From isthar at govers-house.co.uk Sun Apr 1 00:09:23 2007 From: isthar at govers-house.co.uk (Disembodies C. Bernini) Date: Sun, 01 Apr 2007 03:09:23 -0400 Subject: [Vtigercrm-commits] Perfect sex? It is possible! Message-ID: <8190092196.20070401030923@govers-house.co.uk> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://scapeidaa.com Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From collins at gramorwa.com Sun Apr 1 02:09:50 2007 From: collins at gramorwa.com (Spiciest U. Safeguards) Date: Sun, 01 Apr 2007 05:09:50 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5443973319.20070401050950@gramorwa.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/d6b03f23/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: concocts.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/d6b03f23/concocts-0001.gif From audrey at gqitwi.qddfac.r.12hs.com Sun Apr 1 03:36:31 2007 From: audrey at gqitwi.qddfac.r.12hs.com (Anyway H. Muck) Date: Sun, 01 Apr 2007 06:36:31 -0400 Subject: [Vtigercrm-commits] Want to be healthy? U can! Message-ID: <7158214939.20070401063631@gqitwi.qddfac.r.12hs.com> Our Canada Pharmacy store presents top products that will make you healthy! You do not need to go to your local drug store, you can by here any pill that you need. Viagra, Cialis, Levitra, Valium, Phentermine, Tramadol, Xanax, HGH you can find them here: http://scapeidaa.com Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From istcp at globaltouch.com Sun Apr 1 03:37:05 2007 From: istcp at globaltouch.com (Avocado B. Prefatory) Date: Sun, 01 Apr 2007 06:37:05 -0400 Subject: [Vtigercrm-commits] Nobody will know bout your problems. Message-ID: <1917369419.20070401063705@globaltouch.com> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://scapeidaa.com Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From apt at greenleecampground.com Sun Apr 1 01:28:21 2007 From: apt at greenleecampground.com (Sublease V. Comfort) Date: Sun, 01 Apr 2007 08:28:21 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9956322772.20070401082821@greenleecampground.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/27eea470/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: taffies.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/27eea470/taffies.gif From davdoris at go-moneydoctor.com Sun Apr 1 06:57:25 2007 From: davdoris at go-moneydoctor.com (Merino E. Sexes) Date: Sun, 01 Apr 2007 09:57:25 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <5872037935.20070401095725@go-moneydoctor.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://scapeidaa.com Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From istaban_x at greensmiths.com Sun Apr 1 07:07:08 2007 From: istaban_x at greensmiths.com (Yaounde S. Warmonger) Date: Sun, 01 Apr 2007 10:07:08 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5037180724.20070401100708@greensmiths.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/c4f73625/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: formulates.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/c4f73625/formulates.gif From isteffani at gradesofa.com Sun Apr 1 01:07:08 2007 From: isteffani at gradesofa.com (Zachary Merrill) Date: Sun, 01 Apr 2007 04:07:08 -0400 Subject: [Vtigercrm-commits] slovno dlia Message-ID: <6931352896.20070401040708@gradesofa.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/b51fa41d/attachment.htm From samuraikrm at groceriestogo.com Sun Apr 1 04:33:31 2007 From: samuraikrm at groceriestogo.com (Aiden Weeks) Date: Sun, 01 Apr 2007 07:33:31 -0400 Subject: [Vtigercrm-commits] vziatsia nadeius Message-ID: <0857968678.20070401073331@groceriestogo.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/ed9a1448/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: coverall.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/ed9a1448/coverall.gif From palenkal at gpstourguide.com Sun Apr 1 02:35:02 2007 From: palenkal at gpstourguide.com (Alexander Atkinson) Date: Sun, 01 Apr 2007 05:35:02 -0400 Subject: [Vtigercrm-commits] byli shevelnulsia Message-ID: <9568094446.20070401053502@gpstourguide.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/03d54721/attachment.html From istopheb at greatamericanrealty.com Sun Apr 1 05:50:13 2007 From: istopheb at greatamericanrealty.com (Dr. Heather Wyatt) Date: Sun, 01 Apr 2007 12:50:13 +0000 Subject: [Vtigercrm-commits] Penis loader Message-ID: <3563136826.20070401125013@greatamericanrealty.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/26c75936/attachment.htm From darwin at greatlakesequipment.com Sun Apr 1 10:53:50 2007 From: darwin at greatlakesequipment.com (Duffy T. Stovepipe) Date: Sun, 01 Apr 2007 13:53:50 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <8935037704.20070401135350@greatlakesequipment.com> Our Canada Pharmacy store presents top products that will make you healthy! You do not need to go to your local drug store, you can by here any pill that you need. Viagra, Cialis, Levitra, Valium, Phentermine, Tramadol, Xanax, HGH you can find them here: http://scapeidaa.com There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From koczera at greatbridalexpo.com Sun Apr 1 06:58:55 2007 From: koczera at greatbridalexpo.com (Intellects H. Chat) Date: Sun, 01 Apr 2007 13:58:55 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8167743278.20070401135855@greatbridalexpo.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/343ea3b0/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: pink.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/343ea3b0/pink-0001.gif From plusone at greendreamsholiday.com Sun Apr 1 04:22:23 2007 From: plusone at greendreamsholiday.com (Crystal Kerr) Date: Sun, 01 Apr 2007 07:22:23 -0400 Subject: [Vtigercrm-commits] altares zria Message-ID: <3275658016.20070401072223@greendreamsholiday.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/2997937e/attachment.html From act at gpspassion.com Sun Apr 1 12:22:37 2007 From: act at gpspassion.com (Exult T. Straightjacket) Date: Sun, 01 Apr 2007 15:22:37 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0905658213.20070401152237@gpspassion.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/d7d03502/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: simulcast.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/d7d03502/simulcast.gif From neal at goeframe.com Sun Apr 1 06:22:18 2007 From: neal at goeframe.com (Yesenia Reid) Date: Sun, 01 Apr 2007 09:22:18 -0400 Subject: [Vtigercrm-commits] vsiakogo etom Message-ID: <0453762231.20070401092218@goeframe.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/3f881906/attachment.htm From johnm at globalcon.com Sun Apr 1 08:56:59 2007 From: johnm at globalcon.com (Electra H. Linguistic) Date: Sun, 01 Apr 2007 15:56:59 +0000 Subject: [Vtigercrm-commits] Huge on-line pharmacy Message-ID: <1573130104.20070401155659@globalcon.com> The most powerful medicines for you! Pheromone cologne for men - $35.99 - The human pheromones that attracts females has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of men, these natural pheromones are an evolutionary remnant from a time when human females relied on scent to locate male mates. Cumpills - are a great concept formulated by our highly trained speclalists working in the field of natural therapy. Using the knowledge of thousands of years of cumulative research in herbals, this specially designed formula helps in achieving high levels of semen volume and quality. Spermamax - $40.5 - SPERMAMAX is a scientifically validated herbal nutritional blend to enhance fertility by improving sperm quality, count and motility (spontaneous motion). and more! our site http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From mcbride at getesa.com Sun Apr 1 14:27:51 2007 From: mcbride at getesa.com (Ballistic L. Sigurd) Date: Sun, 01 Apr 2007 17:27:51 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <5034310000.20070401172751@getesa.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://scapeidaa.com Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From rfriese at greenwayequip.com Sun Apr 1 08:15:39 2007 From: rfriese at greenwayequip.com (Thomas Fuller) Date: Sun, 01 Apr 2007 11:15:39 -0400 Subject: [Vtigercrm-commits] tysiacheletij zhat Message-ID: <5659974920.20070401111539@greenwayequip.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/f283332a/attachment.html From gatesy at getipx3.uni-paderborn.de Sun Apr 1 08:16:13 2007 From: gatesy at getipx3.uni-paderborn.de (Lisa Foster) Date: Sun, 01 Apr 2007 11:16:13 -0400 Subject: [Vtigercrm-commits] davno voinov Message-ID: <0046496100.20070401111613@getipx3.uni-paderborn.de> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/357f512a/attachment.htm From extremeteen at gkpskldls.shankscape.com Sun Apr 1 11:17:54 2007 From: extremeteen at gkpskldls.shankscape.com (Michael Roberts) Date: Sun, 01 Apr 2007 14:17:54 -0400 Subject: [Vtigercrm-commits] teh krichat Message-ID: <9546345042.20070401141754@gkpskldls.shankscape.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/f6410ec6/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Cali.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/f6410ec6/Cali-0001.gif From frontier at goflo.com Sun Apr 1 11:51:18 2007 From: frontier at goflo.com (Credit E. Towpath) Date: Sun, 01 Apr 2007 18:51:18 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2156198433.20070401185118@goflo.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/b18c8d30/attachment.html From bauer at gocruiseasia.com Sun Apr 1 10:05:50 2007 From: bauer at gocruiseasia.com (Dustin Compton) Date: Sun, 01 Apr 2007 13:05:50 -0400 Subject: [Vtigercrm-commits] nimi svetovogo Message-ID: <1217971370.20070401130550@gocruiseasia.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/a9d97bde/attachment.htm From isteswar at graycomp.net Sun Apr 1 17:53:09 2007 From: isteswar at graycomp.net (Caparisoning T. Stratified) Date: Sun, 01 Apr 2007 20:53:09 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7499506096.20070401205309@graycomp.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/b7f84246/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: renovator.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/b7f84246/renovator.gif From istanbulcu at greatfurniture.com Sun Apr 1 18:51:38 2007 From: istanbulcu at greatfurniture.com (Amateurs R. Wassail) Date: Sun, 01 Apr 2007 21:51:38 -0400 Subject: [Vtigercrm-commits] Want to be healthy? U can! Message-ID: <3074427278.20070401215138@greatfurniture.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft – the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://scapeidaa.com Instant shipping worldwide! CONFIDENTIAL purchase! From annette at gitwangak.ca Sun Apr 1 12:19:05 2007 From: annette at gitwangak.ca (Holly Mayo) Date: Sun, 01 Apr 2007 15:19:05 -0400 Subject: [Vtigercrm-commits] chem svoih Message-ID: <2461844666.20070401151905@gitwangak.ca> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/ab7d49ff/attachment.html From istephens at gravesnyc.com Sun Apr 1 16:22:15 2007 From: istephens at gravesnyc.com (Charm V. Weathermen) Date: Sun, 01 Apr 2007 23:22:15 +0000 Subject: [Vtigercrm-commits] Need some help? Message-ID: <1221097161.20070401232215@gravesnyc.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://scapeidaa.com Completely secure and confidential purchase. Instant shipping worldwide. From guy at grammardoctor.com Sun Apr 1 14:35:50 2007 From: guy at grammardoctor.com (Paula Banks) Date: Sun, 01 Apr 2007 17:35:50 -0400 Subject: [Vtigercrm-commits] reziny shchekoldu Message-ID: <8404432906.20070401173550@grammardoctor.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/18fd1a78/attachment.htm From it-measures at chase.com Sun Apr 1 18:25:32 2007 From: it-measures at chase.com (Transvaal R. Particularize) Date: Mon, 02 Apr 2007 01:25:32 +0000 Subject: [Vtigercrm-commits] Chase Security Measures Message-ID: <8640220151.20070402012532@chase.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/048d1af5/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: bushier.gif Type: image/gif Size: 742 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/048d1af5/bushier-0001.gif From webber at giftcert.com Mon Apr 2 01:04:11 2007 From: webber at giftcert.com (Ruddiest D. Billet) Date: Mon, 02 Apr 2007 04:04:11 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <8458541302.20070402040411@giftcert.com> Make your dreams come true with licensed medications from US Drug Store! Any pills at your choice. There is no need to visit your local drug store at all. http://kiaoq.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From penneylin at gmpmusic.com Sun Apr 1 18:10:46 2007 From: penneylin at gmpmusic.com (Jacquard U. Ripper) Date: Sun, 01 Apr 2007 21:10:46 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3497984776.20070401211046@gmpmusic.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/5ec7b43b/attachment.html From ann at grandevenues.com Sun Apr 1 21:51:45 2007 From: ann at grandevenues.com (Constantinople V. Teacup) Date: Mon, 02 Apr 2007 04:51:45 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6070375689.20070402045145@grandevenues.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/514c9076/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: hunches.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/514c9076/hunches.gif From istent at greenandaway.org Sun Apr 1 19:36:52 2007 From: istent at greenandaway.org (Andean C. Akihito) Date: Sun, 01 Apr 2007 22:36:52 -0400 Subject: [Vtigercrm-commits] Need to buy medications but don't know where? Message-ID: <7548302381.20070401223652@greenandaway.org> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://kiaoq.hk Completely secure and confidential purchase. Instant shipping worldwide. From extremeliquidators at gonzatrips.com Mon Apr 2 04:12:21 2007 From: extremeliquidators at gonzatrips.com (Buckram M. Cookery) Date: Mon, 02 Apr 2007 07:12:21 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5171752923.20070402071221@gonzatrips.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/c17903cf/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: misread.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/c17903cf/misread-0001.gif From istorr at greenwoodinsurance.net Sun Apr 1 21:35:50 2007 From: istorr at greenwoodinsurance.net (Liberally A. Planked) Date: Mon, 02 Apr 2007 00:35:50 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9209240853.20070402003550@greenwoodinsurance.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/f444def7/attachment.htm From crum at grondona.com Mon Apr 2 05:17:01 2007 From: crum at grondona.com (Flickered E. Adulterer) Date: Mon, 02 Apr 2007 08:17:01 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <3877157885.20070402081701@grondona.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://kiaoq.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From extric at gothicsoftware.net Mon Apr 2 01:42:46 2007 From: extric at gothicsoftware.net (Moisturize J. Gawain) Date: Mon, 02 Apr 2007 08:42:46 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9318949184.20070402084246@gothicsoftware.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/6dd48fc5/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: lust.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/6dd48fc5/lust.gif From lfeddy at gqf.com Mon Apr 2 02:02:18 2007 From: lfeddy at gqf.com (Dr. Amy Whitehead) Date: Mon, 02 Apr 2007 09:02:18 +0000 Subject: [Vtigercrm-commits] Penis Launcher Message-ID: <1645878596.20070402090218@gqf.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/4811fcf6/attachment.html From ldsb at gormleyequipment.com Mon Apr 2 02:03:57 2007 From: ldsb at gormleyequipment.com (Dr. Fred Campbell) Date: Mon, 02 Apr 2007 09:03:57 +0000 Subject: [Vtigercrm-commits] Your dick is not only for pissing Message-ID: <8234481223.20070402090357@gormleyequipment.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/d4d22850/attachment.htm From mtolivo at gologurskyphoto.com Sun Apr 1 23:28:47 2007 From: mtolivo at gologurskyphoto.com (Astute A. Gurgle) Date: Mon, 02 Apr 2007 02:28:47 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <3413845854.20070402022847@gologurskyphoto.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://kiaoq.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From mrcrete at gorbi.com Mon Apr 2 01:28:53 2007 From: mrcrete at gorbi.com (Beautifiers K. Excuses) Date: Mon, 02 Apr 2007 04:28:53 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9705098017.20070402042853@gorbi.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/50142a51/attachment.html From ncamper at globetrottersinn.com Mon Apr 2 09:31:00 2007 From: ncamper at globetrottersinn.com (Unholier M. Jeannette) Date: Mon, 02 Apr 2007 12:31:00 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <0042913966.20070402123100@globetrottersinn.com> Our Canada Pharmacy store presents top products that will make you healthy! You do not need to go to your local drug store, you can by here any pill that you need. Viagra, Cialis, Levitra, Valium, Phentermine, Tramadol, Xanax, HGH you can find them here: http://kiaoq.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From hitek at globalprospectors.com Mon Apr 2 09:38:15 2007 From: hitek at globalprospectors.com (Monaco L. Astarte) Date: Mon, 02 Apr 2007 12:38:15 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5425082388.20070402123815@globalprospectors.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/2f45a544/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: witticism.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/2f45a544/witticism-0001.gif From consult at goodtimber.com Mon Apr 2 06:05:31 2007 From: consult at goodtimber.com (Ravening T. Tetrahedron) Date: Mon, 02 Apr 2007 13:05:31 +0000 Subject: [Vtigercrm-commits] sexual drive Message-ID: <4025698632.20070402130531@goodtimber.com> The most powerful medicines for you! Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Sonma - $1.22 - works to relax the muscles by blocking pain messages sent to the brain. Nymphomax - $35.99 - Helps women to achieve multiple and more powerful orgasms with this unique female sexual stimulant. and more! our site http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From stuart at goldiggers.com Mon Apr 2 07:15:17 2007 From: stuart at goldiggers.com (Dustin Gallagher) Date: Mon, 02 Apr 2007 10:15:17 -0400 Subject: [Vtigercrm-commits] bolshomu formirovat Message-ID: <6648304072.20070402101517@goldiggers.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/371c1cf5/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: formerly.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/371c1cf5/formerly.gif From extrmlyyrs at ghga.com Mon Apr 2 04:22:53 2007 From: extrmlyyrs at ghga.com (Vasquez U. Enlistees) Date: Mon, 02 Apr 2007 07:22:53 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <0509379734.20070402072253@ghga.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://kiaoq.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From extrmespet at glitchless.com Mon Apr 2 05:21:20 2007 From: extrmespet at glitchless.com (Satan F. Bandoleer) Date: Mon, 02 Apr 2007 08:21:20 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3511496567.20070402082120@glitchless.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/bc472f7d/attachment.htm From necranom at gerrynolan.net Mon Apr 2 13:12:32 2007 From: necranom at gerrynolan.net (Naturalized J. Hereford) Date: Mon, 02 Apr 2007 16:12:32 -0400 Subject: [Vtigercrm-commits] Can you imagine? Message-ID: <5957461174.20070402161232@gerrynolan.net> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://kiaoq.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From dailey at greenregister.org Mon Apr 2 10:26:29 2007 From: dailey at greenregister.org (Redoubling H. Craftily) Date: Mon, 02 Apr 2007 17:26:29 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1862105922.20070402172629@greenregister.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/e106f054/attachment.html From istartef at getmath.com Mon Apr 2 11:39:44 2007 From: istartef at getmath.com (Enlarger R. Terrence) Date: Mon, 02 Apr 2007 18:39:44 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2989044328.20070402183944@getmath.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/92984bdb/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: stillborns.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/92984bdb/stillborns.gif From casa at glfamily.com Mon Apr 2 09:35:47 2007 From: casa at glfamily.com (Tits H. Dillinger) Date: Mon, 02 Apr 2007 12:35:47 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8368068217.20070402123547@glfamily.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/5c124007/attachment.htm From bnjeri at getafix.india.ti.com Mon Apr 2 16:43:09 2007 From: bnjeri at getafix.india.ti.com (Lentils E. Whirs) Date: Mon, 02 Apr 2007 19:43:09 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6159002268.20070402194309@getafix.india.ti.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/68eae89a/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: diametrical.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/68eae89a/diametrical.gif From bea at goaltex.com Mon Apr 2 09:12:45 2007 From: bea at goaltex.com (Gladys H. Racily) Date: Mon, 02 Apr 2007 12:12:45 -0400 Subject: [Vtigercrm-commits] Why don't you buy some medications to be healthy? Message-ID: <3224358928.20070402121245@goaltex.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://kiaoq.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From istallon at resalehost.networksolutions.com Mon Apr 2 17:29:14 2007 From: istallon at resalehost.networksolutions.com (Querying H. Abduct) Date: Mon, 02 Apr 2007 20:29:14 -0400 Subject: [Vtigercrm-commits] Disappointed with your sexual health? Message-ID: <6374111752.20070402202914@graceharbor.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://kiaoq.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From abby at ggsl.e.telefonica.net Mon Apr 2 14:28:12 2007 From: abby at ggsl.e.telefonica.net (Sedan I. Agatha) Date: Mon, 02 Apr 2007 21:28:12 +0000 Subject: [Vtigercrm-commits] Can you imagine? Message-ID: <4007447044.20070402212812@ggsl.e.telefonica.net> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://kiaoq.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From gregg at govp.com Mon Apr 2 16:02:47 2007 From: gregg at govp.com (Violet Bates) Date: Mon, 02 Apr 2007 19:02:47 -0400 Subject: [Vtigercrm-commits] sirenevuiu ostankov Message-ID: <0384098516.20070402190247@govp.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/387f7f6e/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: jades.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/387f7f6e/jades.gif From reinald.law at gettherhythm.com Mon Apr 2 14:07:05 2007 From: reinald.law at gettherhythm.com (Olaf A. Sinfulness) Date: Mon, 02 Apr 2007 17:07:05 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6783866930.20070402170705@gettherhythm.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/2d2891fc/attachment.html From dkc at graphikillers.com Mon Apr 2 21:58:43 2007 From: dkc at graphikillers.com (Healed F. Debora) Date: Tue, 03 Apr 2007 00:58:43 -0400 Subject: [Vtigercrm-commits] You need these pills. Message-ID: <0180391385.20070403005843@graphikillers.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://kiaoq.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From daniels at grands-moulins.com Mon Apr 2 15:08:58 2007 From: daniels at grands-moulins.com (Housebreak P. Watusi) Date: Mon, 02 Apr 2007 18:08:58 -0400 Subject: [Vtigercrm-commits] We have everything that you need Message-ID: <0780889071.20070402180858@grands-moulins.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://kiaoq.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From samuraidue at goalgroup.com Tue Apr 3 00:02:41 2007 From: samuraidue at goalgroup.com (Wayside U. Ishtar) Date: Tue, 03 Apr 2007 03:02:41 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8255722618.20070403030241@goalgroup.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/78978358/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: foxtrot.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/78978358/foxtrot-0001.gif From rosewil at grinningplanet.com Mon Apr 2 20:42:33 2007 From: rosewil at grinningplanet.com (Guerrillas E. Self) Date: Tue, 03 Apr 2007 03:42:33 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8980416460.20070403034233@grinningplanet.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/c46a11e0/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: thesis.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/c46a11e0/thesis.gif From carleen at grandoakherbfarm.com Mon Apr 2 19:36:49 2007 From: carleen at grandoakherbfarm.com (Guttered I. Partook) Date: Mon, 02 Apr 2007 22:36:49 -0400 Subject: [Vtigercrm-commits] V1 agra vs sexual disorder Message-ID: <7368077498.20070402223649@grandoakherbfarm.com> The most powerful medicines for you! Lipothin - $35.99 - the finest lipotropic fat burner ever! Made from only the finest pharmaceutical grade botanicals, Lipothin contains a unique and highly effective formula of all-natural ingredients which will increase your heart rate, suppress your appetite, and greatly accelerate the burning of fat. Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. Suregasm - $35.99 - Achieve stronger and more powerful orgasms with this all-natural female sexual stimulant. and more! our site http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From administrative at grant.k12.ok.us Mon Apr 2 21:55:48 2007 From: administrative at grant.k12.ok.us (Pok C. Potpourris) Date: Tue, 03 Apr 2007 04:55:48 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6229918345.20070403045548@grant.k12.ok.us> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/464e96f0/attachment.htm From extragaydj at goaironly.com Mon Apr 2 22:30:28 2007 From: extragaydj at goaironly.com (Encephalitis K. Ratio) Date: Tue, 03 Apr 2007 01:30:28 -0400 Subject: [Vtigercrm-commits] Health for everybody Message-ID: <9748141024.20070403013028@goaironly.com> The most powerful medicines for you! Proscar - $1.07 - helps shrink the prostate in many men. Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. Diflucan - $2.64 - a tablet taken orally to treat vaginal yeast infections caused by the yeast Candida. and more! our site http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From res at granitbleu.com Mon Apr 2 22:46:43 2007 From: res at granitbleu.com (Forfeiture M. Castrations) Date: Tue, 03 Apr 2007 05:46:43 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9415651671.20070403054643@granitbleu.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/2a16b1e3/attachment.html From grant at glasurit.com Tue Apr 3 03:50:02 2007 From: grant at glasurit.com (Archaeologist U. Neurons) Date: Tue, 03 Apr 2007 06:50:02 -0400 Subject: [Vtigercrm-commits] Unbelievable! U can be healthy! Message-ID: <1592505580.20070403065002@glasurit.com> Our Canada Pharmacy store presents top products that will make you healthy! You do not need to go to your local drug store, you can by here any pill that you need. Viagra, Cialis, Levitra, Valium, Phentermine, Tramadol, Xanax, HGH you can find them here: http://kiaoq.hk Make right choice: buy medications at LegalRXMedications drug store! From extremehostility at greenwich1892.com Mon Apr 2 21:37:02 2007 From: extremehostility at greenwich1892.com (Redcap A. Octal) Date: Tue, 03 Apr 2007 00:37:02 -0400 Subject: [Vtigercrm-commits] Unbelievable! U can be healthy! Message-ID: <0642260108.20070403003702@greenwich1892.com> Most wanted pills at LOW price! http://kiaoq.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From extremistclub at giuseffi.com Tue Apr 3 00:34:04 2007 From: extremistclub at giuseffi.com (Belles I. Nora) Date: Tue, 03 Apr 2007 07:34:04 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0423875563.20070403073404@giuseffi.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/4a47cf3a/attachment.htm From extrapfui at gmfloral.com Tue Apr 3 00:45:28 2007 From: extrapfui at gmfloral.com (McGee H. Outhouse) Date: Tue, 03 Apr 2007 07:45:28 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6118114223.20070403074528@gmfloral.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/e27cb428/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: bandaging.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/e27cb428/bandaging-0001.gif From cristina at gr-asesores.com Tue Apr 3 01:00:33 2007 From: cristina at gr-asesores.com (Shakily B. Manikin) Date: Tue, 03 Apr 2007 08:00:33 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0440444516.20070403080033@gr-asesores.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/a39d023a/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: longhair.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/a39d023a/longhair.gif From bnkab at grandentry.com Tue Apr 3 01:26:44 2007 From: bnkab at grandentry.com (Polecat R. Incriminatory) Date: Tue, 03 Apr 2007 08:26:44 +0000 Subject: [Vtigercrm-commits] Worry about your erection? Message-ID: <5584969358.20070403082644@grandentry.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://kiaoq.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From crushilu at gocopypro.com Tue Apr 3 06:29:24 2007 From: crushilu at gocopypro.com (Waddled C. Selfishly) Date: Tue, 03 Apr 2007 09:29:24 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7418664554.20070403092924@gocopypro.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/6ce9a3e7/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: toady.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/6ce9a3e7/toady.gif From good at glenviewbaptist.com Tue Apr 3 01:52:40 2007 From: good at glenviewbaptist.com (Sniper T. Milliners) Date: Tue, 03 Apr 2007 08:52:40 +0000 Subject: [Vtigercrm-commits] Unbelievable! U can be healthy! Message-ID: <7644053181.20070403085240@glenviewbaptist.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://kiaoq.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From gardenisme at ges.pickens.k12.al.us Tue Apr 3 01:55:32 2007 From: gardenisme at ges.pickens.k12.al.us (Dr. Donald Hahn) Date: Tue, 03 Apr 2007 08:55:32 +0000 Subject: [Vtigercrm-commits] Don't know where to buy pills? Message-ID: <9491177857.20070403085532@ges.pickens.k12.al.us> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/75bec92b/attachment.html From bj at globalrecovery.com Tue Apr 3 00:33:30 2007 From: bj at globalrecovery.com (Potholing G. Diderot) Date: Tue, 03 Apr 2007 03:33:30 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8746597550.20070403033330@globalrecovery.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/172d4e0d/attachment.htm From istaroz at greyard.com Tue Apr 3 04:23:50 2007 From: istaroz at greyard.com (Tiredness G. Saussure) Date: Tue, 03 Apr 2007 07:23:50 -0400 Subject: [Vtigercrm-commits] Why should you pay more? Message-ID: <4733068000.20070403072350@greyard.com> The most powerful medicines for you! Pheromone perfume for women - $35.99 - The human pheromones that attracts males has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of women, these natural pheromones are an evolutionary remnant from a time when human males relied on scent to locate female mates. Pheromone perfume for women - $35.99 - The human pheromones that attracts males has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of women, these natural pheromones are an evolutionary remnant from a time when human males relied on scent to locate female mates. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. and more! our site http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From absolute at glennboy.com Tue Apr 3 09:36:38 2007 From: absolute at glennboy.com (Ethiopians E. Colonization) Date: Tue, 03 Apr 2007 12:36:38 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <7714491577.20070403123638@glennboy.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://kiaoq.hk Make right choice: buy medications at LegalRXMedications drug store! From u_linkoa at golfhotelazohia.com Tue Apr 3 04:51:04 2007 From: u_linkoa at golfhotelazohia.com (Recuperates O. Gonzalez) Date: Tue, 03 Apr 2007 11:51:04 +0000 Subject: [Vtigercrm-commits] Worry about your erection? Message-ID: <0506900065.20070403115104@golfhotelazohia.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://kiaoq.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 3 06:24:54 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 03 Apr 2007 13:24:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10542 - /vtigercrmoutlook/trunk/resources/support_dlls/TABCTL32.OCX Message-ID: <20070403132454.397957D276E@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Apr 3 07:24:42 2007 New Revision: 10542 Log: version upgraded to 6.01.9782 Modified: vtigercrmoutlook/trunk/resources/support_dlls/TABCTL32.OCX Modified: vtigercrmoutlook/trunk/resources/support_dlls/TABCTL32.OCX ============================================================================== Binary files - no diff available. From istarnes at griffinhomes.com Tue Apr 3 07:15:53 2007 From: istarnes at griffinhomes.com (Acceptances I. Astor) Date: Tue, 03 Apr 2007 14:15:53 +0000 Subject: [Vtigercrm-commits] Pharmacy for everyone Message-ID: <8215541734.20070403141553@griffinhomes.com> The most powerful medicines for you! Allegra - $1.32 - an antihistamine that comes in a variety of strengths and formulations to provide relief from a wide range of seasonal allergy symptoms. Zero Nicotine - $47.99 - innovative stop smoking patch designed to help you give up smoking safely and naturally. With its unique blend of ingredients, Zero Nicotine offers you the best possible chance to finally kick the deadly habit for good! If you are serious about your decision to quit smoking, you’ve come to the right place. Horny Goat Weed - $35.99 - Epimedium is a genus of twenty-one related plant species. It boosts libido (sex drive), increases energy levels and enhances recovery from exercise. and more! our site http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From rosenberg at greetingcards.com Tue Apr 3 07:17:03 2007 From: rosenberg at greetingcards.com (Elderberry K. Wig) Date: Tue, 03 Apr 2007 14:17:03 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8331638402.20070403141703@greetingcards.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/d5d9809e/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: finders.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/d5d9809e/finders.gif From extraserv at godatplay.org Tue Apr 3 04:42:36 2007 From: extraserv at godatplay.org (Inchoating F. Definite) Date: Tue, 03 Apr 2007 07:42:36 -0400 Subject: [Vtigercrm-commits] Don't know where to buy pills? Message-ID: <9219544541.20070403074236@godatplay.org> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://kiaoq.hk any pill you need! Absolutely Confidential and Secure purchase From istorm at gladbird.com Tue Apr 3 08:20:31 2007 From: istorm at gladbird.com (Putts K. Unitarian) Date: Tue, 03 Apr 2007 15:20:31 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8857999119.20070403152031@gladbird.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/351319f5/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: mower.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/351319f5/mower-0001.gif From samuels at giromundo.com Tue Apr 3 06:28:03 2007 From: samuels at giromundo.com (Cramps B. Saucing) Date: Tue, 03 Apr 2007 09:28:03 -0400 Subject: [Vtigercrm-commits] Must have medications. Message-ID: <8930707223.20070403092803@giromundo.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://kiaoq.hk verified by VISA and certified by CIPA. From masonip at giacobbe.net Tue Apr 3 13:57:00 2007 From: masonip at giacobbe.net (Guadalcanal F. Ottering) Date: Tue, 03 Apr 2007 16:57:00 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7162463504.20070403165700@giacobbe.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/e83412fd/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: harangue.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/e83412fd/harangue.gif From blankenship at gosiouxlookout.com Tue Apr 3 09:12:23 2007 From: blankenship at gosiouxlookout.com (Baited L. Inanely) Date: Tue, 03 Apr 2007 16:12:23 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9379143682.20070403161223@gosiouxlookout.com> The most powerful medicines for you! Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. Valtrex - $4.95 - reduce the risk of spreading genital herpes Proscar - $1.07 - helps shrink the prostate in many men. and more! our site http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From alexis at greenwoodking.com Tue Apr 3 15:28:45 2007 From: alexis at greenwoodking.com (Reciting U. Spumoni) Date: Tue, 03 Apr 2007 18:28:45 -0400 Subject: [Vtigercrm-commits] Healthy life is your dream? Message-ID: <6286053179.20070403182845@greenwoodking.com> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://waeq.hk ONLY! From reiner.krause at gregkorten.com Tue Apr 3 11:10:22 2007 From: reiner.krause at gregkorten.com (Billionth E. Perts) Date: Tue, 03 Apr 2007 14:10:22 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <8715584388.20070403141022@gregkorten.com> The most powerful medicines for you! Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. Merindia - $3.29 - a short-term supplement to diet and exercise in the treatment of weight loss. Proscar - $1.07 - helps shrink the prostate in many men. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From kaligula at gijonhidalgo.e.telefonica.net Tue Apr 3 11:02:44 2007 From: kaligula at gijonhidalgo.e.telefonica.net (Butcher C. Equilibrium) Date: Tue, 03 Apr 2007 14:02:44 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <4796177236.20070403140244@gijonhidalgo.e.telefonica.net> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://waeq.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From victor at grluk.com Tue Apr 3 13:58:31 2007 From: victor at grluk.com (Skewing V. Cockiness) Date: Tue, 03 Apr 2007 20:58:31 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0325588852.20070403205831@grluk.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/9b249107/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: rime.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/9b249107/rime-0001.gif From puffinwell at glenstreet.com.au Tue Apr 3 14:15:45 2007 From: puffinwell at glenstreet.com.au (Prying A. Sliding) Date: Tue, 03 Apr 2007 21:15:45 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4158879622.20070403211545@glenstreet.com.au> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/4de84ff3/attachment.html From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 3 14:56:04 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 03 Apr 2007 21:56:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10543 - /vtigercrm/branches/5.0.3/config.inc.php.bak Message-ID: <20070403215604.BA6817D270D@vtiger.fosslabs.com> Author: aissafranc Date: Tue Apr 3 15:55:49 2007 New Revision: 10543 Log: (empty) Added: vtigercrm/branches/5.0.3/config.inc.php.bak From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 3 15:00:37 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 03 Apr 2007 22:00:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10544 - /vtigercrm/branches/5.0.3/config.inc.php.bak Message-ID: <20070403220037.681927D270D@vtiger.fosslabs.com> Author: aissafranc Date: Tue Apr 3 16:00:33 2007 New Revision: 10544 Log: Error from my part Removed: vtigercrm/branches/5.0.3/config.inc.php.bak From crushfilm at goventana.com Tue Apr 3 20:10:54 2007 From: crushfilm at goventana.com (Topographer M. Chagrins) Date: Tue, 03 Apr 2007 23:10:54 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <6857103298.20070403231054@goventana.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://waeq.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From crushercat at glasshoppergifts.com Tue Apr 3 20:28:11 2007 From: crushercat at glasshoppergifts.com (Hogwash V. Tinfoil) Date: Tue, 03 Apr 2007 23:28:11 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1263868308.20070403232811@glasshoppergifts.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/46671362/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Swift.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/46671362/Swift.gif From istcomp at golfcadillac.com Tue Apr 3 16:02:30 2007 From: istcomp at golfcadillac.com (Ram T. Commendations) Date: Tue, 03 Apr 2007 23:02:30 +0000 Subject: [Vtigercrm-commits] Penis launcher Message-ID: <4028338659.20070403230230@golfcadillac.com> The most powerful medicines for you! Zero Nicotine - $47.99 - innovative stop smoking patch designed to help you give up smoking safely and naturally. With its unique blend of ingredients, Zero Nicotine offers you the best possible chance to finally kick the deadly habit for good! If you are serious about your decision to quit smoking, you’ve come to the right place. Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From gerich at globalisation.org Tue Apr 3 16:27:24 2007 From: gerich at globalisation.org (Saigon H. Approximation) Date: Tue, 03 Apr 2007 19:27:24 -0400 Subject: [Vtigercrm-commits] For Your Eyes Only Message-ID: <0040154424.20070403192724@globalisation.org> The most powerful medicines for you! Prilosec - $1.33 - can be taken to decrease the amount of acid produced in the stomach. Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. Hangover Pills - $35.99 Uncle Rummies Hangover Pills are an all-natural dietary supplement providing protection from the "morning after" symptoms experienced after prolonged or excessive alcohol consumption. If taken as directed, Uncle Rummie's Hangover Helper can completely eliminate unpleasant side-effects such as headaches, nausea and dehydration. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From isthistrue at gp-f81157.nhs.uk Tue Apr 3 16:23:49 2007 From: isthistrue at gp-f81157.nhs.uk (Forbear H. Cravens) Date: Tue, 03 Apr 2007 23:23:49 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9798096799.20070403232349@gp-f81157.nhs.uk> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/155a3b29/attachment.htm From extraskin at gijyutu.com Tue Apr 3 16:31:10 2007 From: extraskin at gijyutu.com (Parleyed O. Ensign) Date: Tue, 03 Apr 2007 23:31:10 +0000 Subject: [Vtigercrm-commits] See the results after using V1 agra Message-ID: <4330553591.20070403233110@gijyutu.com> The most powerful medicines for you! Suregasm - $35.99 - Achieve stronger and more powerful orgasms with this all-natural female sexual stimulant. Lipitor - $1.42 - used with diet changes to reduce the amount of cholesterol and certain fatty substances in the blood. Lowering blood levels of cholesterol and fats may help to prevent heart disease, angina, strokes, and heart attacks. Diflucan - $2.64 - a tablet taken orally to treat vaginal yeast infections caused by the yeast Candida. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From samulove at gladstoneconsulting.com Tue Apr 3 16:50:46 2007 From: samulove at gladstoneconsulting.com (Lizzy U. Trailing) Date: Tue, 03 Apr 2007 19:50:46 -0400 Subject: [Vtigercrm-commits] V1 agra vs sexual disorder Message-ID: <2417707485.20070403195046@gladstoneconsulting.com> The most powerful medicines for you! Zero Nicotine - $47.99 - innovative stop smoking patch designed to help you give up smoking safely and naturally. With its unique blend of ingredients, Zero Nicotine offers you the best possible chance to finally kick the deadly habit for good! If you are serious about your decision to quit smoking, you’ve come to the right place. Cumpills - are a great concept formulated by our highly trained speclalists working in the field of natural therapy. Using the knowledge of thousands of years of cumulative research in herbals, this specially designed formula helps in achieving high levels of semen volume and quality. Clearitol - $40.5 - specially formulated to help correct acne-causing internal imbalances in both adults and adolescents. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extravaganse at gordiesgourmet.com Tue Apr 3 17:14:29 2007 From: extravaganse at gordiesgourmet.com (Purgative F. Delusions) Date: Tue, 03 Apr 2007 20:14:29 -0400 Subject: [Vtigercrm-commits] Why don't you buy some medications to be healthy? Message-ID: <1981577100.20070403201429@gordiesgourmet.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://waeq.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From keller at goodmantheatre.org Wed Apr 4 01:09:51 2007 From: keller at goodmantheatre.org (Comparably V. Striven) Date: Wed, 04 Apr 2007 04:09:51 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <8645657335.20070404040951@goodmantheatre.org> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://waeq.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From arne at gridins.com Tue Apr 3 20:13:01 2007 From: arne at gridins.com (Auctions H. Thatcher) Date: Wed, 04 Apr 2007 03:13:01 +0000 Subject: [Vtigercrm-commits] Problems everywhere? Message-ID: <7637696385.20070404031301@gridins.com> The most powerful medicines for you! Cipro - $3.43 - Recommended for people suffering from respiratory pathogens causing infections such as acute exacerbations of chronic bronchitis (AECB). In comparison to traditional remedies, Cipro can be taken to treat respiratory pathogens that may be resistant to standard treatment options. Zolioft - $1.08 - a type of antidepressant known as a selective serotonin reuptake inhibitor (SSRI). Lipotrexate - $35.99 - one of the safest and most powerful dietary supplements on the market. Its special proprietary blend of pharmaceutical grade botanicals provides you with consistent levels of sustained energy all day without the nervousness or jitters commonly associated with other diet pills. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From gardeninge at globalpatents.u-net.com Tue Apr 3 20:14:24 2007 From: gardeninge at globalpatents.u-net.com (Importuned S. Archery) Date: Wed, 04 Apr 2007 03:14:24 +0000 Subject: [Vtigercrm-commits] Tired with sexual troubles? Message-ID: <4660966166.20070404031424@globalpatents.u-net.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://waeq.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From gregory at greenmountainblocks.com Tue Apr 3 21:40:24 2007 From: gregory at greenmountainblocks.com (Nickels R. Ankhs) Date: Wed, 04 Apr 2007 04:40:24 +0000 Subject: [Vtigercrm-commits] Can you imagine that you are healthy? Message-ID: <6151689800.20070404044024@greenmountainblocks.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://waeq.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From trotter at gorgetop.com Tue Apr 3 22:03:01 2007 From: trotter at gorgetop.com (Casandra R. Stationers) Date: Wed, 04 Apr 2007 01:03:01 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <7699587747.20070404010301@gorgetop.com> The most powerful medicines for you! Imitrex - $9.06 - acute treatment of migraine attacks. Maxaman - $35.99 - The all natural proprietary blend of unique herbs found in Maxaman is designed to restore blood flow to your penis, unleash stored testosterone, and heighten sensation by activating the body's natural hormone production and supplying vital nutrients necessary for peak sexual performance. Premium Diet Patch - $37.12 - Lose weight fast and safe with the most potent weight loss patch on the market today! and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From adkins at goeckler.com Tue Apr 3 22:14:39 2007 From: adkins at goeckler.com (Forehead U. Ruggedest) Date: Wed, 04 Apr 2007 05:14:39 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6413710239.20070404051439@goeckler.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/ece56e51/attachment.html From sis-tema at goonie.org Tue Apr 3 22:18:28 2007 From: sis-tema at goonie.org (Sigmund S. Moocher) Date: Wed, 04 Apr 2007 05:18:28 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6657961508.20070404051828@goonie.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/959b1944/attachment.htm From ans at gregorysimon.com Wed Apr 4 04:09:49 2007 From: ans at gregorysimon.com (Maisie E. Waldheim) Date: Wed, 04 Apr 2007 07:09:49 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6151052398.20070404070949@gregorysimon.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/3625b516/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: maturer.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/3625b516/maturer-0001.gif From alain at globaliplaw.com Tue Apr 3 21:38:48 2007 From: alain at globaliplaw.com (Overdressed D. Exclaim) Date: Wed, 04 Apr 2007 00:38:48 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7394819585.20070404003848@globaliplaw.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/95593d6d/attachment.html From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 00:01:37 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 07:01:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10545 - in /vtigercrm/branches/5.0.3/modules/HelpDesk: Save.php language/en_us.lang.php Message-ID: <20070404070137.C94507D2731@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 01:01:31 2007 New Revision: 10545 Log: fix for i18n issue - Notification email - Tickets. Fixes #3044 --Minnie Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php vtigercrm/branches/5.0.3/modules/HelpDesk/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php Wed Apr 4 01:01:31 2007 @@ -91,8 +91,8 @@ else $reply = ''; -$subject = '[ Ticket ID : '.$focus->id.' ] '.$reply.$_REQUEST['ticket_title']; -$bodysubject = ' Ticket ID : '.$focus->id.'
Subject : '.$_REQUEST['ticket_title']; +$subject = '[ '.$mod_strings['LBL_TICKET_ID'].' : '.$focus->id.' ] '.$reply.$_REQUEST['ticket_title']; +$bodysubject = $mod_strings['LBL_TICKET_ID'].' : '.$focus->id.'
'.$mod_strings['LBL_SUBJECT'].$_REQUEST['ticket_title']; $emailoptout = 0; @@ -124,7 +124,7 @@ } if($isactive == 1) { - $url = "Ticket Details"; + $url = "".$mod_strings['LBL_TICKET_DETAILS'].""; $email_body = $bodysubject.'

'.getPortalInfo_Ticket($focus->id,$_REQUEST['ticket_title'],$contactname,$url,$_REQUEST['mode']); } else Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/HelpDesk/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/HelpDesk/language/en_us.lang.php Wed Apr 4 01:01:31 2007 @@ -81,14 +81,6 @@ 'LBL_SELECT_TICKET'=>'Select Ticket', 'LBL_CHANGE_OWNER'=>'Change Owner', 'LBL_CHANGE_STATUS'=>'Change Status', - - - - - - - - 'LBL_TICKET_TITLE'=>'Title', 'LBL_TICKET_DESCRIPTION'=>'Description', 'LBL_TICKET_CATEGORY'=>'Category', @@ -186,6 +178,8 @@ 'LBL_DETAIL' => 'the details are :', 'LBL_REGARDS'=> 'Regards', 'LBL_TEAM'=> 'HelpDesk Team', +'LBL_TICKET_DETAILS' => 'Ticket Details', +'LBL_SUBJECT' => 'Subject : ', 'created' => 'created', 'replied' => 'replied', 'reply'=>'There is a reply to', From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 00:14:47 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 07:14:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10546 - /vtigercrm/branches/5.0.3/include/js/general.js Message-ID: <20070404071448.277997D26D4@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 01:14:41 2007 New Revision: 10546 Log: fix for Can show the pop in the centre of the window. Fixes #3529 --Minnie Modified: vtigercrm/branches/5.0.3/include/js/general.js Modified: vtigercrm/branches/5.0.3/include/js/general.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/general.js (original) +++ vtigercrm/branches/5.0.3/include/js/general.js Wed Apr 4 01:14:41 2007 @@ -1390,6 +1390,10 @@ var topSide = findPosY(obj); var maxW = tagName.style.width; var widthM = maxW.substring(0,maxW.length-2); + if(Lay == 'editdiv') { + leftSide = leftSide - 225; + topSide = topSide - 125; + } var getVal = eval(leftSide) + eval(widthM); if(getVal > document.body.clientWidth ){ leftSide = eval(leftSide) - eval(widthM); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 00:16:23 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 07:16:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10547 - /vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl Message-ID: <20070404071623.7773F7D2736@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 01:16:17 2007 New Revision: 10547 Log: fix for Email icon is shrinked. Fixes #3398 --Minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl Wed Apr 4 01:16:17 2007 @@ -115,7 +115,7 @@ - + {$MOD.LBL_SETTINGS} > {$UMOD.LBL_EMAIL_TEMPLATES} From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 00:18:09 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 07:18:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10548 - /vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl Message-ID: <20070404071809.9C0F27D2731@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 01:18:04 2007 New Revision: 10548 Log: fix for Accounts - The message box at the center overlapping with popmenu of Open All menu. Fixes #3318 --Minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl Wed Apr 4 01:18:04 2007 @@ -404,7 +404,7 @@ {/literal} {* Quick Access Functionality *} -
+
From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 00:38:42 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 07:38:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10549 - /vtigercrm/branches/5.0.3/modules/Quotes/ListView.php Message-ID: <20070404073842.5BD127D2745@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 01:38:36 2007 New Revision: 10549 Log: * Added tablename before user_name in ORDER BY query because in the listview query users table is joined twice to get the inventory manager also. so we have to avoid ambiguous error Modified: vtigercrm/branches/5.0.3/modules/Quotes/ListView.php Modified: vtigercrm/branches/5.0.3/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Quotes/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Quotes/ListView.php Wed Apr 4 01:38:36 2007 @@ -128,7 +128,7 @@ { if($order_by == 'smownerid') { - $query .= ' ORDER BY user_name '.$sorder; + $query .= ' ORDER BY vtiger_users.user_name '.$sorder; } else { From moga at gronmark.com Wed Apr 4 01:41:32 2007 From: moga at gronmark.com (Renee Vasquez) Date: Wed, 04 Apr 2007 08:41:32 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <9162111711.20070404084132@gronmark.com> FDA approved on-line pharmacies. Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/b99c80fa/attachment.htm From issykris at gonova.org Wed Apr 4 06:58:18 2007 From: issykris at gonova.org (Welfare J. Gherkins) Date: Wed, 04 Apr 2007 09:58:18 -0400 Subject: [Vtigercrm-commits] Tired with sexual troubles? Message-ID: <4457047222.20070404095818@gonova.org> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://waeq.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From krispy_gompers at glenys.com Tue Apr 3 23:11:04 2007 From: krispy_gompers at glenys.com (Suede O. Spareness) Date: Wed, 04 Apr 2007 02:11:04 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <4426300700.20070404021104@glenys.com> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://waeq.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 02:59:28 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 09:59:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10550 - /vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Message-ID: <20070404095928.998FF7D2736@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 03:59:23 2007 New Revision: 10550 Log: * Added condition to avoid the security check for Email - fields. when we create a profile we are not populating Email fields in profile2field table so we should not check the profile2field table when we get the fields Fixes #3431 Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/CommonUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Wed Apr 4 03:59:23 2007 @@ -1082,7 +1082,7 @@ require('user_privileges/user_privileges_'.$current_user->id.'.php'); if($disp_view == "detail_view") { - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == "Users") + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == "Users" || $module == "Emails") { $sql = "SELECT vtiger_field.* FROM vtiger_field WHERE vtiger_field.tabid=".$tabid." AND vtiger_field.block IN $blockid_list AND vtiger_field.displaytype IN (1,2,4) ORDER BY block,sequence"; } @@ -1101,7 +1101,7 @@ { if ($info_type != '') { - if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2]== 0 || $module == 'Users') + if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2]== 0 || $module == 'Users' || $module == "Emails") { $sql = "SELECT vtiger_field.* FROM vtiger_field WHERE vtiger_field.tabid=".$tabid." AND vtiger_field.block IN ".$blockid_list ." AND ".$display_type_check." AND info_type = '".$info_type."' ORDER BY block,sequence"; } @@ -1116,7 +1116,7 @@ } else { - if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == 'Users') + if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == 'Users' || $module == "Emails") { $sql = "SELECT vtiger_field.* FROM vtiger_field WHERE vtiger_field.tabid=".$tabid." AND vtiger_field.block IN ".$blockid_list." AND ".$display_type_check." ORDER BY block,sequence"; } From morrow at goldpornhost.com Wed Apr 4 03:58:33 2007 From: morrow at goldpornhost.com (Retired A. Owning) Date: Wed, 04 Apr 2007 06:58:33 -0400 Subject: [Vtigercrm-commits] V1 agra vs sexual disorder Message-ID: <1212589200.20070404065833@goldpornhost.com> The most powerful medicines for you! Suprax - $3- a medication belonging to a class of antibiotics called Cephalosporins. The active ingredient in Suprax is Cefixime. Prilosec - $1.33 - can be taken to decrease the amount of acid produced in the stomach. Pheromone cologne for men - $35.99 - The human pheromones that attracts females has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of men, these natural pheromones are an evolutionary remnant from a time when human females relied on scent to locate male mates. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istamper at gonpas.e.telefonica.net Wed Apr 4 04:05:17 2007 From: istamper at gonpas.e.telefonica.net (Stockpile I. Maypole) Date: Wed, 04 Apr 2007 11:05:17 +0000 Subject: [Vtigercrm-commits] Good health is above wealth Message-ID: <8706277682.20070404110517@gonpas.e.telefonica.net> The most powerful medicines for you! Proprecia - $1.03 - first and only FDA-approved pill demonstrated to treat male pattern hair loss on the vertex (top of head) and anterior mid-scalp area (middle front of head) in men only. Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From gardenman at glenaeon.nsw.edu.au Wed Apr 4 04:49:54 2007 From: gardenman at glenaeon.nsw.edu.au (Involuntary R. Operettas) Date: Wed, 04 Apr 2007 11:49:54 +0000 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <9837668573.20070404114954@glenaeon.nsw.edu.au> The most powerful medicines for you! Lipothin - $35.99 - the finest lipotropic fat burner ever! Made from only the finest pharmaceutical grade botanicals, Lipothin contains a unique and highly effective formula of all-natural ingredients which will increase your heart rate, suppress your appetite, and greatly accelerate the burning of fat. Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. Pro-erex - $35.99 - Enlarge your penis and achieve stronger erections with this natural stamina enhancer. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From shadow at ghly.com Wed Apr 4 05:21:47 2007 From: shadow at ghly.com (Outshine O. Puree) Date: Wed, 04 Apr 2007 12:21:47 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1683314999.20070404122147@ghly.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/99dbb35e/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: heros.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/99dbb35e/heros.gif From ngcuz at globeprintnpack.com Wed Apr 4 03:32:46 2007 From: ngcuz at globeprintnpack.com (Grooves I. Wielded) Date: Wed, 04 Apr 2007 06:32:46 -0400 Subject: [Vtigercrm-commits] Be healthy, be wealthy! Message-ID: <5176415389.20070404063246@globeprintnpack.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://waeq.hk Verified by VISA and sell FDA Approved Drugs only! From scardednas at gillianstewart.com Wed Apr 4 05:48:50 2007 From: scardednas at gillianstewart.com (Intercepted F. Spurting) Date: Wed, 04 Apr 2007 12:48:50 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5485418399.20070404124850@gillianstewart.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/d4830c6b/attachment-0001.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: fingerboard.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/d4830c6b/fingerboard-0001.gif From extralongwilli at gloriasquilts.com Wed Apr 4 10:54:04 2007 From: extralongwilli at gloriasquilts.com (Returns E. Record) Date: Wed, 04 Apr 2007 13:54:04 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0346459283.20070404135404@gloriasquilts.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/5ae72039/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Callaghan.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/5ae72039/Callaghan.gif From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 06:20:43 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 13:20:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10551 - /vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php Message-ID: <20070404132043.4BA9E7D25F6@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 07:20:39 2007 New Revision: 10551 Log: fix for dashboard related issues. --minnie Modified: vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php Modified: vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php Wed Apr 4 07:20:39 2007 @@ -12,6 +12,7 @@ global $tmp_dir; global $mod_strings,$app_strings; global $current_user; +require('user_privileges/user_privileges_'.$current_user->id.'.php'); $period=($_REQUEST['period'])?$_REQUEST['period']:"tmon"; // Period >> lmon- Last Month, tmon- This Month, lweek-LastWeek, tweek-ThisWeek; lday- Last Day $type=($_REQUEST['type'])?$_REQUEST['type']:"leadsource"; @@ -130,7 +131,7 @@ Author: saraj Date: Wed Apr 4 07:40:10 2007 New Revision: 10552 Log: fix for non-admin user could not the graph for Contacts by Campaign. Fixes #3564 --minnie Modified: vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php Modified: vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php Wed Apr 4 07:40:10 2007 @@ -393,7 +393,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Campaigns by Contact - elseif ($profileTabsPermission[getTabid("Contacts")] == 0 && ($type == "contactbycampaign") && (getFieldVisibilityPermission('Campaigns',$user_id,'campaignid') == "0")) + elseif ($profileTabsPermission[getTabid("Contacts")] == 0 && ($type == "contactbycampaign") && $profileTabsPermission[getTabid("Campaigns")] == 0) { $graph_by="campaignname"; $graph_title=$mod_strings['contactbycampaign']; From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 06:43:19 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 13:43:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10553 - /vtigercrm/branches/5.0.3/include/js/Inventory.js Message-ID: <20070404134319.EFD757D2761@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 07:43:14 2007 New Revision: 10553 Log: * Added check to avoid script error. Because of this error validation not done properly in PO/SO/Quotes/Invoice, Fix #3384 Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/Inventory.js (original) +++ vtigercrm/branches/5.0.3/include/js/Inventory.js Wed Apr 4 07:43:14 2007 @@ -624,13 +624,15 @@ function callTaxCalc(curr_row) { //when we change discount or list price, we have to calculate the taxes again before calculate the total - tax_count = eval(document.getElementById('tax_table'+curr_row).rows.length-1);//subtract the title tr length - - for(var i=0, j=i+1;i Author: saraj Date: Wed Apr 4 08:02:30 2007 New Revision: 10554 Log: * Added conditions to avoid script error, Fixed #3404 Modified: vtigercrm/branches/5.0.3/include/js/general.js vtigercrm/branches/5.0.3/modules/Emails/Emails.js Modified: vtigercrm/branches/5.0.3/include/js/general.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/general.js (original) +++ vtigercrm/branches/5.0.3/include/js/general.js Wed Apr 4 08:02:30 2007 @@ -1117,13 +1117,13 @@ * @param divId :: div tag ID */ function show(divId) - -{ - - var id = document.getElementById(divId); - - id.style.display = 'inline'; - +{ + if(getObj(divId)) + { + var id = document.getElementById(divId); + + id.style.display = 'inline'; + } } /* Modified: vtigercrm/branches/5.0.3/modules/Emails/Emails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/Emails.js (original) +++ vtigercrm/branches/5.0.3/modules/Emails/Emails.js Wed Apr 4 08:02:30 2007 @@ -30,7 +30,10 @@ function setSubject(subject) { - document.getElementById("subjectsetter").innerHTML=subject + if(getObj("subjectsetter")) + { + document.getElementById("subjectsetter").innerHTML=subject; + } } function getEmailContents(id) From catherine at grandedenali.com Wed Apr 4 12:11:37 2007 From: catherine at grandedenali.com (Chantey H. Vogueing) Date: Wed, 04 Apr 2007 15:11:37 -0400 Subject: [Vtigercrm-commits] Don't waste your time. Cheap pills are here. Message-ID: <1768846108.20070404151137@grandedenali.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://waeq.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From sharpe at golocalnet.net Wed Apr 4 07:30:20 2007 From: sharpe at golocalnet.net (Librarian S. Fizzed) Date: Wed, 04 Apr 2007 14:30:20 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3525804965.20070404143020@golocalnet.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/e69ccd9e/attachment.htm From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 07:53:12 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 14:53:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10555 - /vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php Message-ID: <20070404145312.8F1277D2765@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 08:53:05 2007 New Revision: 10555 Log: fix for Profile is not creating. Fixes #3498 --minnie Modified: vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php Modified: vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php Wed Apr 4 08:53:05 2007 @@ -14,7 +14,7 @@ require_once('include/utils/utils.php'); global $adb; $profilename = addslashes($_REQUEST['profile_name']); -$description= $_REQUEST['profile_description']; +$description= addslashes($_REQUEST['profile_description']); $def_module = $_REQUEST['selected_module']; $def_tab = $_REQUEST['selected_tab']; //Inserting values into Profile Table From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 07:54:03 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 14:54:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10556 - /vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl Message-ID: <20070404145403.613F17D2765@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 08:53:58 2007 New Revision: 10556 Log: fix for create a new role. Fixes #3499 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl Wed Apr 4 08:53:58 2007 @@ -61,7 +61,7 @@ {include file='SetMenu.tpl'} - + From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 08:14:36 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 15:14:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10557 - /vtigercrm/branches/5.0.3/modules/Campaigns/language/en_us.lang.php Message-ID: <20070404151436.BEC9D78D08D@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 09:14:31 2007 New Revision: 10557 Log: fix for Need to Change Label in Campaigns. Fixes #3416 --minnie Modified: vtigercrm/branches/5.0.3/modules/Campaigns/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Campaigns/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Campaigns/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Campaigns/language/en_us.lang.php Wed Apr 4 09:14:31 2007 @@ -43,7 +43,7 @@ 'Description'=>'Description', 'Product'=>'Product', 'Target Audience'=>'Target Audience', -'TargetSize'=>'TargetSize', +'TargetSize'=>'Target Size', 'Sponsor'=>'Sponsor', 'Expected Sales Count'=>'Expected Sales Count', From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 08:19:23 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 15:19:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10558 - in /vtigercrm/branches/5.0.3: Smarty/templates/OrgSharingDetailView.tpl include/js/general.js Message-ID: <20070404151923.61A127D2684@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 09:19:16 2007 New Revision: 10558 Log: fix for ie -> settings-sharing access ->Reclculate sharing -->ui issue. Fixes #3466 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl vtigercrm/branches/5.0.3/include/js/general.js Modified: vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl Wed Apr 4 09:19:16 2007 @@ -194,22 +194,22 @@
-
+
-
- +
-

{$CMOD.LBL_RECALC_MSG}

+ 		+ {$CMOD.LBL_RECALC_MSG}
    
-		 - @@ -610,8 +610,8 @@ -   - +   +
@@ -846,7 +846,7 @@   - + From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 5 07:56:04 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 05 Apr 2007 14:56:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10569 - /vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php Message-ID: <20070405145604.22F8C7D3226@vtiger.fosslabs.com> Author: richie Date: Thu Apr 5 08:55:59 2007 New Revision: 10569 Log: fix for Issue on notification mail for Trouble tickets. Fixes #3604 --minnie Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php Thu Apr 5 08:55:59 2007 @@ -124,7 +124,7 @@ } if($isactive == 1) { - $url = "".$mod_strings['LBL_TICKET_DETAILS'].""; + $url = "".$mod_strings['LBL_TICKET_DETAILS'].""; $email_body = $bodysubject.'

'.getPortalInfo_Ticket($focus->id,$_REQUEST['ticket_title'],$contactname,$url,$_REQUEST['mode']); } else From avila at ghly.com Thu Apr 5 08:08:13 2007 From: avila at ghly.com (Dehydrated E. Draw) Date: Thu, 05 Apr 2007 15:08:13 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8373943640.20070405150813@ghly.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070405/38891698/attachment.html From rjester at granen.com Thu Apr 5 08:31:43 2007 From: rjester at granen.com (Camper S. Vern) Date: Thu, 05 Apr 2007 15:31:43 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3344856088.20070405153143@granen.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070405/21ce62f8/attachment.htm From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 5 08:42:53 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 05 Apr 2007 15:42:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10570 - /vtigercrm/branches/5.0.3/modules/Rss/Rss.php Message-ID: <20070405154253.DCD507D3223@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 5 09:42:49 2007 New Revision: 10570 Log: UTF-8 support for RSS feeds. Fixes #3258 Modified: vtigercrm/branches/5.0.3/modules/Rss/Rss.php Modified: vtigercrm/branches/5.0.3/modules/Rss/Rss.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Rss/Rss.php (original) +++ vtigercrm/branches/5.0.3/modules/Rss/Rss.php Thu Apr 5 09:42:49 2007 @@ -69,13 +69,17 @@ function getListViewRSSHtml() { + global $default_charset; if(isset($this->rss_object)) { $i = 0; foreach($this->rss_object as $key=>$item) { + $stringConvert = iconv("UTF-8",$default_charset,$item[title]); + $rss_title= addslashes(ltrim(rtrim($stringConvert))); + $i = $i + 1; - $shtml .= "".$item[title]."".$this->rss_title.""; + $shtml .= "".$rss_title."".$this->rss_title.""; if($i == 10) { return $shtml; From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 5 08:52:33 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 05 Apr 2007 15:52:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10571 - /vtigercrm/branches/5.0.3/include/language/en_us.lang.php Message-ID: <20070405155233.EC2187D3225@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 5 09:52:28 2007 New Revision: 10571 Log: is' missing in Advance Search. Fixes #3299 Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Thu Apr 5 09:52:28 2007 @@ -647,7 +647,7 @@ //Added for values of picklist in Advanced Search filter 'contains'=>'contains', 'does not contains'=>'does not contains', -'equals'=>'equals', +'is'=>'is', 'is not'=>'is not', 'begins with'=>'begins with', 'ends with'=>'ends with', From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 5 08:54:44 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 05 Apr 2007 15:54:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10572 - /vtigercrm/branches/5.0.3/modules/Notes/Notes.php Message-ID: <20070405155444.04B737D3255@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 5 09:54:40 2007 New Revision: 10572 Log: improper sorting of contact name in notes listview. Fixes #3298 Modified: vtigercrm/branches/5.0.3/modules/Notes/Notes.php Modified: vtigercrm/branches/5.0.3/modules/Notes/Notes.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Notes/Notes.php (original) +++ vtigercrm/branches/5.0.3/modules/Notes/Notes.php Thu Apr 5 09:54:40 2007 @@ -39,7 +39,7 @@ var $column_fields = Array(); - var $sortby_fields = Array('notes_title','modifiedtime','contact_id','filename'); + var $sortby_fields = Array('title','modifiedtime','contact_id','filename'); // This is used to retrieve related vtiger_fields from form posts. var $additional_column_fields = Array('', '', '', ''); @@ -47,7 +47,7 @@ // This is the list of vtiger_fields that are in the lists. var $list_fields = Array( 'Subject'=>Array('notes'=>'notes_title'), - 'Contact Name'=>Array('notes'=>'contact_id'), + 'Contact Name'=>Array('contactdetails'=>'lastname'), 'Related to'=>Array('senotesrel'=>'crmid'), 'File'=>Array('notes'=>'filename'), 'Last Modified'=>Array('crmentity'=>'modifiedtime') From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 5 09:04:56 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 05 Apr 2007 16:04:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10573 - /vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Message-ID: <20070405160456.783317D3258@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 5 10:04:51 2007 New Revision: 10573 Log: calendar sharing - instruction message is incorrect. Fixes #3603 Modified: vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Thu Apr 5 10:04:51 2007 @@ -212,7 +212,7 @@ 'LBL_YEAR'=>'Year', 'LBL_NONE_SCHEDULED'=>'None Scheduled', -'LBL_INVITE_INST1'=>'To invite, select the users from the "Available Users" list and click the "Add" button.', +'LBL_INVITE_INST1'=>'To share, select the users from the "Available Users" list and click the "Add" button.', 'LBL_INVITE_INST2'=>'To remove, select the users in the "Selected Users" list and the click "Remove" button.', 'LBL_SELUSR_INFO'=>' Selected users will receive an email about the Event.', 'LBL_CALSHAREMESSAGE'=>'Share my calendar with the following selected users', From nealey at getm2.com Thu Apr 5 09:31:02 2007 From: nealey at getm2.com (Atheist R. Weevil) Date: Thu, 05 Apr 2007 16:31:02 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0252153119.20070405163102@getm2.com> The most powerful medicines for you! Suregasm - $35.99 - Achieve stronger and more powerful orgasms with this all-natural female sexual stimulant. Amoxicillin - $1.43 - penicillin-like antibiotic used to treat certain infections caused by bacteria. Human Growth Hormone - $43.37 - increases your metabolism helping to break down fat, build proteins, and create lean muscle. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From ryan_debold at gourmetsa.com Thu Apr 5 14:37:43 2007 From: ryan_debold at gourmetsa.com (Daintily B. Enclaves) Date: Thu, 05 Apr 2007 17:37:43 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9701569009.20070405173743@gourmetsa.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070405/ade76a3e/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: conga.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070405/ade76a3e/conga.gif From dgreig at goralka.com Thu Apr 5 09:59:00 2007 From: dgreig at goralka.com (Grannies M. Planck) Date: Thu, 05 Apr 2007 16:59:00 +0000 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <5146820764.20070405165900@goralka.com> The most powerful medicines for you! Pheromone cologne for men - $35.99 - The human pheromones that attracts females has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of men, these natural pheromones are an evolutionary remnant from a time when human females relied on scent to locate male mates. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. Wellbutrin SR - $3 - antidepressant used to treat depression. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From petty at glen.org Thu Apr 5 15:07:43 2007 From: petty at glen.org (Ramirez S. Grotesquely) Date: Thu, 05 Apr 2007 18:07:43 -0400 Subject: [Vtigercrm-commits] Can you imagine? Message-ID: <6738944618.20070405180743@glen.org> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://waeq.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From istacare at graystrokes.com Thu Apr 5 08:42:43 2007 From: istacare at graystrokes.com (Accomplishing C. Holler) Date: Thu, 05 Apr 2007 11:42:43 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2925035354.20070405114243@graystrokes.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070405/f6e1632b/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: catalyzes.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070405/f6e1632b/catalyzes-0001.gif From skyform at grahamsalisbury.com Thu Apr 5 12:26:21 2007 From: skyform at grahamsalisbury.com (Impartial S. Borax) Date: Thu, 05 Apr 2007 15:26:21 -0400 Subject: [Vtigercrm-commits] Usefull information about drugs Message-ID: <7684541263.20070405152621@grahamsalisbury.com> The most powerful medicines for you! Zero Nicotine - $47.99 - innovative stop smoking patch designed to help you give up smoking safely and naturally. With its unique blend of ingredients, Zero Nicotine offers you the best possible chance to finally kick the deadly habit for good! If you are serious about your decision to quit smoking, you’ve come to the right place. Avandia - $0.96 - Avandia, in addition to diet and exercise, improves blood sugar control in adults with type 2 (non-insulin-dependent) diabetes. Avandia - $0.96 - Avandia, in addition to diet and exercise, improves blood sugar control in adults with type 2 (non-insulin-dependent) diabetes. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From goodman at gfarias.com Thu Apr 5 10:16:29 2007 From: goodman at gfarias.com (Primrosed C. Sentencing) Date: Thu, 05 Apr 2007 13:16:29 -0400 Subject: [Vtigercrm-commits] Unbelievable prices! Message-ID: <7101709882.20070405131629@gfarias.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://waeq.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From cherie at golf.sparks.nv.us Thu Apr 5 13:30:37 2007 From: cherie at golf.sparks.nv.us (Yelped V. Dual) Date: Thu, 05 Apr 2007 20:30:37 +0000 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <1709337795.20070405203037@golf.sparks.nv.us> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://waeq.hk Make right choice: buy medications at LegalRXMedications drug store! From murphy at gmelectricidad.com Thu Apr 5 13:33:21 2007 From: murphy at gmelectricidad.com (Hansel J. Medallions) Date: Thu, 05 Apr 2007 20:33:21 +0000 Subject: [Vtigercrm-commits] Unbelievable prices! Message-ID: <6218214968.20070405203321@gmelectricidad.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://waeq.hk Completely secure and confidential purchase. Instant shipping worldwide. From extremejls at great-ocean.com Thu Apr 5 14:17:52 2007 From: extremejls at great-ocean.com (Luggage M. Mugginess) Date: Thu, 05 Apr 2007 21:17:52 +0000 Subject: [Vtigercrm-commits] Pharmacy for real men! Message-ID: <1982303937.20070405211752@great-ocean.com> The most powerful medicines for you! Allegra - $1.32 - an antihistamine that comes in a variety of strengths and formulations to provide relief from a wide range of seasonal allergy symptoms. Singulair - $1.28 - medicine approved to help control asthma in adults and children as young as 12 months old. It also helps to relieve the symptoms of seasonal allergies in adults and children as young as 2 years old. Diflucan - $2.64 - a tablet taken orally to treat vaginal yeast infections caused by the yeast Candida. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From fg at goradia.com Thu Apr 5 15:16:50 2007 From: fg at goradia.com (Jinx D. Watersheds) Date: Thu, 05 Apr 2007 22:16:50 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1974845986.20070405221650@goradia.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070405/b4178224/attachment.html From gillis at geturhotels.com Thu Apr 5 15:47:16 2007 From: gillis at geturhotels.com (Induce I. Sexism) Date: Thu, 05 Apr 2007 22:47:16 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3229505706.20070405224716@geturhotels.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070405/9a667af7/attachment.htm From dave-daniels at goldvacationpackage.com Thu Apr 5 21:21:23 2007 From: dave-daniels at goldvacationpackage.com (Caudal M. Bystander) Date: Fri, 06 Apr 2007 00:21:23 -0400 Subject: [Vtigercrm-commits] Want to be healthy? U can! Message-ID: <1934784842.20070406002123@goldvacationpackage.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://waeq.hk Verified by VISA and sell FDA Approved Drugs only! From bones at greyzisser.com Thu Apr 5 15:22:26 2007 From: bones at greyzisser.com (Timer I. Kidnaper) Date: Thu, 05 Apr 2007 18:22:26 -0400 Subject: [Vtigercrm-commits] See the results after using V1 agra Message-ID: <9234077025.20070405182226@greyzisser.com> The most powerful medicines for you! Singulair - $1.28 - medicine approved to help control asthma in adults and children as young as 12 months old. It also helps to relieve the symptoms of seasonal allergies in adults and children as young as 2 years old. Hangover Pills - $35.99 Uncle Rummies Hangover Pills are an all-natural dietary supplement providing protection from the "morning after" symptoms experienced after prolonged or excessive alcohol consumption. If taken as directed, Uncle Rummie's Hangover Helper can completely eliminate unpleasant side-effects such as headaches, nausea and dehydration. Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From mugu at globaldatacomm.com Thu Apr 5 18:25:28 2007 From: mugu at globaldatacomm.com (Jogjakarta T. Trolloping) Date: Thu, 05 Apr 2007 21:25:28 -0400 Subject: [Vtigercrm-commits] The most widely prescribed drugs Message-ID: <4154377209.20070405212528@globaldatacomm.com> The most powerful medicines for you! Wellbutrin SR - $3 - antidepressant used to treat depression. Lipothin - $35.99 - the finest lipotropic fat burner ever! Made from only the finest pharmaceutical grade botanicals, Lipothin contains a unique and highly effective formula of all-natural ingredients which will increase your heart rate, suppress your appetite, and greatly accelerate the burning of fat. Zolioft - $1.08 - a type of antidepressant known as a selective serotonin reuptake inhibitor (SSRI). and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istjohn at gescoinc.com Thu Apr 5 23:52:15 2007 From: istjohn at gescoinc.com (Whatever I. Unleashed) Date: Fri, 06 Apr 2007 02:52:15 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9970245562.20070406025215@gescoinc.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070406/788164cc/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Katy.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070406/788164cc/Katy-0001.gif From ira at gkbgroup.com Thu Apr 5 16:34:32 2007 From: ira at gkbgroup.com (Disencumber M. Halfheartedly) Date: Thu, 05 Apr 2007 19:34:32 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <4220510181.20070405193432@gkbgroup.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://waeq.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From hscubaquest at goodtms.com Thu Apr 5 20:04:25 2007 From: hscubaquest at goodtms.com (Satinwoods T. Irredeemables) Date: Fri, 06 Apr 2007 03:04:25 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4824355926.20070406030425@goodtms.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070406/128b6cf5/attachment.html From gregory at grayent.com Thu Apr 5 20:32:31 2007 From: gregory at grayent.com (Stepchild O. Moll) Date: Fri, 06 Apr 2007 03:32:31 +0000 Subject: [Vtigercrm-commits] Perfect sex? It is possible! Message-ID: <2281167989.20070406033231@grayent.com> Make your dreams come true with licensed medications from US Drug Store! Any pills at your choice. There is no need to visit your local drug store at all. http://eadqs.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From istedman at girardcp.com Thu Apr 5 20:51:32 2007 From: istedman at girardcp.com (Manatee I. Emanuel) Date: Fri, 06 Apr 2007 03:51:32 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9853921550.20070406035132@girardcp.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070406/2d9679bc/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Reggie.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070406/2d9679bc/Reggie.gif From jag at goodmancray.com Thu Apr 5 20:59:01 2007 From: jag at goodmancray.com (Churns B. Outsmarting) Date: Fri, 06 Apr 2007 03:59:01 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8980578264.20070406035901@goodmancray.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070406/e93e697a/attachment-0001.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: masturbated.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070406/e93e697a/masturbated-0001.gif From holmes at ges.com Fri Apr 6 02:06:57 2007 From: holmes at ges.com (Comestibles U. Sequoya) Date: Fri, 06 Apr 2007 05:06:57 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <2267557373.20070406050657@ges.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://eadqs.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From beatty at greatnecklibrary.org Thu Apr 5 21:18:03 2007 From: beatty at greatnecklibrary.org (Transceiver P. Ineptness) Date: Fri, 06 Apr 2007 04:18:03 +0000 Subject: [Vtigercrm-commits] Need to buy medications but don't know where? Message-ID: <6760734331.20070406041803@greatnecklibrary.org> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://eadqs.hk Verified by VISA and sell FDA Approved Drugs only! From crusherm at gofaster.com Thu Apr 5 20:53:05 2007 From: crusherm at gofaster.com (Slight J. Drunkard) Date: Thu, 05 Apr 2007 23:53:05 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9308393600.20070405235305@gofaster.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070405/fbd81f4f/attachment.htm From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 5 23:47:04 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 06 Apr 2007 06:47:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10574 - /vtigercrm/branches/5.0.3/modules/Webmails/body.php Message-ID: <20070406064704.A4C0A7D3268@vtiger.fosslabs.com> Author: richie Date: Fri Apr 6 00:47:00 2007 New Revision: 10574 Log: * Removed the loading image... label , Fixes # 3542 Modified: vtigercrm/branches/5.0.3/modules/Webmails/body.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/body.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/body.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/body.php Fri Apr 6 00:47:00 2007 @@ -101,8 +101,6 @@ { echo '
'; echo '
'; - echo $mod_strings['LBL_LOADING_IMAGE']; - echo '..........
'; echo ''; echo '
'; } From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 5 23:50:02 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 06 Apr 2007 06:50:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10575 - in /vtigercrm/branches/5.0.3/modules/Webmails: DetailView.php Webmails.php Message-ID: <20070406065002.B58187D326B@vtiger.fosslabs.com> Author: richie Date: Fri Apr 6 00:49:56 2007 New Revision: 10575 Log: * Changes made for attachment issues, Fixes #3229 Modified: vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php Fri Apr 6 00:49:56 2007 @@ -44,11 +44,14 @@ $webmail->loadMail($array_tab); echo ''; - -echo "

".$mod_strings['LBL_EMAIL_ATTACHMENTS']."

"; - -foreach($webmail->attachments as $key=>$value) { +if($webmail->has_attachments) +{ + //check for attachments + echo "

".$mod_strings['LBL_EMAIL_ATTACHMENTS']."

"; + echo "".$webmail->att_links.""; +} +/*foreach($webmail->attachments as $key=>$value) { echo ''.($key+1).') '.$value["filename"].""; -} +}*/ echo ''; ?> Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php Fri Apr 6 00:49:56 2007 @@ -423,8 +423,10 @@ $mime_type = 'multipart'; for ($i = 0; $i < count($this_part->parts); $i++) { - if ($part_no != '') - $part_no = $part_no . '.'; + if ($part_no != ''){ + if(!strpos($part_no,'.')) + $part_no = $part_no . '.'; + } // if it's an alternative, we skip the text part to only keep the HTML part if ($this_part->subtype == 'ALTERNATIVE')// && $read == true) $this->GetPart($attach_tab, $this_part->parts[++$i], $part_no . ($i + 1), $display_rfc822); @@ -648,7 +650,7 @@ { $mime = str_replace('/', '-', $tmp['mime']); if ($display_part_no == true) - $link .= $tmp['number'] . '  '; + $link .= $tmp['number']-1 . '  '; unset($att_name); $att_name_array = imap_mime_header_decode($tmp['name']); for ($i=0; $idisplay_part_no = true; if ($struct_msg->subtype != 'ALTERNATIVE' && $struct_msg->subtype != 'RELATED') { @@ -779,9 +782,11 @@ break; case 1: $link_att = ''; + $this->att_links .= $this->link_att($mail, $attach_tab, $conf->display_part_no,$ev)."
"; break; default: $link_att = ''; + $this->att_links .= $this->link_att($mail, $attach_tab, $conf->display_part_no,$ev)."
"; break; } }else From istoppedtofillmycarup at greatwindsorchairs.com Fri Apr 6 00:04:33 2007 From: istoppedtofillmycarup at greatwindsorchairs.com (Wisecracked H. Slicker) Date: Fri, 06 Apr 2007 03:04:33 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7294850051.20070406030433@greatwindsorchairs.com> The most powerful medicines for you! Diflucan - $2.64 - a tablet taken orally to treat vaginal yeast infections caused by the yeast Candida. Delay Ejaculation Pills - $139.48 - Premature ejaculation is a problem faced by men and couples for years. The new delay ejaculation pills is the answer you have to this small but devastating problem Premature ejaculation not only makes the man keep craving for more but has very bad consequences on the sexual psyche of a couple. Quick Bust - $35.99 - Get the shape and size you always wanted with natural breast enhancing capsules. and more! our site http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From shelliemills at globalservicesupply.com Thu Apr 5 22:16:54 2007 From: shelliemills at globalservicesupply.com (Abrasively T. Cranes) Date: Fri, 06 Apr 2007 01:16:54 -0400 Subject: [Vtigercrm-commits] Make your girlfriend happy. Message-ID: <1641836697.20070406011654@globalservicesupply.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://eadqs.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From extry at glassspecialist.com Fri Apr 6 01:14:43 2007 From: extry at glassspecialist.com (Minicam R. Languid) Date: Fri, 06 Apr 2007 08:14:43 +0000 Subject: [Vtigercrm-commits] Cheapest way to solve health problems. Message-ID: <4007941621.20070406081443@glassspecialist.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://eadqs.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 6 01:27:01 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 06 Apr 2007 08:27:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10576 - in /vtigercrm/branches/5.0.3: Smarty/templates/ Smarty/templates/Settings/ include/utils/ install/ modules/CustomView/ modules/Invoice/ modules/Invoice/language/ modules/Invoice/pdf_templates/ modules/Settings/ modules/Settings/language/ modules/Users/ schema/ themes/alphagrey/images/ themes/bluelagoon/images/ themes/woodspice/images/ user_privileges/ Message-ID: <20070406082702.4A00E78D200@vtiger.fosslabs.com> Author: richie Date: Fri Apr 6 02:26:21 2007 New Revision: 10576 Log: * Custom Invoice Number has been added. Now we can configure our own Custom Invoice Number Added: vtigercrm/branches/5.0.3/Smarty/templates/Settings/CustomInvoiceNo.tpl (with props) vtigercrm/branches/5.0.3/modules/Settings/CustomInvoiceNo.php (with props) vtigercrm/branches/5.0.3/modules/Users/UpdateCustomInvoiceNo.php (with props) vtigercrm/branches/5.0.3/themes/alphagrey/images/settingsInvNumber.gif (with props) vtigercrm/branches/5.0.3/themes/bluelagoon/images/settingsInvNumber.gif (with props) vtigercrm/branches/5.0.3/themes/woodspice/images/settingsInvNumber.gif (with props) vtigercrm/branches/5.0.3/user_privileges/CustomInvoiceNo.php (with props) Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl vtigercrm/branches/5.0.3/include/utils/InventoryUtils.php vtigercrm/branches/5.0.3/install/populateSeedData.php vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php vtigercrm/branches/5.0.3/modules/Invoice/EditView.php vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php vtigercrm/branches/5.0.3/modules/Invoice/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/header.php vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl Fri Apr 6 02:26:21 2007 @@ -14,7 +14,11 @@ {if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72' || $keyid eq '103'} + {if $label eq 'Invoice No'} + + {else} + {/if} {if $keyid eq '55'} {$keysalut} {*elseif $keyid eq '71' || $keyid eq '72'} Modified: vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl Fri Apr 6 02:26:21 2007 @@ -46,6 +46,11 @@ + {elseif $fldname eq 'invoice_no' && $MODULE eq 'Invoice'} + + + + {else} {/if} Modified: vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl Fri Apr 6 02:26:21 2007 @@ -181,6 +181,16 @@ {$MOD.LBL_INVENTORY_TANDC} {/if} + + + {if $smarty.request.action eq 'CustomInvoiceNo'} + {$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER} + {else} + {$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER} + {/if} + + + Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl Fri Apr 6 02:26:21 2007 @@ -490,6 +490,26 @@ + + + + + + + + + + + + + + + +
{$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER}{$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER}
{$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER_DESCRIPTION}
+ + + + Modified: vtigercrm/branches/5.0.3/include/utils/InventoryUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/InventoryUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/InventoryUtils.php Fri Apr 6 02:26:21 2007 @@ -716,4 +716,88 @@ } +/** function used to set invoice string and increment invoice id + * @param string $mode - mode should be configure_invoiceno or increment_incoiceno + * @param string $req_str - invoice string which is part of the invoice number, this may be alphanumeric characters + * @param int $req_no - This should be a number which will written in file and will be used as a next invoice number + * @return void. The invoice string and number are stored in the file CustomInvoiceNo.php so that concatenated string with number will be used as a next invoice number + */ + +function setInventoryInvoiceNumber($mode, $req_str='', $req_no='') +{ + global $root_directory; + $filename = $root_directory.'user_privileges/CustomInvoiceNo.php'; + $readhandle = fopen($filename, "r+"); + $buffer = ''; + $new_buffer = ''; + + //when we configure the invoice number in Settings this will be used + if ($mode == "configure_invoiceno" && $req_str != '' && $req_no != '') + { + + while(!feof($readhandle)) + { + $buffer = fgets($readhandle, 5200); + list($starter, $tmp) = explode(" = ", $buffer); + + if($starter == '$inv_str') + { + $new_buffer .= "\$inv_str = '".$req_str."';\n"; + } + elseif($starter == '$inv_no') + { + $new_buffer .= "\$inv_no = '".$req_no."';\n"; + } + else + $new_buffer .= $buffer; + } + } + else if ($mode == "increment_invoiceno")//when we save new invoice we will increment the invoice id and write + { + require_once('user_privileges/CustomInvoiceNo.php'); + while(!feof($readhandle)) + { + $buffer = fgets($readhandle, 5200); + list($starter, $tmp) = explode(" = ", $buffer); + + if($starter == '$inv_no') + { + //if number is 001, 002 like this (starting with zero) then when we increment 1, zeros will be striped out and result comes as 1,2, etc. So we have added 0 previously for the needed length ie., two zeros for 001, 002, etc., + //If the value is less than 0, then we assign 0 to it(to avoid error). + $strip=strlen($inv_no)-strlen($inv_no+1); + if($strip<0)$strip=0; + + $temp = str_repeat("0",$strip); + $new_buffer .= "\$inv_no = '".$temp.($inv_no+1)."';\n"; + } + else + $new_buffer .= $buffer; + + } + } + + //we have the contents in buffer. Going to write the contents in file + fclose($readhandle); + $handle = fopen($filename, "w"); + fputs($handle, $new_buffer); + fclose($handle); +} + +/** Function used to check whether the provided invoicenumber is already available or not + * @param int $invoiceno - invoice number, which we are going to check for duplicate + * @return binary true or false. If invoice number is already available then return true else return false + */ +function CheckDuplicateInvoiceNumber($invoiceno) +{ + global $adb; + $result=$adb->query("select invoice_no from vtiger_invoice where invoice_no = '".$invoiceno."'"); + $num_rows = $adb->num_rows($result); + + if($num_rows > 0) + return true; + else + return false; +} + + ?> Modified: vtigercrm/branches/5.0.3/install/populateSeedData.php ============================================================================== --- vtigercrm/branches/5.0.3/install/populateSeedData.php (original) +++ vtigercrm/branches/5.0.3/install/populateSeedData.php Fri Apr 6 02:26:21 2007 @@ -798,6 +798,7 @@ //Populate Invoice Data $isubj_array = array ("vtiger_invoice201", "zoho_inv7841", "vtiger5usrp_invoice71134", "vt100usrpk_inv113", "vendtl_inv214"); +$invoiceno_array = array ("INV2007_1","INV2007_2","INV2007_3","INV2007_4","INV2007_5"); $istatus_array = array ("Created", "Sent", "Approved" , "Credit Invoice", "Paid"); $itotal_array = array ("4842.000", "4842.000", "4842.000", "4842.000", "4842.000"); @@ -814,6 +815,7 @@ $invoice->column_fields["contactid"] = $contact_ids[$contact_key]; $rand = array_rand($num_array); $invoice->column_fields["subject"] = $isubj_array[$i]; + $invoice->column_fields["invoice_no"] = $invoiceno_array[$i]; $invoice->column_fields["invoicestatus"] = $istatus_array[$i]; $invoice->column_fields["hdnGrandTotal"] = $itotal_array[$i]; Modified: vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php Fri Apr 6 02:26:21 2007 @@ -296,7 +296,7 @@ 'vtiger_crmentity:smownerid:assigned_user_id:Emails_Sender:V', 'vtiger_activity:date_start:date_start:Emails_Date_Sent:D'), - Array('vtiger_crmentity:crmid::Invoice_Invoice_Id:I', + Array('vtiger_invoice:invoice_no:invoice_no:Invoice_invoice_no:V', 'vtiger_invoice:subject:subject:Invoice_Subject:V', 'vtiger_invoice:salesorderid:salesorder_id:Invoice_Sales_Order:I', 'vtiger_invoice:invoicestatus:invoicestatus:Invoice_Status:V', @@ -386,14 +386,16 @@ 'vtiger_purchaseorder:carrier:carrier:PurchaseOrder_Carrier:V', 'vtiger_poshipads:ship_street:ship_street:PurchaseOrder_Shipping_Address:V'), - Array( 'vtiger_invoice:subject:subject:Invoice_Subject:V', + Array( 'vtiger_invoice:invoice_no:invoice_no:Invoice_invoice_no:V', + 'vtiger_invoice:subject:subject:Invoice_Subject:V', 'vtiger_invoice:accountid:account_id:Invoice_Account_Name:I', 'vtiger_invoice:salesorderid:salesorder_id:Invoice_Sales_Order:I', 'vtiger_invoice:invoicestatus:invoicestatus:Invoice_Status:V', 'vtiger_crmentity:smownerid:assigned_user_id:Invoice_Assigned_To:V', 'vtiger_crmentity:createdtime:createdtime:Invoice_Created_Time:T'), - Array( 'vtiger_invoice:subject:subject:Invoice_Subject:V', + Array( 'vtiger_invoice:invoice_no:invoice_no:Invoice_invoice_no:V', + 'vtiger_invoice:subject:subject:Invoice_Subject:V', 'vtiger_invoice:accountid:account_id:Invoice_Account_Name:I', 'vtiger_invoice:salesorderid:salesorder_id:Invoice_Sales_Order:I', 'vtiger_invoice:invoicestatus:invoicestatus:Invoice_Status:V', Modified: vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php (original) +++ vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php Fri Apr 6 02:26:21 2007 @@ -29,7 +29,7 @@ $focus = new Invoice(); $focus->retrieve_entity_info($_REQUEST['record'],"Invoice"); $account_name = getAccountName($focus->column_fields[account_id]); - +$invoice_no = $focus->column_fields[invoice_no]; // **************** BEGIN POPULATE DATA ******************** Modified: vtigercrm/branches/5.0.3/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Invoice/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/Invoice/EditView.php Fri Apr 6 02:26:21 2007 @@ -30,6 +30,8 @@ require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); require_once('include/FormValidationUtil.php'); +//Addded for Custom Invoice Number +require_once('user_privileges/CustomInvoiceNo.php'); global $app_strings,$mod_strings,$currentModule,$log,$current_user; @@ -349,6 +351,18 @@ $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); +//Added for Custom Invoice Number +//we have check the Invoice Number for duplicate only in create view +if($focus->mode != 'edit') +{ + $invoiceno=$inv_str.$inv_no; + if(CheckDuplicateInvoiceNumber($invoiceno)) + echo '
Duplicate Invoice Number - Click here to Configure the Invoice Number'.$num_rows; + else + $smarty->assign("inv_no",($inv_str.$inv_no)); +} + + $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); $smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); Modified: vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php (original) +++ vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php Fri Apr 6 02:26:21 2007 @@ -116,6 +116,13 @@ //Based on the total Number of rows we will save the product relationship with this entity saveInventoryProductDetails(&$this, 'Invoice'); } + //Added For Custom Invoice Number + //Here we Incrementing the new InvoiceNumber + if($this->mode != 'edit') + { + setInventoryInvoiceNumber("increment_invoiceno"); + } + } Modified: vtigercrm/branches/5.0.3/modules/Invoice/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Invoice/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Invoice/language/en_us.lang.php Fri Apr 6 02:26:21 2007 @@ -182,7 +182,8 @@ 'Sent'=>'Sent', 'Credit Invoice'=>'Credit Invoice', 'Paid'=>'Paid', - +//Added to Custom Invoice Number +'invoice_no'=>'Invoice No', ); ?> Modified: vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/header.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/header.php (original) +++ vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/header.php Fri Apr 6 02:26:21 2007 @@ -69,7 +69,7 @@ // vtiger_invoice number block $invBlock=array("145","65"); -$pdf->addRecBlock($id, "Invoice Number",$invBlock); +$pdf->addRecBlock($invoice_no, "Invoice Number",$invBlock); /* ************ End Invoice Data ************************ */ Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Fri Apr 6 02:26:21 2007 @@ -907,5 +907,14 @@ 'FILESIZE_EXCEEDS_INFO' => 'Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file', 'PROBLEMS_IN_FILEUPLOAD' => 'Problems in file upload. Please try again!', +//Added fields for Invoice Number labels +'LBL_CUSTOMIZE_INVOICE_NUMBER'=>'Customize Invoice Number', +'LBL_CUSTOMIZE_INVOICE_NUMBER_DESCRIPTION'=>'Invoice Number Customization', +'LBL_CUSTOM_INVOICE_NUMBER_VIEW'=>'Invoice Number Customization', +'LBL_CUSTOMINVOICE_STRING'=>'Custom Invoice String', +'LBL_CUSTOMINVOICE_NUMBER'=>'Custom Invoice Number', +'LBL_INVOICE_NUMBER_PREVIEW'=>'Preview', +'LBL_INVOICE_NUMBER_BUTTON'=>'Update Invoice Number', + ); ?> Modified: vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php Fri Apr 6 02:26:21 2007 @@ -866,7 +866,8 @@ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'ADV')"); //Block74 $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'terms_conditions','vtiger_invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'ADV')"); - +//Added for Custom invoice Number +$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'invoice_no','vtiger_invoice',1,'1','invoice_no','invoice_no',1,0,0,100,3,69,1,'V~M',1,null,'BAS')"); //Invoice Details -- END //users Details Starts Block 79,80,81 Modified: vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml Fri Apr 6 02:26:21 2007 @@ -3999,6 +3999,10 @@ + + + + invoiceid From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 6 01:44:31 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 06 Apr 2007 08:44:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10577 - /vtigercrm/branches/5.0.3/modules/Webmails/functions.php Message-ID: <20070406084431.AEF497D3291@vtiger.fosslabs.com> Author: richie Date: Fri Apr 6 02:44:24 2007 New Revision: 10577 Log: * Commented the line which cause wrong links when we have URL in the mail body, Fixes #3245 Modified: vtigercrm/branches/5.0.3/modules/Webmails/functions.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/functions.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/functions.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/functions.php Fri Apr 6 02:44:24 2007 @@ -236,8 +236,8 @@ "']*>'si" ); $body = preg_replace($to_removed_array, '', $body); - //line added to fix #3245 - $body=preg_replace("/(http:\/\/|ftp:\/\/)([^\s,]*)/i","$1$2 target=_blank",$body ); + //this line is not needed, commented to fix #3245 + //$body=preg_replace("/(http:\/\/|ftp:\/\/)([^\s,]*)/i","$1$2 target=_blank",$body ); $body = preg_replace("|href=\"(.*)script:|i", 'href="nocc_removed_script:', $body); $body = preg_replace("|<([^>]*)java|i", ']*)&{.*}([^>]*)>|i", "<&{;}\\3>", $body); From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 6 01:52:59 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 06 Apr 2007 08:52:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10578 - in /vtigercrm/branches/5.0.3: Smarty/templates/EmailContents.tpl Smarty/templates/Emails.tpl modules/Emails/language/en_us.lang.php Message-ID: <20070406085259.5930C7DA47B@vtiger.fosslabs.com> Author: richie Date: Fri Apr 6 02:52:46 2007 New Revision: 10578 Log: * Fixed issues related to Qualify mail and to show the sent mails based on Leads, Contactas and Accounts, Fixes #3228 #3240 Modified: vtigercrm/branches/5.0.3/Smarty/templates/EmailContents.tpl vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/EmailContents.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/EmailContents.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/EmailContents.tpl Fri Apr 6 02:52:46 2007 @@ -17,16 +17,20 @@ {$LISTHEADER.1} {$LISTHEADER.2} - {foreach key=id item=row from=$LISTENTITY} - - - - - {$row.0} - {$row.1} - {$row.2} - - {/foreach} + {if $LISTENTITY != NULL} + {foreach key=id item=row from=$LISTENTITY} + + + + + {$row.0} + {$row.1} + {$row.2} + + {/foreach} + {else} + {$MOD.LBL_NO_RECORDS} + {/if}
Modified: vtigercrm/branches/5.0.3/include/js/general.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/general.js (original) +++ vtigercrm/branches/5.0.3/include/js/general.js Mon Apr 9 10:03:59 2007 @@ -2008,3 +2008,18 @@ document.location.href=url; } } + +function usernameCharValid(c) { + return ( ((c >= 'a') && (c <= 'z')) || + ((c >= 'A') && (c <= 'Z')) || + ((c >= '0') && (c <= '9')) || + (c == '.') ); +} + +function usernameValid(s) { + for (var i = 0; i < s.length; i++) { + if (!usernameCharValid(s.charAt(i))){ + return false;} + } + return true; +} From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 9 09:15:28 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Apr 2007 16:15:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10602 - /vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Message-ID: <20070409161528.88D5D7DA4E7@vtiger.fosslabs.com> Author: richie Date: Mon Apr 9 10:15:23 2007 New Revision: 10602 Log: * Added alert message for Final discount even the value is 0, Fixed #3505 Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Mon Apr 9 10:15:23 2007 @@ -1214,10 +1214,11 @@ { $finalDiscount = $focus->column_fields['hdnDiscountAmount']; $finalDiscount = getConvertedPriceFromDollar($finalDiscount); - $final_discount_info = $app_strings['LBL_FINAL_DISCOUNT_AMOUNT']." = $finalDiscount"; - } - if($final_discount_info != '') - $final_discount_info = 'onclick="alert(\''.$final_discount_info.'\');"'; + } + + //Alert the Final Discount amount even it is zero + $final_discount_info = $app_strings['LBL_FINAL_DISCOUNT_AMOUNT']." = $finalDiscount"; + $final_discount_info = 'onclick="alert(\''.$final_discount_info.'\');"'; $output .= ''; $output .= '(-) '.$app_strings['LBL_DISCOUNT'].''; From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 9 09:23:53 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Apr 2007 16:23:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10603 - in /vtigercrm/branches/5.0.3/modules/Accounts: Accounts.js AddressChange.php Message-ID: <20070409162354.17AFC7DA4FF@vtiger.fosslabs.com> Author: richie Date: Mon Apr 9 10:23:47 2007 New Revision: 10603 Log: * Fixed the issue with contact address update when we save account as non admin user, Fixed #3269 Modified: vtigercrm/branches/5.0.3/modules/Accounts/Accounts.js vtigercrm/branches/5.0.3/modules/Accounts/AddressChange.php Modified: vtigercrm/branches/5.0.3/modules/Accounts/Accounts.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Accounts/Accounts.js (original) +++ vtigercrm/branches/5.0.3/modules/Accounts/Accounts.js Mon Apr 9 10:23:47 2007 @@ -245,28 +245,40 @@ //When changing the Account Address Information it should also change the related contact address. function checkAddress(form,id) { - var bill_street = form.bill_street.value; - var ship_street = form.ship_street.value; - var bill_city = form.bill_city.value; - var ship_city = form.ship_city.value; - var bill_state = form.bill_state.value; - var ship_state = form.ship_state.value; - var bill_code = form.bill_code.value; - var ship_code = form.ship_code.value; - var bill_country= form.bill_country.value; - var ship_country= form.ship_country.value; - var bill_pobox = form.bill_pobox.value; - var ship_pobox = form.ship_pobox.value; - - - var url = "bill_street="+bill_street+"&ship_street="+ship_street+"&bill_city="+bill_city+"&ship_city="+ship_city+"&bill_state="+bill_state+"&ship_state="+ship_state+"&bill_code="+bill_code+"&ship_code="+ship_code+"&bill_country="+bill_country+"&ship_country="+ship_country+"&bill_pobox="+bill_pobox+"&ship_pobox="+ship_pobox+"&record="+id; + var url=''; + if(typeof(form.bill_street) != 'undefined') + url +="&bill_street="+form.bill_street.value; + if(typeof(form.ship_street) != 'undefined') + url +="&ship_street="+form.ship_street.value; + if(typeof(form.bill_city) != 'undefined') + url +="&bill_city="+form.bill_city.value; + if(typeof(form.ship_city) != 'undefined') + url +="&ship_city="+form.ship_city.value; + if(typeof(form.bill_state) != 'undefined') + url +="&bill_state="+form.bill_state.value; + if(typeof(form.ship_state) != 'undefined') + url +="&ship_state="+form.ship_state.value; + if(typeof(form.bill_code) != 'undefined') + url +="&bill_code="+ form.bill_code.value; + if(typeof(form.ship_code) != 'undefined') + url +="&ship_code="+ form.ship_code.value; + if(typeof(form.bill_country) != 'undefined') + url +="&bill_country="+form.bill_country.value; + if(typeof(form.ship_country) != 'undefined') + url +="&ship_country="+form.ship_country.value; + if(typeof(form.bill_pobox) != 'undefined') + url +="&bill_pobox="+ form.bill_pobox.value; + if(typeof(form.ship_pobox) != 'undefined') + url +="&ship_pobox="+ form.ship_pobox.value; + + url +="&record="+id; $("status").style.display="inline"; new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody:"module=Accounts&action=AccountsAjax&ajax=true&file=AddressChange&"+url, + postBody:"module=Accounts&action=AccountsAjax&ajax=true&file=AddressChange"+url, onComplete: function(response) { if(response.responseText == 'address_change') { Modified: vtigercrm/branches/5.0.3/modules/Accounts/AddressChange.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Accounts/AddressChange.php (original) +++ vtigercrm/branches/5.0.3/modules/Accounts/AddressChange.php Mon Apr 9 10:23:47 2007 @@ -23,7 +23,18 @@ $result = $adb->query($sql); $value = $adb->fetch_row($result); -if(($_REQUEST['bill_city'] != $value['billingcity']) || $_REQUEST['bill_street'] != $value['billingstreet'] || $_REQUEST['bill_country']!=$value['billingcountry'] || $_REQUEST['bill_code']!=$value['billingcode'] || $_REQUEST['bill_pobox']!=$value['billingpobox'] || $_REQUEST['bill_state']!=$value['billingstate'] || $_REQUEST['ship_country']!=$value['country'] || $_REQUEST['ship_city']!=$value['city'] || $_REQUEST['ship_state']!=$value['state'] || $_REQUEST['ship_code']!=$value['code'] || $_REQUEST['ship_street']!=$value['street'] || $_REQUEST['ship_pobox']!=$value['pobox'] ) +if(($_REQUEST['bill_city'] != $value['billingcity'] && isset($_REQUEST['bill_city'])) || + ($_REQUEST['bill_street'] != $value['billingstreet'] && isset($_REQUEST['bill_street'])) || + ($_REQUEST['bill_country']!=$value['billingcountry'] && isset($_REQUEST['bill_country']))|| + ($_REQUEST['bill_code']!=$value['billingcode'] && isset($_REQUEST['bill_code']))|| + ($_REQUEST['bill_pobox']!=$value['billingpobox'] && isset($_REQUEST['bill_pobox'])) || + ($_REQUEST['bill_state']!=$value['billingstate'] && isset($_REQUEST['bill_state']))|| + ($_REQUEST['ship_country']!=$value['country'] && isset($_REQUEST['ship_country']))|| + ($_REQUEST['ship_city']!=$value['city'] && isset($_REQUEST['ship_city']))|| + ($_REQUEST['ship_state']!=$value['state'] && isset($_REQUEST['ship_state']))|| + ($_REQUEST['ship_code']!=$value['code'] && isset($_REQUEST['ship_code']))|| + ($_REQUEST['ship_street']!=$value['street'] && isset($_REQUEST['ship_street']))|| + ($_REQUEST['ship_pobox']!=$value['pobox'] && isset($_REQUEST['ship_pobox']))) { $sql1="select contactid from vtiger_contactdetails where accountid=".$record; $result1 = $adb->query($sql1); From pumppatrol at gmbooks.com Mon Apr 9 10:21:04 2007 From: pumppatrol at gmbooks.com (Tanzania Q. Emphasized) Date: Mon, 09 Apr 2007 17:21:04 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1694475416.20070409172104@gmbooks.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070409/b72be95d/attachment.htm From istbm at globaltrademark.com Mon Apr 9 10:57:45 2007 From: istbm at globaltrademark.com (Frill U. Baudelaire) Date: Mon, 09 Apr 2007 17:57:45 +0000 Subject: [Vtigercrm-commits] On-line generic store Message-ID: <7749563015.20070409175745@globaltrademark.com> The most powerful medicines for you! Diflucan - $2.64 - a tablet taken orally to treat vaginal yeast infections caused by the yeast Candida. Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. and more! our site http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From qqqga at golfalot.com Mon Apr 9 16:22:06 2007 From: qqqga at golfalot.com (Daryl C. Misspelt) Date: Mon, 09 Apr 2007 19:22:06 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5280322627.20070409192206@golfalot.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070409/c417330a/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: brooking.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070409/c417330a/brooking-0001.gif From istack at godivala.force9.net Mon Apr 9 11:42:06 2007 From: istack at godivala.force9.net (Peremptorily F. Aerier) Date: Mon, 09 Apr 2007 18:42:06 +0000 Subject: [Vtigercrm-commits] Pharmacy for real men! Message-ID: <3687328443.20070409184206@godivala.force9.net> The most powerful medicines for you! Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. Horny Goat Weed - $35.99 - Epimedium is a genus of twenty-one related plant species. It boosts libido (sex drive), increases energy levels and enhances recovery from exercise. Cumpills - are a great concept formulated by our highly trained speclalists working in the field of natural therapy. Using the knowledge of thousands of years of cumulative research in herbals, this specially designed formula helps in achieving high levels of semen volume and quality. and more! our site http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From slscc.l at ginalivingston.com Mon Apr 9 10:01:43 2007 From: slscc.l at ginalivingston.com (Linnet O. Fright) Date: Mon, 09 Apr 2007 13:01:43 -0400 Subject: [Vtigercrm-commits] All medications to cure yourself! Message-ID: <1773034251.20070409130143@ginalivingston.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://eadqs.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From istanboule at gonsal.e.telefonica.net Mon Apr 9 13:38:14 2007 From: istanboule at gonsal.e.telefonica.net (Courtney Gross) Date: Mon, 09 Apr 2007 20:38:14 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <1780652167.20070409203814@gonsal.e.telefonica.net> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070409/94e35c53/attachment.html From jsa at gongyeon.com Mon Apr 9 12:05:38 2007 From: jsa at gongyeon.com (Nonpluses L. Processor) Date: Mon, 09 Apr 2007 15:05:38 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1790750638.20070409150538@gongyeon.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070409/06dca50e/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: crackling.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070409/06dca50e/crackling.gif From jasmine at gkp.co.uk Mon Apr 9 19:30:45 2007 From: jasmine at gkp.co.uk (Succulents G. Kennedy) Date: Mon, 09 Apr 2007 22:30:45 -0400 Subject: [Vtigercrm-commits] Looking for perfect sex? Message-ID: <5333099511.20070409223045@gkp.co.uk> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://eadqs.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From county at gettford.com Mon Apr 9 15:03:59 2007 From: county at gettford.com (Herminia T. Downhills) Date: Mon, 09 Apr 2007 18:03:59 -0400 Subject: [Vtigercrm-commits] No doctor appointment is necessary Message-ID: <1300783809.20070409180359@gettford.com> The most powerful medicines for you! Suregasm - $35.99 - Achieve stronger and more powerful orgasms with this all-natural female sexual stimulant. Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Nymphomax - $35.99 - Helps women to achieve multiple and more powerful orgasms with this unique female sexual stimulant. and more! our site http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From pierre at griskon.com Mon Apr 9 15:33:51 2007 From: pierre at griskon.com (Basel G. Cuff) Date: Mon, 09 Apr 2007 22:33:51 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9974637475.20070409223351@griskon.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070409/14035152/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: onset.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070409/14035152/onset-0001.gif From crushhhh at gibsonandassociates.net Mon Apr 9 18:02:51 2007 From: crushhhh at gibsonandassociates.net (Vocabularies J. Blastoff) Date: Tue, 10 Apr 2007 01:02:51 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8029004110.20070410010251@gibsonandassociates.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/04e683ca/attachment.html From lajj at greenimagellc.com Tue Apr 10 00:04:18 2007 From: lajj at greenimagellc.com (Gift P. Lubber) Date: Tue, 10 Apr 2007 03:04:18 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8851979208.20070410030418@greenimagellc.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/56c5db9a/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Warren.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/56c5db9a/Warren.gif From extremeusa at gpventures.com Mon Apr 9 19:31:17 2007 From: extremeusa at gpventures.com (Shades U. Embarrassing) Date: Tue, 10 Apr 2007 02:31:17 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8480605760.20070410023117@gpventures.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/6e94b342/attachment.htm From major at grakonet.com Mon Apr 9 17:27:02 2007 From: major at grakonet.com (Enticements I. Illustrations) Date: Mon, 09 Apr 2007 20:27:02 -0400 Subject: [Vtigercrm-commits] Worry about your erection? Message-ID: <4853555634.20070409202702@grakonet.com> Make your dreams come true with licensed medications from US Drug Store! Any pills at your choice. There is no need to visit your local drug store at all. http://eadqs.hk Verified by VISA and sell FDA Approved Drugs only! From nicholas at gideonwiseman.com Tue Apr 10 01:52:22 2007 From: nicholas at gideonwiseman.com (Covering J. Turkmenistan) Date: Tue, 10 Apr 2007 04:52:22 -0400 Subject: [Vtigercrm-commits] Disappointed with your sexual health? Message-ID: <1719945615.20070410045222@gideonwiseman.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://eadqs.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From nancy at goldensextant.com Mon Apr 9 18:48:30 2007 From: nancy at goldensextant.com (Bray I. Interlarded) Date: Mon, 09 Apr 2007 21:48:30 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <6368971473.20070409214830@goldensextant.com> The most powerful medicines for you! 100% Pure Okinawan Coral Calcium - $35.99 - the preferred source for readily absorbable and accessible calcium in the body. Superior 100% pure coral calcium is harvested from Okinawa, Japan – home to the longest-lived people on earth. Horny Goat Weed - $35.99 - Epimedium is a genus of twenty-one related plant species. It boosts libido (sex drive), increases energy levels and enhances recovery from exercise. Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. and more! our site http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 9 21:54:18 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 04:54:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10604 - in /vtigercrm/branches/5.0.3: include/js/en_us.lang.js modules/Calendar/ListView.php modules/Calendar/calendarLayout.php modules/Calendar/language/en_us.lang.php modules/Calendar/script.js Message-ID: <20070410045418.C824F7C8062@vtiger.fosslabs.com> Author: richie Date: Mon Apr 9 22:54:08 2007 New Revision: 10604 Log: fix for calendar related issues. Fixes #3460 #3438 Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js vtigercrm/branches/5.0.3/modules/Calendar/ListView.php vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Calendar/script.js Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Mon Apr 9 22:54:08 2007 @@ -105,5 +105,6 @@ LESS_OR_EQUALS:'less or equal', GREATER_OR_EQUALS:'greater or equal', - NO_SPECIAL_CHARS:'Special Characters are not allowed in Invoice String' + NO_SPECIAL_CHARS:'Special Characters are not allowed in Invoice String', + SHARED_EVENT_DEL_MSG:'The User does not have permission to Delete this record.' }; Modified: vtigercrm/branches/5.0.3/modules/Calendar/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/ListView.php Mon Apr 9 22:54:08 2007 @@ -56,7 +56,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR",$mod_strings["SHARED_EVENT_DEL_MSG"]); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php Mon Apr 9 22:54:08 2007 @@ -1052,11 +1052,12 @@ $recurring = ' '; $height = $rowspan * 75; $javacript_str = ''; + $idShared = "normal"; if($act[$i]->shared) $idShared = "shared"; /*if($eventstatus != 'Held') {*/ if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") $javacript_str = 'onMouseOver="cal_show(\''.$arrow_img_name.'\');" onMouseOut="fnHide_Event(\''.$arrow_img_name.'\');"'; - $action_str = ''; + $action_str = ''; /*} else { @@ -1128,6 +1129,7 @@ $user = $act[$i]->owner; $priority = $act[$i]->priority; $image = $cal['IMAGE_PATH'].''.$act[$i]->image_name; + $idShared = "normal"; if($act[$i]->shared) $idShared = "shared"; if($act[$i]->recurring) $recurring = ''; else @@ -1135,7 +1137,7 @@ $color = $act[$i]->color; if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") $javacript_str = 'onMouseOver="cal_show(\''.$arrow_img_name.'\');" onMouseOut="fnHide_Event(\''.$arrow_img_name.'\');"'; - $action_str = ''; + $action_str = ''; $eventlayer .='
@@ -1240,7 +1242,7 @@ require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); $cal_log->debug("Entering getEventList() method..."); $shared_ids = getSharedCalendarId($current_user->id); - $query = "SELECT vtiger_groups.groupname, vtiger_users.user_name, + $query = "SELECT vtiger_groups.groupname, vtiger_users.user_name,vtiger_crmentity.smownerid, vtiger_activity.* FROM vtiger_activity INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_activity.activityid @@ -1254,8 +1256,8 @@ ON vtiger_recurringevents.activityid = vtiger_activity.activityid WHERE vtiger_crmentity.deleted = 0 AND (vtiger_activity.activitytype = 'Meeting' OR vtiger_activity.activitytype = 'Call') - AND (vtiger_activity.date_start BETWEEN '".$start_date."' AND '".$end_date."' - OR vtiger_recurringevents.recurringdate BETWEEN '".$start_date."' AND '".$end_date."') "; + AND (((vtiger_activity.date_start between '".$start_date."' AND '".$end_date."') OR (vtiger_activity.due_date between '". $start_date."' AND '".$end_date."') OR (vtiger_activity.date_start<'".$start_date."' and vtiger_activity.due_date>'".$end_date."') AND (vtiger_recurringevents.recurringdate is NULL)) + OR (vtiger_recurringevents.recurringdate BETWEEN '".$start_date."' AND '".$end_date."')) "; if($info != '') { $com_q = " AND vtiger_crmentity.smownerid = ".$current_user->id." @@ -1295,22 +1297,27 @@ $value = getaddEventPopupTime($start_time,$end_time,$format); $start_hour = $value['starthour'].':'.$value['startmin'].''.$value['startfmt']; $end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt']; - if($calendar['view'] == 'day') - { - $element['starttime'] = $start_hour; - $element['endtime'] = $end_hour; - } - else - { - $date_start = $adb->query_result($result,$i,"date_start"); - $due_date = $adb->query_result($result,$i,"due_date"); - $element['starttime'] = getDisplayDate($date_start).' '.$start_hour; - $element['endtime'] = getDisplayDate($due_date).' '.$end_hour; - } + $date_start = $adb->query_result($result,$i,"date_start"); + $due_date = $adb->query_result($result,$i,"due_date"); + $element['starttime'] = getDisplayDate($date_start).' '.$start_hour; + $element['endtime'] = getDisplayDate($due_date).' '.$end_hour; $contact_id = $adb->query_result($result,$i,"contactid"); $id = $adb->query_result($result,$i,"activityid"); $subject = $adb->query_result($result,$i,"subject"); $eventstatus = $adb->query_result($result,$i,"eventstatus"); + $assignedto = $adb->query_result($result,$i,"user_name"); + $userid = $adb->query_result($result,$i,"smownerid"); + $idShared = "normal"; + if(!empty($assignedto) && $userid != $current_user->id && $adb->query_result($result,$i,"visibility") == "Public") + { + $que = "select * from vtiger_sharedcalendar where sharedid=".$current_user->id." and userid=".$userid; + $row = $adb->query($que); + $no = $adb->getRowCount($row); + if($no > 0) $idShared = "shared"; + else $idShared = "normal"; + + + } if(strlen($subject)>25) $subject = substr($subject,0,25)."..."; if($contact_id != '') @@ -1328,9 +1335,8 @@ $element['eventdetail'] = $contact_data." ".$subject." ".$more_link; $element['relatedto']= getRelatedTo('Calendar',$result,$i); if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete")=="yes") - $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"event\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; + $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->get_formatted_date()."\",\"event\",\"".$idShared."\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; $element['status'] = $mod_strings[$adb->query_result($result,$i,"eventstatus")]; - $assignedto = $adb->query_result($result,$i,"user_name"); if(!empty($assignedto)) $element['assignedto'] = $assignedto; else @@ -1439,7 +1445,7 @@ $element['task_contact'] = "".$contact_name.""; $element['status'] = $adb->query_result($result,$i,"status"); if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") - $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"todo\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; + $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->get_formatted_date()."\",\"todo\",\"normal\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; $assignedto = $adb->query_result($result,$i,"user_name"); if(!empty($assignedto)) $element['assignedto'] = $assignedto; @@ -1502,17 +1508,8 @@ $endtemp_date = (($date_format == 'dd-mm-yyyy')?(date('d-m-Y',$endtemp_ts)):(($date_format== 'mm-dd-yyyy')?(date('m-d-Y',$endtemp_ts)):(($date_format == 'yyyy-mm-dd')?(date('Y-m-d', $endtemp_ts)):('')))); } $list_view = ""; - if($cal['view'] == 'day') - { - $start_datetime = $mod_strings['LBL_START_TIME']; - $end_datetime = $mod_strings['LBL_END_TIME']; - } - else - { - $start_datetime = $app_strings['LBL_START_DATE_TIME']; - $end_datetime = $app_strings['LBL_END_DATE_TIME']; - - } + $start_datetime = $app_strings['LBL_START_DATE_TIME']; + $end_datetime = $app_strings['LBL_END_DATE_TIME']; //Events listview header labels $header = Array('0'=>'#', '1'=>$start_datetime, Modified: vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Mon Apr 9 22:54:08 2007 @@ -412,6 +412,7 @@ 'End date'=>'End date', 'LBL_SET_DATE'=>'Set date..', 'Recurrence'=>'Recurrence', +'SHARED_EVENT_DEL_MSG'=>'The User does not have permission to Delete this record.', ); Modified: vtigercrm/branches/5.0.3/modules/Calendar/script.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/script.js (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/script.js Mon Apr 9 22:54:08 2007 @@ -809,13 +809,17 @@ } } -function getcalAction(obj,Lay,id,view,hour,day,month,year,type){ +function getcalAction(obj,Lay,id,view,hour,dateVal,type,isShared){ var tagName = document.getElementById(Lay); var leftSide = findPosX(obj); var topSide = findPosY(obj); var maxW = tagName.style.width; var widthM = maxW.substring(0,maxW.length-2); var getVal = eval(leftSide) + eval(widthM); + var vtDate = dateVal.split("-"); + var day = parseInt(vtDate[2],10); + var month = parseInt(vtDate[1],10); + var year = parseInt(vtDate[0],10); if(getVal > window.innerWidth ){ leftSide = eval(leftSide) - eval(widthM); tagName.style.left = leftSide + 'px'; @@ -860,7 +864,14 @@ if(complete) complete.href="javascript:updateStatus("+id+",'"+heldstatus+"','"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; if(pending) pending.href="javascript:updateStatus("+id+",'"+notheldstatus+"','"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; if(postpone) postpone.href="index.php?module=Calendar&action=EditView&record="+id+"&activity_mode="+activity_mode; - if(actdelete) actdelete.href="javascript:delActivity("+id+",'"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; + if(isShared == "shared") + { + if(actdelete) actdelete.href="javascript:alert('"+alert_arr.SHARED_EVENT_DEL_MSG+"')"; + } + else + { + if(actdelete) actdelete.href="javascript:delActivity("+id+",'"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; + } if(changeowner) changeowner.href="javascript:dispLayer('act_changeowner');"; } From bbassett at glacierbaytravel.com Mon Apr 9 22:02:52 2007 From: bbassett at glacierbaytravel.com (Anemic I. Beebe) Date: Tue, 10 Apr 2007 01:02:52 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8995938453.20070410010252@glacierbaytravel.com> The most powerful medicines for you! Cumpills - are a great concept formulated by our highly trained speclalists working in the field of natural therapy. Using the knowledge of thousands of years of cumulative research in herbals, this specially designed formula helps in achieving high levels of semen volume and quality. Horny Goat Weed - $35.99 - Epimedium is a genus of twenty-one related plant species. It boosts libido (sex drive), increases energy levels and enhances recovery from exercise. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. and more! our site http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From gardenhome at gordon-eng.com Mon Apr 9 22:03:58 2007 From: gardenhome at gordon-eng.com (Greenhouses O. Gallop) Date: Tue, 10 Apr 2007 01:03:58 -0400 Subject: [Vtigercrm-commits] No doctor appointment is necessary Message-ID: <5864884604.20070410010358@gordon-eng.com> The most powerful medicines for you! Diflucan - $2.64 - a tablet taken orally to treat vaginal yeast infections caused by the yeast Candida. Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. Lasix - $0.53 - a loop diuretic used to treat high blood pressure, congestive heart failure, and swelling due to excess body water. and more! our site http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 9 22:37:37 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 05:37:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10605 - in /vtigercrm/branches/5.0.3/Smarty/templates: AuditTrailList.tpl DefModuleView.tpl Settings/Announcements.tpl Settings/BackupServerContents.tpl Settings/CompanyInfo.tpl Settings/EmailConfig.tpl Settings/ProxyServer.tpl Message-ID: <20070410053737.027047DA50A@vtiger.fosslabs.com> Author: richie Date: Mon Apr 9 23:37:25 2007 New Revision: 10605 Log: fix for Can remove the link. Fixes #3580 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/AuditTrailList.tpl vtigercrm/branches/5.0.3/Smarty/templates/DefModuleView.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings/Announcements.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings/BackupServerContents.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings/CompanyInfo.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailConfig.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/AuditTrailList.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/AuditTrailList.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/AuditTrailList.tpl Mon Apr 9 23:37:25 2007 @@ -82,11 +82,11 @@
- + Modified: vtigercrm/branches/5.0.3/Smarty/templates/DefModuleView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DefModuleView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DefModuleView.tpl Mon Apr 9 23:37:25 2007 @@ -72,11 +72,11 @@
- + Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/Announcements.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/Announcements.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/Announcements.tpl Mon Apr 9 23:37:25 2007 @@ -77,9 +77,9 @@
- +
Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/BackupServerContents.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/BackupServerContents.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/BackupServerContents.tpl Mon Apr 9 23:37:25 2007 @@ -59,8 +59,8 @@ - + Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/CompanyInfo.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/CompanyInfo.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/CompanyInfo.tpl Mon Apr 9 23:37:25 2007 @@ -96,11 +96,11 @@
- +
Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailConfig.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailConfig.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailConfig.tpl Mon Apr 9 23:37:25 2007 @@ -132,11 +132,11 @@ - +
Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl Mon Apr 9 23:37:25 2007 @@ -116,11 +116,11 @@ - +
From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 9 22:48:07 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 05:48:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10606 - /vtigercrm/branches/5.0.3/modules/Emails/mail.php Message-ID: <20070410054807.829FB78D2FC@vtiger.fosslabs.com> Author: richie Date: Mon Apr 9 23:47:59 2007 New Revision: 10606 Log: fix for Signature comes two time. Fixes #3623 --minnie Modified: vtigercrm/branches/5.0.3/modules/Emails/mail.php Modified: vtigercrm/branches/5.0.3/modules/Emails/mail.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/mail.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/mail.php Mon Apr 9 23:47:59 2007 @@ -41,8 +41,8 @@ //if module is HelpDesk then from_email will come based on support email id if($from_email == '')//$module != 'HelpDesk') $from_email = getUserEmailId('user_name',$from_name); - - $contents = addSignature($contents,$from_name); + if($module != "Calendar") + $contents = addSignature($contents,$from_name); $mail = new PHPMailer(); From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 9 22:56:48 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 05:56:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10607 - /vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php Message-ID: <20070410055648.7888F7C8062@vtiger.fosslabs.com> Author: richie Date: Mon Apr 9 23:56:40 2007 New Revision: 10607 Log: fix for Calendar: Deleted contact name has been showed in calendar list view,detail view and edit view. Fixes #3520 --minnie Modified: vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php Mon Apr 9 23:56:40 2007 @@ -63,18 +63,33 @@ case Contacts: if($return_module == 'Accounts') { - $sql = 'update vtiger_contactdetails set accountid = "" where contactid = '.$record; - $adb->query($sql); - } - if($return_module == 'Potentials' && $record != '' && $return_id != '') + $sql = 'update vtiger_contactdetails set accountid = null where contactid = '.$record; + $adb->query($sql); + } + elseif($return_module == 'Potentials' && $record != '' && $return_id != '') { $sql = 'delete from vtiger_contpotentialrel where contactid='.$record.' and potentialid='.$return_id; $adb->query($sql); } - if($return_module == "Campaigns") { + elseif($return_module == "Campaigns") { $sql = 'delete from vtiger_campaigncontrel where contactid='.$record.' and campaignid='.$return_id; $adb->query($sql); } + elseif($return_module == 'Products')//Delete Contact from Product relatedlist + { + $sql = "delete from vtiger_seproductsrel where crmid=$record and productid=$return_id"; + $adb->query($sql); + } + elseif($return_module == 'Vendors') + { + $sql = "delete from vtiger_vendorcontactrel where vendorid=$return_id and contactid=$record"; + $adb->query($sql); + } + else + { + $sql = "delete from vtiger_cntactivityrel where contactid=".$record; + $adb->query($sql); + } if($record != '' && $return_id != '') { $sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id; @@ -82,41 +97,36 @@ $sql_recentviewed ='delete from vtiger_tracker where user_id = '.$current_user->id.' and item_id = '.$record; $adb->query($sql_recentviewed); } - if($return_module == 'Products')//Delete Contact from Product relatedlist - { - $sql = "delete from vtiger_seproductsrel where crmid=$record and productid=$return_id"; - $adb->query($sql); - } - if($return_module == 'Vendors') - { - $sql = "delete from vtiger_vendorcontactrel where vendorid=$return_id and contactid=$record"; - $adb->query($sql); - } - if($return_module == 'Calendar') - { - $sql = "delete from vtiger_cntactivityrel where activityid=$return_id and contactid=$record"; - $adb->query($sql); - } break; case Potentials: - if($return_module == 'Accounts' || $return_module == 'Campaigns') + if($return_module == 'Accounts') { //we can call $focus->mark_deleted($record) $sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$record; $adb->query($sql); - } - if($return_module == 'Products')//Delete Potential from Product relatedlist + $sql ='delete from vtiger_seactivityrel where crmid = '.$record; + $adb->query($sql); + } + elseif($return_module == 'Campaigns') + { + $sql = 'update vtiger_potential set campaignid = null where potentialid = '.$record; + $adb->query($sql); + } + elseif($return_module == 'Products')//Delete Potential from Product relatedlist { $sql = "delete from vtiger_seproductsrel where crmid=$record and productid=$return_id"; $adb->query($sql); } - if($return_module == 'Contacts') + elseif($return_module == 'Contacts') { $sql = "delete from vtiger_contpotentialrel where potentialid=$record and contactid=$return_id"; $adb->query($sql); } - $sql ='delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id; - $adb->query($sql); + else + { + $sql ='delete from vtiger_seactivityrel where crmid = '.$record; + $adb->query($sql); + } break; case Calendar: if($return_module == 'Contacts') From hamilton at grandvinltd.com Mon Apr 9 23:10:34 2007 From: hamilton at grandvinltd.com (Trent E. Curtseyed) Date: Tue, 10 Apr 2007 06:10:34 +0000 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <2480708008.20070410061034@grandvinltd.com> The most powerful medicines for you! Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. Quick Bust - $35.99 - Get the shape and size you always wanted with natural breast enhancing capsules. Allegra - $1.32 - an antihistamine that comes in a variety of strengths and formulations to provide relief from a wide range of seasonal allergy symptoms. and more! our site http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 9 23:11:39 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 06:11:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10608 - in /vtigercrmoutlook/trunk/vtigercrmoladdin/source: frmLogin.frm modvtigerUtils.bas vtigeroladdin.vbw Message-ID: <20070410061139.04EA97DA50A@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Apr 10 00:11:22 2007 New Revision: 10608 Log: A constant VTIGER_VERSION has been added to check the version compatibility with the server Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmLogin.frm vtigercrmoutlook/trunk/vtigercrmoladdin/source/modvtigerUtils.bas vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbw Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmLogin.frm ============================================================================== Binary files - no diff available. Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/modvtigerUtils.bas ============================================================================== Binary files - no diff available. Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbw ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 9 23:28:01 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 06:28:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10609 - /vtigercrm/branches/5.0.3/soap/vtigerolservice.php Message-ID: <20070410062801.4B67C7DA4FF@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Apr 10 00:27:53 2007 New Revision: 10609 Log: version field has been added to the login function to check the version compatibility between vtiger and outlook plugin Modified: vtigercrm/branches/5.0.3/soap/vtigerolservice.php Modified: vtigercrm/branches/5.0.3/soap/vtigerolservice.php ============================================================================== --- vtigercrm/branches/5.0.3/soap/vtigerolservice.php (original) +++ vtigercrm/branches/5.0.3/soap/vtigerolservice.php Tue Apr 10 00:27:53 2007 @@ -360,11 +360,18 @@ } } -function LoginToVtiger($userid,$password) -{ +function LoginToVtiger($userid,$password,$version) +{ + global $log; global $adb; + $log->DEBUG("Entered into vtigerCRM with userid".$userid." and Version".$version); + require_once('vtigerversion.php'); + if($version != $vtiger_current_version) + { + $log->DEBUG("outlook plugin version is not compatible with the vtigerCRM"); + return "VERSION"; + } require_once('modules/Users/Users.php'); - $return_access = "FALSE"; $objuser = new Users(); @@ -375,16 +382,17 @@ $objuser->load_user($password); if($objuser->is_authenticated()) { - $return_access = "TRUE"; + $return_access = "TRUES"; }else { - $return_access = "FALSE"; + $return_access = "LOGIN"; } }else { //$server->setError("Invalid username and/or password"); $return_access = "FALSE"; } +$log->DEBUG("The return access to outlook was ".$return_access." from vtigerCRM"); $objuser = $objuser; return $return_access; } From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 00:13:27 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 07:13:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10610 - /vtigercrm/branches/5.0.3/modules/Users/lookupemailtemplates.php Message-ID: <20070410071327.903177DA513@vtiger.fosslabs.com> Author: richie Date: Tue Apr 10 01:13:19 2007 New Revision: 10610 Log: fix for Personal - Email template visible to all. Fixes #3463 --minnie Modified: vtigercrm/branches/5.0.3/modules/Users/lookupemailtemplates.php Modified: vtigercrm/branches/5.0.3/modules/Users/lookupemailtemplates.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/lookupemailtemplates.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/lookupemailtemplates.php Tue Apr 10 01:13:19 2007 @@ -13,9 +13,8 @@ require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -global $theme; +global $theme,$current_user; $theme_path="themes/".$theme."/"; - ?> @@ -39,16 +38,32 @@ $sql = "select * from vtiger_emailtemplates order by templateid desc"; $result = $adb->query($sql); $temprow = $adb->fetch_array($result); + $cnt=1; require_once('include/utils/UserInfoUtil.php'); +require('user_privileges/user_privileges_'.$current_user->id.'.php'); do { - printf(" "); - $templatename = $temprow["templatename"]; - echo "".$temprow["templatename"].""; - printf("%s",$temprow["description"]); - $cnt++; + $templatename = $temprow["templatename"]; + if($is_admin == false) + { + $folderName = $temprow['foldername']; + if($folderName != 'Personal') + { + printf(" "); + echo "".$temprow["templatename"].""; + printf("%s",$temprow["description"]); + } + } + else + { + printf(" "); + echo "".$temprow["templatename"].""; + printf("%s",$temprow["description"]); + } + $cnt++; + }while($temprow = $adb->fetch_array($result)); ?> From hh at greystarproductions.com Tue Apr 10 00:29:52 2007 From: hh at greystarproductions.com (Mountain E. Semitrailer) Date: Tue, 10 Apr 2007 07:29:52 +0000 Subject: [Vtigercrm-commits] U won't believe! Message-ID: <5840326738.20070410072952@greystarproductions.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://eadqs.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 00:49:53 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 07:49:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10611 - in /vtigercrm/branches/5.0.3/include: language/en_us.lang.php utils/ListViewUtils.php Message-ID: <20070410074953.9ADB17DA50D@vtiger.fosslabs.com> Author: richie Date: Tue Apr 10 01:49:43 2007 New Revision: 10611 Log: fix for i18n issues. Fixes #3285 #3645 #3569 #3283 #3281 Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Tue Apr 10 01:49:43 2007 @@ -675,7 +675,7 @@ 'Reminder' => '[Reminder:', 'Visit_Link' => 'Kindly visit the link for more details on the activity', 'Click here' => 'Click here', -'Subject' => 'Subject:', +'Subject' => 'Subject', 'Support_starting' => 'Support starting', 'Congratulations' => 'Congratulations! Your support starts from today', 'Hello_Support' => 'Hello! Support Starts for', @@ -843,6 +843,9 @@ 'LBL_SKYPE'=>'Skype', 'LBL_FIND'=>'Find', 'LBL_CLEAR'=>'Clear', + +// Added for display the label of Invoice no +'invoice no'=>'invoice no', ); $app_list_strings = array ( Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Tue Apr 10 01:49:43 2007 @@ -1005,13 +1005,14 @@ function getValue($field_result, $list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,$mode,$popuptype,$returnset='',$viewid='') { - global $log,$app_strings; + global $log,$app_strings,$current_language; $log->debug("Entering getValue(".$field_result.",". $list_result.",".$fieldname.",".$focus.",".$module.",".$entity_id.",".$list_result_count.",".$mode.",".$popuptype.",".$returnset.",".$viewid.") method ..."); global $adb,$current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); $tabname = getParentTab(); $tabid = getTabid($module); + $current_module_strings = return_module_language($current_language, $module); $uicolarr=$field_result[$fieldname]; foreach($uicolarr as $key=>$value) { @@ -1080,6 +1081,22 @@ }*/ + } + elseif($uitype == 15 || $uitype == 111 || $uitype == 16) + { + $temp_val = $adb->query_result($list_result,$list_result_count,$colname); + if($current_module_strings[$temp_val] != '') + { + $value = $current_module_strings[$temp_val]; + } + elseif($app_strings[$temp_val] != '') + { + $value = $app_strings[$temp_val]; + } + else + { + $value = $temp_val; + } } elseif($uitype == 71 || $uitype == 72) { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 01:02:36 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 08:02:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10612 - in /vtigercrm/branches/5.0.3: Smarty/templates/ImportStep1.tpl include/js/en_us.lang.js include/js/general.js modules/Users/Forms.php Message-ID: <20070410080236.B4E407DA50D@vtiger.fosslabs.com> Author: richie Date: Tue Apr 10 02:02:25 2007 New Revision: 10612 Log: * Validation has been added in file selection of Import Step1, Fixed #3366 Modified: vtigercrm/branches/5.0.3/Smarty/templates/ImportStep1.tpl vtigercrm/branches/5.0.3/include/js/en_us.lang.js vtigercrm/branches/5.0.3/include/js/general.js vtigercrm/branches/5.0.3/modules/Users/Forms.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/ImportStep1.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ImportStep1.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ImportStep1.tpl Tue Apr 10 02:02:25 2007 @@ -12,7 +12,29 @@ + {include file='Buttons_List1.tpl'} @@ -86,7 +108,7 @@   - +   Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Tue Apr 10 02:02:25 2007 @@ -106,5 +106,6 @@ GREATER_OR_EQUALS:'greater or equal', NO_SPECIAL_CHARS:'Special Characters are not allowed in Invoice String', - SHARED_EVENT_DEL_MSG:'The User does not have permission to Delete this record.' + SHARED_EVENT_DEL_MSG:'The User does not have permission to Delete this record.', + PLS_SELECT_VALID_FILE:'Please select a file with the following extension:\n' }; Modified: vtigercrm/branches/5.0.3/include/js/general.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/general.js (original) +++ vtigercrm/branches/5.0.3/include/js/general.js Tue Apr 10 02:02:25 2007 @@ -768,7 +768,7 @@ if (getObj(fieldname[i]) != null && getObj(fieldname[i]).value.replace(/^\s+/g, '').replace(/\s+$/g, '').length!=0) { if (type[1]=="M") - if (!emptyCheck(type[2],fieldlabel[i],getObj(type[2]).type)) + if (!emptyCheck(fieldname[2],fieldlabel[i],getObj(type[2]).type)) return false if(typeof(type[3])=="undefined") var currdatechk="OTH" @@ -2023,3 +2023,35 @@ } return true; } + +/** Check Upload file is in specified format(extension). + * @param fldname -- name of the file field + * @param fldLabel -- Lable of the file field + * @param filter -- List of file extensions to allow. each extension must be seperated with a | sybmol. + * Example: upload_filter("imagename","Image", "jpg|gif|bmp|png") + * @returns true -- if the extension is IN specified extension. + * @returns false -- if the extension is NOT IN specified extension. + * + * NOTE: If this field is mandatory, please call emptyCheck() function before calling this function. + */ + +function upload_filter(fldName, filter) +{ + var currObj=getObj(fldName) + if(currObj.value !="") + { + var file=currObj.value; + var type=file.split("."); + var valid_extn=filter.split("|"); + + if(valid_extn.indexOf(type[type.length-1]) == -1) + { + alert(alert_arr.PLS_SELECT_VALID_FILE+valid_extn) + currObj.focus(); + return false; + } + } + return true + +} + Modified: vtigercrm/branches/5.0.3/modules/Users/Forms.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/Forms.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/Forms.php Tue Apr 10 02:02:25 2007 @@ -41,7 +41,6 @@ $err_missing_required_fields = $app_strings['ERR_MISSING_REQUIRED_FIELDS']; $err_invalid_email_address = $app_strings['ERR_INVALID_EMAIL_ADDRESS']; $lbl_user_image=$mod_strings['User Image']; -$err_select_valid_image = $app_strings['SELECT_VALID_IMAGE']; $the_emailid = $app_strings['THE_EMAILID']; $email_field_is = $app_strings['EMAIL_FILED_IS'].$err_invalid_email_address; $other_email_field_is = $app_strings['OTHER_EMAIL_FILED_IS'].$err_invalid_email_address; @@ -116,22 +115,13 @@ exit(); } -// fix for new user upload image validation - if (trim(form.imagename.value) != "") - { - var valimg=form.imagename.value; - var aUpload=valimg.split("."); - if((aUpload[aUpload.length-1]!="jpg") && (aUpload[aUpload.length-1]!="gif") && (aUpload[aUpload.length-1]!="bmp") && (aUpload[aUpload.length-1]!="png")) - { - alert("$err_select_valid_image"); - form.imagename.focus(); exit(); - - } - - } - + if(! upload_filter("imagename", "jpg|gif|bmp|png") ) + { + form.imagename.focus(); + return false; + } if(form.mode.value != 'edit') From istetter at gologan.de Tue Apr 10 01:55:52 2007 From: istetter at gologan.de (Binning C. Freakier) Date: Tue, 10 Apr 2007 08:55:52 +0000 Subject: [Vtigercrm-commits] Don't know where to buy pills? Message-ID: <4126992108.20070410085552@gologan.de> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://eadqs.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 02:43:40 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 09:43:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10613 - in /vtigercrm/branches/5.0.3: include/RelatedListView.php modules/HelpDesk/ListView.php modules/Quotes/ListView.php Message-ID: <20070410094340.B7C7B78D54D@vtiger.fosslabs.com> Author: richie Date: Tue Apr 10 03:43:30 2007 New Revision: 10613 Log: * Fixed the sorting - assigned to, Fixed #3411 Modified: vtigercrm/branches/5.0.3/include/RelatedListView.php vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php vtigercrm/branches/5.0.3/modules/Quotes/ListView.php Modified: vtigercrm/branches/5.0.3/include/RelatedListView.php ============================================================================== --- vtigercrm/branches/5.0.3/include/RelatedListView.php (original) +++ vtigercrm/branches/5.0.3/include/RelatedListView.php Tue Apr 10 03:43:30 2007 @@ -139,7 +139,7 @@ $query_order_by = $order_by; if($order_by == 'smownerid') { - $query_order_by = 'user_name'; + $query_order_by = "case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end "; } $query .= ' ORDER BY '.$query_order_by.' '.$sorder; $url_qry .="&order_by=".$order_by; Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php Tue Apr 10 03:43:30 2007 @@ -135,7 +135,7 @@ { if( $adb->dbType == "pgsql") $list_query .= ' GROUP BY vtiger_users.user_name'; - $list_query .= ' ORDER BY vtiger_users.user_name '.$sorder; + $list_query .= " ORDER BY case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end ".$sorder; } else { Modified: vtigercrm/branches/5.0.3/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Quotes/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Quotes/ListView.php Tue Apr 10 03:43:30 2007 @@ -128,7 +128,7 @@ { if($order_by == 'smownerid') { - $query .= ' ORDER BY vtiger_users.user_name '.$sorder; + $query .= " ORDER BY case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end ".$sorder; } else { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 02:45:27 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 09:45:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10614 - /vtigercrmoutlook/trunk/vtigercrmoladdin/source/modvtigerSoap.bas Message-ID: <20070410094527.0FF1D7C7FD3@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Apr 10 03:45:16 2007 New Revision: 10614 Log: version field has been added to the login function to check the version compatibility between vtiger and outlook plugin Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/modvtigerSoap.bas Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/modvtigerSoap.bas ============================================================================== Binary files - no diff available. From extrememat at gravatar.com Tue Apr 10 03:02:54 2007 From: extrememat at gravatar.com (Kristen Cardenas) Date: Tue, 10 Apr 2007 10:02:54 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <7167348077.20070410100254@gravatar.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/9465a5f1/attachment.html From isthumper at goldensafe.com Tue Apr 10 08:31:58 2007 From: isthumper at goldensafe.com (Fossil P. Vainer) Date: Tue, 10 Apr 2007 11:31:58 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8140336730.20070410113158@goldensafe.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/28024544/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Antigone.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/28024544/Antigone-0001.gif From istdjpiyujmo at giambanco.net Tue Apr 10 00:48:56 2007 From: istdjpiyujmo at giambanco.net (Taskmasters Q. Stream) Date: Tue, 10 Apr 2007 03:48:56 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <0655733396.20070410034856@giambanco.net> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://eadqs.hk any pill you need! Absolutely Confidential and Secure purchase From istherejustice at gopusa.com Tue Apr 10 08:51:22 2007 From: istherejustice at gopusa.com (Casanova D. Remembrance) Date: Tue, 10 Apr 2007 11:51:22 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <0993387445.20070410115122@gopusa.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://eadqs.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From wlenox at graye.net Tue Apr 10 06:06:15 2007 From: wlenox at graye.net (Ceremonies C. Wronging) Date: Tue, 10 Apr 2007 13:06:15 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1294852484.20070410130615@graye.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/7ce8d92e/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: centime.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/7ce8d92e/centime.gif From nathan.diehl at graywolfcomputers.com Tue Apr 10 06:31:33 2007 From: nathan.diehl at graywolfcomputers.com (Demonstrate R. Bardeen) Date: Tue, 10 Apr 2007 13:31:33 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4733106550.20070410133133@graywolfcomputers.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/791ab563/attachment.html From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 07:51:11 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 14:51:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10615 - in /vtigercrm/branches/5.0.3: Smarty/templates/UserEditView.tpl include/js/en_us.lang.js Message-ID: <20070410145111.EC6037DA52C@vtiger.fosslabs.com> Author: richie Date: Tue Apr 10 08:51:05 2007 New Revision: 10615 Log: * Fixed the i18n issue Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl vtigercrm/branches/5.0.3/include/js/en_us.lang.js Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl Tue Apr 10 08:51:05 2007 @@ -50,7 +50,7 @@ ); {rdelim} else - alert("Please Enter Character & Numerical Values"); + alert(alert_arr.NO_SPECIAL+" in User Name ") {rdelim} Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Tue Apr 10 08:51:05 2007 @@ -107,5 +107,6 @@ NO_SPECIAL_CHARS:'Special Characters are not allowed in Invoice String', SHARED_EVENT_DEL_MSG:'The User does not have permission to Delete this record.', - PLS_SELECT_VALID_FILE:'Please select a file with the following extension:\n' + PLS_SELECT_VALID_FILE:'Please select a file with the following extension:\n', + NO_SPECIAL:'Special Characters are not allowed' }; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 07:53:28 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 14:53:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10616 - /vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Message-ID: <20070410145328.7E3767DA529@vtiger.fosslabs.com> Author: richie Date: Tue Apr 10 08:53:23 2007 New Revision: 10616 Log: * Fixed the issue in PO/SO/Quotes/Invoice editview - NAN error when we don't have values for discount, Fixed #3486 Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Tue Apr 10 08:53:23 2007 @@ -1482,6 +1482,11 @@ $discount_amount=$adb->query_result($result,$i-1,'discount_amount'); $discountTotal = '0.00'; //Based on the discount percent or amount we will show the discount details + + //To avoid NaN javascript error, here we assign 0 initially to' %of price' and 'Direct Price reduction'(for Each Product) + $product_Detail[$i]['discount_percent'.$i] = 0; + $product_Detail[$i]['discount_amount'.$i] = 0; + if($discount_percent != 'NULL' && $discount_percent != '') { $product_Detail[$i]['discount_type'.$i] = "percentage"; @@ -1567,6 +1572,10 @@ $discountPercent = ($focus->column_fields['hdnDiscountPercent'] != '')?$focus->column_fields['hdnDiscountPercent']:'0.00'; $discountAmount = ($focus->column_fields['hdnDiscountAmount'] != '')?$focus->column_fields['hdnDiscountAmount']:'0.00'; + +//To avoid NaN javascript error, here we assign 0 initially to' %of price' and 'Direct Price reduction'(For Final Discount) + $product_Detail[1]['final_details']['discount_percentage_final'] = 0; + $product_Detail[1]['final_details']['discount_amount_final'] = 0; if($focus->column_fields['hdnDiscountPercent'] != '') { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 08:00:57 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 15:00:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10617 - in /vtigercrm/branches/5.0.3/include/js: Inventory.js en_us.lang.js Message-ID: <20070410150057.F1C3F7DA552@vtiger.fosslabs.com> Author: richie Date: Tue Apr 10 09:00:49 2007 New Revision: 10617 Log: * Validation has been done for group tax and S&H tax, Fixed #3336#3536 Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js vtigercrm/branches/5.0.3/include/js/en_us.lang.js Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/Inventory.js (original) +++ vtigercrm/branches/5.0.3/include/js/Inventory.js Tue Apr 10 09:00:49 2007 @@ -290,8 +290,40 @@ alert(alert_arr.VALID_ADJUSTMENT); return false; } - - return true + + //Group - Tax Validation - not allow negative values + //We need to validate group tax only if taxtype is group. + var taxtype=document.getElementById("taxtype").value; + if(taxtype=="group") + { + var tax_count=document.getElementById("group_tax_count").value; + for(var i=1;i<=tax_count;i++) + { + + temp = /^(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("group_tax_percentage"+i).value); + if(!temp) + { + alert(alert_arr.VALID_TAX_PERCENT); + return false; + } + } + } + + //Taxes for Shippring and Handling validation - not allow negative values + var shtax_count=document.getElementById("sh_tax_count").value; + for(var i=1;i<=shtax_count;i++) + { + + temp = /^(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("sh_tax_percentage"+i).value); + if(!temp) + { + alert(alert_arr.VALID_SH_TAX); + return false; + } + } + + + return true; } function FindDuplicate() Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Tue Apr 10 09:00:49 2007 @@ -108,5 +108,7 @@ NO_SPECIAL_CHARS:'Special Characters are not allowed in Invoice String', SHARED_EVENT_DEL_MSG:'The User does not have permission to Delete this record.', PLS_SELECT_VALID_FILE:'Please select a file with the following extension:\n', - NO_SPECIAL:'Special Characters are not allowed' + NO_SPECIAL:'Special Characters are not allowed', + VALID_TAX_PERCENT:'Enter a valid Tax percentage', + VALID_SH_TAX:'Enter valid Taxes for shipping and handling ', }; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 08:02:30 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 15:02:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10618 - in /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Campaigns/ Message-ID: <20070410150231.1194F7C8017@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 10 09:02:20 2007 New Revision: 10618 Log: fix for Leads CustView - Set as Default affects in Campaigns RelatedList also. Fixes #3063 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl vtigercrm/branches/5.0.3/Smarty/templates/RelatedListNew.tpl vtigercrm/branches/5.0.3/Smarty/templates/RelatedLists.tpl vtigercrm/branches/5.0.3/modules/Campaigns/CallRelatedList.php vtigercrm/branches/5.0.3/modules/Campaigns/DetailView.php vtigercrm/branches/5.0.3/modules/Campaigns/LoadList.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl Tue Apr 10 09:02:20 2007 @@ -64,7 +64,7 @@ {/if} {elseif $header eq 'Leads'} {if $MODULE eq 'Campaigns'} - {$LEADCVCOMBO} + {$LEADCVCOMBO} {/if} {if $MODULE eq 'Products'} @@ -83,7 +83,7 @@   {elseif $MODULE eq 'Campaigns'} - {$CONTCVCOMBO} + {$CONTCVCOMBO} {elseif $MODULE eq 'Products'} Modified: vtigercrm/branches/5.0.3/Smarty/templates/RelatedListNew.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/RelatedListNew.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/RelatedListNew.tpl Tue Apr 10 09:02:20 2007 @@ -51,11 +51,22 @@ {/literal} function loadCvList(type,id) {ldelim} + $("status").style.display="inline"; if(type === 'Leads') {ldelim} if($("lead_cv_list").value != 'None') {ldelim} - $("lead_list_button").innerHTML = ''; + new Ajax.Request( + 'index.php', + {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim}, + method: 'post', + postBody: 'module=Campaigns&action=CampaignsAjax&file=LoadList&ajax=true&return_action=DetailView&return_id='+id+'&list_type='+type+'&cvid='+$("lead_cv_list").value, + onComplete: function(response) {ldelim} + $("status").style.display="none"; + $("RLContents").innerHTML= response.responseText; + {rdelim} + {rdelim} + ); {rdelim} {rdelim} @@ -63,7 +74,17 @@ {ldelim} if($("cont_cv_list").value != 'None') {ldelim} - $("contact_list_button").innerHTML = ''; + new Ajax.Request( + 'index.php', + {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim}, + method: 'post', + postBody: 'module=Campaigns&action=CampaignsAjax&file=LoadList&ajax=true&return_action=DetailView&return_id='+id+'&list_type='+type+'&cvid='+$("cont_cv_list").value, + onComplete: function(response) {ldelim} + $("status").style.display="none"; + $("RLContents").innerHTML= response.responseText; + {rdelim} + {rdelim} + ); {rdelim} {rdelim} {rdelim} Modified: vtigercrm/branches/5.0.3/Smarty/templates/RelatedLists.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/RelatedLists.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/RelatedLists.tpl Tue Apr 10 09:02:20 2007 @@ -51,21 +51,41 @@ {/literal} function loadCvList(type,id) {ldelim} - if(type === 'Leads') - {ldelim} - if($("lead_cv_list").value != 'None') - {ldelim} - $("lead_list_button").innerHTML = ''; + $("status").style.display="inline"; + if(type === 'Leads') + {ldelim} + if($("lead_cv_list").value != 'None') + {ldelim} + new Ajax.Request( + 'index.php', + {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim}, + method: 'post', + postBody: 'module=Campaigns&action=CampaignsAjax&file=LoadList&ajax=true&return_action=DetailView&return_id='+id+'&list_type='+type+'&cvid='+$("lead_cv_list").value, + onComplete: function(response) {ldelim} + $("status").style.display="none"; + $("RLContents").innerHTML= response.responseText; + {rdelim} + {rdelim} + ); + {rdelim} + {rdelim} + if(type === 'Contacts') + {ldelim} + if($("cont_cv_list").value != 'None') + {ldelim} + new Ajax.Request( + 'index.php', + {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim}, + method: 'post', + postBody: 'module=Campaigns&action=CampaignsAjax&file=LoadList&ajax=true&return_action=DetailView&return_id='+id+'&list_type='+type+'&cvid='+$("cont_cv_list").value, + onComplete: function(response) {ldelim} + $("status").style.display="none"; + $("RLContents").innerHTML= response.responseText; + {rdelim} + {rdelim} + ); {rdelim} - {rdelim} - - if(type === 'Contacts') - {ldelim} - if($("cont_cv_list").value !='None') - {ldelim} - $("contact_list_button").innerHTML = ''; - {rdelim} - {rdelim} + {rdelim} {rdelim} {include file='Buttons_List1.tpl'} Modified: vtigercrm/branches/5.0.3/modules/Campaigns/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Campaigns/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.3/modules/Campaigns/CallRelatedList.php Tue Apr 10 09:02:20 2007 @@ -12,7 +12,6 @@ require_once('Smarty_setup.php'); require_once('modules/Campaigns/Campaigns.php'); -require_once('modules/CustomView/CustomView.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -38,7 +37,7 @@ } global $mod_strings; -global $app_strings; +global $app_strings,$adb; global $theme; global $currentModule; $theme_path="themes/".$theme."/"; @@ -57,13 +56,29 @@ $related_array=getRelatedLists($currentModule,$focus); $smarty->assign("RELATEDLISTS", $related_array); -$cvObj = new CustomView("Contacts"); -$cvcombo = $cvObj->getCustomViewCombo(); -$smarty->assign("CONTCVCOMBO",""); +/* To get Contacts CustomView -START */ +$sql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype where vtiger_tab.tabid=".getTabid('Contacts'); +$result = $adb->query($sql); +$chtml = ""; +$smarty->assign("CONTCVCOMBO",$chtml); +/* To get Contacts CustomView -END */ -$cvObj = new CustomView("Leads"); -$cvcombo = $cvObj->getCustomViewCombo(); -$smarty->assign("LEADCVCOMBO",""); +/* To get Leads CustomView -START */ +$sql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype where vtiger_tab.tabid=".getTabid('Leads'); +$result = $adb->query($sql); +$lhtml = ""; +$smarty->assign("LEADCVCOMBO",$lhtml); +/* To get Leads CustomView -END */ $category = getParentTab(); $smarty->assign("CATEGORY",$category); @@ -79,6 +94,9 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); -$smarty->display("RelatedLists.tpl"); +if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '') + $smarty->display("RelatedListContents.tpl"); +else + $smarty->display("RelatedLists.tpl"); } ?> Modified: vtigercrm/branches/5.0.3/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Campaigns/DetailView.php (original) +++ vtigercrm/branches/5.0.3/modules/Campaigns/DetailView.php Tue Apr 10 09:02:20 2007 @@ -12,7 +12,6 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once('modules/Campaigns/Campaigns.php'); -require_once('modules/CustomView/CustomView.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -29,7 +28,7 @@ { $focus->id = ""; } -global $app_strings,$mod_strings,$theme,$currentModule,$default_module_view; +global $app_strings,$mod_strings,$theme,$currentModule,$default_module_view,$adb; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -76,13 +75,30 @@ { $related_array = getRelatedLists($currentModule,$focus); $smarty->assign("RELATEDLISTS", $related_array); - $cvObj = new CustomView("Contacts"); - $cvcombo = $cvObj->getCustomViewCombo(); - $smarty->assign("CONTCVCOMBO",""); + /* To get Contacts CustomView -START */ + $sql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype where vtiger_tab.tabid=".getTabid('Contacts'); + $result = $adb->query($sql); + $chtml = ""; + $smarty->assign("CONTCVCOMBO",$chtml); + /* To get Contacts CustomView -END */ + + /* To get Leads CustomView -START */ + $sql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype where vtiger_tab.tabid=".getTabid('Leads'); + $result = $adb->query($sql); + $lhtml = ""; + $smarty->assign("LEADCVCOMBO",$lhtml); + /* To get Leads CustomView -END */ - $cvObj = new CustomView("Leads"); - $cvcombo = $cvObj->getCustomViewCombo(); - $smarty->assign("LEADCVCOMBO",""); } $smarty->assign("SinglePane_View", $singlepane_view); Modified: vtigercrm/branches/5.0.3/modules/Campaigns/LoadList.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Campaigns/LoadList.php (original) +++ vtigercrm/branches/5.0.3/modules/Campaigns/LoadList.php Tue Apr 10 09:02:20 2007 @@ -28,24 +28,6 @@ $adb->query("INSERT INTO ".$reltable." VALUES('".$_REQUEST["return_id"]."','".$row["crmid"]."')"); } -if ($singlepane_view == 'true') -{ +header("Location: index.php?module=Campaigns&action=CampaignsAjax&file=CallRelatedList&ajax=true&record=".$_REQUEST['return_id']); + ?> - - - - From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 08:03:11 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 15:03:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10619 - /vtigercrm/branches/5.0.3/soap/vtigerolservice.php Message-ID: <20070410150311.E90947C8017@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 10 09:03:07 2007 New Revision: 10619 Log: version compatability fixed in outlook plugin Modified: vtigercrm/branches/5.0.3/soap/vtigerolservice.php Modified: vtigercrm/branches/5.0.3/soap/vtigerolservice.php ============================================================================== --- vtigercrm/branches/5.0.3/soap/vtigerolservice.php (original) +++ vtigercrm/branches/5.0.3/soap/vtigerolservice.php Tue Apr 10 09:03:07 2007 @@ -365,17 +365,14 @@ global $log; global $adb; $log->DEBUG("Entered into vtigerCRM with userid".$userid." and Version".$version); - require_once('vtigerversion.php'); + include('vtigerversion.php'); if($version != $vtiger_current_version) { - $log->DEBUG("outlook plugin version is not compatible with the vtigerCRM"); return "VERSION"; - } + } require_once('modules/Users/Users.php'); $return_access = "FALSE"; - $objuser = new Users(); - if($password != "") { $objuser->column_fields['user_name'] = $userid; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 08:08:01 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 15:08:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10620 - /vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl Message-ID: <20070410150801.07BF67DA556@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 10 09:07:56 2007 New Revision: 10620 Log: fix for Calendar : search combo box is not carrying the header list -- non admin. Fixes #3530 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl Tue Apr 10 09:07:56 2007 @@ -140,18 +140,22 @@ -{/if} - - - - - - - - - +{**} + + + + + +
+ + + + + +
+
+
+ + {include file='SetMenu.tpl'} + + + + + + + + + + + {if $EMODE eq 'edit'} + + {else} + + {/if} + + + + + +
{$MOD.LBL_MODULE_NAME}{$MOD.LBL_SETTINGS} > {$UMOD.LBL_EMAIL_TEMPLATES} > {$MOD.LBL_EDIT} "{$TEMPLATENAME}" {$MOD.LBL_SETTINGS} > {$UMOD.LBL_EMAIL_TEMPLATES} > {$MOD.LBL_CREATE_EMAIL_TEMPLATES}
{$UMOD.LBL_EMAIL_TEMPLATE_DESC}
+ +
+ + + + +
+ + + + {if $EMODE eq 'edit'} + + {else} + + {/if} + + +
{$UMOD.LBL_PROPERTIES} "{$TEMPLATENAME}" {$MOD.LBL_CREATE_EMAIL_TEMPLATES} +    + {if $EMODE eq 'edit'} + + {else} + + {/if} +
+ + + + + + + + + + + + + + + + + + + +
*{$UMOD.LBL_NAME} 
{$UMOD.LBL_DESCRIPTION} + +
{$UMOD.LBL_FOLDER} + {if $EMODE eq 'edit'} + + {else} + + {/if} + +
+ + + + +
+ + + + + + + + + + + + +
{$UMOD.LBL_EMAIL_TEMPLATE}
*{$UMOD.LBL_SUBJECT} + +
{$UMOD.LBL_MESSAGE}

+ 		+ + + + + + + + + + + + + + + +
{$UMOD.LBL_MERGE_FIELDS}
+ {$UMOD.LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT}
{$UMOD.LBL_STEP} 1. {$UMOD.LBL_SELECT_FIELD_TYPE}
{$UMOD.LBL_STEP} 2. {$UMOD.LBL_SELECT_FIELD}
{$UMOD.LBL_STEP} 3. {$UMOD.LBL_COPY_PASTE}
+
+ + + + +
{$MOD.LBL_SCROLL}
+
+ + + +
+ + + + + +
+ + + + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/CreateProfile.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/CreateProfile.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/CreateProfile.tpl Mon Apr 16 12:27:44 2007 @@ -20,8 +20,8 @@
{include file='SetMenu.tpl'} -
- + + @@ -32,7 +32,7 @@ - + @@ -125,7 +125,7 @@ @@ -144,7 +144,7 @@

 

{$MOD.LBL_PROFILES} {$MOD.LBL_SETTINGS} > {$CMOD.LBL_PROFILE_PRIVILEGES} {$MOD.LBL_SETTINGS} > {$CMOD.LBL_PROFILE_PRIVILEGES}
{$MOD.LBL_PROFILE_DESCRIPTION}
 
-    +   
- +
Scroll to Top
{$APP.LBL_SCROLL}
@@ -173,6 +173,7 @@ - + - - - Modified: vtigercrm/branches/5.1_jens/Smarty/templates/CreateWordTemplate.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/CreateWordTemplate.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/CreateWordTemplate.tpl Mon Apr 16 12:27:44 2007 @@ -1,100 +1,100 @@ -{**} - -
- - - - - -
-
-
- - {include file='SetMenu.tpl'} - - - - - - - - - - - - - - - -
Users{$MOD.LBL_SETTINGS} > {$UMOD.LBL_WORD_TEMPLATES} > {$UMOD.LBL_NEW_TEMPLATE}
{$MOD.LBL_MAIL_MERGE_DESC}
- -
- - - - -
- - - - - - -
{$UMOD.LBL_NEW_TEMPLATE}
{$ERRORFLAG}
 -   -   -
- - - - - - - - - - - - - - -
*{$UMOD.LBL_NEW} {$UMOD.LBL_TEMPLATE_FILE} - -
{$UMOD.LBL_DESCRIPTION}
{$UMOD.LBL_MODULENAMES} - -
- - - - -
[Scroll to Top]
-
- - - -
- - -
- -
- - - - - +{**} + +
+ + + + + +
+
+
+ + {include file='SetMenu.tpl'} + + + + + + + + + + + + + + + +
{$MOD.LBL_MODULE_NAME}{$MOD.LBL_SETTINGS} > {$UMOD.LBL_WORD_TEMPLATES} > {$UMOD.LBL_NEW_TEMPLATE}
{$MOD.LBL_MAIL_MERGE_DESC}
+ +
+ + + + +
+ + + + + + +
{$UMOD.LBL_NEW_TEMPLATE}
{$ERRORFLAG}
 +   +   +
+ + + + + + + + + + + + + + +
*{$UMOD.LBL_NEW} {$UMOD.LBL_TEMPLATE_FILE} + +
{$UMOD.LBL_DESCRIPTION}
{$UMOD.LBL_MODULENAMES} + +
+ + + + +
{$APP.LBL_SCROLL}
+
+ + + +
+ + + + +
+ + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/CurrencyDetailView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/CurrencyDetailView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/CurrencyDetailView.tpl Mon Apr 16 12:27:44 2007 @@ -27,7 +27,7 @@ - Users + {$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_CURRENCY_SETTINGS} > {$MOD.LBL_VIEWING} "{$CURRENCY_NAME}" Modified: vtigercrm/branches/5.1_jens/Smarty/templates/CurrencyEditView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/CurrencyEditView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/CurrencyEditView.tpl Mon Apr 16 12:27:44 2007 @@ -27,7 +27,7 @@ - Users + {$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_CURRENCY_SETTINGS} > {if $ID neq ''} {$MOD.LBL_EDIT} "{$CURRENCY_NAME}" @@ -131,8 +131,10 @@ if(isNaN(getObj("conversion_rate").value) || eval(getObj("conversion_rate") .value) == 0) { - alert("Enter valid Conversion Rate") + {/literal} + alert("{$APP.ENTER_VALID_CONVERSION_RATE}") return false + {literal} } return true; Modified: vtigercrm/branches/5.1_jens/Smarty/templates/CurrencyListView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/CurrencyListView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/CurrencyListView.tpl Mon Apr 16 12:27:44 2007 @@ -28,7 +28,7 @@ - Users + {$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_CURRENCY_SETTINGS} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/CustomFieldList.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/CustomFieldList.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/CustomFieldList.tpl Mon Apr 16 12:27:44 2007 @@ -29,7 +29,9 @@ {literal} function deleteCustomField(id, fld_module, colName, uitype) { - if(confirm("Are you sure?")) + {/literal} + if(confirm("{$APP.ARE_YOU_SURE}")) + {literal} { document.form.action="index.php?module=Settings&action=DeleteCustomField&fld_module="+fld_module+"&fld_id="+id+"&colName="+colName+"&uitype="+uitype document.form.submit() @@ -88,7 +90,7 @@ - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/CustomFieldMapping.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/CustomFieldMapping.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/CustomFieldMapping.tpl Mon Apr 16 12:27:44 2007 @@ -21,7 +21,7 @@
Users{$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_CUSTOM_FIELD_SETTINGS}
- + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/CustomView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/CustomView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/CustomView.tpl Mon Apr 16 12:27:44 2007 @@ -92,7 +92,7 @@ {rdelim} if(mandatorycheck == false) {ldelim} - alert("Must have one Required field to be selected\n"+showvalues); + alert("{$APP.MUSTHAVE_ONE_REQUIREDFIELD}"+showvalues); {rdelim} return false; @@ -146,7 +146,18 @@ {foreach item=filteroption key=label from=$CHOOSECOLUMN1} {foreach item=text from=$filteroption} - + {assign var=option_values value=$text.text} + {/foreach} {/foreach} {$CHOOSECOLUMN1} @@ -156,7 +167,18 @@ {foreach item=filteroption key=label from=$CHOOSECOLUMN2} {foreach item=text from=$filteroption} - + {assign var=option_values value=$text.text} + {/foreach} {/foreach} {$CHOOSECOLUMN2} @@ -166,7 +188,18 @@ {foreach item=filteroption key=label from=$CHOOSECOLUMN3} {foreach item=text from=$filteroption} - + {assign var=option_values value=$text.text} + {/foreach} {/foreach} {$CHOOSECOLUMN3} @@ -176,7 +209,18 @@ {foreach item=filteroption key=label from=$CHOOSECOLUMN4} {foreach item=text from=$filteroption} - + {assign var=option_values value=$text.text} + {/foreach} {/foreach} {$CHOOSECOLUMN4} @@ -189,7 +233,18 @@ {foreach item=filteroption key=label from=$CHOOSECOLUMN5} {foreach item=text from=$filteroption} - + {assign var=option_values value=$text.text} + {/foreach} {/foreach} {$CHOOSECOLUMN5} @@ -199,7 +254,18 @@ {foreach item=filteroption key=label from=$CHOOSECOLUMN6} {foreach item=text from=$filteroption} - + {assign var=option_values value=$text.text} + {/foreach} {/foreach} {$CHOOSECOLUMN6} @@ -209,7 +275,18 @@ {foreach item=filteroption key=label from=$CHOOSECOLUMN7} {foreach item=text from=$filteroption} - + {assign var=option_values value=$text.text} + {/foreach} {/foreach} {$CHOOSECOLUMN7} @@ -219,7 +296,18 @@ {foreach item=filteroption key=label from=$CHOOSECOLUMN8} {foreach item=text from=$filteroption} - + {assign var=option_values value=$text.text} + {/foreach} {/foreach} {$CHOOSECOLUMN8} @@ -231,7 +319,18 @@ {foreach item=filteroption key=label from=$CHOOSECOLUMN9} {foreach item=text from=$filteroption} - + {assign var=option_values value=$text.text} + {/foreach} {/foreach} {$CHOOSECOLUMN9} @@ -469,6 +568,8 @@
Users{$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_CUSTOM_FIELD_SETTINGS}
 
+ + {$STDFILTER_JAVASCRIPT} {$JAVASCRIPT} @@ -507,9 +608,11 @@ selected_cv_icolumnvalue = $(cvselect_array[iloop]).options[$(cvselect_array[iloop]).selectedIndex].value; if(selected_cv_columnvalue == selected_cv_icolumnvalue) { - alert('Columns cannot be duplicated'); - $(cvselect_array[iloop]).selectedIndex = 0; - return false; + {/literal} + alert('{$APP.COLUMNS_CANNOT_BE_DUPLICATED}'); + $(cvselect_array[iloop]).selectedIndex = 0; + return false; + {literal} } } Modified: vtigercrm/branches/5.1_jens/Smarty/templates/DefModuleView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/DefModuleView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/DefModuleView.tpl Mon Apr 16 12:27:44 2007 @@ -72,11 +72,11 @@ - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/DeleteRole.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/DeleteRole.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/DeleteRole.tpl Mon Apr 16 12:27:44 2007 @@ -83,8 +83,10 @@ { if(document.getElementById('role_name').value == '') { - alert('Specfiy the Role to Transfer Existing Roles Users'); - return false; + {/literal} + alert('{$APP.SPECIFY_ROLE_INFO}'); + return false; + {literal} } return true; } Modified: vtigercrm/branches/5.1_jens/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/DetailView.tpl Mon Apr 16 12:27:44 2007 @@ -11,7 +11,7 @@ ********************************************************************************/ -->*} - + @@ -27,7 +27,7 @@
+ Modified: vtigercrm/branches/5.1_jens/Smarty/templates/EditProfile.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/EditProfile.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/EditProfile.tpl Mon Apr 16 12:27:44 2007 @@ -45,7 +45,7 @@
- + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/EditViewHidden.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/EditViewHidden.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/EditViewHidden.tpl Mon Apr 16 12:27:44 2007 @@ -58,11 +58,8 @@ -{elseif $MODULE eq 'Accounts' || $MODULE eq 'Faq' || $MODULE eq 'PriceBooks' || $MODULE eq 'Vendors' || $MODULE eq 'OrgUnit'} +{elseif $MODULE eq 'Accounts' || $MODULE eq 'Faq' || $MODULE eq 'PriceBooks' || $MODULE eq 'Vendors'} - -{elseif $MODULE eq 'Organization'} - {elseif $MODULE eq 'Notes'} @@ -79,6 +76,9 @@ +{else} + {$ERROR_MESSAGE} + {/if} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/EmailContents.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/EmailContents.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/EmailContents.tpl Mon Apr 16 12:27:44 2007 @@ -17,16 +17,20 @@ - {foreach key=id item=row from=$LISTENTITY} - - - - - - - {/foreach} + {if $LISTENTITY != NULL} + {foreach key=id item=row from=$LISTENTITY} + + + + + + + {/foreach} + {else} + + {/if}
{$MOD.LBL_PROFILES}{$MOD.LBL_SETTINGS} > {$CMOD.LBL_PROFILE_PRIVILEGES} > {$CMOD.LBL_VIEWING} "{$PROFILE_NAME}"{$MOD.LBL_SETTINGS} > {$CMOD.LBL_PROFILE_PRIVILEGES} > {$CMOD.LBL_VIEWING} "{$PROFILE_NAME}"
{$CMOD.LBL_PROFILE_MESG} "{$PROFILE_NAME}"
{$LISTHEADER.1} {$LISTHEADER.2}
- -{$row.0}{$row.1}{$row.2}
+ + {$row.0}{$row.1}{$row.2}
{$MOD.LBL_NO_RECORDS}
- + {foreach item=row from=$BLOCKS} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/EmailDetails.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/EmailDetails.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/EmailDetails.tpl Mon Apr 16 12:27:44 2007 @@ -1,84 +1,86 @@ -{**} -
- - - - - -
 
+ + + + +
{$MOD.LBL_DETAILVIEW_EMAIL}
+
- - - - - - -
- - - {if $BLOCKS neq ''} - - - {else} - - {/if} - -
-   - {if $EMAIL_FLAG neq 'WEBMAIL'} -   - {else} -   - {/if} - {foreach item=row from=$BLOCKS} - {foreach item=elements key=title from=$row} - {if $elements.fldname eq 'filename' && $elements.value != ''} - - {/if} - {/foreach} - {/foreach} -  
-
- {foreach item=row from=$BLOCKS} - {foreach item=elements from=$row} - {if $elements.fldname eq 'subject'} - - {if $EMAIL_FLAG neq 'WEBMAIL'} - - - - {else} - - {/if} - - -
{$MOD.LBL_TO} {$TO_MAIL} 
{$MOD.LBL_CC} {$CC_MAIL} 
{$MOD.LBL_BCC} {$BCC_MAIL} 
{$MOD.LBL_FROM} {$TO_MAIL} 
{$MOD.LBL_SUBJECT} {$elements.value} 
 
- {elseif $elements.fldname eq 'description'} -
- {$elements.value} -
- {/if} - {/foreach} - {/foreach} -
-{foreach item=row from=$BLOCKS} - {foreach item=elements key=title from=$row} - {if $elements.fldname eq 'filename'} -
- - {foreach item=attachments from=$elements.options} - - - - {/foreach} -
- {$attachments} -
-
- {/if} - {/foreach} -{/foreach} - +{**} + + + + + + + +
+ + + {if $BLOCKS neq ''} + + + {else} + + {/if} + +
+   + {if $EMAIL_FLAG neq 'WEBMAIL'} +   +   + {else} +   + {/if} + {foreach item=row from=$BLOCKS} + {foreach item=elements key=title from=$row} + {if $elements.fldname eq 'filename' && $elements.value != ''} + + {/if} + {/foreach} + {/foreach} +  
+
+ {foreach item=row from=$BLOCKS} + {foreach item=elements from=$row} + {if $elements.fldname eq 'subject'} + + {if $EMAIL_FLAG neq 'WEBMAIL'} + + + + + {else} + + {/if} + + +
{$MOD.LBL_FROM} {$FROM_MAIL} 
{$MOD.LBL_TO} {$TO_MAIL} 
{$MOD.LBL_CC} {$CC_MAIL} 
{$MOD.LBL_BCC} {$BCC_MAIL} 
{$MOD.LBL_FROM} {$TO_MAIL} 
{$MOD.LBL_SUBJECT} {$elements.value} 
 
+ {elseif $elements.fldname eq 'description'} +
+ {$elements.value} +
+ {/if} + {/foreach} + {/foreach} +
+{foreach item=row from=$BLOCKS} + {foreach item=elements key=title from=$row} + {if $elements.fldname eq 'filename'} +
+ + {foreach item=attachments from=$elements.options} + + + + {/foreach} +
+ {$attachments} +
+
+ {/if} + {/foreach} +{/foreach} + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Emails.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Emails.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Emails.tpl Mon Apr 16 12:27:44 2007 @@ -16,7 +16,7 @@ gselectedrowid = 0; $("status").style.display="inline"; gFolderid = folderid; - getObj('search_text').value = ''; +// getObj('search_text').value = ''; switch(folderid) {ldelim} case 1: @@ -45,10 +45,12 @@ postBody: 'module=Emails&ajax=true&action=EmailsAjax&file=ListView&folderid='+folderid, onComplete: function(response) {ldelim} $("status").style.display="none"; - if(gFolderid != folderid) + if(gFolderid == folderid) {ldelim} gselectedrowid = 0; $("email_con").innerHTML=response.responseText; + $('EmailDetails').innerHTML = '
 
'; + $("subjectsetter").innerHTML=''; execJS($('email_con')); {rdelim} else @@ -65,8 +67,8 @@ {rdelim} {include file='Buttons_List.tpl'} - - + + @@ -96,7 +98,7 @@
-  {$MOD.LBL_SETTINGS} +  {$MOD.LBL_SETTINGS}
@@ -104,7 +106,7 @@ - +
vtiger Email Client {$MOD.LBL_VTIGER_EMAIL_CLIENT}
@@ -115,9 +117,8 @@ - {$MOD.LBL_EMAIL_FOLDERS} -   - {$MOD.LBL_ALLMAILS} + {$MOD.LBL_EMAIL_FOLDERS} + {$MOD.LBL_ALLMAILS} @@ -126,50 +127,52 @@  {$MOD.LBL_INBOX}  {$MOD.LBL_SENT_MAILS} -   - - + - +
  - {$APP.LBL_SEARCH}   +   + {$APP.LBL_SEARCH}   +   + +
@@ -177,7 +180,6 @@ -  
{include file="EmailContents.tpl"} @@ -186,17 +188,6 @@ -   - - - - -   -   - - - -  
{include file="EmailDetails.tpl"} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/FieldAccess.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/FieldAccess.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/FieldAccess.tpl Mon Apr 16 12:27:44 2007 @@ -23,7 +23,7 @@ - + {if $MODE neq 'view'} @@ -32,7 +32,7 @@ {/if} - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/GlobalListView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/GlobalListView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/GlobalListView.tpl Mon Apr 16 12:27:44 2007 @@ -20,7 +20,7 @@
{/if} - + {if $SEARCH_MODULE eq 'All'} + @@ -32,7 +33,7 @@ - +
Users{$MOD.LBL_MODULE_NAME} {$MOD.LBL_SETTINGS} > {$MOD.LBL_FIELDS_ACCESS}  
@@ -58,7 +59,7 @@
vtiger CRM
- + @@ -93,14 +94,14 @@ {else} @@ -121,7 +122,7 @@ @@ -160,6 +161,7 @@
+ + {include file='Buttons_List1.tpl'} @@ -40,7 +62,7 @@
{$APP.LBL_MY_PREFERENCES}{$APP.LNK_HELP}{$APP.LNK_HELP} {$APP.LNK_WEARE} {$APP.LBL_LOGOUT} ({$CURRENT_USER})
- +
- +
{$MOD.LBL_MODULE_NAME} {$MODULE}{$MOD.LBL_MODULE_NAME} {$APP.$MODULE}
@@ -86,7 +108,10 @@
 
- + +   + +
Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ImportStep2.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ImportStep2.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ImportStep2.tpl Mon Apr 16 12:27:44 2007 @@ -1,188 +1,223 @@ -{**} - - - - - - -{include file='Buttons_List1.tpl'} - - - - - - - -
- - - - -
-
- - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$MOD.LBL_MODULE_NAME} {$MODULE}
 
- {$MOD.LBL_STEP_2_3}   - {$MODULE} {$MOD.LBL_LIST_MAPPING} -
- {$MOD.LBL_STEP_2_MSG} {$MODULE} {$MOD.LBL_STEP_2_MSG1} - {$MOD.LBL_STEP_2_TXT} {$MODULE}. -
 
-    - {$MOD.LBL_USE_SAVED_MAPPING}   {$SAVED_MAP_LISTS} -
- - - - {if $HASHEADER eq 1} - - - - {else} - - - - {/if} - -
{$MOD.LBL_MAPPING}{$MOD.LBL_HEADERS}{$MOD.LBL_ROW} 1{$MOD.LBL_ROW} 2{$MOD.LBL_ROW} 1{$MOD.LBL_ROW} 2{$MOD.LBL_ROW} 3
- {assign var="Firstrow" value=$FIRSTROW} - {assign var="Secondrow" value=$SECONDROW} - {assign var="Thirdrow" value=$THIRDROW} - - - - - -
-
- {include file="ImportMap.tpl"} -
- 		- - {foreach name=iter item=row1 from=$Firstrow} - {assign var="counter" value=$smarty.foreach.iter.iteration} - {math assign="num" equation="x - y" x=$counter y=1} - - {if $HASHEADER eq 1} - - - - {else} - - - - {/if} - - {/foreach} -
 {$row1} {$Secondrow[$num]} {$Thirdrow[$num]} {$row1} {$Secondrow[$num]} {$Thirdrow[$num]}
-
-
-    - {$MOD.LBL_SAVE_AS_CUSTOM}     - -
- -    - -
-
- -
-
- +{**} + + + + + + +{include file='Buttons_List1.tpl'} + + + + + + + +
+ + + + +
+
+ + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{$MOD.LBL_MODULE_NAME} {$APP.$MODULE}
 
+ {$MOD.LBL_STEP_2_3}   + {$APP.$MODULE} {$MOD.LBL_LIST_MAPPING} +
+ {$MOD.LBL_STEP_2_MSG} {$APP.$MODULE} {$MOD.LBL_STEP_2_MSG1} + {$MOD.LBL_STEP_2_TXT} {$APP.$MODULE}. +
 
+    + {$MOD.LBL_USE_SAVED_MAPPING}   {$SAVED_MAP_LISTS} +
+ + + + {if $HASHEADER eq 1} + + + + {else} + + + + {/if} + +
{$MOD.LBL_MAPPING}{$MOD.LBL_HEADERS}{$MOD.LBL_ROW} 1{$MOD.LBL_ROW} 2{$MOD.LBL_ROW} 1{$MOD.LBL_ROW} 2{$MOD.LBL_ROW} 3
+ {assign var="Firstrow" value=$FIRSTROW} + {assign var="Secondrow" value=$SECONDROW} + {assign var="Thirdrow" value=$THIRDROW} + + + + + +
+
+ {include file="ImportMap.tpl"} +
+ 		+ + {foreach name=iter item=row1 from=$Firstrow} + {assign var="counter" value=$smarty.foreach.iter.iteration} + {math assign="num" equation="x - y" x=$counter y=1} + + {if $HASHEADER eq 1} + + + + {else} + + + + {/if} + + {/foreach} +
 {$row1} {$Secondrow[$num]} {$Thirdrow[$num]} {$row1} {$Secondrow[$num]} {$Thirdrow[$num]}
+
+
+    + {$MOD.LBL_SAVE_AS_CUSTOM}     + +
+ +    + +
+
+ +
+
+ Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryActions.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryActions.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryActions.tpl Mon Apr 16 12:27:44 2007 @@ -34,27 +34,28 @@ {if $MODULE eq 'Products'} - - - + + + + {$APP.LBL_CREATE_BUTTON_LABEL} {$APP.Quote} - - + + {$APP.LBL_CREATE_BUTTON_LABEL} {$APP.Invoice} - - + + {$APP.LBL_CREATE_BUTTON_LABEL} {$APP.SalesOrder} - - + + {$APP.LBL_CREATE_BUTTON_LABEL} {$APP.PurchaseOrder} @@ -90,7 +91,7 @@ - + {$APP.LBL_CREATE_BUTTON_LABEL} {$APP.PurchaseOrder} @@ -120,7 +121,7 @@ - + {$APP.LBL_CREATE_BUTTON_LABEL} {$APP.Invoice} @@ -144,13 +145,14 @@ - - {$APP.LBL_GENERATE} {$APP.Invoice} - - + + {$APP.LBL_GENERATE} {$APP.Invoice} + + + - + {$APP.LBL_GENERATE} {$APP.SalesOrder} @@ -198,7 +200,8 @@ - + {$APP.LBL_EXPORT_TO_PDF} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryCreateView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryCreateView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryCreateView.tpl Mon Apr 16 12:27:44 2007 @@ -1,205 +1,216 @@ -{**} - -{**} - - - - - - - - - - -{include file='Buttons_List1.tpl'} - -{**} - - - - - - - -
- - - {**} - {include file='EditViewHidden.tpl'} -
- - {if $OP_MODE eq 'edit_view'} - [ {$ID} ] {$NAME} - {$APP.LBL_EDITING} {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION}
- {$UPDATEINFO} - {/if} - {if $OP_MODE eq 'create_view'} - {$APP.LBL_CREATING} {$APP.LBL_NEW} {$MOD[$SINGLE_MOD]}
- {/if} - -
-
- - - - {**} - - - - - - - -
- - - - - {if $BLOCKS_COUNT eq 2} - - - - {else} - - - {/if} - -
 {$APP.LBL_BASIC} {$APP.LBL_INFORMATION}{$APP.LBL_MORE} {$APP.LBL_INFORMATION}  {$APP.LBL_BASIC} {$APP.LBL_INFORMATION} 
-
- - {foreach item=blockInfo key=divName from=$BLOCKS} - -
- - - - - - -
- - - - - - - - - -
- - - - - - - {foreach key=header item=data from=$blockInfo} - - {if $header== $MOD.LBL_ADDRESS_INFORMATION && ($MODULE == 'Accounts' || $MODULE == 'Contacts' || $MODULE == 'Quotes' || $MODULE == 'PurchaseOrder' || $MODULE == 'SalesOrder'|| $MODULE == 'Invoice')} - - - - {else} - - - - - {include file="DisplayFields.tpl"} - - - {/foreach} - - - {if $divName eq 'basicTab'} - {if $MODULE eq 'PurchaseOrder' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Invoice'} - - - {if $AVAILABLE_PRODUCTS eq true} - {include file="Inventory/ProductDetailsEditView.tpl"} - {else} - {include file="Inventory/ProductDetails.tpl"} - {/if} - - {/if} - {/if} - - - - -
-
- - -
-
- {$header} - {$APP.LBL_RCPY_ADDRESS} - {$APP.LBL_LCPY_ADDRESS} - {$header} - {/if} -
 
-
- - -
-
- -
-
- -
- {/foreach} -
-
-
- - - - - - +{**} + +{**} + + + + + + + + + + +{include file='Buttons_List1.tpl'} + +{**} + + + + + + + +
+ + + {**} + {include file='EditViewHidden.tpl'} +
+ + {if $OP_MODE eq 'edit_view'} + [ {$ID} ] {$NAME} - {$APP.LBL_EDITING} {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION}
+ {$UPDATEINFO} + {/if} + {if $OP_MODE eq 'create_view'} + {if $DUPLICATE neq 'true'} + {$APP.LBL_CREATING} {$APP.LBL_NEW} {$MOD[$SINGLE_MOD]}
+ {else} + {$APP.LBL_DUPLICATING} "{$NAME}"
+ {/if} + {/if} + +
+
+ + + + {**} + + + + + + + +
+ + + + + {if $BLOCKS_COUNT eq 2} + + + + {else} + + + {/if} + +
 {$APP.LBL_BASIC} {$APP.LBL_INFORMATION}{$APP.LBL_MORE} {$APP.LBL_INFORMATION}  {$APP.LBL_BASIC} {$APP.LBL_INFORMATION} 
+
+ + {foreach item=blockInfo key=divName from=$BLOCKS} + +
+ + + + + + +
+ + + + + + + + + +
+ + + + + + + {foreach key=header item=data from=$blockInfo} + + {if $header== $MOD.LBL_ADDRESS_INFORMATION && ($MODULE == 'Accounts' || $MODULE == 'Contacts' || $MODULE == 'Quotes' || $MODULE == 'PurchaseOrder' || $MODULE == 'SalesOrder'|| $MODULE == 'Invoice')} + + + + {else} + + + + + {include file="DisplayFields.tpl"} + + + {/foreach} + + + {if $divName eq 'basicTab'} + {if $MODULE eq 'PurchaseOrder' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Invoice'} + + + {if $AVAILABLE_PRODUCTS eq true} + {include file="Inventory/ProductDetailsEditView.tpl"} + {else} + {include file="Inventory/ProductDetails.tpl"} + {/if} + + {/if} + {/if} + + + + +
+
+ + +
+
+ {$header} + {$APP.LBL_RCPY_ADDRESS} + {$APP.LBL_LCPY_ADDRESS} + {$header} + {/if} +
 
+
+ + +
+
+ +
+
+ +
+ {/foreach} +
+
+
+ + + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryDetailView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryDetailView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryDetailView.tpl Mon Apr 16 12:27:44 2007 @@ -1,339 +1,340 @@ -{**} - - - -
- - - - - - - -
- {include file='Buttons_List1.tpl'} - - - - - - - - -
- -
- - - - - - - - - -
- [ {$ID} ] {$NAME} - {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION}   -  
{$UPDATEINFO}
- -
- - - - - - - - - -
- - - - - - {if $SinglePane_View eq 'false'} - - {/if} - - -
 {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION} {$APP.LBL_MORE} {$APP.LBL_INFORMATION} 
-
- - - - - -
- - - - - - -
- - - - -
- {include file='DetailViewHidden.tpl'} - - {strip} - - - - {/strip} -
- - - - - -
- {if $EDIT_DUPLICATE eq 'permitted'} -   - {/if} - - {if $EDIT_DUPLICATE eq 'permitted'} -   - {/if} - {if $DELETE eq 'permitted'} -   - {/if} -
- -
- - - -{foreach key=header item=detail from=$BLOCKS} - - - - - - - - - {strip} - - {/strip} - - - {foreach item=detail from=$detail} - - {foreach key=label item=data from=$detail} - {assign var=keyid value=$data.ui} - {assign var=keyval value=$data.value} - {assign var=keytblname value=$data.tablename} - {assign var=keyfldname value=$data.fldname} - {assign var=keyoptions value=$data.options} - {assign var=keysecid value=$data.secid} - {assign var=keyseclink value=$data.link} - {assign var=keycursymb value=$data.cursymb} - {assign var=keysalut value=$data.salut} - {assign var=keycntimage value=$data.cntimage} - {assign var=keyadmin value=$data.isadmin} - - - {if $label ne ''} - {if $keycntimage ne ''} - - {elseif $label neq 'Tax Class'} - {if $keyid eq '71' || $keyid eq '72'} - - {else} - - {/if} - {/if} - {if $EDIT_PERMISSION eq 'yes'} - {include file="DetailViewUI.tpl"} - {else} - {include file="DetailViewFields.tpl"} - {/if} - {else} - - - {/if} - {/foreach} - - {/foreach} -
    -
- - {$header} - -
{$keycntimage}{$label} ({$keycursymb}){$label}  
-{/foreach} -{*-- End of Blocks--*} - - -
- - - {$ASSOCIATED_PRODUCTS} - -
- -
- {if $SinglePane_View eq 'false'} - - {strip} - - - - {/strip} -
- - - - - -
- {if $EDIT_DUPLICATE eq 'permitted'} -   - {/if} - - {if $EDIT_DUPLICATE eq 'permitted'} -   - {/if} - {if $DELETE eq 'permitted'} -   - {/if} -
- - -
-{/if} - - - -
- {if $SinglePane_View eq 'true'} - {include file= 'RelatedListNew.tpl'} - {/if} -
-
- - - 		- - {include file="Inventory/InventoryActions.tpl"} - -
- -
- {include file="TagCloudDisplay.tpl"} -
-
-
- -
- -
- -
- - - - - - - - - +{**} + + + +
+ + + + + + + +
+ {include file='Buttons_List1.tpl'} + + + + + + + + +
+ +
+ + + + + + + + + +
+ [ {$ID} ] {$NAME} - {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION}   +  
{$UPDATEINFO}
+ +
+ + + + + + + + + +
+ + + + + + {if $MODULE eq 'Products'} + + + {/if} + {if $SinglePane_View eq 'false'} + + {/if} + + +
 {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION} {$APP.LBL_DEPLIST} {$APP.LBL_INFORMATION} {$APP.LBL_MORE} {$APP.LBL_INFORMATION} 
+
+ + + + + +
+ + + + + + +
+ + + + +
+ {include file='DetailViewHidden.tpl'} + + {strip} + + + + {/strip} +
+ + + + + +
+ {if $EDIT_DUPLICATE eq 'permitted'} +   + {/if} + + {if $EDIT_DUPLICATE eq 'permitted'} +   + {/if} + {if $DELETE eq 'permitted'} +   + {/if} +
+ +
+ + + +{foreach key=header item=detail from=$BLOCKS} + + + + + + + + + {strip} + + {/strip} + + + {foreach item=detail from=$detail} + + {foreach key=label item=data from=$detail} + {assign var=keyid value=$data.ui} + {assign var=keyval value=$data.value} + {assign var=keytblname value=$data.tablename} + {assign var=keyfldname value=$data.fldname} + {assign var=keyoptions value=$data.options} + {assign var=keysecid value=$data.secid} + {assign var=keyseclink value=$data.link} + {assign var=keycursymb value=$data.cursymb} + {assign var=keysalut value=$data.salut} + {assign var=keycntimage value=$data.cntimage} + {assign var=keyadmin value=$data.isadmin} + + + {if $label ne ''} + {if $keycntimage ne ''} + + {elseif $label neq 'Tax Class'} + {if $keyid eq '71' || $keyid eq '72'} + + {else} + + {/if} + {/if} + {if $EDIT_PERMISSION eq 'yes'} + {include file="DetailViewUI.tpl"} + {else} + {include file="DetailViewFields.tpl"} + {/if} + {/if} + {/foreach} + + {/foreach} +
    +
+ + {$header} + +
{$keycntimage}{$label} ({$keycursymb}){$label}
+{/foreach} +{*-- End of Blocks--*} + + +
+ + + {$ASSOCIATED_PRODUCTS} + +
+ +
+ {if $SinglePane_View eq 'false'} + + {strip} + + + + {/strip} +
+ + + + + +
+ {if $EDIT_DUPLICATE eq 'permitted'} +   + {/if} + + {if $EDIT_DUPLICATE eq 'permitted'} +   + {/if} + {if $DELETE eq 'permitted'} +   + {/if} +
+ + +
+{/if} + + + +
+ {if $SinglePane_View eq 'true'} + {include file= 'RelatedListNew.tpl'} + {/if} +
+
+ + + 		+ + {include file="Inventory/InventoryActions.tpl"} + +
+ +
+ {include file="TagCloudDisplay.tpl"} +
+
+
+ +
+ +
+ +
+ + + + + + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryEditView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryEditView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryEditView.tpl Mon Apr 16 12:27:44 2007 @@ -1,197 +1,201 @@ -{**} - -{**} - - - - - - - - - - {include file='Buttons_List1.tpl'} - -{**} - - - - - - -
- {**} -
- - {if $OP_MODE eq 'edit_view'} - [ {$ID} ] {$NAME} - {$APP.LBL_EDITING} {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION}
- {$UPDATEINFO} - {/if} - {if $OP_MODE eq 'create_view'} - {$APP.LBL_CREATING} {$MOD[$SINGLE_MOD]}
- {/if} - -
-
- - {include file='EditViewHidden.tpl'} - - {**} - - - - - - - -
- - - - - - - -
 {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION}  
-
- - - - - - - -
- {**} - - - - - - - - -
- - - - - - - - {foreach key=header item=data from=$BLOCKS} - - {if $header== $MOD.LBL_ADDRESS_INFORMATION && ($MODULE == 'Accounts' || $MODULE == 'Contacts' || $MODULE == 'Quotes' || $MODULE == 'PurchaseOrder' || $MODULE == 'SalesOrder'|| $MODULE == 'Invoice')} - - - - {else} - - - - - {include file="DisplayFields.tpl"} - - - - {/foreach} - - - - {if $MODULE eq 'PurchaseOrder' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Invoice'} - - - - {/if} - - - - -
-
- - -
-
- {$header} - {$APP.LBL_RCPY_ADDRESS} - {$APP.LBL_LCPY_ADDRESS} - {$header} - {/if} -
 
- {include file="Inventory/ProductDetailsEditView.tpl"} -
-
- - -
-
-
- 		- - {include file="Inventory/InventoryActions.tpl"} -
-
-
-
- - - - - - +{**} + +{**} + + + + + + + + + + {include file='Buttons_List1.tpl'} + +{**} + + + + + + +
+ {**} +
+ + {if $OP_MODE eq 'edit_view'} + [ {$ID} ] {$NAME} - {$APP.LBL_EDITING} {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION}
+ {$UPDATEINFO} + {/if} + {if $OP_MODE eq 'create_view'} + {$APP.LBL_CREATING} {$MOD[$SINGLE_MOD]}
+ {/if} + +
+
+ + {include file='EditViewHidden.tpl'} + + {**} + + + + + + + +
+ + + + + + + +
 {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION}  
+
+ + + + + + +
+ {**} + + + + + + + + +
+ + + + + + + + {foreach key=header item=data from=$BLOCKS} + + {if $header== $MOD.LBL_ADDRESS_INFORMATION && ($MODULE == 'Accounts' || $MODULE == 'Contacts' || $MODULE == 'Quotes' || $MODULE == 'PurchaseOrder' || $MODULE == 'SalesOrder'|| $MODULE == 'Invoice')} + + + + {else} + + + + + {include file="DisplayFields.tpl"} + + + + {/foreach} + + + + {if $MODULE eq 'PurchaseOrder' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Invoice'} + + + + {/if} + + + + +
+
+ + +
+
+ {$header} + {$APP.LBL_RCPY_ADDRESS} + {$APP.LBL_LCPY_ADDRESS} + {$header} + {/if} +
 
+ {include file="Inventory/ProductDetailsEditView.tpl"} +
+
+ + +
+
+
+
+
+
+
+ + + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/ProductDetails.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/ProductDetails.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/ProductDetails.tpl Mon Apr 16 12:27:44 2007 @@ -28,7 +28,7 @@ var curr_productid = document.getElementById("hdnProductId"+curr_row).value; if(curr_productid == '') {ldelim} - alert("Please select a Product"); + alert("{$APP.PLEASE_SELECT_PRODUCT}"); return false; {rdelim} {rdelim} @@ -36,24 +36,24 @@ //Set the Header value for Discount if(mode == 'discount') {ldelim} - document.getElementById("discount_div_title"+curr_row).innerHTML = 'Set Discount for : '+document.getElementById("productTotal"+curr_row).innerHTML+''; + document.getElementById("discount_div_title"+curr_row).innerHTML = '{$APP.LABEL_SET_DISCOUNT_FOR_COLON} '+document.getElementById("productTotal"+curr_row).innerHTML+''; {rdelim} else if(mode == 'tax') {ldelim} - document.getElementById("tax_div_title"+curr_row).innerHTML = "Set Tax for "+document.getElementById("totalAfterDiscount"+curr_row).innerHTML+''; + document.getElementById("tax_div_title"+curr_row).innerHTML = "{$APP.LABEL_SET_TAX_FOR} "+document.getElementById("totalAfterDiscount"+curr_row).innerHTML+''; {rdelim} else if(mode == 'discount_final') {ldelim} - document.getElementById("discount_div_title_final").innerHTML = 'Set Discount for : '+document.getElementById("netTotal").innerHTML+''; + document.getElementById("discount_div_title_final").innerHTML = '{$APP.LABEL_SET_DISCOUNT_FOR} '+document.getElementById("netTotal").innerHTML+''; {rdelim} else if(mode == 'sh_tax_div_title') {ldelim} - document.getElementById("sh_tax_div_title").innerHTML = 'Set S&H Tax for : '+document.getElementById("shipping_handling_charge").value+''; + document.getElementById("sh_tax_div_title").innerHTML = '{$APP.LABEL_SET_SH_TAX_FOR_COLON} '+document.getElementById("shipping_handling_charge").value+''; {rdelim} else if(mode == 'group_tax_div_title') {ldelim} var net_total_after_discount = eval(document.getElementById("netTotal").innerHTML)-eval(document.getElementById("discountTotal_final").innerHTML); - document.getElementById("group_tax_div_title").innerHTML = 'Set Group Tax for : '+net_total_after_discount+''; + document.getElementById("group_tax_div_title").innerHTML = '{$APP.LABEL_SET_GROUP_TAX_FOR_COLON} '+net_total_after_discount+''; {rdelim} fnvshobj(currObj,'tax_container'); @@ -170,7 +170,7 @@ - + @@ -180,7 +180,7 @@ @@ -199,7 +199,7 @@ - + @@ -299,7 +299,7 @@ - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/ProductDetailsEditView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/ProductDetailsEditView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/ProductDetailsEditView.tpl Mon Apr 16 12:27:44 2007 @@ -29,7 +29,7 @@ var curr_productid = document.getElementById("hdnProductId"+curr_row).value; if(curr_productid == '') {ldelim} - alert("Please select a Product"); + alert("{$APP.PLEASE_SELECT_PRODUCT}"); return false; {rdelim} {rdelim} @@ -37,24 +37,24 @@ //Set the Header value for Discount if(mode == 'discount') {ldelim} - document.getElementById("discount_div_title"+curr_row).innerHTML = 'Set Discount for : '+document.getElementById("productTotal"+curr_row).innerHTML+''; + document.getElementById("discount_div_title"+curr_row).innerHTML = '{$APP.LABEL_SET_DISCOUNT_FOR_X_COLON} '+document.getElementById("productTotal"+curr_row).innerHTML+''; {rdelim} else if(mode == 'tax') {ldelim} - document.getElementById("tax_div_title"+curr_row).innerHTML = "Set Tax for "+document.getElementById("totalAfterDiscount"+curr_row).innerHTML+''; + document.getElementById("tax_div_title"+curr_row).innerHTML = "{$APP.LABEL_SET_TAX_FOR} "+document.getElementById("totalAfterDiscount"+curr_row).innerHTML+''; {rdelim} else if(mode == 'discount_final') {ldelim} - document.getElementById("discount_div_title_final").innerHTML = 'Set Discount for : '+document.getElementById("netTotal").innerHTML+''; + document.getElementById("discount_div_title_final").innerHTML = '{$APP.LABEL_SET_DISCOUNT_FOR_COLON} '+document.getElementById("netTotal").innerHTML+''; {rdelim} else if(mode == 'sh_tax_div_title') {ldelim} - document.getElementById("sh_tax_div_title").innerHTML = 'Set S&H Tax for : '+document.getElementById("shipping_handling_charge").value+''; + document.getElementById("sh_tax_div_title").innerHTML = '{$APP.LABEL_SET_SH_TAX_FOR_COLON} '+document.getElementById("shipping_handling_charge").value+''; {rdelim} else if(mode == 'group_tax_div_title') {ldelim} var net_total_after_discount = eval(document.getElementById("netTotal").innerHTML)-eval(document.getElementById("discountTotal_final").innerHTML); - document.getElementById("group_tax_div_title").innerHTML = 'Set Group Tax for : '+net_total_after_discount+''; + document.getElementById("group_tax_div_title").innerHTML = '{$APP.LABEL_SET_GROUP_TAX_FOR_COLON} '+net_total_after_discount+''; {rdelim} fnvshobj(currObj,'tax_container'); @@ -132,6 +132,7 @@ {assign var="hdnProductId" value="hdnProductId"|cat:$row_no} {assign var="productName" value="productName"|cat:$row_no} {assign var="comment" value="comment"|cat:$row_no} + {assign var="productDescription" value="productDescription"|cat:$row_no} {assign var="qtyInStock" value="qtyInStock"|cat:$row_no} {assign var="qty" value="qty"|cat:$row_no} {assign var="listPrice" value="listPrice"|cat:$row_no} @@ -169,6 +170,7 @@ @@ -192,7 +194,7 @@ @@ -201,7 +203,7 @@
-   +  
  % {$APP.LBL_OF_PRICE} % %
 {$APP.LBL_DIRECT_PRICE_REDUCTION}
  % {$APP.LBL_OF_PRICE} % %
 {$APP.LBL_DIRECT_PRICE_REDUCTION} +
- +
@@ -220,7 +222,7 @@ - + @@ -350,7 +352,7 @@ - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ListEmailTemplates.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ListEmailTemplates.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ListEmailTemplates.tpl Mon Apr 16 12:27:44 2007 @@ -1,192 +1,191 @@ -{**} - - - -
-
-   +  
  % {$APP.LBL_OF_PRICE} % %
 {$APP.LBL_DIRECT_PRICE_REDUCTION}
  % {$APP.LBL_OF_PRICE} % %
 {$APP.LBL_DIRECT_PRICE_REDUCTION}
- - - - -
-
-
- - {include file='SetMenu.tpl'} - - - - - - - - - - - - - - -
{$MOD.LBL_SETTINGS} > {$UMOD.LBL_EMAIL_TEMPLATES}
{$UMOD.LBL_EMAIL_TEMPLATE_DESC}
- -
- - - - -
- - - - - - -
{$UMOD.LBL_EMAIL_TEMPLATES}  -
- - - - - - -
- - - - - - - - - {foreach name=emailtemplate item=template from=$TEMPLATES} - - - - - - - - {/foreach} -
#{$UMOD.LBL_LIST_SELECT}{$UMOD.LBL_EMAIL_TEMPLATE}{$UMOD.LBL_DESCRIPTION}{$UMOD.LBL_TEMPLATE_TOOLS}
{$smarty.foreach.emailtemplate.iteration} - {$template.templatename} - {$template.description}  - {$UMOD.LNK_SAMPLE_EMAIL} -
- - - - -
{$MOD.LBL_SCROLL}
-
- - - -
- - - - - -
- - - - - +{**} + + + +
+ + + + + +
+
+
+ + {include file='SetMenu.tpl'} + + + + + + + + + + + + + + +
{$MOD.LBL_SETTINGS} > {$UMOD.LBL_EMAIL_TEMPLATES}
{$UMOD.LBL_EMAIL_TEMPLATE_DESC}
+ +
+ + + + +
+ + + + + + +
{$UMOD.LBL_EMAIL_TEMPLATES}  +
+ + + + + + +
+ + + + + + + + + {foreach name=emailtemplate item=template from=$TEMPLATES} + + + + + + + + {/foreach} +
#{$UMOD.LBL_LIST_SELECT}{$UMOD.LBL_EMAIL_TEMPLATE}{$UMOD.LBL_DESCRIPTION}
{$smarty.foreach.emailtemplate.iteration} + {$template.templatename} + {$template.description} 
+ + + + +
{$MOD.LBL_SCROLL}
+
+ + + +
+ + + + + +
+ + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ListGroup.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ListGroup.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ListGroup.tpl Mon Apr 16 12:27:44 2007 @@ -23,7 +23,7 @@ - + @@ -67,11 +67,11 @@ Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ListLeadCustomFieldMapping.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ListLeadCustomFieldMapping.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ListLeadCustomFieldMapping.tpl Mon Apr 16 12:27:44 2007 @@ -83,7 +83,7 @@ + - - - - - - - - - -
{$smarty.foreach.grouplist.iteration} - {$APP.LNK_EDIT} | + {$APP.LNK_EDIT} | {$LNK_DELETE} - {$groupvalues.groupname} + {$groupvalues.groupname} {$groupvalues.description}
- - - - - - - - -

- {$MOD.LBL_SETTINGS} > {$MOD.LBL_UPGRADE_VTIGER} - -               - {if $502_PATCH eq 'apply'} - Click here to apply the 5.0.2 Database changes from 5.0.0/5.0.1 - {/if} - -
- 		 
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {if $GET_MYSQL_PATH eq 1} - - - - - {/if} - - - -
- {$MOD.LBL_UPGRADE_VTIGER}
- ({$MOD.LBL_UPGRADE_FROM_VTIGER_423}) -
- {$MOD.LBL_STEP} 1 : - {$MOD.LBL_SELECT_SOURCE}
- {$MOD.LBL_STEP1_DESC}

-
- - - {$MOD.LBL_RADIO_BUTTON1_TEXT}

- {$MOD.LBL_NOTE_TITLE} {$MOD.LBL_RADIO_BUTTON1_DESC} -
- - - {$MOD.LBL_RADIO_BUTTON2_TEXT}

- {$MOD.LBL_NOTE_TITLE} {$MOD.LBL_RADIO_BUTTON2_DESC} -
- - - {$MOD.LBL_RADIO_BUTTON3_TEXT}

{$MOD.LBL_NOTE_TITLE} {$MOD.LBL_RADIO_BUTTON3_DESC} -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - -
- {$MOD.LBL_STEP} 2 : - {$MOD.LBL_HOST_DB_ACCESS_DETAILS}

-
{$MOD.LBL_SOURCE_HOST_NAME}
{$MOD.LBL_SOURCE_MYSQL_PORT_NO}
{$MOD.LBL_SOURCE_MYSQL_USER_NAME}
{$MOD.LBL_SOURCE_MYSQL_PASSWORD}
{$MOD.LBL_SOURCE_DB_NAME}
-
- - -
- - - - - - - - - - - - - -
- {$MOD.LBL_STEP} 2 : - {$MOD.LBL_LOCATE_DB_DUMP_FILE}

-
  - {$MOD.LBL_DUMP_FILE_LOCATION} - -
{$MOD.LBL_NOTE_TITLE}{$MOD.LBL_NOTES_DUMP_PROCESS}
-
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {$MOD.LBL_STEP} 2 : - {$MOD.LBL_HOST_DB_ACCESS_DETAILS}

-
 {$MOD.LBL_MYSQL_HOST_NAME_IP}
 {$MOD.LBL_MYSQL_PORT}
 {$MOD.LBL_MYSQL_USER_NAME}
 {$MOD.LBL_MYSQL_PASSWORD}
 {$MOD.LBL_DB_NAME}
{$MOD.LBL_NOTE_TITLE} - - {$MOD.LBL_RADIO_BUTTON3_PROCESS} -
-
- - -
- -
- - - - - - - - -
- {$MOD.LBL_STEP} 3 : - {$MOD.LBL_ENTER_MYSQL_SERVER_PATH}
{$MOD.LBL_SERVER_PATH_DESC}

-
{$MOD.LBL_MYSQL_SERVER_PATH} - -
-
- - -
- -   -
-
-
- 		 
- - - - - +{**} + + + + + +
+ + + + + + + + + + + + + + + +

+ {$MOD.LBL_SETTINGS} > {$MOD.LBL_UPGRADE_VTIGER} +
+ 		 
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {if $GET_MYSQL_PATH eq 1} + + + + + {/if} + + + +
+ {$MOD.LBL_UPGRADE_VTIGER}
+ ({$MOD.LBL_UPGRADE_FROM_VTIGER_423}) +
+ {$MOD.LBL_STEP} 1 : + {$MOD.LBL_SELECT_SOURCE}
+ {$MOD.LBL_STEP1_DESC}

+
+ + + {$MOD.LBL_RADIO_BUTTON1_TEXT}

+ {$MOD.LBL_NOTE_TITLE} {$MOD.LBL_RADIO_BUTTON1_DESC} +
+ + + {$MOD.LBL_RADIO_BUTTON2_TEXT}

+ {$MOD.LBL_NOTE_TITLE} {$MOD.LBL_RADIO_BUTTON2_DESC} +
+ + + {$MOD.LBL_RADIO_BUTTON3_TEXT}

{$MOD.LBL_NOTE_TITLE} {$MOD.LBL_RADIO_BUTTON3_DESC} +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ {$MOD.LBL_STEP} 2 : + {$MOD.LBL_HOST_DB_ACCESS_DETAILS}

+
{$MOD.LBL_SOURCE_HOST_NAME}
{$MOD.LBL_SOURCE_MYSQL_PORT_NO}
{$MOD.LBL_SOURCE_MYSQL_USER_NAME}
{$MOD.LBL_SOURCE_MYSQL_PASSWORD}
{$MOD.LBL_SOURCE_DB_NAME}
+
+ + +
+ + + + + + + + + + + + + +
+ {$MOD.LBL_STEP} 2 : + {$MOD.LBL_LOCATE_DB_DUMP_FILE}

+
  + {$MOD.LBL_DUMP_FILE_LOCATION} + +
{$MOD.LBL_NOTE_TITLE}{$MOD.LBL_NOTES_DUMP_PROCESS}
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {$MOD.LBL_STEP} 2 : + {$MOD.LBL_HOST_DB_ACCESS_DETAILS}

+
 {$MOD.LBL_MYSQL_HOST_NAME_IP}
 {$MOD.LBL_MYSQL_PORT}
 {$MOD.LBL_MYSQL_USER_NAME}
 {$MOD.LBL_MYSQL_PASSWORD}
 {$MOD.LBL_DB_NAME}
{$MOD.LBL_NOTE_TITLE} + + {$MOD.LBL_RADIO_BUTTON3_PROCESS} +
+
+ + +
+ +
+ + + + + + + + +
+ {$MOD.LBL_STEP} 3 : + {$MOD.LBL_ENTER_MYSQL_SERVER_PATH}
{$MOD.LBL_SERVER_PATH_DESC}

+
{$MOD.LBL_MYSQL_SERVER_PATH} + +
+
+ + +
+ +   +
+
+
+ 		 
+ +
+ + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/OrgSharingDetailView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/OrgSharingDetailView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/OrgSharingDetailView.tpl Mon Apr 16 12:27:44 2007 @@ -45,7 +45,7 @@ - + @@ -194,22 +194,22 @@
-
Users{$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_SHARING_ACCESS}  
+
-
- +
-

{$CMOD.LBL_RECALC_MSG}

+ 		+ {$CMOD.LBL_RECALC_MSG}
    
- - - - - - - - - +{**} +{literal} + +{/literal} + + + +{/literal} + +
+ + + + + +
+
+
+ {include file='SetMenu.tpl'} + +
+ + + + + + + + + + + + + + + + +
{$MOD.LBL_PROFILES}{$MOD.LBL_SETTINGS} > {$CMOD.LBL_PROFILE_PRIVILEGES} > {$CMOD.LBL_VIEWING} "{$PROFILE_NAME}"
{$CMOD.LBL_PROFILE_MESG} "{$PROFILE_NAME}"
+ + + + + + +
+ + + + +
+ + + + + +
+ + + + + +
+ + + + + + + + +
+ + + + +
+ + + + + + + +
{$CMOD.LBL_DEFINE_PRIV_FOR} <{$PROFILE_NAME}>
+ {$CMOD.LBL_USE_OPTION_TO_SET_PRIV}
   +
+ + + + + + + + + + +
+ + + + +
+ + + + + + +
{$CMOD.LBL_SUPER_USER_PRIV}
+ + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
{$GLOBAL_PRIV.0}{$CMOD.LBL_VIEW_ALL}
{$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}
 
{$GLOBAL_PRIV.1}{$CMOD.LBL_EDIT_ALL}
{$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_EDIT}
+
+
+ + + + + +
{$CMOD.LBL_SET_PRIV_FOR_EACH_MODULE}
+ + + + + + +
  + + + + + + + + + + + + + + + {foreach key=tabid item=elements from=$TAB_PRIV} + + {assign var=modulename value=$TAB_PRIV[$tabid][0]} + + + + + + + + + + + {/foreach} + +
{$CMOD.LBL_TAB_MESG_OPTION}
{$CMOD.LBL_EDIT_PERMISSIONS}
{$CMOD.LBL_FIELDS_AND_TOOLS_SETTINGS}
{$CMOD.LBL_CREATE_EDIT} +
{$CMOD.LBL_VIEW}
{$CMOD.LBL_DELETE}
+ {$TAB_PRIV[$tabid][1]} +

{$APP[$modulename]}

 
+ {$STANDARD_PRIV[$tabid][1]} +
 
+ {$STANDARD_PRIV[$tabid][3]} +
 
+ {$STANDARD_PRIV[$tabid][2]} +
 
+ {if $FIELD_PRIVILEGES[$tabid] neq NULL || $modulename eq 'Emails'} + {$APP.LBL_EXPAND_COLLAPSE} + {/if} +
+ + + {if $FIELD_PRIVILEGES[$tabid] neq ''} + + {if $modulename eq 'Calendar'} + + {else} + + {/if} + + {/if} + {foreach item=row_values from=$FIELD_PRIVILEGES[$tabid]} + + {foreach item=element from=$row_values} + + + {/foreach} + + {/foreach} + {if $modulename eq 'Calendar'} + + + + {foreach item=row_values from=$FIELD_PRIVILEGES[16]} + + {foreach item=element from=$row_values} + + + {/foreach} + + {/foreach} + {/if} + {if $UTILITIES_PRIV[$tabid] neq ''} + + + + {/if} + {foreach item=util_value from=$UTILITIES_PRIV[$tabid]} + + {foreach item=util_elements from=$util_value} + + + {/foreach} + + {/foreach} + +
{$CMOD.LBL_FIELDS_SELECT_DESELECT} ({$APP.Tasks}){$CMOD.LBL_FIELDS_SELECT_DESELECT}
{$element.1}{$element.0}
{$CMOD.LBL_FIELDS_SELECT_DESELECT} ({$APP.Events})
{$element.1}{$element.0}
{$CMOD.LBL_TOOLS_TO_BE_SHOWN}
{$util_elements.1}{$APP[$util_elements.0]}
+
+
+
+ + + + + + +
*{$CMOD.LBL_MANDATORY_MSG}
*{$CMOD.LBL_DISABLE_FIELD_MSG}
+
+ + + + + + + + + +
 
+
+
+
+ + + + + + + +
+

 

+ + +
{$MOD.LBL_SCROLL}
+ +
+ + + + + + + + + + + + + + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/QuickCreate.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/QuickCreate.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/QuickCreate.tpl Mon Apr 16 12:27:44 2007 @@ -17,7 +17,7 @@ - +
{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.$QCMODULE}Quick Create
{$APP.LBL_QUICK_CREATE}
@@ -66,10 +66,19 @@ {$fldlabel} - + {elseif $uitype eq 50} - + {elseif $uitype eq 73} - + {elseif $uitype eq 75 || $uitype eq 81} - +   {/if} {elseif $uitype eq 57} - + {elseif $uitype eq 80} - + {elseif $uitype eq 78} - + {elseif $uitype eq 76} - + {elseif $uitype eq 17} @@ -228,10 +237,22 @@ {assign var=date_val value="$date_value"} {assign var=time_val value="$time_value"} {/foreach} - + {foreach key=date_fmt item=date_str from=$secondvalue} + {assign var=dateFormat value="$date_fmt"} + {assign var=dateStr value="$date_str"} + {/foreach} + {if $uitype eq 6 && $QCMODULE eq 'Event'} + {assign var=datejsfn value="onChange='dochange(\"jscal_field_date_start\",\"jscal_field_due_date\");'"} + {assign var=timejsfn value="onChange='calQCduedatetime();'"} + + {else} + {assign var=datejsfn value=""} + {assign var=timejsfn value=""} + {/if} + {if $uitype eq 6} - + {/if} {if $uitype eq 23 && $QCMODULE eq 'Event'} @@ -239,10 +260,6 @@ getCalendarPopup('jscal_trigger_{$fldname}','jscal_field_{$fldname}','{$dateFormat}'); {/if} - {foreach key=date_format item=date_str from=$secondvalue} - {assign var=dateFormat value="$date_format"} - {assign var=dateStr value="$date_str"} - {/foreach} {if $uitype eq 5 || $uitype eq 23}
({$dateStr}) {else} @@ -275,7 +292,7 @@ +  {$APP.LBL_SELECT}  {elseif $uitype eq 357} @@ -287,7 +304,7 @@ {/foreach} -  Select  +  {$APP.LBL_SELECT}  {elseif $uitype eq 55} @@ -322,7 +339,7 @@ Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ReportRun.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ReportRun.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ReportRun.tpl Mon Apr 16 12:27:44 2007 @@ -12,7 +12,7 @@ -->*}
- + @@ -64,13 +64,13 @@ {if $report_in_fld_id neq $REPORTID} {else} - + {/if} {else} {if $report_in_fld_id neq $REPORTID} {else} - + {/if} {/if} {/foreach} @@ -205,7 +205,9 @@ var reportinfr = 'Reporting "'+stdDateFilterFieldvalue+'" ( till '+enddatevalue+')'; }else if(startdatevalue == '' && enddatevalue =='') { - var reportinfr = 'No filter Selected'; + {/literal} + var reportinfr = "{$MOD.NO_FILTER_SELECTED}"; + {literal} }else if(startdatevalue != '' && enddatevalue !='') { var reportinfr = 'Reporting "'+stdDateFilterFieldvalue+'" of "'+stdDateFiltervalue+'" ( '+startdatevalue+' to '+enddatevalue+' )'; Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Reports.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Reports.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Reports.tpl Mon Apr 16 12:27:44 2007 @@ -13,7 +13,7 @@ -->*} {**} - +
- {foreach item=arr from=$fldvalue} {foreach key=sel_value item=value from=$arr} + {if $MOD.$sel_value neq ''} + {else} + + {/if} {/foreach} {/foreach} @@ -150,14 +159,14 @@ {assign var='popuptype' value = 'specific_contact_account_address'} {/if} {$fldlabel} Select  {$APP.LBL_SELECT} *{$fldlabel} Select {$APP.LBL_SELECT}*{$fldlabel} Select {$APP.LBL_SELECT} @@ -168,25 +177,25 @@ {/if} {$fldlabel}  Select +  {$APP.LBL_SELECT} {if $uitype eq 75} -  {$fldlabel} Select  {$APP.LBL_SELECT} {$fldlabel} Select  {$APP.LBL_SELECT} {$fldlabel} Select  {$APP.LBL_SELECT} {$fldlabel} Select  {$APP.LBL_SELECT} {$fldlabel} -  Select To: 
CC:  @@ -302,7 +319,7 @@ {$fldlabel} -  Select  +  {$APP.LBL_SELECT}  {if $MODULE eq 'Products'} -
Files Maximum 6 +
{$APP.Files_Maximum_6}
- + + {literal} - + + {literal} {include file='Buttons_List1.tpl'} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ReportColumns.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ReportColumns.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ReportColumns.tpl Mon Apr 16 12:27:44 2007 @@ -35,7 +35,7 @@
- {$BLOCK2}
@@ -28,13 +28,13 @@ @@ -82,15 +82,15 @@
- + - + - + - +
Create {$MODULE}...{$MOD.LBL_CREATE_REPORT}...  Create New Folder...{$MOD.Create_New_Folder}...  Move Reports...{$MOD.Move_Reports}...  Delete Report...{$MOD.LBL_DELETE_FOLDER}...
- - +
{$MOD.LBL_REP_FOLDER_NAME} + - +
{$MOD.LBL_REP_FOLDER_DESC}
@@ -135,7 +135,9 @@ { var title = 'folder'+id; var fldr_name = getObj(title).innerHTML; - if(confirm("Are you sure you want to delete the folder '"+fldr_name +"' ?")) + {/literal} + if(confirm("{$APP.DELETE_FOLDER_CONFIRMATION}"+fldr_name +"' ?")) + {literal} { new Ajax.Request( 'index.php', @@ -159,42 +161,74 @@ { if(getObj('folder_name').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert('The Folder name cannot be empty'); - return false; + {/literal} + alert('{$APP.FOLDERNAME_CANNOT_BE_EMPTY}'); + return false; + {literal} } else { - fninvsh('orgLay'); - var foldername = getObj('folder_name').value; - var folderdesc = getObj('folder_desc').value; - getObj('folder_name').value = ''; - getObj('folder_desc').value = ''; - foldername = foldername.replace(/&/gi,'*amp*') - folderdesc = folderdesc.replace(/&/gi,'*amp*') - var mode = getObj('fldrsave_mode').value; - if(mode == 'save') - { - url ='&savemode=Save&foldername='+foldername+'&folderdesc='+folderdesc; - } - else - { - var folderid = getObj('folder_id').value; - url ='&savemode=Edit&foldername='+foldername+'&folderdesc='+folderdesc+'&record='+folderid; - } - getObj('fldrsave_mode').value = 'save'; new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody: 'action=ReportsAjax&mode=ajax&file=SaveReportFolder&module=Reports'+url, + postBody: 'action=ReportsAjax&mode=ajax&file=CheckReport&module=Reports&check=folderCheck&folderName='+getObj('folder_name').value, onComplete: function(response) { - var item = response.responseText; - getObj('customizedrep').innerHTML = item; - } - } - ); - } -} + if((response.responseText==1) && (mode == 'Edit')) + { + {/literal} + alert("{$APP.FOLDER_NAME_ALREADY_EXISTS}"); + return false; + {literal} + } + else if((response.responseText !=0) && (mode == 'Edit')) + { + {/literal}; + alert("{$APP.FOLDER_NAME_ALREADY_EXISTS}"); + return false; + {literal} + } + else + { + fninvsh('orgLay'); + var foldername = getObj('folder_name').value; + var folderdesc = getObj('folder_desc').value; + getObj('folder_name').value = ''; + getObj('folder_desc').value = ''; + foldername = foldername.replace(/&/gi,'*amp*') + folderdesc = folderdesc.replace(/&/gi,'*amp*') + var mode = getObj('fldrsave_mode').value; + if(mode == 'save') + { + url ='&savemode=Save&foldername='+foldername+'&folderdesc='+folderdesc; + } + else + { + var folderid = getObj('folder_id').value; + url ='&savemode=Edit&foldername='+foldername+'&folderdesc='+folderdesc+'&record='+folderid; + } + getObj('fldrsave_mode').value = 'save'; + new Ajax.Request( + 'index.php', + {queue: {position: 'end', scope: 'command'}, + method: 'post', + postBody: 'action=ReportsAjax&mode=ajax&file=SaveReportFolder&module=Reports'+url, + onComplete: function(response) { + var item = response.responseText; + getObj('customizedrep').innerHTML = item; + } + } + + ); + } + } + } + ); + + } +} + + function EditFolder(id,name,desc) { {/literal} @@ -241,8 +275,9 @@ } } if(idstring != '') - { - if(confirm("Are you sure you want to delete the selected "+count+" reports ?")) + { {/literal} + if(confirm("{$APP.DELETE_CONFIRMATION}"+count+"{$APP.RECORDS}")) + {literal} { new Ajax.Request( 'index.php', @@ -262,13 +297,17 @@ }else { - alert('Please select at least one Report'); - return false; + {/literal} + alert('{$APP.SELECT_ATLEAST_ONE_REPORT}'); + return false; + {literal} } } function DeleteReport(id) { - if(confirm("Are you sure you want to delete this report ?")) + {/literal} + if(confirm("{$APP.DELETE_REPORT_CONFIRMATION}")) + {literal} { new Ajax.Request( 'index.php', @@ -323,7 +362,9 @@ } if(idstring != '') { - if(confirm("Are you sure you want to move this report to "+foldername+" folder ?")) + {/literal} + if(confirm("{$APP.MOVE_REPORT_CONFIRMATION}"+foldername+"{$APP.FOLDER}")) + {literal} { new Ajax.Request( 'index.php', @@ -342,8 +383,10 @@ }else { - alert('Please select at least one Report'); - return false; + {/literal} + alert('{$APP.SELECT_ATLEAST_ONE_REPORT}'); + return false; + {literal} } } Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ReportsCustomize.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ReportsCustomize.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ReportsCustomize.tpl Mon Apr 16 12:27:44 2007 @@ -23,7 +23,7 @@ - - -
-   +   Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ReportsStep0.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ReportsStep0.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ReportsStep0.tpl Mon Apr 16 12:27:44 2007 @@ -11,11 +11,13 @@ -->*} - - vtiger CRM - Create Report + + {$MOD.TITLE_VTIGERCRM_CREATE_REPORT} - + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ReportsStep1.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ReportsStep1.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ReportsStep1.tpl Mon Apr 16 12:27:44 2007 @@ -11,11 +11,12 @@ -->*} - - vtiger CRM - Create Report + + {$MOD.TITLE_VTIGERCRM_CREATE_REPORT} - + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/RoleDetailView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/RoleDetailView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/RoleDetailView.tpl Mon Apr 16 12:27:44 2007 @@ -1,125 +1,125 @@ -{**} - - -
-
- - - - -
-
- -
- {include file='SetMenu.tpl'} - - - - - - - - - - - - - - - - -
{$MOD.LBL_SETTINGS} > {$CMOD.LBL_ROLES} > {$CMOD.LBL_VIEWING} "{$ROLE_NAME}"
{$CMOD.LBL_VIEWING} {$CMOD.LBL_PROPERTIES} "{$ROLE_NAME}" {$MOD.LBL_LIST_CONTACT_ROLE}
- -
- - - - -
- - - - - - -
{$CMOD.LBL_PROPERTIES} "{$ROLE_NAME}"
- -
- - - - - - - - - - - - - -
{$CMOD.LBL_ROLE_NAME}{$ROLE_NAME}
{$CMOD.LBL_REPORTS_TO}{$PARENTNAME}
{$CMOD.LBL_MEMBER} - - - - - {foreach item=elements from=$ROLEINFO.profileinfo} - - - - - - {/foreach} - - - - {if $ROLEINFO.userinfo.0 neq ''} - {foreach item=elements from=$ROLEINFO.userinfo} - - - - - - {/foreach} - {/if} -
-
{$CMOD.LBL_ASSOCIATED_PROFILES}
-
- {$elements.1}
-
-
{$CMOD.LBL_ASSOCIATED_USERS}
-
- {$elements.1}
-
-
- - -
{$MOD.LBL_SCROLL}
- - -
- - - -
-
- - - - - - - +{**} + + +
+ + + + + +
+
+ +
+ {include file='SetMenu.tpl'} + + + + + + + + + + + + + + + + +
{$MOD.LBL_SETTINGS} > {$CMOD.LBL_ROLES} > {$CMOD.LBL_VIEWING} "{$ROLE_NAME}"
{$CMOD.LBL_VIEWING} {$CMOD.LBL_PROPERTIES} "{$ROLE_NAME}" {$MOD.LBL_LIST_CONTACT_ROLE}
+ +
+ + + + +
+ + + + + + +
{$CMOD.LBL_PROPERTIES} "{$ROLE_NAME}"
+ +
+ + + + + + + + + + + + + +
{$CMOD.LBL_ROLE_NAME}{$ROLE_NAME}
{$CMOD.LBL_REPORTS_TO}{$PARENTNAME}
{$CMOD.LBL_MEMBER} + + + + + {foreach item=elements from=$ROLEINFO.profileinfo} + + + + + + {/foreach} + + + + {if $ROLEINFO.userinfo.0 neq ''} + {foreach item=elements from=$ROLEINFO.userinfo} + + + + + + {/foreach} + {/if} +
+
{$CMOD.LBL_ASSOCIATED_PROFILES}
+
+ {$elements.1}
+
+
{$CMOD.LBL_ASSOCIATED_USERS}
+
+ {$elements.1}
+
+
+ + +
{$MOD.LBL_SCROLL}
+ + +
+ + + +
+ + + + + + + + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/RoleEditView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/RoleEditView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/RoleEditView.tpl Mon Apr 16 12:27:44 2007 @@ -24,7 +24,7 @@ 'index.php', {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim}, method: 'post', - postBody: 'module=Users&action=UsersAjax&file=SaveRole&ajax=true&dup_check=true'+urlstring, + postBody: 'module=Settings&action=SettingsAjax&file=SaveRole&ajax=true&dup_check=true'+urlstring, onComplete: function(response) {ldelim} if(response.responseText == 'SUCESS') document.newRoleForm.submit(); @@ -38,16 +38,16 @@ function validate() {ldelim} formSelectColumnString(); - if( !emptyCheck( "roleName", "Role Name" ) ) + if( !emptyCheck("roleName", "Role Name", "text" ) ) return false; if(document.newRoleForm.selectedColumnsString.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) {ldelim} - alert('Role should have atlease one profile'); + alert('{$APP.ROLE_SHOULDHAVE_INFO}'); return false; {rdelim} - dup_validation(); + dup_validation();return false {rdelim}
@@ -61,8 +61,8 @@ {include file='SetMenu.tpl'} - - + + @@ -70,11 +70,11 @@ - + {if $MODE eq 'edit'} - + {else} - + {/if} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Rss.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Rss.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Rss.tpl Mon Apr 16 12:27:44 2007 @@ -34,8 +34,10 @@ function DeleteRssFeeds(id) { if(id != '') - { - if(confirm('Are you sure to delete the rss feed?')) + { + {/literal} + if(confirm('{$APP.DELETE_RSSFEED_CONFIRMATION}')) + {literal} { show('status'); var feed = 'feed_'+id; @@ -103,7 +105,7 @@
Roles{$CMOD.LBL_ROLES}{$MOD.LBL_SETTINGS} > {$CMOD.LBL_ROLES} > {$MOD.LBL_EDIT} "{$ROLENAME}" {$MOD.LBL_SETTINGS} > {$CMOD.LBL_ROLES} > {$MOD.LBL_EDIT} "{$ROLENAME}" {$MOD.LBL_SETTINGS} > {$CMOD.LBL_ROLES} > {$CMOD.LBL_CREATE_NEW_ROLE}{$MOD.LBL_SETTINGS} > {$CMOD.LBL_ROLES} > {$CMOD.LBL_CREATE_NEW_ROLE}
- + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/SelectEmail.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/SelectEmail.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/SelectEmail.tpl Mon Apr 16 12:27:44 2007 @@ -11,59 +11,68 @@ -->*}
-
{$MOD.LBL_ADD_RSS_FEED}vtiger RSS Reader{$MOD.LBL_VTIGER_RSS_READER}
@@ -112,7 +114,7 @@ - +
Feed Sources
{$MOD.LBL_FEED_SOURCES}
{$RSSFEEDS}
- - - - -
{$MOD.SELECT_EMAIL} - {if $ONE_RECORD neq 'true'} - ({$MOD.LBL_MULTIPLE} {$APP[$FROM_MODULE]}) - {/if} -   - {$APP.LBL_CLOSE}
- - - + + + +
- - - - -
- {if $ONE_RECORD eq 'true'} - {$ENTITY_NAME} {$MOD.LBL_MAILSELECT_INFO}.

- {else} - {$MOD.LBL_MAILSELECT_INFO1} {$APP[$FROM_MODULE]}.{$MOD.LBL_MAILSELECT_INFO2}

- {/if} -
- - {foreach name=emailids key=fieldid item=elements from=$MAILINFO} - - {if $smarty.foreach.emailids.iteration eq 1} - - {else} - +
+ + - {else} - - {/if} - - {/foreach} +   + + + +
{$MOD.SELECT_EMAIL} + {if $ONE_RECORD neq 'true'} + ({$MOD.LBL_MULTIPLE} {$APP[$FROM_MODULE]}) {/if} - {if $ONE_RECORD eq 'true'} - {$elements.0}
{$MAILDATA[$smarty.foreach.emailids.iteration]}		{$elements.0}
+ {$APP.LBL_CLOSE} +
+{if $PERMIT eq '0'} + + - +
+ + + +
+ {if $ONE_RECORD eq 'true'} + {$ENTITY_NAME} {$MOD.LBL_MAILSELECT_INFO}.

+ {else} + {$MOD.LBL_MAILSELECT_INFO1} {$APP[$FROM_MODULE]}.{$MOD.LBL_MAILSELECT_INFO2}

+ {/if} +
+ + {foreach name=emailids key=fieldid item=elements from=$MAILINFO} + + {if $smarty.foreach.emailids.iteration eq 1} + + {else} + + {/if} + {if $ONE_RECORD eq 'true'} + + {else} + + {/if} + + {/foreach} +
{$elements.0}
{$MAILDATA[$smarty.foreach.emailids.iteration]}		{$elements.0}
+
+
- -
-
- - - - -
-    - -
- - + + +
+    + +
+{else} + + +
+ + +
+ {$MOD.LBL_MAILSELECT_INFO3} +
+
+{/if} + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/SetMenu.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/SetMenu.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/SetMenu.tpl Mon Apr 16 12:27:44 2007 @@ -1,192 +1,202 @@ -{**} - - - + +
- - - - - - - -
- - - - - - - {if $smarty.request.action eq 'index' || $smarty.request.action eq 'DetailView' || $smarty.request.action eq 'EditView' || $smarty.request.action eq 'ListView' } - - {else} - - {/if} - - {if $smarty.request.action eq 'listroles' || $smarty.request.action eq 'RoleDetailView' || $smarty.request.action eq 'saverole' || $smarty.request.action eq 'createrole' || $smarty.request.action eq 'RoleDeleteStep1'} - - {else} - - {/if} - - {if $smarty.request.action eq 'ListProfiles' || $smarty.request.action eq 'profilePrivileges' || $smarty.request.action eq 'CreateProfile' || $smarty.request.action eq 'SaveProfile' || $smarty.request.action eq 'UpdateProfileChanges' } - - {else} - - {/if} - - {if $smarty.request.action eq 'listgroups' || $smarty.request.action eq 'GroupDetailView' || $smarty.request.action eq 'createnewgroup' || $smarty.request.action eq 'SaveGroup'} - - {else} - - {/if} - - {if $smarty.request.action eq 'OrgSharingEditView' || $smarty.request.action eq 'OrgSharingDetailView' || $smarty.request.action eq 'SaveOrgSharing'} - - {else} - - {/if} - - {if $smarty.request.action eq 'DefaultFieldPermissions' || $smarty.request.action eq 'UpdateDefaultFieldLevelAccess' || $smarty.request.action eq 'EditDefOrgFieldLevelAccess' } - - {else} - - {/if} - - {if $smarty.request.action eq 'AuditTrailList'} - - {else} - - {/if} - - {if $smarty.request.action eq 'ListLoginHistory'} - - {else} - - {/if} - - - - {if $smarty.request.action eq 'CustomFieldList' || $smarty.request.action eq 'LeadCustomFieldMapping'} - - {else} - - {/if} - - {if $smarty.request.action eq 'PickList' || $smarty.request.action eq 'SettingsAjax'} - {else} - - {/if} - - - - {if $smarty.request.action eq 'listemailtemplates' || $smarty.request.action eq 'detailviewemailtemplate' || $smarty.request.action eq 'editemailtemplate' || $smarty.request.action eq 'saveemailtemplate' || $smarty.request.action eq 'deleteemailtemplate' || $smarty.request.action eq 'createemailtemplate'} - - {else} - - {/if} - - {if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'add2db' || $smarty.request.action eq 'deletewordtemplate' || $smarty.request.action eq 'upload'} - - {else} - - {/if} - - {if $smarty.request.action eq 'listnotificationschedulers' || $smarty.request.action eq 'UsersAjax'} - - {else} - - {/if} - - {if $smarty.request.action eq 'listinventorynotifications' || $smarty.request.action eq 'UsersAjax'} - - {else} - - {/if} - - - - - {if $smarty.request.action eq 'OrganizationConfig' || $smarty.request.action eq 'EditCompanyDetails' || $smarty.request.action eq 'add2db'} - - {else} - - {/if} - - {if $smarty.request.action eq 'EmailConfig' || $smarty.request.action eq 'Save' } - - {else} - - {/if} - - {if $smarty.request.action eq 'BackupServerConfig' || $smarty.request.action eq 'Save'} - - {else} - - {/if} - - {if $smarty.request.action eq 'ListModuleOwners' || $smarty.request.action eq 'SettingsAjax'} - - {else} - - {/if} - - {if $smarty.request.action eq 'CurrencyListView' || $smarty.request.action eq 'CurrencyEditView' || $smarty.request.action eq 'SaveCurrencyInfo'} - - {else} - - {/if} - - {if $smarty.request.action eq 'TaxConfig'} - - {else} - - {/if} - - {if $smarty.request.action eq 'listsysconfig'} - - {else} - - {/if} - - {if $smarty.request.action eq 'ProxyServerConfig'} - - {else} - - {/if} - - {if $smarty.request.action eq 'Announcements' || $smarty.request.action eq 'UsersAjax' } - - {else} - - {/if} - - {if $smarty.request.action eq 'DefModuleView'} - - {else} - - {/if} - - - - {if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'} - - {else} - - {/if} - -
{$MOD.LBL_USER_MANAGEMENT}
{$MOD.LBL_USERS}
{$MOD.LBL_USERS}
{$MOD.LBL_ROLES}
{$MOD.LBL_ROLES}
{$MOD.LBL_PROFILES}
{$MOD.LBL_PROFILES}
{$MOD.USERGROUPLIST}
{$MOD.USERGROUPLIST}
{$MOD.LBL_SHARING_ACCESS}
{$MOD.LBL_SHARING_ACCESS}
{$MOD.LBL_FIELDS_ACCESS}
{$MOD.LBL_FIELDS_ACCESS}
{$MOD.LBL_AUDIT_TRAIL}
{$MOD.LBL_AUDIT_TRAIL}
{$MOD.LBL_LOGIN_HISTORY_DETAILS}
{$MOD.LBL_LOGIN_HISTORY_DETAILS}
{$MOD.LBL_STUDIO}
{$MOD.LBL_CUSTOM_FIELDS}
{$MOD.LBL_CUSTOM_FIELDS}
{$MOD.LBL_PICKLIST_EDITOR}
{$MOD.LBL_PICKLIST_EDITOR}
{$MOD.LBL_COMMUNICATION_TEMPLATES}
{$MOD.EMAILTEMPLATES}
{$MOD.EMAILTEMPLATES}
{$MOD.WORDINTEGRATION}
{$MOD.WORDINTEGRATION}
{$MOD.NOTIFICATIONSCHEDULERS}
{$MOD.NOTIFICATIONSCHEDULERS}
{$MOD.INVENTORYNOTIFICATION}
{$MOD.INVENTORYNOTIFICATION}
{$MOD.LBL_OTHER_SETTINGS}
{$MOD.LBL_COMPANY_DETAILS}
{$MOD.LBL_COMPANY_DETAILS}
{$MOD.LBL_MAIL_SERVER_SETTINGS}
{$MOD.LBL_MAIL_SERVER_SETTINGS}
{$MOD.LBL_BACKUP_SERVER_SETTINGS}
{$MOD.LBL_BACKUP_SERVER_SETTINGS}
{$MOD.LBL_MODULE_OWNERS}
{$MOD.LBL_MODULE_OWNERS}
{$MOD.LBL_CURRENCY_SETTINGS}
{$MOD.LBL_CURRENCY_SETTINGS}
{$MOD.LBL_TAX_SETTINGS}
{$MOD.LBL_TAX_SETTINGS}
{$MOD.LBL_SYSTEM_INFO}
{$MOD.LBL_SYSTEM_INFO}
{$MOD.LBL_PROXY_SETTINGS}
{$MOD.LBL_PROXY_SETTINGS}
{$MOD.LBL_ANNOUNCEMENT}
{$MOD.LBL_ANNOUNCEMENT}
{$MOD.LBL_DEFAULT_MODULE_VIEW}
{$MOD.LBL_DEFAULT_MODULE_VIEW}
{$MOD.LBL_MIGRATION}
{$MOD.LBL_INVENTORY_TANDC}
{$MOD.LBL_INVENTORY_TANDC}
- - - 		- - - - +{**} + + + - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/BackupServerContents.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/BackupServerContents.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/BackupServerContents.tpl Mon Apr 16 12:27:44 2007 @@ -59,8 +59,8 @@
+ + + +
+ + + + + + + {if $smarty.request.action eq 'index' || $smarty.request.action eq 'DetailView' || $smarty.request.action eq 'EditView' || $smarty.request.action eq 'ListView' } + + {else} + + {/if} + + {if $smarty.request.action eq 'listroles' || $smarty.request.action eq 'RoleDetailView' || $smarty.request.action eq 'saverole' || $smarty.request.action eq 'createrole' || $smarty.request.action eq 'RoleDeleteStep1'} + + {else} + + {/if} + + {if $smarty.request.action eq 'ListProfiles' || $smarty.request.action eq 'profilePrivileges' || $smarty.request.action eq 'CreateProfile' || $smarty.request.action eq 'SaveProfile' || $smarty.request.action eq 'UpdateProfileChanges' } + + {else} + + {/if} + + {if $smarty.request.action eq 'listgroups' || $smarty.request.action eq 'GroupDetailView' || $smarty.request.action eq 'createnewgroup' || $smarty.request.action eq 'SaveGroup'} + + {else} + + {/if} + + {if $smarty.request.action eq 'OrgSharingEditView' || $smarty.request.action eq 'OrgSharingDetailView' || $smarty.request.action eq 'SaveOrgSharing'} + + {else} + + {/if} + + {if $smarty.request.action eq 'DefaultFieldPermissions' || $smarty.request.action eq 'UpdateDefaultFieldLevelAccess' || $smarty.request.action eq 'EditDefOrgFieldLevelAccess' } + + {else} + + {/if} + + {if $smarty.request.action eq 'AuditTrailList'} + + {else} + + {/if} + + {if $smarty.request.action eq 'ListLoginHistory'} + + {else} + + {/if} + + + + {if $smarty.request.action eq 'CustomFieldList' || $smarty.request.action eq 'LeadCustomFieldMapping'} + + {else} + + {/if} + + {if $smarty.request.action eq 'PickList' || $smarty.request.action eq 'SettingsAjax'} + {else} + + {/if} + + + + {if $smarty.request.action eq 'listemailtemplates' || $smarty.request.action eq 'detailviewemailtemplate' || $smarty.request.action eq 'editemailtemplate' || $smarty.request.action eq 'saveemailtemplate' || $smarty.request.action eq 'deleteemailtemplate' || $smarty.request.action eq 'createemailtemplate'} + + {else} + + {/if} + + {if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'savewordtemplate' || $smarty.request.action eq 'deletewordtemplate' || $smarty.request.action eq 'upload'} + + {else} + + {/if} + + {if $smarty.request.action eq 'listnotificationschedulers' || $smarty.request.action eq 'SettingsAjax'} + + {else} + + {/if} + + {if $smarty.request.action eq 'listinventorynotifications' || $smarty.request.action eq 'SettingsAjax'} + + {else} + + {/if} + + + + + {if $smarty.request.action eq 'OrganizationConfig' || $smarty.request.action eq 'EditCompanyDetails' || $smarty.request.action eq 'add2db'} + + {else} + + {/if} + + {if $smarty.request.action eq 'EmailConfig' || $smarty.request.action eq 'Save' } + + {else} + + {/if} + + {if $smarty.request.action eq 'BackupServerConfig' || $smarty.request.action eq 'Save'} + + {else} + + {/if} + + {if $smarty.request.action eq 'ListModuleOwners' || $smarty.request.action eq 'SettingsAjax'} + + {else} + + {/if} + + {if $smarty.request.action eq 'CurrencyListView' || $smarty.request.action eq 'CurrencyEditView' || $smarty.request.action eq 'SaveCurrencyInfo'} + + {else} + + {/if} + + {if $smarty.request.action eq 'TaxConfig'} + + {else} + + {/if} + + {if $smarty.request.action eq 'listsysconfig'} + + {else} + + {/if} + + {if $smarty.request.action eq 'ProxyServerConfig'} + + {else} + + {/if} + + {if $smarty.request.action eq 'Announcements' || $smarty.request.action eq 'SettingsAjax' } + + {else} + + {/if} + + {if $smarty.request.action eq 'DefModuleView'} + + {else} + + {/if} + + + + {if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'} + + {else} + + {/if} + + + + {if $smarty.request.action eq 'CustomInvoiceNo'} + + {else} + + {/if} + + + +
{$MOD.LBL_USER_MANAGEMENT}
{$MOD.LBL_USERS}
{$MOD.LBL_USERS}
{$MOD.LBL_ROLES}
{$MOD.LBL_ROLES}
{$MOD.LBL_PROFILES}
{$MOD.LBL_PROFILES}
{$MOD.USERGROUPLIST}
{$MOD.USERGROUPLIST}
{$MOD.LBL_SHARING_ACCESS}
{$MOD.LBL_SHARING_ACCESS}
{$MOD.LBL_FIELDS_ACCESS}
{$MOD.LBL_FIELDS_ACCESS}
{$MOD.LBL_AUDIT_TRAIL}
{$MOD.LBL_AUDIT_TRAIL}
{$MOD.LBL_LOGIN_HISTORY_DETAILS}
{$MOD.LBL_LOGIN_HISTORY_DETAILS}
{$MOD.LBL_STUDIO}
{$MOD.LBL_CUSTOM_FIELDS}
{$MOD.LBL_CUSTOM_FIELDS}
{$MOD.LBL_PICKLIST_EDITOR}
{$MOD.LBL_PICKLIST_EDITOR}
{$MOD.LBL_COMMUNICATION_TEMPLATES}
{$MOD.EMAILTEMPLATES}
{$MOD.EMAILTEMPLATES}
{$MOD.WORDINTEGRATION}
{$MOD.WORDINTEGRATION}
{$MOD.NOTIFICATIONSCHEDULERS}
{$MOD.NOTIFICATIONSCHEDULERS}
{$MOD.INVENTORYNOTIFICATION}
{$MOD.INVENTORYNOTIFICATION}
{$MOD.LBL_OTHER_SETTINGS}
{$MOD.LBL_COMPANY_DETAILS}
{$MOD.LBL_COMPANY_DETAILS}
{$MOD.LBL_MAIL_SERVER_SETTINGS}
{$MOD.LBL_MAIL_SERVER_SETTINGS}
{$MOD.LBL_BACKUP_SERVER_SETTINGS}
{$MOD.LBL_BACKUP_SERVER_SETTINGS}
{$MOD.LBL_MODULE_OWNERS}
{$MOD.LBL_MODULE_OWNERS}
{$MOD.LBL_CURRENCY_SETTINGS}
{$MOD.LBL_CURRENCY_SETTINGS}
{$MOD.LBL_TAX_SETTINGS}
{$MOD.LBL_TAX_SETTINGS}
{$MOD.LBL_SYSTEM_INFO}
{$MOD.LBL_SYSTEM_INFO}
{$MOD.LBL_PROXY_SETTINGS}
{$MOD.LBL_PROXY_SETTINGS}
{$MOD.LBL_ANNOUNCEMENT}
{$MOD.LBL_ANNOUNCEMENT}
{$MOD.LBL_DEFAULT_MODULE_VIEW}
{$MOD.LBL_DEFAULT_MODULE_VIEW}
{$MOD.LBL_MIGRATION}
{$MOD.LBL_INVENTORY_TANDC}
{$MOD.LBL_INVENTORY_TANDC}
{$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER}
{$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER}
+ + + 		+ + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings.tpl Mon Apr 16 12:27:44 2007 @@ -1,507 +1,527 @@ -{**} - - {include file="Buttons_List1.tpl"} - - - - - - - -
-
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - {$MOD.LBL_USER_MANAGEMENT} -
- - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - -
{$MOD.LBL_USERS}{$MOD.LBL_USERS}
{$MOD.LBL_USER_DESCRIPTION}
- 		- - - - - - - - - - -
{$MOD.LBL_ROLES}{$MOD.LBL_ROLES}
{$MOD.LBL_ROLE_DESCRIPTION}
- - 		- - - - - - - - - - -
{$MOD.LBL_PROFILES}{$MOD.LBL_PROFILES}
{$MOD.LBL_PROFILE_DESCRIPTION}
- 		- - - - - - - - - - -
{$MOD.USERGROUPLIST}{$MOD.USERGROUPLIST}
{$MOD.LBL_GROUP_DESCRIPTION}
- -
- - - - - - - - - - -
{$MOD.LBL_SHARING_ACCESS}{$MOD.LBL_SHARING_ACCESS}
{$MOD.LBL_SHARING_ACCESS_DESCRIPTION}
- 		- - - - - - - - - - - -
Fields to be shown{$MOD.LBL_FIELDS_ACCESS}
{$MOD.LBL_SHARING_FIELDS_DESCRIPTION}
- 		- - - - - - - - - - -
{$MOD.LBL_AUDIT_TRAIL}{$MOD.LBL_AUDIT_TRAIL}
{$MOD.LBL_AUDIT_DESCRIPTION}
- - - 		- - - - - - - - - - -
{$MOD.LBL_LOGIN_HISTORY_DETAILS}{$MOD.LBL_LOGIN_HISTORY_DETAILS}
{$MOD.LBL_LOGIN_HISTORY_DESCRIPTION}
-
- - -
- - - {$MOD.LBL_STUDIO} -
- - - - - - - - - - - -
- - - - - - - - - - -
{$MOD.LBL_CUSTOM_FIELDS}{$MOD.LBL_CUSTOM_FIELDS}
{$MOD.LBL_CUSTOM_FIELDS_DESCRIPTION}
- 		- - - - - - - - - - -
{$MOD.LBL_PICKLIST_EDITOR}{$MOD.LBL_PICKLIST_EDITOR}
{$MOD.LBL_PICKLIST_DESCRIPTION}
- 		- - - - - - - - - - -
  
 
- 		- - - - - - - - - - -
  
 
-
- - -
- - {$MOD.LBL_COMMUNICATION_TEMPLATES} -
- - - - - - - - - - -
- - - - - - - - - - -
{$MOD.EMAILTEMPLATES}{$MOD.EMAILTEMPLATES}
{$MOD.LBL_EMAIL_TEMPLATE_DESCRIPTION}
- 		- - - - - - - - - - - -
{$MOD.LBL_MAIL_MERGE}{$MOD.WORDINTEGRATION}
{$MOD.LBL_MAIL_MERGE_DESCRIPTION}
- 		- - - - - - - - - - -
{$MOD.NOTIFICATIONSCHEDULERS}{$MOD.NOTIFICATIONSCHEDULERS}
{$MOD.LBL_NOTIF_SCHED_DESCRIPTION}
- 		- - - - - - - - - - - -
{$MOD.INVENTORYNOTIFICATION}{$MOD.INVENTORYNOTIFICATION}
{$MOD.LBL_INV_NOTIF_DESCRIPTION}
-
- - -
- - {$MOD.LBL_OTHER_SETTINGS} -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - -
{$MOD.LBL_COMPANY_DETAILS}{$MOD.LBL_COMPANY_DETAILS}
{$MOD.LBL_COMPANY_DESCRIPTION}
- - 		- - - - - - - - - - -
{$MOD.LBL_MAIL_SERVER_SETTINGS}{$MOD.LBL_MAIL_SERVER_SETTINGS}
{$MOD.LBL_MAIL_SERVER_DESCRIPTION}
- 		- - - - - - - - - - -
{$MOD.LBL_BACKUP_SERVER_SETTINGS}{$MOD.LBL_BACKUP_SERVER_SETTINGS}
{$MOD.LBL_BACKUP_SERVER_DESCRIPTION}
- - 		- - - - - - - - - - -
{$MOD.LBL_ASSIGN_MODULE_OWNERS}{$MOD.LBL_MODULE_OWNERS}
{$MOD.LBL_MODULE_OWNERS_DESCRIPTION}
-
- - - - - - - - - - -
{$MOD.LBL_CURRENCY_SETTINGS}{$MOD.LBL_CURRENCY_SETTINGS}
{$MOD.LBL_CURRENCY_DESCRIPTION}
- 		- - - - - - - - - - -
{$MOD.LBL_TAX_SETTINGS}{$MOD.LBL_TAX_SETTINGS}
{$MOD.LBL_TAX_DESCRIPTION}
- 		- - - - - - - - - - -
{$MOD.LBL_SYSTEM_INFO}{$MOD.LBL_SYSTEM_INFO}
{$MOD.LBL_SYSTEM_DESCRIPTION}
- 		- - - - - - - - - - - -
{$MOD.LBL_PROXY_SETTINGS}{$MOD.LBL_PROXY_SETTINGS}
{$MOD.LBL_PROXY_DESCRIPTION}
-
- - - - - - - - - - -
{$MOD.LBL_ANNOUNCEMENT}{$MOD.LBL_ANNOUNCEMENT}
{$MOD.LBL_ANNOUNCEMENT_DESCRIPTION}
- 		- - - - - - - - - - -
{$MOD.LBL_DEFAULT_MODULE_VIEW}{$MOD.LBL_DEFAULT_MODULE_VIEW}
{$MOD.LBL_DEFAULT_MODULE_VIEW_DESC}
- 		- - - - - - - -
{$MOD.LBL_MIGRATION}{$MOD.LBL_MIGRATION}
{$MOD.LBL_MIGRATION_INFO}
 - - - - - - - - - - -
{$MOD.INVENTORYTERMSANDCONDITIONS}{$MOD.LBL_INVENTORY_TANDC}
{$MOD.LBL_INV_TANDC_DESCRIPTION}
- -
- -
-
-
- -
- - - +{**} + + {include file="Buttons_List1.tpl"} + + + + + + + +
+
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + {$MOD.LBL_USER_MANAGEMENT} +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
{$MOD.LBL_USERS}{$MOD.LBL_USERS}
{$MOD.LBL_USER_DESCRIPTION}
+ 		+ + + + + + + + + + +
{$MOD.LBL_ROLES}{$MOD.LBL_ROLES}
{$MOD.LBL_ROLE_DESCRIPTION}
+ + 		+ + + + + + + + + + +
{$MOD.LBL_PROFILES}{$MOD.LBL_PROFILES}
{$MOD.LBL_PROFILE_DESCRIPTION}
+ 		+ + + + + + + + + + +
{$MOD.USERGROUPLIST}{$MOD.USERGROUPLIST}
{$MOD.LBL_GROUP_DESCRIPTION}
+ +
+ + + + + + + + + + +
{$MOD.LBL_SHARING_ACCESS}{$MOD.LBL_SHARING_ACCESS}
{$MOD.LBL_SHARING_ACCESS_DESCRIPTION}
+ 		+ + + + + + + + + + + +
{$MOD.LBL_FIELDS_TO_BE_SHOWN}{$MOD.LBL_FIELDS_ACCESS}
{$MOD.LBL_SHARING_FIELDS_DESCRIPTION}
+ 		+ + + + + + + + + + +
{$MOD.LBL_AUDIT_TRAIL}{$MOD.LBL_AUDIT_TRAIL}
{$MOD.LBL_AUDIT_DESCRIPTION}
+ + + 		+ + + + + + + + + + +
{$MOD.LBL_LOGIN_HISTORY_DETAILS}{$MOD.LBL_LOGIN_HISTORY_DETAILS}
{$MOD.LBL_LOGIN_HISTORY_DESCRIPTION}
+
+ + +
+ + + {$MOD.LBL_STUDIO} +
+ + + + + + + + + + + +
+ + + + + + + + + + +
{$MOD.LBL_CUSTOM_FIELDS}{$MOD.LBL_CUSTOM_FIELDS}
{$MOD.LBL_CUSTOM_FIELDS_DESCRIPTION}
+ 		+ + + + + + + + + + +
{$MOD.LBL_PICKLIST_EDITOR}{$MOD.LBL_PICKLIST_EDITOR}
{$MOD.LBL_PICKLIST_DESCRIPTION}
+ 		+ + + + + + + + + + +
  
 
+ 		+ + + + + + + + + + +
  
 
+
+ + +
+ + {$MOD.LBL_COMMUNICATION_TEMPLATES} +
+ + + + + + + + + + +
+ + + + + + + + + + +
{$MOD.EMAILTEMPLATES}{$MOD.EMAILTEMPLATES}
{$MOD.LBL_EMAIL_TEMPLATE_DESCRIPTION}
+ 		+ + + + + + + + + + + +
{$MOD.LBL_MAIL_MERGE}{$MOD.WORDINTEGRATION}
{$MOD.LBL_MAIL_MERGE_DESCRIPTION}
+ 		+ + + + + + + + + + +
{$MOD.NOTIFICATIONSCHEDULERS}{$MOD.NOTIFICATIONSCHEDULERS}
{$MOD.LBL_NOTIF_SCHED_DESCRIPTION}
+ 		+ + + + + + + + + + + +
{$MOD.INVENTORYNOTIFICATION}{$MOD.INVENTORYNOTIFICATION}
{$MOD.LBL_INV_NOTIF_DESCRIPTION}
+
+ + +
+ + {$MOD.LBL_OTHER_SETTINGS} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
{$MOD.LBL_COMPANY_DETAILS}{$MOD.LBL_COMPANY_DETAILS}
{$MOD.LBL_COMPANY_DESCRIPTION}
+ + 		+ + + + + + + + + + +
{$MOD.LBL_MAIL_SERVER_SETTINGS}{$MOD.LBL_MAIL_SERVER_SETTINGS}
{$MOD.LBL_MAIL_SERVER_DESCRIPTION}
+ 		+ + + + + + + + + + +
{$MOD.LBL_BACKUP_SERVER_SETTINGS}{$MOD.LBL_BACKUP_SERVER_SETTINGS}
{$MOD.LBL_BACKUP_SERVER_DESCRIPTION}
+ + 		+ + + + + + + + + + +
{$MOD.LBL_ASSIGN_MODULE_OWNERS}{$MOD.LBL_MODULE_OWNERS}
{$MOD.LBL_MODULE_OWNERS_DESCRIPTION}
+
+ + + + + + + + + + +
{$MOD.LBL_CURRENCY_SETTINGS}{$MOD.LBL_CURRENCY_SETTINGS}
{$MOD.LBL_CURRENCY_DESCRIPTION}
+ 		+ + + + + + + + + + +
{$MOD.LBL_TAX_SETTINGS}{$MOD.LBL_TAX_SETTINGS}
{$MOD.LBL_TAX_DESCRIPTION}
+ 		+ + + + + + + + + + +
{$MOD.LBL_SYSTEM_INFO}{$MOD.LBL_SYSTEM_INFO}
{$MOD.LBL_SYSTEM_DESCRIPTION}
+ 		+ + + + + + + + + + + +
{$MOD.LBL_PROXY_SETTINGS}{$MOD.LBL_PROXY_SETTINGS}
{$MOD.LBL_PROXY_DESCRIPTION}
+
+ + + + + + + + + + +
{$MOD.LBL_ANNOUNCEMENT}{$MOD.LBL_ANNOUNCEMENT}
{$MOD.LBL_ANNOUNCEMENT_DESCRIPTION}
+ 		+ + + + + + + + + + +
{$MOD.LBL_DEFAULT_MODULE_VIEW}{$MOD.LBL_DEFAULT_MODULE_VIEW}
{$MOD.LBL_DEFAULT_MODULE_VIEW_DESC}
+ 		+ + + + + + + +
{$MOD.LBL_MIGRATION}{$MOD.LBL_MIGRATION}
{$MOD.LBL_MIGRATION_INFO}
 + + + + + + + + + + +
{$MOD.INVENTORYTERMSANDCONDITIONS}{$MOD.LBL_INVENTORY_TANDC}
{$MOD.LBL_INV_TANDC_DESCRIPTION}
+ +
+ + + + + + + + + + + +
{$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER}{$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER}
{$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER_DESCRIPTION}
+
+ +
+
+
+ +
+ + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/Announcements.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/Announcements.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/Announcements.tpl Mon Apr 16 12:27:44 2007 @@ -18,11 +18,15 @@ { $("an_busy").style.display="inline"; var announcement=$("announcement").value; + + //Replace & with ##$## and do vice versa in modules/Settings/SettingsAjax.php. if we pass as it is, request of announcement will be skipped after & + announcement = announcement.replace(/&/g,"##$##");//replace('&','##$##'); + new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody: 'module=Users&action=UsersAjax&announcement='+announcement+'&announce_save=yes', + postBody: 'module=Settings&action=SettingsAjax&announcement='+announcement+'&announce_save=yes', onComplete: function(response) { $("announcement").innerHTML=response.responseText; $("an_busy").style.display="none"; @@ -73,9 +77,9 @@
- +
Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/BackupServer.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/BackupServer.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/BackupServer.tpl Mon Apr 16 12:27:44 2007 @@ -28,7 +28,7 @@
Users{$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_BACKUP_SERVER_SETTINGS}
- + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/EmailConfig.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/EmailConfig.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/EmailConfig.tpl Mon Apr 16 12:27:44 2007 @@ -36,7 +36,7 @@
- + @@ -132,11 +132,11 @@
Users{$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_MAIL_SERVER_SETTINGS}
- +
@@ -164,8 +164,10 @@ { if(form.server.value =='') { - alert("Server Name cannot be empty") - return false; + {/literal} + alert("{$APP.SERVERNAME_CANNOT_BE_EMPTY}") + return false; + {literal} } return true; } Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/EmailNotification.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/EmailNotification.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/EmailNotification.tpl Mon Apr 16 12:27:44 2007 @@ -47,7 +47,7 @@ - + @@ -110,7 +110,7 @@ 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody: 'action=UsersAjax&module=Users&file=SaveNotification&active='+active+'¬ifysubject='+subject+'¬ifybody='+body+'&record='+id, + postBody: 'action=SettingsAjax&module=Settings&file=SaveNotification&active='+active+'¬ifysubject='+subject+'¬ifybody='+body+'&record='+id, onComplete: function(response) { $("status").style.display="none"; $("notifycontents").innerHTML=response.responseText; @@ -126,7 +126,7 @@ 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody:'action=UsersAjax&module=Users&file=EditNotification&record='+id, + postBody:'action=SettingsAjax&module=Settings&file=EditNotification&record='+id, onComplete: function(response) { $("status").style.display="none"; $("editdiv").innerHTML=response.responseText; Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/InventoryNotify.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/InventoryNotify.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/InventoryNotify.tpl Mon Apr 16 12:27:44 2007 @@ -47,7 +47,7 @@
Users{$MOD.LBL_MODULE_NAME} {$MOD.LBL_SETTINGS} > {$MOD.NOTIFICATIONSCHEDULERS}  
- + @@ -104,7 +104,7 @@ 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody: 'action=UsersAjax&module=Users&file=SaveInventoryNotification¬ifysubject='+subject+'¬ifybody='+body+'&record='+id, + postBody: 'action=SettingsAjax&module=Settings&file=SaveInventoryNotification¬ifysubject='+subject+'¬ifybody='+body+'&record='+id, onComplete: function(response) { $("status").style.display="none"; } @@ -119,7 +119,7 @@ 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody: 'action=UsersAjax&module=Users&file=EditInventoryNotification&record='+id, + postBody: 'action=SettingsAjax&module=Settings&file=EditInventoryNotification&record='+id, onComplete: function(response) { $("status").style.display="none"; $("editdiv").innerHTML=response.responseText; Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/InventoryTerms.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/InventoryTerms.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/InventoryTerms.tpl Mon Apr 16 12:27:44 2007 @@ -18,7 +18,7 @@ - -
Users{$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.INVENTORYNOTIFICATION}  

- + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/ModuleOwners.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/ModuleOwners.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/ModuleOwners.tpl Mon Apr 16 12:27:44 2007 @@ -24,7 +24,7 @@ - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/PickList.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/PickList.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/PickList.tpl Mon Apr 16 12:27:44 2007 @@ -1,259 +1,267 @@ -{**} - - - - - -
-
Users{$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_MODULE_OWNERS}
- - - - -
-
-
- - {include file='SetMenu.tpl'} - - - - - - - - - -
{$MOD.LBL_SETTINGS} > {$MOD.LBL_PICKLIST_EDITOR}
{$MOD.LBL_PICKLIST_DESCRIPTION}
- - - - - - -
- - - - - - -
1. {$MOD.LBL_SELECT_MODULE} 
- - - - - -
{$MOD.LBL_SELECT_CRM_MODULE} - -
-
- - - - - -
-
- {include file='Settings/PickListContents.tpl'} -
-
- - -
{$MOD.LBL_SCROLL}
- -
- - - -
-
- - - -
-
-{literal} - -{/literal} +{**} + + + + + +
+ + + + + +
+
+
+ + {include file='SetMenu.tpl'} + + + + + + + + + +
{$MOD.LBL_SETTINGS} > {$MOD.LBL_PICKLIST_EDITOR}
{$MOD.LBL_PICKLIST_DESCRIPTION}
+ + + + + + +
+ + + + + + +
1. {$MOD.LBL_SELECT_MODULE} 
+ + + + + +
{$MOD.LBL_SELECT_CRM_MODULE} + +
+
+ + + + + +
+
+ {include file='Settings/PickListContents.tpl'} +
+
+ + +
{$MOD.LBL_SCROLL}
+ +
+ + + +
+
+ + + +
+
+{literal} + +{/literal} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/ProxyServer.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/ProxyServer.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/ProxyServer.tpl Mon Apr 16 12:27:44 2007 @@ -27,7 +27,7 @@ - proxy + {$MOD.LBL_PROXY} {$MOD.LBL_SETTINGS} > {$MOD.LBL_PROXY_SERVER_SETTINGS} @@ -63,20 +63,20 @@ *{$MOD.LBL_SERVER_ADDRESS} - + *{$MOD.LBL_PROXY_PORT} - + *{$MOD.LBL_USERNAME} - + @@ -116,11 +116,11 @@ - +
Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/TaxConfig.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/TaxConfig.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/TaxConfig.tpl Mon Apr 16 12:27:44 2007 @@ -1,262 +1,268 @@ -{**} - - - - - -{literal} - -{/literal} -
- - - - - - -
-
-
- - {include file='SetMenu.tpl'} - -{if $EDIT_MODE eq 'true'} - {assign var=formname value='EditTax'} - {assign var=shformname value='SHEditTax'} -{else} - {assign var=formname value='ListTax'} - {assign var=shformname value='SHListTax'} -{/if} - - - - - - - - - - - -
Users{$MOD.LBL_SETTINGS} > - {if $EDIT_MODE eq 'true'} - {$MOD.LBL_EDIT} {$MOD.LBL_TAX_SETTINGS} - {else} - {$MOD.LBL_TAX_SETTINGS} - {/if} - -
{$MOD.LBL_TAX_DESC}
- -
- - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
{$MOD.LBL_PRODUCT_TAX_SETTINGS}
  - {if $EDIT_MODE neq 'true'} - - {/if} - - {if $EDIT_MODE eq 'true'} -   - - {elseif $TAX_COUNT > 0} - - {/if} -
- - - - - {if $TAX_COUNT eq 0} - - {else} - {foreach item=tax key=count from=$TAX_VALUES} - - - {if $tax.deleted eq 0} - - {else} - - {/if} - - - {assign var=tax_label value="taxlabel_"|cat:$tax.taxname} - - - - - - {/foreach} - {if $EDIT_MODE eq 'true'} - - {/if} - {/if} -
No taxes available. Please Add Tax.
- {if $EDIT_MODE eq 'true'} - - {else} - {$tax.taxlabel} - {/if} - - {if $EDIT_MODE eq 'true'} -  % - {else} - {$tax.percentage} % - {/if} - - {if $tax.deleted eq 0} - Enable me - {else} - Enable me - {/if} -
- - - 		-
- - - - - - - - - - - - - - - - - -
{$MOD.LBL_SHIPPING_HANDLING_TAX_SETTINGS}
  - {if $SH_EDIT_MODE neq 'true'} - - {/if} - - {if $SH_EDIT_MODE eq 'true'} - -   - - {elseif $SH_TAX_COUNT > 0} - - {/if} -
- - - - - {if $SH_TAX_COUNT eq 0} - - {else} - {foreach item=tax key=count from=$SH_TAX_VALUES} - - - {if $tax.deleted eq 0} - - {else} - - {/if} - - {assign var=tax_label value="taxlabel_"|cat:$tax.taxname} - - - - - {/foreach} - {if $SH_EDIT_MODE eq 'true'} - - {/if} - {/if} -
No taxes available. Please Add Tax.
- {if $SH_EDIT_MODE eq 'true'} - - - {else} - {$tax.taxlabel} - {/if} - - {if $SH_EDIT_MODE eq 'true'} - -  % - {else} - {$tax.percentage} % - {/if} - - {if $tax.deleted eq 0} - Enable me - {else} - Enable me - {/if} -
- -
-
- - - - - -
{$MOD.LBL_SCROLL}
- - - - -
- - - - - - - - - - +{**} + + + + + +{literal} + +{/literal} +
+ + + + + + +
+
+
+ + {include file='SetMenu.tpl'} + +{if $EDIT_MODE eq 'true'} + {assign var=formname value='EditTax'} + {assign var=shformname value='SHEditTax'} +{else} + {assign var=formname value='ListTax'} + {assign var=shformname value='SHListTax'} +{/if} + + + + + + + + + + + +
{$MOD.LBL_USERS}{$MOD.LBL_SETTINGS} > + {if $EDIT_MODE eq 'true'} + {$MOD.LBL_EDIT} {$MOD.LBL_TAX_SETTINGS} + {else} + {$MOD.LBL_TAX_SETTINGS} + {/if} + +
{$MOD.LBL_TAX_DESC}
+ +
+ + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + +
{$MOD.LBL_PRODUCT_TAX_SETTINGS}
  + {if $EDIT_MODE neq 'true'} + + {/if} + + {if $EDIT_MODE eq 'true'} +   + + {elseif $TAX_COUNT > 0} + + {/if} +
+ + + + + {if $TAX_COUNT eq 0} + + {else} + {foreach item=tax key=count from=$TAX_VALUES} + + + {if $tax.deleted eq 0} + + {else} + + {/if} + + + {assign var=tax_label value="taxlabel_"|cat:$tax.taxname} + + + + + + {/foreach} + {if $EDIT_MODE eq 'true'} + + {/if} + {/if} +
{$MOD.LBL_NO_TAXES_AVAILABLE}. {$MOD.LBL_PLEASE} {$MOD.LBL_ADD_TAX_BUTTON}.
+ {if $EDIT_MODE eq 'true'} + + {else} + {$tax.taxlabel} + {/if} + + {if $EDIT_MODE eq 'true'} +  % + {else} + {$tax.percentage} % + {/if} + + {if $tax.deleted eq 0} + {$MOD.LBL_ENABLE} + {else} + {$MOD.LBL_ENABLE} + {/if} +
+ +
+ 		+
+ + + + + + + + + + + + + + + + + +
{$MOD.LBL_SHIPPING_HANDLING_TAX_SETTINGS}
  + {if $SH_EDIT_MODE neq 'true'} + + {/if} + + {if $SH_EDIT_MODE eq 'true'} + +   + + {elseif $SH_TAX_COUNT > 0} + + {/if} +
+ + + + + {if $SH_TAX_COUNT eq 0} + + {else} + {foreach item=tax key=count from=$SH_TAX_VALUES} + + + {if $tax.deleted eq 0} + + {else} + + {/if} + + {assign var=tax_label value="taxlabel_"|cat:$tax.taxname} + + + + + {/foreach} + {if $SH_EDIT_MODE eq 'true'} + + {/if} + {/if} +
{$MOD.LBL_NO_TAXES_AVAILABLE}. {$MOD.LBL_PLEASE} {$MOD.LBL_ADD_TAX_BUTTON}.
+ {if $SH_EDIT_MODE eq 'true'} + + + {else} + {$tax.taxlabel} + {/if} + + {if $SH_EDIT_MODE eq 'true'} + +  % + {else} + {$tax.percentage} % + {/if} + + {if $tax.deleted eq 0} + {$MOD.LBL_ENABLE} + {else} + {$MOD.LBL_DISABLE} + {/if} +
+ +
+
+ + + + + +
{$MOD.LBL_SCROLL}
+ + + + +
+ + + + + + + + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ShowAuditTrail.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ShowAuditTrail.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ShowAuditTrail.tpl Mon Apr 16 12:27:44 2007 @@ -14,7 +14,7 @@
- + @@ -50,7 +50,7 @@ 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody: 'module=Users&action=UsersAjax&file=ShowAuditTrail&ajax=true&'+url+'&userid='+userid, + postBody: 'module=Settings&action=SettingsAjax&file=ShowAuditTrail&ajax=true&'+url+'&userid='+userid, onComplete: function(response) { $("AuditTrailContents").innerHTML= response.responseText; } Modified: vtigercrm/branches/5.1_jens/Smarty/templates/SysInformation.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/SysInformation.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/SysInformation.tpl Mon Apr 16 12:27:44 2007 @@ -21,7 +21,7 @@
- + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/UserDetailView.tpl Mon Apr 16 12:27:44 2007 @@ -1,359 +1,360 @@ -{**} - - - - - - - - -
- -
Users{$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_SYSTEM_INFO}
- - - - - -
-
-
- {if $CATEGORY eq 'Settings'} - {include file='SetMenu.tpl'} - {/if} - - - - -
- - - - - - - {if $CATEGORY neq 'Settings'} - - {/if} - - - - - - - {if $CATEGORY eq 'Settings'} - - {/if} - - - - - - - - - - - - - - -
- - - - - - - - - - -
- {if $CATEGORY eq 'Settings'} - - {$MOD.LBL_SETTINGS} > {$MOD.LBL_USERS} >"{$USERNAME}" - {else} - - {$APP.LBL_MY_PREFERENCES} - - {/if} - -
{$UMOD.LBL_USERDETAIL_INFO} "{$USERNAME}"
-
 
- {if $IS_ADMIN eq 'true'} - - {/if} - {if $CATEGORY eq 'Settings'} - {$DUPLICATE_BUTTON} - {/if} - {$EDIT_BUTTON} - {if $CATEGORY eq 'Settings' && $ID neq 1 && $ID neq 2 & $ID neq $CURRENT_USERID} - - {/if} -
- - - - - -
- {foreach key=header name=blockforeach item=detail from=$BLOCKS} -
- - - {strip} - - - {/strip} - -
- {$smarty.foreach.blockforeach.iteration}. {$header} -  
- - - {foreach item=detail from=$detail} - - {foreach key=label item=data from=$detail} - {assign var=keyid value=$data.ui} - {assign var=keyval value=$data.value} - {assign var=keytblname value=$data.tablename} - {assign var=keyfldname value=$data.fldname} - {assign var=keyoptions value=$data.options} - {assign var=keysecid value=$data.secid} - {assign var=keyseclink value=$data.link} - {assign var=keycursymb value=$data.cursymb} - {assign var=keysalut value=$data.salut} - {assign var=keycntimage value=$data.cntimage} - {assign var=keyadmin value=$data.isadmin} - - {if $label ne ''} - - {include file="DetailViewUI.tpl"} - {else} - - - {/if} - {/foreach} - - {/foreach} -
{$label}  
- {/foreach} - - {include file="UserDetailOrg.tpl"} - -
- - - - - - -
- 6. {$UMOD.LBL_HOME_PAGE_COMP} - {$APP.LBL_EXPAND_COLLAPSE}
- - - -
- - - - - - -
- 7. {$UMOD.LBL_MY_GROUPS} - - {if $GROUP_COUNT > 0} - {$APP.LBL_EXPAND_COLLAPSE} - {else} -   - {/if} -
- - - -
-
- - {if $IS_ADMIN eq 'true'} - - - - - -
- 8. {$UMOD.LBL_LOGIN_HISTORY} - {$APP.LBL_EXPAND_COLLAPSE}
- - - -
-
- {/if} -
- - -
- - - -
- - -
-
- - - - - - - - - - - - - -
-{$JAVASCRIPT} -
- - - - +{**} + + + + + + + + +
+ + + + + + + +
+
+
+ {if $CATEGORY eq 'Settings'} + {include file='SetMenu.tpl'} + {/if} + + + + +
+
+ + + + + + {if $CATEGORY neq 'Settings'} + + {/if} + + + + + + + {if $CATEGORY eq 'Settings'} + + {/if} + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+ {if $CATEGORY eq 'Settings'} + + {$MOD.LBL_SETTINGS} > {$MOD.LBL_USERS} >"{$USERNAME}" + {else} + + {$APP.LBL_MY_PREFERENCES} + + {/if} + +
{$UMOD.LBL_USERDETAIL_INFO} "{$USERNAME}"
+
 
+ {if $IS_ADMIN eq 'true'} + + {/if} + {if $CATEGORY eq 'Settings'} + {$DUPLICATE_BUTTON} + {/if} + {$EDIT_BUTTON} + {if $CATEGORY eq 'Settings' && $ID neq 1 && $ID neq 2 & $ID neq $CURRENT_USERID} + + {/if} +
+ + + + + +
+ {foreach key=header name=blockforeach item=detail from=$BLOCKS} +
+ + + {strip} + + + {/strip} + +
+ {$smarty.foreach.blockforeach.iteration}. {$header} +  
+ + + {foreach item=detail from=$detail} + + {foreach key=label item=data from=$detail} + {assign var=keyid value=$data.ui} + {assign var=keyval value=$data.value} + {assign var=keytblname value=$data.tablename} + {assign var=keyfldname value=$data.fldname} + {assign var=keyoptions value=$data.options} + {assign var=keysecid value=$data.secid} + {assign var=keyseclink value=$data.link} + {assign var=keycursymb value=$data.cursymb} + {assign var=keysalut value=$data.salut} + {assign var=keycntimage value=$data.cntimage} + {assign var=keyadmin value=$data.isadmin} + + {if $label ne ''} + + {include file="DetailViewUI.tpl"} + {else} + + + {/if} + {/foreach} + + {/foreach} +
{$label}  
+ {/foreach} + + {include file="UserDetailOrg.tpl"} + +
+ + + + + + +
+ 6. {$UMOD.LBL_HOME_PAGE_COMP} + {$APP.LBL_EXPAND_COLLAPSE}
+ + + +
+ + + + + + +
+ 7. {$UMOD.LBL_MY_GROUPS} + + {if $GROUP_COUNT > 0} + {$APP.LBL_EXPAND_COLLAPSE} + {else} +   + {/if} +
+ + + +
+
+ + {if $IS_ADMIN eq 'true'} + + + + + +
+ 8. {$UMOD.LBL_LOGIN_HISTORY} + {$APP.LBL_EXPAND_COLLAPSE}
+ + + +
+
+ {/if} +
+ + +
+ +
+ +
+ + +
+
+ + + + + + + + + + + + + +
+{$JAVASCRIPT} +
+ + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/UserEditView.tpl Mon Apr 16 12:27:44 2007 @@ -1,206 +1,217 @@ -{**} - - - - - - - - - - - - - - -
-
- -
- {if $PARENTTAB eq 'Settings'} - {include file='SetMenu.tpl'} - {/if} - -
- - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - {if $MODE eq 'edit'} - - -
- - {if $PARENTTAB neq ''} - {$MOD.LBL_SETTINGS} > {$MOD.LBL_USERS} > - {if $MODE eq 'edit'} - {$UMOD.LBL_EDITING} "{$USERNAME}" - {else} - {$UMOD.LBL_CREATE_NEW_USER} - {/if} - - {else} - - {$APP.LBL_MY_PREFERENCES} - - {/if} -   -
{$UMOD.LBL_EDIT_VIEW} "{$USERNAME}" - {else} - {$UMOD.LBL_CREATE_NEW_USER} - {/if} -
-
 
- - - -
- - - -
- - - -
- - - - - - -
- {foreach key=header name=blockforeach item=data from=$BLOCKS} -
- - - {strip} - - - {/strip} - -
- {$smarty.foreach.blockforeach.iteration}. {$header} -  
- - - {include file="DisplayFields.tpl"} -
- {/foreach} - - {include file="UserEditOrg.tpl"} - -
- - - - - -
- 6. {$UMOD.LBL_HOME_PAGE_COMP} -  
- - {foreach item=homeitems key=values from=$HOMEORDER} - - {if $homeitems neq ''} - - - {else} - - - {/if} - - {/foreach} -
{$UMOD.$values} - {$UMOD.LBL_SHOW} - {$UMOD.LBL_HIDE} - {$UMOD.LBL_SHOW} - {$UMOD.LBL_HIDE}
-
-
 
- - -
-
-
-
-
-
- - - - - -
-{$JAVASCRIPT} +{**} + + + + + + + + +
+ + + + + +
+
+ +
+ {if $PARENTTAB eq 'Settings'} + {include file='SetMenu.tpl'} + {/if} + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + {if $MODE eq 'edit'} + + +
+ + {if $PARENTTAB neq ''} + {$MOD.LBL_SETTINGS} > {$MOD.LBL_USERS} > + {if $MODE eq 'edit'} + {$UMOD.LBL_EDITING} "{$USERNAME}" + {else} + {if $DUPLICATE neq 'true'} + {$UMOD.LBL_CREATE_NEW_USER} + {else} + {$APP.LBL_DUPLICATING} "{$USERNAME}" + {/if} + {/if} + + {else} + + {$APP.LBL_MY_PREFERENCES} + + {/if} +   +
{$UMOD.LBL_EDIT_VIEW} "{$USERNAME}" + {else} + {if $DUPLICATE neq 'true'} + {$UMOD.LBL_CREATE_NEW_USER} + {/if} + {/if} +
+
 
+ + + +
+ + + +
+ + + +
+ + + + + + +
+ {foreach key=header name=blockforeach item=data from=$BLOCKS} +
+ + + {strip} + + + {/strip} + +
+ {$smarty.foreach.blockforeach.iteration}. {$header} +  
+ + + {include file="DisplayFields.tpl"} +
+ {/foreach} + + {include file="UserEditOrg.tpl"} + +
+ + + + + +
+ 6. {$UMOD.LBL_HOME_PAGE_COMP} +  
+ + {foreach item=homeitems key=values from=$HOMEORDER} + + {if $homeitems neq ''} + + + {else} + + + {/if} + + {/foreach} +
{$UMOD.$values} + {$UMOD.LBL_SHOW} + {$UMOD.LBL_HIDE} + {$UMOD.LBL_SHOW} + {$UMOD.LBL_HIDE}
+
+
 
+ + +
+
+
+
+
+
+ + + + + +
+{$JAVASCRIPT} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/UserGroups.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/UserGroups.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/UserGroups.tpl Mon Apr 16 12:27:44 2007 @@ -19,7 +19,7 @@ {$smarty.foreach.groupiter.iteration} {if $IS_ADMIN} -{$groupname.1} +{$groupname.1} {else} {$groupname.1} {/if} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/UserProfileList.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/UserProfileList.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/UserProfileList.tpl Mon Apr 16 12:27:44 2007 @@ -69,7 +69,7 @@ {$smarty.foreach.profilelist.iteration} - Edit + {$APP.LBL_EDIT} {if $listvalues.del_permission eq 'yes'}  |  @@ -77,7 +77,7 @@ {/if} - {$listvalues.profilename} + {$listvalues.profilename} {$listvalues.description} {/foreach} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Webmails.tpl Mon Apr 16 12:27:44 2007 @@ -12,178 +12,209 @@ {include file='Buttons_List1.tpl'} - - - - - - + + + + + + + + + +
  -  
- +
+
+ + + + + - - + + + + + + + +
  + + + + + + + + + + + + - - - - - - - -
+ + + + + + + + +
+ +  {$MOD.LBL_CHK_MAIL} + + +  {$MOD.LBL_COMPOSE} + + +  {$MOD.LBL_SETTINGS} + + +  {$MOD.LBL_EXPUNGE_MAILBOX} +  
+
{$MOD.LBL_EMAIL_FOLDERS}{$ACCOUNT} > {$MAILBOX} {$NAVIGATION}
+  {$MOD.LBL_MY_MAILS}   + +
    + + {foreach item=row from=$BOXLIST} + {foreach item=row_values from=$row} + {$row_values} + {/foreach} + {/foreach} +

+ +  {$MOD.LBL_SENT_MAILS} +
+  {$MOD.LBL_TRASH} + + + 		+ + - - - - - - - - + + + + + + + + - - - - + + + - -
- - - - - - - - - - - - - - - - + + {if $DEGRADED_SERVICE eq 'false'} + - - - - - - - - - - - + {/if} + +
- - - - - - - - - -
- -  {$MOD.LBL_CHK_MAIL} - - -  {$MOD.LBL_COMPOSE} - - -  {$MOD.LBL_SETTINGS} - - -  {$MOD.LBL_SHOW_HIDDEN} - - -  {$MOD.LBL_EXPUNGE_MAILBOX} -
-
{$MOD.LBL_EMAIL_FOLDERS}  {$ACCOUNT} > {$MAILBOX} {$NAVIGATION}
-  {$MOD.LBL_MY_MAILS}   - -
    - - {foreach item=row from=$BOXLIST} - {foreach item=row_values from=$row} - {$row_values} - {/foreach} - {/foreach} -

- -  {$MOD.LBL_SENT_MAILS} -
-  {$MOD.LBL_TRASH} - - - 		  - - - {if $DEGRADED_SERVICE eq 'false'} - - {/if} - -
- - {$FOLDER_SELECT} - - {$APP.LBL_SEARCH}   -   - -
  -
- - - - {foreach item=element from=$LISTHEADER} - {$element} - {/foreach} - - {foreach item=row from=$LISTENTITY} - {foreach item=row_values from=$row} - {$row_values} - {/foreach} - {/foreach} -
-
+
+ + {$FOLDER_SELECT} + + {$APP.LBL_SEARCH}  +   + {$SEARCH_HTML} 
 
+ + +
+
+ + +
+ + + + {foreach item=element from=$LISTHEADER} + {$element} + {/foreach} + + {foreach item=row from=$LISTENTITY} + {foreach item=row_values from=$row} + {$row_values} + {/foreach} + {/foreach} +
+
+ + +
+
-

- 		 
+
+
+ + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/pendingActivities.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/pendingActivities.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/pendingActivities.tpl Mon Apr 16 12:27:44 2007 @@ -9,19 +9,36 @@ * ********************************************************************************/ -->*} -{if $ACTIVITIES.1.noofactivities > 0} -{assign var=label value=$ACTIVITIES.1.Title.0} +{if $ACTIVITIES.2.noofactivities > 0 || $ACTIVITIES.3.noofactivities > 0} + + +
+{assign var=label value=$ACTIVITIES.2.Title.0} @@ -31,9 +48,49 @@
- {$APP.$label} {$APP.LBL_PENDING_EVENTS} ({$ACTIVITIES.1.noofactivities})
+ {$APP.$label} {$APP.LBL_PENDING_EVENTS} ({$ACTIVITIES.2.noofactivities})
{$APP.LBL_SHOW} - {if $ACTIVITIES.1.Title.0 eq 'today'} - {$APP.LBL_TODAY}  |  {$APP.LBL_ALL} - {else} - {$APP.LBL_TODAY}  |  {$APP.LBL_ALL} - {/if} + {$APP.LBL_TODAY}  |  {$APP.LBL_ALL}
- + - {foreach item=entries name=entryloop from=$ACTIVITIES.1.Entries} + {if $ACTIVITIES.2.noofactivities != 0} + {foreach item=entries name=entryloop from=$ACTIVITIES.2.Entries} + + + + + + {/foreach} + {else} + + + + {/if} +
  
{math equation="x+1" x=$smarty.foreach.entryloop.index}{$entries.IMAGE}{$entries.0}{*
{$entries.ACCOUNT_NAME*}
{$APP.LBL_NONE_SCHEDULED}
+
+ + + +
+ + + + + +
+ + - -
- - - - + + id,'eventstatus') == '0') { ?> + - + - + - - - - + - + - + - +
@@ -676,7 +704,7 @@ - + id,'description') == '0') { ?> @@ -735,9 +763,9 @@ "; $minical .= ""; //To display days in week - $minical .= ''; + $minical .= ''; for ($i = 0; $i < 7; $i ++) { $weekdays_row = $cal['calendar']->month_array[$cal['calendar']->slices[$i]]; @@ -263,8 +263,8 @@ global $current_user,$app_strings; $date_format = $current_user->date_format; $format = $cal_arr['calendar']->hour_format; - $hour_startat = convertTime2UserSelectedFmt($format,$cal_arr['calendar']->day_start_hour,false); - $hour_endat = convertTime2UserSelectedFmt($format,($cal_arr['calendar']->day_start_hour+1),false); + $hour_startat = timeString(array('hour'=>date('H:i'),'minute'=>0),'24'); + $hour_endat = timeString(array('hour'=>date('H:i',(time() + (60 * 60))),'minute'=>0),'24'); $time_arr = getaddEventPopupTime($hour_startat,$hour_endat,$format); $temp_ts = $cal_arr['calendar']->date_time->ts; //To get date in user selected format @@ -288,15 +288,15 @@ { $headerdata .=""; } - $headerdata .=" + $headerdata .= "
*
- + @@ -892,12 +925,28 @@
hour_format,'start'); ?>
hour_format,'start','','','',true); ?>
- Set date.. + Set date.. @@ -870,9 +898,14 @@ : -   +
+ + +
 
- - - - + + id,'taskstatus') == '0') { ?> + - + - + + - - + - + +
Modified: vtigercrm/branches/5.1_jens/modules/Calendar/calendarLayout.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Calendar/calendarLayout.php (original) +++ vtigercrm/branches/5.1_jens/modules/Calendar/calendarLayout.php Mon Apr 16 12:27:44 2007 @@ -113,7 +113,7 @@ */ function get_mini_calendar(& $cal) { - global $current_user,$adb,$cal_log; + global $current_user,$adb,$cal_log,$mod_strings; $category = getParentTab(); $cal_log->debug('Entering get_mini_calendar() method...'); $count = 0; @@ -133,7 +133,7 @@
Week'.$mod_strings['LBL_WEEK'].'
 "; + $headerdata .=""; $headerdata .= getEventTodoInfo($cal_arr,'listcnt'); - $headerdata .= "
".$mod_strings['LBL_VIEW']." : "; $view_options = getEventViewOption($cal_arr,$viewBox); - $headerdata .=$view_options."
+ $headerdata .=$view_options."
- "; + "; echo $headerdata; $cal_log->debug("Exiting get_cal_header_data() method..."); } @@ -357,8 +357,7 @@ } else die("view is not defined"); - $view .=" - "; + $view .=""; $cal_log->debug("Exiting getEventViewOption() method..."); return $view; } @@ -657,7 +656,6 @@ */ function getDayViewLayout(& $cal) { - //echo '
';print_r($cal);echo '
'; global $current_user,$app_strings,$cal_log,$adb; $no_of_rows = 1; $cal_log->debug("Entering getDayViewLayout() method..."); @@ -686,39 +684,11 @@ } for($i=$day_start_hour;$i<=$day_end_hour;$i++) { - - if($cal['calendar']->hour_format == 'am/pm') - { - if($i == 12) - { - $hour = $i; - $sub_str = 'pm'; - } - elseif($i>12) - { - $hour = $i - 12; - $sub_str = 'pm'; - } - else - { - if($i == 0) - $hour = 12; - else - $hour = $i; - $sub_str = 'am'; - } - - } - else - { - $hour = $i; - if($hour <= 9 && strlen(trim($hour)) < 2) - $hour = "0".$hour; - $sub_str = ':00'; - } + $time = array('hour'=>$i,'minute'=>0); + $sub_str = timeString($time,$format); $y = $i+1; - $hour_startat = convertTime2UserSelectedFmt($format,$i,false); - $hour_endat = convertTime2UserSelectedFmt($format,$y,false); + $hour_startat = timeString(array('hour'=>$i,'minute'=>0),'24'); + $hour_endat = timeString(array('hour'=>$y,'minute'=>0),'24'); $time_arr = getaddEventPopupTime($hour_startat,$hour_endat,$format); $temp_ts = $cal['calendar']->date_time->ts; $sttemp_date = (($date_format == 'dd-mm-yyyy')?(date('d-m-Y',$temp_ts)):(($date_format== 'mm-dd-yyyy')?(date('m-d-Y',$temp_ts)):(($date_format == 'yyyy-mm-dd')?(date('Y-m-d', $temp_ts)):('')))); @@ -736,7 +706,7 @@ if(isPermitted("Calendar","EditView") == "yes") $js_string = 'onClick="fnvshobj(this,\'addEvent\'); gshow(\'addEvent\',\'call\',\''.$sttemp_date.'\',\''.$endtemp_date.'\',\''.$time_arr['starthour'].'\',\''.$time_arr['startmin'].'\',\''.$time_arr['startfmt'].'\',\''.$time_arr['endhour'].'\',\''.$time_arr['endmin'].'\',\''.$time_arr['endfmt'].'\',\'hourview\',\'event\')"'; $dayview_layout .= ' - '.$hour.''.$sub_str.''; + '.$sub_str.''; //To display events in Dayview $dayview_layout .= getdayEventLayer($cal,$cal['calendar']->slices[$i],$no_of_rows); $dayview_layout .= ''; @@ -789,44 +759,17 @@ for($i=$day_start_hour;$i<=$day_end_hour;$i++) { $count = $i; - $hour_startat = convertTime2UserSelectedFmt($format,$i,false); - $hour_endat = convertTime2UserSelectedFmt($format,($i+1),false); + $hour_startat = timeString(array('hour'=>$i,'minute'=>0),'24'); + $hour_endat = timeString(array('hour'=>($i+1),'minute'=>0),'24'); $time_arr = getaddEventPopupTime($hour_startat,$hour_endat,$format); $weekview_layout .= ''; for ($column=1;$column<=1;$column++) { - if($cal['calendar']->hour_format == 'am/pm') - { - if($i == 12) - { - $hour = $i; - $sub_str = 'pm'; - } - elseif($i>12) - { - $hour = $i - 12; - $sub_str = 'pm'; - } - else - { - if($i == 0) - $hour = 12; - else - $hour = $i; - $sub_str = 'am'; - } - - } - else - { - $hour = $i; - if($hour <= 9 && strlen(trim($hour)) < 2) - $hour = "0".$hour; - $sub_str = ':00'; - } - + $time = array('hour'=>$i,'minute'=>0); + $sub_str = timeString($time,$format); + $weekview_layout .= ''; - $weekview_layout .=$hour.''.$sub_str; + $weekview_layout .=$sub_str; $weekview_layout .= ''; } for ($column=0;$column<=6;$column++) @@ -879,8 +822,8 @@ $rows = 6; } $format = $cal['calendar']->hour_format; - $hour_startat = convertTime2UserSelectedFmt($format,$cal['calendar']->day_start_hour,false); - $hour_endat = convertTime2UserSelectedFmt($format,($cal['calendar']->day_start_hour+1),false); + $hour_startat = timeString(array('hour'=>date('H:i'),'minute'=>0),'24'); + $hour_endat = timeString(array('hour'=>date('H:i',(time() + (60 * 60))),'minute'=>0),'24'); $time_arr = getaddEventPopupTime($hour_startat,$hour_endat,$format); $monthview_layout = ''; $monthview_layout .= ''; @@ -1084,8 +1027,6 @@ $id = $act[$i]->record; if(strlen($subject)>25) $subject = substr($subject,0,25)."..."; - $start_time = $act[$i]->start_time->hour.':'.$act[$i]->start_time->minute; - $end_time = $act[$i]->end_time->hour.':'.$act[$i]->end_time->minute; $format = $cal['calendar']->hour_format; $duration_hour = $act[$i]->duration_hour; $duration_min =$act[$i]->duration_minute; @@ -1098,24 +1039,24 @@ $rowspan = $duration_hour; } $row_cnt = $rowspan; - //$st_end_time = convertStEdTime2UserSelectedFmt($format,$start_time,$duration_hour,$duration_min); - //$start_hour = $st_end_time['starttime']; - //$end_hour = $st_end_time['endtime']; - $value = getaddEventPopupTime($start_time,$end_time,$format); - $start_hour = $value['starthour'].':'.$value['startmin'].''.$value['startfmt']; - $end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt']; + $start_hour = timeString($act[$i]->start_time,$format); + $end_hour = timeString($act[$i]->end_time,$format); $account_name = $act[$i]->accountname; $eventstatus = $act[$i]->eventstatus; - $shared = $act[$i]->shared; $color = $act[$i]->color; $image = $cal['IMAGE_PATH'].''.$act[$i]->image_name; + if($act[$i]->recurring) + $recurring = ''; + else + $recurring = ' '; $height = $rowspan * 75; $javacript_str = ''; + $idShared = "normal"; if($act[$i]->shared) $idShared = "shared"; /*if($eventstatus != 'Held') {*/ - if(isPermitted("Calendar","EditView") == "yes") + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") $javacript_str = 'onMouseOver="cal_show(\''.$arrow_img_name.'\');" onMouseOut="fnHide_Event(\''.$arrow_img_name.'\');"'; - $action_str = ''; + $action_str = ''; /*} else { @@ -1126,18 +1067,18 @@ $eventlayer .= '
- - - '; - $eventlayer .= ' + '; + $eventlayer .= ' + + + - - - + $eventlayer .= '
'.$start_hour.' - '.$end_hour.'
'; - if($shared) + '.$start_hour.' - '.$end_hour.'
'.$recurring; + $eventlayer .= ''.$subject.'
'; + if($act[$i]->shared) $eventlayer .= ''; else $eventlayer .= ' '; - $eventlayer .= ''.$subject.'
'.$action_str.'('.$user.' | '.$mod_strings[$eventstatus].' | '.$mod_strings[$priority].')('.$user.' | '.$mod_strings[$eventstatus].' | '.$mod_strings[$priority].')
'.$action_str.' 
'; @@ -1180,46 +1121,45 @@ if(strlen($subject)>25) $subject = substr($subject,0,25)."..."; $format = $cal['calendar']->hour_format; - $duration_hour = $act[$i]->duration_hour; - $duration_min = $act[$i]->duration_minute; - $start_time = $act[$i]->start_time->hour.':'.$act[$i]->start_time->minute; - $end_time = $act[$i]->end_time->hour.':'.$act[$i]->end_time->minute; - //$st_end_time = convertStEdTime2UserSelectedFmt($format,$start_time,$duration_hour,$duration_min); - //$start_hour = $st_end_time['starttime']; - //$end_hour = $st_end_time['endtime']; - $value = getaddEventPopupTime($start_time,$end_time,$format); - $start_hour = $value['starthour'].':'.$value['startmin'].''.$value['startfmt']; - $end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt']; + $start_hour = timeString($act[$i]->start_time,$format); + $end_hour = timeString($act[$i]->end_time,$format); $account_name = $act[$i]->accountname; $eventstatus = $act[$i]->eventstatus; - $shared = $act[$i]->shared; $user = $act[$i]->owner; $priority = $act[$i]->priority; $image = $cal['IMAGE_PATH'].''.$act[$i]->image_name; + $idShared = "normal"; if($act[$i]->shared) $idShared = "shared"; + if($act[$i]->recurring) + $recurring = ''; + else + $recurring = ' '; $color = $act[$i]->color; - if(isPermitted("Calendar","EditView") == "yes") + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") $javacript_str = 'onMouseOver="cal_show(\''.$arrow_img_name.'\');" onMouseOut="fnHide_Event(\''.$arrow_img_name.'\');"'; - $action_str = ''; + $action_str = ''; $eventlayer .='
- - + + - + + + - - - + $eventlayer .= ' + +
'.$start_hour.' - '.$end_hour.''.$start_hour.' - '.$end_hour.'
'; - if($shared) + '.$recurring; + + $eventlayer .= ''.$subject.'
'; + if($act[$i]->shared) $eventlayer .= ''; else $eventlayer .= ' '; - $eventlayer .= ' - '.$subject.'
'.$action_str.'('.$user.' | '.$eventstatus.' | '.$priority.')('.$user.' | '.$eventstatus.' | '.$priority.')
'.$action_str.' 
-

'; +
'; } $cal_log->debug("Exiting getweekEventLayer() method..."); return $eventlayer; @@ -1261,27 +1201,14 @@ $subject = $act[$i]->subject; if(strlen($subject)>10) $subject = substr($subject,0,10)."..."; - $start_time = $act[$i]->start_time->hour.':'.$act[$i]->start_time->minute; - $end_time = $act[$i]->end_time->hour.':'.$act[$i]->end_time->minute; $format = $cal['calendar']->hour_format; - $duration_hour = $act[$i]->duration_hour; - $duration_min = $act[$i]->duration_minute; - //$st_end_time = convertStEdTime2UserSelectedFmt($format,$start_time,$duration_hour,$duration_min); - //$start_hour = $st_end_time['starttime']; - //$end_hour = $st_end_time['endtime']; - $value = getaddEventPopupTime($start_time,$end_time,$format); - $start_hour = $value['starthour'].':'.$value['startmin'].''.$value['startfmt']; - $end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt']; + $start_hour = timeString($act[$i]->start_time,$format); + $end_hour = timeString($act[$i]->end_time,$format); $account_name = $act[$i]->accountname; $image = $cal['IMAGE_PATH'].''.$act[$i]->image_name; $color = $act[$i]->color; $eventlayer .='
'; } if($remin_list != null) @@ -1314,7 +1241,7 @@ require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); $cal_log->debug("Entering getEventList() method..."); $shared_ids = getSharedCalendarId($current_user->id); - $query = "SELECT vtiger_groups.groupname, vtiger_users.user_name, + $query = "SELECT vtiger_groups.groupname, vtiger_users.user_name,vtiger_crmentity.smownerid, vtiger_activity.* FROM vtiger_activity INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_activity.activityid @@ -1328,11 +1255,13 @@ ON vtiger_recurringevents.activityid = vtiger_activity.activityid WHERE vtiger_crmentity.deleted = 0 AND (vtiger_activity.activitytype = 'Meeting' OR vtiger_activity.activitytype = 'Call') - AND (vtiger_activity.date_start BETWEEN '".$start_date."' AND '".$end_date."' - OR vtiger_recurringevents.recurringdate BETWEEN '".$start_date."' AND '".$end_date."') "; + AND (((vtiger_activity.date_start between '".$start_date."' AND '".$end_date."') OR (vtiger_activity.due_date between '". $start_date."' AND '".$end_date."') OR (vtiger_activity.date_start<'".$start_date."' and vtiger_activity.due_date>'".$end_date."') AND (vtiger_recurringevents.recurringdate is NULL)) + OR (vtiger_recurringevents.recurringdate BETWEEN '".$start_date."' AND '".$end_date."')) "; if($info != '') { - $com_q = " AND vtiger_crmentity.smownerid = ".$current_user->id." + $groupids = fetchUserGroupids($current_user->id); + $com_q = " AND (vtiger_crmentity.smownerid = ".$current_user->id." + OR vtiger_groups.groupid in (".$groupids.")) GROUP BY vtiger_activity.activityid"; $pending_query = $query." AND (vtiger_activity.eventstatus = 'Planned')".$com_q; $total_q = $query."".$com_q; @@ -1370,31 +1299,33 @@ $image_tag = ""; $contact_data = ""; $more_link = ""; - $duration_hour = $adb->query_result($result,$i,"duration_hours"); - $duration_min = $adb->query_result($result,$i,"duration_minutes"); $start_time = $adb->query_result($result,$i,"time_start"); $end_time = $adb->query_result($result,$i,"time_end"); $format = $calendar['calendar']->hour_format; - //$st_end_time = convertStEdTime2UserSelectedFmt($format,$start_time,$duration_hour,$duration_min); $value = getaddEventPopupTime($start_time,$end_time,$format); $start_hour = $value['starthour'].':'.$value['startmin'].''.$value['startfmt']; $end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt']; - if($calendar['view'] == 'day') - { - $element['starttime'] = $start_hour; - $element['endtime'] = $end_hour; - } - else - { - $date_start = $adb->query_result($result,$i,"date_start"); - $due_date = $adb->query_result($result,$i,"due_date"); - $element['starttime'] = getDisplayDate($date_start); - $element['endtime'] = getDisplayDate($due_date); - } + $date_start = $adb->query_result($result,$i,"date_start"); + $due_date = $adb->query_result($result,$i,"due_date"); + $element['starttime'] = getDisplayDate($date_start).' '.$start_hour; + $element['endtime'] = getDisplayDate($due_date).' '.$end_hour; $contact_id = $adb->query_result($result,$i,"contactid"); $id = $adb->query_result($result,$i,"activityid"); $subject = $adb->query_result($result,$i,"subject"); $eventstatus = $adb->query_result($result,$i,"eventstatus"); + $assignedto = $adb->query_result($result,$i,"user_name"); + $userid = $adb->query_result($result,$i,"smownerid"); + $idShared = "normal"; + if(!empty($assignedto) && $userid != $current_user->id && $adb->query_result($result,$i,"visibility") == "Public") + { + $que = "select * from vtiger_sharedcalendar where sharedid=".$current_user->id." and userid=".$userid; + $row = $adb->query($que); + $no = $adb->getRowCount($row); + if($no > 0) $idShared = "shared"; + else $idShared = "normal"; + + + } if(strlen($subject)>25) $subject = substr($subject,0,25)."..."; if($contact_id != '') @@ -1410,17 +1341,16 @@ $image_tag = " ".$app_strings['Meeting']; $element['eventtype'] = $image_tag; $element['eventdetail'] = $contact_data." ".$subject." ".$more_link; - if(isPermitted("Calendar","EditView") == "yes") - $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"event\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; - else - $element['action'] =" "; + $element['relatedto']= getRelatedTo('Calendar',$result,$i); + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete")=="yes") + $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->get_formatted_date()."\",\"event\",\"".$idShared."\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; $element['status'] = $mod_strings[$adb->query_result($result,$i,"eventstatus")]; - $assignedto = $adb->query_result($result,$i,"user_name"); if(!empty($assignedto)) $element['assignedto'] = $assignedto; else $element['assignedto'] = $adb->query_result($result,$i,"groupname"); $Entries[] = $element; + } $cal_log->debug("Exiting getEventList() method..."); return $Entries; @@ -1464,7 +1394,7 @@ $com_q = " AND vtiger_crmentity.smownerid = ".$current_user->id; $pending_query = $query." AND (vtiger_activity.status != 'Completed')".$com_q; $total_q = $query."".$com_q; - if( $adb->dbType == "pgsql") + if( $adb->dbType == "pgsql") { $pending_query = fixPostgresQuery( $pending_query, $log, 0); $total_q = fixPostgresQuery( $total_q, $log, 0); @@ -1493,12 +1423,13 @@ $rows = $adb->num_rows($result); for($i=0;$i<$rows;$i++) { + $element = Array(); + $contact_name = ''; $element['no'] = $i+1; $more_link = ""; $start_time = $adb->query_result($result,$i,"time_start"); $format = $calendar['calendar']->hour_format; - //$st_end_time = convertStEdTime2UserSelectedFmt($format,$start_time); $value = getaddEventPopupTime($start_time,$start_time,$format); $element['starttime'] = $value['starthour'].':'.$value['startmin'].''.$value['startfmt']; $date_start = $adb->query_result($result,$i,"date_start"); @@ -1509,14 +1440,20 @@ $id = $adb->query_result($result,$i,"activityid"); $subject = $adb->query_result($result,$i,"subject"); + $contact_id = $adb->query_result($result,$i,"contactid"); + if($contact_id!='') + { + $contact_name = getContactName($contact_id); + } + $status = $adb->query_result($result,$i,"status"); $more_link = "".$subject.""; $element['tododetail'] = $more_link; + $element['task_relatedto'] = getRelatedTo('Calendar',$result,$i); + $element['task_contact'] = "".$contact_name.""; $element['status'] = $adb->query_result($result,$i,"status"); - if(isPermitted("Calendar","EditView") == "yes") - $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"todo\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; - else - $element['action'] =" "; + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->get_formatted_date()."\",\"todo\",\"normal\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; $assignedto = $adb->query_result($result,$i,"user_name"); if(!empty($assignedto)) $element['assignedto'] = $assignedto; @@ -1565,8 +1502,8 @@ $cal_log->debug("Entering constructEventListView() method..."); $format = $cal['calendar']->hour_format; $date_format = $current_user->date_format; - $hour_startat = convertTime2UserSelectedFmt($format,$cal['calendar']->day_start_hour,false); - $hour_endat = convertTime2UserSelectedFmt($format,($cal['calendar']->day_start_hour+1),false); + $hour_startat = timeString(array('hour'=>date('H:i'),'minute'=>0),'24'); + $hour_endat = timeString(array('hour'=>date('H:i',(time() + (60 * 60))),'minute'=>0),'24'); $time_arr = getaddEventPopupTime($hour_startat,$hour_endat,$format); $temp_ts = $cal['calendar']->date_time->ts; //to get date in user selected date format @@ -1579,36 +1516,37 @@ $endtemp_date = (($date_format == 'dd-mm-yyyy')?(date('d-m-Y',$endtemp_ts)):(($date_format== 'mm-dd-yyyy')?(date('m-d-Y',$endtemp_ts)):(($date_format == 'yyyy-mm-dd')?(date('Y-m-d', $endtemp_ts)):('')))); } $list_view = ""; - if($cal['view'] == 'day') - { - $start_datetime = $mod_strings['LBL_APP_START_TIME']; - $end_datetime = $mod_strings['LBL_APP_END_TIME']; - } - else - { - $start_datetime = $mod_strings['LBL_APP_START_DATE']; - $end_datetime = $mod_strings['LBL_APP_END_DATE']; - - } + $start_datetime = $app_strings['LBL_START_DATE_TIME']; + $end_datetime = $app_strings['LBL_END_DATE_TIME']; //Events listview header labels $header = Array('0'=>'#', '1'=>$start_datetime, '2'=>$end_datetime, '3'=>$mod_strings['LBL_EVENTTYPE'], - '4'=>$mod_strings['LBL_EVTDTL'], - '5'=>$mod_strings['LBL_ACTION'], - '6'=>$mod_strings['LBL_STATUS'], - '7'=>$mod_strings['LBL_ASSINGEDTO'], + '4'=>$mod_strings['LBL_EVENTDETAILS'], + '5'=>$mod_strings['LBL_RELATEDTO'], ); + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + { + array_push($header,$mod_strings['LBL_ACTION']); + } + + array_push($header,$mod_strings['LBL_STATUS'],$mod_strings['LBL_ASSINGEDTO']); $header_width = Array('0'=>'5%', '1'=>'10%', '2'=>'10%', '3'=>'10%', '4'=>'28%', - '5'=>'10%', - '6'=>'10%', - '7'=>'15%' + '5'=>'15%', ); + + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + { + + array_push($header_width,'10%'); + } + array_push($header_width,'10%','15%'); + $list_view .=""; $header_rows = count($header); @@ -1632,7 +1570,7 @@ } else { - $list_view .=" - - - - - - - - - - - -
+ $list_view .="
"; $list_view .="
@@ -1677,8 +1615,8 @@ global $current_user,$app_strings; $date_format = $current_user->date_format; $format = $cal['calendar']->hour_format; - $hour_startat = convertTime2UserSelectedFmt($format,$cal['calendar']->day_start_hour,false); - $hour_endat = convertTime2UserSelectedFmt($format,($cal['calendar']->day_start_hour+1),false); + $hour_startat = timeString(array('hour'=>date('H:i'),'minute'=>0),'24'); + $hour_endat = timeString(array('hour'=>date('H:i',(time() + (60 * 60))),'minute'=>0),'24'); $time_arr = getaddEventPopupTime($hour_startat,$hour_endat,$format); $temp_ts = $cal['calendar']->date_time->ts; //to get date in user selected date format @@ -1694,37 +1632,58 @@ //labels of listview header if($cal['view'] == 'day') { - $colspan = 7; + $colspan = 9; $header = Array('0'=>'#','1'=>$mod_strings['LBL_TIME'],'2'=>$mod_strings['LBL_LIST_DUE_DATE'], - '3'=>$mod_strings['LBL_TODO'],'4'=>$mod_strings['LBL_STATUS'],'5'=>$mod_strings['LBL_ACTION'],'6'=>$mod_strings['LBL_ASSINGEDTO'],); - $header_width = Array('0'=>'5%','1'=>'10%','2'=>'10%','3'=>'38%','4'=>'10%','5'=>'10%', '6'=>'15%', ); + '3'=>$mod_strings['LBL_TODO'],'4'=>$mod_strings['LBL_RELATEDTO'],'5'=>$mod_strings['LBL_CONTACT_NAME'],'6'=>$mod_strings['LBL_STATUS']); + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + { + array_push($header,$mod_strings['LBL_ACTION']); + } + array_push($header,$mod_strings['LBL_ASSINGEDTO']); + $header_width = Array('0'=>'5%','1'=>'10%','2'=>'10%','3'=>'38%','4'=>'15%','5'=>'15%','6'=>'10%',); + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + { + array_push($header_width,'10%'); + } + array_push($header_width,'15%'); } else { - $colspan = 8; + $colspan = 10; $header = Array('0'=>'#', '1'=>$mod_strings['LBL_TIME'], - '2'=>$mod_strings['LBL_APP_START_DATE'], - '3'=>$mod_strings['LBL_LIST_DUE_DATE'], + '2'=>$mod_strings['LBL_START_DATE'], + '3'=>$mod_strings['LBL_DUE_DATE'], '4'=>$mod_strings['LBL_TODO'], - '5'=>$mod_strings['LBL_STATUS'], - '6'=>$mod_strings['LBL_ACTION'], - '7'=>$mod_strings['LBL_ASSINGEDTO'], - ); + '5'=>$mod_strings['LBL_RELATEDTO'], + '6'=>$mod_strings['LBL_CONTACT_NAME'], + '7'=>$mod_strings['LBL_STATUS'], + ); + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + { + array_push($header,$mod_strings['LBL_ACTION']); + } + array_push($header,$mod_strings['LBL_ASSINGEDTO']); $header_width = Array('0'=>'5%', '1'=>'10%', '2'=>'10%', '3'=>'10%', '4'=>'28%', - '5'=>'10%', - '6'=>'10%', - '7'=>'15%', - ); + '5'=>'15%', + '6'=>'15%', + '7'=>'10%', + ); + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + { + array_push($header_width,'10%'); + } + array_push($header_width,'15%'); + } $list_view .="
"; //checking permission for Create/Edit Operation - if(isPermitted("Calendar","EditView") == "yes") + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") { $list_view .=""; } - $list_view .=" + $list_view .="
 
@@ -1735,7 +1694,7 @@ { $list_view .="
  ".getEventTodoInfo($cal,'listcnt')."   
@@ -1794,175 +1753,4 @@ return $list_view; } -/** - * Function to convert time to user selected format - * @param string $format - hour format. either 'am/pm' or '24' - * @param string $time - time - * @param boolean $format_check - true/false - * return string $hour - time string - */ -function convertTime2UserSelectedFmt($format,$time,$format_check) -{ - global $cal_log; - $cal_log->debug("Entering convertTime2UserSelectedFmt() method..."); - if($format == 'am/pm' && $format_check) - { - if($time>='12') - { - if($time == '12') - $hour = $time; - else - $hour = $time - 12; - $hour = $hour.":00pm"; - } - else - { - $hour = $time; - $hour = $hour.":00am"; - } - $cal_log->debug("Exiting convertTime2UserSelectedFmt() method..."); - return $hour; - } - else - { - $hour = $time; - if($hour <= 9 && strlen(trim($hour)) < 2) - $hour = "0".$hour; - $hour = $hour.":00"; - $cal_log->debug("Exiting convertTime2UserSelectedFmt() method..."); - return $hour; - } -} - -/** - * Function to convert events/todos start and endtime to user selected format - * @param string $format - hour format. either 'am/pm' or '24' - * @param string $start_time - time - * @param string $duration_hr - duration in hours or empty string - * @param string $duration_min - duration in minutes or empty string - * return array $return_data - start and end time in array format - */ -function convertStEdTime2UserSelectedFmt($format,$start_time,$duration_hr='',$duration_min='') -{ - global $cal_log; - $cal_log->debug("Entering convertStEdTime2UserSelectedFmt() method..."); - list($hour,$min) = explode(":",$start_time); - if($format == 'am/pm') - { - if($hour>'12') - { - $hour = $hour - 12; - $start_hour = $hour; - $start_time = $start_hour.":".$min."pm"; - $end_min = $min+$duration_min; - $end_hour = $hour+$duration_hr; - if($end_min>=60) - { - $end_min = $end_min%60; - $end_hour++; - } - if($end_hour <= 9 && strlen(trim($end_hour)) < 2) - $end_hour = "0".$end_hour; - if($end_min <= 9 && strlen(trim($end_min)) < 2) - $end_min = "0".$end_min; - $end_time = $end_hour.":".$end_min."pm"; - } - elseif($hour == '12') - { - $start_hour = $hour; - $start_time = $start_hour.":".$min."pm"; - $end_min = $min+$duration_min; - $end_hour = $hour+$duration_hr; - if($end_min>=60) - { - $end_min = $end_min%60; - $end_hour++; - } - if($end_hour>'12') - { - $end_hour = $end_hour - 12; - if($end_hour <= 9 && strlen(trim($end_hour)) < 2) - $end_hour = "0".$end_hour; - if($end_min <= 9 && strlen(trim($end_min)) < 2) - $end_min = "0".$end_min; - $end_time = $end_hour.":".$end_min."pm"; - } - else - { - if($end_hour <= 9 && strlen(trim($end_hour)) < 2) - $end_hour = "0".$end_hour; - if($end_min <= 9 && strlen(trim($end_min)) < 2) - $end_min = "0".$end_min; - $end_time = $end_hour.":".$end_min."am"; - } - } - else - { - $start_hour = $hour; - $start_time = $start_hour.":".$min."am"; - $end_min = $min+$duration_min; - $end_hour = $hour+$duration_hr; - if($end_min>=60) - { - $end_min = $end_min%60; - $end_hour++; - } - if($end_hour>='12') - { - if($end_hour == '12' && $end_hour > '00') - $end_hour = $end_hour; - else - $end_hour = $end_hour - 12; - if($end_hour <= 9 && strlen(trim($end_hour)) < 2) - $end_hour = "0".$end_hour; - if($end_min <= 9 && strlen(trim($end_min)) < 2) - $end_min = "0".$end_min; - $end_time = $end_hour.":".$end_min."pm"; - } - else - { - if($end_hour <= 9 && strlen(trim($end_hour)) < 2) - $end_hour = "0".$end_hour; - if($end_min <= 9 && strlen(trim($end_min)) < 2) - $end_min = "0".$end_min; - $end_time = $end_hour.":".$end_min."am"; - } - - } - $return_data = Array( - 'starttime'=>$start_time, - 'endtime' =>$end_time - ); - } - else - { - $hour = $hour; - $min = $min; - $end_min = $min+$duration_min; - $end_hour = $hour+$duration_hr; - if($end_min>=60) - { - $end_min = $end_min%60; - $end_hour++; - } - if($end_hour <= 9 && strlen(trim($end_hour)) < 2) - $end_hour = "0".$end_hour; - if($end_min <= 9 && strlen(trim($end_min)) < 2) - $end_min = "0".$end_min; - $end_time = $end_hour.":".$end_min; - if($hour <= 9 && strlen(trim($hour)) < 2) - $hour = "0".$hour; - $start_time = $hour.":".$min; - $return_data = Array( - 'starttime'=>$start_time, - 'endtime' =>$end_time - ); - } - $cal_log->debug("Exiting convertStEdTime2UserSelectedFmt() method..."); - return $return_data; - - -} - - ?> Modified: vtigercrm/branches/5.1_jens/modules/Calendar/calendar_share.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Calendar/calendar_share.php (original) +++ vtigercrm/branches/5.1_jens/modules/Calendar/calendar_share.php Mon Apr 16 12:27:44 2007 @@ -1,128 +1,171 @@ -id,true); - $shareduser_ids = getSharedUserId($current_user->id); -?> - - - - - -
- -
-
- - - - - - - - - - - - - - - -
- - - - - - - - - - -
-
- start_hour != ''){?> checked onClick="enableCalstarttime();">  -
- hour_format == '24'){?> checked value="24">  -
-
-

-
- - '; - foreach($userDetails as $id=>$name) - { - if(in_array($id,$shareduser_ids)) - $checkbox = "checked"; - else - $checkbox = ""; - echo ''; - if($cnt%2 == 0) - echo ''; - $cnt++; - } - ?> -
 '.$name.'
-
-
-
- - - - -
-    - -
-
- +id); + $shareduser_ids = getSharedUserId($current_user->id); +?> + + + + + +
+ +
+
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+
+ start_hour != ''){?> checked onClick="enableCalstarttime();">  +
+ hour_format == '24'){?> checked value="24">  +
+
+

+ +
+ + + + +
+ + + + + + + + + + + + + +
+
    +
  • +
  • +
+
 
+ + + +
+ + 		+ + + + + +
+ + +
+ +
+
+
+ + + + +
+    + +
+
+ Modified: vtigercrm/branches/5.1_jens/modules/Calendar/header.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Calendar/header.php (original) +++ vtigercrm/branches/5.1_jens/modules/Calendar/header.php Mon Apr 16 12:27:44 2007 @@ -1,109 +1,118 @@ - - -
'.$app_strings[$category].' > '.$app_strings["Calendar"].' - - - - - -
- - - - - -
-
- 		  - - - - - - - - - - -
'.$app_strings['LBL_CALENDAR_ALT'].''.$app_strings['LBL_CLOCK_ALT'].''.$app_strings['LBL_CALCULATOR_ALT'].''.$app_strings['LBL_CHAT_ALT'].''.$app_strings['LBL_LAST_VIEWED'].'
- 		  - - - - - - -
- 		  - - - - -
'.$app_strings['LBL_ALL_MENU_ALT'].'
-
- - - - - - - -
- - -
- - - - - - {elseif $uitype eq 85} Modified: vtigercrm/branches/5.0.3/include/js/general.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/general.js (original) +++ vtigercrm/branches/5.0.3/include/js/general.js Mon Apr 16 22:57:29 2007 @@ -2076,3 +2076,23 @@ } +function validateUrl(name) +{ + var Url = getObj(name); + var wProtocol; + + var oRegex = new Object(); + oRegex.UriProtocol = new RegExp(''); + oRegex.UriProtocol.compile( '^(((http|https|ftp|news):\/\/)|mailto:)', 'gi' ); + oRegex.UrlOnChangeProtocol = new RegExp('') ; + oRegex.UrlOnChangeProtocol.compile( '^(http|https|ftp|news)://(?=.)', 'gi' ); + + wUrl = Url.value; + wProtocol=oRegex.UrlOnChangeProtocol.exec( wUrl ) ; + if ( wProtocol ) + { + wUrl = wUrl.substr( wProtocol[0].length ); + Url.value = wUrl; + } +} + From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 16 22:02:13 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 05:02:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10699 - /vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Message-ID: <20070417050213.576087DA63A@vtiger.fosslabs.com> Author: richie Date: Mon Apr 16 23:02:08 2007 New Revision: 10699 Log: fix for The field Add Comment doesn't need to display in Advance Search. Fixes #3392 --minnie Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Mon Apr 16 23:02:08 2007 @@ -392,6 +392,10 @@ $sql = "select * from vtiger_field "; $sql.= " where vtiger_field.tabid=".$tabid." and"; $sql.= " vtiger_field.displaytype in (1,2)"; + if($tabid == 13 || $tabid == 15) + { + $sql.= " and vtiger_field.fieldlabel != 'Add Comment'"; + } $sql.= " order by block,sequence"; } else @@ -400,7 +404,13 @@ $sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid "; $sql.= " where vtiger_field.tabid=".$tabid." and"; $sql.= " vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0"; - $sql.= " and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." order by block,sequence"; + $sql.= " and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; + if($tabid == 13 || $tabid == 15) + { + $sql.= " and vtiger_field.fieldlabel != 'Add Comment'"; + } + $sql .= " order by block,sequence"; + } From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 16 23:08:15 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 06:08:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10700 - /vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php Message-ID: <20070417060815.5EABE7DA6AB@vtiger.fosslabs.com> Author: richie Date: Tue Apr 17 00:08:10 2007 New Revision: 10700 Log: * Fixed the issues in task status intimation, Fixed #3622 Modified: vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php Modified: vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php ============================================================================== --- vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php (original) +++ vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php Tue Apr 17 00:08:10 2007 @@ -4,7 +4,8 @@ require('send_mail.php'); require_once('config.php'); require_once('include/utils/utils.php'); - +require_once('include/language/en_us.lang.php'); +global $app_strings; // Email Setup $emailresult = $adb->query("SELECT email1 from vtiger_users"); $emailid = $adb->fetch_array($emailresult); @@ -32,7 +33,6 @@ $today = date("Ymd"); $result = $adb->query("select (vtiger_activity.date_start +1) from vtiger_activity where vtiger_activity.status <> 'Completed' and ".$today." > (vtiger_activity.date_start+1)",$db); -" > (vtiger_activity.date_start+1)"; while ($myrow = $adb->fetch_array($result)) { $status=$myrow[0]; @@ -57,8 +57,7 @@ $stage = $myrow[0]; if($stage == 'Closed Won' && $amount > 10000) { - - sendmail($emailaddress,$emailaddress,$app_srings['Big_Deal_Closed_Successfully'],$app_strings['Dear_Team_Time_to_Party'],$mailserver,$mailuname,$mailpwd,""); + sendmail($emailaddress,$emailaddress,$app_strings['Big_Deal_Closed_Successfully'],$app_strings['Dear_Team_Time_to_Party'],$mailserver,$mailuname,$mailpwd,""); } } @@ -136,4 +135,5 @@ } } + ?> From istintegra at greyspacestudio.com Mon Apr 16 21:17:51 2007 From: istintegra at greyspacestudio.com (Optimistic D. Gunshots) Date: Tue, 17 Apr 2007 00:17:51 -0400 Subject: [Vtigercrm-commits] Looking for medications? Message-ID: <3838378311.20070417001751@greyspacestudio.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://mmera.hk verified by VISA and certified by CIPA. From kaiser at goyak.com Tue Apr 17 00:09:59 2007 From: kaiser at goyak.com (Hatfield E. Aberdeen) Date: Tue, 17 Apr 2007 07:09:59 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0396709361.20070417070959@goyak.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/b651b25e/attachment.htm From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 00:35:02 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 07:35:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10701 - /vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Message-ID: <20070417073502.0B77E78D64E@vtiger.fosslabs.com> Author: richie Date: Tue Apr 17 01:34:56 2007 New Revision: 10701 Log: fix for Buttons Edit,Duplicate,Delete is not at bottom in Detailview of Faq. Fixes #3533 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Tue Apr 17 01:34:56 2007 @@ -311,7 +311,7 @@ {$ASSOCIATED_PRODUCTS} - {if $SinglePane_View eq 'false' || $MODULE eq 'Notes' } + {if $SinglePane_View eq 'false' || $MODULE eq 'Notes' || $MODULE eq 'Faq'} '; else { @@ -379,12 +381,12 @@ /* if($tmpval != "INBOX") $boxes .= '
- - - - - - - - -
 '.$app_strings["Calendar"].' '.$mod_strings["LBL_ALL_EVENTS_TODOS"].' 
-
- - - + + +
- - - - + + + + + + + + + + + +
- '; - echo $html_string; -?> + + +
'.$app_strings[$category].' > '.$app_strings["Calendar"].' + + + + + +
+ + + + + +
+
+ 		  + + + + '; + + + if($CALENDAR_DISPLAY == 'true') + $html_string .= ' '; + if($WORLD_CLOCK_DISPLAY == 'true') + $html_string .= ' '; + if($CALCULATOR_DISPLAY == 'true') + $html_string .= ' '; + if($CHAT_DISPLAY == 'true') + $html_string .= ' '; + + $html_string .= ' + + +
'.$app_strings['LBL_CALENDAR_ALT'].''.$app_strings['LBL_CLOCK_ALT'].''.$app_strings['LBL_CALCULATOR_ALT'].''.$app_strings['LBL_CHAT_ALT'].''.$app_strings['LBL_LAST_VIEWED'].'
+ 		  + + + + + + +
+ 		  + + + + +
'.$app_strings['LBL_ALL_MENU_ALT'].'
+
+ + + + +
+ + +
+ + + + + + "; + if(in_array($this->getLstringforReportHeaders($fld->name), $arrayHeaders)) + { + $headerLabel = str_replace("_"," ",$fld->name); + $arrayHeaders[] = $headerLabel; + } + else + { + $headerLabel = str_replace($modules," ",$this->getLstringforReportHeaders($fld->name)); + $arrayHeaders[] = $headerLabel; + } + $header .= ""; } $noofrows = $adb->num_rows($result); @@ -1464,6 +1599,14 @@ { $fieldvalue = "-"; } + else if(stristr($fieldvalue,"|##|")) + { + $fieldvalue = str_ireplace(' |##| ',', ',$fieldvalue); + } + else if(stristr($fld->name, "_Date") || stristr($fld->name, "_Created_Time") || stristr($fld->name, "_Modified_Time")){ + $fieldvalue = getDisplayDate($fieldvalue); + } + if(($lastvalue == $fieldvalue) && $this->reporttype == "summary") { if($this->reporttype == "summary") @@ -1530,10 +1673,10 @@ $sSQL = $this->sGetSQLforReport($this->reportid,$filterlist); $result = $adb->query($sSQL); - $y=$adb->num_fields($result); if($result) { + $y=$adb->num_fields($result); $noofrows = $adb->num_rows($result); $custom_field_values = $adb->fetch_array($result); @@ -1552,7 +1695,17 @@ { $fieldvalue = "-"; } - $arraylists[str_replace($modules," ",$this->getLstringforReportHeaders($fld->name))] = $fieldvalue; + else if(stristr($fieldvalue,"|##|")) + { + $fieldvalue = str_ireplace(' |##| ',', ',$fieldvalue); + } + else if(stristr($fld->name, "_Date") || stristr($fld->name, "_Created_Time") || stristr($fld->name, "_Modified_Time")){ + $fieldvalue = getDisplayDate($fieldvalue); + } + if(array_key_exists($this->getLstringforReportHeaders($fld->name), $arraylists)) + $arraylists[str_replace("_"," ",$fld->name)] = $fieldvalue; + else + $arraylists[str_replace($modules," ",$this->getLstringforReportHeaders($fld->name))] = $fieldvalue; } $arr_val[] = $arraylists; }while($custom_field_values = $adb->fetch_array($result)); @@ -1636,16 +1789,26 @@ { $sSQL = $this->sGetSQLforReport($this->reportid,$filterlist); $result = $adb->query($sSQL); - $y=$adb->num_fields($result); if($result) { + $y=$adb->num_fields($result); + $arrayHeaders = Array(); for ($x=0; $x<$y; $x++) { $fld = $adb->field_name($result, $x); - $header .= ""; - } - + if(in_array($this->getLstringforReportHeaders($fld->name), $arrayHeaders)) + { + $headerLabel = str_replace("_"," ",$fld->name); + $arrayHeaders[] = $headerLabel; + } + else + { + $headerLabel = str_replace($modules," ",$this->getLstringforReportHeaders($fld->name)); + $arrayHeaders[] = $headerLabel; + } + $header .= ""; + } $noofrows = $adb->num_rows($result); $custom_field_values = $adb->fetch_array($result); $groupslist = $this->getGroupingList($this->reportid); @@ -1686,6 +1849,13 @@ if($fieldvalue == "" ) { $fieldvalue = "-"; + } + else if(stristr($fieldvalue,"|##|")) + { + $fieldvalue = str_ireplace(' |##| ',', ',$fieldvalue); + } + else if(stristr($fld->name, "_Date") || stristr($fld->name, "_Created_Time") || stristr($fld->name, "_Modified_Time")){ + $fieldvalue = getDisplayDate($fieldvalue); } if(($lastvalue == $fieldvalue) && $this->reporttype == "summary") { Modified: vtigercrm/branches/5.1_jens/modules/Reports/Reports.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Reports/Reports.php (original) +++ vtigercrm/branches/5.1_jens/modules/Reports/Reports.php Mon Apr 16 12:27:44 2007 @@ -41,14 +41,14 @@ 'Accounts'=>Array('Potentials','Contacts','Products','Quotes','Invoice'), 'Contacts'=>Array('Accounts','Potentials','Quotes','PurchaseOrder'), 'Potentials'=>Array('Accounts','Contacts','Quotes'), - 'Calendar'=>Array('Contacts'), + 'Calendar'=>Array('Leads','Accounts','Contacts','Potentials'), 'Products'=>Array('Accounts','Contacts'), 'HelpDesk'=>Array('Products'), 'Quotes'=>Array('Accounts','Contacts','Potentials'), 'PurchaseOrder'=>Array('Contacts'), 'SalesOrder'=>Array(), 'Invoice'=>Array('Accounts'), - 'Campaigns'=>Array('Products','Contacts') + 'Campaigns'=>Array('Products') ); foreach($report_modules as $values) @@ -107,7 +107,7 @@ var $module_list = Array( "Leads"=>Array("Information"=>13,"Address"=>15,"Description"=>16,"Custom Information"=>14), - "Contacts"=>Array("Information"=>4,"- Portal Information"=>6,"Address"=>7,"Description"=>8,"Custom Information"=>5), + "Contacts"=>Array("Information"=>4,"Portal Information"=>6,"Address"=>7,"Description"=>8,"Custom Information"=>5), "Accounts"=>Array("Information"=>9,"Address"=>11,"Description"=>12,"Custom Information"=>10), "Potentials"=>Array("Information"=>1,"Description"=>3,"Custom Information"=>2), "Calendar"=>Array("Information"=>19,"Description"=>20), @@ -159,8 +159,7 @@ function sgetRptFldr($mode='') { - global $adb; - global $log; + global $adb,$log,$mod_strings; $returndata = Array(); $sql = "select * from vtiger_reportfolder order by folderid"; $result = $adb->query($sql); @@ -174,7 +173,7 @@ $details = Array(); $details['state'] = $reportfldrow["state"]; $details['id'] = $reportfldrow["folderid"]; - $details['name'] = $reportfldrow["foldername"]; + $details['name'] = ($mod_strings[$reportfldrow["foldername"]] == '' ) ? $reportfldrow["foldername"]:$mod_strings[$reportfldrow["foldername"]]; $details['description'] = $reportfldrow["description"]; $details['details'] = $this->sgetRptsforFldr($reportfldrow["folderid"]); $returndata[] = $details; @@ -187,7 +186,7 @@ $details = Array(); $details['state'] = $reportfldrow["state"]; $details['id'] = $reportfldrow["folderid"]; - $details['name'] = $reportfldrow["foldername"]; + $details['name'] = ($mod_strings[$reportfldrow["foldername"]] == '' ) ? $reportfldrow["foldername"]:$mod_strings[$reportfldrow["foldername"]]; $details['description'] = $reportfldrow["description"]; $returndata[] = $details; }while($reportfldrow = $adb->fetch_array($result)); @@ -230,7 +229,8 @@ $report_details ['description'] = $report["description"]; $report_details ['reportname'] = $report["reportname"]; - $returndata []=$report_details; + if(isPermitted($report["primarymodule"],'index') == "yes") + $returndata []=$report_details; }while($report = $adb->fetch_array($result)); } @@ -312,14 +312,26 @@ //Security Check if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0) { - $sql = "select * from vtiger_field where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2,3) order by sequence"; + $sql = "select * from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2,3) order by sequence"; } else { $profileList = getCurrentUserProfileList(); - $sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2,3) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by sequence"; - } + $sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2,3) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by sequence"; + } + //Added to include vtiger_activity type for Reports Module + if($module == 'Calendar' && $block == 19) + { + $module_columnlist['vtiger_activity:activitytype:Calendar_Activity_Type:activitytype:C'] = 'Activity Type'; + } + + if($module == 'HelpDesk' && $block == 25) + { + $module_columnlist['vtiger_crmentity:crmid:HelpDesk_Ticket_ID:ticketid:I'] = 'Ticket ID'; + } + + $result = $adb->query($sql); $noofrows = $adb->num_rows($result); for($i=0; $i<$noofrows; $i++) @@ -328,8 +340,13 @@ $fieldcolname = $adb->query_result($result,$i,"columnname"); $fieldname = $adb->query_result($result,$i,"fieldname"); $fieldtype = $adb->query_result($result,$i,"typeofdata"); + $uitype = $adb->query_result($result,$i,"uitype"); $fieldtype = explode("~",$fieldtype); $fieldtypeofdata = $fieldtype[0]; + if($uitype == 68 || $uitype == 59) + { + $fieldtypeofdata = 'V'; + } if($fieldtablename == "vtiger_crmentity") { $fieldtablename = $fieldtablename.$module; @@ -556,6 +573,42 @@ $nextFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01", date("Y")+1)); $nextFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")+1)); + if(date("m") <= 3) + { + $cFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "03","31",date("Y"))); + $nFq = date("Y-m-d",mktime(0, 0, 0, "04","01",date("Y"))); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "06","30",date("Y"))); + $pFq = date("Y-m-d",mktime(0, 0, 0, "10","01",date("Y")-1)); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y")-1)); + }else if(date("m") > 3 and date("m") <= 6) + { + $pFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y"))); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "03","31",date("Y"))); + $cFq = date("Y-m-d",mktime(0, 0, 0, "04","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "06","30",date("Y"))); + $nFq = date("Y-m-d",mktime(0, 0, 0, "07","01",date("Y"))); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "09","30",date("Y"))); + + }else if(date("m") > 6 and date("m") <= 9) + { + $nFq = date("Y-m-d",mktime(0, 0, 0, "10","01",date("Y"))); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y"))); + $pFq = date("Y-m-d",mktime(0, 0, 0, "04","01",date("Y"))); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "06","30",date("Y"))); + $cFq = date("Y-m-d",mktime(0, 0, 0, "07","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "09","30",date("Y"))); + } + else if(date("m") > 9 and date("m") <= 12) + { + $nFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y")+1)); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "03","31",date("Y")+1)); + $pFq = date("Y-m-d",mktime(0, 0, 0, "07","01",date("Y"))); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "09","30",date("Y"))); + $cFq = date("Y-m-d",mktime(0, 0, 0, "10","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y"))); + + } $sjsStr = ' - - - - - -
+ + + + + + + + +
 '.$app_strings["Calendar"].' '.$mod_strings["LBL_ALL_EVENTS_TODOS"].' 
+
+ + + '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id; - - - // First, get the list of IDs. - $query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and ((vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus !='' && vtiger_activity.eventstatus != 'Held'))"; - $log->debug("Exiting get_activities method ..."); - return GetRelatedList('Leads','Calendar',$focus,$query,$button,$returnset); -} - -/** Returns a list of the associated Campaigns - * @param $id -- campaign id :: Type Integer - * @returns list of campaigns in array format - */ -function get_campaigns($id) -{ - global $log, $singlepane_view; - $log->debug("Entering get_campaigns(".$id.") method ..."); - global $mod_strings; - $focus = new Campaigns(); - $button = ''; - - if($singlepane_view == 'true') - $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id; - - $log->info("Campaign Related List for Lead Displayed"); - $query = "SELECT vtiger_users.user_name, vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaignleadrel on vtiger_campaignleadrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaignleadrel.leadid=".$id." and vtiger_crmentity.deleted=0"; - - $log->debug("Exiting get_campaigns method ..."); - return GetRelatedList('Leads','Campaigns',$focus,$query,$button,$returnset); - -} - - - /** Returns a list of the associated emails - * @param integer $id - leadid - * returns related emails record in array format - */ -function get_emails($id) -{ - global $log, $singlepane_view; - $log->debug("Entering get_emails(".$id.") method ..."); - global $mod_strings; - require_once('include/RelatedListView.php'); - - $focus = new Emails(); - - $button = ''; - - if(isPermitted("Emails",1,"") == 'yes') - { - - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id; - - $query ="select vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.semodule, vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.status, vtiger_activity.priority, vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted=0 and vtiger_seactivityrel.crmid=".$id; - $log->debug("Exiting get_emails method ..."); - return GetRelatedList('Leads','Emails',$focus,$query,$button,$returnset); -} - -/** - * Function to get Lead related Task & Event which have activity type Held, Completed or Deferred. - * @param integer $id - leadid - * returns related Task or Event record in array format - */ -function get_history($id) -{ - global $log; - $log->debug("Entering get_history(".$id.") method ..."); - $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, - vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_crmentity.modifiedtime, - vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name,vtiger_activitygrouprelation.groupname - from vtiger_activity - inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid - left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid - left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname - left join vtiger_users on vtiger_crmentity.smownerid= vtiger_users.id - where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') - and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != '')) - and vtiger_seactivityrel.crmid=".$id; - //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php - - $log->debug("Exiting get_history method ..."); - return getHistory('Leads',$query,$id); -} - -/** - * Function to get Lead related Attachments - * @param integer $id - leadid - * returns related Attachment record in array format - */ -function get_attachments($id) -{ - global $log; - $log->debug("Entering get_attachments(".$id.") method ..."); - // Armando L?scher 18.10.2005 -> ?visibleDescription - // Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name - // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - $query = "select vtiger_notes.title,'Notes ' ActivityType, vtiger_notes.filename, - vtiger_attachments.type FileType,crm2.modifiedtime lastmodified, - vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid, - crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name - from vtiger_notes - inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid - inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid - inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0 - left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid - left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid - inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - where vtiger_crmentity.crmid=".$id; - $query .= ' union all '; - // Armando L?scher 18.10.2005 -> ?visibleDescription - // Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name - // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - // Inserted order by createdtime desc - $query .= "select vtiger_attachments.description title ,'Attachments' ActivityType, - vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified, - vtiger_attachments.attachmentsid attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid, - crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name - from vtiger_attachments - inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid - inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid - inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid - inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - where vtiger_crmentity.crmid=".$id." - order by createdtime desc"; - - $log->debug("Exiting get_attachments method ..."); - return getAttachmentsAndNotes('Leads',$query,$id); -} - -/** -* Function to get lead related Products -* @param integer $id - leadid -* returns related Products record in array format -*/ -function get_products($id) -{ - global $log, $singlepane_view; - $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Products.php'); - global $mod_strings; - global $app_strings; - - $focus = new Products(); - - $button = ''; - - if(isPermitted("Products",1,"") == 'yes') - { - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id; - - $query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_products inner join vtiger_seproductsrel on vtiger_products.productid = vtiger_seproductsrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_leaddetails on vtiger_leaddetails.leadid = vtiger_seproductsrel.crmid where vtiger_leaddetails.leadid = '.$id.' and vtiger_crmentity.deleted = 0'; - $log->debug("Exiting get_products method ..."); - return GetRelatedList('Leads','Products',$focus,$query,$button,$returnset); -} - - /** Function to get the Combo List Values of Leads Field - * @param string $list_option - * Returns Combo List Options - */ - function get_lead_field_options($list_option) - { - global $log; - $log->debug("Entering get_lead_field_options(".$list_option.") method ..."); - $comboFieldArray = getComboArray($this->combofieldNames); - $log->debug("Exiting get_lead_field_options method ..."); - return $comboFieldArray[$list_option]; - } - -/** Function to get the Columnnames of the Leads Record -* Used By vtigerCRM Word Plugin -* Returns the Merge Fields for Word Plugin -*/ -function getColumnNames_Lead() -{ - global $log,$current_user; - $log->debug("Entering getColumnNames_Lead() method ..."); - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) - { - $sql1 = "select fieldlabel from vtiger_field where tabid=7"; - }else - { - $profileList = getCurrentUserProfileList(); - $sql1 = "select fieldlabel from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=7 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; - } - $result = $this->db->query($sql1); - $numRows = $this->db->num_rows($result); - for($i=0; $i < $numRows;$i++) - { - $custom_fields[$i] = $this->db->query_result($result,$i,"fieldlabel"); - $custom_fields[$i] = ereg_replace(" ","",$custom_fields[$i]); - $custom_fields[$i] = strtoupper($custom_fields[$i]); - } - $mergeflds = $custom_fields; - $log->debug("Exiting getColumnNames_Lead method ..."); - return $mergeflds; -} -//End - -} - -?> +'crmid','vtiger_leaddetails'=>'leadid','vtiger_leadsubdetails'=>'leadsubscriptionid','vtiger_leadaddress'=>'leadaddressid','vtiger_leadscf'=>'leadid','vtiger_entity2org'=>'crmid'); + + var $entity_table = "vtiger_crmentity"; + + //construct this from database; + var $column_fields = Array(); + var $sortby_fields = Array('lastname','firstname','email','phone','company','smownerid','website'); + + // This is used to retrieve related vtiger_fields from form posts. + var $additional_column_fields = Array('smcreatorid', 'smownerid', 'contactid','potentialid' ,'crmid'); + + // This is the list of vtiger_fields that are in the lists. + var $list_fields = Array( + 'Last Name'=>Array('leaddetails'=>'lastname'), + 'First Name'=>Array('leaddetails'=>'firstname'), + 'Company'=>Array('leaddetails'=>'company'), + 'Phone'=>Array('leadaddress'=>'phone'), + 'Website'=>Array('leadsubdetails'=>'website'), + 'Email'=>Array('leaddetails'=>'email'), + 'Assigned To'=>Array('crmentity'=>'smownerid') + ); + var $list_fields_name = Array( + 'Last Name'=>'lastname', + 'First Name'=>'firstname', + 'Company'=>'company', + 'Phone'=>'phone', + 'Website'=>'website', + 'Email'=>'email', + 'Assigned To'=>'assigned_user_id' + ); + var $list_link_field= 'lastname'; + + var $search_fields = Array( + 'Name'=>Array('leaddetails'=>'lastname'), + 'Company'=>Array('leaddetails'=>'company') + ); + var $search_fields_name = Array( + 'Name'=>'lastname', + 'Company'=>'company' + ); + + var $required_fields = array("lastname"=>1, 'company'=>1); + + //Added these variables which are used as default order by and sortorder in ListView + var $default_order_by = 'lastname'; + var $default_sort_order = 'ASC'; + + var $groupTable = Array('vtiger_leadgrouprelation','leadid'); + + function Leads() { + $this->log = LoggerManager::getLogger('lead'); + $this->log->debug("Entering Leads() method ..."); + $this->db = new PearDatabase(); + $this->column_fields = getColumnFields('Leads'); + $this->log->debug("Exiting Lead method ..."); + } + + /** Function to handle module specific operations when saving a entity + */ + function save_module($module) + { + } + + // Mike Crowe Mod --------------------------------------------------------Default ordering for us + /** + * Function to get sort order + * return string $sorder - sortorder string either 'ASC' or 'DESC' + */ + function getSortOrder() + { + global $log; + $log->debug("Entering getSortOrder() method ..."); + if(isset($_REQUEST['sorder'])) + $sorder = $_REQUEST['sorder']; + else + $sorder = (($_SESSION['LEADS_SORT_ORDER'] != '')?($_SESSION['LEADS_SORT_ORDER']):($this->default_sort_order)); + + $log->debug("Exiting getSortOrder method ..."); + return $sorder; + } + + /** + * Function to get order by + * return string $order_by - fieldname(eg: 'leadname') + */ + function getOrderBy() + { + global $log; + $log->debug("Entering getOrderBy() method ..."); + if (isset($_REQUEST['order_by'])) + $order_by = $_REQUEST['order_by']; + else + $order_by = (($_SESSION['LEADS_ORDER_BY'] != '')?($_SESSION['LEADS_ORDER_BY']):($this->default_order_by)); + + $log->debug("Exiting getOrderBy method ..."); + return $order_by; + } + // Mike Crowe Mod -------------------------------------------------------- + + + + /** Function to export the lead records in CSV Format + * @param reference variable - order by is passed when the query is executed + * @param reference variable - where condition is passed when the query is executed + * Returns Export Leads Query. + */ + function create_export_query(&$order_by, &$where) + { + global $log; + global $current_user; + $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Leads", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list, vtiger_leadgrouprelation.groupname as 'Assigned To Group' + FROM ".$this->entity_table." + INNER JOIN vtiger_leaddetails + ON vtiger_crmentity.crmid=vtiger_leaddetails.leadid + LEFT JOIN vtiger_leadsubdetails + ON vtiger_leaddetails.leadid = vtiger_leadsubdetails.leadsubscriptionid + LEFT JOIN vtiger_leadaddress + ON vtiger_leaddetails.leadid=vtiger_leadaddress.leadaddressid + LEFT JOIN vtiger_leadscf + ON vtiger_leadscf.leadid=vtiger_leaddetails.leadid + LEFT JOIN vtiger_leadgrouprelation + ON vtiger_leadscf.leadid = vtiger_leadgrouprelation.leadid + LEFT JOIN vtiger_groups + ON vtiger_groups.groupname = vtiger_leadgrouprelation.groupname + LEFT JOIN vtiger_users + ON vtiger_crmentity.smownerid = vtiger_users.id and vtiger_users.status='Active' + "; + + + $where_auto = " vtiger_crmentity.deleted=0 AND vtiger_leaddetails.converted =0"; + + if($where != "") + $query .= "where ($where) AND ".$where_auto; + else + $query .= "where ".$where_auto; + + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + //we should add security check when the user has Private Access + if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[7] == 3) + { + //Added security check to get the permitted records only + $query = $query." ".getListViewSecurityParameter("Leads"); + } + + if(!empty($order_by)) + $query .= " ORDER BY $order_by"; + + $log->debug("Exiting create_export_query method ..."); + return $query; + } + + + + /** Returns a list of the associated tasks + * @param integer $id - leadid + * returns related Task or Event record in array format + */ +function get_activities($id) +{ + global $log, $singlepane_view; + $log->debug("Entering get_activities(".$id.") method ..."); + global $app_strings; + + $focus = new Activity(); + $button = ''; + + if(isPermitted("Calendar",1,"") == 'yes') + { + $button .= ' '; + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id; + + + // First, get the list of IDs. + $query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime,case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and ((vtiger_activity.activitytype='Task' and vtiger_activity.status not in ('Completed','Deferred')) or (vtiger_activity.activitytype in ('Meeting','Call') and vtiger_activity.eventstatus not in ('','Held')))"; + $log->debug("Exiting get_activities method ..."); + return GetRelatedList('Leads','Calendar',$focus,$query,$button,$returnset); +} + +/** Returns a list of the associated Campaigns + * @param $id -- campaign id :: Type Integer + * @returns list of campaigns in array format + */ +function get_campaigns($id) +{ + global $log, $singlepane_view; + $log->debug("Entering get_campaigns(".$id.") method ..."); + global $mod_strings; + $focus = new Campaigns(); + $button = ''; + + if($singlepane_view == 'true') + $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id; + + $log->info("Campaign Related List for Lead Displayed"); + $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name ,vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaignleadrel on vtiger_campaignleadrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaignleadrel.leadid=".$id." and vtiger_crmentity.deleted=0"; + + $log->debug("Exiting get_campaigns method ..."); + return GetRelatedList('Leads','Campaigns',$focus,$query,$button,$returnset); + +} + + + /** Returns a list of the associated emails + * @param integer $id - leadid + * returns related emails record in array format + */ +function get_emails($id) +{ + global $log, $singlepane_view; + $log->debug("Entering get_emails(".$id.") method ..."); + global $mod_strings; + require_once('include/RelatedListView.php'); + + $focus = new Emails(); + + $button = ''; + + if(isPermitted("Emails",1,"") == 'yes') + { + + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id; + + $query ="select vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.semodule, vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.status, vtiger_activity.priority, vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted=0 and vtiger_seactivityrel.crmid=".$id; + $log->debug("Exiting get_emails method ..."); + return GetRelatedList('Leads','Emails',$focus,$query,$button,$returnset); +} + +/** + * Function to get Lead related Task & Event which have activity type Held, Completed or Deferred. + * @param integer $id - leadid + * returns related Task or Event record in array format + */ +function get_history($id) +{ + global $log; + $log->debug("Entering get_history(".$id.") method ..."); + $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, + vtiger_activity.eventstatus, vtiger_activity.activitytype,vtiger_activity.date_start, + vtiger_activity.due_date,vtiger_activity.time_start,vtiger_activity.time_end, + vtiger_crmentity.modifiedtime,vtiger_crmentity.createdtime, + vtiger_crmentity.description, vtiger_users.user_name,vtiger_activitygrouprelation.groupname + from vtiger_activity + inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid + left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid + left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname + left join vtiger_users on vtiger_crmentity.smownerid= vtiger_users.id + where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') + and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != '')) + and vtiger_seactivityrel.crmid=".$id; + //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + + $log->debug("Exiting get_history method ..."); + return getHistory('Leads',$query,$id); +} + +/** + * Function to get Lead related Attachments + * @param integer $id - leadid + * returns related Attachment record in array format + */ +function get_attachments($id) +{ + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); + // Armando L?scher 18.10.2005 -> ?visibleDescription + // Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name + // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + $query = "select vtiger_notes.title,'Notes ' ActivityType, vtiger_notes.filename, + vtiger_attachments.type FileType,crm2.modifiedtime lastmodified, + vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid, + crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name + from vtiger_notes + inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0 + left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid + left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id; + $query .= ' union all '; + // Armando L?scher 18.10.2005 -> ?visibleDescription + // Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name + // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + // Inserted order by createdtime desc + $query .= "select vtiger_attachments.description title ,'Attachments' ActivityType, + vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified, + vtiger_attachments.attachmentsid attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid, + crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name + from vtiger_attachments + inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id." + order by createdtime desc"; + + $log->debug("Exiting get_attachments method ..."); + return getAttachmentsAndNotes('Leads',$query,$id); +} + +/** +* Function to get lead related Products +* @param integer $id - leadid +* returns related Products record in array format +*/ +function get_products($id) +{ + global $log, $singlepane_view; + $log->debug("Entering get_products(".$id.") method ..."); + require_once('modules/Products/Products.php'); + global $mod_strings; + global $app_strings; + + $focus = new Products(); + + $button = ''; + + if(isPermitted("Products",1,"") == 'yes') + { + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, + vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, + vtiger_crmentity.crmid, vtiger_crmentity.smownerid + FROM vtiger_products + INNER JOIN vtiger_seproductsrel ON vtiger_products.productid = vtiger_seproductsrel.productid and vtiger_seproductsrel.setype = 'Leads' + INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_products.productid + INNER JOIN vtiger_leaddetails ON vtiger_leaddetails.leadid = vtiger_seproductsrel.crmid + WHERE vtiger_crmentity.deleted = 0 AND vtiger_leaddetails.leadid = $id"; + + $log->debug("Exiting get_products method ..."); + return GetRelatedList('Leads','Products',$focus,$query,$button,$returnset); +} + + /** Function to get the Combo List Values of Leads Field + * @param string $list_option + * Returns Combo List Options + */ + function get_lead_field_options($list_option) + { + global $log; + $log->debug("Entering get_lead_field_options(".$list_option.") method ..."); + $comboFieldArray = getComboArray($this->combofieldNames); + $log->debug("Exiting get_lead_field_options method ..."); + return $comboFieldArray[$list_option]; + } + +/** Function to get the Columnnames of the Leads Record +* Used By vtigerCRM Word Plugin +* Returns the Merge Fields for Word Plugin +*/ +function getColumnNames_Lead() +{ + global $log,$current_user; + $log->debug("Entering getColumnNames_Lead() method ..."); + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) + { + $sql1 = "select fieldlabel from vtiger_field where tabid=7"; + }else + { + $profileList = getCurrentUserProfileList(); + $sql1 = "select fieldlabel from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=7 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; + } + $result = $this->db->query($sql1); + $numRows = $this->db->num_rows($result); + for($i=0; $i < $numRows;$i++) + { + $custom_fields[$i] = $this->db->query_result($result,$i,"fieldlabel"); + $custom_fields[$i] = ereg_replace(" ","",$custom_fields[$i]); + $custom_fields[$i] = strtoupper($custom_fields[$i]); + } + $mergeflds = $custom_fields; + $log->debug("Exiting getColumnNames_Lead method ..."); + return $mergeflds; +} +//End + +} + +?> Modified: vtigercrm/branches/5.1_jens/modules/Leads/ListView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/ListView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/ListView.php Mon Apr 16 12:27:44 2007 @@ -166,7 +166,7 @@ $query .= ' and '.$where; } - +/* if(isset($order_by) && $order_by != '') { $tablename = getTableNameForField('Leads',$order_by); @@ -177,7 +177,24 @@ $query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder; } - +*/ +if(isset($order_by) && $order_by != '') +{ + if($order_by == 'smownerid') + { + $query .= ' ORDER BY user_name '.$sorder; + } + else + { + $tablename = getTableNameForField('Leads',$order_by); + $tablename = (($tablename != '')?($tablename."."):''); + if( $adb->dbType == "pgsql") + $query .= ' GROUP BY '.$tablename.$order_by; + + + $query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder; + } +} //Retreiving the no of rows $count_result = $adb->query( mkCountQuery( $query)); $noofrows = $adb->query_result($count_result,0,"count"); @@ -221,7 +238,6 @@ } if(isPermitted("Leads","Merge") == 'yes') { - $smarty->assign("MERGEBUTTON",""); $wordTemplateResult = fetchWordTemplateList("Leads"); $tempCount = $adb->num_rows($wordTemplateResult); $tempVal = $adb->fetch_array($wordTemplateResult); @@ -230,7 +246,23 @@ $optionString .=""; $tempVal = $adb->fetch_array($wordTemplateResult); } - $smarty->assign("WORDTEMPLATEOPTIONS",""); + if($tempCount > 0) + { + $smarty->assign("WORDTEMPLATEOPTIONS",""); + + $smarty->assign("MERGEBUTTON",""); + } + else + { + global $current_user; + require("user_privileges/user_privileges_".$current_user->id.".php"); + if($is_admin == true) + { + $smarty->assign("MERGEBUTTON",''); + } + } + + } //mass merge for word templates Modified: vtigercrm/branches/5.1_jens/modules/Leads/ListViewTop.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/ListViewTop.php (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/ListViewTop.php Mon Apr 16 12:27:44 2007 @@ -68,7 +68,7 @@ $start_date = date("Y-m-d", strtotime("-1 week")); } - $list_query = 'select vtiger_leaddetails.*,vtiger_crmentity.createdtime,vtiger_crmentity.description from vtiger_leaddetails inner join vtiger_crmentity on vtiger_leaddetails.leadid = vtiger_crmentity.crmid where vtiger_crmentity.deleted =0 AND vtiger_leaddetails.converted =0 AND vtiger_crmentity.createdtime >='.$start_date.' AND vtiger_crmentity.smownerid = '.$current_user->id; + $list_query = 'select vtiger_leaddetails.*,vtiger_crmentity.createdtime,vtiger_crmentity.description from vtiger_leaddetails inner join vtiger_crmentity on vtiger_leaddetails.leadid = vtiger_crmentity.crmid where vtiger_crmentity.deleted =0 AND vtiger_leaddetails.converted =0 AND vtiger_leaddetails.leadstatus not in (\'Lost Lead\', \'Junk Lead\',\''.$current_module_strings['Lost Lead'].'\',\''.$current_module_strings['Junk Lead'].'\') AND vtiger_crmentity.createdtime >='.$start_date.' AND vtiger_crmentity.smownerid = '.$current_user->id; $list_result = $adb->query($list_query); $noofrows = $adb->num_rows($list_result); @@ -114,7 +114,7 @@ 'LEAD_ID' => $lead['id'], ); - $value[]= ''.$lead_fields['LEAD_NAME'].''; + $value[]= ''.substr($lead_fields['LEAD_NAME'],0,20).'...'.''; $value[]=$lead_fields['COMPANY']; $value[]=$lead_fields['ANNUAL_REVENUE']; $value[]=$lead_fields['LEAD_STATUS']; Modified: vtigercrm/branches/5.1_jens/modules/Leads/Merge.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/Merge.php (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/Merge.php Mon Apr 16 12:27:44 2007 @@ -24,6 +24,7 @@ } else if(document.all) { + document.write("

Click here to return to the previous page"); document.write(""); } Modified: vtigercrm/branches/5.1_jens/modules/Leads/updateRelations.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/updateRelations.php (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/updateRelations.php Mon Apr 16 12:27:44 2007 @@ -13,8 +13,11 @@ require_once('user_privileges/default_module_view.php'); global $adb, $singlepane_view; $idlist = $_REQUEST['idlist']; -$update_mod = $_REQUEST['destination_module']; -$rel_table = 'vtiger_campaignleadrel'; +$dest_mod = $_REQUEST['destination_module']; + +if($singlepane_view == 'true') $action = "DetailView"; +else $action = "CallRelatedList"; + if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '') { //split the string and store in an array @@ -23,24 +26,25 @@ { if($id != '') { - $sql = "insert into ".$rel_table." values(".$id.",".$_REQUEST["parentid"].")"; - $adb->query($sql); + if($dest_mod == 'Products') + $adb->query("insert into vtiger_seproductsrel values (".$_REQUEST["parentid"].",".$id.",'Leads')"); + elseif($dest_mod == 'Campaigns') + $adb->query("insert into vtiger_campaignleadrel values(".$id.",".$_REQUEST["parentid"].")"); } } - if($singlepane_view == 'true') - header("Location: index.php?action=DetailView&module=Leads&record=".$_REQUEST["parentid"]); - else - header("Location: index.php?action=CallRelatedList&module=Leads&record=".$_REQUEST["parentid"]); + $record = $_REQUEST["parentid"]; } elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '') -{ - $sql = "insert into ".$rel_table." values(".$_REQUEST["entityid"].",".$_REQUEST["parid"].")"; - $adb->query($sql); - - if($singlepane_view == 'true') - header("Location: index.php?action=DetailView&module=Leads&record=".$_REQUEST["parid"]); - else - header("Location: index.php?action=CallRelatedList&module=Leads&record=".$_REQUEST["parid"]); +{ + if($dest_mod == 'Products') + $adb->query("insert into vtiger_seproductsrel values (".$_REQUEST["parid"].",".$_REQUEST["entityid"].",'Leads')"); + elseif($dest_mod == 'Campaigns') + $adb->query("insert into vtiger_campaignleadrel values(".$_REQUEST["entityid"].",".$_REQUEST["parid"].")"); + $record = $_REQUEST["parid"]; } +header("Location: index.php?action=$action&module=Leads&record=".$record); + + + ?> Modified: vtigercrm/branches/5.1_jens/modules/Migration/Migration.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Migration/Migration.php (original) +++ vtigercrm/branches/5.1_jens/modules/Migration/Migration.php Mon Apr 16 12:27:44 2007 @@ -299,8 +299,8 @@ //To handle the file includes for each and every version //Here we have to decide which files should be included, where the files will be added newly for every public release - //Handle Here -- Mickie - include("modules/Migration/ModifyDatabase/MigrationInfo.php"); + //In this included file we have included modules/Migration/DBChanges/42P2_to_50.php which will apply the db changes upto 5.0. + include("modules/Migration/MigrationInfo.php"); $migrationlog->debug("Mickie ---- Ends\n\n\n"); } Modified: vtigercrm/branches/5.1_jens/modules/Migration/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Migration/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Migration/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -75,7 +75,20 @@ 'LBL_MYSQL_SERVER_PATH'=>'MySQL Server Path : ', 'LBL_MIGRATE_BUTTON'=>'Migrate', 'LBL_CANCEL_BUTTON'=>'Cancel', - +'LBL_UPGRADE_FROM_VTIGER_5X'=>'Upgrade database from vtiger CRM 5.x to next version', +'LBL_PATCH_OR_MIGRATION'=>'you must specify the source database version (Patch update or Migration)', +//Added for java script alerts +'ENTER_SOURCE_HOST' => 'Please enter the Source Host Name', +'ENTER_SOURCE_MYSQL_PORT' => 'Please enter the Source MySql Port Number', +'ENTER_SOURCE_MYSQL_USER' => 'Please enter the Source MySql User Name', +'ENTER_SOURCE_DATABASE' => 'Please enter the Source Database Name', +'ENTER_SOURCE_MYSQL_DUMP' => 'Please enter the Valid MySQL Dump File', +'ENTER_HOST' => 'Please enter the Host Name', +'ENTER_MYSQL_PORT' => 'Please enter the MySql Port Number', +'ENTER_MYSQL_USER' => 'Please enter the MySql User Name', +'ENTER_DATABASE' => 'Please enter the Database Name', +'SELECT_ANYONE_OPTION' => 'Please select any one option', +'ENTER_CORRECT_MYSQL_PATH' => 'Please enter the Correct MySQL Path', ); Modified: vtigercrm/branches/5.1_jens/modules/Notes/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Notes/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Notes/DetailView.php Mon Apr 16 12:27:44 2007 @@ -1,119 +1,122 @@ -retrieve_entity_info($_REQUEST['record'],"Notes"); - $focus->id = $_REQUEST['record']; - $focus->name=$focus->column_fields['notes_title']; -} -if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { - $focus->id = ""; -} - -//needed when creating a new note with default values passed in -if (isset($_REQUEST['contact_name']) && is_null($focus->contact_name)) { - $focus->contact_name = $_REQUEST['contact_name']; -} -if (isset($_REQUEST['contact_id']) && is_null($focus->contact_id)) { - $focus->contact_id = $_REQUEST['contact_id']; -} -if (isset($_REQUEST['opportunity_name']) && is_null($focus->parent_name)) { - $focus->parent_name = $_REQUEST['opportunity_name']; -} -if (isset($_REQUEST['opportunity_id']) && is_null($focus->parent_id)) { - $focus->parent_id = $_REQUEST['opportunity_id']; -} -if (isset($_REQUEST['account_name']) && is_null($focus->parent_name)) { - $focus->parent_name = $_REQUEST['account_name']; -} -if (isset($_REQUEST['account_id']) && is_null($focus->parent_id)) { - $focus->parent_id = $_REQUEST['account_id']; -} - -global $theme; -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; -require_once($theme_path.'layout_utils.php'); - -$log->info("Note detail view"); - -$smarty = new vtigerCRM_Smarty; -$smarty->assign("MOD", $mod_strings); -$smarty->assign("APP", $app_strings); -$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields)); -$smarty->assign("UPDATEINFO",updateInfo($focus->id)); - - -if (isset($focus->name)) $smarty->assign("NAME", $focus->name); -else $smarty->assign("NAME", ""); - -if (isset($_REQUEST['return_module'])) $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); -if (isset($_REQUEST['return_action'])) $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); -if (isset($_REQUEST['return_id'])) $smarty->assign("RETURN_ID", $_REQUEST['return_id']); - -$smarty->assign("THEME", $theme); -$smarty->assign("IMAGE_PATH", $image_path); -$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); -$smarty->assign("ID", $focus->id); -$category = getParentTab(); -$smarty->assign("CATEGORY",$category); - -if ( isset($focus->filename) && $focus->filename != '') -{ - $fileurl = "filename,$focus->id)."\" target=\"_blank\">". $focus->filename .""; - $smarty->assign("FILELINK", $fileurl); -} - -$smarty->assign("SINGLE_MOD", 'Note'); - -if(isPermitted("Notes","EditView",$_REQUEST['record']) == 'yes') - $smarty->assign("EDIT_DUPLICATE","permitted"); - -if(isPermitted("Notes","Delete",$_REQUEST['record']) == 'yes') - $smarty->assign("DELETE","permitted"); - -$check_button = Button_Check($module); -$smarty->assign("CHECK", $check_button); -$tabid = getTabid("Notes"); - $validationData = getDBValidationData($focus->tab_name,$tabid); - $data = split_validationdataArray($validationData); - - $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); - $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); - $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); - -$smarty->assign("MODULE",$currentModule); -$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); -$smarty->display("DetailView.tpl"); - -?> +retrieve_entity_info($_REQUEST['record'],"Notes"); + $focus->id = $_REQUEST['record']; + $focus->name=$focus->column_fields['notes_title']; +} +if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { + $focus->id = ""; +} + +//needed when creating a new note with default values passed in +if (isset($_REQUEST['contact_name']) && is_null($focus->contact_name)) { + $focus->contact_name = $_REQUEST['contact_name']; +} +if (isset($_REQUEST['contact_id']) && is_null($focus->contact_id)) { + $focus->contact_id = $_REQUEST['contact_id']; +} +if (isset($_REQUEST['opportunity_name']) && is_null($focus->parent_name)) { + $focus->parent_name = $_REQUEST['opportunity_name']; +} +if (isset($_REQUEST['opportunity_id']) && is_null($focus->parent_id)) { + $focus->parent_id = $_REQUEST['opportunity_id']; +} +if (isset($_REQUEST['account_name']) && is_null($focus->parent_name)) { + $focus->parent_name = $_REQUEST['account_name']; +} +if (isset($_REQUEST['account_id']) && is_null($focus->parent_id)) { + $focus->parent_id = $_REQUEST['account_id']; +} + +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); + +$log->info("Note detail view"); + +$smarty = new vtigerCRM_Smarty; +$smarty->assign("MOD", $mod_strings); +$smarty->assign("APP", $app_strings); +$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields)); +$smarty->assign("UPDATEINFO",updateInfo($focus->id)); + + +if (isset($focus->name)) $smarty->assign("NAME", $focus->name); +else $smarty->assign("NAME", ""); + +if (isset($_REQUEST['return_module'])) $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); +if (isset($_REQUEST['return_action'])) $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); +if (isset($_REQUEST['return_id'])) $smarty->assign("RETURN_ID", $_REQUEST['return_id']); + +$smarty->assign("THEME", $theme); +$smarty->assign("IMAGE_PATH", $image_path); +$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); +$smarty->assign("ID", $focus->id); +$category = getParentTab(); +$smarty->assign("CATEGORY",$category); + +if ( isset($focus->filename) && $focus->filename != '') +{ + $fileurl = "filename,$focus->id)."\" target=\"_blank\">". $focus->filename .""; + $smarty->assign("FILELINK", $fileurl); +} + +$smarty->assign("SINGLE_MOD", 'Note'); + +if(isPermitted("Notes","EditView",$_REQUEST['record']) == 'yes') + $smarty->assign("EDIT_DUPLICATE","permitted"); + +if(isPermitted("Notes","Delete",$_REQUEST['record']) == 'yes') + $smarty->assign("DELETE","permitted"); + +$check_button = Button_Check($module); +$smarty->assign("CHECK", $check_button); + +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); + +$tabid = getTabid("Notes"); + $validationData = getDBValidationData($focus->tab_name,$tabid); + $data = split_validationdataArray($validationData); + + $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); + $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); + $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); + +$smarty->assign("MODULE",$currentModule); +$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); +$smarty->display("DetailView.tpl"); + +?> Modified: vtigercrm/branches/5.1_jens/modules/Notes/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Notes/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Notes/EditView.php Mon Apr 16 12:27:44 2007 @@ -1,191 +1,191 @@ - The selected file has no data or a invalid file.
'; -} - -if(isset($_REQUEST['record']) && $_REQUEST['record'] !='') -{ - $focus->id = $_REQUEST['record']; - $focus->mode = 'edit'; - $focus->retrieve_entity_info($_REQUEST['record'],"Notes"); - $focus->name=$focus->column_fields['notes_title']; -} -if(isset($_REQUEST['parent_id'])) -{ - $focus->column_fields['parent_id'] = $_REQUEST['parent_id']; -} -//$old_id = ''; -if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') -{ - $old_id = $_REQUEST['record']; - if (! empty($focus->filename) ) - { - $old_id = $focus->id; - } - $focus->id = ""; - $focus->mode = ''; -} - - - -//setting default flag value so due date and time not required -if (!isset($focus->id)) $focus->date_due_flag = 'on'; - -//needed when creating a new case with default values passed in -if (isset($_REQUEST['contact_name']) && is_null($focus->contact_name)) { - $focus->contact_name = $_REQUEST['contact_name']; -} -if (isset($_REQUEST['contact_id']) && is_null($focus->contact_id)) { - $focus->contact_id = $_REQUEST['contact_id']; -} -if (isset($_REQUEST['parent_name']) && is_null($focus->parent_name)) { - $focus->parent_name = $_REQUEST['parent_name']; -} -if (isset($_REQUEST['parent_id']) && is_null($focus->parent_id)) { - $focus->parent_id = $_REQUEST['parent_id']; -} -if (isset($_REQUEST['parent_type'])) { - $focus->parent_type = $_REQUEST['parent_type']; -} -elseif (!isset($focus->parent_type)) { - $focus->parent_type = $app_list_strings['record_type_default_key']; -} - -if (isset($_REQUEST['filename']) && $_REQUEST['isDuplicate'] != 'true') { - $focus->filename = $_REQUEST['filename']; -} - - - -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; -require_once($theme_path.'layout_utils.php'); - -$disp_view = getView($focus->mode); -if($disp_view == 'edit_view') - $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields)); -else -{ - $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS')); -} -$smarty->assign("OP_MODE",$disp_view); -$category = getParentTab(); -$smarty->assign("CATEGORY",$category); - - -$log->info("Note detail view"); - -$smarty->assign("MOD", $mod_strings); -$smarty->assign("APP", $app_strings); -$smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",'Note'); -//Display the FCKEditor or not? -- configure $FCKEDITOR_DISPLAY in config.php -$smarty->assign("FCKEDITOR_DISPLAY",$FCKEDITOR_DISPLAY); - -if (isset($focus->name)) -$smarty->assign("NAME", $focus->name); -else -$smarty->assign("NAME", ""); - -if($focus->mode == 'edit') -{ - $smarty->assign("UPDATEINFO",updateInfo($focus->id)); - $smarty->assign("MODE", $focus->mode); -} - -if (isset($_REQUEST['return_module'])) -$smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); -else -$smarty->assign("RETURN_MODULE","Notes"); -if (isset($_REQUEST['return_action'])) -$smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); -else -$smarty->assign("RETURN_ACTION","index"); -if (isset($_REQUEST['return_id'])) -$smarty->assign("RETURN_ID", $_REQUEST['return_id']); -if (isset($_REQUEST['email_id'])) -$smarty->assign("EMAILID", $_REQUEST['email_id']); -if (isset($_REQUEST['ticket_id'])) $smarty->assign("TICKETID", $_REQUEST['ticket_id']); -if (isset($_REQUEST['fileid'])) -$smarty->assign("FILEID", $_REQUEST['fileid']); -if (isset($_REQUEST['record'])) -{ - $smarty->assign("CANCELACTION", "DetailView"); -} -else -{ - $smarty->assign("CANCELACTION", "index"); -} -if (isset($_REQUEST['return_viewname'])) -$smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); -$smarty->assign("THEME", $theme); -$smarty->assign("IMAGE_PATH", $image_path); -$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); -$smarty->assign("ID", $focus->id); -$smarty->assign("OLD_ID", $old_id ); - -if ( empty($focus->filename)) -{ - $smarty->assign("FILENAME_TEXT", ""); - $smarty->assign("FILENAME", ""); -} -else -{ - $smarty->assign("FILENAME_TEXT", "(".$focus->filename.")"); - $smarty->assign("FILENAME", $focus->filename); -} - -if (isset($focus->parent_type) && $focus->parent_type != "") { - $change_parent_button = ""; - $smarty->assign("CHANGE_PARENT_BUTTON", $change_parent_button); -} -if ($focus->parent_type == "Account") $smarty->assign("DEFAULT_SEARCH", "&query=true&account_id=$focus->parent_id&account_name=".urlencode($focus->parent_name)); - -$check_button = Button_Check($module); -$smarty->assign("CHECK", $check_button); -$tabid = getTabid("Notes"); - $validationData = getDBValidationData($focus->tab_name,$tabid); - $data = split_validationdataArray($validationData); - - $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); - $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); - $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); - -if($focus->mode == 'edit') - $smarty->display("salesEditView.tpl"); -else - $smarty->display("CreateView.tpl"); - -?> + The selected file has no data or a invalid file.
'; +} + +if(isset($_REQUEST['record']) && $_REQUEST['record'] !='') +{ + $focus->id = $_REQUEST['record']; + $focus->mode = 'edit'; + $focus->retrieve_entity_info($_REQUEST['record'],"Notes"); + $focus->name=$focus->column_fields['notes_title']; +} +if(isset($_REQUEST['parent_id'])) +{ + $focus->column_fields['parent_id'] = $_REQUEST['parent_id']; +} +//$old_id = ''; +if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') +{ + $old_id = $_REQUEST['record']; + if (! empty($focus->filename) ) + { + $old_id = $focus->id; + } + $focus->id = ""; + $focus->mode = ''; +} + + + +//setting default flag value so due date and time not required +if (!isset($focus->id)) $focus->date_due_flag = 'on'; + +//needed when creating a new case with default values passed in +if (isset($_REQUEST['contact_name']) && is_null($focus->contact_name)) { + $focus->contact_name = $_REQUEST['contact_name']; +} +if (isset($_REQUEST['contact_id']) && is_null($focus->contact_id)) { + $focus->contact_id = $_REQUEST['contact_id']; +} +if (isset($_REQUEST['parent_name']) && is_null($focus->parent_name)) { + $focus->parent_name = $_REQUEST['parent_name']; +} +if (isset($_REQUEST['parent_id']) && is_null($focus->parent_id)) { + $focus->parent_id = $_REQUEST['parent_id']; +} +if (isset($_REQUEST['parent_type'])) { + $focus->parent_type = $_REQUEST['parent_type']; +} +elseif (!isset($focus->parent_type)) { + $focus->parent_type = $app_list_strings['record_type_default_key']; +} + +if (isset($_REQUEST['filename']) && $_REQUEST['isDuplicate'] != 'true') { + $focus->filename = $_REQUEST['filename']; +} + + + +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); + +$disp_view = getView($focus->mode); +if($disp_view == 'edit_view') + $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields)); +else +{ + $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS')); +} +$smarty->assign("OP_MODE",$disp_view); +$category = getParentTab(); +$smarty->assign("CATEGORY",$category); + + +$log->info("Note detail view"); + +$smarty->assign("MOD", $mod_strings); +$smarty->assign("APP", $app_strings); +$smarty->assign("MODULE",$currentModule); +$smarty->assign("SINGLE_MOD",'Note'); +//Display the FCKEditor or not? -- configure $FCKEDITOR_DISPLAY in config.php +$smarty->assign("FCKEDITOR_DISPLAY",$FCKEDITOR_DISPLAY); + +if (isset($focus->name)) +$smarty->assign("NAME", $focus->name); +else +$smarty->assign("NAME", ""); + +if($focus->mode == 'edit') +{ + $smarty->assign("UPDATEINFO",updateInfo($focus->id)); + $smarty->assign("MODE", $focus->mode); +} + +if (isset($_REQUEST['return_module'])) +$smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); +else +$smarty->assign("RETURN_MODULE","Notes"); +if (isset($_REQUEST['return_action'])) +$smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); +else +$smarty->assign("RETURN_ACTION","index"); +if (isset($_REQUEST['return_id'])) +$smarty->assign("RETURN_ID", $_REQUEST['return_id']); +if (isset($_REQUEST['email_id'])) +$smarty->assign("EMAILID", $_REQUEST['email_id']); +if (isset($_REQUEST['ticket_id'])) $smarty->assign("TICKETID", $_REQUEST['ticket_id']); +if (isset($_REQUEST['fileid'])) +$smarty->assign("FILEID", $_REQUEST['fileid']); +if (isset($_REQUEST['record'])) +{ + $smarty->assign("CANCELACTION", "DetailView"); +} +else +{ + $smarty->assign("CANCELACTION", "index"); +} +if (isset($_REQUEST['return_viewname'])) +$smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); +$smarty->assign("THEME", $theme); +$smarty->assign("IMAGE_PATH", $image_path); +$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); +$smarty->assign("ID", $focus->id); +$smarty->assign("OLD_ID", $old_id ); + +if ( empty($focus->filename)) +{ + $smarty->assign("FILENAME_TEXT", ""); + $smarty->assign("FILENAME", ""); +} +else +{ + $smarty->assign("FILENAME_TEXT", "(".$focus->filename.")"); + $smarty->assign("FILENAME", $focus->filename); +} + +if (isset($focus->parent_type) && $focus->parent_type != "") { + $change_parent_button = ""; + $smarty->assign("CHANGE_PARENT_BUTTON", $change_parent_button); +} +if ($focus->parent_type == "Account") $smarty->assign("DEFAULT_SEARCH", "&query=true&account_id=$focus->parent_id&account_name=".urlencode($focus->parent_name)); + +$check_button = Button_Check($module); +$smarty->assign("CHECK", $check_button); +$tabid = getTabid("Notes"); + $validationData = getDBValidationData($focus->tab_name,$tabid); + $data = split_validationdataArray($validationData); + + $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); + $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); + $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); + $smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); +if($focus->mode == 'edit') + $smarty->display("salesEditView.tpl"); +else + $smarty->display("CreateView.tpl"); + +?> Modified: vtigercrm/branches/5.1_jens/modules/Notes/Notes.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Notes/Notes.php (original) +++ vtigercrm/branches/5.1_jens/modules/Notes/Notes.php Mon Apr 16 12:27:44 2007 @@ -29,17 +29,18 @@ // Note is used to store customer information. class Notes extends CRMEntity { + var $log; var $db; var $default_note_name_dom = array('Meeting vtiger_notes', 'Reminder'); - var $tab_name = Array('vtiger_crmentity','vtiger_notes'); + var $tab_name = Array('vtiger_crmentity','vtiger_notes','vtiger_attachments'); var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_notes'=>'notesid','vtiger_senotesrel'=>'notesid','vtiger_attachments'=>'attachmentsid'); var $column_fields = Array(); - var $sortby_fields = Array('notes_title','modifiedtime','contact_id','filename'); + var $sortby_fields = Array('title','modifiedtime','contact_id','filename'); // This is used to retrieve related vtiger_fields from form posts. var $additional_column_fields = Array('', '', '', ''); @@ -47,7 +48,7 @@ // This is the list of vtiger_fields that are in the lists. var $list_fields = Array( 'Subject'=>Array('notes'=>'notes_title'), - 'Contact Name'=>Array('notes'=>'contact_id'), + 'Contact Name'=>Array('contactdetails'=>'lastname'), 'Related to'=>Array('senotesrel'=>'crmid'), 'File'=>Array('notes'=>'filename'), 'Last Modified'=>Array('crmentity'=>'modifiedtime') @@ -64,7 +65,6 @@ //Added these variables which are used as default order by and sortorder in ListView var $default_order_by = 'modifiedtime'; var $default_sort_order = 'ASC'; - function Notes() { $this->log = LoggerManager::getLogger('notes'); $this->log->debug("Entering Notes() method ..."); @@ -75,7 +75,8 @@ function save_module($module) { - + + $insertion_mode = $this->mode; //inserting into vtiger_senotesrel if(isset($this->column_fields['parent_id']) && $this->column_fields['parent_id'] != '') { Modified: vtigercrm/branches/5.1_jens/modules/Notes/Save.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Notes/Save.php (original) +++ vtigercrm/branches/5.1_jens/modules/Notes/Save.php Mon Apr 16 12:27:44 2007 @@ -1,139 +1,139 @@ -date_due_flag = 'off'; - -//Save the Note -$focus->save("Notes"); - -//Added to retrieve the existing attachment of the notes and save it for the new duplicated note -if($_FILES['filename']['name'] == '' && $_REQUEST['mode'] != 'edit' && $_REQUEST['old_id'] != '') -{ - $sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid=vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid= ".$_REQUEST['old_id']; - $result = $adb->query($sql); - if($adb->num_rows($result) != 0) - { - $attachmentid = $adb->query_result($result,0,'attachmentsid'); - $filename = $adb->query_result($result,0,'name'); - $filetype = $adb->query_result($result,0,'type'); - $filepath = $adb->query_result($result,0,'path'); - - $new_attachmentid = $adb->getUniqueID("vtiger_crmentity"); - $date_var = $adb->formatDate(date('YmdHis')); - - $upload_filepath = decideFilePath(); - - //Read the old file contents and write it as a new file with new attachment id - $handle = @fopen($upload_filepath.$new_attachmentid."_".$filename,'w'); - fputs($handle, file_get_contents($filepath.$attachmentid."_".$filename)); - fclose($handle); - - $adb->query("update vtiger_notes set filename=\"$filename\" where notesid=$focus->id"); - $adb->query("insert into vtiger_crmentity (crmid,setype,createdtime) values('".$new_attachmentid."','Notes Attachment','".$date_var."')"); - - $adb->query("insert into vtiger_attachments values(".$new_attachmentid.",'".$filename."','','".$filetype."','".$upload_filepath."')"); - - $adb->query("insert into vtiger_seattachmentsrel values('".$focus->id."','".$new_attachmentid."')"); - } -} - - -$return_id = $focus->id; -$note_id = $return_id; - -if(isset($_REQUEST['parenttab']) && $_REQUEST['parenttab'] != "") $parenttab = $_REQUEST['parenttab']; -if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; -else $return_module = "Notes"; -if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; -else $return_action = "DetailView"; -if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id']; - -// Notes added to Contacts should also update Accounts -// Added by DG 16 Nov 2005 -if($_REQUEST['mode'] != 'edit' && ($_REQUEST['return_module']=='Contacts')) -{ - $crmid = $_REQUEST['return_id']; - $noteid = $focus->id; - $query = 'select accountid from vtiger_contactdetails where contactid='.$crmid; - $result = $adb->query($query); - if($adb->num_rows($result) != 0) - { - $associated_account = $adb->query_result($result,0,"accountid"); - } - else - { - $associated_account = ''; - } - if ($associated_account) - { - $sql1 = "insert into vtiger_senotesrel (notesid, crmid) values('"; - $sql1 .= $noteid."','".$associated_account."')"; - $result = $adb->query($sql1); - } -} - -if($_REQUEST['mode'] != 'edit' && (($_REQUEST['return_module']=='Emails') ||($_REQUEST['return_module']=='HelpDesk') )) -{ - if($_REQUEST['email_id'] != '') - $crmid = $_REQUEST['email_id']; - if($_REQUEST['ticket_id'] != '') - $crmid = $_REQUEST['ticket_id']; - if($crmid != $_REQUEST['parent_id']) - { - $sql = "insert into vtiger_senotesrel (notesid, crmid) values('".$focus->id."','".$crmid."')"; - $adb->query($sql); - } -} - -$local_log->debug("Saved record with id of ".$return_id); - -//Redirect to EditView if the given file is not valid. -if($file_upload_error) -{ - $return_module = 'Notes'; - $return_action = 'EditView'; - $return_id = $note_id.'&upload_error=true&return_module='.$_REQUEST['return_module'].'&return_action='.$_REQUEST['return_action'].'&return_id='.$_REQUEST['return_id']; -} - -//code added for returning back to the current view after edit from list view -if($_REQUEST['return_viewname'] == '') $return_viewname='0'; -if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; -header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&viewname=$return_viewname"); -?> +date_due_flag = 'off'; + +//Save the Note +$focus->save("Notes"); + +//Added to retrieve the existing attachment of the notes and save it for the new duplicated note +if($_FILES['filename']['name'] == '' && $_REQUEST['mode'] != 'edit' && $_REQUEST['old_id'] != '') +{ + $sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid=vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid= ".$_REQUEST['old_id']; + $result = $adb->query($sql); + if($adb->num_rows($result) != 0) + { + $attachmentid = $adb->query_result($result,0,'attachmentsid'); + $filename = $adb->query_result($result,0,'name'); + $filetype = $adb->query_result($result,0,'type'); + $filepath = $adb->query_result($result,0,'path'); + + $new_attachmentid = $adb->getUniqueID("vtiger_crmentity"); + $date_var = $adb->formatDate(date('YmdHis')); + + $upload_filepath = decideFilePath(); + + //Read the old file contents and write it as a new file with new attachment id + $handle = @fopen($upload_filepath.$new_attachmentid."_".$filename,'w'); + fputs($handle, file_get_contents($filepath.$attachmentid."_".$filename)); + fclose($handle); + + $adb->query("update vtiger_notes set filename=\"$filename\" where notesid=$focus->id"); + $adb->query("insert into vtiger_crmentity (crmid,setype,createdtime) values('".$new_attachmentid."','Notes Attachment',".$date_var.")"); + + $adb->query("insert into vtiger_attachments values(".$new_attachmentid.",'".$filename."','','".$filetype."','".$upload_filepath."')"); + + $adb->query("insert into vtiger_seattachmentsrel values('".$focus->id."','".$new_attachmentid."')"); + } +} + + +$return_id = $focus->id; +$note_id = $return_id; + +if(isset($_REQUEST['parenttab']) && $_REQUEST['parenttab'] != "") $parenttab = $_REQUEST['parenttab']; +if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; +else $return_module = "Notes"; +if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; +else $return_action = "DetailView"; +if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id']; + +// Notes added to Contacts should also update Accounts +// Added by DG 16 Nov 2005 +if($_REQUEST['mode'] != 'edit' && ($_REQUEST['return_module']=='Contacts')) +{ + $crmid = $_REQUEST['return_id']; + $noteid = $focus->id; + $query = 'select accountid from vtiger_contactdetails where contactid='.$crmid; + $result = $adb->query($query); + if($adb->num_rows($result) != 0) + { + $associated_account = $adb->query_result($result,0,"accountid"); + } + else + { + $associated_account = ''; + } + if ($associated_account) + { + $sql1 = "insert into vtiger_senotesrel (notesid, crmid) values('"; + $sql1 .= $noteid."','".$associated_account."')"; + $result = $adb->query($sql1); + } +} + +if($_REQUEST['mode'] != 'edit' && (($_REQUEST['return_module']=='Emails') ||($_REQUEST['return_module']=='HelpDesk') )) +{ + if($_REQUEST['email_id'] != '') + $crmid = $_REQUEST['email_id']; + if($_REQUEST['ticket_id'] != '') + $crmid = $_REQUEST['ticket_id']; + if($crmid != $_REQUEST['parent_id']) + { + $sql = "insert into vtiger_senotesrel (notesid, crmid) values('".$focus->id."','".$crmid."')"; + $adb->query($sql); + } +} + +$local_log->debug("Saved record with id of ".$return_id); + +//Redirect to EditView if the given file is not valid. +if($file_upload_error) +{ + $return_module = 'Notes'; + $return_action = 'EditView'; + $return_id = $note_id.'&upload_error=true&return_module='.$_REQUEST['return_module'].'&return_action='.$_REQUEST['return_action'].'&return_id='.$_REQUEST['return_id']; +} + +//code added for returning back to the current view after edit from list view +if($_REQUEST['return_viewname'] == '') $return_viewname='0'; +if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; +header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&viewname=$return_viewname"); +?> Modified: vtigercrm/branches/5.1_jens/modules/Portal/Portal.js ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Portal/Portal.js (original) +++ vtigercrm/branches/5.1_jens/modules/Portal/Portal.js Mon Apr 16 12:27:44 2007 @@ -1,115 +1,115 @@ -/********************************************************************************* -** The contents of this file are subject to the vtiger CRM Public License Version 1.0 - * ("License"); You may not use this file except in compliance with the License - * The Original Code is: vtiger CRM Open Source - * The Initial Developer of the Original Code is vtiger. - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. -* - ********************************************************************************/ - - -function fetchAddSite(id) -{ - $("status").style.display="inline"; - new Ajax.Request( - 'index.php', - {queue: {position: 'end', scope: 'command'}, - method: 'post', - postBody:'module=Portal&action=PortalAjax&file=Popup&record='+id, - onComplete: function(response) { - $("status").style.display="none"; - $('editportal_cont').innerHTML = response.responseText; - } - } - ); -} - -function fetchContents(mode) -{ - $("status").style.display="inline"; - new Ajax.Request( - 'index.php', - {queue: {position: 'end', scope: 'command'}, - method: 'post', - postBody:'action=PortalAjax&mode=ajax&module=Portal&file=ListView&datamode='+mode, - onComplete: function(response) { - $("status").style.display="none"; - $('portalcont').innerHTML = response.responseText; - } - } - ); -} -function DeleteSite(id) -{ - if(confirm("Are you sure you want to delete ?")) - { - $("status").style.display="inline"; - new Ajax.Request( - 'index.php', - {queue: {position: 'end', scope: 'command'}, - method: 'post', - postBody:'action=PortalAjax&mode=ajax&file=Delete&module=Portal&record='+id, - onComplete: function(response) { - $("status").style.display="none"; - $('portalcont').innerHTML = response.responseText; - } - } - ); - } -} -function SaveSite(id) -{ - if ($('portalurl').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert('Site Url cannot be empty') - return false; - } - if ($('portalname').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert('Site Name cannot be empty') - return false; - } - Effect.Puff('orgLay'); - $("status").style.display="inline"; - var portalurl = document.getElementById('portalurl').value; - var portalurl = portalurl.replace(/&/g, "#$#$#"); - var portalname = document.getElementById('portalname').value; - new Ajax.Request( - 'index.php', - {queue: {position: 'end', scope: 'command'}, - method: 'post', - postBody:'action=PortalAjax&mode=ajax&file=Save&module=Portal&portalname='+portalname+'&portalurl='+portalurl+'&record='+id, - onComplete: function(response) { - $("status").style.display="none"; - $('portalcont').innerHTML = response.responseText; - } - } - ); -} -function setSite(oUrllist) -{ - var url = oUrllist.options[oUrllist.options.selectedIndex].value; - document.getElementById('locatesite').src = url; -} - -var oRegex = new Object() ; -oRegex.UriProtocol = new RegExp('') ; -oRegex.UriProtocol.compile( '^(((http|https|ftp|news):\/\/)|mailto:)', 'gi' ) ; - -oRegex.UrlOnChangeProtocol = new RegExp('') ; -oRegex.UrlOnChangeProtocol.compile( '^(http|https|ftp|news)://(?=.)', 'gi' ) ; - -function OnUrlChange() -{ - var sUrl; - var sProtocol; - - sUrl=document.getElementById("portalurl").value ; - sProtocol=oRegex.UrlOnChangeProtocol.exec( sUrl ) ; - if ( sProtocol ) - { - sUrl = sUrl.substr( sProtocol[0].length ) ; - document.getElementById("portalurl").value = sUrl ; - } - - -} +/********************************************************************************* +** The contents of this file are subject to the vtiger CRM Public License Version 1.0 + * ("License"); You may not use this file except in compliance with the License + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. +* + ********************************************************************************/ + + +function fetchAddSite(id) +{ + $("status").style.display="inline"; + new Ajax.Request( + 'index.php', + {queue: {position: 'end', scope: 'command'}, + method: 'post', + postBody:'module=Portal&action=PortalAjax&file=Popup&record='+id, + onComplete: function(response) { + $("status").style.display="none"; + $('editportal_cont').innerHTML = response.responseText; + } + } + ); +} + +function fetchContents(mode) +{ + $("status").style.display="inline"; + new Ajax.Request( + 'index.php', + {queue: {position: 'end', scope: 'command'}, + method: 'post', + postBody:'action=PortalAjax&mode=ajax&module=Portal&file=ListView&datamode='+mode, + onComplete: function(response) { + $("status").style.display="none"; + $('portalcont').innerHTML = response.responseText; + } + } + ); +} +function DeleteSite(id) +{ + if(confirm(alert_arr.SURE_TO_DELETE)) + { + $("status").style.display="inline"; + new Ajax.Request( + 'index.php', + {queue: {position: 'end', scope: 'command'}, + method: 'post', + postBody:'action=PortalAjax&mode=ajax&file=Delete&module=Portal&record='+id, + onComplete: function(response) { + $("status").style.display="none"; + $('portalcont').innerHTML = response.responseText; + } + } + ); + } +} +function SaveSite(id) +{ + if ($('portalurl').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { + alert(alert_arr.SITEURL_CANNOT_BE_EMPTY) + return false; + } + if ($('portalname').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { + alert(alert_arr.SITENAME_CANNOT_BE_EMPTY) + return false; + } + Effect.Puff('orgLay'); + $("status").style.display="inline"; + var portalurl = document.getElementById('portalurl').value; + var portalurl = portalurl.replace(/&/g, "#$#$#"); + var portalname = document.getElementById('portalname').value; + new Ajax.Request( + 'index.php', + {queue: {position: 'end', scope: 'command'}, + method: 'post', + postBody:'action=PortalAjax&mode=ajax&file=Save&module=Portal&portalname='+portalname+'&portalurl='+portalurl+'&record='+id, + onComplete: function(response) { + $("status").style.display="none"; + $('portalcont').innerHTML = response.responseText; + } + } + ); +} +function setSite(oUrllist) +{ + var url = oUrllist.options[oUrllist.options.selectedIndex].value; + document.getElementById('locatesite').src = url; +} + +var oRegex = new Object() ; +oRegex.UriProtocol = new RegExp('') ; +oRegex.UriProtocol.compile( '^(((http|https|ftp|news):\/\/)|mailto:)', 'gi' ) ; + +oRegex.UrlOnChangeProtocol = new RegExp('') ; +oRegex.UrlOnChangeProtocol.compile( '^(http|https|ftp|news)://(?=.)', 'gi' ) ; + +function OnUrlChange() +{ + var sUrl; + var sProtocol; + + sUrl=document.getElementById("portalurl").value ; + sProtocol=oRegex.UrlOnChangeProtocol.exec( sUrl ) ; + if ( sProtocol ) + { + sUrl = sUrl.substr( sProtocol[0].length ) ; + document.getElementById("portalurl").value = sUrl ; + } + + +} Modified: vtigercrm/branches/5.1_jens/modules/Portal/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Portal/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Portal/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -25,6 +25,6 @@ 'LBL_BOOKMARK_NAME_URL'=>'Bookmark Name & URL', 'LBL_TOOLS'=>'Tools', 'LBL_MANAGE_SITES'=>'Manage Sites', -'LBL_MY_SITES'=>'My Sites', +'LBL_MY_SITES'=>'Sites', ); ?> Modified: vtigercrm/branches/5.1_jens/modules/Potentials/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/CallRelatedList.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/CallRelatedList.php Mon Apr 16 12:27:44 2007 @@ -52,6 +52,7 @@ if (isset($focus->name)) $smarty->assign("NAME", $focus->name); $related_array = getRelatedLists($currentModule,$focus); $smarty->assign("RELATEDLISTS", $related_array); +$smarty->assign("BASE_ACCOUNT",getAccountName($focus->column_fields[account_id])); $category = getParentTab(); $smarty->assign("CATEGORY",$category); $smarty->assign("UPDATEINFO",updateInfo($focus->id)); Modified: vtigercrm/branches/5.1_jens/modules/Potentials/Charts.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/Charts.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/Charts.php Mon Apr 16 12:27:44 2007 @@ -1,1280 +1,1280 @@ -debug("Entering outcome_by_month(".$date_start.",". $date_end.",". $user_id.") method ..."); - global $app_strings,$lang_crm, $app_list_strings, $current_module_strings,$current_user, $log, $charset, $tmp_dir; - global $theme; - include_once ('Image/Graph.php'); - include_once ('Image/Canvas.php'); - - $log =& LoggerManager::getLogger('outcome_by_month chart'); - // Set the basic parameters of the graph - $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); - $imagemap = $canvas->getImageMap(); - $graph =& Image_Graph::factory('graph', $canvas); - $log->debug("graph object created"); - - // add a TrueType font - $font =& $graph->addNew('font', calculate_font_name($lang_crm)); - // set the font size to 11 pixels - $font->setSize(8); - - $graph->setFont($font); - // create the plotarea layout - $title =& Image_Graph::factory('title', array('Title',10)); - $plotarea =& Image_Graph::factory('plotarea',array( - 'axis', - 'axis' - )); - $footer =& Image_Graph::factory('title', array('Footer',8)); - $graph->add( - Image_Graph::vertical($title, - Image_Graph::vertical( - $plotarea, - $footer, - 90 - ), - 5 - ) - ); - - //$graph->SetScale("textlin"); - - if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) { - //$font = calculate_font_family($lang_crm); - - $log->debug("date_start is: $date_start"); - $log->debug("date_end is: $date_end"); - $log->debug("user_id is: "); - $log->debug($user_id); - $log->debug("cache_file_name is: $cache_file_name"); - - //build the where clause for the query that matches $user - $where = "("; - $first = true; - $current = 0; - foreach ($user_id as $the_id) { - if (!$first) $where .= "OR "; - $first = false; - $where .= "vtiger_crmentity.smcreatorid='$the_id' "; - } - $where .= ") "; - - //build the where clause for the query that matches $date_start and $date_end - $where .= "AND closingdate >= '$date_start' AND closingdate <= '$date_end'"; - $subtitle = $current_module_strings['LBL_DATE_RANGE']." ".getDisplayDate($date_start)." ".$current_module_strings['LBL_DATE_RANGE_TO']." ".getDisplayDate($date_end)."\n"; - - //Now do the db queries - //query for opportunity data that matches $datay and $user - $opp = new Potentials(); - $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); - - //build pipeline by sales stage data - $total = 0; - $count = array(); - $sum = array(); - $months = array(); - $other = $current_module_strings['LBL_LEAD_SOURCE_OTHER']; - if (isset($opp_list)) { - foreach ($opp_list as $record) { - $month = substr_replace($record->column_fields['closingdate'],'',-3); - if (!in_array($month, $months)) { array_push($months, $month); } - if ($record->column_fields['sales_stage'] == 'Closed Won' || $record->column_fields['sales_stage'] == 'Closed Lost') { - $sales_stage=$record->column_fields['sales_stage']; - } - else { - $sales_stage=$other; - } - - if (!isset($sum[$month][$sales_stage])) { - $sum[$month][$sales_stage] = 0; - } - if (isset($record->column_fields['amount'])) { - // Strip all non numbers from this string. - $amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate); - $sum[$month][$sales_stage] = $sum[$month][$sales_stage] + $amount; - if (isset($count[$month][$sales_stage])) { - $count[$month][$sales_stage]++; - } - else { - $count[$month][$sales_stage] = 1; - } - $total = $total + ($amount/1000); - } - } - } - - $legend = array(); - $datax = array(); - $aTargets = array(); - $aAlts = array(); - $stages = array($other, 'Closed Lost', 'Closed Won'); - //sort the months or push a bogus month on the array so that an empty chart is drawn - if (empty($months)) { - array_push($months, date('Y-m',time())); - } - else{ - sort($months); - } - foreach($months as $month) { - foreach($stages as $stage) { - $log->debug("stage is $stage"); - if (!isset($datax[$stage])) { - $datax[$stage] = array(); - } - if (!isset($aAlts[$stage])) { - $aAlts[$stage] = array(); - } - if (!isset($aTargets[$stage])) { - $aTargets[$stage] = array(); - } - - if (isset($sum[$month][$stage])) { - array_push($datax[$stage], $sum[$month][$stage]/1000); - array_push($aAlts[$stage], $count[$month][$stage]." ".$current_module_strings['LBL_OPPS_OUTCOME']." $stage"); - } - else { - array_push($datax[$stage], 0); - array_push($aAlts[$stage], ""); - } - array_push($aTargets[$stage], "index.php?module=Potentials&action=ListView&date_closed=$month&sales_stage=".urlencode($stage)."&query=true&type=dbrd"); - } - array_push($legend,$month); - } - - $log->debug("datax is:"); - $log->debug($datax); - $log->debug("aAlts is:"); - $log->debug($aAlts); - $log->debug("aTargets is:"); - $log->debug($aTargets); - $log->debug("sum is:"); - $log->debug($sum); - $log->debug("count is:"); - $log->debug($count); - - //now build the bar plots for each user across the sales stages - $color = array('Closed Lost'=>'#FF9900','Closed Won'=>'#009933', $other=>'#0066CC'); - $index = 0; - $datasets = array(); - $xlabels = array(); - $fills =& Image_Graph::factory('Image_Graph_Fill_Array'); - foreach($stages as $stage) { - // Now create a bar plot - $datasets[$index] = & Image_Graph::factory('dataset'); - foreach($datax[$stage] as $i => $y) { - $x = 1+2*$i; - $datasets[$index]->addPoint( - $x, - $y, - array( - 'url' => $aTargets[$stage][$i], - 'alt' => $aAlts[$stage][$i] - ) - ); - } - - // Set fill colors for bars - $fills->addColor($color[$stage]); - - $index++; - } - for($i=0;$i$m) { - $monthSum = 0; - foreach($stages as $stage) $monthSum += $datax[$stage][$num]; - if($monthSum > $maximum) $maximum = $monthSum; - $log->debug('maximum = '.$maximum.' month = '.$m.' sum = '.$monthSum); - } - - if($theme == "blue") - { - $font_color = "#212473"; - } - else - { - $font_color = "#000000"; - } - $font->setColor($font_color); - - // Create the grouped bar plot - $gbplot = & $plotarea->addNew('bar', array($datasets, 'stacked')); - $gbplot->setFillStyle($fills); - - //You can change the width of the bars if you like - $gbplot->setBarWidth(50/count($months),"%"); - - // set margin - $plotarea->setPadding(array('top'=>0,'bottom'=>0,'left'=>10,'right'=>20)); - - // Set white margin color - $graph->setBackgroundColor('#F5F5F5'); - - // Use a box around the plot area - $gbplot->setBorderColor('black'); - - // Use a gradient to fill the plot area - $gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_VERTICAL, 'white', '#E5E5E5'))); - - // Setup title - $titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL']; - //$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total; - - $title->setText($titlestr); - - // Create the xaxis labels - $array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', - array($xlabels) - ); - - // Setup X-axis - $xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X); - $xaxis->setDataPreprocessor($array_data); - $xaxis->forceMinimum(0); - $xaxis->forceMaximum(2*count($months)); - $xaxis->setLabelInterval(1); - $xaxis->setTickOptions(0,0); - $xaxis->setLabelInterval(2,2); - $xaxis->setTickOptions(5,0,2); - - // set grid - $gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y); - $gridY->setLineColor('#E5E5E5 at 0.5'); - - - // Add some grace to y-axis so the bars doesn't go - // all the way to the end of the plot area - $yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y); - $yaxis->forceMaximum($maximum * 1.1); - $ticks = get_tickspacing($maximum); - - // Setup the Y-axis to be displayed in the bottom of the - // graph. We also finetune the exact layout of the title, - // ticks and labels to make them look nice. - $yaxis->setAxisIntersection('max'); - - // Then fix the tick marks - $valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d"); - $yaxis->setFontSize(8); - $yaxis->setDataPreprocessor($valueproc); - // Arrange Y-Axis tick marks inside - $yaxis->setLabelInterval($ticks[0]); - $yaxis->setTickOptions(-5,0); - $yaxis->setLabelInterval($ticks[1],2); - $yaxis->setTickOptions(-2,0,2); - $yaxis->setLabelOption('position','inside'); - - // Finally setup the title - $yaxis->setLabelOption('position','inside'); - - // eliminate zero values - $gbplot->setDataSelector(Image_Graph::factory('Image_Graph_DataSelector_NoZeros')); - - // set markers - $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); - $marker->setDataPreprocessor($valueproc); - $marker->setFillColor('000000 at 0.0'); - $marker->setBorderColor('000000 at 0.0'); - $marker->setFontColor('white'); - $marker->setFontSize(8); - $gbplot->setMarker($marker); - - $subtitle .= $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; - $footer->setText($subtitle); - $footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT); - - // .. and stroke the graph - $imgMap = $graph->done( - array( - 'tohtml' => true, - 'border' => 0, - 'filename' => $cache_file_name, - 'filepath' => './', - 'urlpath' => '' - )); - //$imgMap = htmlspecialchars($output); - save_image_map($cache_file_name.'.map', $imgMap); - } - else { - $imgMap_fp = fopen($cache_file_name.'.map', "rb"); - $imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map')); - fclose($imgMap_fp); - } - $fileModTime = filemtime($cache_file_name.'.map'); - $return = "\n$imgMap"; - $log->debug("Exiting outcome_by_month method ..."); - return $return; - } - - /** - * Creates lead_source_by_outcome pipeline image as a horizontal accumlated bar graph for multiple vtiger_users. - * param $datay- the lead source data to display in the x-axis - * param $date_start- the begin date of opps to find - * param $date_end- the end date of opps to find - * param $ids - list of assigned vtiger_users of opps to find - * param $cache_file_name - file name to write image to - * param $refresh - boolean whether to rebuild image if exists - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function lead_source_by_outcome($datay=array('foo','bar'), $user_id=array('1'), $cache_file_name='a_file', $refresh=false,$width=900,$height=500){ - global $log,$current_user; - $log->debug("Entering lead_source_by_outcome(".$datay.",".$user_id.",".$cache_file_name.",".$refresh.") method ..."); - global $app_strings,$lang_crm, $current_module_strings,$charset, $tmp_dir; - global $theme; - - include_once ('Image/Graph.php'); - include_once ('Image/Canvas.php'); - - $log =& LoggerManager::getLogger('lead_source_by_outcome chart'); - // Set the basic parameters of the graph - $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); - $imagemap = $canvas->getImageMap(); - $graph =& Image_Graph::factory('graph', $canvas); - $log->debug("graph object created"); - // add a TrueType font - $font =& $graph->addNew('font', calculate_font_name($lang_crm)); - // set the font size to 11 pixels - $font->setSize(8); - - $graph->setFont($font); - // create the plotarea layout - $title =& Image_Graph::factory('title', array('Test',10)); - $plotarea =& Image_Graph::factory('plotarea',array( - 'axis', - 'axis', - 'horizontal' - )); - $footer =& Image_Graph::factory('title', array('Footer',8)); - $graph->add( - Image_Graph::vertical($title, - Image_Graph::vertical( - $plotarea, - $footer, - 90 - ), - 5 - ) - ); - - if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) { - - $log->debug("datay is:"); - $log->debug($datay); - $log->debug("user_id is: "); - $log->debug($user_id); - $log->debug("cache_file_name is: $cache_file_name"); - - $where=""; - //build the where clause for the query that matches $user - $count = count($user_id); - if ($count>0) { - $where = "("; - $first = true; - $current = 0; - foreach ($user_id as $the_id) { - if (!$first) $where .= "OR "; - $first = false; - $where .= "vtiger_crmentity.smcreatorid='$the_id' "; - } - $where .= ") "; - } - - //build the where clause for the query that matches $datay - $count = count($datay); - if ($count>0) { - $where .= "AND ( "; - unset($first); - $first = true; - foreach ($datay as $key=>$value) { - if (!$first) $where .= "OR "; - $first = false; - $where .= "leadsource ='$key' "; - } - $where .= ")"; - } - - //Now do the db queries - //query for opportunity data that matches $datay and $user - $opp = new Potentials(); - $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); - - //build pipeline by sales stage data - $total = 0; - $count = array(); - $sum = array(); - $other = $current_module_strings['LBL_LEAD_SOURCE_OTHER']; - if (isset($opp_list)) { - foreach ($opp_list as $record) { - //if lead source is blank, set it to the language's "none" value - if (isset($record->column_fields['leadsource']) && $record->column_fields['leadsource'] != '') { - $lead_source = $record->column_fields['leadsource']; - } - else { - $lead_source = $current_module_strings['NTC_NO_LEGENDS']; - } - - if ($record->column_fields['sales_stage'] == 'Closed Won' || $record->column_fields['sales_stage'] == 'Closed Lost') { - $sales_stage=$record->column_fields['sales_stage']; - } - else { - $sales_stage=$other; - } - - if (!isset($sum[$lead_source][$sales_stage])) { - $sum[$lead_source][$sales_stage] = 0; - } - if (isset($record->column_fields['amount'])) { - // Strip all non numbers from this string. - $amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate); - $sum[$lead_source][$sales_stage] = $sum[$lead_source][$sales_stage] + $amount; - if (isset($count[$lead_source][$sales_stage])) { - $count[$lead_source][$sales_stage]++; - } - else { - $count[$lead_source][$sales_stage] = 1; - } - $total = $total + ($amount/1000); - } - } - } - - $legend = array(); - $datax = array(); - $aTargets = array(); - $aAlts = array(); - $stages = array($other,'Closed Lost', 'Closed Won'); - foreach($datay as $lead=>$translation) { - if ($lead == '') { - $lead = $current_module_strings['NTC_NO_LEGENDS']; - $translation = $current_module_strings['NTC_NO_LEGENDS']; - } - foreach($stages as $stage) { - $log->debug("stage_key is $stage"); - if (!isset($datax[$stage])) { - $datax[$stage] = array(); - } - if (!isset($aAlts[$stage])) { - $aAlts[$stage] = array(); - } - if (!isset($aTargets[$stage])) { - $aTargets[$stage] = array(); - } - - if (isset($sum[$lead][$stage])) { - array_push($datax[$stage], $sum[$lead][$stage]/1000); - array_push($aAlts[$stage], $count[$lead][$stage]." ".$current_module_strings['LBL_OPPS_OUTCOME']." $stage"); - } - else { - array_push($datax[$stage], 0); - array_push($aAlts[$stage], ""); - } - array_push($aTargets[$stage], "index.php?module=Potentials&action=ListView&leadsource=".urlencode($lead)."&sales_stage=".urlencode($stage)."&query=true&type=dbrd"); - } - array_push($legend,$translation); - } - - $log->debug("datax is:"); - $log->debug($datax); - $log->debug("aAlts is:"); - $log->debug($aAlts); - $log->debug("aTargets is:"); - $log->debug($aTargets); - $log->debug("sum is:"); - $log->debug($sum); - $log->debug("count is:"); - $log->debug($count); - - //now build the bar plots for each user across the sales stages - $color = array('Closed Lost'=>'FF9900','Closed Won'=>'009933', $other=>'0066CC'); - $index = 0; - $xlabels = array(); - $datasets = array(); - $fills =& Image_Graph::factory('Image_Graph_Fill_Array'); - foreach($stages as $stage) { - // Now create a bar pot - $datasets[$index] = & Image_Graph::factory('dataset'); - foreach($datax[$stage] as $i => $y) { - $x = 1+2*$i; - $datasets[$index]->addPoint( - //$datay[$legend[$x]], - $x, - $y, - array( - 'url' => $aTargets[$stage][$i], - 'alt' => $aAlts[$stage][$i], - 'target' => '' - ) - ); - } - for($i=0;$iaddColor("#".$color[$stage]); - - $log->debug("datax[$stage] is: "); - $log->debug($datax[$stage]); - $index++; - } - - // compute maximum value because of grace jpGraph parameter not supported - $maximum = 0; - foreach($legend as $legendidx=>$legend_text) { - $dataxSum = 0; - foreach($stages as $stage) $dataxSum += $datax[$stage][$legendidx]; - if($dataxSum > $maximum) $maximum = $dataxSum; - } - - if($theme == "blue") - { - $font_color = "#212473"; - } - else - { - $font_color = "#000000"; - } - $font->setColor($font_color); - - // Create the grouped bar plot - $gbplot = & $plotarea->addNew('bar', array($datasets, 'stacked')); - $gbplot->setFillStyle($fills); - - //You can change the width of the bars if you like - $gbplot->setBarWidth(50/count($legend),"%"); - - // Set white margin color - $graph->setBackgroundColor('#F5F5F5'); - - // Use a box around the plot area - $gbplot->setBorderColor('black'); - - // Use a gradient to fill the plot area - $gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_HORIZONTAL, 'white', '#E5E5E5'))); - - // Setup title - $titlestr = $current_module_strings['LBL_ALL_OPPORTUNITIES'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL']; - //$titlestr = $current_module_strings['LBL_ALL_OPPORTUNITIES'].$current_user->currency_symbol.$total; - $title->setText($titlestr); - - // Create the xaxis labels - $array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', - array($xlabels) - ); - - // Setup X-axis - $xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X); - $xaxis->setDataPreprocessor($array_data); - $xaxis->forceMinimum(0); - $xaxis->forceMaximum(2*count($legend)); - $xaxis->setLabelInterval(1); - $xaxis->setTickOptions(0,0); - $xaxis->setLabelInterval(2,2); - $xaxis->setTickOptions(5,0,2); - $xaxis->setInverted(true); - - // set grid - $gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y); - $gridY->setLineColor('#E5E5E5 at 0.5'); - - // Add some grace to y-axis so the bars doesn't go - // all the way to the end of the plot area - $yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y); - $yaxis->forceMaximum($maximum * 1.1); - $ticks = get_tickspacing($maximum); - - // Then fix the tick marks - $yaxis->setFontSize(8); - $yaxis->setAxisIntersection('max'); - $valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d"); - $yaxis->setDataPreprocessor($valueproc); - $yaxis->setLabelInterval($ticks[0]); - $yaxis->setTickOptions(-5,0); - $yaxis->setLabelInterval($ticks[1],2); - $yaxis->setTickOptions(-2,0,2); - - // eliminate zero values - $gbplot->setDataSelector(Image_Graph::factory('Image_Graph_DataSelector_NoZeros')); - - // set markers - $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); - $marker->setDataPreprocessor($valueproc); - $marker->setFillColor('#000000 at 0.0'); - $marker->setBorderColor('#000000 at 0.0'); - $marker->setFontColor('white'); - $marker->setFontSize(8); - $gbplot->setMarker($marker); - - // Finally setup the title - $subtitle = $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; - $footer->setText($subtitle); - $footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT); - - // .. and stroke the graph - $imgMap = $graph->done( - array( - 'tohtml' => true, - 'border' => 0, - 'filename' => $cache_file_name, - 'filepath' => './', - 'urlpath' => '' - )); - //$imgMap = htmlspecialchars($output); - save_image_map($cache_file_name.'.map', $imgMap); - } - else { - $imgMap_fp = fopen($cache_file_name.'.map', "rb"); - $imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map')); - fclose($imgMap_fp); - } - $fileModTime = filemtime($cache_file_name.'.map'); - $return = "\n$imgMap"; - $log->debug("Exiting lead_source_by_outcome method ..."); - return $return; - } - - /** - * Creates opportunity pipeline image as a horizontal accumlated bar graph for multiple vtiger_users. - * param $datax- the sales stage data to display in the x-axis - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function pipeline_by_sales_stage($datax=array('foo','bar'), $date_start='2071-10-15', $date_end='2071-10-15', $user_id=array('1'), $cache_file_name='a_file', $refresh=false,$width=900,$height=500){ - global $log,$current_user; - $log->debug("Entering pipeline_by_sales_stage(".$datax.",".$date_start.",".$date_end.",".$user_id.",".$cache_file_name.",".$refresh.") method ..."); - global $app_strings,$lang_crm, $current_module_strings, $charset, $tmp_dir; - global $theme; - include_once ('Image/Graph.php'); - include_once ('Image/Canvas.php'); - - $log =& LoggerManager::getLogger('opportunity charts'); - // Set the basic parameters of the graph - - - $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); - $imagemap = $canvas->getImageMap(); - $graph =& Image_Graph::factory('graph', $canvas); - //$log->debug("graph object created"); - // add a TrueType font - //$font =& $graph->addNew('font', calculate_font_name($lang_crm)); - $font =& $graph->addNew('font', calculate_font_name($lang_crm)); - // set the font size to 11 pixels - $font->setSize(8); - - $graph->setFont($font); - $title =& Image_Graph::factory('title', array('Test',10)); - $plotarea =& Image_Graph::factory('plotarea',array( - 'axis', - 'axis', - 'horizontal' - )); - $footer =& Image_Graph::factory('title', array('Footer',8)); - $graph->add( - Image_Graph::vertical($title, - Image_Graph::vertical( - $plotarea, - $footer, - 90 - ), - 5 - ) - ); - $log->debug("graph object created"); - - - if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) { - - $log->debug("starting pipeline chart"); - $log->debug("datax is:"); - $log->debug($datax); - $log->debug("user_id is: "); - $log->debug($user_id); - $log->debug("cache_file_name is: $cache_file_name"); - - $where=""; - //build the where clause for the query that matches $user - $count = count($user_id); - if ($count>0) { - $where = "("; - $first = true; - $current = 0; - foreach ($user_id as $the_id) { - if (!$first) $where .= "OR "; - $first = false; - //reference post - //if I change the owner of a opportunity, the graph shown on Home does not update correctly, this is because the graph is looking for the creatorid and not for the ownerid - //fix incorporated based on /sak's feedback - $where .= "vtiger_crmentity.smownerid='$the_id' "; - } - $where .= ") "; - } - - //build the where clause for the query that matches $datax - $count = count($datax); - if ($count>0) { - $where .= "AND ( "; - unset($first); - $first = true; - foreach ($datax as $key=>$value) { - if (!$first) $where .= "OR "; - $first = false; - $where .= "sales_stage ='$key' "; - } - $where .= ")"; - } - - //build the where clause for the query that matches $date_start and $date_end - $where .= "AND closingdate >= '$date_start' AND closingdate <= '$date_end'"; - $subtitle = $current_module_strings['LBL_DATE_RANGE']." ".getDisplayDate($date_start)." ".$current_module_strings['LBL_DATE_RANGE_TO']." ".getDisplayDate($date_end)."\n"; - - //Now do the db queries - //query for opportunity data that matches $datax and $user - $opp = new Potentials(); - $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); - - //build pipeline by sales stage data - $total = 0; - $count = array(); - $sum = array(); - if (isset($opp_list)) { - foreach ($opp_list as $record) { - if (!isset($sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']])) { - $sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] = 0; - } - if (isset($record->column_fields['amount'])) { - // Strip all non numbers from this string. - $amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate); - $sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] = $sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] + $amount; - if (isset($count[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']])) { - $count[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']]++; - } - else { - $count[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] = 1; - } - $total = $total + ($amount/1000); - } - } - } - - $legend = array(); - $datay = array(); - $aTargets = array(); - $aAlts = array(); - foreach ($datax as $stage_key=>$stage_translation) { - foreach ($user_id as $the_id) { - $the_user = get_assigned_user_name($the_id); - if (!isset($datay[$the_id])) { - $datay[$the_id] = array(); - } - if (!isset($aAlts[$the_id])) { - $aAlts[$the_id] = array(); - } - if (!isset($aTargets[$the_id])) { - $aTargets[$the_id] = array(); - } - - if (isset($sum[$stage_key][$the_id])) { - array_push($datay[$the_id], $sum[$stage_key][$the_id]/1000); - array_push($aAlts[$the_id], $the_user.' - '.$count[$stage_key][$the_id]." ".$current_module_strings['LBL_OPPS_IN_STAGE']." $stage_translation"); - } - else { - array_push($datay[$the_id], 0); - array_push($aAlts[$the_id], ""); - } - array_push($aTargets[$the_id], "index.php?module=Potentials&action=ListView&assigned_user_id=$the_id&sales_stage=".urlencode($stage_key)."&closingdate_start=".urlencode($date_start)."&closingdate_end=".urlencode($date_end)."&query=true&type=dbrd"); - } - array_push($legend,$stage_translation); - } - - $log->debug("datay is:"); - $log->debug($datay); - $log->debug("aAlts is:"); - $log->debug($aAlts); - $log->debug("aTargets is:"); - $log->debug($aTargets); - $log->debug("sum is:"); - $log->debug($sum); - $log->debug("count is:"); - $log->debug($count); - - //now build the bar plots for each user across the sales stages - $colors = color_generator(count($user_id),'#D50100','#002222'); - $index = 0; - $datasets = array(); - $xlabels = array(); - $fills =& Image_Graph::factory('Image_Graph_Fill_Array'); - foreach($user_id as $the_id) { - // Now create a bar pot - $datasets[$index] = & Image_Graph::factory('dataset'); - foreach($datay[$the_id] as $i => $y) { - $x = 1+2*$i; - $datasets[$index]->addPoint( - $x, - $y, - array( - 'url' => $aTargets[$the_id][$i], - 'alt' => $aAlts[$the_id][$i] - ) - ); - } - - // Set fill colors for bars - $fills->addColor($colors[$index]); - - $index++; - } - for($i=0;$i$legend_text) { - $legendsum = 0; - foreach($user_id as $the_id) $legendsum += $datay[$the_id][$legendidx]; - if($legendsum > $maximum) $maximum = $legendsum; - } - // Create the grouped bar plot - $gbplot = & $plotarea->addNew('bar', array($datasets, 'stacked')); - $gbplot->setFillStyle($fills); - - //You can change the width of the bars if you like - $gbplot->setBarWidth(50/count($legend),"%"); - - - // Set white margin color - $graph->setBackgroundColor('#F5F5F5'); - - // Use a box around the plot area - $gbplot->setBorderColor('black'); - - // Use a gradient to fill the plot area - $gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_HORIZONTAL, 'white', '#E5E5E5'))); - - if($theme == "blue") - { - $font_color = "#212473"; - } - else - { - $font_color = "#000000"; - } - $font->setColor($font_color); - - // Setup title - $titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL']; - //$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total; - $title->setText($titlestr); - - // Create the xaxis labels - $array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', - array($xlabels) - ); - - - // Setup X-axis - $xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X); - $xaxis->setDataPreprocessor($array_data); - $xaxis->forceMinimum(0); - $xaxis->forceMaximum(2*count($legend)); - $xaxis->setLabelInterval(1); - $xaxis->setTickOptions(0,0); - $xaxis->setLabelInterval(2,2); - $xaxis->setTickOptions(5,0,2); - $xaxis->setInverted(true); - - // Setup Y-axis - $yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y); - $yaxis->setFontSize(8); - $yaxis->setAxisIntersection('max'); - - // Add some grace to y-axis so the bars doesn't go - // all the way to the end of the plot area - $yaxis->forceMaximum($maximum * 1.1); - $ticks = get_tickspacing($maximum); - - // set grid - $gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y); - $gridY->setLineColor('#E5E5E5 at 0.5'); - - // First make the labels look right - $valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d"); - $yaxis->setDataPreprocessor($valueproc); - $yaxis->setLabelInterval($ticks[0]); - $yaxis->setTickOptions(-5,0); - $yaxis->setLabelInterval($ticks[1],2); - $yaxis->setTickOptions(-2,0,2); - - // eliminate zero values - $gbplot->setDataSelector(Image_Graph::factory('Image_Graph_DataSelector_NoZeros')); - - // set markers - $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); - $marker->setDataPreprocessor($valueproc); - $marker->setFillColor('000000 at 0.0'); - $marker->setBorderColor('000000 at 0.0'); - $marker->setFontColor('white'); - $marker->setFontSize(8); - $gbplot->setMarker($marker); - - // Finally setup the title - - $subtitle .= $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; - $footer->setText($subtitle); - $footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT); - - // .. and stroke the graph - $imgMap = $graph->done( - array( - 'tohtml' => true, - 'border' => 0, - 'filename' => $cache_file_name, - 'filepath' => './', - 'urlpath' => '' - )); - //$imgMap = $graph->GetHTMLImageMap('pipeline'); - save_image_map($cache_file_name.'.map', $imgMap); - } - else { - $imgMap_fp = fopen($cache_file_name.'.map', "rb"); - $imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map')); - fclose($imgMap_fp); - } - $fileModTime = filemtime($cache_file_name.'.map'); - $return = "\n$imgMap"; - $log->debug("Exiting pipeline_by_sales_stage method ..."); - return $return; - } - - /** - * Creates pie chart image of opportunities by lead_source. - * param $datax- the sales stage data to display in the x-axis - * param $datay- the sum of opportunity amounts for each opportunity in each sales stage - * to display in the y-axis - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function pipeline_by_lead_source($legends=array('foo','bar'), $user_id=array('1'), $cache_file_name='a_file', $refresh=true,$width=900,$height=500){ - global $log,$current_user; - $log->debug("Entering pipeline_by_lead_source(".$legends.") method ..."); - global $app_strings,$lang_crm, $current_module_strings, $log, $charset, $tmp_dir; - global $theme; - - include_once ('Image/Graph.php'); - include_once ('Image/Canvas.php'); - - $font = calculate_font_name($lang_crm); - - if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) { - $log =& LoggerManager::getLogger('opportunity charts'); - $log->debug("starting pipeline chart"); - $log->debug("legends is:"); - $log->debug($legends); - $log->debug("user_id is: "); - $log->debug($user_id); - $log->debug("cache_file_name is: $cache_file_name"); - - //Now do the db queries - //query for opportunity data that matches $legends and $user - $where=""; - //build the where clause for the query that matches $user - $count = count($user_id); - if ($count>0) { - $where = "("; - $first = true; - foreach ($user_id as $the_id) { - if (!$first) $where .= "OR "; - $first = false; - $where .= "vtiger_crmentity.smcreatorid='$the_id' "; - } - $where .= ") "; - } - - //build the where clause for the query that matches $datax - $count = count($legends); - if ($count>0) { - $where .= "AND ( "; - $first = true; - foreach ($legends as $key=>$value) { - if (!$first) $where .= "OR "; - $first = false; - $where .= "leadsource ='$key' "; - } - $where .= ")"; - } - - $opp = new Potentials(); - $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); - - //build pipeline by lead source data - $total = 0; - $count = array(); - $sum = array(); - if (isset($opp_list)) { - foreach ($opp_list as $record) { - if (!isset($sum[$record->column_fields['leadsource']])) $sum[$record->column_fields['leadsource']] = 0; - if (isset($record->column_fields['amount']) && isset($record->column_fields['leadsource'])) { - // Strip all non numbers from this string. - $amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate); - $sum[$record->column_fields['leadsource']] = $sum[$record->column_fields['leadsource']] + ($amount/1000); - if (isset($count[$record->column_fields['leadsource']])) $count[$record->column_fields['leadsource']]++; - else $count[$record->column_fields['leadsource']] = 1; - $total = $total + ($amount/1000); - } - } - } - - $visible_legends = array(); - $data= array(); - $aTargets = array(); - $aAlts = array(); - foreach ($legends as $lead_source_key=>$lead_source_translation) { - if (isset($sum[$lead_source_key])) - { - array_push($data, $sum[$lead_source_key]); - if($lead_source_key != '') - { - array_push($visible_legends, $lead_source_translation); - } - else - { - // put none in if the vtiger_field is blank. - array_push($visible_legends, $current_module_strings['NTC_NO_LEGENDS']); - } - array_push($aTargets, "index.php?module=Potentials&action=ListView&leadsource=".urlencode($lead_source_key)."&query=true&type=dbrd"); - array_push($aAlts, $count[$lead_source_key]." ".$current_module_strings['LBL_OPPS_IN_LEAD_SOURCE']." $lead_source_translation "); - } - } - - $log->debug("sum is:"); - $log->debug($sum); - $log->debug("count is:"); - $log->debug($count); - $log->debug("total is: $total"); - if ($total == 0) { -$log->debug("Exiting pipeline_by_lead_source method ..."); - return ($current_module_strings['ERR_NO_OPPS']); - } - - if($theme == "blue") - { - $font_color = "#212473"; - } - else - { - $font_color = "#000000"; - } - - - $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); - $imagemap = $canvas->getImageMap(); - $graph =& Image_Graph::factory('graph', $canvas); - - $font =& $graph->addNew('font', calculate_font_name($lang_crm)); - // set the font size to 11 pixels - $font->setSize(8); - $font->setColor($font_color); - - $graph->setFont($font); - // create the plotarea layout - $title =& Image_Graph::factory('title', array('Test',10)); - $plotarea =& Image_Graph::factory('plotarea',array( - 'category', - 'axis' - )); - $footer =& Image_Graph::factory('title', array('Footer',8)); - $graph->add( - Image_Graph::vertical($title, - Image_Graph::vertical( - $plotarea, - $footer, - 90 - ), - 5 - ) - ); - - // Generate colours - $colors = color_generator(count($visible_legends),'#33CCFF','#3322FF'); - $index = 0; - $dataset = & Image_Graph::factory('dataset'); - $fills =& Image_Graph::factory('Image_Graph_Fill_Array'); - foreach($visible_legends as $legend) { - $dataset->addPoint( - $legend, - $data[$index], - array( - 'url' => $aTargets[$index], - 'alt' => $aAlts[$index] - ) - ); - $fills->addColor($colors[$index]); - $log->debug('point ='.$legend.','.$data[$index]); - - $index++; - } - - // create the pie chart and associate the filling colours - $gbplot = & $plotarea->addNew('pie', $dataset); - $plotarea->hideAxis(); - $gbplot->setFillStyle($fills); - - // Setup title - $titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL']; - //$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total; - - $title->setText($titlestr); - - // format the data values - $valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d"); - - // set markers - $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); - $marker->setDataPreprocessor($valueproc); - $marker->setFillColor('#FFFFFF'); - $marker->setBorderColor($font_color); - $marker->setFontColor($font_color); - $marker->setFontSize(8); - $pointingMarker =& $graph->addNew('Image_Graph_Marker_Pointing_Angular', array(20, &$marker)); - $gbplot->setMarker($pointingMarker); - - // set legend - $legend_box =& $plotarea->addNew('legend'); - $legend_box->setPadding(array('top'=>20,'bottom'=>0,'left'=>0,'right'=>0)); - $legend_box->setFillColor('#F5F5F5'); - $legend_box->showShadow(); - - $subtitle = $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; - $footer->setText($subtitle); - $footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_LEFT); - - $imgMap = $graph->done( - array( - 'tohtml' => true, - 'border' => 0, - 'filename' => $cache_file_name, - 'filepath' => './', - 'urlpath' => '' - )); - //$imgMap = htmlspecialchars($output); - save_image_map($cache_file_name.'.map', $imgMap); - } - else { - $imgMap_fp = fopen($cache_file_name.'.map', "rb"); - $imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map')); - fclose($imgMap_fp); - } - $fileModTime = filemtime($cache_file_name.'.map'); - $return = "\n$imgMap"; - $log->debug("Exiting pipeline_by_lead_source method ..."); - return $return; - - } - -} - - -/** - * Creates a file with the image map - * param $filename - file name to save to - * param $image_map - image map string to save - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ -function save_image_map($filename,$image_map) -{ - global $log; - $log->debug("Entering save_image_map(".$filename.",".$image_map.") method ..."); - // save the image map to file - $log =& LoggerManager::getLogger('save_image_file'); - - if (!$handle = fopen($filename, 'w')) { - $log->debug("Cannot open file ($filename)"); - $log->debug("Exiting save_image_map method ..."); - return; - } - - // Write $somecontent to our opened file. - if (fwrite($handle, $image_map) === FALSE) { - $log->debug("Cannot write to file ($filename)"); - $log->debug("Exiting save_image_map method ..."); - return false; - } - - $log->debug("Success, wrote ($image_map) to file ($filename)"); - - fclose($handle); - $log->debug("Exiting save_image_map method ..."); - return true; - -} - -// retrieve the translated strings. -$app_strings = return_application_language($current_language); - -if(isset($app_strings['LBL_CHARSET'])) -{ - $charset = $app_strings['LBL_CHARSET']; -} -else -{ - $charset = $default_charset; -} - - -?> +debug("Entering outcome_by_month(".$date_start.",". $date_end.",". $user_id.") method ..."); + global $app_strings,$lang_crm, $app_list_strings, $current_module_strings,$current_user, $log, $charset, $tmp_dir; + global $theme; + include_once ('Image/Graph.php'); + include_once ('Image/Canvas.php'); + + $log =& LoggerManager::getLogger('outcome_by_month chart'); + // Set the basic parameters of the graph + $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); + $imagemap = $canvas->getImageMap(); + $graph =& Image_Graph::factory('graph', $canvas); + $log->debug("graph object created"); + + // add a TrueType font + $font =& $graph->addNew('font', calculate_font_name($lang_crm)); + // set the font size to 11 pixels + $font->setSize(8); + + $graph->setFont($font); + // create the plotarea layout + $title =& Image_Graph::factory('title', array('Title',10)); + $plotarea =& Image_Graph::factory('plotarea',array( + 'axis', + 'axis' + )); + $footer =& Image_Graph::factory('title', array('Footer',8)); + $graph->add( + Image_Graph::vertical($title, + Image_Graph::vertical( + $plotarea, + $footer, + 90 + ), + 5 + ) + ); + + //$graph->SetScale("textlin"); + + if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) { + //$font = calculate_font_family($lang_crm); + + $log->debug("date_start is: $date_start"); + $log->debug("date_end is: $date_end"); + $log->debug("user_id is: "); + $log->debug($user_id); + $log->debug("cache_file_name is: $cache_file_name"); + + //build the where clause for the query that matches $user + $where = ""; + $first = true; + $current = 0; + /*foreach ($user_id as $the_id) { + if (!$first) $where .= "OR "; + $first = false; + $where .= "vtiger_crmentity.smcreatorid='$the_id' "; + } + $where .= ") ";*/ + + //build the where clause for the query that matches $date_start and $date_end + $where .= " closingdate >= '$date_start' AND closingdate <= '$date_end'"; + $subtitle = $current_module_strings['LBL_DATE_RANGE']." ".getDisplayDate($date_start)." ".$current_module_strings['LBL_DATE_RANGE_TO']." ".getDisplayDate($date_end)."\n"; + + //Now do the db queries + //query for opportunity data that matches $datay and $user + $opp = new Potentials(); + $opp_list = $opp->get_full_list("vtiger_potential.amount DESC, vtiger_potential.closingdate DESC", $where); + + //build pipeline by sales stage data + $total = 0; + $count = array(); + $sum = array(); + $months = array(); + $other = $current_module_strings['LBL_LEAD_SOURCE_OTHER']; + if (isset($opp_list)) { + foreach ($opp_list as $record) { + $month = substr_replace($record->column_fields['closingdate'],'',-3); + if (!in_array($month, $months)) { array_push($months, $month); } + if ($record->column_fields['sales_stage'] == 'Closed Won' || $record->column_fields['sales_stage'] == 'Closed Lost') { + $sales_stage=$record->column_fields['sales_stage']; + } + else { + $sales_stage=$other; + } + + if (!isset($sum[$month][$sales_stage])) { + $sum[$month][$sales_stage] = 0; + } + if (isset($record->column_fields['amount'])) { + // Strip all non numbers from this string. + $amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate); + $sum[$month][$sales_stage] = $sum[$month][$sales_stage] + $amount; + if (isset($count[$month][$sales_stage])) { + $count[$month][$sales_stage]++; + } + else { + $count[$month][$sales_stage] = 1; + } + $total = $total + ($amount/1000); + } + } + } + + $legend = array(); + $datax = array(); + $aTargets = array(); + $aAlts = array(); + $stages = array($other, 'Closed Lost', 'Closed Won'); + //sort the months or push a bogus month on the array so that an empty chart is drawn + if (empty($months)) { + array_push($months, date('Y-m',time())); + } + else{ + sort($months); + } + foreach($months as $month) { + foreach($stages as $stage) { + $log->debug("stage is $stage"); + if (!isset($datax[$stage])) { + $datax[$stage] = array(); + } + if (!isset($aAlts[$stage])) { + $aAlts[$stage] = array(); + } + if (!isset($aTargets[$stage])) { + $aTargets[$stage] = array(); + } + + if (isset($sum[$month][$stage])) { + array_push($datax[$stage], $sum[$month][$stage]/1000); + array_push($aAlts[$stage], $count[$month][$stage]." ".$current_module_strings['LBL_OPPS_OUTCOME']." $stage"); + } + else { + array_push($datax[$stage], 0); + array_push($aAlts[$stage], ""); + } + array_push($aTargets[$stage], "index.php?module=Potentials&action=ListView&date_closed=$month&sales_stage=".urlencode($stage)."&query=true&type=dbrd"); + } + array_push($legend,$month); + } + + $log->debug("datax is:"); + $log->debug($datax); + $log->debug("aAlts is:"); + $log->debug($aAlts); + $log->debug("aTargets is:"); + $log->debug($aTargets); + $log->debug("sum is:"); + $log->debug($sum); + $log->debug("count is:"); + $log->debug($count); + + //now build the bar plots for each user across the sales stages + $color = array('Closed Lost'=>'#FF9900','Closed Won'=>'#009933', $other=>'#0066CC'); + $index = 0; + $datasets = array(); + $xlabels = array(); + $fills =& Image_Graph::factory('Image_Graph_Fill_Array'); + foreach($stages as $stage) { + // Now create a bar plot + $datasets[$index] = & Image_Graph::factory('dataset'); + foreach($datax[$stage] as $i => $y) { + $x = 1+2*$i; + $datasets[$index]->addPoint( + $x, + $y, + array( + 'url' => $aTargets[$stage][$i], + 'alt' => $aAlts[$stage][$i] + ) + ); + } + + // Set fill colors for bars + $fills->addColor($color[$stage]); + + $index++; + } + for($i=0;$i$m) { + $monthSum = 0; + foreach($stages as $stage) $monthSum += $datax[$stage][$num]; + if($monthSum > $maximum) $maximum = $monthSum; + $log->debug('maximum = '.$maximum.' month = '.$m.' sum = '.$monthSum); + } + + if($theme == "blue") + { + $font_color = "#212473"; + } + else + { + $font_color = "#000000"; + } + $font->setColor($font_color); + + // Create the grouped bar plot + $gbplot = & $plotarea->addNew('bar', array($datasets, 'stacked')); + $gbplot->setFillStyle($fills); + + //You can change the width of the bars if you like + $gbplot->setBarWidth(50/count($months),"%"); + + // set margin + $plotarea->setPadding(array('top'=>0,'bottom'=>0,'left'=>10,'right'=>20)); + + // Set white margin color + $graph->setBackgroundColor('#F5F5F5'); + + // Use a box around the plot area + $gbplot->setBorderColor('black'); + + // Use a gradient to fill the plot area + $gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_VERTICAL, 'white', '#E5E5E5'))); + + // Setup title + $titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL']; + //$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total; + + $title->setText($titlestr); + + // Create the xaxis labels + $array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', + array($xlabels) + ); + + // Setup X-axis + $xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X); + $xaxis->setDataPreprocessor($array_data); + $xaxis->forceMinimum(0); + $xaxis->forceMaximum(2*count($months)); + $xaxis->setLabelInterval(1); + $xaxis->setTickOptions(0,0); + $xaxis->setLabelInterval(2,2); + $xaxis->setTickOptions(5,0,2); + + // set grid + $gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y); + $gridY->setLineColor('#E5E5E5 at 0.5'); + + + // Add some grace to y-axis so the bars doesn't go + // all the way to the end of the plot area + $yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y); + $yaxis->forceMaximum($maximum * 1.1); + $ticks = get_tickspacing($maximum); + + // Setup the Y-axis to be displayed in the bottom of the + // graph. We also finetune the exact layout of the title, + // ticks and labels to make them look nice. + $yaxis->setAxisIntersection('max'); + + // Then fix the tick marks + $valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d"); + $yaxis->setFontSize(8); + $yaxis->setDataPreprocessor($valueproc); + // Arrange Y-Axis tick marks inside + $yaxis->setLabelInterval($ticks[0]); + $yaxis->setTickOptions(-5,0); + $yaxis->setLabelInterval($ticks[1],2); + $yaxis->setTickOptions(-2,0,2); + $yaxis->setLabelOption('position','inside'); + + // Finally setup the title + $yaxis->setLabelOption('position','inside'); + + // eliminate zero values + $gbplot->setDataSelector(Image_Graph::factory('Image_Graph_DataSelector_NoZeros')); + + // set markers + $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); + $marker->setDataPreprocessor($valueproc); + $marker->setFillColor('000000 at 0.0'); + $marker->setBorderColor('000000 at 0.0'); + $marker->setFontColor('white'); + $marker->setFontSize(8); + $gbplot->setMarker($marker); + + $subtitle .= $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; + $footer->setText($subtitle); + $footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT); + + // .. and stroke the graph + $imgMap = $graph->done( + array( + 'tohtml' => true, + 'border' => 0, + 'filename' => $cache_file_name, + 'filepath' => './', + 'urlpath' => '' + )); + //$imgMap = htmlspecialchars($output); + save_image_map($cache_file_name.'.map', $imgMap); + } + else { + $imgMap_fp = fopen($cache_file_name.'.map', "rb"); + $imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map')); + fclose($imgMap_fp); + } + $fileModTime = filemtime($cache_file_name.'.map'); + $return = "\n$imgMap"; + $log->debug("Exiting outcome_by_month method ..."); + return $return; + } + + /** + * Creates lead_source_by_outcome pipeline image as a horizontal accumlated bar graph for multiple vtiger_users. + * param $datay- the lead source data to display in the x-axis + * param $date_start- the begin date of opps to find + * param $date_end- the end date of opps to find + * param $ids - list of assigned vtiger_users of opps to find + * param $cache_file_name - file name to write image to + * param $refresh - boolean whether to rebuild image if exists + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function lead_source_by_outcome($datay=array('foo','bar'), $user_id=array('1'), $cache_file_name='a_file', $refresh=false,$width=900,$height=500){ + global $log,$current_user; + $log->debug("Entering lead_source_by_outcome(".$datay.",".$user_id.",".$cache_file_name.",".$refresh.") method ..."); + global $app_strings,$lang_crm, $current_module_strings,$charset, $tmp_dir; + global $theme; + + include_once ('Image/Graph.php'); + include_once ('Image/Canvas.php'); + + $log =& LoggerManager::getLogger('lead_source_by_outcome chart'); + // Set the basic parameters of the graph + $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); + $imagemap = $canvas->getImageMap(); + $graph =& Image_Graph::factory('graph', $canvas); + $log->debug("graph object created"); + // add a TrueType font + $font =& $graph->addNew('font', calculate_font_name($lang_crm)); + // set the font size to 11 pixels + $font->setSize(8); + + $graph->setFont($font); + // create the plotarea layout + $title =& Image_Graph::factory('title', array('Test',10)); + $plotarea =& Image_Graph::factory('plotarea',array( + 'axis', + 'axis', + 'horizontal' + )); + $footer =& Image_Graph::factory('title', array('Footer',8)); + $graph->add( + Image_Graph::vertical($title, + Image_Graph::vertical( + $plotarea, + $footer, + 90 + ), + 5 + ) + ); + + if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) { + + $log->debug("datay is:"); + $log->debug($datay); + $log->debug("user_id is: "); + $log->debug($user_id); + $log->debug("cache_file_name is: $cache_file_name"); + + $where=""; + //build the where clause for the query that matches $user + /*$count = count($user_id); + if ($count>0) { + $where = "("; + $first = true; + $current = 0; + foreach ($user_id as $the_id) { + if (!$first) $where .= "OR "; + $first = false; + $where .= "vtiger_crmentity.smcreatorid='$the_id' "; + } + $where .= ") "; + }*/ + + //build the where clause for the query that matches $datay + $count = count($datay); + if ($count>0) { + $where .= " ( "; + unset($first); + $first = true; + foreach ($datay as $key=>$value) { + if (!$first) $where .= "OR "; + $first = false; + $where .= "leadsource ='$key' "; + } + $where .= ")"; + } + + //Now do the db queries + //query for opportunity data that matches $datay and $user + $opp = new Potentials(); + $opp_list = $opp->get_full_list("vtiger_potential.amount DESC, vtiger_potential.closingdate DESC", $where); + + //build pipeline by sales stage data + $total = 0; + $count = array(); + $sum = array(); + $other = $current_module_strings['LBL_LEAD_SOURCE_OTHER']; + if (isset($opp_list)) { + foreach ($opp_list as $record) { + //if lead source is blank, set it to the language's "none" value + if (isset($record->column_fields['leadsource']) && $record->column_fields['leadsource'] != '') { + $lead_source = $record->column_fields['leadsource']; + } + else { + $lead_source = $current_module_strings['NTC_NO_LEGENDS']; + } + + if ($record->column_fields['sales_stage'] == 'Closed Won' || $record->column_fields['sales_stage'] == 'Closed Lost') { + $sales_stage=$record->column_fields['sales_stage']; + } + else { + $sales_stage=$other; + } + + if (!isset($sum[$lead_source][$sales_stage])) { + $sum[$lead_source][$sales_stage] = 0; + } + if (isset($record->column_fields['amount'])) { + // Strip all non numbers from this string. + $amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate); + $sum[$lead_source][$sales_stage] = $sum[$lead_source][$sales_stage] + $amount; + if (isset($count[$lead_source][$sales_stage])) { + $count[$lead_source][$sales_stage]++; + } + else { + $count[$lead_source][$sales_stage] = 1; + } + $total = $total + ($amount/1000); + } + } + } + + $legend = array(); + $datax = array(); + $aTargets = array(); + $aAlts = array(); + $stages = array($other,'Closed Lost', 'Closed Won'); + foreach($datay as $lead=>$translation) { + if ($lead == '') { + $lead = $current_module_strings['NTC_NO_LEGENDS']; + $translation = $current_module_strings['NTC_NO_LEGENDS']; + } + foreach($stages as $stage) { + $log->debug("stage_key is $stage"); + if (!isset($datax[$stage])) { + $datax[$stage] = array(); + } + if (!isset($aAlts[$stage])) { + $aAlts[$stage] = array(); + } + if (!isset($aTargets[$stage])) { + $aTargets[$stage] = array(); + } + + if (isset($sum[$lead][$stage])) { + array_push($datax[$stage], $sum[$lead][$stage]/1000); + array_push($aAlts[$stage], $count[$lead][$stage]." ".$current_module_strings['LBL_OPPS_OUTCOME']." $stage"); + } + else { + array_push($datax[$stage], 0); + array_push($aAlts[$stage], ""); + } + array_push($aTargets[$stage], "index.php?module=Potentials&action=ListView&leadsource=".urlencode($lead)."&sales_stage=".urlencode($stage)."&query=true&type=dbrd"); + } + array_push($legend,$translation); + } + + $log->debug("datax is:"); + $log->debug($datax); + $log->debug("aAlts is:"); + $log->debug($aAlts); + $log->debug("aTargets is:"); + $log->debug($aTargets); + $log->debug("sum is:"); + $log->debug($sum); + $log->debug("count is:"); + $log->debug($count); + + //now build the bar plots for each user across the sales stages + $color = array('Closed Lost'=>'FF9900','Closed Won'=>'009933', $other=>'0066CC'); + $index = 0; + $xlabels = array(); + $datasets = array(); + $fills =& Image_Graph::factory('Image_Graph_Fill_Array'); + foreach($stages as $stage) { + // Now create a bar pot + $datasets[$index] = & Image_Graph::factory('dataset'); + foreach($datax[$stage] as $i => $y) { + $x = 1+2*$i; + $datasets[$index]->addPoint( + //$datay[$legend[$x]], + $x, + $y, + array( + 'url' => $aTargets[$stage][$i], + 'alt' => $aAlts[$stage][$i], + 'target' => '' + ) + ); + } + for($i=0;$iaddColor("#".$color[$stage]); + + $log->debug("datax[$stage] is: "); + $log->debug($datax[$stage]); + $index++; + } + + // compute maximum value because of grace jpGraph parameter not supported + $maximum = 0; + foreach($legend as $legendidx=>$legend_text) { + $dataxSum = 0; + foreach($stages as $stage) $dataxSum += $datax[$stage][$legendidx]; + if($dataxSum > $maximum) $maximum = $dataxSum; + } + + if($theme == "blue") + { + $font_color = "#212473"; + } + else + { + $font_color = "#000000"; + } + $font->setColor($font_color); + + // Create the grouped bar plot + $gbplot = & $plotarea->addNew('bar', array($datasets, 'stacked')); + $gbplot->setFillStyle($fills); + + //You can change the width of the bars if you like + $gbplot->setBarWidth(50/count($legend),"%"); + + // Set white margin color + $graph->setBackgroundColor('#F5F5F5'); + + // Use a box around the plot area + $gbplot->setBorderColor('black'); + + // Use a gradient to fill the plot area + $gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_HORIZONTAL, 'white', '#E5E5E5'))); + + // Setup title + $titlestr = $current_module_strings['LBL_ALL_OPPORTUNITIES'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL']; + //$titlestr = $current_module_strings['LBL_ALL_OPPORTUNITIES'].$current_user->currency_symbol.$total; + $title->setText($titlestr); + + // Create the xaxis labels + $array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', + array($xlabels) + ); + + // Setup X-axis + $xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X); + $xaxis->setDataPreprocessor($array_data); + $xaxis->forceMinimum(0); + $xaxis->forceMaximum(2*count($legend)); + $xaxis->setLabelInterval(1); + $xaxis->setTickOptions(0,0); + $xaxis->setLabelInterval(2,2); + $xaxis->setTickOptions(5,0,2); + $xaxis->setInverted(true); + + // set grid + $gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y); + $gridY->setLineColor('#E5E5E5 at 0.5'); + + // Add some grace to y-axis so the bars doesn't go + // all the way to the end of the plot area + $yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y); + $yaxis->forceMaximum($maximum * 1.1); + $ticks = get_tickspacing($maximum); + + // Then fix the tick marks + $yaxis->setFontSize(8); + $yaxis->setAxisIntersection('max'); + $valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d"); + $yaxis->setDataPreprocessor($valueproc); + $yaxis->setLabelInterval($ticks[0]); + $yaxis->setTickOptions(-5,0); + $yaxis->setLabelInterval($ticks[1],2); + $yaxis->setTickOptions(-2,0,2); + + // eliminate zero values + $gbplot->setDataSelector(Image_Graph::factory('Image_Graph_DataSelector_NoZeros')); + + // set markers + $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); + $marker->setDataPreprocessor($valueproc); + $marker->setFillColor('#000000 at 0.0'); + $marker->setBorderColor('#000000 at 0.0'); + $marker->setFontColor('white'); + $marker->setFontSize(8); + $gbplot->setMarker($marker); + + // Finally setup the title + $subtitle = $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; + $footer->setText($subtitle); + $footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT); + + // .. and stroke the graph + $imgMap = $graph->done( + array( + 'tohtml' => true, + 'border' => 0, + 'filename' => $cache_file_name, + 'filepath' => './', + 'urlpath' => '' + )); + //$imgMap = htmlspecialchars($output); + save_image_map($cache_file_name.'.map', $imgMap); + } + else { + $imgMap_fp = fopen($cache_file_name.'.map', "rb"); + $imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map')); + fclose($imgMap_fp); + } + $fileModTime = filemtime($cache_file_name.'.map'); + $return = "\n$imgMap"; + $log->debug("Exiting lead_source_by_outcome method ..."); + return $return; + } + + /** + * Creates opportunity pipeline image as a horizontal accumlated bar graph for multiple vtiger_users. + * param $datax- the sales stage data to display in the x-axis + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function pipeline_by_sales_stage($datax=array('foo','bar'), $date_start='2071-10-15', $date_end='2071-10-15', $user_id=array('1'), $cache_file_name='a_file', $refresh=false,$width=900,$height=500){ + global $log,$current_user; + $log->debug("Entering pipeline_by_sales_stage(".$datax.",".$date_start.",".$date_end.",".$user_id.",".$cache_file_name.",".$refresh.") method ..."); + global $app_strings,$lang_crm, $current_module_strings, $charset, $tmp_dir; + global $theme; + include_once ('Image/Graph.php'); + include_once ('Image/Canvas.php'); + + $log =& LoggerManager::getLogger('opportunity charts'); + // Set the basic parameters of the graph + + + $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); + $imagemap = $canvas->getImageMap(); + $graph =& Image_Graph::factory('graph', $canvas); + //$log->debug("graph object created"); + // add a TrueType font + //$font =& $graph->addNew('font', calculate_font_name($lang_crm)); + $font =& $graph->addNew('font', calculate_font_name($lang_crm)); + // set the font size to 11 pixels + $font->setSize(8); + + $graph->setFont($font); + $title =& Image_Graph::factory('title', array('Test',10)); + $plotarea =& Image_Graph::factory('plotarea',array( + 'axis', + 'axis', + 'horizontal' + )); + $footer =& Image_Graph::factory('title', array('Footer',8)); + $graph->add( + Image_Graph::vertical($title, + Image_Graph::vertical( + $plotarea, + $footer, + 90 + ), + 5 + ) + ); + $log->debug("graph object created"); + + + if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) { + + $log->debug("starting pipeline chart"); + $log->debug("datax is:"); + $log->debug($datax); + $log->debug("user_id is: "); + $log->debug($user_id); + $log->debug("cache_file_name is: $cache_file_name"); + + $where=""; + //build the where clause for the query that matches $user + /*$count = count($user_id); + if ($count>0) { + $where = "("; + $first = true; + $current = 0; + foreach ($user_id as $the_id) { + if (!$first) $where .= "OR "; + $first = false; + //reference post + //if I change the owner of a opportunity, the graph shown on Home does not update correctly, this is because the graph is looking for the creatorid and not for the ownerid + //fix incorporated based on /sak's feedback + $where .= "vtiger_crmentity.smownerid='$the_id' "; + } + $where .= ") "; + }*/ + + //build the where clause for the query that matches $datax + $count = count($datax); + if ($count>0) { + $where .= " ( "; + unset($first); + $first = true; + foreach ($datax as $key=>$value) { + if (!$first) $where .= "OR "; + $first = false; + $where .= "sales_stage ='$key' "; + } + $where .= ")"; + } + + //build the where clause for the query that matches $date_start and $date_end + $where .= "AND closingdate >= '$date_start' AND closingdate <= '$date_end'"; + $subtitle = $current_module_strings['LBL_DATE_RANGE']." ".getDisplayDate($date_start)." ".$current_module_strings['LBL_DATE_RANGE_TO']." ".getDisplayDate($date_end)."\n"; + + //Now do the db queries + //query for opportunity data that matches $datax and $user + $opp = new Potentials(); + $opp_list = $opp->get_full_list("vtiger_potential.amount DESC, vtiger_potential.closingdate DESC", $where); + + //build pipeline by sales stage data + $total = 0; + $count = array(); + $sum = array(); + if (isset($opp_list)) { + foreach ($opp_list as $record) { + if (!isset($sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']])) { + $sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] = 0; + } + if (isset($record->column_fields['amount'])) { + // Strip all non numbers from this string. + $amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate); + $sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] = $sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] + $amount; + if (isset($count[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']])) { + $count[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']]++; + } + else { + $count[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] = 1; + } + $total = $total + ($amount/1000); + } + } + } + + $legend = array(); + $datay = array(); + $aTargets = array(); + $aAlts = array(); + foreach ($datax as $stage_key=>$stage_translation) { + foreach ($user_id as $the_id) { + $the_user = get_assigned_user_name($the_id); + if (!isset($datay[$the_id])) { + $datay[$the_id] = array(); + } + if (!isset($aAlts[$the_id])) { + $aAlts[$the_id] = array(); + } + if (!isset($aTargets[$the_id])) { + $aTargets[$the_id] = array(); + } + + if (isset($sum[$stage_key][$the_id])) { + array_push($datay[$the_id], $sum[$stage_key][$the_id]/1000); + array_push($aAlts[$the_id], $the_user.' - '.$count[$stage_key][$the_id]." ".$current_module_strings['LBL_OPPS_IN_STAGE']." $stage_translation"); + } + else { + array_push($datay[$the_id], 0); + array_push($aAlts[$the_id], ""); + } + array_push($aTargets[$the_id], "index.php?module=Potentials&action=ListView&sales_stage=".urlencode($stage_key)."&closingdate_start=".urlencode($date_start)."&closingdate_end=".urlencode($date_end)."&query=true&type=dbrd"); + } + array_push($legend,$stage_translation); + } + + $log->debug("datay is:"); + $log->debug($datay); + $log->debug("aAlts is:"); + $log->debug($aAlts); + $log->debug("aTargets is:"); + $log->debug($aTargets); + $log->debug("sum is:"); + $log->debug($sum); + $log->debug("count is:"); + $log->debug($count); + + //now build the bar plots for each user across the sales stages + $colors = color_generator(count($user_id),'#D50100','#002222'); + $index = 0; + $datasets = array(); + $xlabels = array(); + $fills =& Image_Graph::factory('Image_Graph_Fill_Array'); + foreach($user_id as $the_id) { + // Now create a bar pot + $datasets[$index] = & Image_Graph::factory('dataset'); + foreach($datay[$the_id] as $i => $y) { + $x = 1+2*$i; + $datasets[$index]->addPoint( + $x, + $y, + array( + 'url' => $aTargets[$the_id][$i], + 'alt' => $aAlts[$the_id][$i] + ) + ); + } + + // Set fill colors for bars + $fills->addColor($colors[$index]); + + $index++; + } + for($i=0;$i$legend_text) { + $legendsum = 0; + foreach($user_id as $the_id) $legendsum += $datay[$the_id][$legendidx]; + if($legendsum > $maximum) $maximum = $legendsum; + } + // Create the grouped bar plot + $gbplot = & $plotarea->addNew('bar', array($datasets, 'stacked')); + $gbplot->setFillStyle($fills); + + //You can change the width of the bars if you like + $gbplot->setBarWidth(50/count($legend),"%"); + + + // Set white margin color + $graph->setBackgroundColor('#F5F5F5'); + + // Use a box around the plot area + $gbplot->setBorderColor('black'); + + // Use a gradient to fill the plot area + $gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_HORIZONTAL, 'white', '#E5E5E5'))); + + if($theme == "blue") + { + $font_color = "#212473"; + } + else + { + $font_color = "#000000"; + } + $font->setColor($font_color); + + // Setup title + $titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL']; + //$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total; + $title->setText($titlestr); + + // Create the xaxis labels + $array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', + array($xlabels) + ); + + + // Setup X-axis + $xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X); + $xaxis->setDataPreprocessor($array_data); + $xaxis->forceMinimum(0); + $xaxis->forceMaximum(2*count($legend)); + $xaxis->setLabelInterval(1); + $xaxis->setTickOptions(0,0); + $xaxis->setLabelInterval(2,2); + $xaxis->setTickOptions(5,0,2); + $xaxis->setInverted(true); + + // Setup Y-axis + $yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y); + $yaxis->setFontSize(8); + $yaxis->setAxisIntersection('max'); + + // Add some grace to y-axis so the bars doesn't go + // all the way to the end of the plot area + $yaxis->forceMaximum($maximum * 1.1); + $ticks = get_tickspacing($maximum); + + // set grid + $gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y); + $gridY->setLineColor('#E5E5E5 at 0.5'); + + // First make the labels look right + $valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d"); + $yaxis->setDataPreprocessor($valueproc); + $yaxis->setLabelInterval($ticks[0]); + $yaxis->setTickOptions(-5,0); + $yaxis->setLabelInterval($ticks[1],2); + $yaxis->setTickOptions(-2,0,2); + + // eliminate zero values + $gbplot->setDataSelector(Image_Graph::factory('Image_Graph_DataSelector_NoZeros')); + + // set markers + $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); + $marker->setDataPreprocessor($valueproc); + $marker->setFillColor('000000 at 0.0'); + $marker->setBorderColor('000000 at 0.0'); + $marker->setFontColor('white'); + $marker->setFontSize(8); + $gbplot->setMarker($marker); + + // Finally setup the title + + $subtitle .= $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; + $footer->setText($subtitle); + $footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT); + + // .. and stroke the graph + $imgMap = $graph->done( + array( + 'tohtml' => true, + 'border' => 0, + 'filename' => $cache_file_name, + 'filepath' => './', + 'urlpath' => '' + )); + //$imgMap = $graph->GetHTMLImageMap('pipeline'); + save_image_map($cache_file_name.'.map', $imgMap); + } + else { + $imgMap_fp = fopen($cache_file_name.'.map', "rb"); + $imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map')); + fclose($imgMap_fp); + } + $fileModTime = filemtime($cache_file_name.'.map'); + $return = "\n$imgMap"; + $log->debug("Exiting pipeline_by_sales_stage method ..."); + return $return; + } + + /** + * Creates pie chart image of opportunities by lead_source. + * param $datax- the sales stage data to display in the x-axis + * param $datay- the sum of opportunity amounts for each opportunity in each sales stage + * to display in the y-axis + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function pipeline_by_lead_source($legends=array('foo','bar'), $user_id=array('1'), $cache_file_name='a_file', $refresh=true,$width=900,$height=500){ + global $log,$current_user; + $log->debug("Entering pipeline_by_lead_source(".$legends.") method ..."); + global $app_strings,$lang_crm, $current_module_strings, $log, $charset, $tmp_dir; + global $theme; + + include_once ('Image/Graph.php'); + include_once ('Image/Canvas.php'); + + $font = calculate_font_name($lang_crm); + + if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) { + $log =& LoggerManager::getLogger('opportunity charts'); + $log->debug("starting pipeline chart"); + $log->debug("legends is:"); + $log->debug($legends); + $log->debug("user_id is: "); + $log->debug($user_id); + $log->debug("cache_file_name is: $cache_file_name"); + + //Now do the db queries + //query for opportunity data that matches $legends and $user + $where=""; + //build the where clause for the query that matches $user + /*$count = count($user_id); + if ($count>0) { + $where = "("; + $first = true; + foreach ($user_id as $the_id) { + if (!$first) $where .= "OR "; + $first = false; + $where .= "vtiger_crmentity.smcreatorid='$the_id' "; + } + $where .= ") "; + }*/ + + //build the where clause for the query that matches $datax + $count = count($legends); + if ($count>0) { + $where .= " ( "; + $first = true; + foreach ($legends as $key=>$value) { + if (!$first) $where .= "OR "; + $first = false; + $where .= "leadsource ='$key' "; + } + $where .= ")"; + } + + $opp = new Potentials(); + $opp_list = $opp->get_full_list("vtiger_potential.amount DESC, vtiger_potential.closingdate DESC", $where); + + //build pipeline by lead source data + $total = 0; + $count = array(); + $sum = array(); + if (isset($opp_list)) { + foreach ($opp_list as $record) { + if (!isset($sum[$record->column_fields['leadsource']])) $sum[$record->column_fields['leadsource']] = 0; + if (isset($record->column_fields['amount']) && isset($record->column_fields['leadsource'])) { + // Strip all non numbers from this string. + $amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate); + $sum[$record->column_fields['leadsource']] = $sum[$record->column_fields['leadsource']] + ($amount/1000); + if (isset($count[$record->column_fields['leadsource']])) $count[$record->column_fields['leadsource']]++; + else $count[$record->column_fields['leadsource']] = 1; + $total = $total + ($amount/1000); + } + } + } + + $visible_legends = array(); + $data= array(); + $aTargets = array(); + $aAlts = array(); + foreach ($legends as $lead_source_key=>$lead_source_translation) { + if (isset($sum[$lead_source_key])) + { + array_push($data, $sum[$lead_source_key]); + if($lead_source_key != '') + { + array_push($visible_legends, $lead_source_translation); + } + else + { + // put none in if the vtiger_field is blank. + array_push($visible_legends, $current_module_strings['NTC_NO_LEGENDS']); + } + array_push($aTargets, "index.php?module=Potentials&action=ListView&leadsource=".urlencode($lead_source_key)."&query=true&type=dbrd"); + array_push($aAlts, $count[$lead_source_key]." ".$current_module_strings['LBL_OPPS_IN_LEAD_SOURCE']." $lead_source_translation "); + } + } + + $log->debug("sum is:"); + $log->debug($sum); + $log->debug("count is:"); + $log->debug($count); + $log->debug("total is: $total"); + if ($total == 0) { +$log->debug("Exiting pipeline_by_lead_source method ..."); + return ($current_module_strings['ERR_NO_OPPS']); + } + + if($theme == "blue") + { + $font_color = "#212473"; + } + else + { + $font_color = "#000000"; + } + + + $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); + $imagemap = $canvas->getImageMap(); + $graph =& Image_Graph::factory('graph', $canvas); + + $font =& $graph->addNew('font', calculate_font_name($lang_crm)); + // set the font size to 11 pixels + $font->setSize(8); + $font->setColor($font_color); + + $graph->setFont($font); + // create the plotarea layout + $title =& Image_Graph::factory('title', array('Test',10)); + $plotarea =& Image_Graph::factory('plotarea',array( + 'category', + 'axis' + )); + $footer =& Image_Graph::factory('title', array('Footer',8)); + $graph->add( + Image_Graph::vertical($title, + Image_Graph::vertical( + $plotarea, + $footer, + 90 + ), + 5 + ) + ); + + // Generate colours + $colors = color_generator(count($visible_legends),'#33CCFF','#3322FF'); + $index = 0; + $dataset = & Image_Graph::factory('dataset'); + $fills =& Image_Graph::factory('Image_Graph_Fill_Array'); + foreach($visible_legends as $legend) { + $dataset->addPoint( + $legend, + $data[$index], + array( + 'url' => $aTargets[$index], + 'alt' => $aAlts[$index] + ) + ); + $fills->addColor($colors[$index]); + $log->debug('point ='.$legend.','.$data[$index]); + + $index++; + } + + // create the pie chart and associate the filling colours + $gbplot = & $plotarea->addNew('pie', $dataset); + $plotarea->hideAxis(); + $gbplot->setFillStyle($fills); + + // Setup title + $titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL']; + //$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total; + + $title->setText($titlestr); + + // format the data values + $valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d"); + + // set markers + $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); + $marker->setDataPreprocessor($valueproc); + $marker->setFillColor('#FFFFFF'); + $marker->setBorderColor($font_color); + $marker->setFontColor($font_color); + $marker->setFontSize(8); + $pointingMarker =& $graph->addNew('Image_Graph_Marker_Pointing_Angular', array(20, &$marker)); + $gbplot->setMarker($pointingMarker); + + // set legend + $legend_box =& $plotarea->addNew('legend'); + $legend_box->setPadding(array('top'=>20,'bottom'=>0,'left'=>0,'right'=>0)); + $legend_box->setFillColor('#F5F5F5'); + $legend_box->showShadow(); + + $subtitle = $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; + $footer->setText($subtitle); + $footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_LEFT); + + $imgMap = $graph->done( + array( + 'tohtml' => true, + 'border' => 0, + 'filename' => $cache_file_name, + 'filepath' => './', + 'urlpath' => '' + )); + //$imgMap = htmlspecialchars($output); + save_image_map($cache_file_name.'.map', $imgMap); + } + else { + $imgMap_fp = fopen($cache_file_name.'.map', "rb"); + $imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map')); + fclose($imgMap_fp); + } + $fileModTime = filemtime($cache_file_name.'.map'); + $return = "\n$imgMap"; + $log->debug("Exiting pipeline_by_lead_source method ..."); + return $return; + + } + +} + + +/** + * Creates a file with the image map + * param $filename - file name to save to + * param $image_map - image map string to save + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. + * All Rights Reserved. + * Contributor(s): ______________________________________.. + */ +function save_image_map($filename,$image_map) +{ + global $log; + $log->debug("Entering save_image_map(".$filename.",".$image_map.") method ..."); + // save the image map to file + $log =& LoggerManager::getLogger('save_image_file'); + + if (!$handle = fopen($filename, 'w')) { + $log->debug("Cannot open file ($filename)"); + $log->debug("Exiting save_image_map method ..."); + return; + } + + // Write $somecontent to our opened file. + if (fwrite($handle, $image_map) === FALSE) { + $log->debug("Cannot write to file ($filename)"); + $log->debug("Exiting save_image_map method ..."); + return false; + } + + $log->debug("Success, wrote ($image_map) to file ($filename)"); + + fclose($handle); + $log->debug("Exiting save_image_map method ..."); + return true; + +} + +// retrieve the translated strings. +$app_strings = return_application_language($current_language); + +if(isset($app_strings['LBL_CHARSET'])) +{ + $charset = $app_strings['LBL_CHARSET']; +} +else +{ + $charset = $default_charset; +} + + +?> Modified: vtigercrm/branches/5.1_jens/modules/Potentials/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/DetailView.php Mon Apr 16 12:27:44 2007 @@ -1,112 +1,115 @@ -retrieve_entity_info($_REQUEST['record'],"Potentials"); - $focus->id = $_REQUEST['record']; - $focus->name=$focus->column_fields['potentialname']; -} -if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { - $focus->id = ""; -} - -global $theme; -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; -require_once($theme_path.'layout_utils.php'); - -$log->info("Potential detail view"); - -$smarty->assign("MOD", $mod_strings); -$smarty->assign("APP", $app_strings); - -$smarty->assign("THEME", $theme); -$smarty->assign("IMAGE_PATH", $image_path); -$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); -$smarty->assign("ID", $focus->id); -$smarty->assign("UPDATEINFO",updateInfo($focus->id)); - -$smarty->assign("ACCOUNTID",$focus->column_fields['account_id']); - -if (isset($focus->name)) $smarty->assign("NAME", $focus->name); -else $smarty->assign("NAME", ""); - -$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields)); - -$smarty->assign("CUSTOMFIELD", $cust_fld); -$smarty->assign("SINGLE_MOD", 'Opportunity'); -$category = getParentTab(); -$smarty->assign("CATEGORY",$category); - - -if(isPermitted("Potentials","EditView",$_REQUEST['record']) == 'yes') - $smarty->assign("EDIT_DUPLICATE","permitted"); -if(isPermitted("Invoice","EditView",$_REQUEST['record']) == 'yes') - $smarty->assign("CONVERTINVOICE","permitted"); -if(isPermitted("Potentials","Delete",$_REQUEST['record']) == 'yes') - $smarty->assign("DELETE","permitted"); - -$tabid = getTabid("Potentials"); -$validationData = getDBValidationData($focus->tab_name,$tabid); -$data = split_validationdataArray($validationData); - -$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); - -$check_button = Button_Check($module); -$smarty->assign("CHECK", $check_button); - -$smarty->assign("CONVERTMODE",'potentoinvoice'); -$smarty->assign("MODULE","Potentials"); -$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); - -if($singlepane_view == 'true') -{ - $related_array = getRelatedLists($currentModule,$focus); - $smarty->assign("RELATEDLISTS", $related_array); -} - -$smarty->assign("SinglePane_View", $singlepane_view); - + +$focus = new Potentials(); +$smarty = new vtigerCRM_Smarty; + +if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { + $focus->retrieve_entity_info($_REQUEST['record'],"Potentials"); + $focus->id = $_REQUEST['record']; + $focus->name=$focus->column_fields['potentialname']; +} +if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { + $focus->id = ""; +} + +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); + +$log->info("Potential detail view"); + +$smarty->assign("MOD", $mod_strings); +$smarty->assign("APP", $app_strings); + +$smarty->assign("THEME", $theme); +$smarty->assign("IMAGE_PATH", $image_path); +$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); +$smarty->assign("ID", $focus->id); +$smarty->assign("UPDATEINFO",updateInfo($focus->id)); + +$smarty->assign("ACCOUNTID",$focus->column_fields['account_id']); + +if (isset($focus->name)) $smarty->assign("NAME", $focus->name); +else $smarty->assign("NAME", ""); + +$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields)); + +$smarty->assign("CUSTOMFIELD", $cust_fld); +$smarty->assign("SINGLE_MOD", 'Opportunity'); +$category = getParentTab(); +$smarty->assign("CATEGORY",$category); + + +if(isPermitted("Potentials","EditView",$_REQUEST['record']) == 'yes') + $smarty->assign("EDIT_DUPLICATE","permitted"); +if(isPermitted("Invoice","EditView",$_REQUEST['record']) == 'yes') + $smarty->assign("CONVERTINVOICE","permitted"); +if(isPermitted("Potentials","Delete",$_REQUEST['record']) == 'yes') + $smarty->assign("DELETE","permitted"); + +$tabid = getTabid("Potentials"); +$validationData = getDBValidationData($focus->tab_name,$tabid); +$data = split_validationdataArray($validationData); + +$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); +$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); +$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); + +$check_button = Button_Check($module); +$smarty->assign("CHECK", $check_button); + +$smarty->assign("CONVERTMODE",'potentoinvoice'); +$smarty->assign("MODULE","Potentials"); +$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); + +if($singlepane_view == 'true') +{ + $related_array = getRelatedLists($currentModule,$focus); + $smarty->assign("RELATEDLISTS", $related_array); + $smarty->assign("BASE_ACCOUNT",getAccountName($focus->column_fields[account_id])); +} + +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); + +$smarty->assign("SinglePane_View", $singlepane_view); + $organization = new Organization; $organization->id = $current_organization; -$smarty->assign("ASSIGN_ORGUNIT_LIST", getOrgUnits($organization)); - -$smarty->display("DetailView.tpl"); -?> +$smarty->assign("ASSIGN_ORGUNIT_LIST", getOrgUnits($organization)); + +$smarty->display("DetailView.tpl"); +?> Modified: vtigercrm/branches/5.1_jens/modules/Potentials/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/DetailViewAjax.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/DetailViewAjax.php Mon Apr 16 12:27:44 2007 @@ -1,51 +1,52 @@ -retrieve_entity_info($crmid,"Potentials"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $_REQUEST[$fieldname] = $fieldvalue; - if($fieldname == 'amount')//amount converted to dollar value while saving - { - $modObj->column_fields[$fieldname] = getConvertedPrice($fieldvalue); - } - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Potentials"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -?> +retrieve_entity_info($crmid,"Potentials"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $_REQUEST[$fieldname] = $fieldvalue; + if($fieldname == 'amount')//amount converted to dollar value while saving + { + $modObj->column_fields[$fieldname] = getConvertedPrice($fieldvalue); + } + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Potentials"); + sendNotificationToOwner('Potentials',&$modObj); + if($modObj->id != "") + { + echo ":#:SUCCESS"; + }else + { + echo ":#:FAILURE"; + } + }else + { + echo ":#:FAILURE"; + } +} +?> Modified: vtigercrm/branches/5.1_jens/modules/Potentials/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/EditView.php Mon Apr 16 12:27:44 2007 @@ -1,148 +1,151 @@ -id = $_REQUEST['record']; - $focus->mode = 'edit'; - $focus->retrieve_entity_info($_REQUEST['record'],"Potentials"); - $focus->name=$focus->column_fields['potentialname']; -} -if(isset($_REQUEST['account_id'])) -{ - $focus->column_fields['account_id'] = $_REQUEST['account_id']; -} -if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { - $focus->id = ""; - $focus->mode = ''; -} - -$disp_view = getView($focus->mode); -if($disp_view == 'edit_view') - $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields)); -else -{ - $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS')); -} -$smarty->assign("OP_MODE",$disp_view); -$category = getParentTab(); -$smarty->assign("CATEGORY",$category); - -//needed when creating a new opportunity with a default vtiger_account value passed in -if (isset($_REQUEST['accountname']) && is_null($focus->accountname)) { - $focus->accountname = $_REQUEST['accountname']; - -} -if (isset($_REQUEST['accountid']) && is_null($focus->accountid)) { - $focus->accountid = $_REQUEST['accountid']; -} -if (isset($_REQUEST['contactid']) && is_null($focus->contactid)) { - $focus->contactid = $_REQUEST['contactid']; -} - -global $theme; -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; -//retreiving the combo values array -$comboFieldNames = Array('leadsource'=>'leadsource_dom' - ,'opportunity_type'=>'opportunity_type_dom' - ,'sales_stage'=>'sales_stage_dom'); -$comboFieldArray = getComboArray($comboFieldNames); -require_once($theme_path.'layout_utils.php'); - -$log->info("Potential detail view"); -$smarty->assign("MOD", $mod_strings); -$smarty->assign("APP", $app_strings); - -if (isset($focus->name)) -$smarty->assign("NAME", $focus->name); -else -$smarty->assign("NAME", ""); - -if(isset($cust_fld)) -{ - $smarty->assign("CUSTOMFIELD", $cust_fld); -} -if($focus->mode == 'edit') -{ - $smarty->assign("UPDATEINFO",updateInfo($focus->id)); - $smarty->assign("MODE", $focus->mode); -} - - - -// Unimplemented until jscalendar language vtiger_files are fixed -$smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']); -$smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT'])); - -if (isset($_REQUEST['return_module'])) -$smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); -if (isset($_REQUEST['return_action'])) -$smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); -if (isset($_REQUEST['return_id'])) -$smarty->assign("RETURN_ID", $_REQUEST['return_id']); -if (isset($_REQUEST['return_viewname'])) -$smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); -$smarty->assign("THEME", $theme); -$smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); -$smarty->assign("ID", $focus->id); -$smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",'Potential'); - - - $tabid = getTabid("Potentials"); - $validationData = getDBValidationData($focus->tab_name,$tabid); - $data = split_validationdataArray($validationData); - - $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); - $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); - $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); - -$check_button = Button_Check($module); -$smarty->assign("CHECK", $check_button); - +$focus = new Potentials(); +$smarty = new vtigerCRM_Smarty(); + +if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') +{ + $focus->id = $_REQUEST['record']; + $focus->mode = 'edit'; + $focus->retrieve_entity_info($_REQUEST['record'],"Potentials"); + $focus->name=$focus->column_fields['potentialname']; +} +if(isset($_REQUEST['account_id'])) +{ + $focus->column_fields['account_id'] = $_REQUEST['account_id']; +} +if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { + $focus->id = ""; + $focus->mode = ''; +} + +$disp_view = getView($focus->mode); +if($disp_view == 'edit_view') + $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields)); +else +{ + $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS')); +} +$smarty->assign("OP_MODE",$disp_view); +$category = getParentTab(); +$smarty->assign("CATEGORY",$category); + +//needed when creating a new opportunity with a default vtiger_account value passed in +if (isset($_REQUEST['accountname']) && is_null($focus->accountname)) { + $focus->accountname = $_REQUEST['accountname']; + +} +if (isset($_REQUEST['accountid']) && is_null($focus->accountid)) { + $focus->accountid = $_REQUEST['accountid']; +} +if (isset($_REQUEST['contactid']) && is_null($focus->contactid)) { + $focus->contactid = $_REQUEST['contactid']; +} + +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +//retreiving the combo values array +$comboFieldNames = Array('leadsource'=>'leadsource_dom' + ,'opportunity_type'=>'opportunity_type_dom' + ,'sales_stage'=>'sales_stage_dom'); +$comboFieldArray = getComboArray($comboFieldNames); +require_once($theme_path.'layout_utils.php'); + +$log->info("Potential detail view"); +$smarty->assign("MOD", $mod_strings); +$smarty->assign("APP", $app_strings); + +if (isset($focus->name)) +$smarty->assign("NAME", $focus->name); +else +$smarty->assign("NAME", ""); + +if(isset($cust_fld)) +{ + $smarty->assign("CUSTOMFIELD", $cust_fld); +} +if($focus->mode == 'edit') +{ + $smarty->assign("UPDATEINFO",updateInfo($focus->id)); + $smarty->assign("MODE", $focus->mode); +} + + + +// Unimplemented until jscalendar language vtiger_files are fixed +$smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']); +$smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT'])); + +if (isset($_REQUEST['return_module'])) +$smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); +if (isset($_REQUEST['return_action'])) +$smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); +if (isset($_REQUEST['return_id'])) +$smarty->assign("RETURN_ID", $_REQUEST['return_id']); +if (isset($_REQUEST['return_viewname'])) +$smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); +$smarty->assign("THEME", $theme); +$smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); +$smarty->assign("ID", $focus->id); +$smarty->assign("MODULE",$currentModule); +$smarty->assign("SINGLE_MOD",'Potential'); + + + $tabid = getTabid("Potentials"); + $validationData = getDBValidationData($focus->tab_name,$tabid); + $data = split_validationdataArray($validationData); + + $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); + $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); + $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); + +//fix for potential duplicate header +$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); + +$check_button = Button_Check($module); +$smarty->assign("CHECK", $check_button); + $organization = new Organization; $organization->id = $current_organization; -$smarty->assign("ASSIGN_ORGUNIT_LIST", getOrgUnits($organization)); - -if($focus->mode == 'edit') -$smarty->display("salesEditView.tpl"); -else -$smarty->display("CreateView.tpl"); - -?> +$smarty->assign("ASSIGN_ORGUNIT_LIST", getOrgUnits($organization)); + +if($focus->mode == 'edit') +$smarty->display("salesEditView.tpl"); +else +$smarty->display("CreateView.tpl"); + +?> Modified: vtigercrm/branches/5.1_jens/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/ListView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/ListView.php Mon Apr 16 12:27:44 2007 @@ -26,7 +26,7 @@ require_once('include/DatabaseUtil.php'); -global $app_strings,$list_max_entries_per_page; +global $app_strings,$list_max_entries_per_page,$mod_strings; $log = LoggerManager::getLogger('potential_list'); @@ -134,11 +134,12 @@ $list_query = getListQuery("Potentials"); } //<<<<<<<>>>>>>>> - if(isset($where) && $where != '') { if(isset($_REQUEST['from_dashboard']) && $_REQUEST['from_dashboard'] == 'true') - $list_query .= " AND vtiger_potential.sales_stage = 'Closed Won' AND ".$where; + $list_query .= " AND vtiger_potential.sales_stage = '".$mod_strings['Closed Won']."' AND ".$where; + elseif(isset($_REQUEST['from_homepagedb']) && $_REQUEST['from_homepagedb'] == 'true') + $list_query .= " AND vtiger_potential.sales_stage not in( '".$mod_strings['Closed Won']."' , '".$mod_strings['Closed Lost']."' )AND ".$where; else $list_query .= " AND ".$where; } Modified: vtigercrm/branches/5.1_jens/modules/Potentials/ListViewTop.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/ListViewTop.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/ListViewTop.php Mon Apr 16 12:27:44 2007 @@ -42,7 +42,7 @@ $title[]='myTopOpenPotentials.gif'; $title[]=$current_module_strings['LBL_TOP_OPPORTUNITIES']; $title[]='home_mypot'; - $where = "AND vtiger_potential.sales_stage <> 'Closed Won' AND vtiger_potential.sales_stage <> 'Closed Lost' AND vtiger_crmentity.smownerid='".$current_user->id."'"; + $where = "AND vtiger_potential.sales_stage not in ('Closed Won','Closed Lost','".$current_module_strings['Closed Won']."','".$current_module_strings['Closed Lost']."') AND vtiger_crmentity.smownerid='".$current_user->id."'"; $header=array(); $header[]=$current_module_strings['LBL_LIST_OPPORTUNITY_NAME']; $header[]=$current_module_strings['LBL_LIST_ACCOUNT_NAME']; @@ -70,7 +70,7 @@ ); $potentialid=$adb->query_result($list_result,$i,'potentialid'); $value=array(); - $value[]=''.$adb->query_result($list_result,$i,"potentialname").''; + $value[]=''.substr($adb->query_result($list_result,$i,"potentialname"),0,20).'...'.''; $value[]=''.$adb->query_result($list_result,$i,"accountname").''; $value[]=convertFromDollar($adb->query_result($list_result,$i,'amount'),$rate); $value[]=getDisplayDate($adb->query_result($list_result,$i,'closingdate')); Modified: vtigercrm/branches/5.1_jens/modules/Potentials/Opportunity.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/Opportunity.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/Opportunity.php Mon Apr 16 12:27:44 2007 @@ -1,510 +1,510 @@ -'crmid','vtiger_potential'=>'potentialid','vtiger_potentialscf'=>'potentialid'); - - var $column_fields = Array(); - - var $sortby_fields = Array('potentialname','amount','closingdate','smownerid'); - - - // This is the list of vtiger_fields that are in the lists. - var $list_fields = Array( - 'Potential'=>Array('potential'=>'potentialname'), - 'Account Name'=>Array('account'=>'accountname'), - 'Sales Stage'=>Array('potential'=>'sales_stage'), - 'Amount'=>Array('potential'=>'amount'), - 'Expected Close'=>Array('potential'=>'closingdate'), - 'Assigned To'=>Array('crmentity','smownerid') - ); - - var $list_fields_name = Array( - 'Potential'=>'potentialname', - 'Account Name'=>'accountid', - 'Sales Stage'=>'sales_stage', - 'Amount'=>'amount', - 'Expected Close'=>'closingdate', - 'Assigned To'=>'assigned_user_id'); - - var $list_link_field= 'potentialname'; - - var $search_fields = Array( - 'Potential'=>Array('potential'=>'potentialname'), - 'Account Name'=>Array('potential'=>'accountid'), - 'Expected Close'=>Array('potential'=>'closedate') - ); - - var $search_fields_name = Array( - 'Potential'=>'potentialname', - 'Account Name'=>'account_id', - 'Expected Close'=>'closingdate' - ); - - var $required_fields = array( - "potentialname"=>1, - "account_id"=>1, - "closingdate"=>1, - "sales_stage"=>1, - "amount"=>1 - ); - - //Added these variables which are used as default order by and sortorder in ListView - var $default_order_by = 'potentialname'; - var $default_sort_order = 'ASC'; - - function Potential() { - $this->log = LoggerManager::getLogger('potential'); - $this->db = new PearDatabase(); - $this->column_fields = getColumnFields('Potentials'); - } - - var $new_schema = true; - - /** - * Function to get sort order - * return string $sorder - sortorder string either 'ASC' or 'DESC' - */ - function getSortOrder() - { - global $log; - $log->debug("Entering getSortOrder() method ..."); - if(isset($_REQUEST['sorder'])) - $sorder = $_REQUEST['sorder']; - else - $sorder = (($_SESSION['POTENTIALS_SORT_ORDER'] != '')?($_SESSION['POTENTIALS_SORT_ORDER']):($this->default_sort_order)); - $log->debug("Exiting getSortOrder() method ..."); - return $sorder; - } - - /** - * Function to get order by - * return string $order_by - fieldname(eg: 'Potentialname') - */ - function getOrderBy() - { - global $log; - $log->debug("Entering getOrderBy() method ..."); - if (isset($_REQUEST['order_by'])) - $order_by = $_REQUEST['order_by']; - else - $order_by = (($_SESSION['POTENTIALS_ORDER_BY'] != '')?($_SESSION['POTENTIALS_ORDER_BY']):($this->default_order_by)); - $log->debug("Exiting getOrderBy method ..."); - return $order_by; - } - - /** Function to create list query - * @param reference variable - order by is passed when the query is executed - * @param reference variable - where condition is passed when the query is executed - * Returns Query. - */ - function create_list_query($order_by, $where) - { - global $log; - $log->debug("Entering create_list_query(".$order_by.",". $where.") method ..."); - // Determine if the vtiger_account name is present in the where clause. - $account_required = ereg("accounts\.name", $where); - - if($account_required) - { - $query = "SELECT vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.dateclosed FROM vtiger_potential, vtiger_account "; - $where_auto = "account.accountid = vtiger_potential.accountid AND vtiger_crmentity.deleted=0 "; - } - else - { - $query = 'SELECT potentialid, potentialname, smcreatorid, closingdate FROM vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid '; - $where_auto = 'AND vtiger_crmentity.deleted=0'; - } - - if($where != "") - $query .= "where $where ".$where_auto; - else - $query .= "where ".$where_auto; - - if($order_by != "") - $query .= " ORDER BY vtiger_potential.$order_by"; - else - $query .= " ORDER BY vtiger_potential.potentialname"; - - - - $log->debug("Exiting create_list_query method ..."); - return $query; - } - - /** Function to export the Opportunities records in CSV Format - * @param reference variable - order by is passed when the query is executed - * @param reference variable - where condition is passed when the query is executed - * Returns Export Potentials Query. - */ - function create_export_query($order_by, $where) - { - global $log; - global $current_user; - $log->debug("Entering create_export_query(".$order_by.",". $where.") method ..."); - - include("include/utils/ExportUtils.php"); - - //To get the Permitted fields query and the permitted fields list - $sql = getPermittedFieldsQuery("Potentials", "detail_view"); - $fields_list = getFieldsListFromQuery($sql); - - $query = "SELECT $fields_list FROM vtiger_potential - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid - LEFT JOIN vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id - LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid - LEFT JOIN vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid - LEFT JOIN vtiger_potentialgrouprelation - ON vtiger_potentialscf.potentialid = vtiger_potentialgrouprelation.potentialid - LEFT JOIN vtiger_groups - ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname - LEFT JOIN vtiger_campaign - ON vtiger_campaign.campaignid = vtiger_potential.campaignid - - where vtiger_crmentity.deleted=0 "; - - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - //we should add security check when the user has Private Access - if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[2] == 3) - { - //Added security check to get the permitted records only - $query = $query." ".getListViewSecurityParameter("Potentials"); - } - - $log->debug("Exiting create_export_query method ..."); - return $query; - - } - - - - /** Returns a list of the associated contacts - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function get_contacts($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_contacts(".$id.") method ..."); - global $app_strings; - - $focus = new Contact(); - - $button = ''; - - if(isPermitted("Contacts",3,"") == 'yes') - { - - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - $query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_potential inner join vtiger_contpotentialrel on vtiger_contpotentialrel.potentialid = vtiger_potential.potentialid inner join vtiger_contactdetails on vtiger_contpotentialrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted=0'; - - $log->debug("Exiting get_contacts method ..."); - return GetRelatedList('Potentials','Contacts',$focus,$query,$button,$returnset); - } - - /** Returns a list of the associated calls - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function get_activities($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_activities(".$id.") method ..."); - global $mod_strings; - - $focus = new Activity(); - - $button = ''; - - if(isPermitted("Calendar",1,"") == 'yes') - { - - $button .= ' '; - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - $query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name, vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and ((vtiger_activity.status is not NULL AND vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL AND vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' AND vtiger_activity.eventstatus != 'Held'))"; - $log->debug("Exiting get_activities method ..."); - return GetRelatedList('Potentials','Calendar',$focus,$query,$button,$returnset); - - } - - /** - * Function to get Contact related Products - * @param integer $id - contactid - * returns related Products record in array format - */ - function get_products($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Product.php'); - global $app_strings; - - $focus = new Product(); - - $button = ''; - - if(isPermitted("Products",1,"") == 'yes') - { - - - $button .= ' '; - } - if(isPermitted("Products",3,"") == 'yes') - { - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - $query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_products inner join vtiger_seproductsrel on vtiger_products.productid = vtiger_seproductsrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_potential on vtiger_potential.potentialid = vtiger_seproductsrel.crmid where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted = 0'; - $log->debug("Exiting get_products method ..."); - return GetRelatedList('Potentials','Products',$focus,$query,$button,$returnset); - } - - /** Function used to get the Sales Stage history of the Potential - * @param $id - potentialid - * return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are array which contains all the column values of an row - */ - function get_stage_history($id) - { - global $log; - $log->debug("Entering get_stage_history(".$id.") method ..."); - - global $adb; - global $mod_strings; - global $app_strings; - - $query = 'select vtiger_potstagehistory.*, vtiger_potential.potentialname from vtiger_potstagehistory inner join vtiger_potential on vtiger_potential.potentialid = vtiger_potstagehistory.potentialid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid where vtiger_crmentity.deleted = 0 and vtiger_potential.potentialid = '.$id; - $result=$adb->query($query); - $noofrows = $adb->num_rows($result); - - $header[] = $app_strings['LBL_AMOUNT']; - $header[] = $app_strings['LBL_SALES_STAGE']; - $header[] = $app_strings['LBL_PROBABILITY']; - $header[] = $app_strings['LBL_CLOSE_DATE']; - $header[] = $app_strings['LBL_LAST_MODIFIED']; - - while($row = $adb->fetch_array($result)) - { - $entries = Array(); - - $entries[] = $row['amount']; - $entries[] = $row['stage']; - $entries[] = $row['probability']; - $entries[] = getDisplayDate($row['closedate']); - $entries[] = getDisplayDate($row['lastmodified']); - - $entries_list[] = $entries; - } - - $return_data = Array('header'=>$header,'entries'=>$entries_list); - - $log->debug("Exiting get_stage_history method ..."); - - return $return_data; - } - - /** - * Function to get Potential related Task & Event which have activity type Held, Completed or Deferred. - * @param integer $id - * returns related Task or Event record in array format - */ - function get_history($id) - { - global $log; - $log->debug("Entering get_history(".$id.") method ..."); - $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, - vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_crmentity.modifiedtime, - vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name - from vtiger_activity - inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid - left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid - left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname - inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id - where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') - and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != '')) - and vtiger_seactivityrel.crmid=".$id; - //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php - - $log->debug("Exiting get_history method ..."); - return getHistory('Potentials',$query,$id); - } - - /** - * Function to get Potential related Attachments - * @param integer $id - * returns related Attachment record in array format - */ - function get_attachments($id) - { - global $log; - $log->debug("Entering get_attachments(".$id.") method ..."); - // Armando L?scher 18.10.2005 -> ?visibleDescription - // Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name - // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - $query = "select vtiger_notes.title,'Notes ' ActivityType, vtiger_notes.filename, - vtiger_attachments.type FileType, crm2.modifiedtime lastmodified, - vtiger_seattachmentsrel.attachmentsid, vtiger_notes.notesid crmid, - crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name - from vtiger_notes - inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid - inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid - inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0 - left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid - left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid - inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - where vtiger_crmentity.crmid=".$id; - $query .= ' union all '; - // Armando L?scher 18.10.2005 -> ?visibleDescription - // Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name - // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - // Inserted order by createdtime desc - $query .= "select vtiger_attachments.description title ,'Attachments' ActivityType, - vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified, - vtiger_attachments.attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid, - crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name - from vtiger_attachments - inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid - inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid - inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid - inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - where vtiger_crmentity.crmid=".$id." - order by createdtime desc"; - - $log->debug("Exiting get_attachments method ..."); - return getAttachmentsAndNotes('Potentials',$query,$id); - } - - /** - * Function to get Potential related Quotes - * @param integer $id - potentialid - * returns related Quotes record in array format - */ - function get_quotes($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_quotes(".$id.") method ..."); - global $app_strings; - require_once('modules/Quotes/Quote.php'); - - if($this->column_fields['account_id']!='') - $focus = new Quote(); - - $button = ''; - if(isPermitted("Quotes",1,"") == 'yes') - { - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - - $query = "select vtiger_crmentity.*, vtiger_quotes.*, vtiger_potential.potentialname, vtiger_users.user_name from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid=".$id; - $log->debug("Exiting get_quotes method ..."); - return GetRelatedList('Potentials','Quotes',$focus,$query,$button,$returnset); - } - - /** - * Function to get Potential related SalesOrder - * @param integer $id - potentialid - * returns related SalesOrder record in array format - */ - function get_salesorder($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_salesorder(".$id.") method ..."); - require_once('modules/SalesOrder/SalesOrder.php'); - global $mod_strings; - global $app_strings; - - $focus = new SalesOrder(); - - $button = ''; - if(isPermitted("SalesOrder",1,"") == 'yes') - { - $button .= ' '; - } - - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - - $query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_potential.potentialname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_salesorder.potentialid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid = ".$id; - $log->debug("Exiting get_salesorder method ..."); - return GetRelatedList('Potentials','SalesOrder',$focus,$query,$button,$returnset); - - } - - - - -} - - - -?> +'crmid','vtiger_potential'=>'potentialid','vtiger_potentialscf'=>'potentialid'); + + var $column_fields = Array(); + + var $sortby_fields = Array('potentialname','amount','closingdate','smownerid'); + + + // This is the list of vtiger_fields that are in the lists. + var $list_fields = Array( + 'Potential'=>Array('potential'=>'potentialname'), + 'Account Name'=>Array('account'=>'accountname'), + 'Sales Stage'=>Array('potential'=>'sales_stage'), + 'Amount'=>Array('potential'=>'amount'), + 'Expected Close'=>Array('potential'=>'closingdate'), + 'Assigned To'=>Array('crmentity','smownerid') + ); + + var $list_fields_name = Array( + 'Potential'=>'potentialname', + 'Account Name'=>'accountid', + 'Sales Stage'=>'sales_stage', + 'Amount'=>'amount', + 'Expected Close'=>'closingdate', + 'Assigned To'=>'assigned_user_id'); + + var $list_link_field= 'potentialname'; + + var $search_fields = Array( + 'Potential'=>Array('potential'=>'potentialname'), + 'Account Name'=>Array('potential'=>'accountid'), + 'Expected Close'=>Array('potential'=>'closedate') + ); + + var $search_fields_name = Array( + 'Potential'=>'potentialname', + 'Account Name'=>'account_id', + 'Expected Close'=>'closingdate' + ); + + var $required_fields = array( + "potentialname"=>1, + "account_id"=>1, + "closingdate"=>1, + "sales_stage"=>1, + "amount"=>1 + ); + + //Added these variables which are used as default order by and sortorder in ListView + var $default_order_by = 'potentialname'; + var $default_sort_order = 'ASC'; + + function Potential() { + $this->log = LoggerManager::getLogger('potential'); + $this->db = new PearDatabase(); + $this->column_fields = getColumnFields('Potentials'); + } + + var $new_schema = true; + + /** + * Function to get sort order + * return string $sorder - sortorder string either 'ASC' or 'DESC' + */ + function getSortOrder() + { + global $log; + $log->debug("Entering getSortOrder() method ..."); + if(isset($_REQUEST['sorder'])) + $sorder = $_REQUEST['sorder']; + else + $sorder = (($_SESSION['POTENTIALS_SORT_ORDER'] != '')?($_SESSION['POTENTIALS_SORT_ORDER']):($this->default_sort_order)); + $log->debug("Exiting getSortOrder() method ..."); + return $sorder; + } + + /** + * Function to get order by + * return string $order_by - fieldname(eg: 'Potentialname') + */ + function getOrderBy() + { + global $log; + $log->debug("Entering getOrderBy() method ..."); + if (isset($_REQUEST['order_by'])) + $order_by = $_REQUEST['order_by']; + else + $order_by = (($_SESSION['POTENTIALS_ORDER_BY'] != '')?($_SESSION['POTENTIALS_ORDER_BY']):($this->default_order_by)); + $log->debug("Exiting getOrderBy method ..."); + return $order_by; + } + + /** Function to create list query + * @param reference variable - order by is passed when the query is executed + * @param reference variable - where condition is passed when the query is executed + * Returns Query. + */ + function create_list_query($order_by, $where) + { + global $log; + $log->debug("Entering create_list_query(".$order_by.",". $where.") method ..."); + // Determine if the vtiger_account name is present in the where clause. + $account_required = ereg("accounts\.name", $where); + + if($account_required) + { + $query = "SELECT vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.dateclosed FROM vtiger_potential, vtiger_account "; + $where_auto = "account.accountid = vtiger_potential.accountid AND vtiger_crmentity.deleted=0 "; + } + else + { + $query = 'SELECT potentialid, potentialname, smcreatorid, closingdate FROM vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid '; + $where_auto = 'AND vtiger_crmentity.deleted=0'; + } + + if($where != "") + $query .= "where $where ".$where_auto; + else + $query .= "where ".$where_auto; + + if($order_by != "") + $query .= " ORDER BY vtiger_potential.$order_by"; + else + $query .= " ORDER BY vtiger_potential.potentialname"; + + + + $log->debug("Exiting create_list_query method ..."); + return $query; + } + + /** Function to export the Opportunities records in CSV Format + * @param reference variable - order by is passed when the query is executed + * @param reference variable - where condition is passed when the query is executed + * Returns Export Potentials Query. + */ + function create_export_query($order_by, $where) + { + global $log; + global $current_user; + $log->debug("Entering create_export_query(".$order_by.",". $where.") method ..."); + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Potentials", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list FROM vtiger_potential + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid + LEFT JOIN vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id + LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid + LEFT JOIN vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid + LEFT JOIN vtiger_potentialgrouprelation + ON vtiger_potentialscf.potentialid = vtiger_potentialgrouprelation.potentialid + LEFT JOIN vtiger_groups + ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname + LEFT JOIN vtiger_campaign + ON vtiger_campaign.campaignid = vtiger_potential.campaignid + + where vtiger_crmentity.deleted=0 "; + + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + //we should add security check when the user has Private Access + if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[2] == 3) + { + //Added security check to get the permitted records only + $query = $query." ".getListViewSecurityParameter("Potentials"); + } + + $log->debug("Exiting create_export_query method ..."); + return $query; + + } + + + + /** Returns a list of the associated contacts + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function get_contacts($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_contacts(".$id.") method ..."); + global $app_strings; + + $focus = new Contact(); + + $button = ''; + + if(isPermitted("Contacts",3,"") == 'yes') + { + + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + $query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_potential inner join vtiger_contpotentialrel on vtiger_contpotentialrel.potentialid = vtiger_potential.potentialid inner join vtiger_contactdetails on vtiger_contpotentialrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted=0'; + + $log->debug("Exiting get_contacts method ..."); + return GetRelatedList('Potentials','Contacts',$focus,$query,$button,$returnset); + } + + /** Returns a list of the associated calls + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function get_activities($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_activities(".$id.") method ..."); + global $mod_strings; + + $focus = new Activity(); + + $button = ''; + + if(isPermitted("Calendar",1,"") == 'yes') + { + + $button .= ' '; + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name, vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and ((vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' && vtiger_activity.eventstatus != 'Held'))"; + $log->debug("Exiting get_activities method ..."); + return GetRelatedList('Potentials','Calendar',$focus,$query,$button,$returnset); + + } + + /** + * Function to get Contact related Products + * @param integer $id - contactid + * returns related Products record in array format + */ + function get_products($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_products(".$id.") method ..."); + require_once('modules/Products/Product.php'); + global $app_strings; + + $focus = new Product(); + + $button = ''; + + if(isPermitted("Products",1,"") == 'yes') + { + + + $button .= ' '; + } + if(isPermitted("Products",3,"") == 'yes') + { + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + $query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_products inner join vtiger_seproductsrel on vtiger_products.productid = vtiger_seproductsrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_potential on vtiger_potential.potentialid = vtiger_seproductsrel.crmid where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted = 0'; + $log->debug("Exiting get_products method ..."); + return GetRelatedList('Potentials','Products',$focus,$query,$button,$returnset); + } + + /** Function used to get the Sales Stage history of the Potential + * @param $id - potentialid + * return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are array which contains all the column values of an row + */ + function get_stage_history($id) + { + global $log; + $log->debug("Entering get_stage_history(".$id.") method ..."); + + global $adb; + global $mod_strings; + global $app_strings; + + $query = 'select vtiger_potstagehistory.*, vtiger_potential.potentialname from vtiger_potstagehistory inner join vtiger_potential on vtiger_potential.potentialid = vtiger_potstagehistory.potentialid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid where vtiger_crmentity.deleted = 0 and vtiger_potential.potentialid = '.$id; + $result=$adb->query($query); + $noofrows = $adb->num_rows($result); + + $header[] = $app_strings['LBL_AMOUNT']; + $header[] = $app_strings['LBL_SALES_STAGE']; + $header[] = $app_strings['LBL_PROBABILITY']; + $header[] = $app_strings['LBL_CLOSE_DATE']; + $header[] = $app_strings['LBL_LAST_MODIFIED']; + + while($row = $adb->fetch_array($result)) + { + $entries = Array(); + + $entries[] = $row['amount']; + $entries[] = $row['stage']; + $entries[] = $row['probability']; + $entries[] = getDisplayDate($row['closedate']); + $entries[] = getDisplayDate($row['lastmodified']); + + $entries_list[] = $entries; + } + + $return_data = Array('header'=>$header,'entries'=>$entries_list); + + $log->debug("Exiting get_stage_history method ..."); + + return $return_data; + } + + /** + * Function to get Potential related Task & Event which have activity type Held, Completed or Deferred. + * @param integer $id + * returns related Task or Event record in array format + */ + function get_history($id) + { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); + $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, + vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_crmentity.modifiedtime, + vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name + from vtiger_activity + inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid + left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid + left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname + inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id + where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') + and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != '')) + and vtiger_seactivityrel.crmid=".$id; + //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + + $log->debug("Exiting get_history method ..."); + return getHistory('Potentials',$query,$id); + } + + /** + * Function to get Potential related Attachments + * @param integer $id + * returns related Attachment record in array format + */ + function get_attachments($id) + { + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); + // Armando L?scher 18.10.2005 -> ?visibleDescription + // Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name + // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + $query = "select vtiger_notes.title,'Notes ' ActivityType, vtiger_notes.filename, + vtiger_attachments.type FileType, crm2.modifiedtime lastmodified, + vtiger_seattachmentsrel.attachmentsid, vtiger_notes.notesid crmid, + crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name + from vtiger_notes + inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0 + left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid + left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id; + $query .= ' union all '; + // Armando L?scher 18.10.2005 -> ?visibleDescription + // Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name + // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + // Inserted order by createdtime desc + $query .= "select vtiger_attachments.description title ,'Attachments' ActivityType, + vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified, + vtiger_attachments.attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid, + crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name + from vtiger_attachments + inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id." + order by createdtime desc"; + + $log->debug("Exiting get_attachments method ..."); + return getAttachmentsAndNotes('Potentials',$query,$id); + } + + /** + * Function to get Potential related Quotes + * @param integer $id - potentialid + * returns related Quotes record in array format + */ + function get_quotes($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_quotes(".$id.") method ..."); + global $app_strings; + require_once('modules/Quotes/Quote.php'); + + if($this->column_fields['account_id']!='') + $focus = new Quote(); + + $button = ''; + if(isPermitted("Quotes",1,"") == 'yes') + { + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + + $query = "select vtiger_crmentity.*, vtiger_quotes.*, vtiger_potential.potentialname, vtiger_users.user_name from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid=".$id; + $log->debug("Exiting get_quotes method ..."); + return GetRelatedList('Potentials','Quotes',$focus,$query,$button,$returnset); + } + + /** + * Function to get Potential related SalesOrder + * @param integer $id - potentialid + * returns related SalesOrder record in array format + */ + function get_salesorder($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_salesorder(".$id.") method ..."); + require_once('modules/SalesOrder/SalesOrder.php'); + global $mod_strings; + global $app_strings; + + $focus = new SalesOrder(); + + $button = ''; + if(isPermitted("SalesOrder",1,"") == 'yes') + { + $button .= ' '; + } + + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + + $query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_potential.potentialname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_salesorder.potentialid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid = ".$id; + $log->debug("Exiting get_salesorder method ..."); + return GetRelatedList('Potentials','SalesOrder',$focus,$query,$button,$returnset); + + } + + + + +} + + + +?> Modified: vtigercrm/branches/5.1_jens/modules/Potentials/Potentials.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/Potentials.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/Potentials.php Mon Apr 16 12:27:44 2007 @@ -1,506 +1,538 @@ -'crmid','vtiger_potential'=>'potentialid','vtiger_potentialscf'=>'potentialid'); - - var $column_fields = Array(); - - var $sortby_fields = Array('potentialname','amount','closingdate','smownerid'); - - - // This is the list of vtiger_fields that are in the lists. - var $list_fields = Array( - 'Potential'=>Array('potential'=>'potentialname'), - 'Account Name'=>Array('account'=>'accountname'), - 'Sales Stage'=>Array('potential'=>'sales_stage'), - 'Amount'=>Array('potential'=>'amount'), - 'Expected Close'=>Array('potential'=>'closingdate'), - 'Assigned To'=>Array('crmentity','smownerid') - ); - - var $list_fields_name = Array( - 'Potential'=>'potentialname', - 'Account Name'=>'accountid', - 'Sales Stage'=>'sales_stage', - 'Amount'=>'amount', - 'Expected Close'=>'closingdate', - 'Assigned To'=>'assigned_user_id'); - - var $list_link_field= 'potentialname'; - - var $search_fields = Array( - 'Potential'=>Array('potential'=>'potentialname'), - 'Account Name'=>Array('potential'=>'accountid'), - 'Expected Close'=>Array('potential'=>'closedate') - ); - - var $search_fields_name = Array( - 'Potential'=>'potentialname', - 'Account Name'=>'account_id', - 'Expected Close'=>'closingdate' - ); - - var $required_fields = array( - "potentialname"=>1, - "account_id"=>1, - "closingdate"=>1, - "sales_stage"=>1, - "amount"=>1 - ); - - //Added these variables which are used as default order by and sortorder in ListView - var $default_order_by = 'potentialname'; - var $default_sort_order = 'ASC'; - - function Potentials() { - $this->log = LoggerManager::getLogger('potential'); - $this->db = new PearDatabase(); - $this->column_fields = getColumnFields('Potentials'); - } - - function save_module($module) - { - } - - /** - * Function to get sort order - * return string $sorder - sortorder string either 'ASC' or 'DESC' - */ - function getSortOrder() - { - global $log; - $log->debug("Entering getSortOrder() method ..."); - if(isset($_REQUEST['sorder'])) - $sorder = $_REQUEST['sorder']; - else - $sorder = (($_SESSION['POTENTIALS_SORT_ORDER'] != '')?($_SESSION['POTENTIALS_SORT_ORDER']):($this->default_sort_order)); - $log->debug("Exiting getSortOrder() method ..."); - return $sorder; - } - - /** - * Function to get order by - * return string $order_by - fieldname(eg: 'Potentialname') - */ - function getOrderBy() - { - global $log; - $log->debug("Entering getOrderBy() method ..."); - if (isset($_REQUEST['order_by'])) - $order_by = $_REQUEST['order_by']; - else - $order_by = (($_SESSION['POTENTIALS_ORDER_BY'] != '')?($_SESSION['POTENTIALS_ORDER_BY']):($this->default_order_by)); - $log->debug("Exiting getOrderBy method ..."); - return $order_by; - } - - /** Function to create list query - * @param reference variable - order by is passed when the query is executed - * @param reference variable - where condition is passed when the query is executed - * Returns Query. - */ - function create_list_query($order_by, $where) - { - global $log; - $log->debug("Entering create_list_query(".$order_by.",". $where.") method ..."); - // Determine if the vtiger_account name is present in the where clause. - $account_required = ereg("accounts\.name", $where); - - if($account_required) - { - $query = "SELECT vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.dateclosed FROM vtiger_potential, vtiger_account "; - $where_auto = "account.accountid = vtiger_potential.accountid AND vtiger_crmentity.deleted=0 "; - } - else - { - $query = 'SELECT potentialid, potentialname, smcreatorid, closingdate FROM vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid '; - $where_auto = 'AND vtiger_crmentity.deleted=0'; - } - - if($where != "") - $query .= "where $where ".$where_auto; - else - $query .= "where ".$where_auto; - - if($order_by != "") - $query .= " ORDER BY vtiger_potential.$order_by"; - else - $query .= " ORDER BY vtiger_potential.potentialname"; - - - - $log->debug("Exiting create_list_query method ..."); - return $query; - } - - /** Function to export the Opportunities records in CSV Format - * @param reference variable - order by is passed when the query is executed - * @param reference variable - where condition is passed when the query is executed - * Returns Export Potentials Query. - */ - function create_export_query($order_by, $where) - { - global $log; - global $current_user; - $log->debug("Entering create_export_query(".$order_by.",". $where.") method ..."); - - include("include/utils/ExportUtils.php"); - - //To get the Permitted fields query and the permitted fields list - $sql = getPermittedFieldsQuery("Potentials", "detail_view"); - $fields_list = getFieldsListFromQuery($sql); - - $query = "SELECT $fields_list FROM vtiger_potential - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid - LEFT JOIN vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id - LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid - LEFT JOIN vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid - LEFT JOIN vtiger_potentialgrouprelation - ON vtiger_potentialscf.potentialid = vtiger_potentialgrouprelation.potentialid - LEFT JOIN vtiger_groups - ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname - LEFT JOIN vtiger_campaign - ON vtiger_campaign.campaignid = vtiger_potential.campaignid - - where vtiger_crmentity.deleted=0 "; - - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - //we should add security check when the user has Private Access - if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[2] == 3) - { - //Added security check to get the permitted records only - $query = $query." ".getListViewSecurityParameter("Potentials"); - } - - $log->debug("Exiting create_export_query method ..."); - return $query; - - } - - - - /** Returns a list of the associated contacts - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function get_contacts($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_contacts(".$id.") method ..."); - global $app_strings; - - $focus = new Contacts(); - - $button = ''; - - if(isPermitted("Contacts",3,"") == 'yes') - { - - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - $query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_potential inner join vtiger_contpotentialrel on vtiger_contpotentialrel.potentialid = vtiger_potential.potentialid inner join vtiger_contactdetails on vtiger_contpotentialrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted=0'; - - $log->debug("Exiting get_contacts method ..."); - return GetRelatedList('Potentials','Contacts',$focus,$query,$button,$returnset); - } - - /** Returns a list of the associated calls - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function get_activities($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_activities(".$id.") method ..."); - global $mod_strings; - - $focus = new Activity(); - - $button = ''; - - if(isPermitted("Calendar",1,"") == 'yes') - { - - $button .= ' '; - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - $query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name, vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and ((vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' && vtiger_activity.eventstatus != 'Held'))"; - $log->debug("Exiting get_activities method ..."); - return GetRelatedList('Potentials','Calendar',$focus,$query,$button,$returnset); - - } - - /** - * Function to get Contact related Products - * @param integer $id - contactid - * returns related Products record in array format - */ - function get_products($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Products.php'); - global $app_strings; - - $focus = new Products(); - - $button = ''; - - if(isPermitted("Products",1,"") == 'yes') - { - - - $button .= ' '; - } - if(isPermitted("Products",3,"") == 'yes') - { - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - $query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_products inner join vtiger_seproductsrel on vtiger_products.productid = vtiger_seproductsrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_potential on vtiger_potential.potentialid = vtiger_seproductsrel.crmid where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted = 0'; - $log->debug("Exiting get_products method ..."); - return GetRelatedList('Potentials','Products',$focus,$query,$button,$returnset); - } - - /** Function used to get the Sales Stage history of the Potential - * @param $id - potentialid - * return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are array which contains all the column values of an row - */ - function get_stage_history($id) - { - global $log; - $log->debug("Entering get_stage_history(".$id.") method ..."); - - global $adb; - global $mod_strings; - global $app_strings; - - $query = 'select vtiger_potstagehistory.*, vtiger_potential.potentialname from vtiger_potstagehistory inner join vtiger_potential on vtiger_potential.potentialid = vtiger_potstagehistory.potentialid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid where vtiger_crmentity.deleted = 0 and vtiger_potential.potentialid = '.$id; - $result=$adb->query($query); - $noofrows = $adb->num_rows($result); - - $header[] = $app_strings['LBL_AMOUNT']; - $header[] = $app_strings['LBL_SALES_STAGE']; - $header[] = $app_strings['LBL_PROBABILITY']; - $header[] = $app_strings['LBL_CLOSE_DATE']; - $header[] = $app_strings['LBL_LAST_MODIFIED']; - - while($row = $adb->fetch_array($result)) - { - $entries = Array(); - - $entries[] = $row['amount']; - $entries[] = $row['stage']; - $entries[] = $row['probability']; - $entries[] = getDisplayDate($row['closedate']); - $entries[] = getDisplayDate($row['lastmodified']); - - $entries_list[] = $entries; - } - - $return_data = Array('header'=>$header,'entries'=>$entries_list); - - $log->debug("Exiting get_stage_history method ..."); - - return $return_data; - } - - /** - * Function to get Potential related Task & Event which have activity type Held, Completed or Deferred. - * @param integer $id - * returns related Task or Event record in array format - */ - function get_history($id) - { - global $log; - $log->debug("Entering get_history(".$id.") method ..."); - $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, - vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_crmentity.modifiedtime, - vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name - from vtiger_activity - inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid - left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid - left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname - inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id - where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') - and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != '')) - and vtiger_seactivityrel.crmid=".$id; - //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php - - $log->debug("Exiting get_history method ..."); - return getHistory('Potentials',$query,$id); - } - - /** - * Function to get Potential related Attachments - * @param integer $id - * returns related Attachment record in array format - */ - function get_attachments($id) - { - global $log; - $log->debug("Entering get_attachments(".$id.") method ..."); - // Armando L?scher 18.10.2005 -> ?visibleDescription - // Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name - // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - $query = "select vtiger_notes.title,'Notes ' ActivityType, vtiger_notes.filename, - vtiger_attachments.type FileType, crm2.modifiedtime lastmodified, - vtiger_seattachmentsrel.attachmentsid, vtiger_notes.notesid crmid, - crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name - from vtiger_notes - inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid - inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid - inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0 - left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid - left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid - inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - where vtiger_crmentity.crmid=".$id; - $query .= ' union all '; - // Armando L?scher 18.10.2005 -> ?visibleDescription - // Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name - // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - // Inserted order by createdtime desc - $query .= "select vtiger_attachments.description title ,'Attachments' ActivityType, - vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified, - vtiger_attachments.attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid, - crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name - from vtiger_attachments - inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid - inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid - inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid - inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - where vtiger_crmentity.crmid=".$id." - order by createdtime desc"; - - $log->debug("Exiting get_attachments method ..."); - return getAttachmentsAndNotes('Potentials',$query,$id); - } - - /** - * Function to get Potential related Quotes - * @param integer $id - potentialid - * returns related Quotes record in array format - */ - function get_quotes($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_quotes(".$id.") method ..."); - global $app_strings; - require_once('modules/Quotes/Quotes.php'); - - if($this->column_fields['account_id']!='') - $focus = new Quotes(); - - $button = ''; - if(isPermitted("Quotes",1,"") == 'yes') - { - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - - $query = "select vtiger_crmentity.*, vtiger_quotes.*, vtiger_potential.potentialname, vtiger_users.user_name from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid=".$id; - $log->debug("Exiting get_quotes method ..."); - return GetRelatedList('Potentials','Quotes',$focus,$query,$button,$returnset); - } - - /** - * Function to get Potential related SalesOrder - * @param integer $id - potentialid - * returns related SalesOrder record in array format - */ - function get_salesorder($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_salesorder(".$id.") method ..."); - require_once('modules/SalesOrder/SalesOrder.php'); - global $mod_strings; - global $app_strings; - - $focus = new SalesOrder(); - - $button = ''; - if(isPermitted("SalesOrder",1,"") == 'yes') - { - $button .= ' '; - } - - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - - $query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_potential.potentialname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_salesorder.potentialid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid = ".$id; - $log->debug("Exiting get_salesorder method ..."); - return GetRelatedList('Potentials','SalesOrder',$focus,$query,$button,$returnset); - - } - - - - -} - - - -?> +'crmid','vtiger_potential'=>'potentialid','vtiger_potentialscf'=>'potentialid'); + + var $column_fields = Array(); + + var $sortby_fields = Array('potentialname','amount','closingdate','smownerid'); + + + // This is the list of vtiger_fields that are in the lists. + var $list_fields = Array( + 'Potential'=>Array('potential'=>'potentialname'), + 'Account Name'=>Array('account'=>'accountname'), + 'Sales Stage'=>Array('potential'=>'sales_stage'), + 'Amount'=>Array('potential'=>'amount'), + 'Expected Close Date'=>Array('potential'=>'closingdate'), + 'Assigned To'=>Array('crmentity','smownerid') + ); + + var $list_fields_name = Array( + 'Potential'=>'potentialname', + 'Account Name'=>'accountid', + 'Sales Stage'=>'sales_stage', + 'Amount'=>'amount', + 'Expected Close Date'=>'closingdate', + 'Assigned To'=>'assigned_user_id'); + + var $list_link_field= 'potentialname'; + + var $search_fields = Array( + 'Potential'=>Array('potential'=>'potentialname'), + 'Account Name'=>Array('potential'=>'accountid'), + 'Expected Close Date'=>Array('potential'=>'closedate') + ); + + var $search_fields_name = Array( + 'Potential'=>'potentialname', + 'Account Name'=>'account_id', + 'Expected Close Date'=>'closingdate' + ); + + var $required_fields = array( + "potentialname"=>1, + "account_id"=>1, + "closingdate"=>1, + "sales_stage"=>1, + "amount"=>1 + ); + + //Added these variables which are used as default order by and sortorder in ListView + var $default_order_by = 'potentialname'; + var $default_sort_order = 'ASC'; + + var $groupTable = Array('vtiger_potentialgrouprelation','potentialid'); + function Potentials() { + $this->log = LoggerManager::getLogger('potential'); + $this->db = new PearDatabase(); + $this->column_fields = getColumnFields('Potentials'); + } + + function save_module($module) + { + } + + /** + * Function to get sort order + * return string $sorder - sortorder string either 'ASC' or 'DESC' + */ + function getSortOrder() + { + global $log; + $log->debug("Entering getSortOrder() method ..."); + if(isset($_REQUEST['sorder'])) + $sorder = $_REQUEST['sorder']; + else + $sorder = (($_SESSION['POTENTIALS_SORT_ORDER'] != '')?($_SESSION['POTENTIALS_SORT_ORDER']):($this->default_sort_order)); + $log->debug("Exiting getSortOrder() method ..."); + return $sorder; + } + + /** + * Function to get order by + * return string $order_by - fieldname(eg: 'Potentialname') + */ + function getOrderBy() + { + global $log; + $log->debug("Entering getOrderBy() method ..."); + if (isset($_REQUEST['order_by'])) + $order_by = $_REQUEST['order_by']; + else + $order_by = (($_SESSION['POTENTIALS_ORDER_BY'] != '')?($_SESSION['POTENTIALS_ORDER_BY']):($this->default_order_by)); + $log->debug("Exiting getOrderBy method ..."); + return $order_by; + } + + /** Function to create list query + * @param reference variable - order by is passed when the query is executed + * @param reference variable - where condition is passed when the query is executed + * Returns Query. + */ + function create_list_query($order_by, $where) + { + global $log,$current_user; + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + $tab_id = getTabid("Potentials"); + $log->debug("Entering create_list_query(".$order_by.",". $where.") method ..."); + // Determine if the vtiger_account name is present in the where clause. + $account_required = ereg("accounts\.name", $where); + + if($account_required) + { + $query = "SELECT vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.dateclosed FROM vtiger_potential, vtiger_account "; + $where_auto = "account.accountid = vtiger_potential.accountid AND vtiger_crmentity.deleted=0 "; + } + else + { + $query = 'SELECT vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_crmentity.smcreatorid, vtiger_potential.closingdate FROM vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid LEFT JOIN vtiger_potentialgrouprelation on vtiger_potential.potentialid = vtiger_potentialgrouprelation.potentialid LEFT JOIN vtiger_groups on vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid '; + $where_auto = 'AND vtiger_crmentity.deleted=0 '; + } + + if($where != "") + $query .= "where $where ".$where_auto; + else + $query .= "where ".$where_auto; + if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) + { + $sec_parameter=getListViewSecurityParameter("Potentials"); + $query .= $sec_parameter; + + } + + if($order_by != "") + $query .= " ORDER BY $order_by"; + else + $query .= " ORDER BY vtiger_potential.potentialname "; + + + + $log->debug("Exiting create_list_query method ..."); + return $query; + } + + /** Function to export the Opportunities records in CSV Format + * @param reference variable - order by is passed when the query is executed + * @param reference variable - where condition is passed when the query is executed + * Returns Export Potentials Query. + */ + function create_export_query($order_by, $where) + { + global $log; + global $current_user; + $log->debug("Entering create_export_query(".$order_by.",". $where.") method ..."); + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Potentials", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list, vtiger_potentialgrouprelation.groupname as 'Assigned To Group' + FROM vtiger_potential + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid + LEFT JOIN vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id + LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid + LEFT JOIN vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid + LEFT JOIN vtiger_potentialgrouprelation + ON vtiger_potentialscf.potentialid = vtiger_potentialgrouprelation.potentialid + LEFT JOIN vtiger_groups + ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname + LEFT JOIN vtiger_campaign + ON vtiger_campaign.campaignid = vtiger_potential.campaignid + + where vtiger_crmentity.deleted=0 "; + + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + //we should add security check when the user has Private Access + if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[2] == 3) + { + //Added security check to get the permitted records only + $query = $query." ".getListViewSecurityParameter("Potentials"); + } + + $log->debug("Exiting create_export_query method ..."); + return $query; + + } + + + + /** Returns a list of the associated contacts + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function get_contacts($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_contacts(".$id.") method ..."); + global $app_strings; + + $focus = new Contacts(); + + $button = ''; + + if(isPermitted("Contacts",3,"") == 'yes') + { + + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + $query = 'select case when (vtiger_users.user_name not like \'\') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_contactdetails.accountid,vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_potential inner join vtiger_contpotentialrel on vtiger_contpotentialrel.potentialid = vtiger_potential.potentialid inner join vtiger_contactdetails on vtiger_contpotentialrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted=0'; + + $log->debug("Exiting get_contacts method ..."); + return GetRelatedList('Potentials','Contacts',$focus,$query,$button,$returnset); + } + + /** Returns a list of the associated calls + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function get_activities($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_activities(".$id.") method ..."); + global $mod_strings; + + $focus = new Activity(); + + $button = ''; + + if(isPermitted("Calendar",1,"") == 'yes') + { + + $button .= ' '; + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid where vtiger_seactivityrel.crmid=".$id." and vtiger_crmentity.deleted=0 and ((vtiger_activity.activitytype='Task' and vtiger_activity.status not in ('Completed','Deferred')) or (vtiger_activity.activitytype in ('Meeting','Call') and vtiger_activity.eventstatus not in ('','Held')))"; + $log->debug("Exiting get_activities method ..."); + return GetRelatedList('Potentials','Calendar',$focus,$query,$button,$returnset); + + } + + /** + * Function to get Contact related Products + * @param integer $id - contactid + * returns related Products record in array format + */ + function get_products($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_products(".$id.") method ..."); + require_once('modules/Products/Products.php'); + global $app_strings; + + $focus = new Products(); + + $button = ''; + + if(isPermitted("Products",1,"") == 'yes') + { + + + $button .= ' '; + } + if(isPermitted("Products",3,"") == 'yes') + { + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, + vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, + vtiger_crmentity.crmid, vtiger_crmentity.smownerid + FROM vtiger_products + INNER JOIN vtiger_seproductsrel ON vtiger_products.productid = vtiger_seproductsrel.productid and vtiger_seproductsrel.setype = 'Potentials' + INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_products.productid + INNER JOIN vtiger_potential ON vtiger_potential.potentialid = vtiger_seproductsrel.crmid + WHERE vtiger_crmentity.deleted = 0 AND vtiger_potential.potentialid = $id"; + + $log->debug("Exiting get_products method ..."); + return GetRelatedList('Potentials','Products',$focus,$query,$button,$returnset); + } + + /** Function used to get the Sales Stage history of the Potential + * @param $id - potentialid + * return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are array which contains all the column values of an row + */ + function get_stage_history($id) + { + global $log; + $log->debug("Entering get_stage_history(".$id.") method ..."); + + global $adb; + global $mod_strings; + global $app_strings; + + $query = 'select vtiger_potstagehistory.*, vtiger_potential.potentialname from vtiger_potstagehistory inner join vtiger_potential on vtiger_potential.potentialid = vtiger_potstagehistory.potentialid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid where vtiger_crmentity.deleted = 0 and vtiger_potential.potentialid = '.$id; + $result=$adb->query($query); + $noofrows = $adb->num_rows($result); + + $header[] = $app_strings['LBL_AMOUNT']; + $header[] = $app_strings['LBL_SALES_STAGE']; + $header[] = $app_strings['LBL_PROBABILITY']; + $header[] = $app_strings['LBL_CLOSE_DATE']; + $header[] = $app_strings['LBL_LAST_MODIFIED']; + + while($row = $adb->fetch_array($result)) + { + $entries = Array(); + + $entries[] = $row['amount']; + $entries[] = $row['stage']; + $entries[] = $row['probability']; + $entries[] = getDisplayDate($row['closedate']); + $entries[] = getDisplayDate($row['lastmodified']); + + $entries_list[] = $entries; + } + + $return_data = Array('header'=>$header,'entries'=>$entries_list); + + $log->debug("Exiting get_stage_history method ..."); + + return $return_data; + } + + /** + * Function to get Potential related Task & Event which have activity type Held, Completed or Deferred. + * @param integer $id + * returns related Task or Event record in array format + */ + function get_history($id) + { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); + $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, + vtiger_activity.eventstatus, vtiger_activity.activitytype,vtiger_activity.date_start, + vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.time_end, + vtiger_crmentity.modifiedtime, vtiger_crmentity.createdtime, + vtiger_crmentity.description,case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name + from vtiger_activity + inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid + left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid + left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname + left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid + where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') + and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != '')) + and vtiger_seactivityrel.crmid=".$id; + //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + + $log->debug("Exiting get_history method ..."); + return getHistory('Potentials',$query,$id); + } + + /** + * Function to get Potential related Attachments + * @param integer $id + * returns related Attachment record in array format + */ + function get_attachments($id) + { + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); + // Armando L?scher 18.10.2005 -> ?visibleDescription + // Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name + // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + $query = "select vtiger_notes.title,'Notes ' ActivityType, vtiger_notes.filename, + vtiger_attachments.type FileType, crm2.modifiedtime lastmodified, + vtiger_seattachmentsrel.attachmentsid, vtiger_notes.notesid crmid, + crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name + from vtiger_notes + inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0 + left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid + left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id; + $query .= ' union all '; + // Armando L?scher 18.10.2005 -> ?visibleDescription + // Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name + // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + // Inserted order by createdtime desc + $query .= "select vtiger_attachments.description title ,'Attachments' ActivityType, + vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified, + vtiger_attachments.attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid, + crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name + from vtiger_attachments + inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id." + order by createdtime desc"; + + $log->debug("Exiting get_attachments method ..."); + return getAttachmentsAndNotes('Potentials',$query,$id); + } + + /** + * Function to get Potential related Quotes + * @param integer $id - potentialid + * returns related Quotes record in array format + */ + function get_quotes($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_quotes(".$id.") method ..."); + global $app_strings; + require_once('modules/Quotes/Quotes.php'); + + if($this->column_fields['account_id']!='') + $focus = new Quotes(); + + $button = ''; + if(isPermitted("Quotes",1,"") == 'yes') + { + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + + $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_crmentity.*, vtiger_quotes.*, vtiger_potential.potentialname from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid=".$id; + $log->debug("Exiting get_quotes method ..."); + return GetRelatedList('Potentials','Quotes',$focus,$query,$button,$returnset); + } + + /** + * Function to get Potential related SalesOrder + * @param integer $id - potentialid + * returns related SalesOrder record in array format + */ + function get_salesorder($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_salesorder(".$id.") method ..."); + require_once('modules/SalesOrder/SalesOrder.php'); + global $mod_strings; + global $app_strings; + + $focus = new SalesOrder(); + + $button = ''; + if(isPermitted("SalesOrder",1,"") == 'yes') + { + $button .= ' '; + } + + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + + $query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_potential.potentialname,case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name + from vtiger_salesorder + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid + left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid + left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid + left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_salesorder.potentialid + left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid + left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname + left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid + where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid = ".$id; + $log->debug("Exiting get_salesorder method ..."); + return GetRelatedList('Potentials','SalesOrder',$focus,$query,$button,$returnset); + + } + + + + +} + + + +?> Modified: vtigercrm/branches/5.1_jens/modules/Potentials/Save.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/Save.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/Save.php Mon Apr 16 12:27:44 2007 @@ -1,65 +1,65 @@ -id); -$rate_symbol = getCurrencySymbolandCRate($currencyid); -$rate = $rate_symbol['rate']; -$curr_symbol= $rate_symbol['symbol']; - -setObjectValuesFromRequest(&$focus); - -if(isset($_REQUEST['amount'])) -{ - $value = convertToDollar($_REQUEST['amount'],$rate); - $focus->column_fields['amount'] = $value; -} - -$focus->save("Potentials"); -$return_id = $focus->id; - -if(isset($_REQUEST['parenttab']) && $_REQUEST['parenttab'] != "") $parenttab = $_REQUEST['parenttab']; -if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; -else $return_module = "Potentials"; -if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; -else $return_action = "DetailView"; -if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id']; - -$local_log->debug("Saved record with id of ".$return_id); - -//code added for returning back to the current view after edit from list view -if($_REQUEST['return_viewname'] == '') $return_viewname='0'; -if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; - -//Added to send mail to the vtiger_potential-owner about the Potential -$status = sendNotificationToOwner('Potentials',&$focus); - -header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&viewname=$return_viewname"); - -?> +id); +$rate_symbol = getCurrencySymbolandCRate($currencyid); +$rate = $rate_symbol['rate']; +$curr_symbol= $rate_symbol['symbol']; + +setObjectValuesFromRequest(&$focus); + +if(isset($_REQUEST['amount'])) +{ + $value = convertToDollar($_REQUEST['amount'],$rate); + $focus->column_fields['amount'] = $value; +} + +$focus->save("Potentials"); +$pot_id = $return_id = $focus->id; + +if(isset($_REQUEST['parenttab']) && $_REQUEST['parenttab'] != "") $parenttab = $_REQUEST['parenttab']; +if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; +else $return_module = "Potentials"; +if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; +else $return_action = "DetailView"; +if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id']; + +$local_log->debug("Saved record with id of ".$return_id); + +//code added for returning back to the current view after edit from list view +if($_REQUEST['return_viewname'] == '') $return_viewname='0'; +if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; + +//Added to send mail to the vtiger_potential-owner about the Potential +$status = sendNotificationToOwner('Potentials',&$focus); + +header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&pot_id=$pot_id&viewname=$return_viewname"); + +?> Modified: vtigercrm/branches/5.1_jens/modules/Potentials/updateRelations.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/updateRelations.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/updateRelations.php Mon Apr 16 12:27:44 2007 @@ -13,7 +13,13 @@ require_once('user_privileges/default_module_view.php'); global $adb, $singlepane_view; $idlist = $_REQUEST['idlist']; -$returnmodule = $_REQUEST['return_module']; +$dest_mod = $_REQUEST['destination_module']; + +if($singlepane_view == 'true') + $action = "DetailView"; +else + $action = "CallRelatedList"; + if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '') { //split the string and store in an array @@ -22,27 +28,23 @@ { if($id != '') { - $sql = "insert into vtiger_contpotentialrel values (".$id.",".$_REQUEST["parentid"] .")"; - $adb->query($sql); - $sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parentid"] .",".$id.")"; - $adb->query($sql); + $sql = "insert into vtiger_contpotentialrel values (".$id.",".$_REQUEST["parentid"] .")"; + $adb->query($sql); + $sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parentid"] .",".$id.",'Potentials')"; + $adb->query($sql); } } - if($singlepane_view == 'true') - header("Location: index.php?action=DetailView&module=Potentials&record=".$_REQUEST["parentid"]); - else - header("Location: index.php?action=CallRelatedList&module=Potentials&record=".$_REQUEST["parentid"]); + + header("Location: index.php?action=$action&module=Potentials&record=".$_REQUEST["parentid"]); } elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '') { - $sql = "insert into vtiger_contpotentialrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")"; - $adb->query($sql); - $sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parid"] .",".$_REQUEST["entityid"] .")"; - $adb->query($sql); - if($singlepane_view == 'true') - header("Location: index.php?action=DetailView&module=Potentials&record=".$_REQUEST["parid"]); - else - header("Location: index.php?action=CallRelatedList&module=Potentials&record=".$_REQUEST["parid"]); + $sql = "insert into vtiger_contpotentialrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")"; + $adb->query($sql); + $sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parid"] .",".$_REQUEST["entityid"] .",'Potentials')"; + $adb->query($sql); + + header("Location: index.php?action=$action&module=Potentials&record=".$_REQUEST["parid"]); } ?> Modified: vtigercrm/branches/5.1_jens/modules/PriceBooks/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/PriceBooks/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/PriceBooks/DetailView.php Mon Apr 16 12:27:44 2007 @@ -83,6 +83,7 @@ $related_array = getRelatedLists($currentModule,$focus); $smarty->assign("RELATEDLISTS", $related_array); } +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); $smarty->assign("SinglePane_View", $singlepane_view); Modified: vtigercrm/branches/5.1_jens/modules/PriceBooks/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/PriceBooks/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/PriceBooks/EditView.php Mon Apr 16 12:27:44 2007 @@ -94,6 +94,7 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); // Assigned organizations $smarty->assign("CURRENT_ORGANIZATION",$current_organization); @@ -106,7 +107,7 @@ $smarty->assign("USER_ORGANIZATIONS",$org_array); if($focus->mode == 'edit') - $smarty->display('Inventory/InventoryEditView.tpl'); + $smarty->display('Inventory/InventoryEditView.tpl'); else - $smarty->display('Inventory/InventoryCreateView.tpl'); + $smarty->display('Inventory/InventoryCreateView.tpl'); ?> Modified: vtigercrm/branches/5.1_jens/modules/Products/AddProductToPriceBooks.html ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/AddProductToPriceBooks.html (original) +++ vtigercrm/branches/5.1_jens/modules/Products/AddProductToPriceBooks.html Mon Apr 16 12:27:44 2007 @@ -116,7 +116,7 @@ } - +
+ + + + '; - if($singlepane_view == 'true') - $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; - - $query = "select vtiger_users.user_name,vtiger_crmentity.crmid, vtiger_troubletickets.title, vtiger_contactdetails.contactid, vtiger_troubletickets.parent_id, vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_troubletickets.status, vtiger_troubletickets.priority, vtiger_crmentity.smownerid from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_troubletickets.parent_id left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid=vtiger_ticketgrouprelation.ticketid left join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_contactdetails.contactid=".$id; - $log->info("Ticket Related List for Contact Displayed"); - $log->debug("Exiting get_tickets method ..."); - return GetRelatedList('Contacts','HelpDesk',$focus,$query,$button,$returnset); - } - /** - * Function to get Contact related Attachments - * @param integer $id - contactid - * returns related Attachment record in array format - */ - function get_attachments($id) - { - global $log; - $log->debug("Entering get_attachments(".$id.") method ..."); - $query = "select vtiger_notes.title,'Notes ' AS ActivityType, - vtiger_notes.filename, vtiger_attachments.type AS FileType,crm2.modifiedtime AS lastmodified, - vtiger_seattachmentsrel.attachmentsid AS attachmentsid, vtiger_notes.notesid AS crmid, - crm2.createdtime, vtiger_notes.notecontent AS description, vtiger_users.user_name - from vtiger_notes - inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_notes.contact_id - inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0 - left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid - left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid - inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - where vtiger_crmentity.crmid=".$id; - $query .= " union all "; - $query .= "select vtiger_attachments.description AS title,'Attachments' AS ActivityType, - vtiger_attachments.name AS filename, vtiger_attachments.type AS FileType,crm2.modifiedtime AS lastmodified, - vtiger_attachments.attachmentsid AS attachmentsid, vtiger_seattachmentsrel.attachmentsid AS crmid, - crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name - from vtiger_attachments - inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid - inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid - inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid - inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - where vtiger_crmentity.crmid=".$id." - order by createdtime desc"; - $log->info("Notes&Attachmenmts for Contact Displayed"); - $log->debug("Exiting get_attachments method ..."); - return getAttachmentsAndNotes('Contacts',$query,$id); - } - /** - * Function to get Contact related Quotes - * @param integer $id - contactid - * returns related Quotes record in array format - */ - function get_quotes($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_quotes(".$id.") method ..."); - global $app_strings; - require_once('modules/Quotes/Quotes.php'); - $focus = new Quotes(); - - $button = ''; - if(isPermitted("Quotes",1,"") == 'yes') - { - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; - $query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_quotes.*,vtiger_potential.potentialname,vtiger_contactdetails.lastname from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_quotes.contactid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_contactdetails.contactid=".$id; - $log->debug("Exiting get_quotes method ..."); - return GetRelatedList('Contacts','Quotes',$focus,$query,$button,$returnset); - } - /** - * Function to get Contact related SalesOrder - * @param integer $id - contactid - * returns related SalesOrder record in array format - */ - function get_salesorder($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_salesorder(".$id.") method ..."); - require_once('modules/SalesOrder/SalesOrder.php'); - global $app_strings; - $focus = new SalesOrder(); - $button = ''; - - if(isPermitted("SalesOrder",1,"") == 'yes') - { - - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; - - $query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_contactdetails.lastname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_salesorder.contactid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.contactid = ".$id; - $log->debug("Exiting get_salesorder method ..."); - return GetRelatedList('Contacts','SalesOrder',$focus,$query,$button,$returnset); - } - /** - * Function to get Contact related Products - * @param integer $id - contactid - * returns related Products record in array format - */ - function get_products($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_products(".$id.") method ..."); - global $app_strings; - require_once('modules/Products/Products.php'); - $focus = new Products(); - $button = ''; - - if(isPermitted("Products",1,"") == 'yes') - { - - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; - - $query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_contactdetails.lastname from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_products.contactid where vtiger_contactdetails.contactid = '.$id.' and vtiger_crmentity.deleted = 0'; - $log->debug("Exiting get_products method ..."); - return GetRelatedList('Contacts','Products',$focus,$query,$button,$returnset); - } - - /** - * Function to get Contact related PurchaseOrder - * @param integer $id - contactid - * returns related PurchaseOrder record in array format - */ - function get_purchase_orders($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_purchase_orders(".$id.") method ..."); - global $app_strings; - require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new PurchaseOrder(); - - $button = ''; - - if(isPermitted("PurchaseOrder",1,"") == 'yes') - { - - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; - - $query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname,vtiger_contactdetails.lastname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_purchaseorder.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.contactid=".$id; - $log->debug("Exiting get_purchase_orders method ..."); - return GetRelatedList('Contacts','PurchaseOrder',$focus,$query,$button,$returnset); - } - - /** Returns a list of the associated emails - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function get_emails($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_emails(".$id.") method ..."); - global $mod_strings; - - $focus = new Emails(); - - $button = ''; - - if(isPermitted("Emails",1,"") == 'yes') - { - $button .= ''; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; - - $log->info("Email Related List for Contact Displayed"); - - $query = "select vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_users.user_name, vtiger_crmentity.modifiedtime, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_activity.date_start from vtiger_activity, vtiger_seactivityrel, vtiger_contactdetails, vtiger_users, vtiger_crmentity left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.activityid = vtiger_activity.activityid and vtiger_contactdetails.contactid = vtiger_seactivityrel.crmid and vtiger_users.id=vtiger_crmentity.smownerid and vtiger_crmentity.crmid = vtiger_activity.activityid and vtiger_contactdetails.contactid = ".$id." and vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted = 0"; - $log->debug("Exiting get_emails method ..."); - return GetRelatedList('Contacts','Emails',$focus,$query,$button,$returnset); - } - - /** Returns a list of the associated Campaigns - * @param $id -- campaign id :: Type Integer - * @returns list of campaigns in array format - */ - - function get_campaigns($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_campaigns(".$id.") method ..."); - global $mod_strings; - - $focus = new Campaigns(); - if($singlepane_view == 'true') - $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; - $button = ''; - - $log->info("Campaign Related List for Contact Displayed"); - $query = "SELECT vtiger_users.user_name, vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaigncontrel.contactid=".$id." and vtiger_crmentity.deleted=0"; - - $log->debug("Exiting get_campaigns method ..."); - return GetRelatedList('Contacts','Campaigns',$focus,$query,$button,$returnset); - - } - /** Function to export the contact records in CSV Format - * @param reference variable - order by is passed when the query is executed - * @param reference variable - where condition is passed when the query is executed - * Returns Export Contacts Query. - */ - function create_export_query(&$order_by, &$where) - { - global $log; - global $current_user; - $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - - include("include/utils/ExportUtils.php"); - - //To get the Permitted fields query and the permitted fields list - $sql = getPermittedFieldsQuery("Contacts", "detail_view"); - $fields_list = getFieldsListFromQuery($sql); - - $query = "SELECT $fields_list - FROM vtiger_contactdetails - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid - LEFT JOIN vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id - LEFT JOIN vtiger_account on vtiger_contactdetails.accountid=vtiger_account.accountid - left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid - left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid=vtiger_contactdetails.contactid - left join vtiger_contactscf on vtiger_contactscf.contactid=vtiger_contactdetails.contactid - left join vtiger_customerdetails on vtiger_customerdetails.customerid=vtiger_contactdetails.contactid - LEFT JOIN vtiger_contactgrouprelation - ON vtiger_contactscf.contactid = vtiger_contactgrouprelation.contactid - LEFT JOIN vtiger_groups - ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname - LEFT JOIN vtiger_contactdetails vtiger_contactdetails2 - ON vtiger_contactdetails2.contactid = vtiger_contactdetails.reportsto - where vtiger_crmentity.deleted=0 and vtiger_users.status='Active' "; - //vtiger_contactdetails2 is added to get the Reports To of Contact - - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - //we should add security check when the user has Private Access - if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[4] == 3) - { - //Added security check to get the permitted records only - $query = $query." ".getListViewSecurityParameter("Contacts"); - } - - $log->info("Export Query Constructed Successfully"); - $log->debug("Exiting create_export_query method ..."); - return $query; - } - - -/** Function to get the Columnnames of the Contacts -* Used By vtigerCRM Word Plugin -* Returns the Merge Fields for Word Plugin -*/ -function getColumnNames() -{ - global $log, $current_user; - $log->debug("Entering getColumnNames() method ..."); - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) - { - $sql1 = "select fieldlabel from vtiger_field where tabid=4 and block <> 75"; - }else - { - $profileList = getCurrentUserProfileList(); - $sql1 = "select fieldlabel from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=4 and vtiger_field.block <> 6 and vtiger_field.block <> 75 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; - } - $result = $this->db->query($sql1); - $numRows = $this->db->num_rows($result); - for($i=0; $i < $numRows;$i++) - { - $custom_fields[$i] = $this->db->query_result($result,$i,"fieldlabel"); - $custom_fields[$i] = ereg_replace(" ","",$custom_fields[$i]); - $custom_fields[$i] = strtoupper($custom_fields[$i]); - } - $mergeflds = $custom_fields; - $log->debug("Exiting getColumnNames method ..."); - return $mergeflds; -} -//End -/** Function to get the Contacts assigned to a user with a valid email address. -* @param varchar $username - User Name -* @param varchar $emailaddress - Email Addr for each contact. -* Used By vtigerCRM Outlook Plugin -* Returns the Query -*/ -function get_searchbyemailid($username,$emailaddress) -{ - global $log; - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - $log->debug("Entering get_searchbyemailid(".$username.",".$emailaddress.") method ..."); - $query = "select vtiger_contactdetails.lastname,vtiger_contactdetails.firstname, - vtiger_contactdetails.contactid, vtiger_contactdetails.salutation, - vtiger_contactdetails.email,vtiger_contactdetails.title, - vtiger_contactdetails.mobile,vtiger_account.accountname, - vtiger_account.accountid as accountid from vtiger_contactdetails - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid - inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid - left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid - left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid - LEFT JOIN vtiger_contactgrouprelation ON vtiger_contactdetails.contactid = vtiger_contactgrouprelation.contactid - LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname - where vtiger_crmentity.deleted=0 and vtiger_contactdetails.email like '%".$emailaddress."%'"; - $tab_id = getTabid("Contacts"); - if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) - { - $sec_parameter=getListViewSecurityParameter("Contacts"); - $query .= $sec_parameter; - - } - $log->debug("Exiting get_searchbyemailid method ..."); - return $this->plugin_process_list_query($query); -} - -/** Function to get the Contacts associated with the particular User Name. -* @param varchar $user_name - User Name -* Returns query -*/ - -function get_contactsforol($user_name) -{ - global $log,$adb; - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($user_name); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) - { - $sql1 = "select tablename,columnname from vtiger_field where tabid=4 and block <> 75 and block <> 6 and vtiger_field.block <> 5"; - }else - { - $profileList = getCurrentUserProfileList(); - $sql1 = "select tablename,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=4 and vtiger_field.block <> 75 and vtiger_field.block <> 6 and vtiger_field.block <> 5 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; - } - $result1 = $adb->query($sql1); - for($i=0;$i < $adb->num_rows($result1);$i++) - { - $permitted_lists[] = $adb->query_result($result1,$i,'tablename'); - $permitted_lists[] = $adb->query_result($result1,$i,'columnname'); - if($adb->query_result($result1,$i,'columnname') == "accountid") - { - $permitted_lists[] = 'vtiger_account'; - $permitted_lists[] = 'accountname'; - } - } - $permitted_lists = array_chunk($permitted_lists,2); - $column_table_lists = array(); - for($i=0;$i < count($permitted_lists);$i++) - { - $column_table_lists[] = implode(".",$permitted_lists[$i]); - } - - $log->debug("Entering get_contactsforol(".$user_name.") method ..."); - $query = "select vtiger_contactdetails.contactid as id, ".implode(',',$column_table_lists)." from vtiger_contactdetails - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid - inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid - left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid - left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid - left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid = vtiger_contactdetails.contactid - LEFT JOIN vtiger_contactgrouprelation ON vtiger_contactdetails.contactid = vtiger_contactgrouprelation.contactid - LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname - where vtiger_crmentity.deleted=0 and vtiger_users.user_name='".$user_name."'"; - $log->debug("Exiting get_contactsforol method ..."); - return $query; -} - - - /** Function to handle module specific operations when saving a entity - */ - function save_module($module) - { - $this->insertIntoAttachment($this->id,$module); - } - - /** - * This function is used to add the vtiger_attachments. This will call the function uploadAndSaveFile which will upload the attachment into the server and save that attachment information in the database. - * @param int $id - entity id to which the vtiger_files to be uploaded - * @param string $module - the current module name - */ - function insertIntoAttachment($id,$module) - { - global $log, $adb; - $log->debug("Entering into insertIntoAttachment($id,$module) method."); - - $file_saved = false; - - //This is to added to store the existing attachment id of the contact where we should delete this when we give new image - $old_attachmentid = $adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid=$id"),0,'attachmentsid'); - - foreach($_FILES as $fileindex => $files) - { - if($files['name'] != '' && $files['size'] > 0) - { - $file_saved = $this->uploadAndSaveFile($id,$module,$files); - } - } - - //This is to handle the delete image for contacts - if($module == 'Contacts' && $file_saved) - { - $del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$old_attachmentid"); - $del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$old_attachmentid"); - } - - $log->debug("Exiting from insertIntoAttachment($id,$module) method."); - } - - -//End - -} - -?> +'crmid','vtiger_contactdetails'=>'contactid','vtiger_contactaddress'=>'contactaddressid','vtiger_contactsubdetails'=>'contactsubscriptionid','vtiger_contactscf'=>'contactid','vtiger_customerdetails'=>'customerid','vtiger_attachments'=>'attachmentsid','vtiger_entity2org'=>'crmid'); + + + + var $column_fields = Array(); + + var $sortby_fields = Array('lastname','firstname','title','email','phone','smownerid','accountid'); + + var $list_link_field= 'lastname'; + + // This is the list of vtiger_fields that are in the lists. + var $list_fields = Array( + 'Last Name' => Array('contactdetails'=>'lastname'), + 'First Name' => Array('contactdetails'=>'firstname'), + 'Title' => Array('contactdetails'=>'title'), + 'Account Name' => Array('account'=>'accountid'), + 'Email' => Array('contactdetails'=>'email'), + 'Phone' => Array('contactdetails'=>'phone'), + 'Assigned To' => Array('crmentity'=>'smownerid') + ); + + var $range_fields = Array( + 'first_name', + 'last_name', + 'primary_address_city', + 'account_name', + 'account_id', + 'id', + 'email1', + 'salutation', + 'title', + 'phone_mobile', + 'reports_to_name', + 'primary_address_street', + 'primary_address_city', + 'primary_address_state', + 'primary_address_postalcode', + 'primary_address_country', + 'alt_address_city', + 'alt_address_street', + 'alt_address_city', + 'alt_address_state', + 'alt_address_postalcode', + 'alt_address_country', + 'office_phone', + 'home_phone', + 'other_phone', + 'fax', + 'department', + 'birthdate', + 'assistant_name', + 'assistant_phone'); + + + var $list_fields_name = Array( + 'Last Name' => 'lastname', + 'First Name' => 'firstname', + 'Title' => 'title', + 'Account Name' => 'accountid', + 'Email' => 'email', + 'Phone' => 'phone', + 'Assigned To' => 'assigned_user_id' + ); + + var $search_fields = Array( + 'Name' => Array('contactdetails'=>'lastname'), + 'Title' => Array('contactdetails'=>'title'), + 'Account Name'=>Array('contactdetails'=>'account_id'), + ); + + var $search_fields_name = Array( + 'Name' => 'lastname', + 'Title' => 'title', + 'Account Name'=>'account_id', + ); + + // This is the list of vtiger_fields that are required + var $required_fields = array("lastname"=>1); + + //Added these variables which are used as default order by and sortorder in ListView + var $default_order_by = 'lastname'; + var $default_sort_order = 'ASC'; + + var $groupTable = Array('vtiger_contactgrouprelation','contactid'); + + function Contacts() { + $this->log = LoggerManager::getLogger('contact'); + $this->db = new PearDatabase(); + $this->column_fields = getColumnFields('Contacts'); + } + + // Mike Crowe Mod --------------------------------------------------------Default ordering for us + /** + * Function to get sort order + * return string $sorder - sortorder string either 'ASC' or 'DESC' + */ + function getSortOrder() + { + global $log; + $log->debug("Entering getSortOrder() method ..."); + if(isset($_REQUEST['sorder'])) + $sorder = $_REQUEST['sorder']; + else + $sorder = (($_SESSION['CONTACTS_SORT_ORDER'] != '')?($_SESSION['CONTACTS_SORT_ORDER']):($this->default_sort_order)); + $log->debug("Exiting getSortOrder method ..."); + return $sorder; + } + /** + * Function to get order by + * return string $order_by - fieldname(eg: 'Contactname') + */ + function getOrderBy() + { + global $log; + $log->debug("Entering getOrderBy() method ..."); + if (isset($_REQUEST['order_by'])) + $order_by = $_REQUEST['order_by']; + else + $order_by = (($_SESSION['CONTACTS_ORDER_BY'] != '')?($_SESSION['CONTACTS_ORDER_BY']):($this->default_order_by)); + $log->debug("Exiting getOrderBy method ..."); + return $order_by; + } + // Mike Crowe Mod -------------------------------------------------------- + /** Function to get the number of Contacts assigned to a particular User. + * @param varchar $user name - Assigned to User + * Returns the count of contacts assigned to user. + */ + function getCount($user_name) + { + global $log; + $log->debug("Entering getCount(".$user_name.") method ..."); + $query = "select count(*) from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0"; + + $result = $this->db->query($query,true,"Error retrieving contacts count"); + $rows_found = $this->db->getRowCount($result); + $row = $this->db->fetchByAssoc($result, 0); + + + $log->debug("Exiting getCount method ..."); + return $row["count(*)"]; + } + /** Function to get the Contact Details assigned to a given User ID which has a valid Email Address. + * @param varchar $user_name - User Name (eg. Admin) + * @param varchar $email_address - Email Addr of each contact record. + * Returns the query. + */ + function get_contacts1($user_name,$email_address) + { + global $log; + $log->debug("Entering get_contacts1(".$user_name.",".$email_address.") method ..."); + $query = "select vtiger_users.user_name, vtiger_contactdetails.lastname last_name,vtiger_contactdetails.firstname first_name,vtiger_contactdetails.contactid as id, vtiger_contactdetails.salutation as salutation, vtiger_contactdetails.email as email1,vtiger_contactdetails.title as title,vtiger_contactdetails.mobile as phone_mobile,vtiger_account.accountname as account_name,vtiger_account.accountid as account_id from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 and vtiger_contactdetails.email like '%" .$email_address ."%' limit 50"; + + $log->debug("Exiting get_contacts1 method ..."); + return $this->process_list_query1($query); + } + /** Function to get the Contact Details assigned to a particular User based on the starting count and the number of subsequent records. + * @param varchar $user_name - Assigned User + * @param integer $from_index - Initial record number to be displayed + * @param integer $offset - Count of the subsequent records to be displayed. + * Returns Query. + */ + function get_contacts($user_name,$from_index,$offset) + { + global $log; + $log->debug("Entering get_contacts(".$user_name.",".$from_index.",".$offset.") method ..."); + $query = "select vtiger_users.user_name,vtiger_groups.groupname,vtiger_contactdetails.department department, vtiger_contactdetails.phone office_phone, vtiger_contactdetails.fax fax, vtiger_contactsubdetails.assistant assistant_name, vtiger_contactsubdetails.otherphone other_phone, vtiger_contactsubdetails.homephone home_phone,vtiger_contactsubdetails.birthday birthdate, vtiger_contactdetails.lastname last_name,vtiger_contactdetails.firstname first_name,vtiger_contactdetails.contactid as id, vtiger_contactdetails.salutation as salutation, vtiger_contactdetails.email as email1,vtiger_contactdetails.title as title,vtiger_contactdetails.mobile as phone_mobile,vtiger_account.accountname as account_name,vtiger_account.accountid as account_id, vtiger_contactaddress.mailingcity as primary_address_city,vtiger_contactaddress.mailingstreet as primary_address_street, vtiger_contactaddress.mailingcountry as primary_address_country,vtiger_contactaddress.mailingstate as primary_address_state, vtiger_contactaddress.mailingzip as primary_address_postalcode, vtiger_contactaddress.othercity as alt_address_city,vtiger_contactaddress.otherstreet as alt_address_street, vtiger_contactaddress.othercountry as alt_address_country,vtiger_contactaddress.otherstate as alt_address_state, vtiger_contactaddress.otherzip as alt_address_postalcode from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 limit " .$from_index ."," .$offset; + + $log->debug("Exiting get_contacts method ..."); + return $this->process_list_query1($query); + } + + + /** Function to process list query for a given query + * @param $query + * Returns the results of query in array format + */ + function process_list_query1($query) + { + global $log; + $log->debug("Entering process_list_query1(".$query.") method ..."); + + $result =& $this->db->query($query,true,"Error retrieving $this->object_name list: "); + $list = Array(); + $rows_found = $this->db->getRowCount($result); + if($rows_found != 0) + { + $contact = Array(); + for($index = 0 , $row = $this->db->fetchByAssoc($result, $index); $row && $index <$rows_found;$index++, $row = $this->db->fetchByAssoc($result, $index)) + + { + foreach($this->range_fields as $columnName) + { + if (isset($row[$columnName])) { + + $contact[$columnName] = $row[$columnName]; + } + else + { + $contact[$columnName] = ""; + } + } +// TODO OPTIMIZE THE QUERY ACCOUNT NAME AND ID are set separetly for every vtiger_contactdetails and hence +// vtiger_account query goes for ecery single vtiger_account row + + $list[] = $contact; + } + } + + $response = Array(); + $response['list'] = $list; + $response['row_count'] = $rows_found; + $response['next_offset'] = $next_offset; + $response['previous_offset'] = $previous_offset; + + + $log->debug("Exiting process_list_query1 method ..."); + return $response; + } + + + /** Function to process list query for Plugin with Security Parameters for a given query + * @param $query + * Returns the results of query in array format + */ + function plugin_process_list_query($query) + { + global $log,$adb,$current_user; + $log->debug("Entering process_list_query1(".$query.") method ..."); + $permitted_field_lists = Array(); + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) + { + $sql1 = "select columnname from vtiger_field where tabid=4 and block <> 75"; + }else + { + $profileList = getCurrentUserProfileList(); + $sql1 = "select columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=4 and vtiger_field.block <> 6 and vtiger_field.block <> 75 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; + } + $result1 = $this->db->query($sql1); + for($i=0;$i < $adb->num_rows($result1);$i++) + { + $permitted_field_lists[] = $adb->query_result($result1,$i,'columnname'); + } + + $result =& $this->db->query($query,true,"Error retrieving $this->object_name list: "); + $list = Array(); + $rows_found = $this->db->getRowCount($result); + if($rows_found != 0) + { + for($index = 0 , $row = $this->db->fetchByAssoc($result, $index); $row && $index <$rows_found;$index++, $row = $this->db->fetchByAssoc($result, $index)) + { + $contact = Array(); + foreach($permitted_field_lists as $columnName) + { + if ($columnName == "lastname" || $columnName == "firstname" || $columnName == "email") + { + $contact[$columnName] = $row[$columnName]; + } + else + { + $contact[$columnName] = ""; + } + } + if(in_array("accountid",$permitted_field_lists)) + { + $contact[accountname] = $row[accountname]; + $contact[account_id] = $row[accountid]; + } + $contact[contactid] = $row[contactid]; + $list[] = $contact; + } + } + + $response = Array(); + $response['list'] = $list; + $response['row_count'] = $rows_found; + $response['next_offset'] = $next_offset; + $response['previous_offset'] = $previous_offset; + $log->debug("Exiting process_list_query1 method ..."); + return $response; + } + + + /** Returns a list of the associated opportunities + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function get_opportunities($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_opportunities(".$id.") method ..."); + global $mod_strings; + + $focus = new Potentials(); + $button = ''; + + if(isPermitted("Potentials",1,"") == 'yes') + { + + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; + + $log->info("Potential Related List for Contact Displayed"); + + // First, get the list of IDs. + $query ='select case when (vtiger_users.user_name not like \'\') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_contactdetails.accountid, vtiger_contactdetails.contactid , vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_contpotentialrel on vtiger_contpotentialrel.contactid=vtiger_contactdetails.contactid left join vtiger_potential on vtiger_potential.potentialid = vtiger_contpotentialrel.potentialid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_contactdetails.contactid ='.$id.' and vtiger_contactdetails.accountid = vtiger_potential.accountid and vtiger_crmentity.deleted=0'; + + if($this->column_fields['account_id'] != 0) + $log->debug("Exiting get_opportunities method ..."); + return GetRelatedList('Contacts','Potentials',$focus,$query,$button,$returnset); + } + + + /** Returns a list of the associated tasks + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function get_activities($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_activities(".$id.") method ..."); + global $mod_strings; + + $focus = new Activity(); + + $button = ''; + + if(isPermitted("Calendar",1,"") == 'yes') + { + $button .= ' '; + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; + + $log->info("Activity Related List for Contact Displayed"); + + $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.activityid , vtiger_activity.subject, vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.due_date,vtiger_activity.time_start,vtiger_activity.time_end, vtiger_cntactivityrel.contactid, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_recurringevents.recurringtype from vtiger_contactdetails inner join vtiger_cntactivityrel on vtiger_cntactivityrel.contactid = vtiger_contactdetails.contactid inner join vtiger_activity on vtiger_cntactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_cntactivityrel.activityid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_contactdetails.contactid=".$id." and vtiger_crmentity.deleted = 0 and ((vtiger_activity.activitytype='Task' and vtiger_activity.status not in ('Completed','Deferred')) or (vtiger_activity.activitytype in ('Meeting','Call') and vtiger_activity.eventstatus not in ('','Held')))"; //recurring type is added in Query -Jaguar + $log->debug("Exiting get_activities method ..."); + return GetRelatedList('Contacts','Calendar',$focus,$query,$button,$returnset); + + } + /** + * Function to get Contact related Task & Event which have activity type Held, Completed or Deferred. + * @param integer $id - contactid + * returns related Task or Event record in array format + */ + function get_history($id) + { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); + $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus,vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.due_date,vtiger_activity.time_start,vtiger_activity.time_end,vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime,vtiger_crmentity.createdtime, vtiger_crmentity.description, case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name + from vtiger_activity + inner join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid + inner join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid + left join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid + left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid + left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname + left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid + where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') + and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != '')) + and vtiger_cntactivityrel.contactid=".$id; + //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + $log->debug("Entering get_history method ..."); + return getHistory('Contacts',$query,$id); + } + /** + * Function to get Contact related Tickets. + * @param integer $id - contactid + * returns related Ticket records in array format + */ + function get_tickets($id) + { + global $log, $singlepane_view; + global $app_strings; + $log->debug("Entering get_tickets(".$id.") method ..."); + $focus = new HelpDesk(); + + $button = ''; + if($singlepane_view == 'true') + $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; + + $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_crmentity.crmid, vtiger_troubletickets.title, vtiger_contactdetails.contactid, vtiger_troubletickets.parent_id, vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_troubletickets.status, vtiger_troubletickets.priority, vtiger_crmentity.smownerid from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_troubletickets.parent_id left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid=vtiger_ticketgrouprelation.ticketid left join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_contactdetails.contactid=".$id; + $log->info("Ticket Related List for Contact Displayed"); + $log->debug("Exiting get_tickets method ..."); + return GetRelatedList('Contacts','HelpDesk',$focus,$query,$button,$returnset); + } + /** + * Function to get Contact related Attachments + * @param integer $id - contactid + * returns related Attachment record in array format + */ + function get_attachments($id) + { + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); + $query = "select vtiger_notes.title,'Notes ' AS ActivityType, + vtiger_notes.filename, vtiger_attachments.type AS FileType,crm2.modifiedtime AS lastmodified, + vtiger_seattachmentsrel.attachmentsid AS attachmentsid, vtiger_notes.notesid AS crmid, + crm2.createdtime, vtiger_notes.notecontent AS description, vtiger_users.user_name + from vtiger_notes + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_notes.contact_id + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0 + left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid + left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id; + $query .= " union all "; + $query .= "select vtiger_attachments.description AS title,'Attachments' AS ActivityType, + vtiger_attachments.name AS filename, vtiger_attachments.type AS FileType,crm2.modifiedtime AS lastmodified, + vtiger_attachments.attachmentsid AS attachmentsid, vtiger_seattachmentsrel.attachmentsid AS crmid, + crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name + from vtiger_attachments + inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id." + order by createdtime desc"; + $log->info("Notes&Attachmenmts for Contact Displayed"); + $log->debug("Exiting get_attachments method ..."); + return getAttachmentsAndNotes('Contacts',$query,$id); + } + /** + * Function to get Contact related Quotes + * @param integer $id - contactid + * returns related Quotes record in array format + */ + function get_quotes($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_quotes(".$id.") method ..."); + global $app_strings; + require_once('modules/Quotes/Quotes.php'); + $focus = new Quotes(); + + $button = ''; + if(isPermitted("Quotes",1,"") == 'yes') + { + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; + $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_crmentity.*, vtiger_quotes.*,vtiger_potential.potentialname,vtiger_contactdetails.lastname from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_quotes.contactid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_contactdetails.contactid=".$id; + $log->debug("Exiting get_quotes method ..."); + return GetRelatedList('Contacts','Quotes',$focus,$query,$button,$returnset); + } + /** + * Function to get Contact related SalesOrder + * @param integer $id - contactid + * returns related SalesOrder record in array format + */ + function get_salesorder($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_salesorder(".$id.") method ..."); + require_once('modules/SalesOrder/SalesOrder.php'); + global $app_strings; + $focus = new SalesOrder(); + $button = ''; + + if(isPermitted("SalesOrder",1,"") == 'yes') + { + + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; + + $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_contactdetails.lastname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_salesorder.contactid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.contactid = ".$id; + $log->debug("Exiting get_salesorder method ..."); + return GetRelatedList('Contacts','SalesOrder',$focus,$query,$button,$returnset); + } + /** + * Function to get Contact related Products + * @param integer $id - contactid + * returns related Products record in array format + */ + function get_products($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_products(".$id.") method ..."); + global $app_strings; + require_once('modules/Products/Products.php'); + $focus = new Products(); + $button = ''; + + if(isPermitted("Products",1,"") == 'yes') + { + + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; + + $query = 'SELECT vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, + vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, + vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_contactdetails.lastname + FROM vtiger_products + INNER JOIN vtiger_seproductsrel + ON vtiger_seproductsrel.productid=vtiger_products.productid and vtiger_seproductsrel.setype=\'Contacts\' + INNER JOIN vtiger_crmentity + ON vtiger_crmentity.crmid = vtiger_products.productid + INNER JOIN vtiger_contactdetails + ON vtiger_contactdetails.contactid = vtiger_seproductsrel.crmid + WHERE vtiger_contactdetails.contactid = '.$id.' and vtiger_crmentity.deleted = 0'; + + $log->debug("Exiting get_products method ..."); + return GetRelatedList('Contacts','Products',$focus,$query,$button,$returnset); + } + + /** + * Function to get Contact related PurchaseOrder + * @param integer $id - contactid + * returns related PurchaseOrder record in array format + */ + function get_purchase_orders($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_purchase_orders(".$id.") method ..."); + global $app_strings; + require_once('modules/PurchaseOrder/PurchaseOrder.php'); + $focus = new PurchaseOrder(); + + $button = ''; + + if(isPermitted("PurchaseOrder",1,"") == 'yes') + { + + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; + + $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname,vtiger_contactdetails.lastname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_purchaseorder.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.contactid=".$id; + $log->debug("Exiting get_purchase_orders method ..."); + return GetRelatedList('Contacts','PurchaseOrder',$focus,$query,$button,$returnset); + } + + /** Returns a list of the associated emails + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function get_emails($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_emails(".$id.") method ..."); + global $mod_strings; + + $focus = new Emails(); + + $button = ''; + + if(isPermitted("Emails",1,"") == 'yes') + { + $button .= ''; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; + + $log->info("Email Related List for Contact Displayed"); + + $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_crmentity.modifiedtime, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_activity.date_start from vtiger_activity, vtiger_seactivityrel, vtiger_contactdetails, vtiger_users, vtiger_crmentity left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.activityid = vtiger_activity.activityid and vtiger_contactdetails.contactid = vtiger_seactivityrel.crmid and vtiger_users.id=vtiger_crmentity.smownerid and vtiger_crmentity.crmid = vtiger_activity.activityid and vtiger_contactdetails.contactid = ".$id." and vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted = 0"; + $log->debug("Exiting get_emails method ..."); + return GetRelatedList('Contacts','Emails',$focus,$query,$button,$returnset); + } + + /** Returns a list of the associated Campaigns + * @param $id -- campaign id :: Type Integer + * @returns list of campaigns in array format + */ + + function get_campaigns($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_campaigns(".$id.") method ..."); + global $mod_strings; + + $focus = new Campaigns(); + if($singlepane_view == 'true') + $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; + $button = ''; + + $log->info("Campaign Related List for Contact Displayed"); + $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaigncontrel.contactid=".$id." and vtiger_crmentity.deleted=0"; + + $log->debug("Exiting get_campaigns method ..."); + return GetRelatedList('Contacts','Campaigns',$focus,$query,$button,$returnset); + + } + /** Function to export the contact records in CSV Format + * @param reference variable - order by is passed when the query is executed + * @param reference variable - where condition is passed when the query is executed + * Returns Export Contacts Query. + */ + function create_export_query(&$order_by, &$where) + { + global $log; + global $current_user; + $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Contacts", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT vtiger_contactdetails.salutation as 'Salutation',$fields_list, vtiger_contactgrouprelation.groupname as 'Assigned To Group' + FROM vtiger_contactdetails + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid + LEFT JOIN vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id and vtiger_users.status='Active' + LEFT JOIN vtiger_account on vtiger_contactdetails.accountid=vtiger_account.accountid + left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid + left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid=vtiger_contactdetails.contactid + left join vtiger_contactscf on vtiger_contactscf.contactid=vtiger_contactdetails.contactid + left join vtiger_customerdetails on vtiger_customerdetails.customerid=vtiger_contactdetails.contactid + LEFT JOIN vtiger_contactgrouprelation + ON vtiger_contactscf.contactid = vtiger_contactgrouprelation.contactid + LEFT JOIN vtiger_groups + ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname + LEFT JOIN vtiger_contactdetails vtiger_contactdetails2 + ON vtiger_contactdetails2.contactid = vtiger_contactdetails.reportsto + where vtiger_crmentity.deleted=0"; + //vtiger_contactdetails2 is added to get the Reports To of Contact + + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + //we should add security check when the user has Private Access + if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[4] == 3) + { + //Added security check to get the permitted records only + $query = $query." ".getListViewSecurityParameter("Contacts"); + } + + $log->info("Export Query Constructed Successfully"); + $log->debug("Exiting create_export_query method ..."); + return $query; + } + + +/** Function to get the Columnnames of the Contacts +* Used By vtigerCRM Word Plugin +* Returns the Merge Fields for Word Plugin +*/ +function getColumnNames() +{ + global $log, $current_user; + $log->debug("Entering getColumnNames() method ..."); + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) + { + $sql1 = "select fieldlabel from vtiger_field where tabid=4 and block <> 75"; + }else + { + $profileList = getCurrentUserProfileList(); + $sql1 = "select fieldlabel from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=4 and vtiger_field.block <> 6 and vtiger_field.block <> 75 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; + } + $result = $this->db->query($sql1); + $numRows = $this->db->num_rows($result); + for($i=0; $i < $numRows;$i++) + { + $custom_fields[$i] = $this->db->query_result($result,$i,"fieldlabel"); + $custom_fields[$i] = ereg_replace(" ","",$custom_fields[$i]); + $custom_fields[$i] = strtoupper($custom_fields[$i]); + } + $mergeflds = $custom_fields; + $log->debug("Exiting getColumnNames method ..."); + return $mergeflds; +} +//End +/** Function to get the Contacts assigned to a user with a valid email address. +* @param varchar $username - User Name +* @param varchar $emailaddress - Email Addr for each contact. +* Used By vtigerCRM Outlook Plugin +* Returns the Query +*/ +function get_searchbyemailid($username,$emailaddress) +{ + global $log; + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + $log->debug("Entering get_searchbyemailid(".$username.",".$emailaddress.") method ..."); + $query = "select vtiger_contactdetails.lastname,vtiger_contactdetails.firstname, + vtiger_contactdetails.contactid, vtiger_contactdetails.salutation, + vtiger_contactdetails.email,vtiger_contactdetails.title, + vtiger_contactdetails.mobile,vtiger_account.accountname, + vtiger_account.accountid as accountid from vtiger_contactdetails + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid + inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid + left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid + left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid + LEFT JOIN vtiger_contactgrouprelation ON vtiger_contactdetails.contactid = vtiger_contactgrouprelation.contactid + LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname + where vtiger_crmentity.deleted=0 and vtiger_contactdetails.email like '%".$emailaddress."%' and vtiger_contactdetails.email != ''"; + $tab_id = getTabid("Contacts"); + if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) + { + $sec_parameter=getListViewSecurityParameter("Contacts"); + $query .= $sec_parameter; + + } + $log->debug("Exiting get_searchbyemailid method ..."); + return $this->plugin_process_list_query($query); +} + +/** Function to get the Contacts associated with the particular User Name. +* @param varchar $user_name - User Name +* Returns query +*/ + +function get_contactsforol($user_name) +{ + global $log,$adb; + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($user_name); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) + { + $sql1 = "select tablename,columnname from vtiger_field where tabid=4 and block <> 75 and block <> 6 and vtiger_field.block <> 5"; + }else + { + $profileList = getCurrentUserProfileList(); + $sql1 = "select tablename,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=4 and vtiger_field.block <> 75 and vtiger_field.block <> 6 and vtiger_field.block <> 5 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; + } + $result1 = $adb->query($sql1); + for($i=0;$i < $adb->num_rows($result1);$i++) + { + $permitted_lists[] = $adb->query_result($result1,$i,'tablename'); + $permitted_lists[] = $adb->query_result($result1,$i,'columnname'); + if($adb->query_result($result1,$i,'columnname') == "accountid") + { + $permitted_lists[] = 'vtiger_account'; + $permitted_lists[] = 'accountname'; + } + } + $permitted_lists = array_chunk($permitted_lists,2); + $column_table_lists = array(); + for($i=0;$i < count($permitted_lists);$i++) + { + $column_table_lists[] = implode(".",$permitted_lists[$i]); + } + + $log->debug("Entering get_contactsforol(".$user_name.") method ..."); + $query = "select vtiger_contactdetails.contactid as id, ".implode(',',$column_table_lists)." from vtiger_contactdetails + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid + inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid + left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid + left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid + left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid = vtiger_contactdetails.contactid + LEFT JOIN vtiger_contactgrouprelation ON vtiger_contactdetails.contactid = vtiger_contactgrouprelation.contactid + LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname + where vtiger_crmentity.deleted=0 and vtiger_users.user_name='".$user_name."'"; + $log->debug("Exiting get_contactsforol method ..."); + return $query; +} + + + /** Function to handle module specific operations when saving a entity + */ + function save_module($module) + { + $this->insertIntoAttachment($this->id,$module); + } + + /** + * This function is used to add the vtiger_attachments. This will call the function uploadAndSaveFile which will upload the attachment into the server and save that attachment information in the database. + * @param int $id - entity id to which the vtiger_files to be uploaded + * @param string $module - the current module name + */ + function insertIntoAttachment($id,$module) + { + global $log, $adb; + $log->debug("Entering into insertIntoAttachment($id,$module) method."); + + $file_saved = false; + + //This is to added to store the existing attachment id of the contact where we should delete this when we give new image + $old_attachmentid = $adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid=$id"),0,'attachmentsid'); + + foreach($_FILES as $fileindex => $files) + { + if($files['name'] != '' && $files['size'] > 0) + { + $file_saved = $this->uploadAndSaveFile($id,$module,$files); + } + } + + //This is to handle the delete image for contacts + if($module == 'Contacts' && $file_saved) + { + $del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$old_attachmentid"); + $del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$old_attachmentid"); + } + + $log->debug("Exiting from insertIntoAttachment($id,$module) method."); + } + + +//End + +} + +?> Modified: vtigercrm/branches/5.1_jens/modules/Contacts/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/DetailView.php Mon Apr 16 12:27:44 2007 @@ -1,138 +1,146 @@ -id=$_REQUEST['record']; - $focus->retrieve_entity_info($_REQUEST['record'],'Contacts'); - $log->info("Entity info successfully retrieved for Contact DetailView."); - $focus->firstname=$focus->column_fields['firstname']; - $focus->lastname=$focus->column_fields['lastname']; -} -if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { - $focus->id = ""; -} - -global $theme; -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; -require_once($theme_path.'layout_utils.php'); - -$log->info("Contact detail view"); - -$smarty = new vtigerCRM_Smarty; -$smarty->assign("MOD", $mod_strings); -$smarty->assign("APP", $app_strings); - -$smarty->assign("THEME", $theme); -$smarty->assign("IMAGE_PATH", $image_path); -$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); -$smarty->assign("UPDATEINFO",updateInfo($focus->id)); - -if(useInternalMailer() == 1) - $smarty->assign("INT_MAILER","true"); - -$smarty->assign("NAME",$focus->lastname.' '.$focus->firstname); - -$log->info("Detail Block Informations successfully retrieved."); -$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields)); -$smarty->assign("CUSTOMFIELD", $cust_fld); -$smarty->assign("SINGLE_MOD", 'Contact'); -$smarty->assign("REDIR_MOD","contacts"); - -$smarty->assign("ID", $_REQUEST['record']); -if(isPermitted("Contacts","EditView",$_REQUEST['record']) == 'yes') - $smarty->assign("EDIT_DUPLICATE","permitted"); - -if(isPermitted("Contacts","Delete",$_REQUEST['record']) == 'yes') - $smarty->assign("DELETE","permitted"); -if(isPermitted("Emails","EditView",'') == 'yes') -{ - //Added to pass the parents list as hidden for Emails -- 09-11-2005 - $parent_email = getEmailParentsList('Contacts',$_REQUEST['record']); - $smarty->assign("HIDDEN_PARENTS_LIST",$parent_email); - $smarty->assign("SENDMAILBUTTON","permitted"); -} - -if(isPermitted("Contacts","Merge",'') == 'yes') -{ - $smarty->assign("MERGEBUTTON","permitted"); - require_once('include/utils/UserInfoUtil.php'); - $wordTemplateResult = fetchWordTemplateList("Contacts"); - $tempCount = $adb->num_rows($wordTemplateResult); - $tempVal = $adb->fetch_array($wordTemplateResult); - for($templateCount=0;$templateCount<$tempCount;$templateCount++) - { - $optionString[$tempVal["templateid"]]=$tempVal["filename"]; - $tempVal = $adb->fetch_array($wordTemplateResult); - } - $smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']); - $smarty->assign("TOPTIONS",$optionString); -} - -//Security check for related list -$category = getParentTab(); -$smarty->assign("CATEGORY",$category); - -$check_button = Button_Check($module); -$smarty->assign("CHECK", $check_button); - -$tabid = getTabid("Contacts"); -$validationData = getDBValidationData($focus->tab_name,$tabid); -$data = split_validationdataArray($validationData); - -$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); - -$smarty->assign("MODULE",$currentModule); -$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); - -if($singlepane_view == 'true') -{ - $related_array = getRelatedLists($currentModule,$focus); - $smarty->assign("RELATEDLISTS", $related_array); -} - -$smarty->assign("SinglePane_View", $singlepane_view); - + +$focus = new Contacts(); + +if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { + + $focus->id=$_REQUEST['record']; + $focus->retrieve_entity_info($_REQUEST['record'],'Contacts'); + $log->info("Entity info successfully retrieved for Contact DetailView."); + $focus->firstname=$focus->column_fields['firstname']; + $focus->lastname=$focus->column_fields['lastname']; +} +if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { + $focus->id = ""; +} + +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); + +$log->info("Contact detail view"); + +$smarty = new vtigerCRM_Smarty; +$smarty->assign("MOD", $mod_strings); +$smarty->assign("APP", $app_strings); + +$smarty->assign("THEME", $theme); +$smarty->assign("IMAGE_PATH", $image_path); +$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); +$smarty->assign("UPDATEINFO",updateInfo($focus->id)); + +if(useInternalMailer() == 1) + $smarty->assign("INT_MAILER","true"); + +$smarty->assign("NAME",$focus->lastname.' '.$focus->firstname); + +$log->info("Detail Block Informations successfully retrieved."); +$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields)); +$smarty->assign("CUSTOMFIELD", $cust_fld); +$smarty->assign("SINGLE_MOD", 'Contact'); + +$smarty->assign("ID", $_REQUEST['record']); +if(isPermitted("Contacts","EditView",$_REQUEST['record']) == 'yes') + $smarty->assign("EDIT_DUPLICATE","permitted"); + +if(isPermitted("Contacts","Delete",$_REQUEST['record']) == 'yes') + $smarty->assign("DELETE","permitted"); +if(isPermitted("Emails","EditView",'') == 'yes') +{ + //Added to pass the parents list as hidden for Emails -- 09-11-2005 + $parent_email = getEmailParentsList('Contacts',$_REQUEST['record']); + $smarty->assign("HIDDEN_PARENTS_LIST",$parent_email); + $smarty->assign("SENDMAILBUTTON","permitted"); + $smarty->assign("EMAIL1",$focus->column_fields['email']); + $smarty->assign("EMAIL2",$focus->column_fields['yahooid']); + +} + +if(isPermitted("Contacts","Merge",'') == 'yes') +{ + $smarty->assign("MERGEBUTTON","permitted"); + require_once('include/utils/UserInfoUtil.php'); + $wordTemplateResult = fetchWordTemplateList("Contacts"); + $tempCount = $adb->num_rows($wordTemplateResult); + $tempVal = $adb->fetch_array($wordTemplateResult); + for($templateCount=0;$templateCount<$tempCount;$templateCount++) + { + $optionString[$tempVal["templateid"]]=$tempVal["filename"]; + $tempVal = $adb->fetch_array($wordTemplateResult); + } + $smarty->assign("TEMPLATECOUNT",$tempCount); + $smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']); + $smarty->assign("TOPTIONS",$optionString); +} + +//Security check for related list +$category = getParentTab(); +$smarty->assign("CATEGORY",$category); + +$check_button = Button_Check($module); +$smarty->assign("CHECK", $check_button); + +$tabid = getTabid("Contacts"); +$validationData = getDBValidationData($focus->tab_name,$tabid); +$data = split_validationdataArray($validationData); + +$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); +$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); +$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); + +$smarty->assign("MODULE",$currentModule); +$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); + +if($singlepane_view == 'true') +{ + $sql = $adb->query('select accountid from vtiger_contactdetails where contactid='.$focus->id); + $accountid = $adb->query_result($sql,0,'accountid'); + if($accountid == 0) $accountid=''; + $smarty->assign("accountid",$accountid); + $related_array = getRelatedLists($currentModule,$focus); + $smarty->assign("RELATEDLISTS", $related_array); +} + +$smarty->assign("SinglePane_View", $singlepane_view); + // Assigned organizations $smarty->assign("CURRENT_ORGANIZATION",$current_organization); $org_array=array(); @@ -143,6 +151,6 @@ } $smarty->assign("USER_ORGANIZATIONS",$org_array); -$smarty->display("DetailView.tpl"); -?> - +$smarty->display("DetailView.tpl"); +?> + Modified: vtigercrm/branches/5.1_jens/modules/Contacts/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/DetailViewAjax.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/DetailViewAjax.php Mon Apr 16 12:27:44 2007 @@ -31,11 +31,67 @@ $cntObj->id = $crmid; $cntObj->mode = "edit"; $cntObj->save("Contacts"); + + $email_res = $adb->query("select email from vtiger_contactdetails where contactid=".$cntObj->id); + $email = $adb->query_result($email_res,0,'email'); + + $check_available = $adb->query("select * from vtiger_portalinfo where id=".$cntObj->id); + $update = ''; if($fieldname =='email') { - $sql = "update vtiger_portalinfo set user_name='".$fieldvalue."' where id=".$crmid; - $adb->query($sql); + $active = $adb->query_result($check_available,0,'isactive'); + $update = false; + if($active != '' && $active == 1) + { + $sql = "update vtiger_portalinfo set user_name='".$fieldvalue."',isactive='".$active."' where id=".$crmid; + $adb->query($sql); + $email = $fieldvalue; + $result = $adb->query("select user_password from vtiger_portalinfo where id=".$cntObj->id); + $password = $adb->query_result($result,0,'user_password'); + $update = true; + } } + + if($fieldname == "portal") + { + if($email != '') + { + $confirm = $adb->query_result($check_available,0,'isactive'); + if($confirm == '' && $fieldvalue == 1) + { + $password = makeRandomPassword(); + $sql = "insert into vtiger_portalinfo (id,user_name,user_password,type,isactive) values(".$cntObj->id.",'".$email."','".$password."','C',1)"; + $adb->query($sql); + $insert = true; + + } + elseif($confirm == 0 && $fieldvalue == 1) + { + $sql = "update vtiger_portalinfo set user_name='".$email."', isactive=1 where id=".$cntObj->id; + $adb->query($sql); + $result = $adb->query("select user_password from vtiger_portalinfo where id=".$cntObj->id); + $password = $adb->query_result($result,0,'user_password'); + $update = true; + + } + elseif($confirm == 1 && $fieldvalue == 0) + { + $sql = "update vtiger_portalinfo set isactive=0 where id=".$cntObj->id; + $adb->query($sql); + } + } + } + require_once("modules/Emails/mail.php"); + global $current_user; + $data_array = Array(); + $data_array['first_name'] = $cntObj->column_fields['firstname']; + $data_array['last_name'] = $cntObj->column_fields['lastname']; + $data_array['email'] = $email; + $data_array['portal_url'] = "".$mod_strings['Please Login Here'].""; + $contents = getmail_contents_portalUser($data_array,$password); + if($insert == true || $update == true) + send_mail('Contacts',$cntObj->column_fields['email'],$current_user->user_name,'',$mod_strings['Customer Portal Login Details'],$contents); + if($cntObj->id != "") { echo ":#:SUCCESS"; Modified: vtigercrm/branches/5.1_jens/modules/Contacts/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/EditView.php Mon Apr 16 12:27:44 2007 @@ -1,228 +1,231 @@ -id = $_REQUEST['record']; - $focus->mode = 'edit'; - $focus->retrieve_entity_info($_REQUEST['record'],"Contacts"); - $log->info("Entity info successfully retrieved for EditView."); - $focus->firstname=$focus->column_fields['firstname']; - $focus->lastname=$focus->column_fields['lastname']; + +//added for contact image +$encode_val=$_REQUEST['encode_val']; +$decode_val=base64_decode($encode_val); + + $saveimage=isset($_REQUEST['saveimage'])?$_REQUEST['saveimage']:"false"; + $errormessage=isset($_REQUEST['error_msg'])?$_REQUEST['error_msg']:"false"; + $image_error=isset($_REQUEST['image_error'])?$_REQUEST['image_error']:"false"; +//end + +$focus = new Contacts(); +$smarty = new vtigerCRM_Smarty; + +if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) +{ + $focus->id = $_REQUEST['record']; + $focus->mode = 'edit'; + $focus->retrieve_entity_info($_REQUEST['record'],"Contacts"); + $log->info("Entity info successfully retrieved for EditView."); + $focus->firstname=$focus->column_fields['firstname']; + $focus->lastname=$focus->column_fields['lastname']; } else { $focus->column_fields["otherorgs"][$current_organization]=1; -} - -if($image_error=="true") -{ - $explode_decode_val=explode("&",$decode_val); - for($i=1;$icolumn_fields[$field_name_val]=$field_value; - } -} - -if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']=='') -{ - require_once('modules/Accounts/Accounts.php'); - $focus->column_fields['account_id'] = $_REQUEST['account_id']; - $acct_focus = new Accounts(); - $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); - $focus->column_fields['fax']=$acct_focus->column_fields['fax']; - $focus->column_fields['otherphone']=$acct_focus->column_fields['phone']; - $focus->column_fields['mailingcity']=$acct_focus->column_fields['bill_city']; - $focus->column_fields['othercity']=$acct_focus->column_fields['ship_city']; - $focus->column_fields['mailingstreet']=$acct_focus->column_fields['bill_street']; - $focus->column_fields['otherstreet']=$acct_focus->column_fields['ship_street']; - $focus->column_fields['mailingstate']=$acct_focus->column_fields['bill_state']; - $focus->column_fields['otherstate']=$acct_focus->column_fields['ship_state']; - $focus->column_fields['mailingzip']=$acct_focus->column_fields['bill_code']; - $focus->column_fields['otherzip']=$acct_focus->column_fields['ship_code']; - $focus->column_fields['mailingcountry']=$acct_focus->column_fields['bill_country']; - $focus->column_fields['othercountry']=$acct_focus->column_fields['ship_country']; - $log->debug("Accountid Id from the request is ".$_REQUEST['account_id']); - -} -if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') -{ - $focus->id = ""; - $focus->mode = ""; -} - -$disp_view = getView($focus->mode); -if($disp_view == 'edit_view') - $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields)); -else -{ - $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS')); - $smarty->assign("ADVBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV')); -} - -$smarty->assign("OP_MODE",$disp_view); - -//needed when creating a new contact with a default vtiger_account value passed in -if (isset($_REQUEST['account_name']) && is_null($focus->account_name)) { - $focus->account_name = $_REQUEST['account_name']; - - -} -if (isset($_REQUEST['account_id']) && is_null($focus->account_id)) { - $focus->account_id = $_REQUEST['account_id']; -} - -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; -//retreiving the combo values array -$comboFieldNames = Array('leadsource'=>'lead_source_dom' - ,'salutationtype'=>'salutation_dom'); -$comboFieldArray = getComboArray($comboFieldNames); - -require_once($theme_path.'layout_utils.php'); - -$log->info("Contact detail view"); - -$smarty->assign("MOD", $mod_strings); -$smarty->assign("APP", $app_strings); -$smarty->assign("NAME",$focus->lastname." ".$focus->firstname); -if(isset($cust_fld)) -{ - $smarty->assign("CUSTOMFIELD", $cust_fld); -} -$smarty->assign("ID", $focus->id); -$smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",'Contact'); - -if($focus->mode == 'edit') -{ - $smarty->assign("UPDATEINFO",updateInfo($focus->id)); - $smarty->assign("MODE", $focus->mode); -} - -if(isset($_REQUEST['activity_mode']) && $_REQUEST['activity_mode'] !='') - $smarty->assign("ACTIVITYMODE",$_REQUEST['activity_mode']); - -// Unimplemented until jscalendar language vtiger_files are fixed -$smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']); -$smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT'])); - -if(isset($_REQUEST['campaignid'])) -$smarty->assign("campaignid",$_REQUEST['campaignid']); -if (isset($_REQUEST['return_module'])) -$smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); -if (isset($_REQUEST['return_action'])) -$smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); -if (isset($_REQUEST['return_id'])) -$smarty->assign("RETURN_ID", $_REQUEST['return_id']); -if (isset($_REQUEST['return_viewname'])) -$smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); -$smarty->assign("THEME", $theme); -$smarty->assign("IMAGE_PATH", $image_path); -$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); - - $tabid = getTabid("Contacts"); - $validationData = getDBValidationData($focus->tab_name,$tabid); - $data = split_validationdataArray($validationData); - - $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); - $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); - $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); -$category = getParentTab(); -$smarty->assign("CATEGORY",$category); - -if($errormessage==2) -{ - $msg =$mod_strings['LBL_MAXIMUM_LIMIT_ERROR']; - $errormessage ="".$msg."

"; -} -else if($errormessage==3) -{ - $msg = $mod_strings['LBL_UPLOAD_ERROR']; - $errormessage ="".$msg."

"; - -} -else if($errormessage=="image") -{ - $msg = $mod_strings['LBL_IMAGE_ERROR']; - $errormessage ="".$msg."

"; -} -else if($errormessage =="invalid") -{ - $msg = $mod_strings['LBL_INVALID_IMAGE']; - $errormessage ="".$msg."

"; -} -else -{ - $errormessage=""; -} -if($errormessage!="") -{ - $smarty->assign("ERROR_MESSAGE",$errormessage); -} - -$check_button = Button_Check($module); -$smarty->assign("CHECK", $check_button); - -// Assigned organizations -$smarty->assign("CURRENT_ORGANIZATION",$current_organization); -$org_array=array(); -$org=strtok( $user_organizations, "|"); -while( $org !== false) { - $org_array[$org] = 1; - $org=strtok( "|"); -} -$smarty->assign("USER_ORGANIZATIONS",$org_array); - -if($focus->mode == 'edit') -$smarty->display("salesEditView.tpl"); -else -$smarty->display('CreateView.tpl'); - - -?> +} + +if($image_error=="true") +{ + $explode_decode_val=explode("&",$decode_val); + for($i=1;$icolumn_fields[$field_name_val]=$field_value; + } +} + +if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']=='') +{ + require_once('modules/Accounts/Accounts.php'); + $focus->column_fields['account_id'] = $_REQUEST['account_id']; + $acct_focus = new Accounts(); + $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); + $focus->column_fields['fax']=$acct_focus->column_fields['fax']; + $focus->column_fields['otherphone']=$acct_focus->column_fields['phone']; + $focus->column_fields['mailingcity']=$acct_focus->column_fields['bill_city']; + $focus->column_fields['othercity']=$acct_focus->column_fields['ship_city']; + $focus->column_fields['mailingstreet']=$acct_focus->column_fields['bill_street']; + $focus->column_fields['otherstreet']=$acct_focus->column_fields['ship_street']; + $focus->column_fields['mailingstate']=$acct_focus->column_fields['bill_state']; + $focus->column_fields['otherstate']=$acct_focus->column_fields['ship_state']; + $focus->column_fields['mailingzip']=$acct_focus->column_fields['bill_code']; + $focus->column_fields['otherzip']=$acct_focus->column_fields['ship_code']; + $focus->column_fields['mailingcountry']=$acct_focus->column_fields['bill_country']; + $focus->column_fields['othercountry']=$acct_focus->column_fields['ship_country']; + $focus->column_fields['mailingpobox']=$acct_focus->column_fields['bill_pobox']; + $focus->column_fields['otherpobox']=$acct_focus->column_fields['ship_pobox']; + + $log->debug("Accountid Id from the request is ".$_REQUEST['account_id']); + +} +if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') +{ + $focus->id = ""; + $focus->mode = ""; +} + +$disp_view = getView($focus->mode); +if($disp_view == 'edit_view') + $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields)); +else +{ + $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS')); + $smarty->assign("ADVBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV')); +} +$smarty->assign("OP_MODE",$disp_view); + +//needed when creating a new contact with a default vtiger_account value passed in +if (isset($_REQUEST['account_name']) && is_null($focus->account_name)) { + $focus->account_name = $_REQUEST['account_name']; + + +} +if (isset($_REQUEST['account_id']) && is_null($focus->account_id)) { + $focus->account_id = $_REQUEST['account_id']; +} + +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +//retreiving the combo values array +$comboFieldNames = Array('leadsource'=>'lead_source_dom' + ,'salutationtype'=>'salutation_dom'); +$comboFieldArray = getComboArray($comboFieldNames); + +require_once($theme_path.'layout_utils.php'); + +$log->info("Contact detail view"); + +$smarty->assign("MOD", $mod_strings); +$smarty->assign("APP", $app_strings); +$smarty->assign("NAME",$focus->lastname." ".$focus->firstname); +if(isset($cust_fld)) +{ + $smarty->assign("CUSTOMFIELD", $cust_fld); +} +$smarty->assign("ID", $focus->id); +$smarty->assign("MODULE",$currentModule); +$smarty->assign("SINGLE_MOD",'Contact'); + +if($focus->mode == 'edit') +{ + $smarty->assign("UPDATEINFO",updateInfo($focus->id)); + $smarty->assign("MODE", $focus->mode); +} + +if(isset($_REQUEST['activity_mode']) && $_REQUEST['activity_mode'] !='') + $smarty->assign("ACTIVITYMODE",$_REQUEST['activity_mode']); + +// Unimplemented until jscalendar language vtiger_files are fixed +$smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']); +$smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT'])); + +if(isset($_REQUEST['campaignid'])) +$smarty->assign("campaignid",$_REQUEST['campaignid']); +if (isset($_REQUEST['return_module'])) +$smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); +if (isset($_REQUEST['return_action'])) +$smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); +if (isset($_REQUEST['return_id'])) +$smarty->assign("RETURN_ID", $_REQUEST['return_id']); +if (isset($_REQUEST['return_viewname'])) +$smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); +$smarty->assign("THEME", $theme); +$smarty->assign("IMAGE_PATH", $image_path); +$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); + + $tabid = getTabid("Contacts"); + $validationData = getDBValidationData($focus->tab_name,$tabid); + $data = split_validationdataArray($validationData); + + $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); + $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); + $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); +$category = getParentTab(); +$smarty->assign("CATEGORY",$category); + +if($errormessage==2) +{ + $msg =$mod_strings['LBL_MAXIMUM_LIMIT_ERROR']; + $errormessage ="".$msg."

"; +} +else if($errormessage==3) +{ + $msg = $mod_strings['LBL_UPLOAD_ERROR']; + $errormessage ="".$msg."

"; + +} +else if($errormessage=="image") +{ + $msg = $mod_strings['LBL_IMAGE_ERROR']; + $errormessage ="".$msg."

"; +} +else if($errormessage =="invalid") +{ + $msg = $mod_strings['LBL_INVALID_IMAGE']; + $errormessage ="".$msg."

"; +} +else +{ + $errormessage=""; +} +if($errormessage!="") +{ + $smarty->assign("ERROR_MESSAGE",$errormessage); +} + +$check_button = Button_Check($module); +$smarty->assign("CHECK", $check_button); +$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); + +// Assigned organizations +$smarty->assign("CURRENT_ORGANIZATION",$current_organization); +$org_array=array(); +$org=strtok( $user_organizations, "|"); +while( $org !== false) { + $org_array[$org] = 1; + $org=strtok( "|"); +} +$smarty->assign("USER_ORGANIZATIONS",$org_array); + +if($focus->mode == 'edit') +$smarty->display("salesEditView.tpl"); +else +$smarty->display('CreateView.tpl'); + + +?> Modified: vtigercrm/branches/5.1_jens/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/ListView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/ListView.php Mon Apr 16 12:27:44 2007 @@ -234,7 +234,6 @@ } if(isPermitted("Contacts","Merge") == 'yes') { - $smarty->assign("MERGEBUTTON",""); $wordTemplateResult = fetchWordTemplateList("Contacts"); $tempCount = $adb->num_rows($wordTemplateResult); $tempVal = $adb->fetch_array($wordTemplateResult); @@ -243,7 +242,21 @@ $optionString .=""; $tempVal = $adb->fetch_array($wordTemplateResult); } - $smarty->assign("WORDTEMPLATEOPTIONS",""); + if($tempCount > 0) + { + $smarty->assign("WORDTEMPLATEOPTIONS",""); + + $smarty->assign("MERGEBUTTON",""); + } + else + { + global $current_user; + require("user_privileges/user_privileges_".$current_user->id.".php"); + if($is_admin == true) + { + $smarty->assign("MERGEBUTTON",""); + } + } } //mass merge for word templates Modified: vtigercrm/branches/5.1_jens/modules/Contacts/Merge.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/Merge.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/Merge.php Mon Apr 16 12:27:44 2007 @@ -24,6 +24,7 @@ } else if(document.all) { + document.write("

Click here to return to the previous page"); document.write(""); } Modified: vtigercrm/branches/5.1_jens/modules/Contacts/Save.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/Save.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/Save.php Mon Apr 16 12:27:44 2007 @@ -25,29 +25,6 @@ require_once('include/database/PearDatabase.php'); require_once("modules/Emails/mail.php"); - -/** - * This function is used to get a random password. - * @return a random password with alpha numeric chanreters of length 8 - */ -function makeRandomPassword() -{ - global $log; - $log->debug("Entering makeRandomPassword() method ..."); - $salt = "abcdefghijklmnopqrstuvwxyz0123456789"; - srand((double)microtime()*1000000); - $i = 0; - while ($i <= 7) - { - $num = rand() % 33; - $tmp = substr($salt, $num, 1); - $pass = $pass . $tmp; - $i++; - } -$log->debug("Exiting makeRandomPassword method ..."); - return $pass; -} - $local_log =& LoggerManager::getLogger('index'); global $log,$adb; @@ -193,20 +170,18 @@ $adb->query($sql); } - $subject = "Customer Portal Login Details"; - $contents = "Dear ".$_REQUEST['firstname'].' '.$_REQUEST['lastname'].',

'; - $contents .= 'Your Customer Portal Login details are given below:'; - $contents .= "

User Id : ".$_REQUEST['email']; - $contents .= '
Password : '.$password; - $contents .= "

Please Login Here"; - - $contents .= '

Note : We suggest you to change your password after logging in first time.'; - $contents .= '

Support Team'; + //changes made to send mail to portal user when we use ajax edit + $data_array = Array(); + $data_array['first_name'] = $_REQUEST['firstname']; + $data_array['last_name'] = $_REQUEST['lastname']; + $data_array['email'] = $_REQUEST['email']; + $data_array['portal_url'] = "".$mod_strings['Please Login Here'].""; + $contents = getmail_contents_portalUser($data_array,$password); $log->info("Customer Portal Information Updated in database and details are going to send => '".$_REQUEST['email']."'"); if($insert == 'true' || $update == 'true') { - $mail_status = send_mail('Contacts',$_REQUEST['email'],$current_user->user_name,'',$subject,$contents); + $mail_status = send_mail('Contacts',$_REQUEST['email'],$current_user->user_name,'',$mod_strings['Customer Portal Login Details'],$contents); } $log->info("After return from the SendMailToCustomer function. Now control will go to the header."); } Modified: vtigercrm/branches/5.1_jens/modules/Contacts/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -1,237 +1,248 @@ -'General Information', -'LBL_MODULE_NAME'=>'Contacts', -'LBL_INVITEE'=>'Direct Reports', -'LBL_MODULE_TITLE'=>'Contacts: Home', -'LBL_SEARCH_FORM_TITLE'=>'Contact Search', -'LBL_LIST_FORM_TITLE'=>'Contact List', -'LBL_NEW_FORM_TITLE'=>'New Contact', -'LBL_CONTACT_OPP_FORM_TITLE'=>'Contact-Opportunity:', -'LBL_CONTACT'=>'Contact:', - -'LBL_LIST_NAME'=>'Name', -'LBL_LIST_LAST_NAME'=>'Last Name', -'LBL_LIST_FIRST_NAME'=>'First Name', -'LBL_LIST_CONTACT_NAME'=>'Contact Name', -'LBL_LIST_TITLE'=>'Title', -'LBL_LIST_ACCOUNT_NAME'=>'Account Name', -'LBL_LIST_EMAIL_ADDRESS'=>'Email', -'LBL_LIST_PHONE'=>'Phone', -'LBL_LIST_CONTACT_ROLE'=>'Role', - -//DON'T CONVERT THESE THEY ARE MAPPINGS -'db_last_name' => 'LBL_LIST_LAST_NAME', -'db_first_name' => 'LBL_LIST_FIRST_NAME', -'db_title' => 'LBL_LIST_TITLE', -'db_email1' => 'LBL_LIST_EMAIL_ADDRESS', -'db_email2' => 'LBL_LIST_EMAIL_ADDRESS', -//END DON'T CONVERT - -'LBL_EXISTING_CONTACT' => 'Used an existing contact', -'LBL_CREATED_CONTACT' => 'Created a new contact', -'LBL_EXISTING_ACCOUNT' => 'Used an existing vtiger_account', -'LBL_CREATED_ACCOUNT' => 'Created a new vtiger_account', -'LBL_CREATED_CALL' => 'Created a new call', -'LBL_CREATED_MEETING' => 'Created a new meeting', -'LBL_ADDMORE_BUSINESSCARD' =>'Add another business card', -'LBL_ADD_BUSINESSCARD' => 'Add Business Card', - -'LBL_BUSINESSCARD' => 'Business Card', - -'LBL_NAME'=>'Name:', -'LBL_CONTACT_NAME'=>'Contact Name:', -'LBL_CONTACT_INFORMATION'=>'Contact Information', -'LBL_CUSTOM_INFORMATION'=>'Custom Information', -'LBL_FIRST_NAME'=>'First Name:', -'LBL_OFFICE_PHONE'=>'Office Phone:', -'LBL_ACCOUNT_NAME'=>'Account Name:', -'LBL_ANY_PHONE'=>'Any Phone:', -'LBL_PHONE'=>'Phone:', -'LBL_LAST_NAME'=>'Last Name:', -'LBL_MOBILE_PHONE'=>'Mobile:', -'LBL_HOME_PHONE'=>'Home:', -'LBL_LEAD_SOURCE'=>'Lead Source:', -'LBL_OTHER_PHONE'=>'Other Phone:', -'LBL_FAX_PHONE'=>'Fax:', -'LBL_TITLE'=>'Title:', -'LBL_DEPARTMENT'=>'Department:', -'LBL_BIRTHDATE'=>'Birthdate:', -'LBL_EMAIL_ADDRESS'=>'Email:', -'LBL_OTHER_EMAIL_ADDRESS'=>'Other Email:', -'LBL_ANY_EMAIL'=>'Any Email:', -'LBL_REPORTS_TO'=>'Reports To:', -'LBL_ASSISTANT'=>'Assistant:', -'LBL_YAHOO_ID'=>'Yahoo! ID:', -'LBL_ASSISTANT_PHONE'=>'Assistant Phone:', -'LBL_DO_NOT_CALL'=>'Do Not Call:', -'LBL_EMAIL_OPT_OUT'=>'Email Opt Out:', -'LBL_PRIMARY_ADDRESS'=>'Primary Address:', -'LBL_ALTERNATE_ADDRESS'=>'Other Address:', -'LBL_ANY_ADDRESS'=>'Any Address:', -'LBL_CITY'=>'City:', -'LBL_STATE'=>'State:', -'LBL_POSTAL_CODE'=>'Postal Code:', -'LBL_COUNTRY'=>'Country:', -'LBL_DESCRIPTION_INFORMATION'=>'Description Information', -'LBL_IMAGE_INFORMATION'=>'Contact Image Information:', -'LBL_ADDRESS_INFORMATION'=>'Address Information', -'LBL_DESCRIPTION'=>'Description:', -'LBL_CONTACT_ROLE'=>'Role:', -'LBL_OPP_NAME'=>'Opportunity Name:', -'LBL_DUPLICATE'=>'Potential Duplicate Contacts', -'MSG_DUPLICATE' => 'Creating this contact may vtiger_potentialy create a duplicate contact. You may either select a contact from the list below or you may click on Create New Contact to continue creating a new contact with the previously entered data.', - -'LNK_NEW_APPOINTMENT' => 'New Appointment', -'LBL_ADD_BUSINESSCARD' => 'Add Business Card', -'NTC_DELETE_CONFIRMATION'=>'Are you sure you want to delete this record?', -'NTC_REMOVE_CONFIRMATION'=>'Are you sure you want to remove this contact from this case?', -'NTC_REMOVE_DIRECT_REPORT_CONFIRMATION'=>'Are you sure you want to remove this record as a direct vtiger_report?', -'ERR_DELETE_RECORD'=>"en_us A record number must be specified to delete the contact.", -'NTC_COPY_PRIMARY_ADDRESS'=>'Copy primary address to alternate address', -'NTC_COPY_ALTERNATE_ADDRESS'=>'Copy alternate address to primary address', - -'LBL_SELECT_CONTACT'=>'Select Contact', -//Added for search heading -'LBL_GENERAL_INFORMATION'=>'General Information', - - - -//for v4 release added -'LBL_NEW_POTENTIAL'=>'New Potential', -'LBL_POTENTIAL_TITLE'=>'Potentials', - -'LBL_NEW_TASK'=>'New Task', -'LBL_TASK_TITLE'=>'Tasks', -'LBL_NEW_CALL'=>'New Call', -'LBL_CALL_TITLE'=>'Calls', -'LBL_NEW_MEETING'=>'New Meeting', -'LBL_MEETING_TITLE'=>'Meetings', -'LBL_NEW_EMAIL'=>'New Email', -'LBL_EMAIL_TITLE'=>'Emails', -'LBL_NEW_NOTE'=>'New Note', -'LBL_NOTE_TITLE'=>'Notes', - -// Added for 4GA -'LBL_TOOL_FORM_TITLE'=>'Contact Tools', - -'Salutation'=>'Salutation', -'First Name'=>'First Name', -'Office Phone'=>'Office Phone', -'Last Name'=>'Last Name', -'Mobile'=>'Mobile', -'Account Name'=>'Account Name', -'Home Phone'=>'Home Phone', -'Lead Source'=>'Lead Source', -'Phone'=>'Phone', -'Title'=>'Title', -'Fax'=>'Fax', -'Department'=>'Department', -'Birthdate'=>'Birthdate', -'Email'=>'Email', -'Reports To'=>'Reports To', -'Assistant'=>'Assistant', -'Yahoo Id'=>'Yahoo Id', -'Assistant Phone'=>'Assistant Phone', -'Do Not Call'=>'Do Not Call', -'Email Opt Out'=>'Email Opt Out', -'Assigned To'=>'Assigned To', -'Campaign Source'=>'Campaign Source', -'Reference' =>'Reference', -'Created Time'=>'Created Time', -'Modified Time'=>'Modified Time', -'Mailing Street'=>'Mailing Street', -'Other Street'=>'Other Street', -'Mailing City'=>'Mailing City', -'Mailing State'=>'Mailing State', -'Mailing Zip'=>'Mailing Postal Code', -'Mailing Country'=>'Mailing Country', -'Mailing Po Box'=>'Mailing PO Box', -'Other Po Box'=>'Other PO Box', -'Other City'=>'Other City', -'Other State'=>'Other State', -'Other Zip'=>'Other Postal Code', -'Other Country'=>'Other Country', -'Contact Image'=>'Contact Image', -'Description'=>'Description', - -// Added vtiger_fields for Add Business Card -'LBL_NEW_CONTACT'=>'New Contact', -'LBL_NEW_ACCOUNT'=>'New Account', -'LBL_NOTE_SUBJECT'=>'Note Subject:', -'LBL_NOTE'=>'Note:', -'LBL_WEBSITE'=>'Website:', -'LBL_NEW_APPOINTMENT'=>'New Appointment', -'LBL_SUBJECT'=>'Subject:', -'LBL_START_DATE'=>'Start Date:', -'LBL_START_TIME'=>'Start Time:', - -//Added vtiger_field after 4_0_1 -'Portal User'=>'Portal User', -'LBL_CUSTOMER_PORTAL_INFORMATION'=>'Customer Portal Information', -'Support Start Date'=>'Support Start Date', -'Support End Date'=>'Support End Date', -//Added for 4.2 Release -- CustomView -'Name'=>'Name', -'LBL_ALL'=>'All', -'LBL_MAXIMUM_LIMIT_ERROR'=>'Sorry, the uploaded file exceeds the maximum vtiger_filesize limit. Please try a file smaller than 800000 bytes', -'LBL_UPLOAD_ERROR'=>'Problems in file upload. Please try again!', -'LBL_IMAGE_ERROR'=>'The given file is not of type image(.gif/.jpg/.png)', -'LBL_INVALID_IMAGE'=>'Invalid file OR File has no data', - -//Added after 5Alpha5 -'Notify Owner'=>'Notify Owner', - -//Added for Picklist Values -'--None--'=>'--None--', - -'Mr.'=>'Mr.', -'Ms.'=>'Ms.', -'Mrs.'=>'Mrs.', -'Dr.'=>'Dr.', -'Prof.'=>'Prof.', - -'Cold Call'=>'Cold Call', -'Existing Customer'=>'Existing Customer', -'Self Generated'=>'Self Generated', -'Employee'=>'Employee', -'Partner'=>'Partner', -'Public Relations'=>'Public Relations', -'Direct Mail'=>'Direct Mail', -'Conference'=>'Conference', -'Trade Show'=>'Trade Show', -'Web Site'=>'Web Site', -'Word of mouth'=>'Word of mouth', -'Other'=>'Other', -'User List'=>'User List', - -// Added for multi organization support TRAC #2035 -'LBL_COMPANY_ASSIGNMENT'=>'Organization Assignment', -'Organization Assignment'=>'Assigned to', - - -); - -?> +'Contacts', +'LBL_INVITEE'=>'Direct Reports', +'LBL_MODULE_TITLE'=>'Contacts: Home', +'LBL_SEARCH_FORM_TITLE'=>'Contact Search', +'LBL_LIST_FORM_TITLE'=>'Contact List', +'LBL_NEW_FORM_TITLE'=>'New Contact', +'LBL_CONTACT_OPP_FORM_TITLE'=>'Contact-Opportunity:', +'LBL_CONTACT'=>'Contact:', + +'LBL_LIST_NAME'=>'Name', +'LBL_LIST_LAST_NAME'=>'Last Name', +'LBL_LIST_FIRST_NAME'=>'First Name', +'LBL_LIST_CONTACT_NAME'=>'Contact Name', +'LBL_LIST_TITLE'=>'Title', +'LBL_LIST_ACCOUNT_NAME'=>'Account Name', +'LBL_LIST_EMAIL_ADDRESS'=>'Email', +'LBL_LIST_PHONE'=>'Phone', +'LBL_LIST_CONTACT_ROLE'=>'Role', + +//DON'T CONVERT THESE THEY ARE MAPPINGS +'db_last_name' => 'LBL_LIST_LAST_NAME', +'db_first_name' => 'LBL_LIST_FIRST_NAME', +'db_title' => 'LBL_LIST_TITLE', +'db_email1' => 'LBL_LIST_EMAIL_ADDRESS', +'db_email2' => 'LBL_LIST_EMAIL_ADDRESS', +//END DON'T CONVERT + +'LBL_EXISTING_CONTACT' => 'Used an existing contact', +'LBL_CREATED_CONTACT' => 'Created a new contact', +'LBL_EXISTING_ACCOUNT' => 'Used an existing vtiger_account', +'LBL_CREATED_ACCOUNT' => 'Created a new vtiger_account', +'LBL_CREATED_CALL' => 'Created a new call', +'LBL_CREATED_MEETING' => 'Created a new meeting', +'LBL_ADDMORE_BUSINESSCARD' =>'Add another business card', + +'LBL_BUSINESSCARD' => 'Business Card', + +'LBL_NAME'=>'Name:', +'LBL_CONTACT_NAME'=>'Contact Name:', +'LBL_CONTACT_INFORMATION'=>'Contact Information', +'LBL_CUSTOM_INFORMATION'=>'Custom Information', +'LBL_FIRST_NAME'=>'First Name:', +'LBL_OFFICE_PHONE'=>'Office Phone:', +'LBL_ACCOUNT_NAME'=>'Account Name:', +'LBL_ANY_PHONE'=>'Any Phone:', +'LBL_PHONE'=>'Phone:', +'LBL_LAST_NAME'=>'Last Name:', +'LBL_MOBILE_PHONE'=>'Mobile:', +'LBL_HOME_PHONE'=>'Home:', +'LBL_LEAD_SOURCE'=>'Lead Source:', +'LBL_OTHER_PHONE'=>'Other Phone:', +'LBL_FAX_PHONE'=>'Fax:', +'LBL_TITLE'=>'Title:', +'LBL_DEPARTMENT'=>'Department:', +'LBL_BIRTHDATE'=>'Birthdate:', +'LBL_EMAIL_ADDRESS'=>'Email:', +'LBL_OTHER_EMAIL_ADDRESS'=>'Other Email:', +'LBL_ANY_EMAIL'=>'Any Email:', +'LBL_REPORTS_TO'=>'Reports To:', +'LBL_ASSISTANT'=>'Assistant:', +'LBL_YAHOO_ID'=>'Yahoo! ID:', +'LBL_ASSISTANT_PHONE'=>'Assistant Phone:', +'LBL_DO_NOT_CALL'=>'Do Not Call:', +'LBL_EMAIL_OPT_OUT'=>'Email Opt Out:', +'LBL_PRIMARY_ADDRESS'=>'Primary Address:', +'LBL_ALTERNATE_ADDRESS'=>'Other Address:', +'LBL_ANY_ADDRESS'=>'Any Address:', +'LBL_CITY'=>'City:', +'LBL_STATE'=>'State:', +'LBL_POSTAL_CODE'=>'Postal Code:', +'LBL_COUNTRY'=>'Country:', +'LBL_DESCRIPTION_INFORMATION'=>'Description Information', +'LBL_IMAGE_INFORMATION'=>'Contact Image Information:', +'LBL_ADDRESS_INFORMATION'=>'Address Information', +'LBL_DESCRIPTION'=>'Description:', +'LBL_CONTACT_ROLE'=>'Role:', +'LBL_OPP_NAME'=>'Opportunity Name:', +'LBL_DUPLICATE'=>'Potential Duplicate Contacts', +'MSG_DUPLICATE' => 'Creating this contact may vtiger_potentialy create a duplicate contact. You may either select a contact from the list below or you may click on Create New Contact to continue creating a new contact with the previously entered data.', + +'LNK_NEW_APPOINTMENT' => 'New Appointment', +'LBL_ADD_BUSINESSCARD' => 'Add Business Card', +'NTC_DELETE_CONFIRMATION'=>'Are you sure you want to delete this record?', +'NTC_REMOVE_CONFIRMATION'=>'Are you sure you want to remove this contact from this case?', +'NTC_REMOVE_DIRECT_REPORT_CONFIRMATION'=>'Are you sure you want to remove this record as a direct vtiger_report?', +'ERR_DELETE_RECORD'=>"en_us A record number must be specified to delete the contact.", +'NTC_COPY_PRIMARY_ADDRESS'=>'Copy primary address to alternate address', +'NTC_COPY_ALTERNATE_ADDRESS'=>'Copy alternate address to primary address', + +'LBL_SELECT_CONTACT'=>'Select Contact', +//Added for search heading +'LBL_GENERAL_INFORMATION'=>'General Information', + + + +//for v4 release added +'LBL_NEW_POTENTIAL'=>'New Potential', +'LBL_POTENTIAL_TITLE'=>'Potentials', + +'LBL_NEW_TASK'=>'New Task', +'LBL_TASK_TITLE'=>'Tasks', +'LBL_NEW_CALL'=>'New Call', +'LBL_CALL_TITLE'=>'Calls', +'LBL_NEW_MEETING'=>'New Meeting', +'LBL_MEETING_TITLE'=>'Meetings', +'LBL_NEW_EMAIL'=>'New Email', +'LBL_EMAIL_TITLE'=>'Emails', +'LBL_NEW_NOTE'=>'New Note', +'LBL_NOTE_TITLE'=>'Notes', + +// Added for 4GA +'LBL_TOOL_FORM_TITLE'=>'Contact Tools', + +'Salutation'=>'Salutation', +'First Name'=>'First Name', +'Office Phone'=>'Office Phone', +'Last Name'=>'Last Name', +'Mobile'=>'Mobile', +'Account Name'=>'Account Name', +'Home Phone'=>'Home Phone', +'Lead Source'=>'Lead Source', +'Phone'=>'Phone', +'Title'=>'Title', +'Fax'=>'Fax', +'Department'=>'Department', +'Birthdate'=>'Birthdate', +'Email'=>'Email', +'Reports To'=>'Reports To', +'Assistant'=>'Assistant', +'Yahoo Id'=>'Yahoo Id', +'Assistant Phone'=>'Assistant Phone', +'Do Not Call'=>'Do Not Call', +'Email Opt Out'=>'Email Opt Out', +'Assigned To'=>'Assigned To', +'Campaign Source'=>'Campaign Source', +'Reference' =>'Reference', +'Created Time'=>'Created Time', +'Modified Time'=>'Modified Time', +'Mailing Street'=>'Mailing Street', +'Other Street'=>'Other Street', +'Mailing City'=>'Mailing City', +'Mailing State'=>'Mailing State', +'Mailing Zip'=>'Mailing Postal Code', +'Mailing Country'=>'Mailing Country', +'Mailing Po Box'=>'Mailing PO Box', +'Other Po Box'=>'Other PO Box', +'Other City'=>'Other City', +'Other State'=>'Other State', +'Other Zip'=>'Other Postal Code', +'Other Country'=>'Other Country', +'Contact Image'=>'Contact Image', +'Description'=>'Description', + +// Added vtiger_fields for Add Business Card +'LBL_NEW_CONTACT'=>'New Contact', +'LBL_NEW_ACCOUNT'=>'New Account', +'LBL_NOTE_SUBJECT'=>'Note Subject:', +'LBL_NOTE'=>'Note:', +'LBL_WEBSITE'=>'Website:', +'LBL_NEW_APPOINTMENT'=>'New Appointment', +'LBL_SUBJECT'=>'Subject:', +'LBL_START_DATE'=>'Start Date:', +'LBL_START_TIME'=>'Start Time:', + +//Added vtiger_field after 4_0_1 +'Portal User'=>'Portal User', +'LBL_CUSTOMER_PORTAL_INFORMATION'=>'Customer Portal Information', +'Support Start Date'=>'Support Start Date', +'Support End Date'=>'Support End Date', +//Added for 4.2 Release -- CustomView +'Name'=>'Name', +'LBL_ALL'=>'All', +'LBL_MAXIMUM_LIMIT_ERROR'=>'Sorry, the uploaded file exceeds the maximum vtiger_filesize limit. Please try a file smaller than 800000 bytes', +'LBL_UPLOAD_ERROR'=>'Problems in file upload. Please try again!', +'LBL_IMAGE_ERROR'=>'The given file is not of type image(.gif/.jpg/.png)', +'LBL_INVALID_IMAGE'=>'Invalid file OR File has no data', + +//Added after 5Alpha5 +'Notify Owner'=>'Notify Owner', + +//Added for Picklist Values +'--None--'=>'--None--', + +'Mr.'=>'Mr.', +'Ms.'=>'Ms.', +'Mrs.'=>'Mrs.', +'Dr.'=>'Dr.', +'Prof.'=>'Prof.', + +'Cold Call'=>'Cold Call', +'Existing Customer'=>'Existing Customer', +'Self Generated'=>'Self Generated', +'Employee'=>'Employee', +'Partner'=>'Partner', +'Public Relations'=>'Public Relations', +'Direct Mail'=>'Direct Mail', +'Conference'=>'Conference', +'Trade Show'=>'Trade Show', +'Web Site'=>'Web Site', +'Word of mouth'=>'Word of mouth', +'Other'=>'Other', +'User List'=>'User List', + +// Added for multi organization support TRAC #2035 +'LBL_COMPANY_ASSIGNMENT'=>'Organization Assignment', +'Organization Assignment'=>'Assigned to', + + +//Added for 5.0.3 +'Customer Portal Login Details'=>'Customer Portal Login Details', +'Dear'=>'Dear', +'Your Customer Portal Login details are given below:'=>'Your Customer Portal Login details are given below:', +'User Id :'=>'User Id :', +'Password :'=>'Password :', +'Please Login Here'=>'Please Login Here', +'Note :'=>'Note :', +'We suggest you to change your password after logging in first time'=>'We suggest you to change your password after logging in first time.', +'Support Team'=>'Support Team', + + +'TITLE_AJAX_CSS_POPUP_CHAT'=>'Ajax Css-Popup chat', +); + +?> Modified: vtigercrm/branches/5.1_jens/modules/Contacts/updateRelations.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/updateRelations.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/updateRelations.php Mon Apr 16 12:27:44 2007 @@ -8,13 +8,16 @@ * All Rights Reserved. * ********************************************************************************/ - require_once('include/database/PearDatabase.php'); require_once('user_privileges/default_module_view.php'); global $adb, $singlepane_view; $idlist = $_REQUEST['idlist']; -$update_mod = $_REQUEST['destination_module']; -$rel_table = 'vtiger_campaigncontrel'; +$dest_mod = $_REQUEST['destination_module']; +$record = $_REQUEST['record']; + +if($singlepane_view == 'true') $action = "DetailView"; +else $action = "CallRelatedList"; + if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '') { //split the string and store in an array @@ -23,23 +26,28 @@ { if($id != '') { - $sql = "insert into ".$rel_table." values(".$id.",".$_REQUEST["parentid"].")"; - $adb->query($sql); + if($dest_mod == 'Products') + $adb->query("insert into vtiger_seproductsrel values (".$_REQUEST["parentid"].",".$id.",'Contacts')"); + elseif($dest_mod == 'Campaigns') + $adb->query("insert into vtiger_campaigncontrel values(".$id.",".$_REQUEST["parentid"].")"); } } - if($singlepane_view == 'true') - header("Location: index.php?action=DetailView&module=Contacts&record=".$_REQUEST["parentid"]); - else - header("Location: index.php?action=CallRelatedList&module=Contacts&record=".$_REQUEST["parentid"]); + $record = $_REQUEST["parentid"]; } elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '') +{ + if($dest_mod == 'Products') + $adb->query("insert into vtiger_seproductsrel values (".$_REQUEST["parid"].",".$_REQUEST["entityid"].",'Contacts')"); + elseif($dest_mod == 'Campaigns') + $adb->query("insert into vtiger_campaigncontrel values(".$_REQUEST["entityid"].",".$_REQUEST["parid"].")"); + $record = $_REQUEST["parid"]; +} +elseif(isset($_REQUEST['pot_id']) && $_REQUEST['pot_id'] != '') { - $sql = "insert into ".$rel_table." values(".$_REQUEST["entityid"].",".$_REQUEST["parid"].")"; - $adb->query($sql); - if($singlepane_view == 'true') - header("Location: index.php?action=DetailView&module=Contacts&record=".$_REQUEST["parid"]); - else - header("Location: index.php?action=CallRelatedList&module=Contacts&record=".$_REQUEST["parid"]); + $sql = "insert into vtiger_contpotentialrel values(".$record.",".$_REQUEST["pot_id"].")"; + $adb->query($sql); } +header("Location: index.php?action=$action&module=Contacts&record=".$record); + ?> Modified: vtigercrm/branches/5.1_jens/modules/Contacts/vtchat.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/vtchat.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/vtchat.php Mon Apr 16 12:27:44 2007 @@ -1,107 +1,110 @@ - - - - - - - - - - -Ajax Css-Popup chat - - - - - - - - - - - - - - - - - - - - - - - - -
+ '; + echo $html_string; +?> Modified: vtigercrm/branches/5.1_jens/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Calendar/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -25,7 +25,6 @@ 'LBL_MODULE_TITLE'=>'Calendar: Home', 'LBL_MODULE_APPOINTMENT'=>'Calendar: Appointment', 'LBL_MODULE_APPOINTMENT_DETAIL'=>'Calendar: Appointment Detail', -'LBL_CONTACT'=>'Contact:', 'LBL_SAVE'=>'Save', 'LBL_RESET'=>'Cancel', 'LBL_LIST_USER_NAME'=>'User Name', @@ -39,8 +38,7 @@ 'LBL_USE24'=>'Use 24 hours format', 'LBL_CALSTART'=>'Start my calendar time at', 'LBL_TIMESETTINGS'=>'Time Settings', -'LBL_OPENCAL'=>'Open Calendar', - +'LBL_HOLDFOLLOWUP'=>'Hold followup on', 'LBL_CALL' => 'Call', 'LBL_MEET' => 'Meeting', 'LBL_APPNT' => 'Appointment', @@ -82,10 +80,6 @@ 'LBL_APPCREATED_BY' => 'Created by', -'LBL_APP_START_DATE' => 'Start Date', -'LBL_APP_START_TIME' => 'Start Time', -'LBL_APP_END_DATE' => 'End Date', -'LBL_APP_END_TIME' => 'End Time', 'LBL_AT_DATE_TIME' => 'at', 'LBL_MON' => 'Month', @@ -94,7 +88,6 @@ 'LBL_PREV_MON' => 'Previous Month', 'LBL_NEXT_MON' => 'Next Month', -'LBL_YEAR'=>'Year', 'LBL_YEAR_BUTTON_KEY'=>'Y', 'LBL_MON_BUTTON_TITLE'=>'Year [Alt+Y]', 'LBL_PREV_YEAR'=>'Previous Year', @@ -173,53 +166,53 @@ "Dec", ), +'LBL_TIME'=>'Time', +'LBL_START_TIME' => 'Start Time', +'LBL_END_TIME' => 'End Time', +'LBL_START_DATE'=>'Start Date', +'LBL_DUE_DATE'=>'Due Date', +'LBL_START_DATE_TIME'=>'Start Date & Time', +'LBL_END_DATE_TIME'=>'End Date & Time', +'LBL_TODO'=>'To Do', +'LBL_TODOS'=>'To Dos', 'LBL_EVENTS'=>'Events', -'LBL_TODOS'=>'To Dos', -'LBL_TIME'=>'Time', +'LBL_TOTALEVENTS'=>'My Total Events :', +'LBL_TOTALTODOS'=>'My Total To Dos :', +'LBL_VIEW'=>'View', +'LBL_LISTVIEW'=>'List View', +'LBL_HRVIEW'=>'Hour View', +'LBL_WEEKVIEW'=>'Weekly Calendar View', +'LBL_MONTHVIEW'=>'Monthly Calendar View', +'LBL_YEARVIEW'=>'Yearly Calendar View', +'LBL_STATUS'=>'Status', +'LBL_ACTION'=>'Actions', +'LBL_ADD'=>'Add', +'LBL_OPENCAL'=>'Open Calendar', + + 'LBL_ADD_EVENT'=>'Add Event', -'LBL_ADD'=>'Add', 'LBL_ADDCALL'=>'Call', 'LBL_ADDMEETING'=>'Meeting', 'LBL_ADDTODO'=>'To Do', -'LBL_INVITE'=>'Invite', -'LBL_REMINDER'=>'Reminder', -'LBL_SENDREMINDER'=>'Send Reminder', 'LBL_BEFOREEVENT'=>'before the event starts', 'LBL_BEFORETASK'=>'before the task starts', -'LBL_REPEAT'=>'Repeat', -'LBL_EVENTTYPE'=>'Event Type', -'LBL_EVENTNAME'=>'Event Name', -'LBL_EVENTSTAT'=>'Event starts at', -'LBL_EVENTEDAT'=>'Event ends on', -'LBL_HRVIEW'=>'Hour View', -'LBL_LISTVIEW'=>'List View', -'LBL_WEEKVIEW'=>'Weekly Calendar View', -'LBL_MONTHVIEW'=>'Monthly Calendar View', -'LBL_YEARVIEW'=>'Yearly Calendar View', -'LBL_TOTALEVENTS'=>'Total Events :', -'LBL_TOTALTODOS'=>'Total To Dos :', -'LBL_EVTDTL'=>'Event Details', -'LBL_ACTION'=>'Actions', +'LBL_EVENTDETAILS'=>'Event Details', 'LBL_CURSTATUS'=>'Current Status', 'LBL_ASSINGEDTO'=>'Assigned To', 'LBL_RELATEDTO'=>'Related To', -'LBL_STATUS'=>'Status', 'LBL_PENDING'=>'Pending', 'LBL_PUBLIC'=>'Mark Public', 'LBL_MORE'=>'More', -'LBL_VIEW'=>'View', 'LBL_EDIT'=>'Edit', 'LBL_EVERYDAY'=>'Every Day', 'LBL_EVERYWEEK'=>'Every Week', 'LBL_EVERYMON'=>'Every Month', -'LBL_REPEATEVENT'=>'Repeat once in every', -'LBL_DAYS'=>'Day(s)', 'LBL_WEEKS'=>'Week(s)', 'LBL_MONTHS'=>'Month(s)', 'LBL_YEAR'=>'Year', 'LBL_NONE_SCHEDULED'=>'None Scheduled', -'LBL_INVITE_INST1'=>'To invite, select the users from the "Available Users" list and click the "Add" button.', +'LBL_INVITE_INST1'=>'To share, select the users from the "Available Users" list and click the "Add" button.', 'LBL_INVITE_INST2'=>'To remove, select the users in the "Selected Users" list and the click "Remove" button.', 'LBL_SELUSR_INFO'=>' Selected users will receive an email about the Event.', 'LBL_CALSHAREMESSAGE'=>'Share my calendar with the following selected users', @@ -229,7 +222,6 @@ 'LBL_ADD_BUTTON'=>'Add', 'LBL_USERS'=>'Users', 'LBL_RMV_BUTTON'=>'Remove', -'LBL_RMD_ON'=>'Remind on', 'LBL_SDRMD'=>'Send Reminder to', 'LBL_ENABLE_REPEAT'=>'Enable Repeat', 'LBL_REPEAT_ONCE'=>'Repeat once in every', @@ -241,12 +233,13 @@ -//DON'T CONVERT THESE THEY ARE MAPPINGS +//DON'T CONVERT THESE THEY ARE MAPPINGS - STARTS 'db_last_name' => 'LBL_LIST_LAST_NAME', 'db_first_name' => 'LBL_LIST_FIRST_NAME', 'db_title' => 'LBL_LIST_TITLE', 'db_email1' => 'LBL_LIST_EMAIL_ADDRESS', 'db_email2' => 'LBL_LIST_EMAIL_ADDRESS', +//DON'T CONVERT THESE THEY ARE MAPPINGS -ENDS 'LBL_COMPLETED'=>'Mark Completed', 'LBL_DEFERRED'=>'Mark Deferred', 'LBL_HELD'=>'Mark Held', @@ -254,7 +247,6 @@ 'LBL_POSTPONE'=>'Postpone', 'LBL_CHANGEOWNER'=>'Change Owner', 'LBL_DEL'=>'Delete', -//END DON'T CONVERT //Added for actvity merge with calendar 'LBL_SEARCH_FORM_TITLE'=>'Activity Search', @@ -262,8 +254,13 @@ 'LBL_NEW_FORM_TITLE'=>'New Activity', 'LBL_TASK_INFORMATION'=>'Task Information', 'LBL_EVENT_INFORMATION'=>'Event Information', +'LBL_CALENDAR_INFORMATION'=>'Calendar Information', 'LBL_NAME'=>'Subject:', +'LBL_ACTIVITY_NOTIFICATION'=>'This is a notification that an activity is assigned to you that has been', +'LBL_ACTIVITY_INVITATION'=>'You have been invited for an activity that has been ', +'LBL_DETAILS_STRING'=>'The details are', +'LBL_REGARDS_STRING'=>'Thanks & Regards', 'LBL_CONTACT_NAME'=>'Contact Name', 'LBL_OPEN_ACTIVITIES'=>'Open Activities', 'LBL_ACTIVITY'=>'Activity:', @@ -362,14 +359,14 @@ 'LBL_INVITE'=>'Invite', 'LBL_REPEAT'=>'Repeat', 'LBL_REMINDER'=>'Reminder', -'LBL_ENABLE_REPEAT'=>'Enable Repeat', 'LBL_SENDREMINDER'=>'Send Reminder', 'LBL_NOTIFICATION'=>'Notification', 'LBL_SENDNOTIFICATION'=>'Send Notification', 'LBL_RMD_ON'=>'Remind on', 'LBL_REPEATEVENT'=>'Repeat once in every', 'LBL_TIMEDATE'=>'Time & Date', -'LBL_TODO'=>'To Do', +'LBL_HR'=>'Hr', +'LBL_MIN'=>'min', 'LBL_EVENT'=>'Event', 'Daily'=>'Day(s)', 'Weekly'=>'Week(s)', @@ -389,6 +386,8 @@ 'Last'=>'Last', 'on'=>'on', 'day of the month'=>'day of the month', +'Private'=>'Private', +'Public'=>'Public', //Added for existing Picklist entries @@ -405,6 +404,17 @@ 'Call'=>'Call', 'Meeting'=>'Meeting', +//added to send dates and time in calendar notification/invitation mail. + +'Start date and time'=>'Start Date & Time', +'End date and time'=>'End Date & Time', +//this is for task +'End date'=>'End date', +'LBL_SET_DATE'=>'Set date..', +'Recurrence'=>'Recurrence', +'SHARED_EVENT_DEL_MSG'=>'The User does not have permission to Delete this record.', + + ); ?> Modified: vtigercrm/branches/5.1_jens/modules/Calendar/script.js ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Calendar/script.js (original) +++ vtigercrm/branches/5.1_jens/modules/Calendar/script.js Mon Apr 16 12:27:44 2007 @@ -23,7 +23,7 @@ } else { - alert("Please select at least one user"); + alert(alert_arr.SELECT_ATLEAST_ONE_USER); return false; } } @@ -43,11 +43,11 @@ } else { - alert("Please select at least one user"); + alert(alert_arr.SELECT_ATLEAST_ONE_USER); return false; } } - if(confirm("Are you sure you want to disable sharing for selected "+xx+" user(s) ?")) + if(confirm(alert_arr.DISABLE_SHARING_CONFIRMATION+xx+alert_arr.USERS)) { document.SharedList.action="index.php?module=Calendar&action=disable_sharing&return_module=Calendar&return_action=calendar_share"; } @@ -92,6 +92,8 @@ function gshow(argg1,type,startdate,enddate,starthr,startmin,startfmt,endhr,endmin,endfmt,viewOption,subtab) { + smin = parseInt(startmin,10); + smin = smin - (smin%5); var y=document.getElementById(argg1).style; if(type == 'call' || type == 'meeting') @@ -100,24 +102,22 @@ document.EditView.activitytype[0].checked = true; if(type == 'meeting') document.EditView.activitytype[1].checked = true; - + smin = _2digit(smin); document.EditView.date_start.value = startdate; - document.EditView.due_date.value = enddate; document.EditView.starthr.value = starthr; - document.EditView.startmin.value = startmin; + document.EditView.startmin.value = smin; document.EditView.startfmt.value = startfmt; - document.EditView.endhr.value = endhr; - document.EditView.endmin.value = endmin; - document.EditView.endfmt.value = endfmt; document.EditView.viewOption.value = viewOption; document.EditView.subtab.value = subtab; + calDuedatetime(type); } if(type == 'todo') { + smin = _2digit(smin); document.createTodo.task_date_start.value = startdate; document.createTodo.task_due_date.value = enddate; document.createTodo.starthr.value = starthr; - document.createTodo.startmin.value = startmin; + document.createTodo.startmin.value = smin; document.createTodo.startfmt.value = startfmt; document.createTodo.viewOption.value = viewOption; document.createTodo.subtab.value = subtab; @@ -190,57 +190,58 @@ } function maincheck_form() { - formSelectColumnString('inviteesid'); - starthour = document.EditView.starthr.value; - startmin = document.EditView.startmin.value; + formSelectColumnString('inviteesid','selectedusers'); + starthour = parseInt(document.EditView.starthr.value,10); + startmin = parseInt(document.EditView.startmin.value,10); startformat = document.EditView.startfmt.value; - endhour = document.EditView.endhr.value; - endmin = document.EditView.endmin.value; - endformat = document.EditView.endfmt.value; + endhour = parseInt(document.EditView.endhr.value,10); + endmin = parseInt(document.EditView.endmin.value,10); + endformat = document.EditView.endfmt.value; + followupformat = document.EditView.followup_startfmt.value; + followuphour = parseInt(document.EditView.followup_starthr.value,10); + followupmin = parseInt(document.EditView.followup_startmin.value,10); if(formValidate()) { if(startformat != '') { if(startformat == 'pm') { - if(starthour == '12') + if(starthour == 12) starthour = 12; else - starthour = eval(starthour) + 12; - startmin = startmin; + starthour = starthour + 12; } else { - if(starthour == '12') + if(starthour == 12) starthour = 0; else starthour = starthour; - startmin = startmin; } } if(endformat != '') { if(endformat == 'pm') { - if(endhour == '12') + if(endhour == 12) endhour = 12; else - endhour = eval(endhour) + 12; - endmin = endmin; + endhour = endhour + 12; } else { - if(endhour == '12') + if(endhour == 12) endhour = 0; else endhour = endhour; - endmin = endmin; } } var dateval1=getObj('date_start').value.replace(/^\s+/g, '').replace(/\s+$/g, ''); var dateval2=getObj('due_date').value.replace(/^\s+/g, '').replace(/\s+$/g, ''); - var dateelements1=splitDateVal(dateval1) - var dateelements2=splitDateVal(dateval2) + var dateval3=getObj('followup_date').value.replace(/^\s+/g, '').replace(/\s+$/g, ''); + var dateelements1=splitDateVal(dateval1); + var dateelements2=splitDateVal(dateval2); + var dateelements3=splitDateVal(dateval3); dd1=dateelements1[0] mm1=dateelements1[1] @@ -249,8 +250,14 @@ dd2=dateelements2[0] mm2=dateelements2[1] yyyy2=dateelements2[2] + + dd3=dateelements3[0] + mm3=dateelements3[1] + yyyy3=dateelements3[2] + var date1=new Date() var date2=new Date() + var date3=new Date() date1.setYear(yyyy1) date1.setMonth(mm1-1) @@ -259,17 +266,22 @@ date2.setYear(yyyy2) date2.setMonth(mm2-1) date2.setDate(dd2) + + date3.setYear(yyyy3) + date3.setMonth(mm3-1) + date3.setDate(dd3) + if (date2<=date1) { - if((eval(endhour)*60+eval(endmin)) <= (eval(starthour)*60+eval(startmin))) - { - alert("End Time should be greater than Start Time "); + if((endhour*60+endmin) <= (starthour*60+startmin)) + { + alert(alert_arr.ENDTIME_GREATER_THAN_STARTTIME); document.EditView.endhr.focus(); return false; } else { - durationinmin = (eval(endhour)*60+eval(endmin)) - (eval(starthour)*60+eval(startmin)); + durationinmin = (endhour*60+endmin) - (starthour*60+startmin); if(durationinmin >= 60) { hour = durationinmin/60; @@ -284,8 +296,67 @@ document.EditView.duration_minutes.value = minute; } } - document.EditView.time_start.value = starthour+':'+startmin; - document.EditView.time_end.value = endhour+':'+endmin; + event_starthour = _2digit(starthour); + event_startmin = _2digit(startmin); + event_endhour = _2digit(endhour); + event_endmin = _2digit(endmin); + document.EditView.time_start.value = event_starthour+':'+event_startmin; + document.EditView.time_end.value = event_endhour+':'+event_endmin; + // Added for Aydin Kurt-Elli requirement START -by Minnie + if (document.EditView.followup.checked == true && document.getElementById('date_table_thirdtd').style.display == 'block' ) + { + if(!dateValidate('followup_date','Followup Date','OTH')) + { + return false; + } + if(followupformat != '') + { + if(followupformat == 'pm') + { + if(followuphour == 12) + followuphour = 12; + else + followuphour = followuphour + 12; + } + else + { + if(followuphour == 12) + followuphour = 0; + else + followuphour = followuphour; + } + } + + if ( compareDates(date3,'Followup Date',date2,'End Date','GE')) + { + if (date3 <= date2) + { + if((followuphour*60+followupmin) <= (endhour*60+endmin)) + { + alert(alert_arr.FOLLOWUPTIME_GREATER_THAN_STARTTIME); + document.EditView.followup_starthr.focus(); + return false; + } + } + } + else + return false; + + followupendhour = followuphour; + followupendmin = followupmin + 5; + if(followupendmin == 60) + { + followupendmin = 0; + followupendhour = followupendhour + 1; + } + followuphour = _2digit(followuphour); + followupmin = _2digit(followupmin); + followupendhour = _2digit(followupendhour); + followupendmin = _2digit(followupendmin); + document.EditView.followup_time_start.value = followuphour+':'+followupmin; + document.EditView.followup_time_end.value = followupendhour+':'+followupendmin; + } + // Added for Aydin Kurt-Elli requirement END -by Minnie return true; } else return false; @@ -294,10 +365,10 @@ } function check_form() { - formSelectColumnString('inviteesid'); + formSelectColumnString('inviteesid','selectedusers'); if(trim(document.EditView.subject.value) == "") { - alert("Missing Event Name"); + alert(alert_arr.MISSING_EVENT_NAME); document.EditView.subject.focus() return false; } @@ -311,48 +382,47 @@ { document.EditView.mode.value = 'create'; } - starthour = document.EditView.starthr.value; - startmin = document.EditView.startmin.value; - startformat = document.EditView.startfmt.value; - endhour = document.EditView.endhr.value; - endmin = document.EditView.endmin.value; + starthour = parseInt(document.EditView.starthr.value,10); + startmin = parseInt(document.EditView.startmin.value,10); + startformat = document.EditView.startfmt.value; + endhour = parseInt(document.EditView.endhr.value,10); + endmin = parseInt(document.EditView.endmin.value,10); endformat = document.EditView.endfmt.value; + followupformat = document.EditView.followup_startfmt.value; + followuphour = parseInt(document.EditView.followup_starthr.value,10); + followupmin = parseInt(document.EditView.followup_startmin.value,10); if(startformat != '') { if(startformat == 'pm') { - if(starthour == '12') + if(starthour == 12) starthour = 12; else - starthour = eval(starthour) + 12; - startmin = startmin; + starthour = starthour + 12; } else { - if(starthour == '12') + if(starthour == 12) starthour = 0; else starthour = starthour; - startmin = startmin; } } if(endformat != '') { if(endformat == 'pm') { - if(endhour == '12') + if(endhour == 12) endhour = 12; else - endhour = eval(endhour) + 12; - endmin = endmin; + endhour = endhour + 12; } else { - if(endhour == '12') + if(endhour == 12) endhour == 0; else endhour = endhour; - endmin = endmin; } } if(!dateValidate('date_start','Start date','OTH')) @@ -367,8 +437,11 @@ { var dateval1=getObj('date_start').value.replace(/^\s+/g, '').replace(/\s+$/g, ''); var dateval2=getObj('due_date').value.replace(/^\s+/g, '').replace(/\s+$/g, ''); + var dateval3=getObj('followup_date').value.replace(/^\s+/g, '').replace(/\s+$/g, ''); + var dateelements1=splitDateVal(dateval1) var dateelements2=splitDateVal(dateval2) + var dateelements3=splitDateVal(dateval3) dd1=dateelements1[0] mm1=dateelements1[1] @@ -377,8 +450,14 @@ dd2=dateelements2[0] mm2=dateelements2[1] yyyy2=dateelements2[2] + + dd3=dateelements3[0] + mm3=dateelements3[1] + yyyy3=dateelements3[2] + var date1=new Date() var date2=new Date() + var date3=new Date() date1.setYear(yyyy1) date1.setMonth(mm1-1) @@ -387,15 +466,19 @@ date2.setYear(yyyy2) date2.setMonth(mm2-1) date2.setDate(dd2) + + date3.setYear(yyyy3) + date3.setMonth(mm3-1) + date3.setDate(dd3) if (date2<=date1) { - if((eval(endhour)*60+eval(endmin)) <= (eval(starthour)*60+eval(startmin))) + if((endhour*60+endmin) <= (starthour*60+startmin)) { - alert("End Time should be greater than Start Time "); + alert(alert_arr.ENDTIME_GREATER_THAN_STARTTIME); document.EditView.endhr.focus(); return false; } - durationinmin = (eval(endhour)*60+eval(endmin)) - (eval(starthour)*60+eval(startmin)); + durationinmin = (endhour*60+endmin) - (starthour*60+startmin); if(durationinmin >= 60) { hour = durationinmin/60; @@ -410,11 +493,70 @@ document.EditView.duration_minutes.value = minute; } + + event_starthour = _2digit(starthour); + event_startmin = _2digit(startmin); + event_endhour = _2digit(endhour); + event_endmin = _2digit(endmin); + document.EditView.time_start.value = event_starthour+':'+event_startmin; + document.EditView.time_end.value = event_endhour+':'+event_endmin; + // Added for Aydin Kurt-Elli requirement START -by Minnie + if (document.EditView.followup.checked == true && document.getElementById('date_table_thirdtd').style.display == 'block') + { + if(!dateValidate('followup_date','Followup Date','OTH')) + { + return false; + } + if(followupformat != '') + { + if(followupformat == 'pm') + { + if(followuphour == 12) + followuphour = 12; + else + followuphour = followuphour + 12; + } + else + { + if(followuphour == 12) + followuphour = 0; + else + followuphour = followuphour; + } + } + + if ( compareDates(date3,'Followup Date',date2,'End Date','GE')) + { + if (date3 <= date2) + { + if((followuphour*60+followupmin) <= (endhour*60+endmin)) + { + alert(alert_arr.FOLLOWUPTIME_GREATER_THAN_STARTTIME); + document.EditView.followup_starthr.focus(); + return false; + } + } + } + else return false; + + followupendhour = followuphour; + followupendmin = followupmin + 5; + if(followupendmin == 60) + { + followupendmin = 0; + followupendhour = followupendhour + 1; + } + followuphour = _2digit(followuphour); + followupmin = _2digit(followupmin); + followupendhour = _2digit(followupendhour); + followupendmin = _2digit(followupendmin); + document.EditView.followup_time_start.value = followuphour+':'+followupmin; + document.EditView.followup_time_end.value = followupendhour+':'+followupendmin; + } + // Added for Aydin Kurt-Elli requirement END -by Minnie --> } else return false; - document.EditView.time_start.value = starthour+':'+startmin; - document.EditView.time_end.value = endhour+':'+endmin; if(document.EditView.recurringcheck.checked == false) { document.EditView.recurringtype.value = '--None--'; @@ -425,30 +567,30 @@ function task_check_form() { - starthour = document.createTodo.starthr.value; - startmin = document.createTodo.startmin.value; + starthour = parseInt(document.createTodo.starthr.value,10); + startmin = parseInt(document.createTodo.startmin.value,10); startformat = document.createTodo.startfmt.value; if(startformat != '') { if(startformat == 'pm') { - if(starthour == '12') + if(starthour == 12) starthour = 12; else - starthour = eval(starthour) + 12; - - startmin = startmin; + starthour = starthour + 12; + } else { - if(starthour == '12') + if(starthour == 12) starthour = 0; else starthour = starthour; - startmin = startmin; - } - } - document.createTodo.task_time_start.value = starthour+':'+startmin; + } + } + starthour = _2digit(starthour); + startmin = _2digit(startmin); + document.createTodo.task_time_start.value = starthour+':'+startmin; if(document.createTodo.record.value != '') { document.createTodo.mode.value = 'edit'; @@ -463,131 +605,100 @@ function maintask_check_form() { - starthour = document.EditView.starthr.value; - startmin = document.EditView.startmin.value; + starthour = parseInt(document.EditView.starthr.value,10); + startmin = parseInt(document.EditView.startmin.value,10); startformat = document.EditView.startfmt.value; if(startformat != '') { if(startformat == 'pm') { - if(starthour == '12') + if(starthour == 12) starthour = 12; else - starthour = eval(starthour) + 12; - startmin = startmin; + starthour = starthour + 12; } else { - if(starthour == '12') + if(starthour == 12) starthour = 0; else starthour = starthour; - startmin = startmin; - } - } + } + } + starthour = _2digit(starthour); + startmin = _2digit(startmin); document.EditView.time_start.value = starthour+':'+startmin; } var moveupLinkObj,moveupDisabledObj,movedownLinkObj,movedownDisabledObj; -function setObjects() -{ - availListObj=getObj("availableusers") - selectedColumnsObj=getObj("selectedusers") - -} - - - -function addColumn() -{ + +function userEventSharing(selectedusrid,selcolid) +{ + formSelectColumnString(selectedusrid,selcolid); +} + + +function incUser(avail_users,sel_users) +{ + availListObj=getObj(avail_users) + selectedColumnsObj=getObj(sel_users) var selectlength=selectedColumnsObj.length var availlength=availListObj.length - var s=0 - for (i=0;i= 0) + selectedColumnsObj.remove(selectedColumnsObj.options.selectedIndex) + } + +} + + +function formSelectColumnString(usr,col) +{ + + var selectedColumnsObj=getObj(col) usr_id = document.getElementById(usr); var selectedColStr = ""; for (i=0;i window.innerWidth ){ leftSide = eval(leftSide) - eval(widthM); tagName.style.left = leftSide + 'px'; @@ -746,11 +871,19 @@ document.change_owner.month.value = month; document.change_owner.year.value = year; document.change_owner.subtab.value = type; - complete.href="javascript:updateStatus("+id+",'"+heldstatus+"','"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; - pending.href="javascript:updateStatus("+id+",'"+notheldstatus+"','"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; - postpone.href="index.php?module=Calendar&action=EditView&record="+id+"&activity_mode="+activity_mode; - actdelete.href="javascript:delActivity("+id+",'"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; - changeowner.href="javascript:dispLayer('act_changeowner');"; + if(complete) complete.href="javascript:updateStatus("+id+",'"+heldstatus+"','"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; + if(pending) pending.href="javascript:updateStatus("+id+",'"+notheldstatus+"','"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; + + if(postpone) postpone.href="index.php?module=Calendar&action=EditView&record="+id+"&return_action=index&activity_mode="+activity_mode+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&viewOption="+OptionData+"&subtab="+type+"&maintab=Calendar"; + if(isShared == "shared") + { + if(actdelete) actdelete.href="javascript:alert('"+alert_arr.SHARED_EVENT_DEL_MSG+"')"; + } + else + { + if(actdelete) actdelete.href="javascript:delActivity("+id+",'"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; + } + if(changeowner) changeowner.href="javascript:dispLayer('act_changeowner');"; } @@ -760,43 +893,83 @@ tagName.style.visibility = 'visible'; tagName.style.display = 'block'; } +//check whether user form selected or group form selected +function checkgroup() +{ + if(document.change_owner.user_lead_owner[1].checked) + { + document.change_owner.lead_group_owner.style.display = "block"; + document.change_owner.lead_owner.style.display = "none"; + } + else + { + document.change_owner.lead_group_owner.style.display = "none"; + document.change_owner.lead_owner.style.display = "block"; + } +} function calendarChangeOwner() { - var user_id = document.getElementById('activity_owner').options[document.getElementById('activity_owner').options.selectedIndex].value; var idlist = document.change_owner.idlist.value; var view = document.change_owner.view.value; var day = document.change_owner.day.value; var month = document.change_owner.month.value; var year = document.change_owner.year.value; var hour = document.change_owner.hour.value; - var subtab = document.change_owner.subtab.value; + var subtab = document.change_owner.subtab.value; + + var checked = document.change_owner.user_lead_owner[0].checked; + if(checked==true) + { + var user_id = document.getElementById('lead_owner').options[document.getElementById('lead_owner').options.selectedIndex].value; + var url = 'module=Users&action=updateLeadDBStatus&return_module=Calendar&return_action=ActivityAjax&user_id='+user_id+'&idlist='+idlist+'&view='+view+'&hour='+hour+'&day='+day+'&month='+month+'&year='+year+'&type=change_owner'; + } + else + { + var group_id = document.getElementById('lead_group_owner').options[document.getElementById('lead_group_owner').options.selectedIndex].value; + var url = 'module=Users&action=updateLeadDBStatus&return_module=Calendar&return_action=ActivityAjax&group_id='+group_id+'&idlist='+idlist+'&view='+view+'&hour='+hour+'&day='+day+'&month='+month+'&year='+year+'&type=change_owner'; + } + if(subtab == 'event') { var OptionData = $('view_Option').options[$('view_Option').selectedIndex].value; + var eventurl = url+'&viewOption='+OptionData+'&subtab=event&ajax=true'; + new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody: 'module=Users&action=updateLeadDBStatus&return_module=Calendar&return_action=ActivityAjax&user_id='+user_id+'&idlist='+idlist+'&view='+view+'&hour='+hour+'&day='+day+'&month='+month+'&year='+year+'&type=change_owner&viewOption='+OptionData+'&subtab=event&ajax=true', + postBody: eventurl, onComplete: function(response) { if(OptionData == 'listview') - $("listView").innerHTML=response.responseText; + { + result = response.responseText.split('####'); + $("total_activities").innerHTML = result[1]; + $("listView").innerHTML=result[0]; + } if(OptionData == 'hourview') - $("hrView").innerHTML=response.responseText; + { + result = response.responseText.split('####'); + $("total_activities").innerHTML = result[1]; + $("hrView").innerHTML=result[0]; + } } } ); } if(subtab == 'todo') { + + var todourl = url+'&subtab=todo&ajax=true'; new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody: 'module=Users&action=updateLeadDBStatus&return_module=Calendar&return_action=ActivityAjax&user_id='+user_id+'&idlist='+idlist+'&view='+view+'&hour='+hour+'&day='+day+'&month='+month+'&year='+year+'&type=change_owner&subtab=todo&ajax=true', + postBody: todourl, onComplete: function(response) { - $("mnuTab2").innerHTML=response.responseText; + result = response.responseText.split('####'); + $("total_activities").innerHTML = result[1]; + $("mnuTab2").innerHTML=result[0]; } } ); @@ -816,9 +989,18 @@ postBody: 'module=Users&action=massdelete&return_module=Calendar&return_action=ActivityAjax&idlist='+id+'&view='+view+'&hour='+hour+'&day='+day+'&month='+month+'&year='+year+'&type=activity_delete&viewOption='+OptionData+'&subtab=event&ajax=true', onComplete: function(response) { if(OptionData == 'listview') - $("listView").innerHTML=response.responseText; + { + result = response.responseText.split('####'); + $("total_activities").innerHTML = result[1]; + $("listView").innerHTML=result[0]; + } if(OptionData == 'hourview') - $("hrView").innerHTML=response.responseText; + { + + result = response.responseText.split('####'); + $("total_activities").innerHTML = result[1]; + $("hrView").innerHTML=result[0]; + } } } ); @@ -831,7 +1013,9 @@ method: 'post', postBody: 'module=Users&action=massdelete&return_module=Calendar&return_action=ActivityAjax&idlist='+id+'&view='+view+'&hour='+hour+'&day='+day+'&month='+month+'&year='+year+'&type=activity_delete&subtab=todo&ajax=true', onComplete: function(response) { - $("mnuTab2").innerHTML=response.responseText; + result = response.responseText.split('####'); + $("total_activities").innerHTML = result[1]; + $("mnuTab2").innerHTML=result[0]; } } ); @@ -1013,3 +1197,226 @@ } } +function dochange(start,end) +{ + var startdate = document.getElementById(start); + document.getElementById(end).value = startdate.value; +} + +function getSelectedStatus() +{ + var chosen = document.EditView.eventstatus.value; + if(chosen == "Held") + { + document.getElementById('date_table_firsttd').style.width = "33%"; + document.getElementById('date_table_secondtd').style.width = "33%"; + document.getElementById('date_table_thirdtd').style.display = 'block'; + } + else + { + document.getElementById('date_table_firsttd').style.width = "50%"; + document.getElementById('date_table_secondtd').style.width = "50%"; + document.getElementById('date_table_thirdtd').style.display = 'none'; + } + +} + +function changeEndtime_StartTime() +{ + var select_call = document.EditView.activitytype[0].checked; + var select_meeting = document.EditView.activitytype[1].checked; + if(select_call) + calDuedatetime('call'); + else if(select_meeting) + calDuedatetime('meeting'); + else + alert(alert_arr.EVENT_TYPE_NOT_SELECTED); +} + +function calDuedatetime(type) +{ + var datefmt = document.EditView.dateformat.value; + var dateval1=getObj('date_start').value.replace(/^\s+/g, '').replace(/\s+$/g, ''); + var dateelements1=splitDateVal(dateval1); + dd1=parseInt(dateelements1[0],10); + mm1=dateelements1[1]; + yyyy1=dateelements1[2]; + var date1=new Date(); + //date1.setDate(dd1+1); + date1.setYear(yyyy1); + date1.setMonth(mm1-1,dd1+1); + var yy = date1.getFullYear(); + var mm = parseInt(date1.getMonth(),10) + 1; + var dd = date1.getDate(); + var date = document.EditView.date_start.value; + var hour = parseInt(document.EditView.starthr.value,10); + var min = parseInt(document.EditView.startmin.value,10); + var fmt = document.EditView.startfmt.value; + dd = _2digit(dd); + mm = _2digit(mm); + if(datefmt == '%d-%m-%Y') + { + var tempdate = dd+'-'+mm+'-'+yy; + }else if(datefmt == '%m-%d-%Y') + { + var tempdate = mm+'-'+dd+'-'+yy; + }else + { + var tempdate = yy+'-'+mm+'-'+dd; + } + if(type == 'meeting') + { + if(fmt == 'pm') + { + if(hour == 11) + { + date = tempdate; + hour = 12; + min = min; + fmt = 'am'; + + }else if(hour == 12) + { + hour = 1; + min = min; + fmt = 'pm'; + } + else hour = hour + 1; + hour = _2digit(hour); + min = _2digit(min); + document.EditView.due_date.value = date; + document.EditView.endhr.value = hour; + document.EditView.endmin.value = min; + document.EditView.endfmt.value = fmt; + document.EditView.followup_date.value = date; + document.EditView.followup_starthr.value = hour; + document.EditView.followup_startmin.value = min; + document.EditView.followup_startfmt.value = fmt; + }else if(fmt == 'am') + { + if(hour == 11) + { + hour = 12; min = min; fmt = 'pm'; + }else if(hour == 12) + { + hour = 1; min = min; fmt = 'am'; + } + else hour = hour + 1; + hour = _2digit(hour); + min = _2digit(min); + document.EditView.due_date.value = date; + document.EditView.endhr.value = hour; + document.EditView.endmin.value = min; + document.EditView.endfmt.value = fmt; + document.EditView.followup_date.value = date; + document.EditView.followup_starthr.value = hour; + document.EditView.followup_startmin.value = min; + document.EditView.followup_startfmt.value = fmt; + }else + { + hour = hour + 1; + if(hour == 24) + { + hour = 0; + date = tempdate; + } + hour = _2digit(hour); + min = _2digit(min); + document.EditView.due_date.value = date; + document.EditView.endhr.value = hour; + document.EditView.endmin.value = min; + document.EditView.followup_date.value = date; + document.EditView.followup_starthr.value = hour; + document.EditView.followup_startmin.value = min; + } + } + if(type == 'call') + { + if(fmt == 'pm') + { + if(hour == 11 && min == 55) + { + hour = 12; min = 0; fmt = 'am'; + date = tempdate; + } + else if(hour == 12 && min == 55) + { + hour = 1; min = 0; fmt = 'pm'; + } + else + { + if(min == 55) + { + min = 0; + hour = hour + 1; + } + else min = min + 5; + } + hour = _2digit(hour); + min = _2digit(min); + document.EditView.due_date.value = date; + document.EditView.endhr.value = hour; + document.EditView.endmin.value = min; + document.EditView.endfmt.value = fmt; + document.EditView.followup_date.value = date; + document.EditView.followup_starthr.value = hour; + document.EditView.followup_startmin.value = min; + document.EditView.followup_startfmt.value = fmt; + }else if(fmt == 'am') + { + if(hour == 11 && min == 55) + { + hour = 12; + min = 0; + fmt = 'pm'; + } + else if(hour == 12 && min == 55) + { + hour = 1; + min = 0; + fmt = 'am'; + } + else + { + if(min == 55) + { + min = 0; + hour = hour + 1; + } + else min = min + 5; + } + hour = _2digit(hour); + min = _2digit(min); + document.EditView.due_date.value = date; + document.EditView.endhr.value = hour; + document.EditView.endmin.value = min; + document.EditView.endfmt.value = fmt; + document.EditView.followup_date.value = date; + document.EditView.followup_starthr.value = hour; + document.EditView.followup_startmin.value = min; + document.EditView.followup_startfmt.value = fmt; + } + else + { + if(min == 55) + { + min = 0; + hour = hour + 1; + }else min = min + 5; + if(hour == 24) + { + hour = 0; + date = tempdate; + } + hour = _2digit(hour); + min = _2digit(min); + document.EditView.due_date.value = date; + document.EditView.endhr.value = hour; + document.EditView.endmin.value = min; + document.EditView.followup_date.value = date; + document.EditView.followup_starthr.value = hour; + document.EditView.followup_startmin.value = min; + } + } +} + Modified: vtigercrm/branches/5.1_jens/modules/Calendar/updateCalendarSharing.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Calendar/updateCalendarSharing.php (original) +++ vtigercrm/branches/5.1_jens/modules/Calendar/updateCalendarSharing.php Mon Apr 16 12:27:44 2007 @@ -17,7 +17,8 @@ $hour_format = 'am/pm'; $delquery = "delete from vtiger_sharedcalendar where userid=".$_REQUEST["current_userid"]; $adb->query($delquery); -$sharedid = $_REQUEST['user']; +$selectedid = $_REQUEST['shar_userid']; +$sharedid = explode (";",$selectedid); if(isset($sharedid) && $sharedid != null) { foreach($sharedid as $sid) Modified: vtigercrm/branches/5.1_jens/modules/Campaigns/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Campaigns/CallRelatedList.php (original) +++ vtigercrm/branches/5.1_jens/modules/Campaigns/CallRelatedList.php Mon Apr 16 12:27:44 2007 @@ -12,7 +12,6 @@ require_once('Smarty_setup.php'); require_once('modules/Campaigns/Campaigns.php'); -require_once('modules/CustomView/CustomView.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -38,7 +37,7 @@ } global $mod_strings; -global $app_strings; +global $app_strings,$adb; global $theme; global $currentModule; $theme_path="themes/".$theme."/"; @@ -57,13 +56,29 @@ $related_array=getRelatedLists($currentModule,$focus); $smarty->assign("RELATEDLISTS", $related_array); -$cvObj = new CustomView("Contacts"); -$cvcombo = $cvObj->getCustomViewCombo(); -$smarty->assign("CONTCVCOMBO",""); +/* To get Contacts CustomView -START */ +$sql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype where vtiger_tab.tabid=".getTabid('Contacts'); +$result = $adb->query($sql); +$chtml = ""; +$smarty->assign("CONTCVCOMBO",$chtml); +/* To get Contacts CustomView -END */ -$cvObj = new CustomView("Leads"); -$cvcombo = $cvObj->getCustomViewCombo(); -$smarty->assign("LEADCVCOMBO",""); +/* To get Leads CustomView -START */ +$sql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype where vtiger_tab.tabid=".getTabid('Leads'); +$result = $adb->query($sql); +$lhtml = ""; +$smarty->assign("LEADCVCOMBO",$lhtml); +/* To get Leads CustomView -END */ $category = getParentTab(); $smarty->assign("CATEGORY",$category); @@ -79,6 +94,9 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); -$smarty->display("RelatedLists.tpl"); +if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '') + $smarty->display("RelatedListContents.tpl"); +else + $smarty->display("RelatedLists.tpl"); } ?> Modified: vtigercrm/branches/5.1_jens/modules/Campaigns/Campaigns.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Campaigns/Campaigns.php (original) +++ vtigercrm/branches/5.1_jens/modules/Campaigns/Campaigns.php Mon Apr 16 12:27:44 2007 @@ -1,252 +1,255 @@ -'crmid','vtiger_campaign'=>'campaignid','vtiger_campaignscf'=>'campaignid'); - var $column_fields = Array(); - - var $sortby_fields = Array('campaignname','smownerid','campaigntype','product_id','expectedrevenue','closingdate','campaignstatus','expectedresponse','targetaudience','expectedcost'); - - var $list_fields = Array( - 'Campaign Name'=>Array('campaign'=>'campaignname'), - 'Campaign Type'=>Array('campaign'=>'campaigntype'), - 'Campaign Status'=>Array('campaign'=>'campaignstatus'), - 'Expected Revenue'=>Array('campaign'=>'expectedrevenue'), - 'Expected Close Date'=>Array('campaign'=>'closingdate'), - 'Assigned To' => Array('crmentity'=>'smownerid') - ); - - var $list_fields_name = Array( - 'Campaign Name'=>'campaignname', - 'Campaign Type'=>'campaigntype', - 'Campaign Status'=>'campaignstatus', - 'Expected Revenue'=>'expectedrevenue', - 'Expected Close Date'=>'closingdate', - 'Assigned To'=>'assigned_user_id' - ); - - var $list_link_field= 'campaignname'; - //Added these variables which are used as default order by and sortorder in ListView - var $default_order_by = 'crmid'; - var $default_sort_order = 'DESC'; - - var $search_fields = Array( - 'Campaign Name'=>Array('vtiger_campaign'=>'campaignname'), - 'Campaign Type'=>Array('vtiger_campaign'=>'campaigntype'), - ); - - var $search_fields_name = Array( - 'Campaign Name'=>'campaignname', - 'Campaign Type'=>'campaigntype', - ); - - function Campaigns() - { - $this->log =LoggerManager::getLogger('campaign'); - $this->db = new PearDatabase(); - $this->column_fields = getColumnFields('Campaigns'); - } - - - /** Function to handle module specific operations when saving a entity - */ - function save_module($module) - { - } - - - // Mike Crowe Mod --------------------------------------------------------Default ordering for us - /** - * Function to get sort order - * return string $sorder - sortorder string either 'ASC' or 'DESC' - */ - function getSortOrder() - { - global $log; - $log->debug("Entering getSortOrder() method ..."); - if(isset($_REQUEST['sorder'])) - $sorder = $_REQUEST['sorder']; - else - $sorder = (($_SESSION['CAMPAIGN_SORT_ORDER'] != '')?($_SESSION['CAMPAIGN_SORT_ORDER']):($this->default_sort_order)); - - $log->debug("Exiting getSortOrder method ..."); - return $sorder; - } - - /** - * Function to get order by - * return string $order_by - fieldname(eg: 'campaignname') - */ - function getOrderBy() - { - global $log; - $log->debug("Entering getOrderBy() method ..."); - if (isset($_REQUEST['order_by'])) - $order_by = $_REQUEST['order_by']; - else - $order_by = (($_SESSION['CAMPAIGN_ORDER_BY'] != '')?($_SESSION['CAMPAIGN_ORDER_BY']):($this->default_order_by)); - - $log->debug("Exiting getOrderBy method ..."); - return $order_by; - } - // Mike Crowe Mod -------------------------------------------------------- - - /** - * Function to get Campaign related Contacts - * @param integer $id - campaignid - * returns related Contacts record in array format - */ - function get_contacts($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_contacts(".$id.") method ..."); - global $mod_strings; - - $focus = new Contacts(); - $button = ''; - - if($singlepane_view == 'true') - $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; - - $query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_campaigncontrel on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_campaigncontrel.campaignid = '.$id.' and vtiger_crmentity.deleted=0'; - - $log->debug("Exiting get_contacts method ..."); - return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset); - } - - /** - * Function to get Campaign related Leads - * @param integer $id - campaignid - * returns related Leads record in array format - */ - function get_leads($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_leads(".$id.") method ..."); - global $mod_strings; - - $focus = new Leads(); - - $button = ''; - if($singlepane_view == 'true') - $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; - - $query = 'SELECT vtiger_leaddetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_leaddetails inner join vtiger_campaignleadrel on vtiger_campaignleadrel.leadid=vtiger_leaddetails.leadid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid left join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_campaignleadrel.campaignid = '.$id; - $log->debug("Exiting get_leads method ..."); - return GetRelatedList('Campaigns','Leads',$focus,$query,$button,$returnset); - } - - /** - * Function to get Campaign related Potentials - * @param integer $id - campaignid - * returns related potentials record in array format - */ - function get_opportunities($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_opportunities(".$id.") method ..."); - global $mod_strings; - - $focus = new Potentials(); - - $button = ''; - if($singlepane_view == 'true') - $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; - - $query = 'select vtiger_users.user_name,vtiger_groups.groupname, vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_campaign inner join vtiger_potential on vtiger_campaign.campaignid = vtiger_potential.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0'; - if($this->column_fields['account_id'] != 0) - $log->debug("Exiting get_opportunities method ..."); - return GetRelatedList('Campaigns','Potentials',$focus,$query,$button,$returnset); - - } - - /** - * Function to get Campaign related Activities - * @param integer $id - campaignid - * returns related activities record in array format - */ - function get_activities($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_activities(".$id.") method ..."); - global $app_strings; - - require_once('modules/Calendar/Activity.php'); - - $focus = new Activity(); - - $button = ''; - - if($singlepane_view == 'true') - $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; - - $query = "SELECT vtiger_contactdetails.lastname, - vtiger_contactdetails.firstname, - vtiger_contactdetails.contactid, - vtiger_activity.*, - vtiger_seactivityrel.*, - vtiger_crmentity.crmid, vtiger_crmentity.smownerid, - vtiger_crmentity.modifiedtime, - vtiger_users.user_name, - vtiger_recurringevents.recurringtype - FROM vtiger_activity - INNER JOIN vtiger_seactivityrel - ON vtiger_seactivityrel.activityid = vtiger_activity.activityid - INNER JOIN vtiger_crmentity - ON vtiger_crmentity.crmid=vtiger_activity.activityid - LEFT JOIN vtiger_cntactivityrel - ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid - LEFT JOIN vtiger_contactdetails - ON vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid - LEFT JOIN vtiger_users - ON vtiger_users.id = vtiger_crmentity.smownerid - LEFT OUTER JOIN vtiger_recurringevents - ON vtiger_recurringevents.activityid = vtiger_activity.activityid - LEFT JOIN vtiger_activitygrouprelation - ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid - LEFT JOIN vtiger_groups - ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname - WHERE vtiger_seactivityrel.crmid=".$id." - AND (activitytype = 'Task' - OR activitytype = 'Call' - OR activitytype = 'Meeting')"; - $log->debug("Exiting get_activities method ..."); - return GetRelatedList('Campaigns','Calendar',$focus,$query,$button,$returnset); - } - -} -?> +'crmid','vtiger_campaign'=>'campaignid','vtiger_campaignscf'=>'campaignid'); + var $column_fields = Array(); + + var $sortby_fields = Array('campaignname','smownerid','campaigntype','product_id','expectedrevenue','closingdate','campaignstatus','expectedresponse','targetaudience','expectedcost'); + + var $list_fields = Array( + 'Campaign Name'=>Array('campaign'=>'campaignname'), + 'Campaign Type'=>Array('campaign'=>'campaigntype'), + 'Campaign Status'=>Array('campaign'=>'campaignstatus'), + 'Expected Revenue'=>Array('campaign'=>'expectedrevenue'), + 'Expected Close Date'=>Array('campaign'=>'closingdate'), + 'Assigned To' => Array('crmentity'=>'smownerid') + ); + + var $list_fields_name = Array( + 'Campaign Name'=>'campaignname', + 'Campaign Type'=>'campaigntype', + 'Campaign Status'=>'campaignstatus', + 'Expected Revenue'=>'expectedrevenue', + 'Expected Close Date'=>'closingdate', + 'Assigned To'=>'assigned_user_id' + ); + + var $list_link_field= 'campaignname'; + //Added these variables which are used as default order by and sortorder in ListView + var $default_order_by = 'crmid'; + var $default_sort_order = 'DESC'; + + var $groupTable = Array('vtiger_campaigngrouprelation','campaignid'); + + var $search_fields = Array( + 'Campaign Name'=>Array('vtiger_campaign'=>'campaignname'), + 'Campaign Type'=>Array('vtiger_campaign'=>'campaigntype'), + ); + + var $search_fields_name = Array( + 'Campaign Name'=>'campaignname', + 'Campaign Type'=>'campaigntype', + ); + + function Campaigns() + { + $this->log =LoggerManager::getLogger('campaign'); + $this->db = new PearDatabase(); + $this->column_fields = getColumnFields('Campaigns'); + } + + + /** Function to handle module specific operations when saving a entity + */ + function save_module($module) + { + } + + + // Mike Crowe Mod --------------------------------------------------------Default ordering for us + /** + * Function to get sort order + * return string $sorder - sortorder string either 'ASC' or 'DESC' + */ + function getSortOrder() + { + global $log; + $log->debug("Entering getSortOrder() method ..."); + if(isset($_REQUEST['sorder'])) + $sorder = $_REQUEST['sorder']; + else + $sorder = (($_SESSION['CAMPAIGN_SORT_ORDER'] != '')?($_SESSION['CAMPAIGN_SORT_ORDER']):($this->default_sort_order)); + + $log->debug("Exiting getSortOrder method ..."); + return $sorder; + } + + /** + * Function to get order by + * return string $order_by - fieldname(eg: 'campaignname') + */ + function getOrderBy() + { + global $log; + $log->debug("Entering getOrderBy() method ..."); + if (isset($_REQUEST['order_by'])) + $order_by = $_REQUEST['order_by']; + else + $order_by = (($_SESSION['CAMPAIGN_ORDER_BY'] != '')?($_SESSION['CAMPAIGN_ORDER_BY']):($this->default_order_by)); + + $log->debug("Exiting getOrderBy method ..."); + return $order_by; + } + // Mike Crowe Mod -------------------------------------------------------- + + /** + * Function to get Campaign related Contacts + * @param integer $id - campaignid + * returns related Contacts record in array format + */ + function get_contacts($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_contacts(".$id.") method ..."); + global $mod_strings; + + $focus = new Contacts(); + $button = ''; + + if($singlepane_view == 'true') + $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; + + $query = 'select vtiger_contactdetails.accountid, case when (vtiger_users.user_name not like \'\') then vtiger_users.user_name else vtiger_groups.groupname end as user_name , vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_campaigncontrel on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_campaigncontrel.campaignid = '.$id.' and vtiger_crmentity.deleted=0'; + + $log->debug("Exiting get_contacts method ..."); + return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset); + } + + /** + * Function to get Campaign related Leads + * @param integer $id - campaignid + * returns related Leads record in array format + */ + function get_leads($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_leads(".$id.") method ..."); + global $mod_strings; + + $focus = new Leads(); + + $button = ''; + if($singlepane_view == 'true') + $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; + + $query = 'SELECT vtiger_leaddetails.*, vtiger_crmentity.crmid,vtiger_leadaddress.phone,vtiger_leadsubdetails.website, case when (vtiger_users.user_name not like \'\') then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_crmentity.smownerid from vtiger_leaddetails inner join vtiger_campaignleadrel on vtiger_campaignleadrel.leadid=vtiger_leaddetails.leadid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid inner join vtiger_leadsubdetails on vtiger_leadsubdetails.leadsubscriptionid = vtiger_leaddetails.leadid inner join vtiger_leadaddress on vtiger_leadaddress.leadaddressid = vtiger_leadsubdetails.leadsubscriptionid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid left join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_campaignleadrel.campaignid = '.$id; + $log->debug("Exiting get_leads method ..."); + return GetRelatedList('Campaigns','Leads',$focus,$query,$button,$returnset); + } + + /** + * Function to get Campaign related Potentials + * @param integer $id - campaignid + * returns related potentials record in array format + */ + function get_opportunities($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_opportunities(".$id.") method ..."); + global $mod_strings; + + $focus = new Potentials(); + + $button = ''; + if($singlepane_view == 'true') + $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; + + $query = 'select case when (vtiger_users.user_name not like \'\') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_potential.accountid, vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_campaign inner join vtiger_potential on vtiger_campaign.campaignid = vtiger_potential.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0'; + if($this->column_fields['account_id'] != 0) + $log->debug("Exiting get_opportunities method ..."); + return GetRelatedList('Campaigns','Potentials',$focus,$query,$button,$returnset); + + } + + /** + * Function to get Campaign related Activities + * @param integer $id - campaignid + * returns related activities record in array format + */ + function get_activities($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_activities(".$id.") method ..."); + global $app_strings; + + require_once('modules/Calendar/Activity.php'); + + $focus = new Activity(); + + $button = ''; + + if($singlepane_view == 'true') + $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT vtiger_contactdetails.lastname, + vtiger_contactdetails.firstname, + vtiger_contactdetails.contactid, + vtiger_activity.*, + vtiger_seactivityrel.*, + vtiger_crmentity.crmid, vtiger_crmentity.smownerid, + vtiger_crmentity.modifiedtime, + case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name, + vtiger_recurringevents.recurringtype + FROM vtiger_activity + INNER JOIN vtiger_seactivityrel + ON vtiger_seactivityrel.activityid = vtiger_activity.activityid + INNER JOIN vtiger_crmentity + ON vtiger_crmentity.crmid=vtiger_activity.activityid + LEFT JOIN vtiger_cntactivityrel + ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid + LEFT JOIN vtiger_contactdetails + ON vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid + LEFT JOIN vtiger_users + ON vtiger_users.id = vtiger_crmentity.smownerid + LEFT OUTER JOIN vtiger_recurringevents + ON vtiger_recurringevents.activityid = vtiger_activity.activityid + LEFT JOIN vtiger_activitygrouprelation + ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid + LEFT JOIN vtiger_groups + ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname + WHERE vtiger_seactivityrel.crmid=".$id." + AND (activitytype = 'Task' + OR activitytype = 'Call' + OR activitytype = 'Meeting')"; + $log->debug("Exiting get_activities method ..."); + return GetRelatedList('Campaigns','Calendar',$focus,$query,$button,$returnset); + + } + +} +?> Modified: vtigercrm/branches/5.1_jens/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Campaigns/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Campaigns/DetailView.php Mon Apr 16 12:27:44 2007 @@ -12,7 +12,6 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once('modules/Campaigns/Campaigns.php'); -require_once('modules/CustomView/CustomView.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -29,7 +28,7 @@ { $focus->id = ""; } -global $app_strings,$mod_strings,$theme,$currentModule,$default_module_view; +global $app_strings,$mod_strings,$theme,$currentModule,$default_module_view,$adb; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -70,18 +69,36 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); if($singlepane_view == 'true') { $related_array = getRelatedLists($currentModule,$focus); $smarty->assign("RELATEDLISTS", $related_array); - $cvObj = new CustomView("Contacts"); - $cvcombo = $cvObj->getCustomViewCombo(); - $smarty->assign("CONTCVCOMBO",""); + /* To get Contacts CustomView -START */ + $sql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype where vtiger_tab.tabid=".getTabid('Contacts'); + $result = $adb->query($sql); + $chtml = ""; + $smarty->assign("CONTCVCOMBO",$chtml); + /* To get Contacts CustomView -END */ + + /* To get Leads CustomView -START */ + $sql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype where vtiger_tab.tabid=".getTabid('Leads'); + $result = $adb->query($sql); + $lhtml = ""; + $smarty->assign("LEADCVCOMBO",$lhtml); + /* To get Leads CustomView -END */ - $cvObj = new CustomView("Leads"); - $cvcombo = $cvObj->getCustomViewCombo(); - $smarty->assign("LEADCVCOMBO",""); } $smarty->assign("SinglePane_View", $singlepane_view); Modified: vtigercrm/branches/5.1_jens/modules/Campaigns/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Campaigns/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Campaigns/EditView.php Mon Apr 16 12:27:44 2007 @@ -99,7 +99,7 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); - +$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); if($focus->mode == 'edit') $smarty->display("salesEditView.tpl"); else Modified: vtigercrm/branches/5.1_jens/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Campaigns/ListView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Campaigns/ListView.php Mon Apr 16 12:27:44 2007 @@ -133,8 +133,8 @@ if($order_by == 'smownerid') { if( $adb->dbType == "pgsql") - $list_query .= ' GROUP BY vtiger_users.user_name'; - $list_query .= ' ORDER BY vtiger_users.user_name '.$sorder; + $list_query .= ' GROUP BY user_name'; + $list_query .= ' ORDER BY user_name '.$sorder; } else { Modified: vtigercrm/branches/5.1_jens/modules/Campaigns/LoadList.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Campaigns/LoadList.php (original) +++ vtigercrm/branches/5.1_jens/modules/Campaigns/LoadList.php Mon Apr 16 12:27:44 2007 @@ -28,24 +28,6 @@ $adb->query("INSERT INTO ".$reltable." VALUES('".$_REQUEST["return_id"]."','".$row["crmid"]."')"); } -if ($singlepane_view == 'true') -{ +header("Location: index.php?module=Campaigns&action=CampaignsAjax&file=CallRelatedList&ajax=true&record=".$_REQUEST['return_id']); + ?> - - - - Modified: vtigercrm/branches/5.1_jens/modules/Campaigns/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Campaigns/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Campaigns/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -43,7 +43,7 @@ 'Description'=>'Description', 'Product'=>'Product', 'Target Audience'=>'Target Audience', -'TargetSize'=>'TargetSize', +'TargetSize'=>'Target Size', 'Sponsor'=>'Sponsor', 'Expected Sales Count'=>'Expected Sales Count', Modified: vtigercrm/branches/5.1_jens/modules/Contacts/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/CallRelatedList.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/CallRelatedList.php Mon Apr 16 12:27:44 2007 @@ -64,9 +64,11 @@ $smarty->assign("HIDDEN_PARENTS_LIST",$parent_email); $category = getparenttab(); $smarty->assign("CATEGORY",$category); - $smarty->assign("ID",$focus->id); $smarty->assign("NAME",$focus->name); +$smarty->assign("EMAIL",$focus->column_fields['email']); +$smarty->assign("YAHOO",$focus->column_fields['yahooid']); + $related_array = getRelatedLists($currentModule,$focus); $smarty->assign("RELATEDLISTS", $related_array); $smarty->assign("MODULE",$currentmodule); Modified: vtigercrm/branches/5.1_jens/modules/Contacts/Contacts.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/Contacts.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/Contacts.php Mon Apr 16 12:27:44 2007 @@ -1,869 +1,882 @@ -'crmid','vtiger_contactdetails'=>'contactid','vtiger_contactaddress'=>'contactaddressid','vtiger_contactsubdetails'=>'contactsubscriptionid','vtiger_contactscf'=>'contactid','vtiger_customerdetails'=>'customerid','vtiger_attachments'=>'attachmentsid','vtiger_entity2org'=>'crmid'); - - - - var $column_fields = Array(); - - var $sortby_fields = Array('lastname','firstname','title','email','phone','smownerid','accountid'); - - var $list_link_field= 'lastname'; - - // This is the list of vtiger_fields that are in the lists. - var $list_fields = Array( - 'Last Name' => Array('contactdetails'=>'lastname'), - 'First Name' => Array('contactdetails'=>'firstname'), - 'Title' => Array('contactdetails'=>'title'), - 'Account Name' => Array('account'=>'accountname'), - 'Email' => Array('contactdetails'=>'email'), - 'Phone' => Array('contactdetails'=>'phone'), - 'Assigned To' => Array('crmentity'=>'smownerid') - ); - - var $range_fields = Array( - 'first_name', - 'last_name', - 'primary_address_city', - 'account_name', - 'account_id', - 'id', - 'email1', - 'salutation', - 'title', - 'phone_mobile', - 'reports_to_name', - 'primary_address_street', - 'primary_address_city', - 'primary_address_state', - 'primary_address_postalcode', - 'primary_address_country', - 'alt_address_city', - 'alt_address_street', - 'alt_address_city', - 'alt_address_state', - 'alt_address_postalcode', - 'alt_address_country', - 'office_phone', - 'home_phone', - 'other_phone', - 'fax', - 'department', - 'birthdate', - 'assistant_name', - 'assistant_phone'); - - - var $list_fields_name = Array( - 'Last Name' => 'lastname', - 'First Name' => 'firstname', - 'Title' => 'title', - 'Account Name' => 'accountid', - 'Email' => 'email', - 'Phone' => 'phone', - 'Assigned To' => 'assigned_user_id' - ); - - var $search_fields = Array( - 'Name' => Array('contactdetails'=>'lastname'), - 'Title' => Array('contactdetails'=>'title') - ); - - var $search_fields_name = Array( - 'Name' => 'lastname', - 'Title' => 'title' - ); - - // This is the list of vtiger_fields that are required - var $required_fields = array("lastname"=>1); - - //Added these variables which are used as default order by and sortorder in ListView - var $default_order_by = 'lastname'; - var $default_sort_order = 'ASC'; - - function Contacts() { - $this->log = LoggerManager::getLogger('contact'); - $this->db = new PearDatabase(); - $this->column_fields = getColumnFields('Contacts'); - } - - // Mike Crowe Mod --------------------------------------------------------Default ordering for us - /** - * Function to get sort order - * return string $sorder - sortorder string either 'ASC' or 'DESC' - */ - function getSortOrder() - { - global $log; - $log->debug("Entering getSortOrder() method ..."); - if(isset($_REQUEST['sorder'])) - $sorder = $_REQUEST['sorder']; - else - $sorder = (($_SESSION['CONTACTS_SORT_ORDER'] != '')?($_SESSION['CONTACTS_SORT_ORDER']):($this->default_sort_order)); - $log->debug("Exiting getSortOrder method ..."); - return $sorder; - } - /** - * Function to get order by - * return string $order_by - fieldname(eg: 'Contactname') - */ - function getOrderBy() - { - global $log; - $log->debug("Entering getOrderBy() method ..."); - if (isset($_REQUEST['order_by'])) - $order_by = $_REQUEST['order_by']; - else - $order_by = (($_SESSION['CONTACTS_ORDER_BY'] != '')?($_SESSION['CONTACTS_ORDER_BY']):($this->default_order_by)); - $log->debug("Exiting getOrderBy method ..."); - return $order_by; - } - // Mike Crowe Mod -------------------------------------------------------- - /** Function to get the number of Contacts assigned to a particular User. - * @param varchar $user name - Assigned to User - * Returns the count of contacts assigned to user. - */ - function getCount($user_name) - { - global $log; - $log->debug("Entering getCount(".$user_name.") method ..."); - $query = "select count(*) from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0"; - - $result = $this->db->query($query,true,"Error retrieving contacts count"); - $rows_found = $this->db->getRowCount($result); - $row = $this->db->fetchByAssoc($result, 0); - - - $log->debug("Exiting getCount method ..."); - return $row["count(*)"]; - } - /** Function to get the Contact Details assigned to a given User ID which has a valid Email Address. - * @param varchar $user_name - User Name (eg. Admin) - * @param varchar $email_address - Email Addr of each contact record. - * Returns the query. - */ - function get_contacts1($user_name,$email_address) - { - global $log; - $log->debug("Entering get_contacts1(".$user_name.",".$email_address.") method ..."); - $query = "select vtiger_users.user_name, vtiger_contactdetails.lastname last_name,vtiger_contactdetails.firstname first_name,vtiger_contactdetails.contactid as id, vtiger_contactdetails.salutation as salutation, vtiger_contactdetails.email as email1,vtiger_contactdetails.title as title,vtiger_contactdetails.mobile as phone_mobile,vtiger_account.accountname as account_name,vtiger_account.accountid as account_id from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 and vtiger_contactdetails.email like '%" .$email_address ."%' limit 50"; - - $log->debug("Exiting get_contacts1 method ..."); - return $this->process_list_query1($query); - } - /** Function to get the Contact Details assigned to a particular User based on the starting count and the number of subsequent records. - * @param varchar $user_name - Assigned User - * @param integer $from_index - Initial record number to be displayed - * @param integer $offset - Count of the subsequent records to be displayed. - * Returns Query. - */ - function get_contacts($user_name,$from_index,$offset) - { - global $log; - $log->debug("Entering get_contacts(".$user_name.",".$from_index.",".$offset.") method ..."); - $query = "select vtiger_users.user_name,vtiger_groups.groupname,vtiger_contactdetails.department department, vtiger_contactdetails.phone office_phone, vtiger_contactdetails.fax fax, vtiger_contactsubdetails.assistant assistant_name, vtiger_contactsubdetails.otherphone other_phone, vtiger_contactsubdetails.homephone home_phone,vtiger_contactsubdetails.birthday birthdate, vtiger_contactdetails.lastname last_name,vtiger_contactdetails.firstname first_name,vtiger_contactdetails.contactid as id, vtiger_contactdetails.salutation as salutation, vtiger_contactdetails.email as email1,vtiger_contactdetails.title as title,vtiger_contactdetails.mobile as phone_mobile,vtiger_account.accountname as account_name,vtiger_account.accountid as account_id, vtiger_contactaddress.mailingcity as primary_address_city,vtiger_contactaddress.mailingstreet as primary_address_street, vtiger_contactaddress.mailingcountry as primary_address_country,vtiger_contactaddress.mailingstate as primary_address_state, vtiger_contactaddress.mailingzip as primary_address_postalcode, vtiger_contactaddress.othercity as alt_address_city,vtiger_contactaddress.otherstreet as alt_address_street, vtiger_contactaddress.othercountry as alt_address_country,vtiger_contactaddress.otherstate as alt_address_state, vtiger_contactaddress.otherzip as alt_address_postalcode from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 limit " .$from_index ."," .$offset; - - $log->debug("Exiting get_contacts method ..."); - return $this->process_list_query1($query); - } - - - /** Function to process list query for a given query - * @param $query - * Returns the results of query in array format - */ - function process_list_query1($query) - { - global $log; - $log->debug("Entering process_list_query1(".$query.") method ..."); - - $result =& $this->db->query($query,true,"Error retrieving $this->object_name list: "); - $list = Array(); - $rows_found = $this->db->getRowCount($result); - if($rows_found != 0) - { - $contact = Array(); - for($index = 0 , $row = $this->db->fetchByAssoc($result, $index); $row && $index <$rows_found;$index++, $row = $this->db->fetchByAssoc($result, $index)) - - { - foreach($this->range_fields as $columnName) - { - if (isset($row[$columnName])) { - - $contact[$columnName] = $row[$columnName]; - } - else - { - $contact[$columnName] = ""; - } - } -// TODO OPTIMIZE THE QUERY ACCOUNT NAME AND ID are set separetly for every vtiger_contactdetails and hence -// vtiger_account query goes for ecery single vtiger_account row - - $list[] = $contact; - } - } - - $response = Array(); - $response['list'] = $list; - $response['row_count'] = $rows_found; - $response['next_offset'] = $next_offset; - $response['previous_offset'] = $previous_offset; - - - $log->debug("Exiting process_list_query1 method ..."); - return $response; - } - - - /** Function to process list query for Plugin with Security Parameters for a given query - * @param $query - * Returns the results of query in array format - */ - function plugin_process_list_query($query) - { - global $log,$adb,$current_user; - $log->debug("Entering process_list_query1(".$query.") method ..."); - $permitted_field_lists = Array(); - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) - { - $sql1 = "select columnname from vtiger_field where tabid=4 and block <> 75"; - }else - { - $profileList = getCurrentUserProfileList(); - $sql1 = "select columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=4 and vtiger_field.block <> 6 and vtiger_field.block <> 75 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; - } - $result1 = $this->db->query($sql1); - for($i=0;$i < $adb->num_rows($result1);$i++) - { - $permitted_field_lists[] = $adb->query_result($result1,$i,'columnname'); - } - - $result =& $this->db->query($query,true,"Error retrieving $this->object_name list: "); - $list = Array(); - $rows_found = $this->db->getRowCount($result); - if($rows_found != 0) - { - for($index = 0 , $row = $this->db->fetchByAssoc($result, $index); $row && $index <$rows_found;$index++, $row = $this->db->fetchByAssoc($result, $index)) - { - $contact = Array(); - foreach($permitted_field_lists as $columnName) - { - if ($columnName == "lastname" || $columnName == "firstname" || $columnName == "email") - { - $contact[$columnName] = $row[$columnName]; - } - else - { - $contact[$columnName] = ""; - } - } - if(in_array("accountid",$permitted_field_lists)) - { - $contact[accountname] = $row[accountname]; - $contact[account_id] = $row[accountid]; - } - $contact[contactid] = $row[contactid]; - $list[] = $contact; - } - } - - $response = Array(); - $response['list'] = $list; - $response['row_count'] = $rows_found; - $response['next_offset'] = $next_offset; - $response['previous_offset'] = $previous_offset; - $log->debug("Exiting process_list_query1 method ..."); - return $response; - } - - - /** Returns a list of the associated opportunities - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function get_opportunities($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_opportunities(".$id.") method ..."); - global $mod_strings; - - $focus = new Potentials(); - $button = ''; - - if(isPermitted("Potentials",1,"") == 'yes') - { - - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; - - $log->info("Potential Related List for Contact Displayed"); - - // First, get the list of IDs. - $query = 'select vtiger_users.user_name,vtiger_groups.groupname,vtiger_contactdetails.accountid, vtiger_contactdetails.contactid , vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_potential on vtiger_contactdetails.accountid = vtiger_potential.accountid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_contactdetails.contactid = '.$id.' and vtiger_crmentity.deleted=0'; - if($this->column_fields['account_id'] != 0) - $log->debug("Exiting get_opportunities method ..."); - return GetRelatedList('Contacts','Potentials',$focus,$query,$button,$returnset); - } - - - /** Returns a list of the associated tasks - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function get_activities($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_activities(".$id.") method ..."); - global $mod_strings; - - $focus = new Activity(); - - $button = ''; - - if(isPermitted("Calendar",1,"") == 'yes') - { - $button .= ' '; - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; - - $log->info("Activity Related List for Contact Displayed"); - - $query = "SELECT vtiger_users.user_name,vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.activityid , vtiger_activity.subject, vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.due_date, vtiger_cntactivityrel.contactid, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_recurringevents.recurringtype from vtiger_contactdetails inner join vtiger_cntactivityrel on vtiger_cntactivityrel.contactid = vtiger_contactdetails.contactid inner join vtiger_activity on vtiger_cntactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_cntactivityrel.activityid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_contactdetails.contactid=".$id." and vtiger_crmentity.deleted = 0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') "; //recurring type is added in Query -Jaguar - $log->debug("Exiting get_activities method ..."); - return GetRelatedList('Contacts','Calendar',$focus,$query,$button,$returnset); - - } - /** - * Function to get Contact related Task & Event which have activity type Held, Completed or Deferred. - * @param integer $id - contactid - * returns related Task or Event record in array format - */ - function get_history($id) - { - global $log; - $log->debug("Entering get_history(".$id.") method ..."); - $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus, - vtiger_activity.activitytype, vtiger_contactdetails.contactid, vtiger_contactdetails.firstname, - vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime, - vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name - from vtiger_activity - inner join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid - inner join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid - left join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid - left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid - left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname - inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id - where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') - and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != '')) - and vtiger_cntactivityrel.contactid=".$id; - //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php - $log->debug("Entering get_history method ..."); - return getHistory('Contacts',$query,$id); - } - /** - * Function to get Contact related Tickets. - * @param integer $id - contactid - * returns related Ticket records in array format - */ - function get_tickets($id) - { - global $log, $singlepane_view; - global $app_strings; - $log->debug("Entering get_tickets(".$id.") method ..."); - $focus = new HelpDesk(); - - $button = '  ".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."". $app_strings['LBL_CREATE_MERGE_TEMPLATE']."
- - - - -
- - - - - - - - - - - - - - - - -
-
- -
-
- 		-
-
- - - -
- - - + + + + + + + + + + +<?php echo $mod_strings['TITLE_AJAX_CSS_POPUP_CHAT'];?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+
+ +
+
+ 		+
+
+ + + +
+ + + Modified: vtigercrm/branches/5.1_jens/modules/CustomView/CustomView.js ============================================================================== --- vtigercrm/branches/5.1_jens/modules/CustomView/CustomView.js (original) +++ vtigercrm/branches/5.1_jens/modules/CustomView/CustomView.js Mon Apr 16 12:27:44 2007 @@ -74,7 +74,7 @@ } // Here we decide whether to submit the form. if (isError == true) { - alert("Missing required fields:" + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } //return true; @@ -102,7 +102,7 @@ // Here we decide whether to submit the form. if (isError == true) { - alert("Missing required fields: " + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } return true; Modified: vtigercrm/branches/5.1_jens/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/CustomView/CustomView.php (original) +++ vtigercrm/branches/5.1_jens/modules/CustomView/CustomView.php Mon Apr 16 12:27:44 2007 @@ -22,14 +22,14 @@ global $adv_filter_options; $adv_filter_options = array("e"=>"".$mod_strings['equals']."", - "n"=>"".$mod_strings['not_equal_to']."", - "s"=>"".$mod_strings['starts_with']."", + "n"=>"".$mod_strings['not equal to']."", + "s"=>"".$mod_strings['starts with']."", "c"=>"".$mod_strings['contains']."", - "k"=>"".$mod_strings['does_not_contain']."", - "l"=>"".$mod_strings['less_than']."", - "g"=>"".$mod_strings['greater_than']."", - "m"=>"".$mod_strings['less_or_equal']."", - "h"=>"".$mod_strings['greater_or_equal']."", + "k"=>"".$mod_strings['does not contain']."", + "l"=>"".$mod_strings['less than']."", + "g"=>"".$mod_strings['greater than']."", + "m"=>"".$mod_strings['less or equal']."", + "h"=>"".$mod_strings['greater or equal']."", ); class CustomView extends CRMEntity{ @@ -184,27 +184,31 @@ { global $adb; $tabid = getTabid($module); + if($tabid == 9) + $tabid ="9,16"; global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); + $display_type = " vtiger_field.displaytype in (1,2,3)"; + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) { $sql = "select * from vtiger_field "; - $sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block.") and"; - $sql.= " vtiger_field.displaytype in (1,2)"; + $sql.= " where vtiger_field.tabid in (".$tabid.") and vtiger_field.block in (".$block.") and"; + $sql.= $display_type; $sql.= " order by sequence"; } else { + $profileList = getCurrentUserProfileList(); $sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid "; - $sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block.") and"; - $sql.= " vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0"; - $sql.= " and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." order by sequence"; + $sql.= " where vtiger_field.tabid in (".$tabid.") and vtiger_field.block in (".$block.") and"; + $sql.= "$display_type and vtiger_profile2field.visible=0"; + $sql.= " and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by columnname order by sequence"; } - - - + if($tabid == '9,16') + $tabid ="9"; $result = $adb->query($sql); $noofrows = $adb->num_rows($result); //Added on 14-10-2005 -- added ticket id in list @@ -279,6 +283,7 @@ foreach($this->module_list[$module] as $key=>$value) { $columnlist = $this->getColumnsListbyBlock($module,$value); + if(isset($columnlist)) { $ret_module_list[$module][$key] = $columnlist; @@ -338,18 +343,17 @@ { $sql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid "; $sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$blockids.") - and (vtiger_field.uitype =5 or vtiger_field.displaytype=2) "; + and (vtiger_field.uitype in (5,6,23) or vtiger_field.displaytype=2) "; $sql.= " order by vtiger_field.sequence"; } else { $profileList = getCurrentUserProfileList(); $sql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid "; - $sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$blockids.") and (vtiger_field.uitype =5 or vtiger_field.displaytype=2)"; + $sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$blockids.") and (vtiger_field.uitype in (5,6,23) or vtiger_field.displaytype=2)"; $sql.= " and vtiger_profile2field.visible=0"; $sql.= " and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." order by vtiger_field.sequence"; } - $result = $adb->query($sql); @@ -476,33 +480,43 @@ $nextFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01", date("Y")+1)); $nextFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")+1)); - if(date("m") <= 4) + if(date("m") <= 3) { $cFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y"))); - $cFq1 = date("Y-m-d",mktime(0, 0, 0, "04","30",date("Y"))); - $nFq = date("Y-m-d",mktime(0, 0, 0, "05","01",date("Y"))); - $nFq1 = date("Y-m-d",mktime(0, 0, 0, "08","31",date("Y"))); - $pFq = date("Y-m-d",mktime(0, 0, 0, "09","01",date("Y")-1)); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "03","31",date("Y"))); + $nFq = date("Y-m-d",mktime(0, 0, 0, "04","01",date("Y"))); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "06","30",date("Y"))); + $pFq = date("Y-m-d",mktime(0, 0, 0, "10","01",date("Y")-1)); $pFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y")-1)); - }else if(date("m") > 4 and date("m") <= 8) - { + }else if(date("m") > 3 and date("m") <= 6) + { $pFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y"))); - $pFq1 = date("Y-m-d",mktime(0, 0, 0, "04","30",date("Y"))); - $cFq = date("Y-m-d",mktime(0, 0, 0, "05","01",date("Y"))); - $cFq1 = date("Y-m-d",mktime(0, 0, 0, "08","31",date("Y"))); - $nFq = date("Y-m-d",mktime(0, 0, 0, "09","01",date("Y"))); - $nFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y"))); - - }else - { - $nFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y")+1)); - $nFq1 = date("Y-m-d",mktime(0, 0, 0, "04","30",date("Y")+1)); - $pFq = date("Y-m-d",mktime(0, 0, 0, "05","01",date("Y"))); - $pFq1 = date("Y-m-d",mktime(0, 0, 0, "08","31",date("Y"))); - $cFq = date("Y-m-d",mktime(0, 0, 0, "09","01",date("Y"))); - $cFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y"))); - } - + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "03","31",date("Y"))); + $cFq = date("Y-m-d",mktime(0, 0, 0, "04","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "06","30",date("Y"))); + $nFq = date("Y-m-d",mktime(0, 0, 0, "07","01",date("Y"))); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "09","30",date("Y"))); + + }else if(date("m") > 6 and date("m") <= 9) + { + $nFq = date("Y-m-d",mktime(0, 0, 0, "10","01",date("Y"))); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y"))); + $pFq = date("Y-m-d",mktime(0, 0, 0, "04","01",date("Y"))); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "06","30",date("Y"))); + $cFq = date("Y-m-d",mktime(0, 0, 0, "07","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "09","30",date("Y"))); + } + else if(date("m") > 9 and date("m") <= 12) + { + $nFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y")+1)); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "03","31",date("Y")+1)); + $pFq = date("Y-m-d",mktime(0, 0, 0, "07","01",date("Y"))); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "09","30",date("Y"))); + $cFq = date("Y-m-d",mktime(0, 0, 0, "10","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y"))); + + } + $sjsStr = ' Modified: vtigercrm/branches/5.1_jens/modules/HelpDesk/Save.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/HelpDesk/Save.php (original) +++ vtigercrm/branches/5.1_jens/modules/HelpDesk/Save.php Mon Apr 16 12:27:44 2007 @@ -1,227 +1,215 @@ -constructUpdateLog(&$focus, $mode, $_REQUEST['assigned_group_name'], $_REQUEST['assigntype']); -$fldvalue = from_html($adb->formatString('vtiger_troubletickets','update_log',$fldvalue),($mode == 'edit')?true:false); - -$focus->save("HelpDesk"); - -//After save the record, we should update the log -$adb->query("update vtiger_troubletickets set update_log=$fldvalue where ticketid=".$focus->id); - -//Added to retrieve the existing attachment of the ticket and save it for the new duplicated ticket -if($_FILES['filename']['name'] == '' && $_REQUEST['mode'] != 'edit' && $_REQUEST['old_id'] != '') -{ - $sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid=vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid= ".$_REQUEST['old_id']; - $result = $adb->query($sql); - if($adb->num_rows($result) != 0) - { - $attachmentid = $adb->query_result($result,0,'attachmentsid'); - $filename = $adb->query_result($result,0,'name'); - $filetype = $adb->query_result($result,0,'type'); - $filepath = $adb->query_result($result,0,'path'); - - $new_attachmentid = $adb->getUniqueID("vtiger_crmentity"); +query("select * from vtiger_crmentity where crmid='".$focus->id."'"); + $old_user_id = $adb->query_result($usr_qry,0,"smownerid"); +} +$fldvalue = $focus->constructUpdateLog(&$focus, $mode, $_REQUEST['assigned_group_name'], $_REQUEST['assigntype']); +$fldvalue = from_html($adb->formatString('vtiger_troubletickets','update_log',$fldvalue),($mode == 'edit')?true:false); + +$focus->save("HelpDesk"); + +//After save the record, we should update the log +$adb->query("update vtiger_troubletickets set update_log=$fldvalue where ticketid=".$focus->id); + +//Added to retrieve the existing attachment of the ticket and save it for the new duplicated ticket +if($_FILES['filename']['name'] == '' && $_REQUEST['mode'] != 'edit' && $_REQUEST['old_id'] != '') +{ + $sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid=vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid= ".$_REQUEST['old_id']; + $result = $adb->query($sql); + if($adb->num_rows($result) != 0) + { + $attachmentid = $adb->query_result($result,0,'attachmentsid'); + $filename = $adb->query_result($result,0,'name'); + $filetype = $adb->query_result($result,0,'type'); + $filepath = $adb->query_result($result,0,'path'); + + $new_attachmentid = $adb->getUniqueID("vtiger_crmentity"); $date_var = $adb->formatDate(date('YmdHis')); - - $upload_filepath = decideFilePath(); - - //Read the old file contents and write it as a new file with new attachment id - $handle = @fopen($upload_filepath.$new_attachmentid."_".$filename,'w'); - fputs($handle, file_get_contents($filepath.$attachmentid."_".$filename)); - fclose($handle); - - $adb->query("update vtiger_troubletickets set filename=\"$filename\" where ticketid=$focus->id"); - $adb->query("insert into vtiger_crmentity (crmid,setype,createdtime) values('".$new_attachmentid."','HelpDesk Attachment',".$date_var.")"); - - $adb->query("insert into vtiger_attachments values(".$new_attachmentid.",'".$filename."','','".$filetype."','".$upload_filepath."')"); - - $adb->query("insert into vtiger_seattachmentsrel values('".$focus->id."','".$new_attachmentid."')"); - } -} - - -$return_id = $focus->id; - -if(isset($_REQUEST['parenttab']) && $_REQUEST['parenttab'] != "") $parenttab = $_REQUEST['parenttab']; -if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; -else $return_module = "HelpDesk"; -if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; -else $return_action = "DetailView"; -if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id']; - -if($_REQUEST['mode'] == 'edit') - $reply = 'Re : '; -else - $reply = ''; - -$subject = '[ Ticket ID : '.$focus->id.' ] '.$reply.$_REQUEST['ticket_title']; -$bodysubject = ' Ticket ID : '.$focus->id.'
Subject : '.$_REQUEST['ticket_title']; - -$emailoptout = 0; - -//To get the emailoptout vtiger_field value and then decide whether send mail about the tickets or not -if($focus->column_fields['parent_id'] != '') -{ - $parent_module = getSalesEntityType($focus->column_fields['parent_id']); - if($parent_module == 'Contacts') - { - $result = $adb->query("select * from vtiger_contactdetails where contactid=".$focus->column_fields['parent_id']); - $emailoptout = $adb->query_result($result,0,'emailoptout'); - $contactname = $adb->query_result($result,0,'firstname').' '.$adb->query_result($result,0,'lastname'); - $parentname = $contactname; - $contact_mailid = $adb->query_result($result,0,'email'); - } - if($parent_module == 'Accounts') - { - $result = $adb->query("select * from vtiger_account where accountid=".$focus->column_fields['parent_id']); - $emailoptout = $adb->query_result($result,0,'emailoptout'); - $parentname = $adb->query_result($result,0,'accountname'); - } -} - -//Get the status of the vtiger_portal user. if the customer is active then send the vtiger_portal link in the mail -if($contact_mailid != '') -{ - $sql = "select * from vtiger_portalinfo where user_name='".$contact_mailid."'"; - $isactive = $adb->query_result($adb->query($sql),0,'isactive'); -} -if($isactive == 1) -{ - $bodydetails = "Dear ".$contactname.",

"; - $bodydetails .= 'There is a reply to '.$_REQUEST['ticket_title'].' in the "Customer Portal" at VTiger.'; - $bodydetails .= "You can use the following link to view the replies made:
"; - - $bodydetails .= "Ticket Details"; - $bodydetails .= "

Thanks,

Vtiger Support Team "; - - $email_body = $bodysubject.'

'.$bodydetails; -} -else -{ - $desc = 'Ticket ID : '.$focus->id.'
Ticket Title : '.$reply.$_REQUEST['ticket_title']; - $desc .= "

Dear ".$parentname.",

The Ticket is replied and the details are :
"; - $desc .= "
Status : ".$focus->column_fields['ticketstatus']; - $desc .= "
Category : ".$focus->column_fields['ticketcategories']; - $desc .= "
Severity : ".$focus->column_fields['ticketseverities']; - $desc .= "
Priority : ".$focus->column_fields['ticketpriorities']; - $desc .= '

Description :
'.$focus->column_fields['description']; - $desc .= '

Solution :
'.$focus->column_fields['solution']; - $desc .= getTicketComments($focus->id); - - $desc .= '


'; - $desc .= '


'; - $desc .= '


'; - $desc .= '
Regards, HelpDesk Team
'; - $email_body = $desc; -} -$_REQUEST['return_id'] = $return_id; - -if($_REQUEST['product_id'] != '' && $focus->id != '' && $_REQUEST['mode'] != 'edit') -{ - $sql = 'insert into vtiger_seticketsrel values('.$_REQUEST['product_id'].' , '.$focus->id.')'; - $adb->query($sql); - - if($_REQUEST['return_module'] == 'Products') - $return_id = $_REQUEST['product_id']; -} - -//send mail to the assigned to user and the parent to whom this ticket is assigned -require_once('modules/Emails/mail.php'); -$user_emailid = getUserEmailId('id',$focus->column_fields['assigned_user_id']); -if($user_emailid != '') -{ - $mail_status = send_mail('HelpDesk',$user_emailid,$HELPDESK_SUPPORT_NAME,$HELPDESK_SUPPORT_EMAIL_ID,$subject,$email_body); - $mail_status_str = $user_emailid."=".$mail_status."&&&"; -} -else -{ - $mail_status_str = "'".$to_email."'=0&&&"; -} -//added condition to check the emailoptout(this is for contacts and vtiger_accounts.) -if($emailoptout == 0) -{ - //send mail to parent - if($_REQUEST['parent_id'] != '' && $_REQUEST['parent_type'] != '') - { - $parentmodule = $_REQUEST['parent_type']; - $parentid = $_REQUEST['parent_id']; - - $parent_email = getParentMailId($parentmodule,$parentid); - $mail_status = send_mail('HelpDesk',$parent_email,$HELPDESK_SUPPORT_NAME,$HELPDESK_SUPPORT_EMAIL_ID,$subject,$email_body); - $mail_status_str .= $parent_email."=".$mail_status."&&&"; - } -} -else -{ - $adb->println("'".$parentname."' is not want to get the email about the ticket details as emailoptout is selected"); -} - -$mail_error_status = getMailErrorString($mail_status_str); - -//code added for returning back to the current view after edit from list view -if($_REQUEST['return_viewname'] == '') $return_viewname='0'; -if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; -header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&$mail_error_status&viewname=$return_viewname"); - -/** Function to get all the comments for a troubleticket - * @param int $ticketid -- troubleticket id - * return all the comments as a sequencial string which are related to this ticket -**/ -function getTicketComments($ticketid) -{ - global $log; - $log->debug("Entering getTicketComments(".$ticketid.") method ..."); - global $adb; - - $commentlist = ''; - $sql = "select * from vtiger_ticketcomments where ticketid=".$ticketid; - $result = $adb->query($sql); - for($i=0;$i<$adb->num_rows($result);$i++) - { - $comment = $adb->query_result($result,$i,'comments'); - if($comment != '') - { - $commentlist .= '

'.$comment; - } - } - if($commentlist != '') - $commentlist = '

The comments are : '.$commentlist; - - $log->debug("Exiting getTicketComments method ..."); - return $commentlist; -} - -?> + + $upload_filepath = decideFilePath(); + + //Read the old file contents and write it as a new file with new attachment id + $handle = @fopen($upload_filepath.$new_attachmentid."_".$filename,'w'); + fputs($handle, file_get_contents($filepath.$attachmentid."_".$filename)); + fclose($handle); + + $adb->query("update vtiger_troubletickets set filename=\"$filename\" where ticketid=$focus->id"); + $adb->query("insert into vtiger_crmentity (crmid,setype,createdtime) values('".$new_attachmentid."','HelpDesk Attachment',".$date_var.")"); + + $adb->query("insert into vtiger_attachments values(".$new_attachmentid.",'".$filename."','','".$filetype."','".$upload_filepath."')"); + + $adb->query("insert into vtiger_seattachmentsrel values('".$focus->id."','".$new_attachmentid."')"); + } +} + + +$return_id = $focus->id; + +if(isset($_REQUEST['parenttab']) && $_REQUEST['parenttab'] != "") $parenttab = $_REQUEST['parenttab']; +if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; +else $return_module = "HelpDesk"; +if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; +else $return_action = "DetailView"; +if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id']; + +if($_REQUEST['mode'] == 'edit') + $reply = 'Re : '; +else + $reply = ''; + +$subject = '[ '.$mod_strings['LBL_TICKET_ID'].' : '.$focus->id.' ] '.$reply.$_REQUEST['ticket_title']; +$bodysubject = $mod_strings['LBL_TICKET_ID'].' : '.$focus->id.'
'.$mod_strings['LBL_SUBJECT'].$_REQUEST['ticket_title']; + +$emailoptout = 0; + +//To get the emailoptout vtiger_field value and then decide whether send mail about the tickets or not +if($focus->column_fields['parent_id'] != '') +{ + $parent_module = getSalesEntityType($focus->column_fields['parent_id']); + if($parent_module == 'Contacts') + { + $result = $adb->query("select * from vtiger_contactdetails where contactid=".$focus->column_fields['parent_id']); + $emailoptout = $adb->query_result($result,0,'emailoptout'); + $contactname = $adb->query_result($result,0,'firstname').' '.$adb->query_result($result,0,'lastname'); + $parentname = $contactname; + $contact_mailid = $adb->query_result($result,0,'email'); + } + if($parent_module == 'Accounts') + { + $result = $adb->query("select * from vtiger_account where accountid=".$focus->column_fields['parent_id']); + $emailoptout = $adb->query_result($result,0,'emailoptout'); + $parentname = $adb->query_result($result,0,'accountname'); + } +} + +//Get the status of the vtiger_portal user. if the customer is active then send the vtiger_portal link in the mail +if($contact_mailid != '') +{ + $sql = "select * from vtiger_portalinfo where user_name='".$contact_mailid."'"; + $isactive = $adb->query_result($adb->query($sql),0,'isactive'); +} +if($isactive == 1) +{ + $url = "".$mod_strings['LBL_TICKET_DETAILS'].""; + $email_body = $bodysubject.'

'.getPortalInfo_Ticket($focus->id,$_REQUEST['ticket_title'],$contactname,$url,$_REQUEST['mode']); +} +else +{ + $data['sub']=$_REQUEST['ticket_title']; + $data['parent_name']=$parentname; + $data['status']=$focus->column_fields['ticketstatus']; + $data['category']=$focus->column_fields['ticketcategories']; + $data['severity'] = $focus->column_fields['ticketseverities']; + $data['priority']=$focus->column_fields['ticketpriorities']; + $data['description']=$focus->column_fields['description']; + $data['solution'] = $focus->column_fields['solution']; + $data['mode']= $_REQUEST['mode']; + $email_body = getTicketDetails($focus->id,$data); +} +$_REQUEST['return_id'] = $return_id; + +if($_REQUEST['product_id'] != '' && $focus->id != '' && $_REQUEST['mode'] != 'edit') +{ + $sql = 'insert into vtiger_seticketsrel values('.$_REQUEST['product_id'].' , '.$focus->id.')'; + $adb->query($sql); + + if($_REQUEST['return_module'] == 'Products') + $return_id = $_REQUEST['product_id']; +} + +//send mail to the assigned to user and the parent to whom this ticket is assigned +require_once('modules/Emails/mail.php'); +$user_emailid = getUserEmailId('id',$focus->column_fields['assigned_user_id']); + +if($user_emailid != '') +{ + if($_REQUEST['mode'] != 'edit') + { + $mail_status = send_mail('HelpDesk',$user_emailid,$HELPDESK_SUPPORT_NAME,$HELPDESK_SUPPORT_EMAIL_ID,$subject,$email_body); + } + else + { + if(($focus->column_fields['ticketstatus'] == $mod_strings["Closed"]) || ($focus->column_fields['comments'] != '') || ($_REQUEST['helpdesk_solution'] != $_REQUEST['solution']) || ($focus->column_fields['assigned_user_id'] != $old_user_id)) + { + $mail_status = send_mail('HelpDesk',$user_emailid,$HELPDESK_SUPPORT_NAME,$HELPDESK_SUPPORT_EMAIL_ID,$subject,$email_body); + } + + } + + $mail_status_str = $user_emailid."=".$mail_status."&&&"; +} +else +{ + $mail_status_str = "'".$to_email."'=0&&&"; +} +//added condition to check the emailoptout(this is for contacts and vtiger_accounts.) +if($emailoptout == 0) +{ + //send mail to parent + if($_REQUEST['parent_id'] != '' && $_REQUEST['parent_type'] != '') + { + $parentmodule = $_REQUEST['parent_type']; + $parentid = $_REQUEST['parent_id']; + + $parent_email = getParentMailId($parentmodule,$parentid); + if($_REQUEST['mode'] != 'edit') + { + $mail_status = send_mail('HelpDesk',$parent_email,$HELPDESK_SUPPORT_NAME,$HELPDESK_SUPPORT_EMAIL_ID,$subject,$email_body); + } + else + { + if(( $focus->column_fields['ticketstatus']== $mod_strings["Closed"]) || ($focus->column_fields['comments'] != '' ) || ($_REQUEST['helpdesk_solution'] != $_REQUEST['solution'])) + { + $mail_status = send_mail('HelpDesk',$parent_email,$HELPDESK_SUPPORT_NAME,$HELPDESK_SUPPORT_EMAIL_ID,$subject,$email_body); + } + } + $mail_status_str .= $parent_email."=".$mail_status."&&&"; + } +} +else +{ + $adb->println("'".$parentname."' is not want to get the email about the ticket details as emailoptout is selected"); +} + +$mail_error_status = getMailErrorString($mail_status_str); + +//code added for returning back to the current view after edit from list view +if($_REQUEST['return_viewname'] == '') $return_viewname='0'; +if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; +header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&$mail_error_status&viewname=$return_viewname"); + +?> Modified: vtigercrm/branches/5.1_jens/modules/HelpDesk/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/HelpDesk/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/HelpDesk/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -36,7 +36,6 @@ 'Accounts'=>'Account', 'Contacts'=>'Contact', 'Opportunities'=>'Opportunity', -'LBL_TICKET_INFORMATION'=>'Ticket Information', 'LBL_CUSTOM_INFORMATION'=>'Custom Information', 'LBL_DESCRIPTION_INFORMATION'=>'Description Information', @@ -57,7 +56,6 @@ 'LBL_PRIORITY'=>'Priority', 'LBL_CATEGORY'=>'Category', -'LBL_QUESTION'=>'Question', 'LBL_ANSWER'=>'Answer', 'LBL_COMMENTS'=>'Comments', @@ -83,14 +81,6 @@ 'LBL_SELECT_TICKET'=>'Select Ticket', 'LBL_CHANGE_OWNER'=>'Change Owner', 'LBL_CHANGE_STATUS'=>'Change Status', - - - - - - - - 'LBL_TICKET_TITLE'=>'Title', 'LBL_TICKET_DESCRIPTION'=>'Description', 'LBL_TICKET_CATEGORY'=>'Category', @@ -181,6 +171,23 @@ 'Wait For Response'=>'Wait For Response', 'Closed'=>'Closed', +//added to support i18n in ticket mails +'Hi' => 'Hi', +'Dear'=> 'Dear', +'LBL_PORTAL_BODY_MAILINFO'=> 'The Ticket is', +'LBL_DETAIL' => 'the details are :', +'LBL_REGARDS'=> 'Regards', +'LBL_TEAM'=> 'HelpDesk Team', +'LBL_TICKET_DETAILS' => 'Ticket Details', +'LBL_SUBJECT' => 'Subject : ', +'created' => 'created', +'replied' => 'replied', +'reply'=>'There is a reply to', +'customer_portal' => 'in the "Customer Portal" at VTiger.', +'link' => 'You can use the following link to view the replies made:', +'Thanks' => 'Thanks', +'Support_team' => 'Vtiger Support Team', + ); ?> Modified: vtigercrm/branches/5.1_jens/modules/Home/UnifiedSearch.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Home/UnifiedSearch.php (original) +++ vtigercrm/branches/5.1_jens/modules/Home/UnifiedSearch.php Mon Apr 16 12:27:44 2007 @@ -1,288 +1,294 @@ - object - $object_array = getSearchModules(); - foreach($object_array as $curr_module=>$curr_object) - { - require_once("modules/$curr_module/$curr_object.php"); - } - - global $adb; - global $current_user; - global $theme; - $theme_path="themes/".$theme."/"; - $image_path=$theme_path."images/"; - - $search_val = $query_string; - $search_module = $_REQUEST['search_module']; - - getSearchModulesComboList($search_module); - - foreach($object_array as $module => $object_name) - { - if(isPermitted($module,"index") == "yes") - { - $focus = new $object_name(); - - $smarty = new vtigerCRM_Smarty; - - require_once("modules/$module/language/en_us.lang.php"); - global $mod_strings; - global $app_strings; - - $smarty->assign("MOD", $mod_strings); - $smarty->assign("APP", $app_strings); - $smarty->assign("IMAGE_PATH",$image_path); - $smarty->assign("MODULE",$module); - $smarty->assign("SEARCH_MODULE",$_REQUEST['search_module']); - $smarty->assign("SINGLE_MOD",$module); - - - $listquery = getListQuery($module); - $oCustomView = ''; - - $oCustomView = new CustomView($module); - - if($search_module != '')//This is for Tag search - { - - $where = getTagWhere($search_val,$current_user->id); - $search_msg = $app_strings['LBL_TAG_SEARCH']; - $search_msg .= "".$search_val.""; - } - else //This is for Global search - { - $where = getUnifiedWhere($listquery,$module,$search_val); - $search_msg = $app_strings['LBL_SEARCH_RESULTS_FOR']; - $search_msg .= "".$search_val.""; - } - - if($where != '') - $listquery .= ' and ('.$where.')'; - - $list_result = $adb->query($listquery); - $noofrows = $adb->num_rows($list_result); - - if($noofrows >= 1) - $list_max_entries_per_page = $noofrows; - //Here we can change the max list entries per page per module - $navigation_array = getNavigationValues(1, $noofrows, $list_max_entries_per_page); - - $listview_header = getListViewHeader($focus,$module,"","","","global",$oCustomView); - $listview_entries = getListViewEntries($focus,$module,$list_result,$navigation_array,"","","","",$oCustomView); - - //Do not display the Header if there are no entires in listview_entries - if(count($listview_entries) > 0) - { - $display_header = 1; - } - else - { - $display_header = 0; - } - - $smarty->assign("LISTHEADER", $listview_header); - $smarty->assign("LISTENTITY", $listview_entries); - $smarty->assign("DISPLAYHEADER", $display_header); - $smarty->assign("HEADERCOUNT", count($listview_header)); - - $total_record_count = $total_record_count + $noofrows; - - $smarty->assign("SEARCH_CRITERIA","( $noofrows )".$search_msg); - $smarty->assign("MODULES_LIST", $object_array); - - $smarty->display("GlobalListView.tpl"); - unset($_SESSION['lvs'][$module]); - } - } - - //Added to display the Total record count -?> - -
        ".$mod_strings['ERR_ONE_CHAR'].""; -} - -/** Function to get the where condition for a module based on the field table entries - * @param string $listquery -- ListView query for the module - * @param string $module -- module name - * @param string $search_val -- entered search string value - * @return string $where -- where condition for the module based on field table entries - */ -function getUnifiedWhere($listquery,$module,$search_val) -{ - global $adb; - - $query = "SELECT columnname, tablename FROM vtiger_field WHERE tabid = ".getTabid($module); - $result = $adb->query($query); - $noofrows = $adb->num_rows($result); - - $where = ''; - for($i=0;$i<$noofrows;$i++) - { - $columnname = $adb->query_result($result,$i,'columnname'); - $tablename = $adb->query_result($result,$i,'tablename'); - - //Before form the where condition, check whether the table for the field has been added in the listview query - if(strstr($listquery,$tablename)) - { - if($where != '') - $where .= " OR "; - $where .= $tablename.".".$columnname." LIKE ".$adb->quote("%$search_val%"); - } - } - - return $where; -} - -/** Function to get the Tags where condition - * @param string $search_val -- entered search string value - * @param string $current_user_id -- current user id - * @return string $where -- where condition with the list of crmids, will like vtiger_crmentity.crmid in (1,3,4,etc.,) - */ -function getTagWhere($search_val,$current_user_id) -{ - require_once('include/freetag/freetag.class.php'); - - $freetag_obj = new freetag(); - - $crmid_array = $freetag_obj->get_objects_with_tag_all($search_val,$current_user_id); - - $where = ''; - if(count($crmid_array) > 0) - { - $where = " vtiger_crmentity.crmid IN ("; - foreach($crmid_array as $index => $crmid) - { - $where .= $crmid.','; - } - $where = trim($where,',').')'; - } - - return $where; -} - - -/** Function to get the the List of Searchable Modules as a combo list which will be displayed in right corner under the Header - * @param string $search_module -- search module, this module result will be shown defaultly - */ -function getSearchModulesComboList($search_module) -{ - global $object_array; - global $app_strings; - global $mod_strings; - - ?> - - - - - - - -
   - -
- $object_name1,$module_name2=>$object_name2,$module_name3=>$object_name3,$module_name4=>$object_name4,-----); - */ - function getSearchModules() - { - global $adb; - $sql = 'select distinct vtiger_field.tabid,name from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where vtiger_tab.tabid not in (16,29)'; - $result = $adb->query($sql); - while($module_result = $adb->fetch_array($result)) - { - $modulename = $module_result['name']; - if($modulename != 'Calendar') - { - $return_arr[$modulename] = $modulename; - }else - { - $return_arr[$modulename] = 'Activity'; - } - } - return $return_arr; - } - -?> + object + $object_array = getSearchModules(); + foreach($object_array as $curr_module=>$curr_object) + { + require_once("modules/$curr_module/$curr_object.php"); + } + + global $adb; + global $current_user; + global $theme; + $theme_path="themes/".$theme."/"; + $image_path=$theme_path."images/"; + + $search_val = $query_string; + $search_module = $_REQUEST['search_module']; + + getSearchModulesComboList($search_module); + + foreach($object_array as $module => $object_name) + { + if(isPermitted($module,"index") == "yes") + { + $focus = new $object_name(); + + $smarty = new vtigerCRM_Smarty; + + require_once("modules/$module/language/en_us.lang.php"); + global $mod_strings; + global $app_strings; + + $smarty->assign("MOD", $mod_strings); + $smarty->assign("APP", $app_strings); + $smarty->assign("IMAGE_PATH",$image_path); + $smarty->assign("MODULE",$module); + $smarty->assign("SEARCH_MODULE",$_REQUEST['search_module']); + $smarty->assign("SINGLE_MOD",$module); + + + $listquery = getListQuery($module); + $oCustomView = ''; + + $oCustomView = new CustomView($module); + $viewid = $oCustomView->getViewId($module); + $listquery = $oCustomView->getModifiedCvListQuery($viewid,$listquery,$module); + if ($module == "Calendar"){ + if (!isset($oCustomView->list_fields['Close'])) $oCustomView->list_fields['Close']=array ( 'activity' => 'status' ); + if (!isset($oCustomView->list_fields_name['Close'])) $oCustomView->list_fields_name['Close']='status'; + } + + if($search_module != '')//This is for Tag search + { + + $where = getTagWhere($search_val,$current_user->id); + $search_msg = $app_strings['LBL_TAG_SEARCH']; + $search_msg .= "".$search_val.""; + } + else //This is for Global search + { + $where = getUnifiedWhere($listquery,$module,$search_val); + $search_msg = $app_strings['LBL_SEARCH_RESULTS_FOR']; + $search_msg .= "".$search_val.""; + } + + if($where != '') + $listquery .= ' and ('.$where.')'; + + $list_result = $adb->query($listquery); + $noofrows = $adb->num_rows($list_result); + + if($noofrows >= 1) + $list_max_entries_per_page = $noofrows; + //Here we can change the max list entries per page per module + $navigation_array = getNavigationValues(1, $noofrows, $list_max_entries_per_page); + + $listview_header = getListViewHeader($focus,$module,"","","","global",$oCustomView); + $listview_entries = getListViewEntries($focus,$module,$list_result,$navigation_array,"","","","",$oCustomView); + + //Do not display the Header if there are no entires in listview_entries + if(count($listview_entries) > 0) + { + $display_header = 1; + } + else + { + $display_header = 0; + } + + $smarty->assign("LISTHEADER", $listview_header); + $smarty->assign("LISTENTITY", $listview_entries); + $smarty->assign("DISPLAYHEADER", $display_header); + $smarty->assign("HEADERCOUNT", count($listview_header)); + + $total_record_count = $total_record_count + $noofrows; + + $smarty->assign("SEARCH_CRITERIA","( $noofrows )".$search_msg); + $smarty->assign("MODULES_LIST", $object_array); + + $smarty->display("GlobalListView.tpl"); + unset($_SESSION['lvs'][$module]); + } + } + + //Added to display the Total record count +?> + +
        ".$mod_strings['ERR_ONE_CHAR'].""; +} + +/** Function to get the where condition for a module based on the field table entries + * @param string $listquery -- ListView query for the module + * @param string $module -- module name + * @param string $search_val -- entered search string value + * @return string $where -- where condition for the module based on field table entries + */ +function getUnifiedWhere($listquery,$module,$search_val) +{ + global $adb; + + $query = "SELECT columnname, tablename FROM vtiger_field WHERE tabid = ".getTabid($module); + $result = $adb->query($query); + $noofrows = $adb->num_rows($result); + + $where = ''; + for($i=0;$i<$noofrows;$i++) + { + $columnname = $adb->query_result($result,$i,'columnname'); + $tablename = $adb->query_result($result,$i,'tablename'); + + //Before form the where condition, check whether the table for the field has been added in the listview query + if(strstr($listquery,$tablename)) + { + if($where != '') + $where .= " OR "; + $where .= $tablename.".".$columnname." LIKE ".$adb->quote("%$search_val%"); + } + } + + return $where; +} + +/** Function to get the Tags where condition + * @param string $search_val -- entered search string value + * @param string $current_user_id -- current user id + * @return string $where -- where condition with the list of crmids, will like vtiger_crmentity.crmid in (1,3,4,etc.,) + */ +function getTagWhere($search_val,$current_user_id) +{ + require_once('include/freetag/freetag.class.php'); + + $freetag_obj = new freetag(); + + $crmid_array = $freetag_obj->get_objects_with_tag_all($search_val,$current_user_id); + + $where = ''; + if(count($crmid_array) > 0) + { + $where = " vtiger_crmentity.crmid IN ("; + foreach($crmid_array as $index => $crmid) + { + $where .= $crmid.','; + } + $where = trim($where,',').')'; + } + + return $where; +} + + +/** Function to get the the List of Searchable Modules as a combo list which will be displayed in right corner under the Header + * @param string $search_module -- search module, this module result will be shown defaultly + */ +function getSearchModulesComboList($search_module) +{ + global $object_array; + global $app_strings; + global $mod_strings; + + ?> + + + + + + + +
   + +
+ $object_name1,$module_name2=>$object_name2,$module_name3=>$object_name3,$module_name4=>$object_name4,-----); + */ + function getSearchModules() + { + global $adb; + $sql = 'select distinct vtiger_field.tabid,name from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where vtiger_tab.tabid not in (16,29)'; + $result = $adb->query($sql); + while($module_result = $adb->fetch_array($result)) + { + $modulename = $module_result['name']; + if($modulename != 'Calendar') + { + $return_arr[$modulename] = $modulename; + }else + { + $return_arr[$modulename] = 'Activity'; + } + } + return $return_arr; + } + +?> Modified: vtigercrm/branches/5.1_jens/modules/Home/index.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Home/index.php (original) +++ vtigercrm/branches/5.1_jens/modules/Home/index.php Mon Apr 16 12:27:44 2007 @@ -54,7 +54,7 @@ } if( count($home_section_order) < 1 ) { - $home_section_order = array("ALVT","HDB","PLVT","QLTQ","CVLVT","HLT","OLV","GRT","OLTSO","ILTI","MNL","OLTPO","LTFAQ"); + $home_section_order = array("HDB","ALVT","PLVT","QLTQ","CVLVT","HLT","OLV","GRT","OLTSO","ILTI","MNL","OLTPO","LTFAQ"); } require('user_privileges/user_privileges_'.$current_user->id.'.php'); @@ -67,8 +67,10 @@ { $activities = Array(); include("modules/Calendar/OpenListView.php") ; - $activities[] = getPendingActivities(0); - $activities[] = getPendingActivities(1); + $activities[] = getPendingActivities(0,"today"); + $activities[] = getPendingActivities(0,"all"); + $activities[] = getPendingActivities(1,"today"); + $activities[] = getPendingActivities(1,"all"); } break; case 'ALVT': @@ -173,9 +175,13 @@ } global $current_language; + +global $current_user; +$user_name = $current_user->column_fields[user_name]; $current_module_strings = return_module_language($current_language, 'Calendar'); $t=Date("Ymd"); +//echo '
';print_r($home_values); echo '
'; $buttoncheck['Calendar'] = isPermitted('Calendar','index'); $smarty->assign("CHECK",$buttoncheck); $smarty->assign("IMAGE_PATH",$image_path); @@ -186,6 +192,7 @@ $smarty->assign("HOMEDETAILS",$home_values); $smarty->assign("HOMEDEFAULTVIEW",DefHomeView()); $smarty->assign("ACTIVITIES",$activities); +$smarty->assign("CURRENTUSER",$user_name); $freetag = new freetag(); $smarty->assign("ALL_TAG",$freetag->get_tag_cloud_html("",$current_user->id)); $smarty->display("HomePage.tpl"); @@ -230,11 +237,13 @@ global $app_strings; $userid= $current_user->id; $groupids = fetchUserGroupids($userid); - if($groupids !='') + //Check for permission before constructing the query. + if($groupids !='' && (isPermitted('Leads','index') == "yes" || isPermitted('Calendar','index') == "yes" || isPermitted('HelpDesk','index') == "yes" || isPermitted('Potentials','index') == "yes" || isPermitted('Accounts','index') == "yes" || isPermitted('Contacts','index') =='yes' || isPermitted('Campaigns','index') =='yes' || isPermitted('SalesOrder','index') =='yes' || isPermitted('Invoice','index') =='yes' || isPermitted('PurchaseOrder','index') == 'yes')) { $query = ''; if(isPermitted('Leads','index') == "yes") { + //code modified to list the vtiger_groups associates to a user om 21-11-05 //Get the leads assigned to group $query = "select vtiger_leaddetails.leadid as id,vtiger_leaddetails.lastname as name,vtiger_leadgrouprelation.groupname as groupname, 'Leads ' as Type from vtiger_leaddetails inner join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid inner join vtiger_groups on vtiger_leadgrouprelation.groupname=vtiger_groups.groupname where vtiger_crmentity.deleted=0 and vtiger_leadgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")"; @@ -254,8 +263,66 @@ $query .= "select vtiger_troubletickets.ticketid,vtiger_troubletickets.title as name,vtiger_ticketgrouprelation.groupname,'Tickets ' as Type from vtiger_troubletickets inner join vtiger_ticketgrouprelation on vtiger_ticketgrouprelation.ticketid=vtiger_troubletickets.ticketid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_troubletickets.ticketid inner join vtiger_groups on vtiger_ticketgrouprelation.groupname=vtiger_groups.groupname where vtiger_crmentity.deleted=0 and vtiger_troubletickets.status != 'Closed' and vtiger_ticketgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")"; } + if(isPermitted('Potentials','index') == "yes") + { + if($query != '') + $query .=" union all "; + //Get the potentials assigned to group(sales stage not Closed Lost or Closed Won-- hardcoded value) + $query .= "select vtiger_potential.potentialid,vtiger_potential.potentialname as name,vtiger_potentialgrouprelation.groupname as groupname,'Potentials ' as Type from vtiger_potential inner join vtiger_potentialgrouprelation on vtiger_potentialgrouprelation.potentialid = vtiger_potential.potentialid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid inner join vtiger_groups on vtiger_potentialgrouprelation.groupname = vtiger_groups.groupname where vtiger_crmentity.deleted=0 and ((vtiger_potential.sales_stage !='Closed Lost') or (vtiger_potential.sales_stage != 'Closed Won')) and vtiger_potentialgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")"; + + } + if(isPermitted('Accounts','index') == "yes") + { + if($query != '') + $query .=" union all "; + //Get the Accounts assigned to group + $query .= "select vtiger_account.accountid as id,vtiger_account.accountname as name,vtiger_accountgrouprelation.groupname as groupname, 'Accounts ' as Type from vtiger_account inner join vtiger_accountgrouprelation on vtiger_account.accountid=vtiger_accountgrouprelation.accountid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid inner join vtiger_groups on vtiger_accountgrouprelation.groupname=vtiger_groups.groupname where vtiger_crmentity.deleted=0 and vtiger_accountgrouprelation.groupname is not null and vtiger_groups.groupid in(".$groupids.")"; + } + if(isPermitted('Contacts','index' =='yes')) + { + if($query != '') + $query .=" union all "; + //Get the Contacts assigned to group + $query .= "select vtiger_contactdetails.contactid as id, vtiger_contactdetails.lastname as name ,vtiger_contactgrouprelation.groupname as groupname, 'Contacts ' as Type from vtiger_contactdetails inner join vtiger_contactgrouprelation on vtiger_contactdetails.contactid = vtiger_contactgrouprelation.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_groups on vtiger_contactgrouprelation.groupname = vtiger_groups.groupname where vtiger_crmentity.deleted=0 and vtiger_contactgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")"; + } + if(isPermitted('Campaigns','index' =='yes')) + { + if($query != '') + $query .=" union all "; + //Get the Campaigns assigned to group(Campaign status not Complete -- hardcoded value) + $query .= "select vtiger_campaign.campaignid as id, vtiger_campaign.campaignname as name, vtiger_campaigngrouprelation.groupname as groupname,'Campaigns ' as Type from vtiger_campaign inner join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid inner join vtiger_groups on vtiger_campaigngrouprelation.groupname = vtiger_groups.groupname where vtiger_crmentity.deleted=0 and (vtiger_campaign.campaignstatus != 'Complete') and vtiger_campaigngrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")"; + } + if(isPermitted('Quotes','index' == 'yes')) + { + if($query != '') + $query .=" union all "; + //Get the Quotes assigned to group(Quotes stage not Rejected -- hardcoded value) + $query .="select vtiger_quotes.quoteid as id,vtiger_quotes.subject as name, vtiger_quotegrouprelation.groupname as groupname ,'Quotes 'as Type from vtiger_quotes inner join vtiger_quotegrouprelation on vtiger_quotes.quoteid = vtiger_quotegrouprelation.quoteid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_quotes.quoteid inner join vtiger_groups on vtiger_quotegrouprelation.groupname = vtiger_groups.groupname where vtiger_crmentity.deleted=0 and (vtiger_quotes.quotestage != 'Rejected') and vtiger_quotegrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")"; + } + if(isPermitted('SalesOrder','index' =='yes')) + { + if($query != '') + $query .=" union all "; + //Get the Sales Order assigned to group + $query .="select vtiger_salesorder.salesorderid as id, vtiger_salesorder.subject as name,vtiger_sogrouprelation.groupname as groupname,'SalesOrder ' as Type from vtiger_salesorder inner join vtiger_sogrouprelation on vtiger_salesorder.salesorderid = vtiger_sogrouprelation.salesorderid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_salesorder.salesorderid inner join vtiger_groups on vtiger_sogrouprelation.groupname = vtiger_groups.groupname where vtiger_crmentity.deleted=0 and vtiger_sogrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")"; + } + + if(isPermitted('Invoice','index' =='yes')) + { + if($query != '') + $query .=" union all "; + //Get the Sales Order assigned to group(Invoice status not Paid -- hardcoded value) + $query .="select vtiger_invoice.invoiceid as Id , vtiger_invoice.subject as Name, vtiger_invoicegrouprelation.groupname as Groupname,'Invoice ' as Type from vtiger_invoice inner join vtiger_invoicegrouprelation on vtiger_invoice.invoiceid=vtiger_invoicegrouprelation.invoiceid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_invoice.invoiceid inner join vtiger_groups on vtiger_invoicegrouprelation.groupname = vtiger_groups.groupname where vtiger_crmentity.deleted=0 and(vtiger_invoice.invoicestatus != 'Paid') and vtiger_invoicegrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")"; + } + if(isPermitted('PurchaseOrder','index' == 'yes')) + { + if($query != '') + $query .=" union all "; + //Get the Purchase Order assigned to group + $query .="select vtiger_purchaseorder.purchaseorderid as id,vtiger_purchaseorder.subject as name,vtiger_pogrouprelation.groupname as groupname, 'PurchaseOrder ' as Type from vtiger_purchaseorder inner join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid= vtiger_pogrouprelation.purchaseorderid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_purchaseorder.purchaseorderid inner join vtiger_groups on vtiger_pogrouprelation.groupname =vtiger_groups.groupname where vtiger_crmentity.deleted=0 and vtiger_pogrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")"; + } $log->info("Here is the where clause for the list view: $query"); - $result = $adb->limitquery($query,0,5) or die("Couldn't get the group listing"); + $result = $adb->query($query) or die("Couldn't get the group listing"); $title=array(); $title[]='myGroupAllocation.gif'; Modified: vtigercrm/branches/5.1_jens/modules/Import/ImportAjax.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Import/ImportAjax.php (original) +++ vtigercrm/branches/5.1_jens/modules/Import/ImportAjax.php Mon Apr 16 12:27:44 2007 @@ -14,53 +14,69 @@ include('modules/Import/Forms.php'); //This is to delete the map -if($_REQUEST['delete_map'] != '') + +if($_REQUEST['ajax_action'] == 'check_dup_map_name') { - $query = "update vtiger_import_maps set deleted=1 where id = ".$_REQUEST['mapping']; - $adb->query($query); + $map_name=$_REQUEST['name']; + global $adb; + $query="select * from vtiger_import_maps where deleted=0 and name='".$map_name."'"; + $Result = $adb->query($query); + $noofrows = $adb->num_rows($Result); + if($noofrows > 0) + echo "false"; //Map name already exists + else + echo "true"; +} +else +{ + + if($_REQUEST['delete_map'] != '') + { + $query = "update vtiger_import_maps set deleted=1 where id = ".$_REQUEST['mapping']; + $adb->query($query); + } + + $mapping_file = new ImportMap(); + $mapping_arr = $mapping_file->getSavedMappingContent($_REQUEST['mapping']); + + $importable_fields = $_SESSION['import_module_object_column_fields']; + $field_count = $_SESSION['import_module_field_count']; + $required_fields = $_SESSION['import_module_object_required_fields']; + $translated_column_fields = $_SESSION['import_module_translated_column_fields']; + + $tablename = ''; + $has_header = $_SESSION['import_has_header']; + $firstrow = $_SESSION['import_firstrow']; + $field_map = &$mapping_arr;//$_SESSION['import_field_map']; + $smarty_array1 = array(); + + for($i=0;$i<$field_count;$i++) + { + $suggest = ''; + if ($has_header && isset( $field_map[$firstrow[$i]] ) ) + { + $suggest = $field_map[$firstrow[$i]]; + } + else if (isset($field_map[$i])) + { + $suggest = $field_map[$i]; + } + + $smarty_array1[$i+1] = getFieldSelect( $importable_fields, + $i, + $required_fields, + $suggest, + $translated_column_fields, + $tablename + ); + } + + $smarty = new vtigerCRM_Smarty; + $smarty->assign("FIRSTROW",$firstrow); + $smarty->assign("SELECTFIELD",$smarty_array1); + + $smarty->display('ImportMap.tpl'); + } -$mapping_file = new ImportMap(); -$mapping_arr = $mapping_file->getSavedMappingContent($_REQUEST['mapping']); - -$importable_fields = $_SESSION['import_module_object_column_fields']; -$field_count = $_SESSION['import_module_field_count']; -$required_fields = $_SESSION['import_module_object_required_fields']; -$translated_column_fields = $_SESSION['import_module_translated_column_fields']; - -$tablename = ''; -$has_header = $_SESSION['import_has_header']; -$firstrow = $_SESSION['import_firstrow']; -$field_map = &$mapping_arr;//$_SESSION['import_field_map']; -$smarty_array1 = array(); - -for($i=0;$i<$field_count;$i++) -{ - $suggest = ''; - if ($has_header && isset( $field_map[$firstrow[$i]] ) ) - { - $suggest = $field_map[$firstrow[$i]]; - } - else if (isset($field_map[$i])) - { - $suggest = $field_map[$i]; - } - - $smarty_array1[$i+1] = getFieldSelect( $importable_fields, - $i, - $required_fields, - $suggest, - $translated_column_fields, - $tablename - ); -} - -$smarty = new vtigerCRM_Smarty; -$smarty->assign("FIRSTROW",$firstrow); -$smarty->assign("SELECTFIELD",$smarty_array1); - -$smarty->display('ImportMap.tpl'); - - - ?> Modified: vtigercrm/branches/5.1_jens/modules/Import/ImportSave.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Import/ImportSave.php (original) +++ vtigercrm/branches/5.1_jens/modules/Import/ImportSave.php Mon Apr 16 12:27:44 2007 @@ -29,6 +29,7 @@ { global $current_user; global $adb; + global $mod_strings; // MWC ** Getting vtiger_users $temp = get_user_array(FALSE); @@ -233,7 +234,7 @@ '.$start.' to '.$end.' of '.$totalnoofrows.' are imported successfully'; +$_SESSION['import_display_message'] = '
'.$start.' '.$mod_strings['to'].' '.$end.' '.$mod_strings['of'].' '.$totalnoofrows.' '.$mod_strings['are_imported_succesfully']; //return $_SESSION['import_display_message']; } ?> Modified: vtigercrm/branches/5.1_jens/modules/Import/ImportStep2.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Import/ImportStep2.php (original) +++ vtigercrm/branches/5.1_jens/modules/Import/ImportStep2.php Mon Apr 16 12:27:44 2007 @@ -226,10 +226,11 @@ $list_string_key = strtolower($_REQUEST['module']); $list_string_key .= "_import_fields"; -$translated_column_fields = $mod_list_strings[$list_string_key]; +//Now we are getting the import fields from DB instead of hard coded array $mod_list_strings +$translated_column_fields = getImportFieldsList($_REQUEST['module']);//$mod_list_strings[$list_string_key]; // adding custom vtiger_fields translations -getCustomFieldTrans($_REQUEST['module'],&$translated_column_fields); +//getCustomFieldTrans($_REQUEST['module'],&$translated_column_fields); $cnt=1; for($field_count = 0; $field_count < $ret_field_count; $field_count++) @@ -385,7 +386,7 @@ else { //if a vtiger_field mapped more than once, alert the user and return - alert("'"+tagName.options[tagName.selectedIndex].text+"' is mapped more than once. Please check the mapping."); + alert("'"+tagName.options[tagName.selectedIndex].text+""); return false; } } @@ -397,7 +398,7 @@ { if(seq_string.indexOf(required_fields[inner_loop]) == -1) { - alert('Please map the mandatory field "'+required_fields_name[inner_loop]+'"'); + alert(''+required_fields_name[inner_loop]+'"'); return false; } } @@ -407,7 +408,7 @@ { if(trim(document.getElementById("save_map_as").value) == '') { - alert("Please Enter Save Map Name"); + alert(""); return false; } } Modified: vtigercrm/branches/5.1_jens/modules/Import/ImportSteplast.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Import/ImportSteplast.php (original) +++ vtigercrm/branches/5.1_jens/modules/Import/ImportSteplast.php Mon Apr 16 12:27:44 2007 @@ -145,11 +145,11 @@ $implict_account = false; $import_modules_array = Array( - "Leads"=>"Lead", - "Accounts"=>"Account", - "Contacts"=>"Contact", - "Potentials"=>"Potential", - "Products"=>"Product" + "Leads"=>"Leads", + "Accounts"=>"Accounts", + "Contacts"=>"Contacts", + "Potentials"=>"Potentials", + "Products"=>"Products" ); foreach($import_modules_array as $module_name => $object_name) @@ -220,8 +220,8 @@ //Retreive the List View Header and Entries $listview_header = getListViewHeader($object,$module_name); $listview_entries = getListViewEntries($object,$module_name,$list_result,$navigation_array,"","","EditView","Delete",""); - - $smarty->assign("NAVIGATION", $navigationOutput); + //commented to remove navigation buttons from import list view + //$smarty->assign("NAVIGATION", $navigationOutput); $smarty->assign("HIDE_CUSTOM_LINKS", 1);//Added to hide the CustomView links in imported records ListView $smarty->assign("LISTHEADER", $listview_header); $smarty->assign("LISTENTITY", $listview_entries); Modified: vtigercrm/branches/5.1_jens/modules/Import/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Import/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Import/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -125,7 +125,6 @@ 'LBL_LEADS_NOTE_2'=>'Company Name must be mapped.', 'LBL_IMPORT_NOW'=>'Import Now', 'LBL_'=>'', -'LBL_'=>'', 'LBL_CANNOT_OPEN'=>'Cannot open the imported file for reading', 'LBL_NOT_SAME_NUMBER'=>'There were not the same number of fields per line in your file', 'LBL_NO_LINES'=>'There were no lines in your import file', @@ -163,11 +162,20 @@ 'LBL_STEP_3_3'=>'Step 3 of 3 : ', 'LBL_MAPPING_RESULTS'=>'Mapping Results ', 'LBL_LAST_IMPORTED'=>'Last Imported', +//Added for sript alerts +'PLEASE_CHECK_MAPPING' => "' is mapped more than once. Please check the mapping.", +'MAP_MANDATORY_FIELD' => 'Please map the mandatory field "', +'ENTER_SAVEMAP_NAME' => 'Please Enter Save Map Name', + +//Added for 5.0.3 +'to'=>'to', +'of'=>'of', +'are_imported_succesfully'=>'are imported successfully', + ); /*$mod_list_strings = Array( -'contacts_import_fields' => Array( "id"=>"Contact ID" ,"first_name"=>"First Name" ,"last_name"=>"Last Name" Modified: vtigercrm/branches/5.1_jens/modules/Invoice/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Invoice/CreatePDF.php (original) +++ vtigercrm/branches/5.1_jens/modules/Invoice/CreatePDF.php Mon Apr 16 12:27:44 2007 @@ -11,12 +11,13 @@ require_once('include/fpdf/pdf.php'); +require_once('include/fpdf/pdfconfig.php'); require_once('modules/Invoice/Invoice.php'); require_once('modules/Organization/Organization.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/EditViewUtils.php'); -global $adb,$app_strings,$products_per_page,$focus; +global $adb,$app_strings,$focus; global $log; // for template checking ... @@ -29,7 +30,6 @@ // would you like and end page? 1 for yes 0 for no $endpage="1"; -$products_per_page="6"; $id = $_REQUEST['record']; @@ -37,7 +37,7 @@ $focus = new Invoice(); $focus->retrieve_entity_info($_REQUEST['record'],"Invoice"); $account_name = getAccountName($focus->column_fields[account_id]); - +$invoice_no = $focus->column_fields[invoice_no]; // **************** BEGIN POPULATE DATA ******************** @@ -57,14 +57,15 @@ $bill_code = $focus->column_fields["bill_code"]; $bill_country = $focus->column_fields["bill_country"]; +$contact_name =getContactName($focus->column_fields["contact_id"]); $ship_street = $focus->column_fields["ship_street"]; $ship_city = $focus->column_fields["ship_city"]; $ship_state = $focus->column_fields["ship_state"]; $ship_code = $focus->column_fields["ship_code"]; $ship_country = $focus->column_fields["ship_country"]; -$conditions = $focus->column_fields["terms_conditions"]; -$description = $focus->column_fields["description"]; +$conditions = from_html($focus->column_fields["terms_conditions"]); +$description = from_html($focus->column_fields["description"]); $status = $focus->column_fields["invoicestatus"]; // Company information @@ -140,7 +141,11 @@ if($discount_amount != "") $price_discount = number_format($discount_amount,2,'.',','); else if($discount_percent != "") - $price_discount = $discount_percent."%"; +{ + //This will be displayed near Discount label - used in include/fpdf/templates/body.php + $final_price_discount_percent = "(".number_format($discount_percent,2,'.',',')." %)"; + $price_discount = number_format((($discount_percent*$focus->column_fields["hdnSubTotal"])/100),2,'.',','); +} else $price_discount = "0.00"; @@ -198,6 +203,8 @@ $list_price[$i] = number_format($associated_products[$i]['listPrice'.$i],2,'.',','); $list_pricet[$i] = $associated_products[$i]['listPrice'.$i]; $discount_total[$i] = $associated_products[$i]['discountTotal'.$i]; + //aded for 5.0.3 pdf changes + $product_code[$i] = $associated_products[$i]['hdnProductcode'.$i]; $taxable_total = $qty[$i]*$list_pricet[$i]-$discount_total[$i]; @@ -219,12 +226,47 @@ } $prod_total[$i] = number_format($producttotal,2,'.',','); + $product_line[$j]["Product Code"] = $product_code[$i]; $product_line[$j]["Product Name"] = $product_name[$i]; - $product_line[$j]["Description"] = $prod_description[$i]; $product_line[$j]["Qty"] = $qty[$i]; $product_line[$j]["Price"] = $list_price[$i]; $product_line[$j]["Discount"] = $discount_total[$i]; $product_line[$j]["Total"] = $prod_total[$i]; + + // Product piecelists + $query = "SELECT vtiger_crmentity.crmid, + vtiger_products.productname as productname, + vtiger_products2products_rel.related_productid as prodid, + vtiger_products2products_rel.quantity as quantity, + vtiger_products2products_rel.product_relgroup as product_relgroup + FROM vtiger_products2products_rel + INNER JOIN vtiger_products + ON vtiger_products.productid = vtiger_products2products_rel.related_productid + INNER JOIN vtiger_crmentity + ON vtiger_crmentity.crmid = vtiger_products.productid + WHERE vtiger_crmentity.deleted = 0 + AND vtiger_products2products_rel.productid = ".$product_id[$i]." + AND vtiger_products2products_rel.relation_type = 10"; + $result = $adb->query($query); + $pieces = $adb->num_rows($result); + if( $pieces > 0) { + $product_line[++$j]["Product Name"] = ""; + $product_line[$j]["Description"] = "consisting of:"; + $product_line[$j]["Qty"] = ""; + $product_line[$j]["Price"] = ""; + $product_line[$j]["Discount"] = ""; + $product_line[$j]["Total"] = ""; + for( $pl=0; $pl<$pieces; $pl++) { + $product_line[++$j]["Product Name"] = ""; + $product_line[$j]["Description"] = + $adb->query_result( $result, $pl, "productname"); + $product_line[$j]["Qty"] = + $adb->query_result( $result, $pl, "quantity"); + $product_line[$j]["Price"] = ""; + $product_line[$j]["Discount"] = ""; + $product_line[$j]["Total"] = ""; + } + } } //echo '
Product Details ==>';print_r($product_line);echo '
'; @@ -236,7 +278,7 @@ $pdf = new PDF( 'P', 'mm', 'A4' ); $pdf->Open(); -$num_pages=ceil(($num_products/$products_per_page)); +$num_pages=ceil(count($product_line)/$products_per_page); $current_product=0; @@ -252,15 +294,21 @@ $current_product++; } + //if bottom > 145 then we skip the Description and T&C in every + //page and display only in lastpage + //if you want to display the description and T&C in each page then + //set the display_desc_tc='true' and bottom <= 145 in pdfconfig.php $pdf->AddPage(); if( $page_num == "1") { include("pdf_templates/".$template."/firstpage/header.php"); include("pdf_templates/".$template."/firstpage/body.php"); - include("pdf_templates/".$template."/firstpage/footer.php"); + if($display_desc_tc == 'true' && $bottom <= 145) + include("pdf_templates/".$template."/firstpage/footer.php"); } else { include("pdf_templates/".$template."/pages/header.php"); include("pdf_templates/".$template."/pages/body.php"); - include("pdf_templates/".$template."/pages/footer.php"); + if($display_desc_tc == 'true' && $bottom <= 145) + include("pdf_templates/".$template."/pages/footer.php"); } $page_num++; Modified: vtigercrm/branches/5.1_jens/modules/Invoice/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Invoice/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Invoice/DetailView.php Mon Apr 16 12:27:44 2007 @@ -93,6 +93,7 @@ $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); $smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); if($singlepane_view == 'true') { $related_array = getRelatedLists($currentModule,$focus); Modified: vtigercrm/branches/5.1_jens/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Invoice/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Invoice/EditView.php Mon Apr 16 12:27:44 2007 @@ -31,6 +31,8 @@ require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); require_once('include/FormValidationUtil.php'); +//Addded for Custom Invoice Number +require_once('user_privileges/CustomInvoiceNo.php'); global $app_strings,$mod_strings,$currentModule,$log,$current_user; global $current_organization; @@ -351,16 +353,29 @@ $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); +//Added for Custom Invoice Number +//we have check the Invoice Number for duplicate only in create view +if($focus->mode != 'edit') +{ + $invoiceno=$inv_str.$inv_no; + if(CheckDuplicateInvoiceNumber($invoiceno)) + echo '
Duplicate Invoice Number - Click here to Configure the Invoice Number'.$num_rows; + else + $smarty->assign("inv_no",($inv_str.$inv_no)); +} + + $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); $organization = new Organization; $organization->id = $current_organization; $smarty->assign("ASSIGN_ORGUNIT_LIST", getOrgUnits($organization)); if($focus->mode == 'edit') - $smarty->display("Inventory/InventoryEditView.tpl"); + $smarty->display("Inventory/InventoryEditView.tpl"); else - $smarty->display('Inventory/InventoryCreateView.tpl'); + $smarty->display('Inventory/InventoryCreateView.tpl'); ?> Modified: vtigercrm/branches/5.1_jens/modules/Invoice/Invoice.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Invoice/Invoice.php (original) +++ vtigercrm/branches/5.1_jens/modules/Invoice/Invoice.php Mon Apr 16 12:27:44 2007 @@ -83,6 +83,8 @@ var $default_order_by = 'crmid'; var $default_sort_order = 'ASC'; + var $groupTable = Array('vtiger_invoicegrouprelation','invoiceid'); + /** Constructor which will set the column_fields in this object */ function Invoice() { @@ -107,8 +109,20 @@ $query1 = "update vtiger_salesorder set sostatus='Approved' where salesorderid=".$so_id; $this->db->query($query1); } - //Based on the total Number of rows we will save the product relationship with this entity - saveInventoryProductDetails(&$this, 'Invoice'); + + //in ajax save we should not call this function, because this will delete all the existing product values + if($_REQUEST['action'] != 'InvoiceAjax' && $_REQUEST['ajxaction'] != 'DETAILVIEW') + { + //Based on the total Number of rows we will save the product relationship with this entity + saveInventoryProductDetails(&$this, 'Invoice'); + } + //Added For Custom Invoice Number + //Here we Incrementing the new InvoiceNumber + if($this->mode != 'edit') + { + setInventoryInvoiceNumber("increment_invoiceno"); + } + } @@ -174,7 +188,7 @@ else $returnset = '&return_module=Invoice&return_action=CallRelatedList&return_id='.$id; - $query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL AND vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL AND vtiger_activity.status != 'Deferred')"; + $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL and vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL and vtiger_activity.status != 'Deferred')"; $log->debug("Exiting get_activities method ..."); return GetRelatedList('Invoice','Calendar',$focus,$query,$button,$returnset); } @@ -187,17 +201,15 @@ { global $log; $log->debug("Entering get_history(".$id.") method ..."); - $query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, - vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, - vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name + $query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime,vtiger_crmentity.createdtime, vtiger_crmentity.description, case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid - inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid - left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname + left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname + left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_activity.activitytype='Task' and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred') and vtiger_seactivityrel.crmid=".$id; Modified: vtigercrm/branches/5.1_jens/modules/Invoice/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Invoice/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Invoice/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -183,7 +183,8 @@ 'Sent'=>'Sent', 'Credit Invoice'=>'Credit Invoice', 'Paid'=>'Paid', - +//Added to Custom Invoice Number +'invoice_no'=>'Invoice No', ); ?> Modified: vtigercrm/branches/5.1_jens/modules/Invoice/pdf_templates/Default/_default/header.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Invoice/pdf_templates/Default/_default/header.php (original) +++ vtigercrm/branches/5.1_jens/modules/Invoice/pdf_templates/Default/_default/header.php Mon Apr 16 12:27:44 2007 @@ -51,7 +51,7 @@ $pdf->addTextBlock( "Shipping Address:", $shipText, $shipLocation ); // billing Address -$billPositions = array("147","43","60"); +$billPositions = array("147","40","60"); $billText=$bill_street."\n".$bill_city.", ".$bill_state." ".$bill_code."\n".$bill_country; $pdf->addTextBlock("Billing Address:",$billText, $billPositions); // ********** End Addresses ****************** @@ -60,16 +60,24 @@ /* ******** Begin Invoice Data ************************ */ // terms block -$termBlock=array("10","65"); +$termBlock=array("10","67"); $pdf->addRecBlock($account_name, "Customer Name", $termBlock); +// issue date block +$issueBlock=array("80","37"); +$pdf->addRecBlock(date("Y-m-d"), "Issue Date",$issueBlock); + // due date block -$dueBlock=array("80","65"); +$dueBlock=array("81","52"); $pdf->addRecBlock($valid_till, "Due Date",$dueBlock); +// Contact Name block +$conBlock=array("79","67"); +$pdf->addRecBlock($contact_name, "Contact Name",$conBlock); + // vtiger_invoice number block -$invBlock=array("145","65"); -$pdf->addRecBlock($id, "Invoice Number",$invBlock); +$invBlock=array("145","67"); +$pdf->addRecBlock($invoice_no, "Invoice Number",$invBlock); /* ************ End Invoice Data ************************ */ Modified: vtigercrm/branches/5.1_jens/modules/Leads/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/CallRelatedList.php (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/CallRelatedList.php Mon Apr 16 12:27:44 2007 @@ -66,10 +66,11 @@ $smarty->assign("ID",$focus->id); $smarty->assign("NAME",$focus->lastname.' '.$focus->firstname); +$smarty->assign("EMAIL",$focus->column_fields['email']); +$smarty->assign("YAHOO",$focus->column_fields['yahooid']); $related_array = getRelatedLists($currentModule,$focus); $smarty->assign("RELATEDLISTS", $related_array); $smarty->assign("SINGLE_MOD",$app_strings['Lead']); -$smarty->assign("REDIR_MOD","leads"); $smarty->assign("MODULE", $currentmodule); $smarty->assign("UPDATEINFO",updateInfo($focus->id)); $smarty->assign("MOD",$mod_strings); Modified: vtigercrm/branches/5.1_jens/modules/Leads/ConvertLead.html ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/ConvertLead.html (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/ConvertLead.html Mon Apr 16 12:27:44 2007 @@ -96,6 +96,6 @@ {JAVASCRIPT} - + Modified: vtigercrm/branches/5.1_jens/modules/Leads/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/DetailView.php Mon Apr 16 12:27:44 2007 @@ -61,7 +61,6 @@ $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); $smarty->assign("ID", $focus->id); $smarty->assign("SINGLE_MOD", 'Lead'); -$smarty->assign("REDIR_MOD","leads"); $smarty->assign("NAME",$focus->lastname.' '.$focus->firstname); @@ -97,6 +96,9 @@ $parent_email = getEmailParentsList('Leads',$_REQUEST['record']); $smarty->assign("HIDDEN_PARENTS_LIST",$parent_email); $smarty->assign("SENDMAILBUTTON","permitted"); + $smarty->assign("EMAIL1",$focus->column_fields['email']); + $smarty->assign("EMAIL2",$focus->column_fields['yahooid']); + } if(isPermitted("Leads","Merge",'') == 'yes') @@ -110,6 +112,7 @@ $optionString[$tempVal["templateid"]] =$tempVal["filename"]; $tempVal = $adb->fetch_array($wordTemplateResult); } + $smarty->assign("TEMPLATECOUNT",$tempCount); $smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']); $smarty->assign("TOPTIONS",$optionString); } @@ -121,12 +124,14 @@ $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); - + $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); $smarty->assign("MODULE", $currentModule); $smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); + +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); if($singlepane_view == 'true') { Modified: vtigercrm/branches/5.1_jens/modules/Leads/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/EditView.php Mon Apr 16 12:27:44 2007 @@ -112,6 +112,7 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("DUPLICATE",$_REQUEST['isDuplicate']); // Assigned organizations $smarty->assign("CURRENT_ORGANIZATION",$current_organization); Modified: vtigercrm/branches/5.1_jens/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/LeadConvertToEntities.php Mon Apr 16 12:27:44 2007 @@ -13,7 +13,6 @@ require_once('modules/Leads/Leads.php'); //Getting the Parameters from the ConvertLead Form $id = $_REQUEST["record"]; - $module = $_REQUEST["module"]; $createpotential = $_REQUEST["createpotential"]; @@ -228,26 +227,20 @@ /** Function used to save the lead related products with other entities Account, Contact and Potential * $leadid - leadid * $relatedid - related entity id (accountid/contactid/potentialid) - * $relatedmodule - related entity module name - optional, but for contacts we have to pass Contact because we have to update contactid in vtiger_products table. */ -function saveLeadRelatedProducts($leadid, $relatedid, $relatedmodule = '') +function saveLeadRelatedProducts($leadid, $relatedid) { global $adb, $log; - $log->debug("Entering into function saveLeadRelatedProducts($leadid, $relatedid, \"$relatedmodule\")"); + $log->debug("Entering into function saveLeadRelatedProducts($leadid, $relatedid)"); $product_result = $adb->query("select * from vtiger_seproductsrel where crmid=$leadid"); $noofproducts = $adb->num_rows($product_result); for($i = 0; $i < $noofproducts; $i++) { $productid = $adb->query_result($product_result,$i,'productid'); - - $adb->query("insert into vtiger_seproductsrel (productid, crmid) values($productid, $relatedid)"); - - if($relatedmodule == 'Contacts') - { - //update contactid in products table then only the products will be shown in contact relatedlist - $adb->query("update vtiger_products set contactid=$relatedid where productid=$productid"); - } + $setype = $adb->query_result($product_result,$i,'setype'); + + $adb->query("insert into vtiger_seproductsrel values($relatedid, $productid,'".$setype."')"); } $log->debug("Exit from function saveLeadRelatedProducts."); @@ -272,7 +265,6 @@ } $log->debug("Exit from function saveLeadRelatedCampaigns."); } - /*Code integrated to avoid duplicate Account creation during ConvertLead Operation START-- by Bharathi*/ @@ -297,10 +289,10 @@ /* Modified by Minnie -- END*/ $adb->query($sql_insert_account); - $sql_insert_accountbillads = "INSERT INTO vtiger_accountbillads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')"; + $sql_insert_accountbillads = "INSERT INTO vtiger_accountbillads (accountaddressid,city,code,country,state,street,pobox) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."','".$row["pobox"]."')"; $adb->query($sql_insert_accountbillads); - $sql_insert_accountshipads = "INSERT INTO vtiger_accountshipads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')"; + $sql_insert_accountshipads = "INSERT INTO vtiger_accountshipads (accountaddressid,city,code,country,pobox,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["pobox"]."','".$row["state"] ."','" .$row["lane"]."')"; $adb->query($sql_insert_accountshipads); //Getting the custom vtiger_field values from leads and inserting into Accounts if the vtiger_field is mapped - Jaguar @@ -329,7 +321,6 @@ //Up to this, Account related data save finshed - $date_entered = $adb->formatDate(date('YmdHis')); $date_modified = $adb->formatDate(date('YmdHis')); @@ -351,7 +342,7 @@ $adb->query($sql_insert_contactsubdetails); -$sql_insert_contactaddress = "INSERT INTO vtiger_contactaddress (contactaddressid,mailingcity,mailingstreet,mailingstate,mailingcountry,mailingzip) VALUES (".$contact_id.",'".$row["city"] ."','" .$row["lane"] ."','".$row['state']."','" .$row["country"] ."','".$row['code']."')"; +$sql_insert_contactaddress = "INSERT INTO vtiger_contactaddress (contactaddressid,mailingcity,mailingstreet,mailingstate,mailingcountry,mailingpobox,mailingzip) VALUES (".$contact_id.",'".$row["city"] ."','" .$row["lane"] ."','".$row['state']."','" .$row["country"] ."','".$row["pobox"]."','".$row['code']."')"; $adb->query($sql_insert_contactaddress); @@ -376,7 +367,7 @@ getRelatedActivities($account_id,$contact_id); //To convert relates Activites and Email -Jaguar //Retrieve the lead related products and relate them with this new contact -saveLeadRelatedProducts($id, $contact_id, "Contacts"); +saveLeadRelatedProducts($id, $contact_id); //Retrieve the lead related Campaigns and relate them with this new contact --Minnie saveLeadRelatedCampaigns($id, $contact_id); Modified: vtigercrm/branches/5.1_jens/modules/Leads/Leads.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/Leads.php (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/Leads.php Mon Apr 16 12:27:44 2007 @@ -1,431 +1,443 @@ -'crmid','vtiger_leaddetails'=>'leadid','vtiger_leadsubdetails'=>'leadsubscriptionid','vtiger_leadaddress'=>'leadaddressid','vtiger_leadscf'=>'leadid','vtiger_entity2org'=>'crmid'); - - - - //construct this from database; - var $column_fields = Array(); - var $sortby_fields = Array('lastname','firstname','email','phone','company','smownerid','website'); - - // This is used to retrieve related vtiger_fields from form posts. - var $additional_column_fields = Array('smcreatorid', 'smownerid', 'contactid','potentialid' ,'crmid'); - - // This is the list of vtiger_fields that are in the lists. - var $list_fields = Array( - 'Last Name'=>Array('leaddetails'=>'lastname'), - 'First Name'=>Array('leaddetails'=>'firstname'), - 'Company'=>Array('leaddetails'=>'company'), - 'Phone'=>Array('leadaddress'=>'phone'), - 'Website'=>Array('leadsubdetails'=>'website'), - 'Email'=>Array('leaddetails'=>'email'), - 'Assigned To'=>Array('crmentity'=>'smownerid') - ); - var $list_fields_name = Array( - 'Last Name'=>'lastname', - 'First Name'=>'firstname', - 'Company'=>'company', - 'Phone'=>'phone', - 'Website'=>'website', - 'Email'=>'email', - 'Assigned To'=>'assigned_user_id' - ); - var $list_link_field= 'lastname'; - - var $search_fields = Array( - 'Name'=>Array('leaddetails'=>'lastname'), - 'Company'=>Array('leaddetails'=>'company') - ); - var $search_fields_name = Array( - 'Name'=>'lastname', - 'Company'=>'company' - ); - - var $required_fields = array("lastname"=>1, 'company'=>1); - - //Added these variables which are used as default order by and sortorder in ListView - var $default_order_by = 'lastname'; - var $default_sort_order = 'ASC'; - - function Leads() { - $this->log = LoggerManager::getLogger('lead'); - $this->log->debug("Entering Leads() method ..."); - $this->db = new PearDatabase(); - $this->column_fields = getColumnFields('Leads'); - $this->log->debug("Exiting Lead method ..."); - } - - /** Function to handle module specific operations when saving a entity - */ - function save_module($module) - { - } - - // Mike Crowe Mod --------------------------------------------------------Default ordering for us - /** - * Function to get sort order - * return string $sorder - sortorder string either 'ASC' or 'DESC' - */ - function getSortOrder() - { - global $log; - $log->debug("Entering getSortOrder() method ..."); - if(isset($_REQUEST['sorder'])) - $sorder = $_REQUEST['sorder']; - else - $sorder = (($_SESSION['LEADS_SORT_ORDER'] != '')?($_SESSION['LEADS_SORT_ORDER']):($this->default_sort_order)); - - $log->debug("Exiting getSortOrder method ..."); - return $sorder; - } - - /** - * Function to get order by - * return string $order_by - fieldname(eg: 'leadname') - */ - function getOrderBy() - { - global $log; - $log->debug("Entering getOrderBy() method ..."); - if (isset($_REQUEST['order_by'])) - $order_by = $_REQUEST['order_by']; - else - $order_by = (($_SESSION['LEADS_ORDER_BY'] != '')?($_SESSION['LEADS_ORDER_BY']):($this->default_order_by)); - - $log->debug("Exiting getOrderBy method ..."); - return $order_by; - } - // Mike Crowe Mod -------------------------------------------------------- - - - - /** Function to export the lead records in CSV Format - * @param reference variable - order by is passed when the query is executed - * @param reference variable - where condition is passed when the query is executed - * Returns Export Leads Query. - */ - function create_export_query(&$order_by, &$where) - { - global $log; - global $current_user; - $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - - include("include/utils/ExportUtils.php"); - - //To get the Permitted fields query and the permitted fields list - $sql = getPermittedFieldsQuery("Leads", "detail_view"); - $fields_list = getFieldsListFromQuery($sql); - - $query = "SELECT $fields_list FROM ".$this->entity_table." - INNER JOIN vtiger_leaddetails - ON vtiger_crmentity.crmid=vtiger_leaddetails.leadid - LEFT JOIN vtiger_leadsubdetails - ON vtiger_leaddetails.leadid = vtiger_leadsubdetails.leadsubscriptionid - LEFT JOIN vtiger_leadaddress - ON vtiger_leaddetails.leadid=vtiger_leadaddress.leadaddressid - LEFT JOIN vtiger_leadscf - ON vtiger_leadscf.leadid=vtiger_leaddetails.leadid - LEFT JOIN vtiger_leadgrouprelation - ON vtiger_leadscf.leadid = vtiger_leadgrouprelation.leadid - LEFT JOIN vtiger_groups - ON vtiger_groups.groupname = vtiger_leadgrouprelation.groupname - LEFT JOIN vtiger_users - ON vtiger_crmentity.smownerid = vtiger_users.id - "; - - - $where_auto = " vtiger_users.status='Active' - AND vtiger_crmentity.deleted=0 AND vtiger_leaddetails.converted =0"; - - if($where != "") - $query .= "where ($where) AND ".$where_auto; - else - $query .= "where ".$where_auto; - - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - //we should add security check when the user has Private Access - if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[7] == 3) - { - //Added security check to get the permitted records only - $query = $query." ".getListViewSecurityParameter("Leads"); - } - - if(!empty($order_by)) - $query .= " ORDER BY $order_by"; - - $log->debug("Exiting create_export_query method ..."); - return $query; - } - - - - /** Returns a list of the associated tasks - * @param integer $id - leadid - * returns related Task or Event record in array format - */ -function get_activities($id) -{ - global $log, $singlepane_view; - $log->debug("Entering get_activities(".$id.") method ..."); - global $app_strings; - - $focus = new Activity(); - $button = ''; - - if(isPermitted("Calendar",1,"") == 'yes') - { - $button .= ' '; - $button .= ' 		".$mod_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."".$mod_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."'. $app_strings["LBL_CREATE_MERGE_TEMPLATE"].'
Modified: vtigercrm/branches/5.1_jens/modules/Products/AddProductToPriceBooks.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/AddProductToPriceBooks.php (original) +++ vtigercrm/branches/5.1_jens/modules/Products/AddProductToPriceBooks.php Mon Apr 16 12:27:44 2007 @@ -79,7 +79,7 @@ //we should not display the Add to PriceBook button if there is no pricebooks to associate if($num_rows != $num_prod_rows) - $other_text .=' '; + $other_text .=' '; $other_text .=''; $other_text .=' @@ -115,9 +115,12 @@ $field_name=$entity_id."_listprice"; $list_body .= ''; $list_body .= ''; - $list_body .= ''; - $list_body .= ''; - $list_body .= ''; + $list_body .= ''; } } Modified: vtigercrm/branches/5.1_jens/modules/Products/AddProductsToPriceBook.html ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/AddProductsToPriceBook.html (original) +++ vtigercrm/branches/5.1_jens/modules/Products/AddProductsToPriceBook.html Mon Apr 16 12:27:44 2007 @@ -27,7 +27,7 @@ } - +

{PRODUCTLISTHEADER} Modified: vtigercrm/branches/5.1_jens/modules/Products/AddProductsToPriceBook.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/AddProductsToPriceBook.php (original) +++ vtigercrm/branches/5.1_jens/modules/Products/AddProductsToPriceBook.php Mon Apr 16 12:27:44 2007 @@ -78,7 +78,7 @@ //we should not display the Add to PriceBook button if there is no products to associate if($num_rows != $num_prod_rows) - $other_text .=''; + $other_text .=''; $other_text .=' '; @@ -135,8 +135,12 @@ $list_body .= ''; $list_body .= ''; $list_body .= ''; - $list_body .= ''; - $list_body .= ''; + $list_body .= ''; } } Modified: vtigercrm/branches/5.1_jens/modules/Products/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Products/DetailView.php Mon Apr 16 12:27:44 2007 @@ -94,6 +94,8 @@ $smarty->assign("MODULE", $currentModule); $smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); + if($singlepane_view == 'true') { $related_array = getRelatedLists($currentModule,$focus); Modified: vtigercrm/branches/5.1_jens/modules/Products/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Products/EditView.php Mon Apr 16 12:27:44 2007 @@ -207,6 +207,7 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); // Assigned organizations $smarty->assign("CURRENT_ORGANIZATION",$current_organization); @@ -219,7 +220,7 @@ $smarty->assign("USER_ORGANIZATIONS",$org_array); if($focus->mode == 'edit') - $smarty->display('Inventory/InventoryEditView.tpl'); + $smarty->display('Inventory/InventoryEditView.tpl'); else - $smarty->display('Inventory/InventoryCreateView.tpl'); + $smarty->display('Inventory/InventoryCreateView.tpl'); ?> Modified: vtigercrm/branches/5.1_jens/modules/Products/Products.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/Products.php (original) +++ vtigercrm/branches/5.1_jens/modules/Products/Products.php Mon Apr 16 12:27:44 2007 @@ -66,6 +66,17 @@ 'Unit Price'=>'unit_price' ); + var $dependend_fields = Array( + 'Product Name'=>Array('products'=>'productname'), + 'Part Number'=>Array('products'=>'productcode'), + 'Unit Price'=>Array('products'=>'unit_price') + ); + var $dependend_fields_name = Array( + 'Product Name'=>'productname', + 'Part Number'=>'productcode', + 'Unit Price'=>'unit_price' + ); + //Added these variables which are used as default order by and sortorder in ListView var $default_order_by = 'productname'; var $default_sort_order = 'ASC'; @@ -82,15 +93,6 @@ function save_module($module) { - //Inserting into vtiger_seproductsrel table - if(isset($this->column_fields['parent_id']) && $this->column_fields['parent_id'] != '') - { - $this->insertIntoEntityTable('vtiger_seproductsrel', 'Products'); - } - elseif($this->column_fields['parent_id']=='' && $insertion_mode=="edit") - { - $this->deleteRelation('vtiger_seproductsrel'); - } //Inserting into product_taxrel table if($_REQUEST['ajxaction'] != 'DETAILVIEW') { @@ -270,30 +272,142 @@ return getAttachmentsAndNotes('Products',$query,$id); } + /** function used to get the list of leads which are related to the product + * @param int $id - product id + * @return array - array which will be returned from the function GetRelatedList + */ + function get_leads($id) + { + global $log, $singlepane_view, $mod_strings; + $log->debug("Entering get_leads(".$id.") method ..."); + + require_once('modules/Leads/Leads.php'); + $focus = new Leads(); + + $button = ''; + + if($singlepane_view == 'true') + $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT vtiger_leaddetails.leadid, vtiger_crmentity.crmid, vtiger_leaddetails.firstname, vtiger_leaddetails.lastname, vtiger_leaddetails.company, vtiger_leadaddress.phone, vtiger_leadsubdetails.website, vtiger_leaddetails.email, case when (vtiger_users.user_name not like \"\") then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_crmentity.smownerid, vtiger_products.productname, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_products.expiry_date + FROM vtiger_leaddetails + INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_leaddetails.leadid + INNER JOIN vtiger_leadaddress ON vtiger_leadaddress.leadaddressid = vtiger_leaddetails.leadid + INNER JOIN vtiger_leadsubdetails ON vtiger_leadsubdetails.leadsubscriptionid = vtiger_leaddetails.leadid + INNER JOIN vtiger_seproductsrel ON vtiger_seproductsrel.crmid=vtiger_leaddetails.leadid + INNER JOIN vtiger_products ON vtiger_seproductsrel.productid = vtiger_products.productid + LEFT JOIN vtiger_users ON vtiger_users.id = vtiger_crmentity.smownerid + LEFT JOIN vtiger_leadgrouprelation ON vtiger_leaddetails.leadid = vtiger_leadgrouprelation.leadid + LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_leadgrouprelation.groupname + WHERE vtiger_crmentity.deleted = 0 AND vtiger_products.productid = ".$id; + + $log->debug("Exiting get_leads($id) method ..."); + return GetRelatedList('Products','Leads',$focus,$query,$button,$returnset); + } + + /** function used to get the list of accounts which are related to the product + * @param int $id - product id + * @return array - array which will be returned from the function GetRelatedList + */ + function get_accounts($id) + { + global $log, $singlepane_view, $mod_strings; + $log->debug("Entering get_accounts(".$id.") method ..."); + + require_once('modules/Accounts/Accounts.php'); + $focus = new Accounts(); + + $button = ''; + + if($singlepane_view == 'true') + $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT vtiger_account.accountid, vtiger_crmentity.crmid, vtiger_account.accountname, vtiger_accountbillads.city, vtiger_account.website, vtiger_account.phone, case when (vtiger_users.user_name not like \"\") then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_crmentity.smownerid, vtiger_products.productname, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_products.expiry_date + FROM vtiger_account + INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_account.accountid + INNER JOIN vtiger_accountbillads ON vtiger_accountbillads.accountaddressid = vtiger_account.accountid + INNER JOIN vtiger_seproductsrel ON vtiger_seproductsrel.crmid=vtiger_account.accountid + INNER JOIN vtiger_products ON vtiger_seproductsrel.productid = vtiger_products.productid + LEFT JOIN vtiger_users ON vtiger_users.id = vtiger_crmentity.smownerid + LEFT JOIN vtiger_accountgrouprelation ON vtiger_account.accountid = vtiger_accountgrouprelation.accountid + LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_accountgrouprelation.groupname + WHERE vtiger_crmentity.deleted = 0 AND vtiger_products.productid = ".$id; + + + $log->debug("Exiting get_accounts method ..."); + return GetRelatedList('Products','Accounts',$focus,$query,$button,$returnset); + } + + /** function used to get the list of contacts which are related to the product + * @param int $id - product id + * @return array - array which will be returned from the function GetRelatedList + */ + function get_contacts($id) + { + global $log, $singlepane_view, $mod_strings; + $log->debug("Entering get_contacts(".$id.") method ..."); + + require_once('modules/Contacts/Contacts.php'); + $focus = new Contacts(); + + $button = ''; + + if($singlepane_view == 'true') + $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_contactdetails.title, vtiger_contactdetails.accountid, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, case when (vtiger_users.user_name not like \"\") then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_crmentity.smownerid, vtiger_products.productname, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_products.expiry_date + FROM vtiger_contactdetails + INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_contactdetails.contactid + INNER JOIN vtiger_seproductsrel ON vtiger_seproductsrel.crmid=vtiger_contactdetails.contactid + INNER JOIN vtiger_products ON vtiger_seproductsrel.productid = vtiger_products.productid + LEFT JOIN vtiger_users ON vtiger_users.id = vtiger_crmentity.smownerid + LEFT JOIN vtiger_contactgrouprelation ON vtiger_contactdetails.contactid = vtiger_contactgrouprelation.contactid + LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname + WHERE vtiger_crmentity.deleted = 0 AND vtiger_products.productid = ".$id; + + $log->debug("Exiting get_contacts method ..."); + return GetRelatedList('Products','Contacts',$focus,$query,$button,$returnset); + } + + /** function used to get the list of potentials which are related to the product * @param int $id - product id - * @return void - but this function will call the function renderRelatedPotentials with parameter query + * @return array - array which will be returned from the function GetRelatedList */ function get_opportunities($id) { - global $log; + global $log, $singlepane_view, $mod_strings; $log->debug("Entering get_opportunities(".$id.") method ..."); - $query = "SELECT vtiger_potential.potentialid, vtiger_potential.potentialname, - vtiger_potential.potentialtype, vtiger_products.productid, - vtiger_products.productname, vtiger_products.qty_per_unit, - vtiger_products.unit_price, vtiger_products.expiry_date + + require_once('modules/Potentials/Potentials.php'); + $focus = new Potentials(); + + $button = ''; + + if($singlepane_view == 'true') + $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT vtiger_potential.potentialid, vtiger_crmentity.crmid, vtiger_potential.potentialname, vtiger_account.accountname, vtiger_potential.accountid, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, case when (vtiger_users.user_name not like \"\") then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_crmentity.smownerid, vtiger_products.productname, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_products.expiry_date FROM vtiger_potential - INNER JOIN vtiger_products - ON vtiger_potential.productid = vtiger_products.productid - LEFT JOIN vtiger_potentialgrouprelation - ON vtiger_potential.potentialid = vtiger_potentialgrouprelation.potentialid - LEFT JOIN vtiger_groups - ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname - inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid - WHERE vtiger_crmentity.deleted = 0 - AND vtiger_products.productid = ".$id; - $log->debug("Exiting get_opportunities method ..."); - renderRelatedPotentials($query); + INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_potential.potentialid + INNER JOIN vtiger_account ON vtiger_potential.accountid = vtiger_account.accountid + INNER JOIN vtiger_seproductsrel ON vtiger_seproductsrel.crmid = vtiger_potential.potentialid + INNER JOIN vtiger_products ON vtiger_seproductsrel.productid = vtiger_products.productid + LEFT JOIN vtiger_users ON vtiger_users.id = vtiger_crmentity.smownerid + LEFT JOIN vtiger_potentialgrouprelation ON vtiger_potential.potentialid = vtiger_potentialgrouprelation.potentialid + LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname + WHERE vtiger_crmentity.deleted = 0 AND vtiger_products.productid = ".$id; + + $log->debug("Exiting get_opportunities($id) method ..."); + return GetRelatedList('Products','Potentials',$focus,$query,$button,$returnset); } /** function used to get the list of tickets which are related to the product @@ -315,7 +429,7 @@ else $returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id; - $query = "SELECT vtiger_users.user_name, vtiger_users.id, + $query = "SELECT case when (vtiger_users.user_name not like \"\") then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_users.id, vtiger_products.productid, vtiger_products.productname, vtiger_troubletickets.ticketid, vtiger_troubletickets.parent_id, vtiger_troubletickets.title, @@ -335,7 +449,8 @@ ON vtiger_groups.groupname = vtiger_ticketgrouprelation.groupname WHERE vtiger_crmentity.deleted = 0 AND vtiger_products.productid = ".$id; - $log->debug("Exiting get_tickets method ..."); + + $log->debug("Exiting get_tickets method ..."); return GetRelatedList('Products','HelpDesk',$focus,$query,$button,$returnset); } @@ -419,7 +534,8 @@ vtiger_quotes.*, vtiger_potential.potentialname, vtiger_account.accountname, - vtiger_inventoryproductrel.productid + vtiger_inventoryproductrel.productid, + vtiger_users.user_name FROM vtiger_quotes INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_quotes.quoteid @@ -433,6 +549,8 @@ ON vtiger_quotes.quoteid = vtiger_quotegrouprelation.quoteid LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_quotegrouprelation.groupname + LEFT JOIN vtiger_users + ON vtiger_users.id=vtiger_crmentity.smownerid WHERE vtiger_crmentity.deleted = 0 AND vtiger_inventoryproductrel.productid = ".$id; $log->debug("Exiting get_quotes method ..."); @@ -461,7 +579,8 @@ $query = "SELECT vtiger_crmentity.*, vtiger_purchaseorder.*, vtiger_products.productname, - vtiger_inventoryproductrel.productid + vtiger_inventoryproductrel.productid, + vtiger_users.user_name FROM vtiger_purchaseorder INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_purchaseorder.purchaseorderid @@ -473,6 +592,8 @@ ON vtiger_purchaseorder.purchaseorderid = vtiger_pogrouprelation.purchaseorderid LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_pogrouprelation.groupname + LEFT JOIN vtiger_users + ON vtiger_users.id=vtiger_crmentity.smownerid WHERE vtiger_crmentity.deleted = 0 AND vtiger_products.productid = ".$id; $log->debug("Exiting get_purchase_orders method ..."); @@ -501,7 +622,8 @@ $query = "SELECT vtiger_crmentity.*, vtiger_salesorder.*, vtiger_products.productname AS productname, - vtiger_account.accountname + vtiger_account.accountname, + vtiger_users.user_name FROM vtiger_salesorder INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_salesorder.salesorderid @@ -515,6 +637,8 @@ ON vtiger_salesorder.salesorderid = vtiger_sogrouprelation.salesorderid LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_sogrouprelation.groupname + LEFT JOIN vtiger_users + ON vtiger_users.id=vtiger_crmentity.smownerid WHERE vtiger_crmentity.deleted = 0 AND vtiger_products.productid = ".$id; $log->debug("Exiting get_salesorder method ..."); @@ -543,7 +667,8 @@ $query = "SELECT vtiger_crmentity.*, vtiger_invoice.*, vtiger_inventoryproductrel.quantity, - vtiger_account.accountname + vtiger_account.accountname, + vtiger_users.user_name FROM vtiger_invoice INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_invoice.invoiceid @@ -555,6 +680,8 @@ ON vtiger_invoice.invoiceid = vtiger_invoicegrouprelation.invoiceid LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_invoicegrouprelation.groupname + LEFT JOIN vtiger_users + ON vtiger_users.id=vtiger_crmentity.smownerid WHERE vtiger_crmentity.deleted = 0 AND vtiger_inventoryproductrel.productid = ".$id; $log->debug("Exiting get_invoices method ..."); @@ -591,6 +718,82 @@ AND vtiger_pricebookproductrel.productid = ".$id; $log->debug("Exiting get_product_pricebooks method ..."); return GetRelatedList('Products','PriceBooks',$focus,$query,$button,$returnset); + } + + /** function used to get the piecelist for this product + * @param int $id - product id + * @return array - array which will be returned from the function GetRelatedList + */ + function get_product_piecelist($id) + { + return $this->get_product_dependencies($id,10); + } + + /** function used to get the list of required products for this product + * @param int $id - product id + * @return array - array which will be returned from the function GetRelatedList + */ + function get_product_depends($id) + { + return $this->get_product_dependencies($id,20); + } + + /** function used to get the list of products incompatible with this product + * @param int $id - product id + * @return array - array which will be returned from the function GetRelatedList + */ + function get_product_incompatibles($id) + { + return $this->get_product_dependencies($id,21); + } + + /** function used to get the list of optional products related to this product + * @param int $id - product id + * @return array - array which will be returned from the function GetRelatedList + */ + function get_product_options($id) + { + return $this->get_product_dependencies($id,30); + } + + /** function used to get the list of products to be purchased to sell this product + * @param int $id - product id + * @return array - array which will be returned from the function GetRelatedList + */ + function get_product_purchaselist($id) + { + return $this->get_product_dependencies($id,40); + } + + /** function used to get generic product dependencies + * @param int $id - product id + * @param int $type - dependency typ (10=piecelist, 20=requirement, 21=incompatible, 30=option, 40=purchaselist) + * @return array - array which will be returned from the function GetRelatedList + */ + function get_product_dependencies($id,$type) + { + global $log,$singlepane_view; + $log->debug("Entering get_product_dependencies(".$id.",".$type.") method ..."); + global $mod_strings; + $button = ''; + $returnset = '&return_module=Products&return_action=CallDependencyList&return_id='.$id; + $focus = new Products(); + + $query = "SELECT vtiger_crmentity.crmid, + vtiger_products.*, + vtiger_products2products_rel.related_productid as prodid, + vtiger_products2products_rel.quantity as quantity, + vtiger_products2products_rel.product_relgroup as product_relgroup + FROM vtiger_products2products_rel + INNER JOIN vtiger_products + ON vtiger_products.productid = vtiger_products2products_rel.related_productid + INNER JOIN vtiger_crmentity + ON vtiger_crmentity.crmid = vtiger_products.productid + WHERE vtiger_crmentity.deleted = 0 + AND vtiger_products2products_rel.productid = ".$id." + AND vtiger_products2products_rel.relation_type = ".$type; + $log->debug("Exiting get_product_dependencies method ..."); + return GetRelatedList('Products','Products',$focus,$query,$button,$returnset,'','','',$type); } /** function used to get the number of vendors which are related to the product @@ -650,18 +853,19 @@ LEFT JOIN vtiger_potential vtiger_ProductRelatedToPotential ON vtiger_ProductRelatedToPotential.potentialid = vtiger_seproductsrel.crmid - LEFT JOIN vtiger_contactdetails - ON vtiger_contactdetails.contactid = vtiger_products.contactid + LEFT JOIN vtiger_contactdetails vtiger_ProductRelatedToContact + ON vtiger_ProductRelatedToContact.contactid = vtiger_seproductsrel.crmid + LEFT JOIN vtiger_vendor ON vtiger_vendor.vendorid = vtiger_products.vendor_id WHERE vtiger_crmentity.deleted = 0 AND vtiger_users.status = 'Active' - AND ((vtiger_seproductsrel.crmid IS NULL - AND (vtiger_products.contactid = 0 OR vtiger_products.contactid IS NULL)) - OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Leads').") - OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Accounts').") - OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Potentials').") - OR vtiger_products.contactid IN (".getReadEntityIds('Contacts').")) + AND ( + (vtiger_seproductsrel.crmid IS NULL) + OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Leads').") + OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Accounts').") + OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Potentials').") + OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Contacts').")) group by vtiger_products.productid "; //ProductRelatedToLead, Account and Potential tables are added to get the Related to field Modified: vtigercrm/branches/5.1_jens/modules/Products/Save.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/Save.php (original) +++ vtigercrm/branches/5.1_jens/modules/Products/Save.php Mon Apr 16 12:27:44 2007 @@ -24,7 +24,7 @@ require_once('modules/Products/Products.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -global $log,$current_user; +global $log,$current_user,$mod_strings; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); $rate = $rate_symbol['rate']; @@ -139,14 +139,14 @@ $handler_name = getUserName($handler); $sender_name = getUserName($current_user->id); $to_address= getUserEmail($handler); - $subject = $productname.' Stock Level is Low'; - $body = 'Dear '.$handler_name.', + $subject = $productname.' '.$mod_strings['MSG_STOCK_LEVEL']; + $body = $mod_strings['MSG_DEAR'].' '.$handler_name.',

'. - The current stock of '.$productname.' in our warehouse is '.$qty_stk.'. Kindly procure required number of units as the stock level is below reorder level '.$reord.'. + $mod_strings['MSG_CURRENT_STOCK'].' '.$productname.' '.$mod_strings['MSG_IN_OUR_WAREHOUSE'].' '.$qty_stk.'. '.$mod_strings['MSG_PROCURE_REQUIRED_NUMBER'].' '.$reord.'.
'. - Severity: Major - Thanks, - '.$sender_name; + $mod_strings['MSG_SEVERITY'].'

'. + $mod_strings['MSG_THANKS'].'
'. + $sender_name; include("modules/Emails/mail.php"); $mail_status = send_mail("Products",$to_address,$current_user->user_name,$current_user->email1,$subject,$body); Modified: vtigercrm/branches/5.1_jens/modules/Products/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Products/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -63,7 +63,6 @@ 'LBL_COLON'=>':', 'LBL_ATTACHMENTS'=>'Attachments', -'LBL_NEW_ATTACHMENT'=>'New Attachment', 'LBL_ATTACH_FILE'=>'File Attachment', 'LBL_DESCRIPTION'=>'Description', 'LBL_FILE'=>'File Name', @@ -94,13 +93,18 @@ //Added for 4GA 'Product Name'=>'Product Name', -'Product Code'=>'Part Number', +//'Product Code'=>'Part Number', +'Part Number'=>'Part Number', 'Product Active'=>'Product Active', 'Commission Rate'=>'Commission Rate (%)', 'Qty/Unit'=>'Qty/Unit', 'Unit Price'=>'Unit Price', 'Manufacturer'=>'Manufacturer', 'Product Category'=>'Product Category', +'Product Class'=>'Product Class', +'Product Type'=>'Product Type', +'Product Validation'=>'Product Validation', +'Contract Bound'=>'Contract Required', 'Support Start Date'=>'Support Start Date', 'Support Expiry Date'=>'Support Expiry Date', 'Purchase Date'=>'Purchase Date', @@ -108,14 +112,12 @@ 'Sales End Date'=>'Sales End Date', 'Created Time'=>'Created Time', 'Modified Time'=>'Modified Time', -'Description'=>'Description', 'Related To'=>'Related To', 'Usage Unit'=>'Usage Unit', 'Handler'=>'Handler', 'Contact Name'=>'Contact Name', 'Currency'=>'Currency', 'Reorder Level'=>'Reorder Level', -'Website'=>'Website', 'Tax Class'=>'Tax Class', 'Mfr PartNo'=>'Mfr Part No', 'Vendor PartNo'=>'Vendor Part No', @@ -215,6 +217,15 @@ 'LBL_COMPANY_ASSIGNMENT'=>'Organization Assignment', 'Organization Assignment'=>'Assigned to', +//Added for 5.0.3 +'MSG_STOCK_LEVEL'=>'Stock Level is Low', +'MSG_DEAR'=>'Dear', +'MSG_CURRENT_STOCK'=>'The current stock of', +'MSG_IN_OUR_WAREHOUSE'=>'in our warehouse is', +'MSG_PROCURE_REQUIRED_NUMBER'=>'Kindly procure required number of units as the stock level is below reorder level', +'MSG_SEVERITY'=>'Severity: Major', +'MSG_THANKS'=>'Thanks,', + ); ?> Modified: vtigercrm/branches/5.1_jens/modules/Products/updateRelations.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/updateRelations.php (original) +++ vtigercrm/branches/5.1_jens/modules/Products/updateRelations.php Mon Apr 16 12:27:44 2007 @@ -11,34 +11,114 @@ require_once('include/database/PearDatabase.php'); global $adb; +global $log; +$dest_mod = $_REQUEST['destination_module']; -//This if will be true, when we select product from vendor related list -if($_REQUEST['destination_module']=='Products') +$log->debug("Entering Products/updateRelations.php"); + +if($singlepane_view == 'true') + $return_action = "DetailView"; +else + $return_action = "CallRelatedList"; + +if($_REQUEST['return_module'] != '') $return_module = $_REQUEST['return_module']; + +//if select Lead, Account, Contact, Potential from Product RelatedList +//we have to insert in vtiger_seproductsrel +if($dest_mod =='Leads' || $dest_mod =='Accounts' ||$dest_mod =='Contacts' ||$dest_mod =='Potentials') { + //For Bulk updates + if($_REQUEST['idlist'] != '') + { + $entityids = explode(';',trim($_REQUEST['idlist'],';')); + $productid = $_REQUEST['parentid']; + } + else + { + $entityids[] = $_REQUEST['entityid']; + $productid = $_REQUEST['parid']; + } + + foreach($entityids as $ind => $crmid) + { + if($crmid != '' && $productid != '') + { + $sql = "insert into vtiger_seproductsrel values ($crmid,$productid,'".$dest_mod."')"; + $adb->query($sql); + } + } + + $return_module = 'Products'; + $return_record = $productid; +} + +//if the destination module is also a product, we have to update dependency +//lists +else if($dest_mod=='Products') { + if( !isset( $_REQUEST['dependency_type']) || $_REQUEST['dependency_type'] == '') { + + //select product from vendor related list if($_REQUEST['parid'] != '' && $_REQUEST['entityid'] != '') { $sql = "update vtiger_products set vendor_id=".$_REQUEST['parid']." where productid=".$_REQUEST['entityid']; $adb->query($sql); } -} -if($_REQUEST['destination_module']=='Contacts') -{ - if($_REQUEST['smodule']=='VENDOR') - { - $sql = "insert into vtiger_vendorcontactrel values (".$_REQUEST['parid'].",".$_REQUEST['entityid'].")"; + + $return_module = 'Products'; + $return_record = $_REQUEST['parid']; + + } else { + //module dependency list change + $sql = "SELECT count(*) FROM vtiger_products2products_rel + WHERE productid=".$_REQUEST['parentid']." AND relation_type=".$_REQUEST['dependency_type']; + $count_result = $adb->query( $sql); + $sequence = $adb->query_result($count_result,0,"count"); + + //get the list of dependencies from the request + $idlist = $_REQUEST['idlist']; + $storearray = explode (";",$idlist); + $qtylist = $_REQUEST['qtylist']; + $tmparray = explode (";",$qtylist); + $qtyarray = array(); + foreach( $tmparray as $avp) { + $avplist = explode( ":",$avp); + $qtyarray[$avplist[0]] = $avplist[1]; + } + + //get the values from the requies and store them into the database + foreach($storearray as $id) { + if($id != '') { + + //We have quantities for piecelists and purchase lists + $qty = $grp = 1; + if( isset( $qtyarray[$id])) { + if( $_REQUEST['dependency_type'] == 10 || $_REQUEST['dependency_type'] == 40) { + $qty = $qtyarray[$id]; + } elseif( $_REQUEST['dependency_type'] == 20) { + $grp = $qtyarray[$id]; + } + } + + //database query + $sql = "INSERT INTO vtiger_products2products_rel(productid,related_productid,relation_type,sequence_no,quantity,comment,product_relgroup) VALUES(".$_REQUEST["parentid"].",".$id.",".$_REQUEST['dependency_type'].",".++$sequence.",".$qty.",'',".$grp.")"; $adb->query($sql); + } } + + //Navigation + $return_action = "CallDependencyList"; + $return_module = "Products"; + $return_record = $_REQUEST['parentid']; + } } -$return_action = 'DetailView'; -if($_REQUEST['return_action'] != '') - $return_action = $_REQUEST['return_action']; -header("Location:index.php?action=$return_action&module=Vendors&record=".$_REQUEST["parid"]); +if( $return_action == "") { + $return_action = 'DetailView'; + if($_REQUEST['return_action'] != '') + $return_action = $_REQUEST['return_action']; +} - - - - +header("Location:index.php?action=$return_action&module=$return_module&record=$return_record"); ?> Modified: vtigercrm/branches/5.1_jens/modules/PurchaseOrder/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/PurchaseOrder/CreatePDF.php (original) +++ vtigercrm/branches/5.1_jens/modules/PurchaseOrder/CreatePDF.php Mon Apr 16 12:27:44 2007 @@ -10,6 +10,7 @@ ********************************************************************************/ require('include/fpdf/pdf.php'); +require_once('include/fpdf/pdfconfig.php'); require_once('modules/PurchaseOrder/PurchaseOrder.php'); require_once('modules/Organization/Organization.php'); require_once('include/database/PearDatabase.php'); @@ -28,8 +29,6 @@ // would you like and end page? 1 for yes 0 for no $endpage="1"; -global $products_per_page; -$products_per_page="6"; $id = $_REQUEST['record']; //retreiving the vtiger_invoice info @@ -55,14 +54,15 @@ $bill_code = $focus->column_fields["bill_code"]; $bill_country = $focus->column_fields["bill_country"]; +$contact_name =getContactName($focus->column_fields["contact_id"]); $ship_street = $focus->column_fields["ship_street"]; $ship_city = $focus->column_fields["ship_city"]; $ship_state = $focus->column_fields["ship_state"]; $ship_code = $focus->column_fields["ship_code"]; $ship_country = $focus->column_fields["ship_country"]; -$conditions = $focus->column_fields["terms_conditions"]; -$description = $focus->column_fields["description"]; +$conditions = from_html($focus->column_fields["terms_conditions"]); +$description = from_html($focus->column_fields["description"]); $status = $focus->column_fields["postatus"]; // Company information @@ -141,7 +141,11 @@ if($discount_amount != "") $price_discount = number_format($discount_amount,2,'.',','); else if($discount_percent != "") - $price_discount = $discount_percent."%"; +{ + //This will be displayed near Discount label - used in include/fpdf/templates/body.php + $final_price_discount_percent = "(".number_format($discount_percent,2,'.',',')." %)"; + $price_discount = number_format((($discount_percent*$focus->column_fields["hdnSubTotal"])/100),2,'.',','); +} else $price_discount = "0.00"; @@ -199,6 +203,8 @@ $list_price[$i] = number_format($associated_products[$i]['listPrice'.$i],2,'.',','); $list_pricet[$i] = $associated_products[$i]['listPrice'.$i]; $discount_total[$i] = $associated_products[$i]['discountTotal'.$i]; + //aded for 5.0.3 pdf changes + $product_code[$i] = $associated_products[$i]['hdnProductcode'.$i]; $taxable_total = $qty[$i]*$list_pricet[$i]-$discount_total[$i]; @@ -219,13 +225,47 @@ $product_line[$j]["Tax"] = number_format($total_taxes,2,'.',',')."\n ($total_tax_percent %) "; } $prod_total[$i] = number_format($producttotal,2,'.',','); - + $product_line[$j]["Product Code"] = $product_code[$i]; $product_line[$j]["Product Name"] = $product_name[$i]; - $product_line[$j]["Description"] = $prod_description[$i]; $product_line[$j]["Qty"] = $qty[$i]; $product_line[$j]["Price"] = $list_price[$i]; $product_line[$j]["Discount"] = $discount_total[$i]; $product_line[$j]["Total"] = $prod_total[$i]; + + // Product piecelists + $query = "SELECT vtiger_crmentity.crmid, + vtiger_products.productname as productname, + vtiger_products2products_rel.related_productid as prodid, + vtiger_products2products_rel.quantity as quantity, + vtiger_products2products_rel.product_relgroup as product_relgroup + FROM vtiger_products2products_rel + INNER JOIN vtiger_products + ON vtiger_products.productid = vtiger_products2products_rel.related_productid + INNER JOIN vtiger_crmentity + ON vtiger_crmentity.crmid = vtiger_products.productid + WHERE vtiger_crmentity.deleted = 0 + AND vtiger_products2products_rel.productid = ".$product_id[$i]." + AND vtiger_products2products_rel.relation_type = 10"; + $result = $adb->query($query); + $pieces = $adb->num_rows($result); + if( $pieces > 0) { + $product_line[++$j]["Product Name"] = ""; + $product_line[$j]["Description"] = "consisting of:"; + $product_line[$j]["Qty"] = ""; + $product_line[$j]["Price"] = ""; + $product_line[$j]["Discount"] = ""; + $product_line[$j]["Total"] = ""; + for( $pl=0; $pl<$pieces; $pl++) { + $product_line[++$j]["Product Name"] = ""; + $product_line[$j]["Description"] = + $adb->query_result( $result, $pl, "productname"); + $product_line[$j]["Qty"] = + $adb->query_result( $result, $pl, "quantity"); + $product_line[$j]["Price"] = ""; + $product_line[$j]["Discount"] = ""; + $product_line[$j]["Total"] = ""; + } + } } //echo '
Product Details ==>';print_r($product_line);echo '
'; //echo '
';print_r($associated_products);echo '
'; @@ -240,7 +280,7 @@ $pdf = new PDF( 'P', 'mm', 'A4' ); $pdf->Open(); -$num_pages=ceil(($num_products/$products_per_page)); +$num_pages=ceil(count($product_line)/$products_per_page); $current_product=0; @@ -256,15 +296,21 @@ $current_product++; } + //if bottom > 145 then we skip the Description and T&C in every + //page and display only in lastpage + //if you want to display the description and T&C in each page then + //set the display_desc_tc='true' and bottom <= 145 in pdfconfig.php $pdf->AddPage(); if( $page_num == "1") { include("pdf_templates/".$template."/firstpage/header.php"); include("pdf_templates/".$template."/firstpage/body.php"); - include("pdf_templates/".$template."/firstpage/footer.php"); + if($display_desc_tc == 'true' && $bottom <= 145) + include("pdf_templates/".$template."/firstpage/footer.php"); } else { include("pdf_templates/".$template."/pages/header.php"); include("pdf_templates/".$template."/pages/body.php"); - include("pdf_templates/".$template."/pages/footer.php"); + if($display_desc_tc == 'true' && $bottom <= 145) + include("pdf_templates/".$template."/pages/footer.php"); } $page_num++; Modified: vtigercrm/branches/5.1_jens/modules/PurchaseOrder/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/PurchaseOrder/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/PurchaseOrder/DetailView.php Mon Apr 16 12:27:44 2007 @@ -94,6 +94,8 @@ $smarty->assign("CHECK", $check_button); $smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); + if($singlepane_view == 'true') { $related_array = getRelatedLists($currentModule,$focus); Modified: vtigercrm/branches/5.1_jens/modules/PurchaseOrder/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/PurchaseOrder/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/PurchaseOrder/EditView.php Mon Apr 16 12:27:44 2007 @@ -200,13 +200,14 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); $organization = new Organization; $organization->id = $current_organization; $smarty->assign("ASSIGN_ORGUNIT_LIST", getOrgUnits($organization)); if($focus->mode == 'edit') - $smarty->display('Inventory/InventoryEditView.tpl'); + $smarty->display('Inventory/InventoryEditView.tpl'); else - $smarty->display('Inventory/InventoryCreateView.tpl'); + $smarty->display('Inventory/InventoryCreateView.tpl'); ?> Modified: vtigercrm/branches/5.1_jens/modules/PurchaseOrder/PurchaseOrder.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/PurchaseOrder/PurchaseOrder.php (original) +++ vtigercrm/branches/5.1_jens/modules/PurchaseOrder/PurchaseOrder.php Mon Apr 16 12:27:44 2007 @@ -86,6 +86,8 @@ var $default_order_by = 'subject'; var $default_sort_order = 'ASC'; + var $groupTable = Array('vtiger_pogrouprelation','purchaseorderid'); + /** Constructor Function for Order class * This function creates an instance of LoggerManager class using getLogger method * creates an instance for PearDatabase class and get values for column_fields array of Order class. @@ -98,8 +100,12 @@ function save_module($module) { - //Based on the total Number of rows we will save the product relationship with this entity - saveInventoryProductDetails(&$this, 'PurchaseOrder', $this->update_prod_stock); + //in ajax save we should not call this function, because this will delete all the existing product values + if($_REQUEST['action'] != 'PurchaseOrderAjax' && $_REQUEST['ajxaction'] != 'DETAILVIEW') + { + //Based on the total Number of rows we will save the product relationship with this entity + saveInventoryProductDetails(&$this, 'PurchaseOrder', $this->update_prod_stock); + } } @@ -153,7 +159,7 @@ else $returnset = '&return_module=PurchaseOrder&return_action=CallRelatedList&return_id='.$id; - $query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL AND vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL AND vtiger_activity.status != 'Deferred') "; + $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL and vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL and vtiger_activity.status != 'Deferred') "; $log->debug("Exiting get_activities method ..."); return GetRelatedList('PurchaseOrder','Calendar',$focus,$query,$button,$returnset); } @@ -166,17 +172,15 @@ { global $log; $log->debug("Entering get_history(".$id.") method ..."); - $query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, - vtiger_activity.* ,vtiger_seactivityrel.*, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, - vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name + $query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,vtiger_activity.* ,vtiger_seactivityrel.*, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_crmentity.createdtime, vtiger_crmentity.description,case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid - inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname + left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_activity.activitytype='Task' and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred') and vtiger_seactivityrel.crmid=".$id; Modified: vtigercrm/branches/5.1_jens/modules/PurchaseOrder/Save.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/PurchaseOrder/Save.php (original) +++ vtigercrm/branches/5.1_jens/modules/PurchaseOrder/Save.php Mon Apr 16 12:27:44 2007 @@ -33,13 +33,18 @@ //Added code for auto product stock updation on receiving goods $focus->update_prod_stock=''; -if($focus->column_fields['postatus'] == 'Received Shipment' && $focus->mode == 'edit') +if($focus->column_fields['postatus'] == 'Received Shipment') { - $prev_postatus=getPoStatus($focus->id); - if($focus->column_fields['postatus'] != $prev_postatus) - { - $focus->update_prod_stock='true'; - } + if($focus->mode != 'edit') + $focus->update_prod_stock='true'; + else + { + $prev_postatus=getPoStatus($focus->id); + if($focus->column_fields['postatus'] != $prev_postatus) + { + $focus->update_prod_stock='true'; + } + } } Modified: vtigercrm/branches/5.1_jens/modules/PurchaseOrder/pdf_templates/Default/_default/header.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/PurchaseOrder/pdf_templates/Default/_default/header.php (original) +++ vtigercrm/branches/5.1_jens/modules/PurchaseOrder/pdf_templates/Default/_default/header.php Mon Apr 16 12:27:44 2007 @@ -51,7 +51,7 @@ $pdf->addTextBlock( "Shipping Address:", $shipText, $shipLocation ); // billing Address -$billPositions = array("147","43","60"); +$billPositions = array("147","40","60"); $billText=$bill_street."\n".$bill_city.", ".$bill_state." ".$bill_code."\n".$bill_country; $pdf->addTextBlock("Billing Address:",$billText, $billPositions); // ********** End Addresses ****************** @@ -59,13 +59,22 @@ /* ******** Begin Invoice Data ************************ */ +// issue date block +$issueBlock=array("80","37"); +$pdf->addRecBlock(date("Y-m-d"), "Issue Date",$issueBlock); + +// due date block +$dueBlock=array("81","52"); +$pdf->addRecBlock($valid_till, "Due Date",$dueBlock); + // terms block $termBlock=array("10","65"); $pdf->addRecBlock($vendor_name, "Vendor Name", $termBlock); -// due date block -$dueBlock=array("80","65"); -$pdf->addRecBlock($valid_till, "Due Date",$dueBlock); +// Contact Name block +$conBlock=array("79","67"); +$pdf->addRecBlock($contact_name, "Contact Name",$conBlock); + // vtiger_invoice number block $invBlock=array("145","65"); Modified: vtigercrm/branches/5.1_jens/modules/Quotes/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Quotes/CreatePDF.php (original) +++ vtigercrm/branches/5.1_jens/modules/Quotes/CreatePDF.php Mon Apr 16 12:27:44 2007 @@ -11,6 +11,7 @@ require_once('include/fpdf/pdf.php'); +require_once('include/fpdf/pdfconfig.php'); require_once('modules/Quotes/Quotes.php'); require_once('modules/Organization/Organization.php'); require_once('include/database/PearDatabase.php'); @@ -29,8 +30,6 @@ // would you like and end page? 1 for yes 0 for no $endpage="1"; -global $products_per_page; -$products_per_page="6"; $focus = new Quotes(); $focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); @@ -54,6 +53,7 @@ $bill_state = $focus->column_fields["bill_state"]; $bill_code = $focus->column_fields["bill_code"]; $bill_country = $focus->column_fields["bill_country"]; +$contact_name =getContactName($focus->column_fields["contact_id"]); $ship_street = $focus->column_fields["ship_street"]; $ship_city = $focus->column_fields["ship_city"]; @@ -61,8 +61,8 @@ $ship_code = $focus->column_fields["ship_code"]; $ship_country = $focus->column_fields["ship_country"]; -$conditions = $focus->column_fields["terms_conditions"]; -$description = $focus->column_fields["description"]; +$conditions = from_html($focus->column_fields["terms_conditions"]); +$description = from_html($focus->column_fields["description"]); $status = $focus->column_fields["quotestage"]; // Company information @@ -141,7 +141,11 @@ if($discount_amount != "") $price_discount = number_format($discount_amount,2,'.',','); else if($discount_percent != "") - $price_discount = $discount_percent."%"; +{ + //This will be displayed near Discount label - used in include/fpdf/templates/body.php + $final_price_discount_percent = "(".number_format($discount_percent,2,'.',',')." %)"; + $price_discount = number_format((($discount_percent*$focus->column_fields["hdnSubTotal"])/100),2,'.',','); +} else $price_discount = "0.00"; @@ -199,6 +203,8 @@ $list_price[$i] = number_format($associated_products[$i]['listPrice'.$i],2,'.',','); $list_pricet[$i] = $associated_products[$i]['listPrice'.$i]; $discount_total[$i] = $associated_products[$i]['discountTotal'.$i]; + //aded for 5.0.3 pdf changes + $product_code[$i] = $associated_products[$i]['hdnProductcode'.$i]; $taxable_total = $qty[$i]*$list_pricet[$i]-$discount_total[$i]; @@ -220,13 +226,49 @@ } $prod_total[$i] = number_format($producttotal,2,'.',','); + $product_line[$j]["Product Code"] = $product_code[$i]; $product_line[$j]["Product Name"] = $product_name[$i]; - $product_line[$j]["Description"] = $prod_description[$i]; $product_line[$j]["Qty"] = $qty[$i]; $product_line[$j]["Price"] = $list_price[$i]; $product_line[$j]["Discount"] = $discount_total[$i]; $product_line[$j]["Total"] = $prod_total[$i]; -} + + // Product piecelists + $query = "SELECT vtiger_crmentity.crmid, + vtiger_products.productname as productname, + vtiger_products2products_rel.related_productid as prodid, + vtiger_products2products_rel.quantity as quantity, + vtiger_products2products_rel.product_relgroup as product_relgroup + FROM vtiger_products2products_rel + INNER JOIN vtiger_products + ON vtiger_products.productid = vtiger_products2products_rel.related_productid + INNER JOIN vtiger_crmentity + ON vtiger_crmentity.crmid = vtiger_products.productid + WHERE vtiger_crmentity.deleted = 0 + AND vtiger_products2products_rel.productid = ".$product_id[$i]." + AND vtiger_products2products_rel.relation_type = 10"; + $result = $adb->query($query); + $pieces = $adb->num_rows($result); + if( $pieces > 0) { + $product_line[++$j]["Product Name"] = ""; + $product_line[$j]["Description"] = "consisting of:"; + $product_line[$j]["Qty"] = ""; + $product_line[$j]["Price"] = ""; + $product_line[$j]["Discount"] = ""; + $product_line[$j]["Total"] = ""; + for( $pl=0; $pl<$pieces; $pl++) { + $product_line[++$j]["Product Name"] = ""; + $product_line[$j]["Description"] = + $adb->query_result( $result, $pl, "productname"); + $product_line[$j]["Qty"] = + $adb->query_result( $result, $pl, "quantity"); + $product_line[$j]["Price"] = ""; + $product_line[$j]["Discount"] = ""; + $product_line[$j]["Total"] = ""; + } + } +} + //echo '
Product Details ==>';print_r($product_line);echo '
'; //echo '
';print_r($associated_products);echo '
'; @@ -240,7 +282,7 @@ $pdf = new PDF( 'P', 'mm', 'A4' ); $pdf->Open(); -$num_pages=ceil(($num_products/$products_per_page)); +$num_pages=ceil(count($product_line)/$products_per_page); $current_product=0; @@ -256,15 +298,21 @@ $current_product++; } + //if bottom > 145 then we skip the Description and T&C in every + //page and display only in lastpage + //if you want to display the description and T&C in each page then + //set the display_desc_tc='true' and bottom <= 145 in pdfconfig.php $pdf->AddPage(); if( $page_num == "1") { include("pdf_templates/".$template."/firstpage/header.php"); include("pdf_templates/".$template."/firstpage/body.php"); - include("pdf_templates/".$template."/firstpage/footer.php"); + if($display_desc_tc == 'true' && $bottom <= 145) + include("pdf_templates/".$template."/firstpage/footer.php"); } else { include("pdf_templates/".$template."/pages/header.php"); include("pdf_templates/".$template."/pages/body.php"); - include("pdf_templates/".$template."/pages/footer.php"); + if($display_desc_tc == 'true' && $bottom <= 145) + include("pdf_templates/".$template."/pages/footer.php"); } $page_num++; Modified: vtigercrm/branches/5.1_jens/modules/Quotes/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Quotes/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Quotes/DetailView.php Mon Apr 16 12:27:44 2007 @@ -104,6 +104,8 @@ $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); $smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); + if($singlepane_view == 'true') { $related_array = getRelatedLists($currentModule,$focus); Modified: vtigercrm/branches/5.1_jens/modules/Quotes/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Quotes/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Quotes/EditView.php Mon Apr 16 12:27:44 2007 @@ -211,14 +211,15 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); $organization = new Organization; $organization->id = $current_organization; $smarty->assign("ASSIGN_ORGUNIT_LIST", getOrgUnits($organization)); if($focus->mode == 'edit') - $smarty->display("Inventory/InventoryEditView.tpl"); + $smarty->display("Inventory/InventoryEditView.tpl"); else - $smarty->display('Inventory/InventoryCreateView.tpl'); + $smarty->display('Inventory/InventoryCreateView.tpl'); ?> Modified: vtigercrm/branches/5.1_jens/modules/Quotes/ListTopQuotes.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Quotes/ListTopQuotes.php (original) +++ vtigercrm/branches/5.1_jens/modules/Quotes/ListTopQuotes.php Mon Apr 16 12:27:44 2007 @@ -60,7 +60,10 @@ //<<<<<<<<>>>>>>>> $date_var = date('Y-m-d'); - $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_quotes.validtill >= \''.$date_var.'\''; + $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_quotes.quotestage != \'Rejected\' and vtiger_quotes.validtill >= \''.$date_var.'\''; + //$where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_quotes.validtill >= \''.$date_var.'\''; + + $query = getListQuery("Quotes",$where); $query .=" ORDER BY total DESC"; //<<<<<<<>>>>>>>> Modified: vtigercrm/branches/5.1_jens/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Quotes/ListView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Quotes/ListView.php Mon Apr 16 12:27:44 2007 @@ -131,8 +131,8 @@ if($order_by == 'smownerid') { if( $adb->dbType == "pgsql") - $query .= ' GROUP BY user_name'; - $query .= ' ORDER BY user_name '.$sorder; + $query .= ' GROUP BY vtiger_users.user_name'; + $query .= " ORDER BY case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end ".$sorder; } else { Modified: vtigercrm/branches/5.1_jens/modules/Quotes/Quotes.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Quotes/Quotes.php (original) +++ vtigercrm/branches/5.1_jens/modules/Quotes/Quotes.php Mon Apr 16 12:27:44 2007 @@ -1,266 +1,285 @@ -'crmid','vtiger_quotes'=>'quoteid','vtiger_quotesbillads'=>'quotebilladdressid','vtiger_quotesshipads'=>'quoteshipaddressid','vtiger_quotescf'=>'quoteid'); - - var $entity_table = "vtiger_crmentity"; - - var $billadr_table = "vtiger_quotesbillads"; - - var $object_name = "Quote"; - - var $new_schema = true; - - var $module_id = "quoteid"; - - var $column_fields = Array(); - - var $sortby_fields = Array('subject','crmid','smownerid'); - - // This is used to retrieve related vtiger_fields from form posts. - var $additional_column_fields = Array('assigned_user_name', 'smownerid', 'opportunity_id', 'case_id', 'contact_id', 'task_id', 'note_id', 'meeting_id', 'call_id', 'email_id', 'parent_name', 'member_id' ); - - // This is the list of vtiger_fields that are in the lists. - var $list_fields = Array( - 'Quote Id'=>Array('crmentity'=>'crmid'), - 'Subject'=>Array('quotes'=>'subject'), - 'Quote Stage'=>Array('quotes'=>'quotestage'), - 'Potential Name'=>Array('quotes'=>'potentialid'), - 'Account Name'=>Array('account'=> 'accountid'), - 'Total'=>Array('quotes'=> 'total'), - 'Assigned To'=>Array('crmentity'=>'smownerid') - ); - - var $list_fields_name = Array( - 'Quote Id'=>'', - 'Subject'=>'subject', - 'Quote Stage'=>'quotestage', - 'Potential Name'=>'potential_id', - 'Account Name'=>'account_id', - 'Total'=>'hdnGrandTotal', - 'Assigned To'=>'assigned_user_id' - ); - var $list_link_field= 'subject'; - - var $search_fields = Array( - 'Quote Id'=>Array('crmentity'=>'crmid'), - 'Subject'=>Array('quotes'=>'subject'), - 'Account Name'=>Array('quotes'=>'accountid'), - 'Quote Stage'=>Array('quotes'=>'quotestage'), - ); - - var $search_fields_name = Array( - 'Quote Id'=>'', - 'Subject'=>'subject', - 'Account Name'=>'account_id', - 'Quote Stage'=>'quotestage', - ); - - // This is the list of vtiger_fields that are required. - var $required_fields = array("accountname"=>1); - - //Added these variables which are used as default order by and sortorder in ListView - var $default_order_by = 'crmid'; - var $default_sort_order = 'ASC'; - - /** Constructor which will set the column_fields in this object - */ - function Quotes() { - $this->log =LoggerManager::getLogger('quote'); - $this->db = new PearDatabase(); - $this->column_fields = getColumnFields('Quotes'); - } - - function save_module() - { - } - - /** Function used to get the sort order for Quote listview - * @return string $sorder - first check the $_REQUEST['sorder'] if request value is empty then check in the $_SESSION['QUOTES_SORT_ORDER'] if this session value is empty then default sort order will be returned. - */ - function getSortOrder() - { - global $log; - $log->debug("Entering getSortOrder() method ..."); - if(isset($_REQUEST['sorder'])) - $sorder = $_REQUEST['sorder']; - else - $sorder = (($_SESSION['QUOTES_SORT_ORDER'] != '')?($_SESSION['QUOTES_SORT_ORDER']):($this->default_sort_order)); - $log->debug("Exiting getSortOrder() method ..."); - return $sorder; - } - - /** Function used to get the order by value for Quotes listview - * @return string $order_by - first check the $_REQUEST['order_by'] if request value is empty then check in the $_SESSION['QUOTES_ORDER_BY'] if this session value is empty then default order by will be returned. - */ - function getOrderBy() - { - global $log; - $log->debug("Entering getOrderBy() method ..."); - if (isset($_REQUEST['order_by'])) - $order_by = $_REQUEST['order_by']; - else - $order_by = (($_SESSION['QUOTES_ORDER_BY'] != '')?($_SESSION['QUOTES_ORDER_BY']):($this->default_order_by)); - $log->debug("Exiting getOrderBy method ..."); - return $order_by; - } - - /** function used to get the list of sales orders which are related to the Quotes - * @param int $id - quote id - * @return array - return an array which will be returned from the function GetRelatedList - */ - function get_salesorder($id) - { - global $log,$singlepane_view; - $log->debug("Entering get_salesorder(".$id.") method ..."); - require_once('modules/SalesOrder/SalesOrder.php'); - $focus = new SalesOrder(); - - $button = ''; - - if($singlepane_view == 'true') - $returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Quotes&return_action=CallRelatedList&return_id='.$id; - - $query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.quoteid = ".$id; - $log->debug("Exiting get_salesorder method ..."); - return GetRelatedList('Quotes','SalesOrder',$focus,$query,$button,$returnset); - } - - /** function used to get the list of activities which are related to the Quotes - * @param int $id - quote id - * @return array - return an array which will be returned from the function GetRelatedList - */ - function get_activities($id) - { - global $log,$singlepane_view; - $log->debug("Entering get_activities(".$id.") method ..."); - global $app_strings; - require_once('modules/Calendar/Activity.php'); - $focus = new Activity(); - - $button = ''; - - if($singlepane_view == 'true') - $returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Quotes&return_action=CallRelatedList&return_id='.$id; - - $query = "SELECT vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and (vtiger_activity.status is not NULL AND vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL AND vtiger_activity.status != 'Deferred')"; - $log->debug("Exiting get_activities method ..."); - return GetRelatedList('Quotes','Calendar',$focus,$query,$button,$returnset); - } - - /** function used to get the the activity history related to the quote - * @param int $id - quote id - * @return array - return an array which will be returned from the function GetHistory - */ - function get_history($id) - { - global $log; - $log->debug("Entering get_history(".$id.") method ..."); - $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, - vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_contactdetails.contactid, - vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime, - vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name - from vtiger_activity - inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid - left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid - left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid - inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id - left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid - left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname - where vtiger_activity.activitytype='Task' - and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred') - and vtiger_seactivityrel.crmid=".$id; - //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php - - $log->debug("Exiting get_history method ..."); - return getHistory('Quotes',$query,$id); - } - - - /** Function used to get the Quote Stage history of the Quotes - * @param $id - quote id - * @return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are arrays which contains header values and all column values of all entries - */ - function get_quotestagehistory($id) - { - global $log; - $log->debug("Entering get_quotestagehistory(".$id.") method ..."); - - global $adb; - global $mod_strings; - global $app_strings; - - $query = 'select vtiger_quotestagehistory.*, vtiger_quotes.subject from vtiger_quotestagehistory inner join vtiger_quotes on vtiger_quotes.quoteid = vtiger_quotestagehistory.quoteid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_quotes.quoteid where vtiger_crmentity.deleted = 0 and vtiger_quotes.quoteid = '.$id; - $result=$adb->query($query); - $noofrows = $adb->num_rows($result); - - $header[] = $app_strings['Quote Id']; - $header[] = $app_strings['LBL_ACCOUNT_NAME']; - $header[] = $app_strings['LBL_AMOUNT']; - $header[] = $app_strings['Quote Stage']; - $header[] = $app_strings['LBL_LAST_MODIFIED']; - - while($row = $adb->fetch_array($result)) - { - $entries = Array(); - - $entries[] = $row['quoteid']; - $entries[] = $row['accountname']; - $entries[] = $row['total']; - $entries[] = $row['quotestage']; - $entries[] = getDisplayDate($row['lastmodified']); - - $entries_list[] = $entries; - } - - $return_data = Array('header'=>$header,'entries'=>$entries_list); - - $log->debug("Exiting get_quotestagehistory method ..."); - - return $return_data; - } - -} - -?> +'crmid','vtiger_quotes'=>'quoteid','vtiger_quotesbillads'=>'quotebilladdressid','vtiger_quotesshipads'=>'quoteshipaddressid','vtiger_quotescf'=>'quoteid'); + + var $entity_table = "vtiger_crmentity"; + + var $billadr_table = "vtiger_quotesbillads"; + + var $object_name = "Quote"; + + var $new_schema = true; + + var $module_id = "quoteid"; + + var $column_fields = Array(); + + var $sortby_fields = Array('subject','crmid','smownerid'); + + // This is used to retrieve related vtiger_fields from form posts. + var $additional_column_fields = Array('assigned_user_name', 'smownerid', 'opportunity_id', 'case_id', 'contact_id', 'task_id', 'note_id', 'meeting_id', 'call_id', 'email_id', 'parent_name', 'member_id' ); + + // This is the list of vtiger_fields that are in the lists. + var $list_fields = Array( + 'Quote Id'=>Array('crmentity'=>'crmid'), + 'Subject'=>Array('quotes'=>'subject'), + 'Quote Stage'=>Array('quotes'=>'quotestage'), + 'Potential Name'=>Array('quotes'=>'potentialid'), + 'Account Name'=>Array('account'=> 'accountid'), + 'Total'=>Array('quotes'=> 'total'), + 'Assigned To'=>Array('crmentity'=>'smownerid') + ); + + var $list_fields_name = Array( + 'Quote Id'=>'', + 'Subject'=>'subject', + 'Quote Stage'=>'quotestage', + 'Potential Name'=>'potential_id', + 'Account Name'=>'account_id', + 'Total'=>'hdnGrandTotal', + 'Assigned To'=>'assigned_user_id' + ); + var $list_link_field= 'subject'; + + var $search_fields = Array( + 'Quote Id'=>Array('crmentity'=>'crmid'), + 'Subject'=>Array('quotes'=>'subject'), + 'Account Name'=>Array('quotes'=>'accountid'), + 'Quote Stage'=>Array('quotes'=>'quotestage'), + ); + + var $search_fields_name = Array( + 'Quote Id'=>'', + 'Subject'=>'subject', + 'Account Name'=>'account_id', + 'Quote Stage'=>'quotestage', + ); + + // This is the list of vtiger_fields that are required. + var $required_fields = array("accountname"=>1); + + //Added these variables which are used as default order by and sortorder in ListView + var $default_order_by = 'crmid'; + var $default_sort_order = 'ASC'; + var $groupTable = Array('vtiger_quotegrouprelation','quoteid'); + + + + /** Constructor which will set the column_fields in this object + */ + function Quotes() { + $this->log =LoggerManager::getLogger('quote'); + $this->db = new PearDatabase(); + $this->column_fields = getColumnFields('Quotes'); + } + + function save_module() + { + //in ajax save we should not call this function, because this will delete all the existing product values + if($_REQUEST['action'] != 'QuotesAjax' && $_REQUEST['ajxaction'] != 'DETAILVIEW') + { + //Based on the total Number of rows we will save the product relationship with this entity + saveInventoryProductDetails(&$this, 'Quotes'); + } + } + + /** Function used to get the sort order for Quote listview + * @return string $sorder - first check the $_REQUEST['sorder'] if request value is empty then check in the $_SESSION['QUOTES_SORT_ORDER'] if this session value is empty then default sort order will be returned. + */ + function getSortOrder() + { + global $log; + $log->debug("Entering getSortOrder() method ..."); + if(isset($_REQUEST['sorder'])) + $sorder = $_REQUEST['sorder']; + else + $sorder = (($_SESSION['QUOTES_SORT_ORDER'] != '')?($_SESSION['QUOTES_SORT_ORDER']):($this->default_sort_order)); + $log->debug("Exiting getSortOrder() method ..."); + return $sorder; + } + + /** Function used to get the order by value for Quotes listview + * @return string $order_by - first check the $_REQUEST['order_by'] if request value is empty then check in the $_SESSION['QUOTES_ORDER_BY'] if this session value is empty then default order by will be returned. + */ + function getOrderBy() + { + global $log; + $log->debug("Entering getOrderBy() method ..."); + if (isset($_REQUEST['order_by'])) + $order_by = $_REQUEST['order_by']; + else + $order_by = (($_SESSION['QUOTES_ORDER_BY'] != '')?($_SESSION['QUOTES_ORDER_BY']):($this->default_order_by)); + $log->debug("Exiting getOrderBy method ..."); + return $order_by; + } + + /** function used to get the list of sales orders which are related to the Quotes + * @param int $id - quote id + * @return array - return an array which will be returned from the function GetRelatedList + */ + function get_salesorder($id) + { + global $log,$singlepane_view; + $log->debug("Entering get_salesorder(".$id.") method ..."); + require_once('modules/SalesOrder/SalesOrder.php'); + $focus = new SalesOrder(); + + $button = ''; + + if($singlepane_view == 'true') + $returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Quotes&return_action=CallRelatedList&return_id='.$id; + + $query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname,case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name + from vtiger_salesorder + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid + left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid + left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid + left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid + left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname + left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid + where vtiger_crmentity.deleted=0 and vtiger_salesorder.quoteid = ".$id; + $log->debug("Exiting get_salesorder method ..."); + return GetRelatedList('Quotes','SalesOrder',$focus,$query,$button,$returnset); + } + + /** function used to get the list of activities which are related to the Quotes + * @param int $id - quote id + * @return array - return an array which will be returned from the function GetRelatedList + */ + function get_activities($id) + { + global $log,$singlepane_view; + $log->debug("Entering get_activities(".$id.") method ..."); + global $app_strings; + require_once('modules/Calendar/Activity.php'); + $focus = new Activity(); + + $button = ''; + + if($singlepane_view == 'true') + $returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Quotes&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and (vtiger_activity.status is not NULL and vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL and vtiger_activity.status != 'Deferred')"; + $log->debug("Exiting get_activities method ..."); + return GetRelatedList('Quotes','Calendar',$focus,$query,$button,$returnset); + } + + /** function used to get the the activity history related to the quote + * @param int $id - quote id + * @return array - return an array which will be returned from the function GetHistory + */ + function get_history($id) + { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); + $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, + vtiger_activity.eventstatus, vtiger_activity.activitytype,vtiger_activity.date_start, + vtiger_activity.due_date,vtiger_activity.time_start, vtiger_activity.time_end, + vtiger_contactdetails.contactid, + vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime, + vtiger_crmentity.createdtime, vtiger_crmentity.description, case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name + from vtiger_activity + inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid + left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid + left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid + left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid + left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname + left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid + where vtiger_activity.activitytype='Task' + and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred') + and vtiger_seactivityrel.crmid=".$id; + //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + + $log->debug("Exiting get_history method ..."); + return getHistory('Quotes',$query,$id); + } + + + /** Function used to get the Quote Stage history of the Quotes + * @param $id - quote id + * @return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are arrays which contains header values and all column values of all entries + */ + function get_quotestagehistory($id) + { + global $log; + $log->debug("Entering get_quotestagehistory(".$id.") method ..."); + + global $adb; + global $mod_strings; + global $app_strings; + + $query = 'select vtiger_quotestagehistory.*, vtiger_quotes.subject from vtiger_quotestagehistory inner join vtiger_quotes on vtiger_quotes.quoteid = vtiger_quotestagehistory.quoteid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_quotes.quoteid where vtiger_crmentity.deleted = 0 and vtiger_quotes.quoteid = '.$id; + $result=$adb->query($query); + $noofrows = $adb->num_rows($result); + + $header[] = $app_strings['Quote Id']; + $header[] = $app_strings['LBL_ACCOUNT_NAME']; + $header[] = $app_strings['LBL_AMOUNT']; + $header[] = $app_strings['Quote Stage']; + $header[] = $app_strings['LBL_LAST_MODIFIED']; + + while($row = $adb->fetch_array($result)) + { + $entries = Array(); + + $entries[] = $row['quoteid']; + $entries[] = $row['accountname']; + $entries[] = $row['total']; + $entries[] = $row['quotestage']; + $entries[] = getDisplayDate($row['lastmodified']); + + $entries_list[] = $entries; + } + + $return_data = Array('header'=>$header,'entries'=>$entries_list); + + $log->debug("Exiting get_quotestagehistory method ..."); + + return $return_data; + } + +} + +?> Modified: vtigercrm/branches/5.1_jens/modules/Quotes/Save.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Quotes/Save.php (original) +++ vtigercrm/branches/5.1_jens/modules/Quotes/Save.php Mon Apr 16 12:27:44 2007 @@ -28,23 +28,10 @@ $local_log =& LoggerManager::getLogger('index'); -global $log,$current_user; -$currencyid=fetchCurrency($current_user->id); -$rate_symbol = getCurrencySymbolandCRate($currencyid); -$rate = $rate_symbol['rate']; -$log->debug("Inside Quote Save"); - $focus = new Quotes(); - setObjectValuesFromRequest(&$focus); -$log->debug("The Field Value Array -----> ".$focus->column_fields); $focus->save("Quotes"); - - -//Based on the total Number of rows we will save the product relationship with this entity -saveInventoryProductDetails(&$focus, 'Quotes'); - $return_id = $focus->id; Modified: vtigercrm/branches/5.1_jens/modules/Quotes/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Quotes/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Quotes/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -45,7 +45,6 @@ //END DON'T CONVERT 'LBL_ACCOUNT'=>'Account:', -'LBL_ACCOUNT_NAME'=>'Account Name:', 'LBL_PHONE'=>'Phone:', 'LBL_WEBSITE'=>'Website:', 'LBL_FAX'=>'Fax:', Modified: vtigercrm/branches/5.1_jens/modules/Quotes/pdf_templates/Default/_default/header.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Quotes/pdf_templates/Default/_default/header.php (original) +++ vtigercrm/branches/5.1_jens/modules/Quotes/pdf_templates/Default/_default/header.php Mon Apr 16 12:27:44 2007 @@ -46,7 +46,7 @@ $pdf->addTextBlock( "Shipping Address:", $shipText, $shipLocation ); // billing Address -$billPositions = array("147","43","60"); +$billPositions = array("147","40","60"); $billText=$bill_street."\n".$bill_city.", ".$bill_state." ".$bill_code."\n".$bill_country; $pdf->addTextBlock("Billing Address:",$billText, $billPositions); // ********** End Addresses ****************** @@ -54,15 +54,25 @@ /* ******** Begin Quote Data ************************ */ -// terms block +// issue date block +$issueBlock=array("80","35"); +$pdf->addRecBlock(date("Y-m-d"), "Issue Date",$issueBlock); + +// valid till block +$dueBlock=array("80","50"); +$pdf->addRecBlock($valid_till, "Valid Till",$dueBlock); + +// customer name block $termBlock=array("10","65"); $pdf->addRecBlock($account_name, "Customer Name", $termBlock); -// due date block -$dueBlock=array("80","65"); -$pdf->addRecBlock($valid_till, "Valid Till",$dueBlock); -// vtiger_invoice number block +// Contact Name block +$conBlock=array("79","65"); +$pdf->addRecBlock($contact_name, "Contact Name",$conBlock); + + +// quote number block $invBlock=array("147","65"); $pdf->addRecBlock($quote_id, "Quote Number",$invBlock); Modified: vtigercrm/branches/5.1_jens/modules/Reports/AdvancedFilter.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Reports/AdvancedFilter.php (original) +++ vtigercrm/branches/5.1_jens/modules/Reports/AdvancedFilter.php Mon Apr 16 12:27:44 2007 @@ -140,7 +140,7 @@ { foreach($ogReport->sec_module_columnslist[$secmodule[$i]][$key] as $field=>$fieldlabel) { - if(isset($mod_strings[$fieldlable])) + if(isset($mod_strings[$fieldlabel])) { if($selected == $field) { Modified: vtigercrm/branches/5.1_jens/modules/Reports/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Reports/CreatePDF.php (original) +++ vtigercrm/branches/5.1_jens/modules/Reports/CreatePDF.php Mon Apr 16 12:27:44 2007 @@ -52,6 +52,7 @@ function Html2PDF($orientation='P',$unit='mm',$format='A4') { +//echo '
';print_r($format);echo '
'; //Call parent constructor $this->FPDF($orientation,$unit,$format); //Initialization @@ -295,35 +296,6 @@ $filterlist = $oReportRun->RunTimeFilter($filtercolumn,$filter,$_REQUEST["startdate"],$_REQUEST["enddate"]); $arr_val = $oReportRun->GenerateReport("PDF",$filterlist); - -if(isset($arr_val)) -{ - $columnlength = count($arr_val[0]); -} - -if($columnlength > 0 && $columnlength <= 4) -{ - $pdf = new Html2PDF('P','mm','A4'); -}elseif($columnlength >= 5 && $columnlength < 8) -{ - $pdf = new Html2PDF('L','mm','A4'); -}elseif($columnlength >= 8 && $columnlength <= 12) -{ - $pdf = new Html2PDF('P','mm','A3'); -}elseif($columnlength > 12) -{ - $pdf = new Html2PDF('L','mm','A3'); -} - -$pdf->AddPage(); - -$pdf->SetFillColor(224,235,255); -$pdf->SetTextColor(0); -$pdf->SetFont('Arial','B',14); -$pdf->Cell(($pdf->columnlength*50),10,$oReport->reportname,0,0,'C',0); -$pdf->Ln(); - -$pdf->SetFont('Arial','',10); if(isset($arr_val)) { @@ -396,6 +368,35 @@ '.$dataHTML.'
 
'.$adb->query_result($list_result,$i,"bookname").''.$unit_price.'
'.$unit_price.''; + if(isPermitted("PriceBooks","EditView","") == 'yes') + $list_body .= ''; + else + $list_body .= ''; + $list_body .= '
'.$adb->query_result($list_result,$i,"productname").''.$adb->query_result($list_result,$i,"productcode").''.$unit_price.'
'.$unit_price.''; + if(isPermitted("PriceBooks","EditView","") == 'yes') + $list_body .= ''; + else + $list_body .= ''; + $list_body .= '
'; +if(isset($arr_val)) +{ + $columnlength = array_sum($col_width); +} + +if($columnlength <= 420 ) +{ + $pdf = new Html2PDF('P','mm','A5'); +}elseif($columnlength >= 421 && $columnlength <= 600) +{ + $pdf = new Html2PDF('L','mm','A4'); +}elseif($columnlength >=601 && $columnlength <= 850) +{ + $pdf = new Html2PDF('P','mm','A3'); +}elseif($columnlength >=851 ) +{ + $pdf = new Html2PDF('L','mm','A1'); +} +//echo '
';print_r($columnlength);echo '
'; +$pdf->AddPage(); + +$pdf->SetFillColor(224,235,255); +$pdf->SetTextColor(0); +$pdf->SetFont('Arial','B',14); +$pdf->Cell(($pdf->columnlength*50),10,$oReport->reportname,0,0,'C',0); +$pdf->Ln(); + +$pdf->SetFont('Arial','',10); + $pdf->WriteHTML($html); $pdf->Output('Reports.pdf','D'); exit(); Modified: vtigercrm/branches/5.1_jens/modules/Reports/PopulateReports.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Reports/PopulateReports.php (original) +++ vtigercrm/branches/5.1_jens/modules/Reports/PopulateReports.php Mon Apr 16 12:27:44 2007 @@ -53,19 +53,19 @@ 'vtiger_contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V', 'vtiger_accountContacts:accountname:Contacts_Account_Name:account_id:I', 'vtiger_account:industry:Accounts_industry:industry:V', - 'vtiger_contactdetails:email:Contacts_Email:email:V'), + 'vtiger_contactdetails:email:Contacts_Email:email:E'), Array('vtiger_contactdetails:firstname:Contacts_First_Name:firstname:V', 'vtiger_contactdetails:lastname:Contacts_Last_Name:lastname:V', 'vtiger_contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V', 'vtiger_accountContacts:accountname:Contacts_Account_Name:account_id:I', 'vtiger_account:industry:Accounts_industry:industry:V', - 'vtiger_contactdetails:email:Contacts_Email:email:V'), + 'vtiger_contactdetails:email:Contacts_Email:email:E'), Array('vtiger_contactdetails:firstname:Contacts_First_Name:firstname:V', 'vtiger_contactdetails:lastname:Contacts_Last_Name:lastname:V', 'vtiger_accountContacts:accountname:Contacts_Account_Name:account_id:I', - 'vtiger_contactdetails:email:Contacts_Email:email:V', + 'vtiger_contactdetails:email:Contacts_Email:email:E', 'vtiger_potential:potentialname:Potentials_Potential_Name:potentialname:V', 'vtiger_potential:sales_stage:Potentials_Sales_Stage:sales_stage:V'), @@ -164,7 +164,7 @@ 'vtiger_contactdetails:firstname:Contacts_First_Name:firstname:V', 'vtiger_contactdetails:lastname:Contacts_Last_Name:lastname:V', 'vtiger_contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V', - 'vtiger_contactdetails:email:Contacts_Email:email:V'), + 'vtiger_contactdetails:email:Contacts_Email:email:E'), Array('vtiger_purchaseorder:subject:PurchaseOrder_Subject:subject:V', 'vtiger_vendorRel:vendorname:PurchaseOrder_Vendor_Name:vendor_id:I', @@ -562,7 +562,7 @@ global $adb; if($queryid != "") { - $ireportmodulesql = "insert into vtiger_reportdatefilter (DATEFILTERID,DATECOLUMNNAME,DATEFILTER,STARTDATE,ENDDATE) values (".$queryid.",'".$filtercolumn."','".$datefilter."','".$adb->formatString("vtiger_crmentity","startdate",$startdate)."','".$adb->formatString("vtiger_crmentity","enddate",$enddate)."')"; + $ireportmodulesql = "insert into vtiger_reportdatefilter (DATEFILTERID,DATECOLUMNNAME,DATEFILTER,STARTDATE,ENDDATE) values (".$queryid.",'".$filtercolumn."','".$datefilter."','".$startdate."','".$enddate."')"; $ireportmoduleresult = $adb->query($ireportmodulesql); } Modified: vtigercrm/branches/5.1_jens/modules/Reports/PrintReport.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Reports/PrintReport.php (original) +++ vtigercrm/branches/5.1_jens/modules/Reports/PrintReport.php Mon Apr 16 12:27:44 2007 @@ -13,6 +13,7 @@ require_once("modules/Reports/Reports.php"); global $app_strings; +global $mod_strings; $oPrint_smarty=new vtigerCRM_Smarty; $reportid = $_REQUEST["record"]; $oReport = new Reports($reportid); @@ -25,6 +26,7 @@ $total_report = $oReportRun->GenerateReport("PRINT_TOTAL",$filterlist); $oPrint_smarty->assign("COUNT",$arr_values[1]); $oPrint_smarty->assign("APP",$app_strings); +$oPrint_smarty->assign("MOD",$mod_strings); $oPrint_smarty->assign("REPORT_NAME",$oReport->reportname); $oPrint_smarty->assign("PRINT_CONTENTS",$arr_values[0]); $oPrint_smarty->assign("TOTAL_HTML",$total_report); Modified: vtigercrm/branches/5.1_jens/modules/Reports/ReportColumns.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Reports/ReportColumns.php (original) +++ vtigercrm/branches/5.1_jens/modules/Reports/ReportColumns.php Mon Apr 16 12:27:44 2007 @@ -64,6 +64,7 @@ { global $ogReport; global $app_list_strings; + global $app_strings; global $current_language; $mod_strings = return_module_language($current_language,$module); @@ -71,7 +72,8 @@ { if(isset($ogReport->pri_module_columnslist[$module][$key])) { - $shtml .= ""; + + $shtml .= ""; foreach($ogReport->pri_module_columnslist[$module][$key] as $field=>$fieldlabel) { if(isset($mod_strings[$fieldlabel])) @@ -97,7 +99,7 @@ function getSecondaryColumnsHTML($module) { global $ogReport; - global $app_list_strings; + global $app_list_strings,$app_strings; global $current_language; if($module != "") @@ -110,7 +112,7 @@ { if(isset($ogReport->sec_module_columnslist[$secmodule[$i]][$key])) { - $shtml .= ""; + $shtml .= ""; foreach($ogReport->sec_module_columnslist[$secmodule[$i]][$key] as $field=>$fieldlabel) { if(isset($mod_strings[$fieldlabel])) Modified: vtigercrm/branches/5.1_jens/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Reports/ReportRun.php (original) +++ vtigercrm/branches/5.1_jens/modules/Reports/ReportRun.php Mon Apr 16 12:27:44 2007 @@ -68,7 +68,7 @@ $ssql .= " where vtiger_report.reportid =".$reportid; $ssql .= " order by vtiger_selectcolumn.columnindex"; $result = $adb->query($ssql); - + $permitted_fields = Array(); while($columnslistrow = $adb->fetch_array($result)) @@ -81,12 +81,13 @@ { list($module,$field) = split("_",$module_field); $permitted_fields = $this->getaccesfield($module); + } $selectedfields = explode(":",$fieldcolname); $querycolumns = $this->getEscapedColumns($selectedfields); - if(sizeof($permitted_fields) != 0 && !in_array($fieldname,$permitted_fields)) + if(sizeof($permitted_fields) != 0 && !in_array($colname,$permitted_fields)) { continue; } @@ -94,7 +95,30 @@ { if($querycolumns == "") { - $columnslist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1].' AS "'.$selectedfields[2].'"'; + if($selectedfields[0] == 'vtiger_activity' && $selectedfields[1] == 'status') + { + $columnslist[$fieldcolname] = " case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end as Calendar_Status"; + } + elseif($selectedfields[0] == 'vtiger_activity' && $selectedfields[1] == 'date_start') + { + $columnslist[$fieldcolname] = "concat(vtiger_activity.date_start,' ',vtiger_activity.time_start) as Calendar_Start_Date_and_Time"; + } + elseif(stristr($selectedfields[0],"vtiger_users") && ($selectedfields[1] == 'user_name') && $module_field != 'Products_Handler') + { + $columnslist[$fieldcolname] = " case when (".$selectedfields[0].".user_name not like '') then ".$selectedfields[0].".user_name else vtiger_groups.groupname end as ".$this->primarymodule."_Assigned_To"; + } + elseif(stristr($selectedfields[0],"vtiger_users") && ($selectedfields[1] == 'user_name') && $module_field == 'Products_Handler')//Products cannot be assiged to group only to handler so group is not included + { + $columnslist[$fieldcolname] = $selectedfields[0].".user_name as ".$this->primarymodule."_Handler"; + } + elseif($selectedfields[0] == "vtiger_crmentity".$this->primarymodule) + { + $columnslist[$fieldcolname] = "vtiger_crmentity.".$selectedfields[1]." AS '".$selectedfields[2]."'"; + } + else + { + $columnslist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1].' AS "'.$selectedfields[2].'"'; + } } else { @@ -117,7 +141,15 @@ $access_fields = Array(); $profileList = getCurrentUserProfileList(); - $query = "select vtiger_field.fieldname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=(select tabid from vtiger_tab where vtiger_tab.name='".$module."') and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; + $query = "select vtiger_field.fieldname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where"; + if($module == "Calendar") + { + $query .= " vtiger_field.tabid in (9,16) and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; + } + else + { + $query .= " vtiger_field.tabid in (select tabid from vtiger_tab where vtiger_tab.name in ('".$this->primarymodule."','".$this->secondarymodule."')) and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; + } $result = $adb->query($query); @@ -125,6 +157,9 @@ { $access_fields[] = $collistrow["fieldname"]; } + //added to include ticketid for Reports module in select columnlist for all users + if($module == "HelpDesk") + $access_fields[] = "ticketid"; return $access_fields; } @@ -139,7 +174,7 @@ { if($this->primarymodule == "HelpDesk" && $selectedfields[0] == "vtiger_crmentityRelHelpDesk") { - $querycolumn = "case vtiger_crmentityRelHelpDesk.setype when 'Accounts' then vtiger_accountRelHelpDesk.accountname when 'Contacts' then vtiger_contactdetailsRelHelpDesk.lastname End"." '".$selectedfields[2]."', vtiger_crmentityRelHelpDesk.setype 'Entity_type'"; + $querycolumn = "case vtiger_crmentityRelHelpDesk.setype when 'Accounts' then vtiger_accountRelHelpDesk.accountname when 'Contacts' then concat(vtiger_contactdetailsRelHelpDesk.lastname,' ',vtiger_contactdetailsRelHelpDesk.firstname) End"." '".$selectedfields[2]."', vtiger_crmentityRelHelpDesk.setype 'Entity_type'"; return $querycolumn; } if($this->primarymodule == "Products" || $this->secondarymodule == "Products") @@ -197,6 +232,8 @@ if($ordercolumnsequal) { $selectedfields = explode(":",$fieldcolname); + if($selectedfields[0] == "vtiger_crmentity".$this->primarymodule) + $selectedfields[0] = "vtiger_crmentity"; $sSQLList[] = $selectedfields[0].".".$selectedfields[1]." '".$selectedfields[2]."'"; } } @@ -322,15 +359,42 @@ $advorsql = ""; for($n=0;$ngetAdvComparator($comparator,trim($valuearray[$n]),$datatype); + if($selectedfields[0] == 'vtiger_crmentityRelHelpDesk' && $selectedfields[1] == 'setype') + { + $advorsql[] = "(case vtiger_crmentityRelHelpDesk.setype when 'Accounts' then vtiger_accountRelHelpDesk.accountname else concat(vtiger_contactdetailsRelHelpDesk.lastname,' ',vtiger_contactdetailsRelHelpDesk.firstname) end) ". $this->getAdvComparator($comparator,trim($valuearray[$n]),$datatype); + }elseif($selectedfields[1] == 'status') + { + $advorsql[] = "(case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end)".$this->getAdvComparator($comparator,trim($valuearray[$n]),$datatype); + }else + { + $advorsql[] = $selectedfields[0].".".$selectedfields[1].$this->getAdvComparator($comparator,trim($valuearray[$n]),$datatype); + } } $advorsqls = implode(" or ",$advorsql); $fieldvalue = " (".$advorsqls.") "; - }else + }elseif($selectedfields[0] == 'vtiger_activity' && $selectedfields[1] == 'status') + { + $fieldvalue = "(case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end)".$this->getAdvComparator($comparator,trim($value),$datatype); + } + elseif($selectedfields[0] == "vtiger_users".$this->primarymodule && $selectedfields[1] == 'user_name') + { + $fieldvalue = " case when (".$selectedfields[0].".user_name not like '') then ".$selectedfields[0].".user_name else vtiger_groups.groupname end ".$this->getAdvComparator($comparator,trim($value),$datatype); + } + elseif($selectedfields[0] == "vtiger_crmentity".$this->primarymodule) + { + $fieldvalue = "vtiger_crmentity.".$selectedfields[1]." ".$this->getAdvComparator($comparator,trim($value),$datatype); + } + elseif($selectedfields[0] == 'vtiger_crmentityRelHelpDesk' && $selectedfields[1]=='setype') + { + $fieldvalue = "(vtiger_accountRelHelpDesk.accountname ".$this->getAdvComparator($comparator,trim($value),$datatype)." or vtiger_contactdetailsRelHelpDesk.lastname ".$this->getAdvComparator($comparator,trim($value),$datatype)." or vtiger_contactdetailsRelHelpDesk.firstname ".$this->getAdvComparator($comparator,trim($value),$datatype).")"; + } + else { $fieldvalue = $selectedfields[0].".".$selectedfields[1].$this->getAdvComparator($comparator,trim($value),$datatype); } - $advfilterlist[$fieldcolname] = $fieldvalue; + if(isset($advfilterlist[$fieldcolname])) + $advfilterlist[$fieldcolname] = $advfilterlist[$fieldcolname].' and '.$fieldvalue; + else $advfilterlist[$fieldcolname] = $fieldvalue; } } @@ -366,16 +430,17 @@ if($fieldcolname != "none") { + $selectedfields = explode(":",$fieldcolname); + if($selectedfields[0] == "vtiger_crmentity".$this->primarymodule) + $selectedfields[0] = "vtiger_crmentity"; if($datefilter == "custom") { if($startdate != "0000-00-00" && $enddate != "0000-00-00") { - $selectedfields = explode(":",$fieldcolname); $stdfilterlist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1]." between '".$startdate."' and '".$enddate."'"; } }else { - $selectedfields = explode(":",$fieldcolname); $startenddate = $this->getStandarFiltersStartAndEndDate($datefilter); if($startenddate[0] != "" && $startenddate[1] != "") { @@ -401,18 +466,19 @@ { if($filtercolumn != "none") { + $selectedfields = explode(":",$filtercolumn); + if($selectedfields[0] == "vtiger_crmentity".$this->primarymodule) + $selectedfields[0] = "vtiger_crmentity"; if($filter == "custom") { if($startdate != "" && $enddate != "") { - $selectedfields = explode(":",$filtercolumn); $stdfilterlist[$filtercolumn] = $selectedfields[0].".".$selectedfields[1]." between '".$startdate."' and '".$enddate."'"; } }else { if($startdate != "" && $enddate != "") { - $selectedfields = explode(":",$filtercolumn); $startenddate = $this->getStandarFiltersStartAndEndDate($filter); if($startenddate[0] != "" && $startenddate[1] != "") { @@ -453,16 +519,17 @@ if($fieldcolname != "none") { + $selectedfields = explode(":",$fieldcolname); + if($selectedfields[0] == "vtiger_crmentity".$this->primarymodule) + $selectedfields[0] = "vtiger_crmentity"; if($datefilter == "custom") { if($startdate != "0000-00-00" && $enddate != "0000-00-00") { - $selectedfields = explode(":",$fieldcolname); $sSQL .= $selectedfields[0].".".$selectedfields[1]." between '".$startdate."' and '".$enddate."'"; } }else { - $selectedfields = explode(":",$fieldcolname); $startenddate = $this->getStandarFiltersStartAndEndDate($datefilter); if($startenddate[0] != "" && $startenddate[1] != "") { @@ -721,6 +788,8 @@ if($fieldcolname != "none") { $selectedfields = explode(":",$fieldcolname); + if($selectedfields[0] == "vtiger_crmentity".$this->primarymodule) + $selectedfields[0] = "vtiger_crmentity"; $sqlvalue = $selectedfields[0].".".$selectedfields[1]." ".$sortorder; $grouplist[$fieldcolname] = $sqlvalue; $this->groupbylist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1]." ".$selectedfields[2]; @@ -775,6 +844,8 @@ $sSQL .= ", "; $this->orderbylistsql .= ", "; } + if($selectedfields[0] == "vtiger_crmentity".$this->primarymodule) + $selectedfields[0] = "vtiger_crmentity"; $sSQL .= $selectedfields[0].".".$selectedfields[1]." ".$sortorder; $this->orderbylistsql .= $selectedfields[0].".".$selectedfields[1]." ".$selectedfields[2]; } @@ -898,12 +969,12 @@ } if($secmodule == "Products") { - $query = "left join vtiger_seproductsrel on vtiger_seproductsrel.crmid = vtiger_account.accountid + $query = "left join vtiger_seproductsrel on vtiger_seproductsrel.crmid = vtiger_account.accountid and vtiger_seproductsrel.setype = 'Accounts' left join vtiger_products on vtiger_products.productid = vtiger_seproductsrel.productid left join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid - left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid - left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid + left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_products.handler + left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_seproductsrel.crmid left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id left join vtiger_crmentity as vtiger_crmentityRel on vtiger_crmentityRel.crmid = vtiger_seproductsrel.crmid left join vtiger_account as vtiger_accountRel on vtiger_accountRel.accountid=vtiger_crmentityRel.crmid @@ -986,11 +1057,14 @@ left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid "; } } + + //Here we will get the Products - Accounts, Contacts relationship (Also Leads, Potentials) if($module == "Products") { if($secmodule == "Accounts") { - $query = "left join vtiger_account on vtiger_account.accountid = vtiger_crmentityRelProducts.crmid + $query = " + left join vtiger_account on vtiger_account.accountid = vtiger_seproductsrel.crmid left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid @@ -1000,7 +1074,8 @@ } if($secmodule == "Contacts") { - $query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_products.contactid + $query = " + left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_seproductsrel.crmid left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid @@ -1058,8 +1133,7 @@ $query = "left join vtiger_products on vtiger_products.productid = vtiger_troubletickets.product_id left join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid - left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid - left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid + left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_products.handler left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid left join vtiger_crmentity as vtiger_crmentityRelProducts on vtiger_crmentityRelProducts.crmid = vtiger_seproductsrel.crmid @@ -1070,6 +1144,29 @@ } if($module == "Calendar") { + //Added Leads,Accounts,Potentials as secondarymodule for Calendar + + if($secmodule == "Leads") + { + $query = "left join vtiger_leaddetails on vtiger_leaddetails.leadid = vtiger_seactivityrel.crmid + left join vtiger_crmentity as vtiger_crmentityLeads on vtiger_crmentityLeads.crmid = vtiger_leaddetails.leadid + left join vtiger_leadaddress on vtiger_leaddetails.leadid = vtiger_leadaddress.leadaddressid + left join vtiger_leadsubdetails on vtiger_leadsubdetails.leadsubscriptionid = vtiger_leaddetails.leadid + left join vtiger_leadscf on vtiger_leadscf.leadid = vtiger_leaddetails.leadid + left join vtiger_users as vtiger_usersLeads on vtiger_usersLeads.id = vtiger_crmentityLeads.smownerid "; + + } + if($secmodule == "Accounts") + { + $query = "left join vtiger_account on vtiger_account.accountid = vtiger_seactivityrel.crmid + left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid + left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid + left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid + left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid + left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid + left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid "; + + } if($secmodule == "Contacts") { $query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid @@ -1082,6 +1179,14 @@ left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid "; } + if($secmodule == "Potentials") + { + $query = "left join vtiger_potential on vtiger_potential.potentialid = vtiger_seactivityrel.crmid + left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid + left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid + left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid "; + + } } if($module == 'Campaigns') { @@ -1090,22 +1195,13 @@ $query = "left join vtiger_products on vtiger_products.productid = vtiger_campaign.product_id left join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid - left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid - left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid + left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_products.handler left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid left join vtiger_crmentity as vtiger_crmentityRelProducts on vtiger_crmentityRelProducts.crmid = vtiger_seproductsrel.crmid left join vtiger_account as vtiger_accountRelProducts on vtiger_accountRelProducts.accountid=vtiger_seproductsrel.crmid left join vtiger_leaddetails as vtiger_leaddetailsRelProducts on vtiger_leaddetailsRelProducts.leadid = vtiger_seproductsrel.crmid left join vtiger_potential as vtiger_potentialRelProducts on vtiger_potentialRelProducts.potentialid = vtiger_seproductsrel.crmid "; - } - elseif($secmodule == 'Contacts') - { - $query = "left join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid=vtiger_campaign.campaignid - left join vtiger_contactdetails on vtiger_campaigncontrel.contactid=vtiger_contactdetails.contactid - left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid - left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid - left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid "; } } $log->info("ReportRun :: Successfully returned getRelatedModulesQuery".$secmodule); @@ -1122,91 +1218,100 @@ if($module == "Leads") { $query = "from vtiger_leaddetails - inner join vtiger_crmentity as vtiger_crmentityLeads on vtiger_crmentityLeads.crmid=vtiger_leaddetails.leadid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid inner join vtiger_leadsubdetails on vtiger_leadsubdetails.leadsubscriptionid=vtiger_leaddetails.leadid inner join vtiger_leadaddress on vtiger_leadaddress.leadaddressid=vtiger_leadsubdetails.leadsubscriptionid inner join vtiger_leadscf on vtiger_leaddetails.leadid = vtiger_leadscf.leadid - left join vtiger_users as vtiger_usersLeads on vtiger_usersLeads.id = vtiger_crmentityLeads.smownerid - where vtiger_crmentityLeads.deleted=0 and vtiger_leaddetails.converted=0"; + left join vtiger_leadgrouprelation on vtiger_leaddetails.leadid = vtiger_leadgrouprelation.leadid + left join vtiger_groups on vtiger_groups.groupname = vtiger_leadgrouprelation.groupname + left join vtiger_users as vtiger_usersLeads on vtiger_usersLeads.id = vtiger_crmentity.smownerid + where vtiger_crmentity.deleted=0 and vtiger_leaddetails.converted=0"; } if($module == "Accounts") { $query = "from vtiger_account - inner join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid inner join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid inner join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid inner join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid + left join vtiger_accountgrouprelation on vtiger_account.accountid = vtiger_accountgrouprelation.accountid + left join vtiger_groups on vtiger_groups.groupname = vtiger_accountgrouprelation.groupname left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid - left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid + left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentity.smownerid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - where vtiger_crmentityAccounts.deleted=0 "; + where vtiger_crmentity.deleted=0 "; } if($module == "Contacts") { $query = "from vtiger_contactdetails - inner join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid + inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid inner join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid inner join vtiger_customerdetails on vtiger_customerdetails.customerid = vtiger_contactdetails.contactid inner join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid inner join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid + left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid = vtiger_contactgrouprelation.contactid + left join vtiger_groups on vtiger_groups.groupname = vtiger_contactgrouprelation.groupname left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid - left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid + left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentity.smownerid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - where vtiger_crmentityContacts.deleted=0"; + where vtiger_crmentity.deleted=0"; } if($module == "Potentials") { $query = "from vtiger_potential - inner join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid inner join vtiger_account as vtiger_accountPotentials on vtiger_potential.accountid = vtiger_accountPotentials.accountid inner join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid - left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid + left join vtiger_potentialgrouprelation on vtiger_potential.potentialid = vtiger_potentialgrouprelation.potentialid + left join vtiger_groups on vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname + left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentity.smownerid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - where vtiger_crmentityPotentials.deleted=0 "; - } - + where vtiger_crmentity.deleted=0 "; + } + + //For this Product - we can related Accounts, Contacts (Also Leads, Potentials) if($module == "Products") { $query = "from vtiger_products - inner join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid - left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid - left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid - left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id - left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid - left join vtiger_crmentity as vtiger_crmentityRelProducts on vtiger_crmentityRelProducts.crmid = vtiger_seproductsrel.crmid - left join vtiger_account as vtiger_accountRelProducts on vtiger_accountRelProducts.accountid=vtiger_crmentityRelProducts.crmid - left join vtiger_leaddetails as vtiger_leaddetailsRelProducts on vtiger_leaddetailsRelProducts.leadid = vtiger_crmentityRelProducts.crmid - left join vtiger_potential as vtiger_potentialRelProducts on vtiger_potentialRelProducts.potentialid = vtiger_crmentityRelProducts.crmid + left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_products.handler + left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id + left join vtiger_seproductsrel on vtiger_seproductsrel.productid= vtiger_products.productid and vtiger_seproductsrel.setype='".$this->secondarymodule."' ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - where vtiger_crmentityProducts.deleted=0 "; + where vtiger_crmentity.deleted=0"; } if($module == "HelpDesk") { $query = "from vtiger_troubletickets - inner join vtiger_crmentity as vtiger_crmentityHelpDesk - on vtiger_crmentityHelpDesk.crmid=vtiger_troubletickets.ticketid + inner join vtiger_crmentity + on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid left join vtiger_crmentity as vtiger_crmentityRelHelpDesk on vtiger_crmentityRelHelpDesk.crmid = vtiger_troubletickets.parent_id left join vtiger_account as vtiger_accountRelHelpDesk on vtiger_accountRelHelpDesk.accountid=vtiger_crmentityRelHelpDesk.crmid left join vtiger_contactdetails as vtiger_contactdetailsRelHelpDesk on vtiger_contactdetailsRelHelpDesk.contactid= vtiger_crmentityRelHelpDesk.crmid left join vtiger_products as vtiger_productsRel on vtiger_productsRel.productid = vtiger_troubletickets.product_id - left join vtiger_users as vtiger_usersHelpDesk on vtiger_crmentityHelpDesk.smownerid=vtiger_usersHelpDesk.id + left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid = vtiger_ticketgrouprelation.ticketid + left join vtiger_groups on vtiger_groups.groupname = vtiger_ticketgrouprelation.groupname + + left join vtiger_users as vtiger_usersHelpDesk on vtiger_crmentity.smownerid=vtiger_usersHelpDesk.id ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - where vtiger_crmentityHelpDesk.deleted=0 "; + where vtiger_crmentity.deleted=0 "; } if($module == "Calendar") { $query = "from vtiger_activity - inner join vtiger_crmentity as vtiger_crmentityCalendar on vtiger_crmentityCalendar.crmid=vtiger_activity.activityid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails as vtiger_contactdetailsCalendar on vtiger_contactdetailsCalendar.contactid= vtiger_cntactivityrel.contactid - left join vtiger_users as vtiger_usersCalendar on vtiger_usersCalendar.id = vtiger_crmentityCalendar.smownerid + left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid + left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname + left join vtiger_users as vtiger_usersCalendar on vtiger_usersCalendar.id = vtiger_crmentity.smownerid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left join vtiger_crmentity as vtiger_crmentityRelCalendar on vtiger_crmentityRelCalendar.crmid = vtiger_seactivityrel.crmid left join vtiger_account as vtiger_accountRelCalendar on vtiger_accountRelCalendar.accountid=vtiger_crmentityRelCalendar.crmid @@ -1216,55 +1321,61 @@ left join vtiger_purchaseorder as vtiger_purchaseorderRelCalendar on vtiger_purchaseorderRelCalendar.purchaseorderid = vtiger_crmentityRelCalendar.crmid left join vtiger_invoice as vtiger_invoiceRelCalendar on vtiger_invoiceRelCalendar.invoiceid = vtiger_crmentityRelCalendar.crmid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - WHERE vtiger_crmentityCalendar.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')"; + WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')"; } if($module == "Quotes") { $query = "from vtiger_quotes - inner join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid inner join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid inner join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid left join vtiger_quotescf on vtiger_quotes.quoteid = vtiger_quotescf.quoteid - left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid + left join vtiger_quotegrouprelation on vtiger_quotes.quoteid = vtiger_quotegrouprelation.quoteid + left join vtiger_groups on vtiger_groups.groupname = vtiger_quotegrouprelation.groupname + left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentity.smownerid left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - where vtiger_crmentityQuotes.deleted=0"; + where vtiger_crmentity.deleted=0"; } if($module == "PurchaseOrder") { $query = "from vtiger_purchaseorder - inner join vtiger_crmentity as vtiger_crmentityPurchaseOrder on vtiger_crmentityPurchaseOrder.crmid=vtiger_purchaseorder.purchaseorderid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid inner join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid inner join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid left join vtiger_purchaseordercf on vtiger_purchaseorder.purchaseorderid = vtiger_purchaseordercf.purchaseorderid - left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentityPurchaseOrder.smownerid + left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid = vtiger_pogrouprelation.purchaseorderid + left join vtiger_groups on vtiger_groups.groupname = vtiger_pogrouprelation.groupname + left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentity.smownerid left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_purchaseorder.vendorid left join vtiger_contactdetails as vtiger_contactdetailsPurchaseOrder on vtiger_contactdetailsPurchaseOrder.contactid = vtiger_purchaseorder.contactid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - where vtiger_crmentityPurchaseOrder.deleted=0"; + where vtiger_crmentity.deleted=0"; } if($module == "Invoice") { $query = "from vtiger_invoice - inner join vtiger_crmentity as vtiger_crmentityInvoice on vtiger_crmentityInvoice.crmid=vtiger_invoice.invoiceid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_invoice.invoiceid inner join vtiger_invoicebillads on vtiger_invoice.invoiceid=vtiger_invoicebillads.invoicebilladdressid inner join vtiger_invoiceshipads on vtiger_invoice.invoiceid=vtiger_invoiceshipads.invoiceshipaddressid left join vtiger_invoicecf on vtiger_invoice.invoiceid = vtiger_invoicecf.invoiceid - left join vtiger_users as vtiger_usersInvoice on vtiger_usersInvoice.id = vtiger_crmentityInvoice.smownerid + left join vtiger_invoicegrouprelation on vtiger_invoice.invoiceid = vtiger_invoicegrouprelation.invoiceid + left join vtiger_groups on vtiger_groups.groupname = vtiger_invoicegrouprelation.groupname + left join vtiger_users as vtiger_usersInvoice on vtiger_usersInvoice.id = vtiger_crmentity.smownerid left join vtiger_account as vtiger_accountInvoice on vtiger_accountInvoice.accountid = vtiger_invoice.accountid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - where vtiger_crmentityInvoice.deleted=0"; + where vtiger_crmentity.deleted=0"; } if($module == "SalesOrder") { $query = "from vtiger_salesorder - inner join vtiger_crmentity as vtiger_crmentitySalesOrder on vtiger_crmentitySalesOrder.crmid=vtiger_salesorder.salesorderid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid inner join vtiger_sobillads on vtiger_salesorder.salesorderid=vtiger_sobillads.sobilladdressid inner join vtiger_soshipads on vtiger_salesorder.salesorderid=vtiger_soshipads.soshipaddressid left join vtiger_salesordercf on vtiger_salesorder.salesorderid = vtiger_salesordercf.salesorderid @@ -1272,8 +1383,10 @@ left join vtiger_quotes as vtiger_quotesSalesOrder on vtiger_quotesSalesOrder.quoteid = vtiger_salesorder.quoteid left join vtiger_account as vtiger_accountSalesOrder on vtiger_accountSalesOrder.accountid = vtiger_salesorder.accountid left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_salesorder.potentialid - left join vtiger_users as vtiger_usersSalesOrder on vtiger_usersSalesOrder.id = vtiger_crmentitySalesOrder.smownerid - where vtiger_crmentitySalesOrder.deleted=0"; + left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid = vtiger_sogrouprelation.salesorderid + left join vtiger_groups on vtiger_groups.groupname = vtiger_sogrouprelation.groupname + left join vtiger_users as vtiger_usersSalesOrder on vtiger_usersSalesOrder.id = vtiger_crmentity.smownerid + where vtiger_crmentity.deleted=0"; } @@ -1281,10 +1394,13 @@ { $query = "from vtiger_campaign inner join vtiger_campaignscf as vtiger_campaignscf on vtiger_campaignscf.campaignid=vtiger_campaign.campaignid - inner join vtiger_crmentity as vtiger_crmentityCampaigns on vtiger_crmentityCampaigns.crmid=vtiger_campaign.campaignid - left join vtiger_users as vtiger_usersCampaigns on vtiger_usersCampaigns.id = vtiger_crmentityCampaigns.smownerid - ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - where vtiger_crmentityCampaigns.deleted=0"; + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_campaign.campaignid + left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid = vtiger_campaigngrouprelation.campaignid + left join vtiger_groups on vtiger_groups.groupname = vtiger_campaigngrouprelation.groupname + + left join vtiger_users as vtiger_usersCampaigns on vtiger_usersCampaigns.id = vtiger_crmentity.smownerid + ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." + where vtiger_crmentity.deleted=0"; } $log->info("ReportRun :: Successfully returned getReportsQuery".$module); return $query; @@ -1308,6 +1424,10 @@ $columnstotallist = $this->getColumnsTotal($reportid); $advfilterlist = $this->getAdvFilterList($reportid); $this->totallist = $columnstotallist; + global $current_user; + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + $tab_id = getTabid($this->primarymodule); if($this->reporttype == "summary") { if(isset($this->groupbylist)) @@ -1322,7 +1442,6 @@ { $selectlist = $columnlist; } - //columns list if(isset($selectlist)) { @@ -1363,7 +1482,6 @@ } $reportquery = $this->getReportsQuery($this->primarymodule); - if($type == 'COLUMNSTOTOTAL') { if(trim($groupsquery) != "") @@ -1389,6 +1507,12 @@ $reportquery = "select ".$selectedcolumns." ".$reportquery." ".$wheresql; } } + if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) + { + $sec_parameter=getListViewSecurityParameter($this->primarymodule); + $reportquery .= $sec_parameter; + } + $log->info("ReportRun :: Successfully returned sGetSQLforReport".$reportid); return $reportquery; @@ -1415,14 +1539,25 @@ { $sSQL = $this->sGetSQLforReport($this->reportid,$filterlist); $result = $adb->query($sSQL); - $y=$adb->num_fields($result); if($result) { + $y=$adb->num_fields($result); + $arrayHeaders = Array(); for ($x=0; $x<$y; $x++) { $fld = $adb->field_name($result, $x); - $header .= "		".$this->getLstringforReportHeaders($fld->name)."".$headerLabel."".$this->getLstringforReportHeaders($fld->name)."".$headerLabel."
- - - -"; - echo "\n"; - echo "\n"; - echo ""; - echo "\n"; -} -else echo ""; -?> - - - - - - - - - -
Change Password
".$mod_strings['LBL_OLD_PASSWORD']."
-
- - - - - - - -
' accessKey='' class='crmbutton small save' LANGUAGE=javascript onclick='if (set_password(this.form)) window.close(); else return false;' type='submit' name='button' value=' '>' accessyKey='' class='crmbutton small cancel' LANGUAGE=javascript onclick='window.close()' type='submit' name='button' value=' '>
- -
- + + + + +
+ + + + + + +"; + echo "\n"; + echo "\n"; + echo ""; + echo "\n"; +} +else echo ""; +?> + + + + + + + + + +
".$mod_strings['LBL_OLD_PASSWORD']."
+
+ + + + + + + +
' accessKey='' class='crmbutton small save' LANGUAGE=javascript onclick='if (set_password(this.form)) window.close(); else return false;' type='submit' name='button' value=' '>' accessyKey='' class='crmbutton small cancel' LANGUAGE=javascript onclick='window.close()' type='submit' name='button' value=' '>
+
+
+ Modified: vtigercrm/branches/5.1_jens/modules/Users/CreateUserPrivilegeFile.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/CreateUserPrivilegeFile.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/CreateUserPrivilegeFile.php Mon Apr 16 12:27:44 2007 @@ -1359,7 +1359,9 @@ $code = 'array('; foreach ($var as $key => $value) { - if($i<$size) + //fix for signatue quote(') issue + $value=addslashes($value); + if($i<$size) { $code .= "'".$key."'=>'".$value."',"; } Modified: vtigercrm/branches/5.1_jens/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/DefaultDataPopulator.php Mon Apr 16 12:27:44 2007 @@ -55,33 +55,33 @@ $this->db->completeTransaction(); $this->db->startTransaction(); - $this->db->query("INSERT INTO vtiger_tab VALUES (3,'Home',0,1,'Home',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (7,'Leads',0,4,'Leads',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (6,'Accounts',0,5,'Accounts',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (4,'Contacts',0,6,'Contacts',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (2,'Potentials',0,7,'Potentials',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (8,'Notes',0,9,'Notes',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (9,'Calendar',0,3,'Calendar',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (10,'Emails',0,10,'Emails',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (13,'HelpDesk',0,11,'HelpDesk',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (14,'Products',0,8,'Products',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (1,'Dashboard',0,12,'Dashboards',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (15,'Faq',0,14,'Faq',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (16,'Events',2,13,'Events',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (18,'Vendors',0,15,'Vendors',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (19,'PriceBooks',0,16,'PriceBooks',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (20,'Quotes',0,17,'Quotes',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (21,'PurchaseOrder',0,18,'PurchaseOrder',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (22,'SalesOrder',0,19,'SalesOrder',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (23,'Invoice',0,20,'Invoice',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (24,'Rss',0,21,'Rss',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (25,'Reports',0,22,'Reports',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (26,'Campaigns',0,23,'Campaigns',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (27,'Portal',0,24,'Portal',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (29,'Users',0,26,'Users',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (30,'Organization',0,30,'Organization',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (31,'OrgUnit',0,31,'OrgUnit',null,null,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (3,'Home',0,1,'Home',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (7,'Leads',0,4,'Leads',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (6,'Accounts',0,5,'Accounts',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (4,'Contacts',0,6,'Contacts',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (2,'Potentials',0,7,'Potentials',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (8,'Notes',0,9,'Notes',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (9,'Calendar',0,3,'Calendar',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (10,'Emails',0,10,'Emails',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (13,'HelpDesk',0,11,'HelpDesk',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (14,'Products',0,8,'Products',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (1,'Dashboard',0,12,'Dashboards',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (15,'Faq',0,14,'Faq',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (16,'Events',2,13,'Events',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (18,'Vendors',0,15,'Vendors',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (19,'PriceBooks',0,16,'PriceBooks',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (20,'Quotes',0,17,'Quotes',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (21,'PurchaseOrder',0,18,'PurchaseOrder',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (22,'SalesOrder',0,19,'SalesOrder',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (23,'Invoice',0,20,'Invoice',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (24,'Rss',0,21,'Rss',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (25,'Reports',0,22,'Reports',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (26,'Campaigns',0,23,'Campaigns',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (27,'Portal',0,24,'Portal',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (28,'Webmails',0,25,'Webmails',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (29,'Users',0,26,'Users',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (30,'Organization',0,30,'Organization',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (31,'OrgUnit',0,31,'OrgUnit',null,null,0,0)"); $this->db->completeTransaction(); @@ -459,36 +459,38 @@ //Product Details -- START //Block31-36 -- Start + $this->db->query("INSERT INTO vtiger_field VALUES (14,".$this->db->getUniqueID("vtiger_field").",'quantity','vtiger_products2products_rel',1,'1','dependency_qty','LBL_QTY',1,0,0,3,0,33,1,'V~O',1,null,'DEP')"); + $this->db->query("INSERT INTO vtiger_field VALUES (14,".$this->db->getUniqueID("vtiger_field").",'product_relgroup','vtiger_products2products_rel',1,'1','dependency_grp','LBL_GRP',1,0,0,3,0,33,1,'V~O',1,null,'DEP')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productname','vtiger_products',1,'2','productname','Product Name',1,0,0,100,1,31,1,'V~M',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productcode','vtiger_products',1,'1','productcode','Product Code',1,0,0,100,2,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productcode','vtiger_products',1,'1','productcode','Part Number',1,0,0,100,2,31,1,'V~O',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'discontinued','vtiger_products',1,'56','discontinued','Product Active',1,0,0,100,3,31,1,'V~O',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'manufacturer','vtiger_products',1,'15','manufacturer','Manufacturer',1,0,0,100,4,31,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productcategory','vtiger_products',1,'15','productcategory','Product Category',1,0,0,100,4,31,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'sales_start_date','vtiger_products',1,'5','sales_start_date','Sales Start Date',1,0,0,100,5,31,1,'D~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'sales_end_date','vtiger_products',1,'5','sales_end_date','Sales End Date',1,0,0,100,6,31,1,'D~O~OTH~GE~sales_start_date~Sales Start Date',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'start_date','vtiger_products',1,'5','start_date','Support Start Date',1,0,0,100,7,31,1,'D~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'expiry_date','vtiger_products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,31,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')"); - - - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'crmid','vtiger_seproductsrel',1,'66','parent_id','Related To',1,0,0,100,10,31,1,'I~O',1,null,'BAS')"); - - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'contactid','vtiger_products',1,'57','contact_id','Contact Name',1,0,0,100,11,31,1,'I~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'website','vtiger_products',1,'17','website','Website',1,0,0,100,12,31,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'vendor_id','vtiger_products',1,'75','vendor_id','Vendor Name',1,0,0,100,13,31,1,'I~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'mfr_part_no','vtiger_products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,14,31,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'vendor_part_no','vtiger_products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,15,31,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'serialno','vtiger_products',1,'1','serial_no','Serial No',1,0,0,100,16,31,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productsheet','vtiger_products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'glacct','vtiger_products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productcategory','vtiger_products',1,'15','productcategory','Product Category',1,0,0,100,5,31,1,'V~O',1,null,'BAS')"); + $this->db->query("INSERT INTO vtiger_field VALUES ( 14, ".$this->db->getUniqueID("vtiger_field").", 'productclass','vtiger_products',1,'15','productclass','Product Class',1,0,0,100,6,31,1,'V~M',1,null,'BAS')"); + $this->db->query("INSERT INTO vtiger_field VALUES ( 14, ".$this->db->getUniqueID("vtiger_field").", 'producttype','vtiger_products',1,'15','producttype','Product Type',1,0,0,100,7,31,1,'V~M',1,null,'BAS')"); + $this->db->query("INSERT INTO vtiger_field VALUES ( 14, ".$this->db->getUniqueID("vtiger_field").", 'productvalidation','vtiger_products',1,'15','productvalidation','Product Validation',1,0,0,100,8,31,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'sales_start_date','vtiger_products',1,'5','sales_start_date','Sales Start Date',1,0,0,100,9,31,1,'D~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'sales_end_date','vtiger_products',1,'5','sales_end_date','Sales End Date',1,0,0,100,10,31,1,'D~O~OTH~GE~sales_start_date~Sales Start Date',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'start_date','vtiger_products',1,'5','start_date','Support Start Date',1,0,0,100,11,31,1,'D~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'expiry_date','vtiger_products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,12,31,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')"); + $this->db->query("INSERT INTO vtiger_field VALUES ( 14, ".$this->db->getUniqueID("vtiger_field").", 'contractbound','vtiger_products',1,'56','contractbound','Contract Bound',1,0,0,100,14,31,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'website','vtiger_products',1,'17','website','Website',1,0,0,100,16,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'vendor_id','vtiger_products',1,'75','vendor_id','Vendor Name',1,0,0,100,17,31,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'mfr_part_no','vtiger_products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,18,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'vendor_part_no','vtiger_products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,19,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'serialno','vtiger_products',1,'1','serial_no','Serial No',1,0,0,100,20,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productsheet','vtiger_products',1,'1','productsheet','Product Sheet',1,0,0,100,21,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'glacct','vtiger_products',1,'15','glacct','GL Account',1,0,0,100,22,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,23,31,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,24,31,2,'T~O',1,null,'BAS')"); //Block32 Pricing Information $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'unit_price','vtiger_products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'commissionrate','vtiger_products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'taxclass','vtiger_producttaxrel',1,'83','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'taxclass','vtiger_products',1,'83','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')"); //Block 33 stock info @@ -916,7 +918,8 @@ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'ADV')"); //Block74 $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'terms_conditions','vtiger_invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'ADV')"); - + //Added for Custom invoice Number + $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'invoice_no','vtiger_invoice',1,'1','invoice_no','invoice_no',1,0,0,100,3,69,1,'V~M',1,null,'BAS')"); //Invoice Details -- END //users Details Starts Block 79,80,81 @@ -995,26 +998,26 @@ //The Entity Name for the modules are maintained in this table - $this->db->query("insert into vtiger_entityname values(7,'Leads','vtiger_leaddetails','lastname,firstname','leadid')"); - $this->db->query("insert into vtiger_entityname values(6,'Accounts','vtiger_account','accountname','accountid')"); - $this->db->query("insert into vtiger_entityname values(4,'Contacts','vtiger_contactdetails','lastname,firstname','contactid')"); - $this->db->query("insert into vtiger_entityname values(2,'Potentials','vtiger_potential','potentialname','potentialid')"); - $this->db->query("insert into vtiger_entityname values(8,'Notes','vtiger_notes','title','notesid')"); - $this->db->query("insert into vtiger_entityname values(13,'HelpDesk','vtiger_troubletickets','title','ticketid')"); - $this->db->query("insert into vtiger_entityname values(9,'Calendar','vtiger_activity','subject','activityid')"); - $this->db->query("insert into vtiger_entityname values(10,'Emails','vtiger_activity','subject','activityid')"); - $this->db->query("insert into vtiger_entityname values(14,'Products','vtiger_products','productname','productid')"); - $this->db->query("insert into vtiger_entityname values(29,'Users','vtiger_users','last_name,first_name','id')"); - $this->db->query("insert into vtiger_entityname values(23,'Invoice','vtiger_invoice','subject','invoiceid')"); - $this->db->query("insert into vtiger_entityname values(20,'Quotes','vtiger_quotes','subject','quoteid')"); - $this->db->query("insert into vtiger_entityname values(21,'PurchaseOrder','vtiger_purchaseorder','subject','purchaseorderid')"); - $this->db->query("insert into vtiger_entityname values(22,'SalesOrder','vtiger_salesorder','subject','salesorderid')"); - $this->db->query("insert into vtiger_entityname values(18,'Vendors','vtiger_vendor','vendorname','vendorid')"); - $this->db->query("insert into vtiger_entityname values(19,'PriceBooks','vtiger_pricebook','bookname','pricebookid')"); - $this->db->query("insert into vtiger_entityname values(26,'Campaigns','vtiger_campaign','campaignname','campaignid')"); - $this->db->query("insert into vtiger_entityname values(15,'Faq','vtiger_faq','question','id')"); - $this->db->query("insert into vtiger_entityname values(30,'Organization','vtiger_organizationdetails','organizationname','organizationname')"); - $this->db->query("insert into vtiger_entityname values(31,'OrgUnit','vtiger_orgunit','name','orgunitid')"); + $this->db->query("insert into vtiger_entityname values(7,'Leads','vtiger_leaddetails','lastname,firstname','leadid','leadid')"); + $this->db->query("insert into vtiger_entityname values(6,'Accounts','vtiger_account','accountname','accountid','account_id')"); + $this->db->query("insert into vtiger_entityname values(4,'Contacts','vtiger_contactdetails','lastname,firstname','contactid','contact_id')"); + $this->db->query("insert into vtiger_entityname values(2,'Potentials','vtiger_potential','potentialname','potentialid','potential_id')"); + $this->db->query("insert into vtiger_entityname values(8,'Notes','vtiger_notes','title','notesid','notesid')"); + $this->db->query("insert into vtiger_entityname values(13,'HelpDesk','vtiger_troubletickets','title','ticketid','ticketid')"); + $this->db->query("insert into vtiger_entityname values(9,'Calendar','vtiger_activity','subject','activityid','activityid')"); + $this->db->query("insert into vtiger_entityname values(10,'Emails','vtiger_activity','subject','activityid','activityid')"); + $this->db->query("insert into vtiger_entityname values(14,'Products','vtiger_products','productname','productid','product_id')"); + $this->db->query("insert into vtiger_entityname values(29,'Users','vtiger_users','last_name,first_name','id','id')"); + $this->db->query("insert into vtiger_entityname values(23,'Invoice','vtiger_invoice','subject','invoiceid','invoiceid')"); + $this->db->query("insert into vtiger_entityname values(20,'Quotes','vtiger_quotes','subject','quoteid','quote_id')"); + $this->db->query("insert into vtiger_entityname values(21,'PurchaseOrder','vtiger_purchaseorder','subject','purchaseorderid','purchaseorderid')"); + $this->db->query("insert into vtiger_entityname values(22,'SalesOrder','vtiger_salesorder','subject','salesorderid','salesorder_id')"); + $this->db->query("insert into vtiger_entityname values(18,'Vendors','vtiger_vendor','vendorname','vendorid','vendor_id')"); + $this->db->query("insert into vtiger_entityname values(19,'PriceBooks','vtiger_pricebook','bookname','pricebookid','pricebookid')"); + $this->db->query("insert into vtiger_entityname values(26,'Campaigns','vtiger_campaign','campaignname','campaignid','campaignid')"); + $this->db->query("insert into vtiger_entityname values(15,'Faq','vtiger_faq','question','id','id')"); + $this->db->query("insert into vtiger_entityname values(30,'Organization','vtiger_organizationdetails','organizationname','organizationname','organizationname')"); + $this->db->query("insert into vtiger_entityname values(31,'OrgUnit','vtiger_orgunit','name','orgunitid','orgunitid')"); // Insert End @@ -1751,26 +1754,25 @@ //insert into related list vtiger_table //Inserting for vtiger_account related lists $this->db->startTransaction(); - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)"); - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)"); - - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Calendar").",'get_activities',3,'Activities',0)"); - - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)"); - - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Calendar").",'get_history',5,'Activity History',0)"); - - - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",0,'get_attachments',6,'Attachments',0)"); - - - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',7,'Quotes',0)"); - - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',8,'Invoice',0)"); - - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',9,'Sales Order',0)"); - + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',2,'Potentials',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',3,'Quotes',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',4,'Sales Order',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',5,'Invoice',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Calendar").",'get_activities',6,'Activities',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Calendar").",'get_history',7,'Activity History',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",0,'get_attachments',8,'Attachments',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',9,'HelpDesk',0)"); + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Products").",'get_products',10,'Products',0)"); //Inserting Lead Related Lists @@ -1847,6 +1849,14 @@ $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Invoice").",'get_invoices',7,'Invoice',0)"); $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("PriceBooks").",'get_product_pricebooks',8,'PriceBooks',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Leads").",'get_leads',9,'Leads',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Accounts").",'get_accounts',10,'Accounts',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Contacts").",'get_contacts',11,'Contacts',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Potentials").",'get_opportunities',12,'Potentials',0)"); //Inserting Emails Related Lists @@ -1953,41 +1963,41 @@ $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_notificationscheduler").",'LBL_ACTIVITY_REMINDER_DESCRIPTION' ,1,'Activity Reminder Notification','This is a reminder notification for the Activity','LBL_ACTIVITY_NOTIFICATION')"); //Inserting Inventory Notifications - $invoice_body = 'Dear {HANDLER}, - + $invoice_body = 'Dear {HANDLER},
+
The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. Kindly procure required number of units as the stock level is below reorder level {REORDERLEVELVALUE}. - +

Please treat this information as Urgent as the invoice is already sent to the customer. - +

Severity: Critical - -Thanks, +
+Thanks,
{CURRENTUSER}'; - - $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_inventorynotification").",'InvoiceNotification','{PRODUCTNAME} Stock Level is Low','".$invoice_body." ','InvoiceNotificationDescription')"); - - $quote_body = 'Dear {HANDLER}, + + $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_inventorynotification").",'InvoiceNotification','{PRODUCTNAME} Stock Level is Low','".$invoice_body." ','InvoiceNotificationDescription')"); + + $quote_body = 'Dear {HANDLER},

Quote is generated for {QUOTEQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. - +

Severity: Minor - -Thanks, +

+Thanks,
{CURRENTUSER}'; - - - $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_inventorynotification").",'QuoteNotification','Quote given for {PRODUCTNAME}','".$quote_body." ','QuoteNotificationDescription')"); - - $so_body = 'Dear {HANDLER}, - + + + $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_inventorynotification").",'QuoteNotification','Quote given for {PRODUCTNAME}','".$quote_body." ','QuoteNotificationDescription')"); + + $so_body = 'Dear {HANDLER}, +

SalesOrder is generated for {SOQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. - +

Please treat this information with priority as the sales order is already generated. - +

Severity: Major - -Thanks, +

+Thanks,
{CURRENTUSER}'; @@ -2242,7 +2252,7 @@ $this->db->query("insert into vtiger_parenttab values (8,'Settings',8,0)"); $this->db->query("insert into vtiger_parenttabrel values (1,9,2)"); - $this->db->query("insert into vtiger_parenttabrel values (1,10,4)"); + $this->db->query("insert into vtiger_parenttabrel values (1,28,4)"); $this->db->query("insert into vtiger_parenttabrel values (1,3,1)"); $this->db->query("insert into vtiger_parenttabrel values (3,7,1)"); $this->db->query("insert into vtiger_parenttabrel values (3,6,2)"); @@ -2275,15 +2285,15 @@ $this->db->query("insert into vtiger_parenttabrel values (2,26,1)"); $this->db->query("insert into vtiger_parenttabrel values (2,6,2)"); $this->db->query("insert into vtiger_parenttabrel values (2,4,3)"); - $this->db->query("insert into vtiger_parenttabrel values (2,10,4)"); - $this->db->query("insert into vtiger_parenttabrel values (4,10,7)"); + $this->db->query("insert into vtiger_parenttabrel values (2,28,4)"); + $this->db->query("insert into vtiger_parenttabrel values (4,28,7)"); $this->db->query("insert into vtiger_parenttabrel values (2,7,5)"); $this->db->query("insert into vtiger_parenttabrel values (2,9,6)"); $this->db->query("insert into vtiger_parenttabrel values (4,9,8)"); $this->db->query("insert into vtiger_parenttabrel values (2,8,8)"); $this->db->query("insert into vtiger_parenttabrel values (3,9,11)"); $this->db->query("insert into vtiger_parenttabrel values (8,30,2)"); - $this->db->query("insert into vtiger_parenttabrel values (30,31,2)"); + $this->db->query("insert into vtiger_parenttabrel values (8,31,2)"); $this->db->completeTransaction(); //Added to populate the default inventory tax informations @@ -2313,6 +2323,41 @@ $this->db->query("alter table vtiger_inventoryshippingrel add column shtax$shserviceid decimal(7,3) default NULL"); $this->db->completeTransaction(); + + //Added to populate the default dependency and product classes + $this->db->startTransaction(); + $this->db->query("INSERT INTO vtiger_dependendlists VALUES (".$this->db->getUniqueID("vtiger_dependendlists").",14,'get_product_piecelist',1,'Piecelist',0)"); + $this->db->query("INSERT INTO vtiger_dependendlists VALUES (".$this->db->getUniqueID("vtiger_dependendlists").",14,'get_product_depends',2,'Dependencies',0)"); + $this->db->query("INSERT INTO vtiger_dependendlists VALUES (".$this->db->getUniqueID("vtiger_dependendlists").",14,'get_product_incompatibles',3,'Incompatibles',0)"); + $this->db->query("INSERT INTO vtiger_dependendlists VALUES (".$this->db->getUniqueID("vtiger_dependendlists").",14,'get_product_options',4,'Options',0)"); + $this->db->query("INSERT INTO vtiger_dependendlists VALUES (".$this->db->getUniqueID("vtiger_dependendlists").",14,'get_product_purchaselist',5,'Purchaselist',0)"); + + $this->db->query("INSERT into vtiger_productclass VALUES ( ".$this->db->getUniqueID("vtiger_productclass").", 'Sales', 0, 1)"); + $this->db->query("INSERT into vtiger_productclass VALUES ( ".$this->db->getUniqueID("vtiger_productclass").", 'Purchase', 0, 1)"); + + $this->db->query("INSERT into vtiger_producttype VALUES ( ".$this->db->getUniqueID("vtiger_producttype").", 'One time fixed', 0, 1)"); + $this->db->query("INSERT into vtiger_producttype VALUES ( ".$this->db->getUniqueID("vtiger_producttype").", 'Periodically fixed', 10, 1)"); + $this->db->query("INSERT into vtiger_producttype VALUES ( ".$this->db->getUniqueID("vtiger_producttype").", 'Rental', 20, 1)"); + $this->db->query("INSERT into vtiger_producttype VALUES ( ".$this->db->getUniqueID("vtiger_producttype").", 'Contingent Accounting', 30, 1)"); + $this->db->query("INSERT into vtiger_producttype VALUES ( ".$this->db->getUniqueID("vtiger_producttype").", 'Usage Accouting', 31, 1)"); + $this->db->query("INSERT into vtiger_producttype VALUES ( ".$this->db->getUniqueID("vtiger_producttype").", 'Manually', 98, 1)"); + $this->db->query("INSERT into vtiger_producttype VALUES ( ".$this->db->getUniqueID("vtiger_producttype").", 'Free of charge', 99, 1)"); + + $this->db->query("INSERT into vtiger_productvalidation VALUES ( ".$this->db->getUniqueID("vtiger_productvalidation").", 'On delivery', 0, 1)"); + $this->db->query("INSERT into vtiger_productvalidation VALUES ( ".$this->db->getUniqueID("vtiger_productvalidation").", 'On demand', 0, 1)"); + $this->db->query("INSERT into vtiger_productvalidation VALUES ( ".$this->db->getUniqueID("vtiger_productvalidation").", 'Per day', 0, 1)"); + $this->db->query("INSERT into vtiger_productvalidation VALUES ( ".$this->db->getUniqueID("vtiger_productvalidation").", 'Per week', 0, 1)"); + $this->db->query("INSERT into vtiger_productvalidation VALUES ( ".$this->db->getUniqueID("vtiger_productvalidation").", 'Per month', 0, 1)"); + $this->db->query("INSERT into vtiger_productvalidation VALUES ( ".$this->db->getUniqueID("vtiger_productvalidation").", 'Per quarter', 0, 1)"); + $this->db->query("INSERT into vtiger_productvalidation VALUES ( ".$this->db->getUniqueID("vtiger_productvalidation").", 'Per year', 0, 1)"); + $this->db->query("INSERT into vtiger_productvalidation VALUES ( ".$this->db->getUniqueID("vtiger_productvalidation").", 'Never', 0, 1)"); + + $this->db->completeTransaction(); + + //version file is included here because without including this + //file version cannot be get + include('vtigerversion.php'); + $this->db->query("insert into vtiger_version values(0,'".$vtiger_current_version."','".$vtiger_current_version."')"); } } ?> Modified: vtigercrm/branches/5.1_jens/modules/Users/DeleteGroup.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/DeleteGroup.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/DeleteGroup.php Mon Apr 16 12:27:44 2007 @@ -33,5 +33,5 @@ deleteGroup($del_id,$transferId,$transferType); -header("Location: index.php?action=listgroups&module=Users&parenttab=Settings"); +header("Location: index.php?action=listgroups&module=Settings&parenttab=Settings"); ?> Modified: vtigercrm/branches/5.1_jens/modules/Users/DeleteProfile.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/DeleteProfile.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/DeleteProfile.php Mon Apr 16 12:27:44 2007 @@ -14,5 +14,5 @@ $tran_id = $_REQUEST['transfer_prof_id']; //Deleting the Profile deleteProfile($del_id,$tran_id); -header("Location: index.php?module=Users&action=ListProfiles&parenttab=Settings"); +header("Location: index.php?module=Settings&action=ListProfiles&parenttab=Settings"); ?> Modified: vtigercrm/branches/5.1_jens/modules/Users/DeleteRole.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/DeleteRole.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/DeleteRole.php Mon Apr 16 12:27:44 2007 @@ -15,5 +15,5 @@ deleteRole($del_id,$tran_id); -header("Location: index.php?action=listroles&module=Users"); +header("Location: index.php?action=listroles&module=Settings"); ?> Modified: vtigercrm/branches/5.1_jens/modules/Users/DeleteSharingRule.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/DeleteSharingRule.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/DeleteSharingRule.php Mon Apr 16 12:27:44 2007 @@ -13,5 +13,5 @@ $shareid = $_REQUEST['shareid']; deleteSharingRule($shareid); -header("Location: index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings"); +header("Location: index.php?module=Settings&action=OrgSharingDetailView&parenttab=Settings"); ?> Modified: vtigercrm/branches/5.1_jens/modules/Users/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/DetailView.php Mon Apr 16 12:27:44 2007 @@ -1,205 +1,247 @@ -retrieve_entity_info($_REQUEST['record'],'Users'); - $focus->id = $_REQUEST['record']; -} -else -{ - - echo " - - "; -} - -if( $focus->user_name == "" ) -{ - - echo " - - - - - - - -
- User does not exist. -
- List Users -
- "; - exit; -} - - -if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { - $focus->id = ""; -} - -global $theme; -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; -require_once($theme_path.'layout_utils.php'); - -//the user might belong to multiple groups -$log->info("User detail view"); - -$category = getParenttab(); - -$smarty = new vtigerCRM_Smarty; - -$smarty->assign("UMOD", $mod_strings); -global $current_language; -$smod_strings = return_module_language($current_language, 'Settings'); -$smarty->assign("MOD", $smod_strings); - -$smarty->assign("APP", $app_strings); - -$oGetUserGroups = new GetUserGroups(); -$oGetUserGroups->getAllUserGroups($focus->id); - - -$smarty->assign("GROUP_COUNT",count($oGetUserGroups->user_groups)); -$smarty->assign("THEME", $theme); -$smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); -$smarty->assign("ID", $focus->id); -$smarty->assign("CATEGORY", $category); -if(isset($focus->imagename) && $focus->imagename!='') -{ - $imagestring="
-
-
- - -
-

"; - //$smarty->assign("USER_IMAGE",$imagestring); -} - -if(isset($_REQUEST['modechk']) && $_REQUEST['modechk'] != '' ) -{ - $modepref = $_REQUEST['modechk']; -} - if($_REQUEST['modechk'] == 'prefview') - $parenttab = ''; - else - $parenttab = 'Settings'; - -$smarty->assign("PARENTTAB", $parenttab); - -if ((is_admin($current_user) || $_REQUEST['record'] == $current_user->id) - && isset($default_user_name) - && $default_user_name == $focus->user_name - && isset($lock_default_user_name) - && $lock_default_user_name == true ) { - $buttons = ""; - $smarty->assign('EDIT_BUTTON',$buttons); -} -elseif (is_admin($current_user) || $_REQUEST['record'] == $current_user->id) { - $buttons = ""; - $smarty->assign('EDIT_BUTTON',$buttons); - - $buttons = ""; - $smarty->assign('CHANGE_PW_BUTTON',$buttons); - - -} -if (is_admin($current_user)) -{ - $buttons = ""; - $smarty->assign('DUPLICATE_BUTTON',$buttons); - - //done so that only the admin user can see the customize tab button - if($_REQUEST['record'] != $current_user->id) - { - $buttons = "id')\" type='button' name='Delete' value=' ".$app_strings['LBL_DELETE_BUTTON_LABEL']." '>"; - $smarty->assign('DELETE_BUTTON',$buttons); - } - - if($_SESSION['authenticated_user_roleid'] == 'administrator') - { - $buttons = ""; - $smarty->assign('LISTROLES_BUTTON',$buttons); - } - -} - -if(is_admin($current_user)) - $smarty->assign("IS_ADMIN", true); -else - $smarty->assign("IS_ADMIN", false); - -$lead_tables = Array('vtiger_users','vtiger_user2role'); -$tabid = getTabid("Users"); -$validationData = getDBValidationData($lead_tables,$tabid); -$data = split_validationdataArray($validationData); - -$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); -$smarty->assign("MODULE", 'Users'); -$smarty->assign("CURRENT_USERID", $current_user->id); -$smarty->assign("HOMEORDER",$focus->getHomeOrder($focus->id)); -$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields)); -$smarty->assign("USERNAME",$focus->last_name.' '.$focus->first_name); - - -//Organization assignment -$crmid=$focus->id; -require('modules/Users/GetUserOrg.php'); - -//Assign the organization details to the html output -$smarty->assign("MULTISELECT_COMBO_BOX_ITEM_SEPARATOR_STRING", $org_separator); -$smarty->assign("ALL_USER_ORGANIZATIONS", $smarty_allorgs); -$smarty->assign("EDIT_USER_ORGANIZATIONS", $smarty_orgs); -$smarty->assign("EDIT_USER_ORGUNITS", $smarty_orgunits); -$smarty->assign("EDIT_USER_PRIMARY_ORGANIZATION", $curorg); -$smarty->assign("EDIT_USER_ASSIGNED_ORGANIZATIONS", $assigned_org); -$smarty->assign("EDIT_USER_PRIMARY_ORGUNITS", $prim_orgunits); - -$smarty->display("UserDetailView.tpl"); - - -?> +retrieve_entity_info($_REQUEST['record'],'Users'); + $focus->id = $_REQUEST['record']; +} +else +{ + + echo " + + "; +} + +if( $focus->user_name == "" ) +{ + + if(is_admin($current_user)) + { + echo " + + + + "; + + echo " + + + +
+ User does not exist. +
+ List Users +
+ "; + exit; + } + +} + + +if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { + $focus->id = ""; +} + +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); + +//the user might belong to multiple groups +$log->info("User detail view"); + +$category = getParenttab(); + +$smarty = new vtigerCRM_Smarty; + +$smarty->assign("UMOD", $mod_strings); +global $current_language; +$smod_strings = return_module_language($current_language, 'Settings'); +$smarty->assign("MOD", $smod_strings); + +$smarty->assign("APP", $app_strings); + +$oGetUserGroups = new GetUserGroups(); +$oGetUserGroups->getAllUserGroups($focus->id); + + +$smarty->assign("GROUP_COUNT",count($oGetUserGroups->user_groups)); +$smarty->assign("THEME", $theme); +$smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); +$smarty->assign("ID", $focus->id); +$smarty->assign("CATEGORY", $category); +if(isset($focus->imagename) && $focus->imagename!='') +{ + $imagestring="
+
+
+ + +
+

"; + //$smarty->assign("USER_IMAGE",$imagestring); +} + +if(isset($_REQUEST['modechk']) && $_REQUEST['modechk'] != '' ) +{ + $modepref = $_REQUEST['modechk']; +} + if($_REQUEST['modechk'] == 'prefview') + $parenttab = ''; + else + $parenttab = 'Settings'; + +$smarty->assign("PARENTTAB", $parenttab); + +if ((is_admin($current_user) || $_REQUEST['record'] == $current_user->id) + && isset($default_user_name) + && $default_user_name == $focus->user_name + && isset($lock_default_user_name) + && $lock_default_user_name == true ) { + $buttons = ""; + $smarty->assign('EDIT_BUTTON',$buttons); +} +elseif (is_admin($current_user) || $_REQUEST['record'] == $current_user->id) { + $buttons = ""; + $smarty->assign('EDIT_BUTTON',$buttons); + + $buttons = ""; + $smarty->assign('CHANGE_PW_BUTTON',$buttons); + + +} +if (is_admin($current_user)) +{ + $buttons = ""; + $smarty->assign('DUPLICATE_BUTTON',$buttons); + + //done so that only the admin user can see the customize tab button + if($_REQUEST['record'] != $current_user->id) + { + $buttons = "id')\" type='button' name='Delete' value=' ".$app_strings['LBL_DELETE_BUTTON_LABEL']." '>"; + $smarty->assign('DELETE_BUTTON',$buttons); + } + + if($_SESSION['authenticated_user_roleid'] == 'administrator') + { + $buttons = ""; + $smarty->assign('LISTROLES_BUTTON',$buttons); + } + +} + +if(is_admin($current_user)) + $smarty->assign("IS_ADMIN", true); +else + $smarty->assign("IS_ADMIN", false); + +$lead_tables = Array('vtiger_users','vtiger_user2role'); +$tabid = getTabid("Users"); +$validationData = getDBValidationData($lead_tables,$tabid); +$data = split_validationdataArray($validationData); + +if($current_user->id == $_REQUEST['record'] || is_admin($current_user) == true) +{ +$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); +$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); +$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); +$smarty->assign("MODULE", 'Users'); +$smarty->assign("CURRENT_USERID", $current_user->id); +$smarty->assign("HOMEORDER",$focus->getHomeOrder($focus->id)); +$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields)); +$smarty->assign("USERNAME",$focus->last_name.' '.$focus->first_name); + +//for check audittrail if it is enable or not +$smarty->assign("AUDITTRAIL",$audit_trail); + +//Organization assignment +$crmid=$focus->id; +require('modules/Users/GetUserOrg.php'); + +//Assign the organization details to the html output +$smarty->assign("MULTISELECT_COMBO_BOX_ITEM_SEPARATOR_STRING", $org_separator); +$smarty->assign("ALL_USER_ORGANIZATIONS", $smarty_allorgs); +$smarty->assign("EDIT_USER_ORGANIZATIONS", $smarty_orgs); +$smarty->assign("EDIT_USER_ORGUNITS", $smarty_orgunits); +$smarty->assign("EDIT_USER_PRIMARY_ORGANIZATION", $curorg); +$smarty->assign("EDIT_USER_ASSIGNED_ORGANIZATIONS", $assigned_org); +$smarty->assign("EDIT_USER_PRIMARY_ORGUNITS", $prim_orgunits); + +$smarty->display("UserDetailView.tpl"); +} +else +{ + $output = ' + +
+
+ + + + + + + + +
+ + + '.$app_strings["LBL_PERMISSION"].' + +
+ '.$app_strings["LBL_GO_BACK"].' +
+
+
+
'; + echo $output; +} + + + +?> Modified: vtigercrm/branches/5.1_jens/modules/Users/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/EditView.php Mon Apr 16 12:27:44 2007 @@ -42,7 +42,7 @@ $smarty->assign("ID",$_REQUEST['record']); $mode='edit'; if (!is_admin($current_user) && $_REQUEST['record'] != $current_user->id) die ("Unauthorized access to user administration."); - $focus->retrieve_entity_info($_REQUEST['record'],'Users'); + $focus->retrieve_entity_info($_REQUEST['record'],'Users'); $smarty->assign("USERNAME",$focus->last_name.' '.$focus->first_name); }else { @@ -58,11 +58,6 @@ $focus->column_fields['user_password']=''; $focus->column_fields['confirm_password']=''; } - -if(is_admin($current_user)) - $smarty->assign("IS_ADMIN", true); -else - $smarty->assign("IS_ADMIN", false); global $theme; $theme_path="themes/".$theme."/"; @@ -115,56 +110,9 @@ } $smarty->assign("HOMEORDER",$focus->getHomeOrder($focus->id)); +$smarty->assign("DUPLICATE",$_REQUEST['isDuplicate']); + $smarty->assign('PARENTTAB',$_REQUEST['parenttab']); - -//Organization assignment -if( $mode == "create" ) { - $orgs = array(); - $smarty_orgs = array($orgs); - - //all organizations - $sql = "SELECT organizationname FROM vtiger_organizationdetails WHERE deleted=0"; - $result = $adb->query($sql); - $allorgs = array(); - while($org_result = $adb->fetch_array($result)) { - $key = $org_result["organizationname"]; - $allorgs[$key] = ''; - } - $smarty_allorgs = array($allorgs); - - //Organization untis - $orgunits = array(); - $smarty_orgunits = array($orgunits); - - //The remaining field are intentially left blank - $curorg = ""; - $assigned_org = ""; - $prim_orgunits = ""; - $org_separator = "
 "; - - //Set up session variables - $_SESSION['all_user_organizations'] = $smarty_allorgs; - $_SESSION['edit_user_organizations'] = $smarty_orgs; - $_SESSION['edit_user_orgunits'] = $smarty_orgunits; - $_SESSION['edit_user_primary_organization'] = $curorg; - $_SESSION['edit_user_assigned_organization'] = $assigned_org; - $_SESSION['edit_user_primary_orgunits'] = $prim_orgunits; -} - -//In case of edit mode use the predefined gathering fuction -else { - $crmid = $focus->id; - require('modules/Users/GetUserOrg.php'); -} - -//Assign the organization details to the html output -$smarty->assign("MULTISELECT_COMBO_BOX_ITEM_SEPARATOR_STRING", $org_separator); -$smarty->assign("ALL_USER_ORGANIZATIONS", $smarty_allorgs); -$smarty->assign("EDIT_USER_ORGANIZATIONS", $smarty_orgs); -$smarty->assign("EDIT_USER_ORGUNITS", $smarty_orgunits); -$smarty->assign("EDIT_USER_PRIMARY_ORGANIZATION", $curorg); -$smarty->assign("EDIT_USER_ASSIGNED_ORGANIZATIONS", $assigned_org); -$smarty->assign("EDIT_USER_PRIMARY_ORGUNITS", $prim_orgunits); $smarty->display('UserEditView.tpl'); Modified: vtigercrm/branches/5.1_jens/modules/Users/Forms.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/Forms.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/Forms.php Mon Apr 16 12:27:44 2007 @@ -40,6 +40,11 @@ $lbl_user_email1 = $mod_strings['LBL_LIST_EMAIL']; $err_missing_required_fields = $app_strings['ERR_MISSING_REQUIRED_FIELDS']; $err_invalid_email_address = $app_strings['ERR_INVALID_EMAIL_ADDRESS']; +$lbl_user_image=$mod_strings['User Image']; +$the_emailid = $app_strings['THE_EMAILID']; +$email_field_is = $app_strings['EMAIL_FILED_IS'].$err_invalid_email_address; +$other_email_field_is = $app_strings['OTHER_EMAIL_FILED_IS'].$err_invalid_email_address; +$yahoo_email_field_is = $app_strings['YAHOO_EMAIL_FILED_IS'].$err_invalid_email_address; $the_script = << - - - - - -
'.$mod_strings['LBL_DELETE_GROUP'].''.$app_strings[
- - - - -
- - - - - - - - - -
'.$mod_strings['LBL_DELETE_GROUPNAME'].''.$delete_group_name.'
'.$mod_strings['LBL_TRANSFER_GROUP'].''; - global $adb; - $sql = "select groupid,groupname from vtiger_groups"; - $result = $adb->query($sql); - $num_groups = $adb->num_rows($result); - - $sql1 = "select id,user_name from vtiger_users where deleted=0"; - $result1= $adb->query($sql1); - $num_users = $adb->num_rows($result1); - - - $output.= ' User'; - if($num_groups > 1) - { - $output .= ' Group'; - } - - $output .= ''; - - $output .= ''; - - if($num_groups > 1) - { - $output .= ''; - } - - $output.='
-
- - - - -
-
-
'; - -echo $output; -?> + +
+ + + + + + + + +
'.$mod_strings['LBL_DELETE_GROUP'].''.$app_strings[
+ + + + +
+ + + + + + + + + +
'.$mod_strings['LBL_DELETE_GROUPNAME'].''.$delete_group_name.'
'.$mod_strings['LBL_TRANSFER_GROUP'].''; + global $adb; + $sql = "select groupid,groupname from vtiger_groups"; + $result = $adb->query($sql); + $num_groups = $adb->num_rows($result); + + $sql1 = "select id,user_name from vtiger_users where deleted=0"; + $result1= $adb->query($sql1); + $num_users = $adb->num_rows($result1); + + + $output.= ' User'; + if($num_groups > 1) + { + $output .= ' Group'; + } + + $output .= ''; + + $output .= ''; + + if($num_groups > 1) + { + $output .= ''; + } + + $output.='
+
+ + + + +
+
+
'; + +echo $output; +?> Modified: vtigercrm/branches/5.1_jens/modules/Users/Login.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/Login.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/Login.php Mon Apr 16 12:27:44 2007 @@ -86,95 +86,76 @@ +

+
+ + + + +
+ + + + + + + + smcreatorid - - - smownerid - - - modifiedby - - - deleted - smownerid - - - smownerid - deleted - - Type=InnoDB -
vtiger CRMThe honest Open Source CRM
- - - ","","","",""); +$search_fields = Array("SUBJECT","BODY","TO","CC","BCC","FROM"); +$listview_header = array("","","","",""); $listview_entries = array(); $displayed_msgs=0; $new_msgs=0; -if(($numEmails-1) <= 0) - $listview_entries[0][] = ''; +if(($numEmails) <= 0) + $listview_entries[0][] = ''; else { -if(isset($_REQUEST["search"])) { - $searchstring = $_REQUEST["search_type"].' "'.$_REQUEST["search_input"].'"'; - //echo $searchstring."
"; - $searchlist = imap_search($MailBox->mbox,$searchstring); - if($searchlist === false) - echo "The search failed"; - - $num_searches = count($searchlist); - - //print_r($searchlist); - $c=$numEmails; -} - -flush(); - -// MAIN LOOP -// Main loop to create listview entries -$i=1; -while ($i<$c) { - if(is_array($searchlist)) { - for($l=0;$l<$num_searches;$l++) { - if($mails[$start_message]->msgno == $searchlist[$l]) + if(isset($_REQUEST["search"]) && trim($_REQUEST["search_input"]) != '') { + $searchstring = $_REQUEST["search_type"].' "'.$_REQUEST["search_input"].'"'; + //echo $searchstring."
"; + $searchlist = Array(); + $searchlist = imap_search($MailBox->mbox,$searchstring); + + if(is_array($searchlist)) + { + $num_searches = count($searchlist); + $c=$numEmails; + } + + while ($i<=$c) { + if(is_array($searchlist)) { + for($l=0;$l<$num_searches;$l++) { + if($mails[$start_message]->msgno == $searchlist[$l]) + $listview_entries[] = show_msg($mails,$start_message); + } + } + $i++; + $start_message--; + } + }else + { + $i=1; + while ($i<=$c) { + if($start_message > 0) + { $listview_entries[] = show_msg($mails,$start_message); - } - } else { - $listview_entries[] = show_msg($mails,$start_message); - if($displayed_msgs == $MailBox->mails_per_page) {break;} - } - $i++; - $start_message--; -} -} + if($displayed_msgs == $MailBox->mails_per_page) {break;} + } + $i++; + $start_message--; + } + + } + + flush(); + // MAIN LOOP + // Main loop to create listview entries + +} + +$search_html = ''; // Build folder list and move_to dropdown box $list = imap_getmailboxes($MailBox->mbox, "{".$MailBox->imapServerAddress."}", "*"); sort($list); $i=0; if (is_array($list)) { - $boxes = ''; + $boxes .= ''; + foreach ($list as $key => $val) { $tmpval = preg_replace(array("/\{.*?\}/i"),array(""),$val->name); if(preg_match("/trash/i",$tmpval)) $img = "webmail_trash.gif"; elseif(preg_match("/sent/i",$tmpval)) - $img = "webmail_uparrow.gif"; + $img = "emailOutFolder.gif"; else - $img = "webmail_downarrow.gif"; + $img = "emailInFolder.gif"; $i++; + if($_REQUEST["mailbox"] == '') + $_REQUEST["mailbox"] = 'INBOX'; + if ($_REQUEST["mailbox"] == $tmpval) { - $boxes .= '"; - if ($mails[$start_message]->deleted) { - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; - } elseif(!$mails[$start_message]->seen || $mails[$start_message]->recent) { - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; - } else { - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; - } + if ($mails[$start_message]->deleted) + { + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + } + elseif(!$mails[$start_message]->seen || $mails[$start_message]->recent) + { + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + } + else + { + //IMPORTANT - This UTF-8 conversion has been done in ListView.php so no need to do again here + //Added to shown the original UTF-8 characters - Mickie - 30-11-06 - Starts + //we can use the option 1 or option 2 + //Option 1 - Starts + /* + $translated_subject = imap_mime_header_decode($mails[$start_message]->subject); + for($i=0;$icharset != 'default') + { + $tmp .= $translated_subject[$i]->text; + $mails[$start_message]->subject = utf8_decode($tmp);//$tmp; + } + } + //Option 1 - Ends + */ + //Option 2 - Starts + //$mails[$start_message]->subject = utf8_decode(imap_utf8($mails[$start_message]->subject));//imap_utf8($mails[$start_message]->subject); + //Option 2 - Ends + //Added to shown the original UTF-8 characters - Mickie - 30-11-06 - Ends + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + } + + + if($mails[$start_message]->deleted) - $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; else - $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + return $listview_entries[$num]; } Modified: vtigercrm/branches/5.1_jens/modules/Webmails/Save.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Webmails/Save.php (original) +++ vtigercrm/branches/5.1_jens/modules/Webmails/Save.php Mon Apr 16 12:27:44 2007 @@ -1,130 +1,130 @@ -mbox, $_REQUEST["mailid"]); -$subject = $email->subject; -$date = $email->date; - -$email->loadMail(); -$msgData = $email->body; - -$focus->column_fields['subject']=$subject; -$focus->column_fields["activitytype"]="Emails"; - -$ddate = date("Y-m-d"); -$dtime = date("h:m"); -$focus->column_fields["assigned_user_id"]=$current_user->id; -$focus->column_fields["date_start"]=$ddate; -$focus->column_fields["time_start"]=$dtime; - -//$tmpBody = preg_replace(array('//i',"/>/i","/</i","/ /i","/&/i","/©/i","/(.*?)<\/style>/i","/\{(.*?)\}/i","/BODY/i"),array("\r",">","<"," ","&","(c)","","",""),$msgData); -//$focus->column_fields["description"]=strip_tags($tmpBody); -$focus->column_fields["description"]=$msgData; - - -//to save the email details in vtiger_emaildetails vtiger_tables -$fieldid = $adb->query_result($adb->query('select fieldid from vtiger_field where tablename="contactdetails" and fieldname="email" and columnname="email"'),0,'fieldid'); - -if($email->relationship != 0) { - $focus->column_fields['parent_id']=$email->relationship["id"].'@'.$fieldid.'|'; - - if($email->relationship["type"] == "Contacts") - add_attachment_to_contact($email->relationship["id"],$email); -}else { - //if relationship is not available create a contact and relate the email to the contact - require_once('modules/Contacts/Contacts.php'); - $contact_focus = new Contacts(); - $contact_focus->column_fields['lastname'] =$email->fromname; - $contact_focus->column_fields['email'] = $email->from; - $contact_focus->save("Contacts"); - $focus->column_fields['parent_id']=$contact_focus->id.'@'.$fieldid.'|'; - - add_attachment_to_contact($contact_focus->id,$email); -} - -function add_attachment_to_contact($cid,$email) { - // add vtiger_attachments to contact - global $adb,$current_user; - for($j=0;$j<2;$j++) { - if($j==0) - $attachments=$email->downloadAttachments(); - else - $attachments=$email->downloadInlineAttachments(); - - $upload_filepath = decideFilePath(); - for($i=0,$num_files=count($attachments);$i<$num_files;$i++) { - $current_id = $adb->getUniqueID("vtiger_crmentity"); - $date_var = $adb->formatDate(date('YmdHis')); - - $filename = ereg_replace("[ ()-]+", "_",$attachments[$i]["filename"]); - $filetype= substr($filename,strstr($filename,"."),strlen($filename)); - $filesize = $attachments[$i]["filesize"]; - - $query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('"; - $query .= $current_id."','".$current_user->id."','".$current_user->id."','Contacts Attachment','Uploaded from webmail during qualification',".$date_var.")"; - $result = $adb->query($query); - - $sql = "insert into vtiger_attachments values("; - $sql .= $current_id.",'".$filename."','Uploaded ".$filename." from webmail','".$filetype."','".$upload_filepath."')"; - echo $query; - $result = $adb->query($sql); - - $sql1 = "insert into vtiger_seattachmentsrel values('"; - $sql1 .= $cid."','".$current_id."')"; - $result = $adb->query($sql1); - - $fp = fopen($upload_filepath.'/'.$filename, "w") or die("Can't open file"); - fputs($fp, base64_decode($attachments[$i]["filedata"])); - fclose($fp); - } - } -} - -$_REQUEST['parent_id'] = $focus->column_fields['parent_id']; -$focus->save("Emails"); - -//saving in vtiger_emaildetails vtiger_table -$id_lists = $focus->column_fields['parent_id'].'@'.$fieldid; -$all_to_ids = $email->from; -$query = 'insert into vtiger_emaildetails values ('.$focus->id.',"","'.$all_to_ids.'","","","","'.$id_lists.'","WEBMAIL")'; -$adb->query($query); - -$return_id = $_REQUEST["mailid"]; -$return_module='Webmails'; -$return_action='ListView'; - - -if($_POST["ajax"] != "true") - header("Location: index.php?action=$return_action&module=$return_module&record=$return_id"); - -return; -?> +mbox, $_REQUEST["mailid"]); +$subject = $email->subject; +$date = $email->date; +$array_tab = Array(); +$email->loadMail($array_tab); +$msgData = $email->body; + +$focus->column_fields['subject']=$subject; +$focus->column_fields["activitytype"]="Emails"; + +$ddate = date("Y-m-d"); +$dtime = date("h:m"); +$focus->column_fields["assigned_user_id"]=$current_user->id; +$focus->column_fields["date_start"]=$ddate; +$focus->column_fields["time_start"]=$dtime; + +//$tmpBody = preg_replace(array('//i',"/>/i","/</i","/ /i","/&/i","/©/i","/(.*?)<\/style>/i","/\{(.*?)\}/i","/BODY/i"),array("\r",">","<"," ","&","(c)","","",""),$msgData); +//$focus->column_fields["description"]=strip_tags($tmpBody); +$focus->column_fields["description"]=$msgData; + + +//to save the email details in vtiger_emaildetails vtiger_tables +$fieldid = $adb->query_result($adb->query('select fieldid from vtiger_field where tablename="contactdetails" and fieldname="email" and columnname="email"'),0,'fieldid'); + +if(count($email->relationship) != 0) { + $focus->column_fields['parent_id']=$email->relationship["id"].'@'.$fieldid.'|'; + + if($email->relationship["type"] == "Contacts") + add_attachment_to_contact($email->relationship["id"],$email); +}else { + //if relationship is not available create a contact and relate the email to the contact + require_once('modules/Contacts/Contacts.php'); + $contact_focus = new Contacts(); + $contact_focus->column_fields['lastname'] =$email->fromname; + $contact_focus->column_fields['email'] = $email->from; + $contact_focus->save("Contacts"); + $focus->column_fields['parent_id']=$contact_focus->id.'@'.$fieldid.'|'; + + add_attachment_to_contact($contact_focus->id,$email); +} + +function add_attachment_to_contact($cid,$email) { + // add vtiger_attachments to contact + global $adb,$current_user; + for($j=0;$j<2;$j++) { + if($j==0) + $attachments=$email->downloadAttachments(); + else + $attachments=$email->downloadInlineAttachments(); + + $upload_filepath = decideFilePath(); + for($i=0,$num_files=count($attachments);$i<$num_files;$i++) { + $current_id = $adb->getUniqueID("vtiger_crmentity"); + $date_var = $adb->formatDate(date('YmdHis')); + + $filename = ereg_replace("[ ()-]+", "_",$attachments[$i]["filename"]); + $filetype= substr($filename,strstr($filename,"."),strlen($filename)); + $filesize = $attachments[$i]["filesize"]; + + $query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('"; + $query .= $current_id."','".$current_user->id."','".$current_user->id."','Contacts Attachment','Uploaded from webmail during qualification',".$date_var.")"; + $result = $adb->query($query); + + $sql = "insert into vtiger_attachments values("; + $sql .= $current_id.",'".$filename."','Uploaded ".$filename." from webmail','".$filetype."','".$upload_filepath."')"; + echo $query; + $result = $adb->query($sql); + + $sql1 = "insert into vtiger_seattachmentsrel values('"; + $sql1 .= $cid."','".$current_id."')"; + $result = $adb->query($sql1); + + $fp = fopen($upload_filepath.'/'.$filename, "w") or die("Can't open file"); + fputs($fp, base64_decode($attachments[$i]["filedata"])); + fclose($fp); + } + } +} + +$_REQUEST['parent_id'] = $focus->column_fields['parent_id']; +$focus->save("Emails"); + +//saving in vtiger_emaildetails vtiger_table +$id_lists = $focus->column_fields['parent_id'].'@'.$fieldid; +$all_to_ids = $email->from; +$query = 'insert into vtiger_emaildetails values ('.$focus->id.',"","'.$all_to_ids.'","","","","'.$id_lists.'","WEBMAIL")'; +$adb->query($query); + +$return_id = $_REQUEST["mailid"]; +$return_module='Webmails'; +$return_action='ListView'; + + +if($_POST["ajax"] != "true") + header("Location: index.php?action=$return_action&module=$return_module&record=$return_id"); + +return; +?> Modified: vtigercrm/branches/5.1_jens/modules/Webmails/WebmailsAjax.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Webmails/WebmailsAjax.php (original) +++ vtigercrm/branches/5.1_jens/modules/Webmails/WebmailsAjax.php Mon Apr 16 12:27:44 2007 @@ -13,7 +13,7 @@ require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once('modules/Webmails/MailBox.php'); -require_once('modules/Webmails/Webmail.php'); +require_once('modules/Webmails/Webmails.php'); global $adb,$current_user; @@ -42,6 +42,17 @@ $command = $_REQUEST["command"]; if($command == "expunge") { $MailBox = new MailBox($mailbox); + /* + $search = imap_search($MailBox->mbox,'DELETED'); + $data = imap_fetch_overview($MailBox->mbox,implode(',',$search)); + for($i=0;$i<$num;$i++) + { + if($data[$i]->deleted != 0) + { + imap_delete($MailBox->mbox,$data[$i]->message_id); + } + } + */ imap_expunge($MailBox->mbox); imap_close($MailBox->mbox); flush(); @@ -50,8 +61,8 @@ if($command == "delete_msg") { $adb->println("DELETE SINGLE WEBMAIL MESSAGE $mailid"); $MailBox = new MailBox($mailbox); - $email = new Webmail($MailBox->mbox,$mailid); - $email->delete(); + imap_mail_move($MailBox->mbox,$mailid,"Deleted"); + $email = new Webmails($MailBox->mbox,$mailid); imap_close($MailBox->mbox); echo $mailid; flush(); @@ -61,9 +72,10 @@ $MailBox = new MailBox($mailbox); $tlist = explode(":",$mailid); foreach($tlist as $id) { + imap_mail_move($MailBox->mbox,$id,"Trash"); $adb->println("DELETE MULTI MESSAGE $id"); - $email = new Webmail($MailBox->mbox,$id); - $email->delete(); + $email = new Webmails($MailBox->mbox,$id); + $email->delete(); } imap_close($MailBox->mbox); echo $mailid; @@ -72,7 +84,7 @@ } if($command == "undelete_msg") { $MailBox = new MailBox($mailbox); - $email = new Webmail($MailBox->mbox,$mailid); + $email = new Webmails($MailBox->mbox,$mailid); $email->unDeleteMsg(); imap_close($MailBox->mbox); echo $mailid; @@ -81,17 +93,19 @@ } if($command == "set_flag") { $MailBox = new MailBox($mailbox); - $email = new Webmail($MailBox->mbox,$mailid); + $email = new Webmails($MailBox->mbox,$mailid); $email->setFlag(); imap_close($MailBox->mbox); + echo $mailid; flush(); exit(); } if($command == "clear_flag") { $MailBox = new MailBox($mailbox); - $email = new Webmail($MailBox->mbox,$mailid); + $email = new Webmails($MailBox->mbox,$mailid); $email->delFlag(); imap_close($MailBox->mbox); + echo $mailid; flush(); exit(); } Modified: vtigercrm/branches/5.1_jens/modules/Webmails/body.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Webmails/body.php (original) +++ vtigercrm/branches/5.1_jens/modules/Webmails/body.php Mon Apr 16 12:27:44 2007 @@ -12,15 +12,24 @@ global $current_user; require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); -require_once('modules/Webmails/Webmail.php'); +require_once('modules/Webmails/Webmails.php'); require_once('modules/Webmails/MailBox.php'); +global $mod_strings; if(!isset($_SESSION["authenticated_user_id"]) || $_SESSION["authenticated_user_id"] != $current_user->id) {echo "ajax failed";flush();exit();} $mailid=$_REQUEST["mailid"]; -if(isset($_REQUEST["mailbox"]) && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";} +if(isset($_REQUEST["mailbox"]) && $_REQUEST["mailbox"] != "") +{ + $mailbox=$_REQUEST["mailbox"]; +} +else +{ + $mailbox="INBOX"; +} $MailBox = new MailBox($mailbox); -$email = new Webmail($MailBox->mbox,$mailid); - +$mail = $MailBox->mbox; +$email = new Webmails($MailBox->mbox,$mailid); +$status=imap_setflag_full($MailBox->mbox,$mailid,"\\Seen"); ?> -loadMail(); - echo $email->body; - echo "

"; - if(is_array($email->inline)) { - $inline = $email->downloadInlineAttachments(); - $num=sizeof($inline); - echo "

Inline Attachments:

"; - for($i=0;$i<$num;$i++) { - //var_dump($inline[$i]); - // PLAIN TEXT - if($inline[$i]["subtype"] == "RFC822") { - echo ($i+1).") ".$inline[$i]["filename"].""; - } elseif($inline[$i]["subtype"] == "JPEG" || $inline[$i]["subtype"] == "GIF") { - echo ($i+1).") ".$inline[$i]["filename"]."


'; - } else - echo ($i+1).") ".$inline[$i]["filename"]."
"; +loadMail($attach_tab); +$content['body'] = ''.$email->body.''; +$content['attachtab'] = $email->attachtab; +//Need to put this along with the subject block +echo $email->att; +echo $content['body']; + +//test added by Richie +if (!isset($_REQUEST['display_images']) || $_REQUEST['display_images'] != 1) +{ + $content['body'] = eregi_replace('src="[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]"', 'src="none"', $content['body']); + $content['body'] = eregi_replace('src=[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]', 'src="none"', $content['body']); +} + +//Display embedded HTML images +$tmp_attach_tab=$content['attachtab']; +$i = 0; +$conf->display_img_attach = true; +$conf->display_text_attach = true; + +while ($tmp = array_pop($tmp_attach_tab)) +{ + if ($conf->display_img_attach && (eregi('image', $tmp['mime']) && ($tmp['number'] != ''))) + { + $exploded = explode('/', $tmp['mime']); + $img_type = array_pop($exploded); + if (eregi('JPEG', $img_type) || eregi('JPG', $img_type) || eregi('GIF', $img_type) || eregi ('PNG', $img_type)) + { + $new_img_src = 'src="get_img.php?mail=' . $mailid.'&num=' . $tmp['number'] . '&mime=' . $img_type . '&transfer=' . $tmp['transfer'] . '"'; + $img_id = str_replace('<', '', $tmp['id']); + $img_id = str_replace('>', '', $img_id); + $content['body'] = str_replace('src="cid:'.$img_id.'"', $new_img_src, $content['body']); + $content['body'] = str_replace('src=cid:'.$img_id, $new_img_src, $content['body']); } - } + } +} +while ($tmp = array_pop($content['attachtab'])) +{ + if ((!eregi('ATTACHMENT', $tmp['disposition'])) && $conf->display_text_attach && (eregi('text/plain', $tmp['mime']))) + echo '
'.view_part_detail($mail, $mailid, $tmp['number'], $tmp['transfer'], $tmp['charset'], $charset); + if ($conf->display_img_attach && (eregi('image', $tmp['mime']) && ($tmp['number'] != ''))) + { + $exploded = explode('/', $tmp['mime']); + $img_type = array_pop($exploded); + if (eregi('JPEG', $img_type) || eregi('JPG', $img_type) || eregi('GIF', $img_type) || eregi ('PNG', $img_type)) + { + echo '
'; + echo '
'; + echo ''; + echo '
'; + } +} +} + + +//test ended by Richie + imap_close($MailBox->mbox); + + ?> + Modified: vtigercrm/branches/5.1_jens/modules/Webmails/dlAttachments.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Webmails/dlAttachments.php (original) +++ vtigercrm/branches/5.1_jens/modules/Webmails/dlAttachments.php Mon Apr 16 12:27:44 2007 @@ -1,4 +1,4 @@ -mbox,$mailid); +$email = new Webmails($MailBox->mbox,$mailid); $attachments=$email->downloadAttachments(); $inline=$email->downloadInlineAttachments(); -if($num == "" || !isset($num) && count($attachments) >0 ) { - echo "




- - - - -
- - - - - - - -
- - - - -
- - + + + - -
+ + +
+
+ + + + + - + - - -
- vtiger CRM 5 - 100% Open Source CRM - Sign in
-- AJAX-based user interface
-- Complete customer life cycle management
-- Collaboration through e-mail, portal, and live chat
-- Customization & fine-grained security management
-- Ready to use reports & dashboards
-
- -
- - - - - - - - - - - - -
Sign In
-
- - - +
+ +
+ - + + - + + + + + + + + + + + + @@ -188,44 +169,23 @@ ?> + + - + +
- - - - - - - -
- -
- -
-
 
- - - -
- -  
-
+

- -
- +
- - - - - - - - -
- - - -
+
+ Modified: vtigercrm/branches/5.1_jens/modules/Users/RecalculateSharingRules.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/RecalculateSharingRules.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/RecalculateSharingRules.php Mon Apr 16 12:27:44 2007 @@ -11,7 +11,7 @@ RecalculateSharingRules(); -header("Location: index.php?action=OrgSharingDetailView&parenttab=Settings&module=Users"); +header("Location: index.php?action=OrgSharingDetailView&parenttab=Settings&module=Settings"); ?> Modified: vtigercrm/branches/5.1_jens/modules/Users/RoleDragDrop.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/RoleDragDrop.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/RoleDragDrop.php Mon Apr 16 12:27:44 2007 @@ -14,7 +14,7 @@ $fromid=$_REQUEST['childId']; -global $adb; +global $adb,$mod_strings; $query = "select * from vtiger_role where roleid='".$toid."'"; $result=$adb->query($query); $parentRoleList=$adb->query_result($result,0,'parentrole'); @@ -27,7 +27,7 @@ if(in_array($fromid,$parentRoles)) { - echo 'You cannot move a Parent Node under a Child Node'; + echo $mod_strings['ROLE_DRAG_ERR_MSG']; die; } @@ -58,5 +58,5 @@ -header("Location: index.php?action=UsersAjax&module=Users&file=listroles&ajax=true"); +header("Location: index.php?action=SettingsAjax&module=Settings&file=listroles&ajax=true"); ?> Modified: vtigercrm/branches/5.1_jens/modules/Users/SaveGroup.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/SaveGroup.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/SaveGroup.php Mon Apr 16 12:27:44 2007 @@ -112,7 +112,7 @@ $groupMemberArray=constructGroupMemberArray($member_array); updateGroup($groupId,$groupName,$groupMemberArray,$description); - $loc = "Location: index.php?action=".$returnaction."&module=Users&parenttab=Settings&groupId=".$groupId; + $loc = "Location: index.php?action=".$returnaction."&module=Settings&parenttab=Settings&groupId=".$groupId; } elseif(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'create') { @@ -120,7 +120,7 @@ $member_array = explode(';',$selected_col_string); $groupMemberArray=constructGroupMemberArray($member_array); $groupId=createGroup($groupName,$groupMemberArray,$description); - $loc = "Location: index.php?action=".$returnaction."&parenttab=Settings&module=Users&groupId=".$groupId; + $loc = "Location: index.php?action=".$returnaction."&parenttab=Settings&module=Settings&groupId=".$groupId; } Modified: vtigercrm/branches/5.1_jens/modules/Users/SaveOrgSharing.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/SaveOrgSharing.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/SaveOrgSharing.php Mon Apr 16 12:27:44 2007 @@ -39,6 +39,6 @@ } } -$loc = "Location: index.php?action=OrgSharingDetailView&module=Users&parenttab=Settings"; +$loc = "Location: index.php?action=OrgSharingDetailView&module=Settings&parenttab=Settings"; header($loc); ?> Modified: vtigercrm/branches/5.1_jens/modules/Users/SaveProfile.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/SaveProfile.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/SaveProfile.php Mon Apr 16 12:27:44 2007 @@ -13,8 +13,8 @@ require_once('include/utils/UserInfoUtil.php'); require_once('include/utils/utils.php'); global $adb; -$profilename = $_REQUEST['profile_name']; -$description= $_REQUEST['profile_description']; +$profilename = addslashes($_REQUEST['profile_name']); +$description= addslashes($_REQUEST['profile_description']); $def_module = $_REQUEST['selected_module']; $def_tab = $_REQUEST['selected_tab']; //Inserting values into Profile Table @@ -27,10 +27,17 @@ $profileid = $adb->query_result($result2,0,'current_id'); -//Retreiving the vtiger_tabs permission array -$tab_perr_result = $adb->query("select * from vtiger_profile2tab where profileid=1"); -$act_perr_result = $adb->query("select * from vtiger_profile2standardpermissions where profileid=1"); -$act_utility_result = $adb->query("select * from vtiger_profile2utility where profileid=1"); + //Retreiving the vtiger_tabs permission array + // + + //Retreiving the first profileid + $prof_query="select profileid from vtiger_profile order by profileid ASC"; + $prof_result = $adb->query($prof_query); + $first_prof_id = $adb->query_result($prof_result,0,'profileid'); + +$tab_perr_result = $adb->query("select * from vtiger_profile2tab where profileid=".$first_prof_id); +$act_perr_result = $adb->query("select * from vtiger_profile2standardpermissions where profileid=".$first_prof_id); +$act_utility_result = $adb->query("select * from vtiger_profile2utility where profileid=".$first_prof_id); $num_tab_per = $adb->num_rows($tab_perr_result); $num_act_per = $adb->num_rows($act_perr_result); $num_act_util_per = $adb->num_rows($act_utility_result); @@ -154,7 +161,7 @@ foreach($modArr as $fld_module => $fld_label) { - $fieldListResult = getProfile2FieldList($fld_module, 1); + $fieldListResult = getProfile2FieldList($fld_module, $first_prof_id); $noofrows = $adb->num_rows($fieldListResult); $tab_id = getTabid($fld_module); for($i=0; $i<$noofrows; $i++) @@ -171,7 +178,7 @@ } //Updating the Mandatory vtiger_fields $uitype = $adb->query_result($fieldListResult,$i,"uitype"); - if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16) + if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 53) { $visible_value = 0; } @@ -180,7 +187,7 @@ $adb->query($sql11); } } - $loc = "Location: index.php?action=ListProfiles&module=Users&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module; + $loc = "Location: index.php?action=ListProfiles&module=Settings&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module; header($loc); Modified: vtigercrm/branches/5.1_jens/modules/Users/UpdateProfileChanges.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/UpdateProfileChanges.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/UpdateProfileChanges.php Mon Apr 16 12:27:44 2007 @@ -162,7 +162,7 @@ } //Updating the Mandatory vtiger_fields $uitype = $adb->query_result($fieldListResult,$i,"uitype"); - if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16) + if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 53) { $visible_value = 0; } @@ -172,7 +172,14 @@ } } - $loc = "Location: index.php?action=".$return_action."&module=Users&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module; + if($return_action == 'profilePrivileges' || $return_action == 'ListProfiles') + { + $loc = "Location: index.php?action=".$return_action."&module=Settings&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module; + } + else + { + $loc = "Location: index.php?action=".$return_action."&module=Users&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module; + } header($loc); /** returns value 0 if request permission is on else returns value 1 Modified: vtigercrm/branches/5.1_jens/modules/Users/Users.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/Users.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/Users.php Mon Apr 16 12:27:44 2007 @@ -115,7 +115,7 @@ var $object_name = "User"; var $user_preferences; var $defhomeview; - var $homeorder_array = array('ALVT','HDB','PLVT','QLTQ','CVLVT','HLT','OLV','GRT','OLTSO','ILTI','MNL','OLTPO','LTFAQ'); + var $homeorder_array = array('HDB','ALVT','PLVT','QLTQ','CVLVT','HLT','OLV','GRT','OLTSO','ILTI','MNL','OLTPO','LTFAQ'); var $encodeFields = Array("first_name", "last_name", "description"); @@ -1185,7 +1185,8 @@ if($_REQUEST[$this->homeorder_array[$i]] != '') $save_array[] = $this->homeorder_array[$i]; } - $homeorder = implode(',',$save_array); + if(count($save_array)) + $homeorder = implode(',',$save_array); $query = "update vtiger_users set homeorder ='$homeorder' where id=$id"; $adb->query($query); $log->debug("Exiting from function saveHomeOrder($id)"); Modified: vtigercrm/branches/5.1_jens/modules/Users/UsersAjax.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/UsersAjax.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/UsersAjax.php Mon Apr 16 12:27:44 2007 @@ -11,27 +11,8 @@ global $current_user; global $adb; - if(isset($_REQUEST['file']) && ($_REQUEST['file'] !='')) { require_once('modules/Users/'.$_REQUEST['file'].'.php'); } -if(isset($_REQUEST['orgajax']) && ($_REQUEST['orgajax'] !='')) -{ - require_once('modules/Users/CreateSharingRule.php'); -} -elseif(isset($_REQUEST['announce_save']) && ($_REQUEST['announce_save'] != '')) -{ - $date_var = date('YmdHis'); - $announcement = $_REQUEST['announcement']; - $title = $_REQUEST['title_announcement']; - $sql="select * from vtiger_announcement where creatorid=".$current_user->id; - $is_announce=$adb->query($sql); - if($adb->num_rows($is_announce) > 0) - $query="update vtiger_announcement set announcement=".$adb->formatString("vtiger_announcement","announcement",$announcement).",time=".$adb->formatString("vtiger_announcement","time",$date_var).",title='announcement' where creatorid=".$current_user->id; - else - $query="insert into vtiger_announcement values (".$current_user->id.",".$adb->formatString("vtiger_announcement","announcement",$announcement).",'announcement',".$adb->formatString("vtiger_announcement","time",$date_var).")"; - $result=$adb->query($query); - echo $announcement; -} ?> Modified: vtigercrm/branches/5.1_jens/modules/Users/about_us.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/about_us.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/about_us.php Mon Apr 16 12:27:44 2007 @@ -32,9 +32,10 @@ "http://www.w3.org/TR/html4/loose.dtd"> - -vtiger CRM 5 - Free, Commercial grade Open Source CRM - + +<?php echo $mod_strings['TITLE_VTIGER_CRM_5'];?> + + - + @@ -86,7 +84,9 @@ + + @@ -96,6 +96,8 @@ + + @@ -131,35 +133,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -171,13 +173,13 @@ - - Modified: vtigercrm/branches/5.1_jens/modules/Users/updateLeadDBStatus.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/updateLeadDBStatus.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/updateLeadDBStatus.php Mon Apr 16 12:27:44 2007 @@ -79,7 +79,9 @@ //First we have to delete the group relationship $delete_query = "delete from ". $deletegroup_array[$return_module] ." where " . $tableId_array[$return_module] . "='".$id."'"; $result = $adb->query($delete_query); - + //Inserting changed owner information to salesmanactivityrel table + $insert = "insert into vtiger_salesmanactivityrel values(".$idval.",".$id.")"; + $result = $adb->query($insert); //Now we have to update the smownerid $sql = "update vtiger_crmentity set modifiedby=".$current_user->id.",smownerid='" .$idval ."', modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid='" .$id."'"; $result = $adb->query($sql); Modified: vtigercrm/branches/5.1_jens/modules/Vendors/Delete.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Vendors/Delete.php (original) +++ vtigercrm/branches/5.1_jens/modules/Vendors/Delete.php Mon Apr 16 12:27:44 2007 @@ -29,11 +29,11 @@ if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); - + if($_REQUEST['module'] == $_REQUEST['return_module']) { + delVendorRelRecords($_REQUEST['record']); $focus->mark_deleted($_REQUEST['record']); - $smod ="smodule=VENDOR&"; } -header("Location: index.php?".$smod."module=".$_REQUEST['return_module']."&action=".$_REQUEST['return_action']."&record=".$_REQUEST['return_id']."&relmodule=".$_REQUEST['module']); +header("Location: index.php?module=".$_REQUEST['return_module']."&action=".$_REQUEST['return_action']."&record=".$_REQUEST['return_id']."&relmodule=".$_REQUEST['module']); ?> Modified: vtigercrm/branches/5.1_jens/modules/Vendors/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Vendors/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Vendors/DetailView.php Mon Apr 16 12:27:44 2007 @@ -74,6 +74,8 @@ $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); $smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); + if($singlepane_view == 'true') { $related_array = getRelatedLists($currentModule,$focus); Modified: vtigercrm/branches/5.1_jens/modules/Vendors/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Vendors/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Vendors/EditView.php Mon Apr 16 12:27:44 2007 @@ -99,6 +99,7 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); // Assigned organizations $smarty->assign("CURRENT_ORGANIZATION",$current_organization); Modified: vtigercrm/branches/5.1_jens/modules/Vendors/Vendors.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Vendors/Vendors.php (original) +++ vtigercrm/branches/5.1_jens/modules/Vendors/Vendors.php Mon Apr 16 12:27:44 2007 @@ -89,7 +89,14 @@ else $returnset = '&return_module=Vendors&return_action=CallRelatedList&return_id='.$id; - $query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_vendor.vendorname from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid left outer join vtiger_vendor on vtiger_vendor.vendorid = vtiger_products.vendor_id where vtiger_vendor.vendorid = '.$id.' and vtiger_crmentity.deleted = 0'; + $query = "SELECT vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, + vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, + vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_vendor.vendorname + FROM vtiger_products + INNER JOIN vtiger_vendor ON vtiger_vendor.vendorid = vtiger_products.vendor_id + INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_products.productid + WHERE vtiger_crmentity.deleted = 0 AND vtiger_vendor.vendorid = $id"; + $log->debug("Exiting get_products method ..."); return GetRelatedList('Vendors','Products',$focus,$query,$button,$returnset); } @@ -113,7 +120,7 @@ else $returnset = '&return_module=Vendors&return_action=CallRelatedList&return_id='.$id; - $query = "select vtiger_users.user_name,vtiger_groups.groupname,vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.vendorid=".$id; + $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.vendorid=".$id; $log->debug("Exiting get_purchase_orders method ..."); return GetRelatedList('Vendors','PurchaseOrder',$focus,$query,$button,$returnset); } @@ -136,7 +143,7 @@ else $returnset = '&return_module=Vendors&return_action=CallRelatedList&return_id='.$id; - $query = 'SELECT vtiger_users.user_name,vtiger_groups.groupname,vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_vendorcontactrel.vendorid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid inner join vtiger_vendorcontactrel on vtiger_vendorcontactrel.contactid=vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_vendorcontactrel.vendorid = '.$id; + $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_vendorcontactrel.vendorid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid inner join vtiger_vendorcontactrel on vtiger_vendorcontactrel.contactid=vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_vendorcontactrel.vendorid = ".$id; $log->debug("Exiting get_contacts method ..."); return GetRelatedList('Vendors','Contacts',$focus,$query,$button,$returnset); Modified: vtigercrm/branches/5.1_jens/modules/Vendors/updateRelations.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Vendors/updateRelations.php (original) +++ vtigercrm/branches/5.1_jens/modules/Vendors/updateRelations.php Mon Apr 16 12:27:44 2007 @@ -15,40 +15,63 @@ $idlist = $_REQUEST['idlist']; -if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '') +if($singlepane_view == 'true') + $action = "DetailView"; +else + $action = "CallRelatedList"; + +$dest_mod = $_REQUEST['destination_module']; + +//This will be true, when we select product from vendor related list +if($_REQUEST['destination_module']=='Products') { - //split the string and store in an array - $storearray = explode (";",$idlist); - foreach($storearray as $id) + if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '') { - if($id != '') + $record = $_REQUEST["parentid"]; + $storearray = explode (";",$idlist); + foreach($storearray as $id) { - $sql = "insert into vtiger_vendorcontactrel values (".$_REQUEST["parentid"].",".$id.")"; - $adb->query($sql); - $sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parentid"] .",".$id.")"; - $adb->query($sql); + if($id != '') + $adb->query("update vtiger_products set vendor_id=".$record." where productid=".$id); } } - if($singlepane_view == 'true') - header("Location: index.php?action=DetailView&module=Vendors&record=".$_REQUEST["parentid"]); - else - header("Location: index.php?action=CallRelatedList&module=Vendors&record=".$_REQUEST["parentid"]); + elseif($_REQUEST['parid'] != '' && $_REQUEST['entityid'] != '') + { + $sql = "update vtiger_products set vendor_id=".$_REQUEST['parid']." where productid=".$_REQUEST['entityid']; + $adb->query($sql); + $record = $_REQUEST['parid']; + } } -elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '') +//select contact from vendor relatedlist +if($_REQUEST['destination_module']=='Contacts') { + if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '') + { + $record = $_REQUEST["parentid"]; - $sql = "insert into vtiger_vendorcontactrel values (".$_REQUEST['parid'].",".$_REQUEST['entityid'].")"; + //split the string and store in an array + $storearray = explode (";",$idlist); + foreach($storearray as $id) + { + if($id != '') + { + $sql = "insert into vtiger_vendorcontactrel values (".$record.",".$id.")"; + $adb->query($sql); + } + } + } + elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '') + { + $record = $_REQUEST["parid"]; + + $sql = "insert into vtiger_vendorcontactrel values (".$record.",".$_REQUEST['entityid'].")"; $adb->query($sql); - $sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parid"] .",".$_REQUEST["entityid"] .")"; - $adb->query($sql); - if($singlepane_view == 'true') - header("Location: index.php?action=DetailView&module=Vendors&record=".$_REQUEST["parid"]); - else - header("Location:index.php?action=CallRelatedList&module=Vendors&record=".$_REQUEST["parid"]); + } } +header("Location:index.php?action=$action&module=Vendors&record=".$record); Modified: vtigercrm/branches/5.1_jens/modules/Webmails/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Webmails/CallRelatedList.php (original) +++ vtigercrm/branches/5.1_jens/modules/Webmails/CallRelatedList.php Mon Apr 16 12:27:44 2007 @@ -18,7 +18,7 @@ require_once('include/upload_file.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/Webmails/Webmail.php'); +require_once('modules/Webmails/Webmails.php'); require_once('modules/Webmails/MailParse.php'); global $log; @@ -40,7 +40,7 @@ $mbox = getImapMbox($mailbox,$temprow); -$email = new Webmail($mbox, $mailid); +$email = new Webmails($mbox, $mailid); $from = $email->from; $subject=$email->subject; $date=$email->date; @@ -85,7 +85,6 @@ $smarty->assign("NAME","From: ".$from); $smarty->assign("RELATEDLISTS", $block); $smarty->assign("SINGLE_MOD","Webmails"); -$smarty->assign("REDIR_MOD","Webmails"); $smarty->assign("MODULE", "Webmails"); $smarty->assign("ID",$_REQUEST["record"] ); $smarty->assign("MOD",$mod_strings); Modified: vtigercrm/branches/5.1_jens/modules/Webmails/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Webmails/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Webmails/DetailView.php Mon Apr 16 12:27:44 2007 @@ -9,7 +9,7 @@ * ********************************************************************************/ require_once('include/utils/UserInfoUtil.php'); -require_once("modules/Webmails/Webmail.php"); +require_once("modules/Webmails/Webmails.php"); require_once("modules/Webmails/MailBox.php"); global $app_strings; @@ -21,7 +21,7 @@ global $MailBox; $MailBox = new MailBox($mailbox); -$webmail = new Webmail($MailBox->mbox,$mailid); +$webmail = new Webmails($MailBox->mbox,$mailid); $elist = $MailBox->mailList["overview"][($mailid-1)]; echo '
 
Anusha
Bharath
Bharathi
Dina
Don
Fenzik
Gopal
Jeri
Mani
Philip
Radiant
Richie
Shahul
Tamilmani
Vashni
 
Valmir Carlos Trindade
 
-
ADOdb
Ajax Popup Chat
Apache HTTP Server
Attachments in E-mail Client
Calculator
Carousel Slideshow
class_http
ExcelReader
FCKeditor
FPDF
freetag
gdwin32
Graph
Image Crossfade Redux
Image_Canvas
Image_Color
jscalendar
log4php
MagpieRSS
Mailfeed
MySQL
nusoap
PHP
PHPMailer
phpSysinfo
Prototype
script.oculo.us
Smarty Template Engine
SugarCRM (SPL 1.1.2)
ADOdb
Ajax Popup Chat
Apache HTTP Server
Attachments in E-mail Client
Calculator
Carousel Slideshow
class_http
ExcelReader
FCKeditor
FPDF
freetag
gdwin32
Graph
Image Crossfade Redux
Image_Canvas
Image_Color
jscalendar
log4php
MagpieRSS
Mailfeed
MySQL
nusoap
PHP
PHPMailer
phpSysinfo
Prototype
script.oculo.us
Smarty Template Engine
SugarCRM (SPL 1.1.2)
 
 
 
+ "; - printf("",$temprow["description"]); - $cnt++; + $templatename = $temprow["templatename"]; + if($is_admin == false) + { + $folderName = $temprow['foldername']; + if($folderName != 'Personal') + { + printf(""; + printf("",$temprow["description"]); + } + } + else + { + printf(""; + printf("",$temprow["description"]); + } + $cnt++; + }while($temprow = $adb->fetch_array($result)); ?>
 |  -  |  - +  |  + Modified: vtigercrm/branches/5.1_jens/modules/Users/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -1,621 +1,659 @@ -'Users', -'LBL_MODULE_TITLE'=>'Users: Home', -'LBL_SEARCH_FORM_TITLE'=>'User Search', -'LBL_LIST_FORM_TITLE'=>'User List', -'LBL_NEW_FORM_TITLE'=>'New User', -'LBL_CREATE_NEW_USER'=>'Create New User', -'LBL_USER'=>'Users:', -'LBL_LOGIN'=>'Login', -'LBL_USER_ROLE'=>'Role', -'LBL_LIST_NAME'=>'Name', -'LBL_LIST_LAST_NAME'=>'Last Name', -'LBL_LIST_USER_NAME'=>'User Name', -'LBL_LIST_DEPARTMENT'=>'Department', -'LBL_LIST_EMAIL'=>'E-Mail', -'LBL_LIST_PRIMARY_PHONE'=>'Primary Phone', -'LBL_LIST_ADMIN'=>'Admin', -'LBL_LIST_PASSWORD'=>'Password', -'LBL_LIST_CONFIRM_PASSWORD'=>'Confirm Password', -'LBL_LIST_USER_NAME_ROLE'=>'User ID , Name & Role', -'LBL_LIST_SELECT'=>'Select', -'LBL_LIST_PHONE'=>'Phone', -'LBL_LIST_NO'=>'#', - -'LBL_ADMINS'=>'Admins', -'LBL_STD_USERS'=>'Standard Users', - -'UserName'=>'UserName', -'Role'=>'Role', -'Email'=>'Email', -'Name'=>'Name', -'Admin'=>'Admin', -'Tools'=>'Tools', - - -//added for patch2 -'LBL_GROUP'=>'Group', -'LBL_CURRENCY_NAME'=>'Currency', - -'LBL_NEW_USER_BUTTON_TITLE'=>'New User [Alt+N]', -'LBL_NEW_USER_BUTTON_LABEL'=>'New User', -'LBL_NEW_USER_BUTTON_KEY'=>'N', -'LBL_DATE_FORMAT'=>'Date Format', - -'LBL_ERROR'=>'Error:', -'LBL_PASSWORD'=>'Password', -'LBL_USER_NAME'=>'User Name', -'LBL_CRM_ID'=>'CRM ID', -'LBL_FIRST_NAME'=>'First Name', -'LBL_LAST_NAME'=>'Last Name', -'LBL_YAHOO_ID'=>'Yahoo ID', -'LBL_USER_SETTINGS'=>'User Settings', -'LBL_THEME'=>'Color Theme', -'LBL_LANGUAGE'=>'Language', -'LBL_ADMIN'=>'Admin', -'LBL_USER_INFORMATION'=>'User Information', -'LBL_OFFICE_PHONE'=>'Office Phone', -'LBL_REPORTS_TO'=>'Reports to', -'LBL_OTHER_PHONE'=>'Other Phone', -'LBL_OTHER_EMAIL'=>'Other Email', -'LBL_NOTES'=>'Notes', -'LBL_DEPARTMENT'=>'Department', -'LBL_STATUS'=>'Status', -'LBL_TITLE'=>'Title', -'LBL_ANY_PHONE'=>'Any Phone:', -'LBL_ANY_EMAIL'=>'Any Email:', -'LBL_ADDRESS'=>'Street Address', -'LBL_CITY'=>'City', -'LBL_STATE'=>'State', -'LBL_POSTAL_CODE'=>'Postal Code', -'LBL_COUNTRY'=>'Country', -'LBL_NAME'=>'Name:', -'LBL_USER_SETTINGS'=>'User Settings', -'LBL_USER_INFORMATION'=>'User Information', -'LBL_MOBILE_PHONE'=>'Mobile', -'LBL_OTHER'=>'Other', -'LBL_FAX'=>'Fax', -'LBL_EMAIL'=>'E-Mail Id', -'LBL_HOME_PHONE'=>'Home Phone', -'LBL_ADDRESS_INFORMATION'=>'User Address', -'LBL_CAL_HRFORMAT'=>'Calendar Time Format', -'LBL_CAL_DURATION'=>'Day starts at', -'LBL_PRIMARY_ADDRESS'=>'Primary Address:', - -'LBL_ORGANIZATION_INFORMATION'=>'Organizations', -'LBL_PRIMARY_ORGANIZATION'=>'Primary organization', -'LBL_ASSIGNED_ORGANIZATIONS'=>'Assigned to organizations', -'LBL_PRIMARY_ORGUNITS'=>'Primary organization units', - -'LBL_CHANGE_PASSWORD_BUTTON_TITLE'=>'Change Password [Alt+P]', -'LBL_CHANGE_PASSWORD_BUTTON_KEY'=>'P', -'LBL_CHANGE_PASSWORD_BUTTON_LABEL'=>'Change Password', -'LBL_LOGIN_BUTTON_TITLE'=>'Login [Alt+L]', -'LBL_LOGIN_BUTTON_KEY'=>'L', -'LBL_LOGIN_BUTTON_LABEL'=>'Login', -'LBL_LOGIN_HISTORY_BUTTON_TITLE'=>'Login History [Alt+H]', -'LBL_LOGIN_HISTORY_BUTTON_KEY'=>'H', -'LBL_LOGIN_HISTORY_BUTTON_LABEL'=>'Login History', -'LBL_LOGIN_HISTORY_TITLE'=>'Users: Login History', -'LBL_RESET_PREFERENCES'=>'Reset To Default Preferences', - -'LBL_CHANGE_PASSWORD'=>'Change Password', -'LBL_OLD_PASSWORD'=>'Old Password:', -'LBL_NEW_PASSWORD'=>'New Password:', -'LBL_CONFIRM_PASSWORD'=>'Confirm Password:', -'ERR_ENTER_OLD_PASSWORD'=>'Please enter your old password.', -'ERR_ENTER_NEW_PASSWORD'=>'Please enter your new password.', -'ERR_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', -'ERR_REENTER_PASSWORDS'=>'Please re-enter passwords. The \"new password\" and \"confirm password\" values do not match.', -'ERR_INVALID_PASSWORD'=>'You must specify a valid username and password.', -'ERR_PASSWORD_CHANGE_FAILED_1'=>'User password change failed for ', -'ERR_PASSWORD_CHANGE_FAILED_2'=>' failed. The new password must be set.', -'ERR_PASSWORD_INCORRECT_OLD'=>'Incorrect old password specified. Re-enter password information.', -'ERR_USER_NAME_EXISTS_1'=>'The user name ', -'ERR_USER_NAME_EXISTS_2'=>' already exists. Duplicate user names are not allowed.
Change the user name to be unique.', -'ERR_LAST_ADMIN_1'=>'The user name ', -'ERR_LAST_ADMIN_2'=>' is the last Admin user. At least one user must be an Admin user.
Check the Admin user setting.', - -'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.", - -// Additional Fields for i18n --- Release vtigerCRM 3.2 Patch 2 -// Users--listroles.php , createrole.php , ListPermissions.php , editpermissions.php - -'LBL_ROLES'=>'Roles', -'LBL_ROLES_SUBORDINATES'=>'Roles and Subordinates', -'LBL_ROLE_NAME'=>'Role Name', -'LBL_CREATE_NEW_ROLE'=>'Create New Role', - -'LBL_CREATE_NEW_ROLE'=>'Create New Role', -'LBL_INDICATES_REQUIRED_FIELD'=>'Indicates Required Field', -'LBL_NEW_ROLE'=>'New Role', -'LBL_PARENT_ROLE'=>'Parent Role', - -'LBL_LIST_ROLES'=>'List Roles', -'LBL_ENTITY_LEVEL_PERMISSIONS'=>'Entity Level Permissions', -'LBL_ENTITY'=>'Entity', -'LBL_CREATE_EDIT'=>'Create/Edit', -'LBL_DELETE'=>'Delete', -'LBL_VIEW'=>'View', -'LBL_LEADS'=>'Leads', -'LBL_ACCOUNTS'=>'Accounts', -'LBL_CONTACTS'=>'Contacts', -'LBL_OPPURTUNITIES'=>'Opportunities', -'LBL_TASKS'=>'Tasks', -'LBL_CASES'=>'Cases', -'LBL_EMAILS'=>'Emails', -'LBL_NOTES'=>'Notes', -'LBL_MEETINGS'=>'Meetings', -'LBL_CALLS'=>'Calls', -'LBL_IMPORT_PERMISSIONS'=>'Import Permissions', -'LBL_IMPORT_LEADS'=>'Import Leads', -'LBL_IMPORT_ACCOUNTS'=>'Import Accounts', -'LBL_IMPORT_CONTACTS'=>'Import Contacts', -'LBL_IMPORT_OPPURTUNITIES'=>'Import Opportunities', - -'LBL_ROLE_DETAILS'=>'Role Details', -//added for vtigercrm4 rc -'LBL_FILE'=> 'File Name', -'LBL_FILE_TYPE'=>'File Type', -'LBL_UPLOAD'=>'Upload File', -'LBL_ATTACH_FILE'=>'Attach Mail Merge Template', -'LBL_EMAIL_TEMPLATES'=>'Email Templates', -'LBL_TEMPLATE_NAME'=>'Template Name', -'LBL_TEMPLATE_HEADER'=>'Template', -'LBL_TEMPLATE_DETAILS'=>'Template Details', -'LBL_EDIT_TEMPLATE'=>'Edit Template', -'LBL_TEMPLATE_FILE'=>'Template File', -'LBL_DESCRIPTION'=>'Description', -'LBL_EMAIL_TEMPLATES_LIST'=>'Communication Templates > Email Templates', -'LBL_MAILMERGE_TEMPLATES_LIST'=>' > Communication Templates > Mail Merge Templates', -'LBL_MAILMERGE_TEMPLATES_ATTACHMENT' => '> Communication Templates > Attach Mail Merge Template', -'LBL_DOWNLOAD_NOW'=>'Download Now', -'LBL_DOWNLOAD'=>'Download', -'LBL_SELECT_MODULE'=>'Select Module', -'LBL_MERGE_FILE'=>'File : ', -'LBL_MERGE_MSG'=>'Select a module to assign this Template', -'LBL_MERGE_FIELDS'=>'Merge Fields', -'LBL_COPY_PASTE'=>'Copy & Paste', -'LNK_GO_TO_TOP'=>'Go to Page Top', -'LNK_SAMPLE_EMAIL'=>'View Sample Email', -'LBL_COLON'=>':', -'LBL_EMAIL_TEMPLATE'=>'Email Template', -'LBL_NEW_TEMPLATE'=>'New Template', -'LBL_ADD_TEMPLATE'=>'Add Template', -'LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT'=>'Use merge fields to personalize your email content.', -'LBL_AVAILABLE_MERGE_FIELDS'=>'Available Merge Fields', -'LBL_SELECT_FIELD_TYPE'=>'Select Field Type', -'LBL_SELECT_FIELD'=>'Select Field :', -'LBL_MERGE_FIELD_VALUE'=>'Copy Merge Field Value :', -'LBL_ACCOUNT_FIELDS'=>'Account Fields', -'LBL_CONTACT_FIELDS'=>'Contact Fields', -'LBL_LEAD_FIELDS'=>'Lead Fields', -'LBL_COPY_AND_PASTE_MERGE_FIELD'=>'Copy and paste the merge field value into your template below.', -'LBL_EMAIL_TEMPLATE_INFORMATION'=>'Communication Templates > Email Templates > Viewing', -'LBL_FOLDER'=>'Folder', -'LBL_PERSONAL'=>'Personal', -'LBL_PUBLIC'=>'Public', -'LBL_TEMPLATE_NAME'=>'Template Name:', -'LBL_SUBJECT'=>'Subject', -'LBL_BODY'=>'Email Body', -'LBL_TEMPLATE_TOOLS'=>'Tools', -'LBL_TEMPLATE_PUBLIC'=>'Public Access', -'LBL_TEMPLATE_PRIVATE'=>'Private Access', -'LBL_TEMPLATE_SUBJECT'=>'Email Subject', -'LBL_TEMPLATE_MESSAGE'=>'Email Message', -'LBL_VIEWING'=>'Viewing', -'LBL_PROPERTIES'=>'Properties of', - - - -// Added fields in createnewgroup.php -'LBL_CREATE_NEW_GROUP'=>'Create New Group', -'LBL_NEW_GROUP'=>'New Group', -'LBL_EDIT_GROUP'=>'Edit Group', -'LBL_GROUP_NAME'=>'Group Name', -'LBL_GROUP_DETAILS'=>'Group Details', -'LBL_MEMBER'=>'Members', -'LBL_MEMBER_AVLBL'=>'Available Entities & Members', -'LBL_MEMBER_SELECTED'=>'Selected Members', -'LBL_DESCRIPTION'=>'Description', -'LBL_GROUP_MESG1'=>'Groups are a flexible way to assign access rights, when complex access rights has to be defined. You can combine multiple entities like Roles, Users, profiles etc into a single group.', -'LBL_GROUP_MESG2'=>'To add, select the Entity members from left and click the ">>" button.', -'LBL_GROUP_MESG3'=>'To remove, select the group members from the right and click the "<<" button.', - - -// Added fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php -'LBL_DETAIL_VIEW_OF_EMAIL_TEMPLATE'=>'Detail View of Email Template', -'LBL_DETAIL_VIEW'=>'Detail View of', -'LBL_EDIT_VIEW'=>'Editing details of the user', -'LBL_EDITING'=>'Editing user', -'LBL_GROUP_MEMBERS_LIST'=>'Group members list', -'LBL_GROUPS'=>'Groups', -'LBL_MY_GROUPS'=>'My Groups', -'LBL_ADD_GROUP_BUTTON'=>'Add Group', -'LBL_WORD_TEMPLATES'=>'Mail Merge Templates', -'LBL_NEW_WORD_TEMPLATE'=>'New Template', -'LBL_EMAIL_TEMPLATE_DESC'=>'Manage email templates used for Campaigns and Mass mailing', -'LBL_NAME'=>'Name', - -// Added fields in TabCustomise.php,html and UpdateTab.php,html -'LBL_CUSTOMISE_TABS'=>'Customize Tabs', -'LBL_CHOOSE_TABS'=>'Choose Tabs', -'LBL_AVAILABLE_TABS'=>'Available Tabs', -'LBL_SELECTED_TABS'=>'Selected Tabs', -'LBL_USER'=>'User', -'LBL_TAB_MENU_UPDATED'=>'Tab Menu Updated! kindly go to ', -'LBL_TO_VIEW_CHANGES'=>' to view the changes', - -// Added to change homepage order -'LBL_CHANGE_HOMEPAGE_LABEL'=>'Homepage Order', -'LBL_CHANGE_HOMEPAGE_TITLE'=>'Homepage', - -// Added fields in binaryfilelist.php -'LBL_OERATION'=>'Operation', - -// Added fields in CreateProfile.php -'LBL_PROFILE_NAME'=>'Create New Profile:', -'LBL_NEW_PROFILE'=>'New Profile', -'LBL_NEW_PROFILE_NAME'=>'Profile Name', -'LBL_PARENT_PROFILE'=>'Parent Profile', -'LBL_BASIC_PROFILE_DETAILS'=>'Basic details of Profile', -'LBL_STEP_1_2'=>'Step 1 of 2', -'LBL_STEP_2_2'=>'Step 2 of 2', -'LBL_STEP'=>'Step', -'LBL_SELECT_BASE_PROFILE'=>'Select Base Profile', -'LBL_PROFILE_PRIVILEGES'=>'Profile Privileges', -'LBL_GLOBAL_PRIVILEGES'=>'Global Privileges', -'LBL_TAB_PRIVILEGES'=>'Tab Privileges', -'LBL_FIELD_PRIVILEGES'=>'Field Privileges', -'LBL_STANDARD_PRIVILEGES'=>'Standard Privileges', -'LBL_UTILITY_PRIVILEGES'=>'Utility Privileges', -'LBL_UTILITIES'=>'Utilities', -'LBL_BASE_PROFILE_MESG'=>'I would like to setup a base profile and edit privileges (Recommended)', -'LBL_BASE_PROFILE'=>'Base Profile:', -'LBL_OR'=>'OR', -'LBL_BASE_PROFILE_MESG_ADV'=>'I will choose the privileges from scratch (Advanced Users)', -'LBL_FOR'=>'for', -'LBL_GLOBAL_MESG_OPTION'=>'Select the options below to change global privileges', -'LBL_VIEW_ALL'=>'View all', -'LBL_EDIT_ALL'=>'Edit all', -'LBL_ALLOW'=>'Allows', -'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM', -'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM', -'LBL_STD_MESG_OPTION'=>'Select the standard actions to be permitted', -'LBL_TAB_MESG_OPTION'=>'modules to be shown', -'LBL_UTILITY_MESG_OPTION'=>'Select the utility actions to be permitted', -'LBL_FIELD_MESG_OPTION'=>'Select the fields to be permitted', -'LBL_FINISH_BUTTON'=>'Finish', -'LBL_PROFILE_DETAIL_VIEW'=>'Detail View of Profile', -'LBL_PROFILE_MESG'=>'Viewing access privileges for', -'LBL_PROFILE_M'=>'Profile', -'LBL_DEFINE_PRIV_FOR'=>' Define Privileges for ', -'LBL_USE_OPTION_TO_SET_PRIV'=>'Use the options below to set privileges', -'LBL_SUPER_USER_PRIV'=>'Global Privileges', -'LBL_SET_PRIV_FOR_EACH_MODULE'=>'Set Privileges for each Module ', -'LBL_FIELDS_AND_TOOLS_SETTINGS'=>'Fields & Tools Settings', -'LBL_SHOW_FIELDS'=>'Show Fields', -'LBL_TOOLS_TO_BE_SHOWN'=>'Tools to be shown', -'LBL_WELCOME_PROFILE_CREATE'=>'Welcome to Privilege Profile Creator ', -'LBL_SELECT_CHOICE_NEW_PROFILE'=>'Select your choice of creating the new profile', -'LBL_ADD_CUSTOM_RULE'=>'Add Custom Privilege Rule', -'LBL_EDIT_CUSTOM_RULE'=>'Edit Custom Privilege Rule', -'LBL_CLOSE'=>'Close', -'LBL_SELECT_ENTITY'=>'Select an entity below', -'LBL_CAN_BE_ACCESSED_BY'=>'Can be accessed by', -'LBL_PERMISSIONS'=>'Permissions', -'LBL_ACCESS_RIGHTS_FOR_MODULES'=>'Access rights for relative modules', -'LBL_RULE_CONSTRUCTION'=>'Rule Construction Display', -'LBL_ADD_RULE'=>'Add Rule', -'LBL_RELATED_MODULE_RIGHTS'=>'Related Module Rights', -'LBL_IN_PERMISSION'=>'in the permission', - -//Added fields in createrole.php -'LBL_HDR_ROLE_NAME'=>'Create New Role:', -'LBL_TITLE_ROLE_NAME'=>'New Role', -'LBL_ROLE_NAME'=>'Role Name', -'LBL_ROLE_PROFILE_NAME'=>'Associate With Profile', -'LBL_SPECIFY_ROLE_NAME'=>'Specify a name for new role :', -'LBL_ASSIGN_PROFILE'=>'Assign Profile(s)', -'LBL_PROFILE_SELECT_TEXT'=>'Select the Profiles below and click on assign button', -'LBL_PROFILES_AVLBL'=>'Profiles Available', -'LBL_ASSIGN_PROFILES'=>'Assigned Profiles', -'LBL_REPORTS_TO_ROLE'=>'Reports to Role', -'LBL_ASSOCIATED_PROFILES'=>'Associated Profiles :', -'LBL_ASSOCIATED_USERS'=>'Associated Users :', - - -//Added fields in OrgSharingDetailsView.php -'LBL_ORG_SHARING_PRIVILEGES'=>'Organisation Sharing Privileges', -'LBL_EDIT_PERMISSIONS'=>'Edit Permissions', -'LBL_SAVE_PERMISSIONS'=>'Save Permissions', -'LBL_READ_ONLY'=>'Public: Read Only', -'LBL_EDIT_CREATE_ONLY'=>'Public: Read, Create/Edit', -'LBL_READ_CREATE_EDIT_DEL'=>'Public: Read, Create/Edit, Delete', -'LBL_PRIVATE'=>'Private', - -//Added fields in listnotificationschedulers.php -'LBL_HDR_EMAIL_SCHDS'=>'Users : Email Notifications', -'LBL_EMAIL_SCHDS_DESC'=>'The following is the list of notifications that are activated automatically when the corresponding event has happened.', -'LBL_ACTIVE'=>'Active', -'LBL_INACTIVE'=>'Inactive', -'LBL_NOTIFICATION'=>'Notification', -'LBL_DESCRIPTION'=>'Description', -'LBL_TASK_NOTIFICATION'=>'Delayed Task Notification', -'LBL_TASK_NOTIFICATION_DESCRITPION'=>'Notify when a task is delayed beyond 24 hrs', -'LBL_MANY_TICKETS'=>'Too many tickets Notification', -'LBL_MANY_TICKETS_DESCRIPTION'=>'Notify when a particular entity is allocated too many tickets, might reflect Service Level commitments', -'LBL_PENDING_TICKETS'=>'Pending Tickets Notification', -'LBL_TICKETS_DESCRIPTION'=>'Notify for getting attention to status of tickets which are pending', -'LBL_START_NOTIFICATION'=>'Support Start Notification', -'LBL_START_DESCRIPTION'=>'Notifiy stating the start of support/service', -'LBL_BIG_DEAL'=>'Big Deal Notification', -'LBL_BIG_DEAL_DESCRIPTION'=>'Notify on completion of big deal', -'LBL_SUPPORT_NOTICIATION'=>'Support End Notification', -'LBL_SUPPORT_DESCRIPTION'=>'Notify when support is about to end', -'LBL_BUTTON_UPDATE'=>'Update', -'LBL_MODULENAMES'=>'Module', - -//Added fields in ListFieldPermissions.html -'LBL_FIELD_PERMISSION_FIELD_NAME'=>'Field Name', -'LBL_FIELD_PERMISSION_VISIBLE'=>'Visible', -'LBL_FIELD_PERMISSIOM_TABLE_HEADER'=>'Standard Fields', -'LBL_FIELD_LEVEL_ACCESS'=>'Field Level Access', - -//Added fields after 4.0.1 -'LBL_SIGNATURE'=>'Signature', - -//Added for Event Reminder 4.2 Alpha release -'LBL_ACTIVITY_NOTIFICATION'=>'Event Reminder Notification', -'LBL_ACTIVITY_REMINDER_DESCRIPTION'=>'Notify before an event to occur based on the reminder set', -'LBL_MESSAGE'=>'Message', - -//Added for Global Privileges - -'Public: Read Only'=>'Public: Read Only', -'Public: Read, Create/Edit'=>'Public: Read, Create/Edit', -'Public: Read, Create/Edit, Delete'=>'Public: Read, Create/Edit, Delete', -'Private'=>'Private', -'Hide Details'=>'Hide Details', -'Hide Details and Add Events'=>'Hide Details and Add Events', -'Show Details'=>'Show Details', -'Show Details and Add Events'=>'Show Details and Add Events', - -'LBL_USR_CANNOT_ACCESS'=>'Users cannot access other users ', -'LBL_USR_CAN_ACCESS'=>'Users can ', -'LBL_USR_OTHERS'=>' other users ', - -'Read Only '=>'Read Only ', -'Read, Create/Edit, Delete '=>'Read, Create/Edit, Delete ', -'Read, Create/Edit '=>'Read, Create/Edit ', -'Read/Write'=>'Read/Write', -'LBL_GO_TO_TOP'=>'Go to Top', -'LNK_CLICK_HERE'=>'Click here', -'LBL_RULE_NO'=>'Rule No.', -'LBL_CAN_BE_ACCESSED'=>'can be accessed by', -'LBL_PRIVILEGES'=>'Privileges', -'LBL_OF'=>'of', - - - -//Added for 4.2GA support for mail server integration -'LBL_ADD_MAILSERVER_BUTTON_TITLE'=>'Add Mail Server', -'LBL_ADD_MAILSERVER_BUTTON_KEY'=>'M', -'LBL_ADD_MAILSERVER_BUTTON_LABEL'=>'Add Mail Server', - -'LBL_LIST_MAILSERVER_BUTTON_TITLE'=>'List Mail Server', -'LBL_LIST_MAILSERVER_BUTTON_KEY'=>'L', -'LBL_LIST_MAILSERVER_BUTTON_LABEL'=>'List Mail Server', -//added for inventory terms and conditions -'INV_TANDC'=>'Terms & Coditions', -'INV_TERMSANDCONDITIONS'=>'Inventory Terms & Coditions', -'LBL_INV_TERMSANDCONDITIONS'=>'Inventory Management', - - -'INVENTORYNOTIFICATION'=>'Inventory Notifications', -'LBL_INVENTORY_NOTIFICATIONS'=>'Edit Inventory Email Notifications', -'LBL_INV_NOT_DESC'=>'The following are the list of notifications that are sent to the product handler regarding the demand and the current quantity in hand during the creation of a Quote, SalesOrder and Invoice.', - -'InvoiceNotification'=>'Product Stock Notification during Invoice Generation', -'InvoiceNotificationDescription'=>'When the product stock level goes below the re-order level, notification will be sent to the product handler', - -'QuoteNotification'=>'Product Stock Notification during Quote Generation', -'QuoteNotificationDescription'=>'During quote generation if the product stock in warehouse is lesser than the quantity mentioned in quote then this notification will be sent to the product handler', - -'SalesOrderNotification'=>'Product Stock Notification during Sales Order Generation', -'SalesOrderNotificationDescription'=>'During sales order generation if the product stock in warehouse is lesser than the quantity mentioned in sales order then this notification will be sent to the product handler', - -//New addition for 4.2 GA -'LBL_USER_FIELDS'=>'User Fields', -'LBL_NOTE_DO_NOT_REMOVE_INFO'=>'Note: Donot remove or alter the values within { }', - -//Added for patch2 -'LBL_FILE_INFORMATION'=>'File Information', - -//Added after pathc2 -'LBL_LEAD_FIELD_ACCESS'=>'Lead Field Access', - -'LBL_ACCOUNT_FIELD_ACCESS'=>'Account Field Access', - -'LBL_CONTACT_FIELD_ACCESS'=>'Contact Field Access', - -'LBL_OPPORTUNITY_FIELD_ACCESS'=>'Potential Field Access', - -'LBL_HELPDESK_FIELD_ACCESS'=>'HelpDesk Field Access', - -'LBL_PRODUCT_FIELD_ACCESS'=>'Product Field Access', - -'LBL_NOTE_FIELD_ACCESS'=>'Note Field Access', - -'LBL_EMAIL_FIELD_ACCESS'=>'Email Field Access', - -'LBL_TASK_FIELD_ACCESS'=>'Task Field Access', - -'LBL_EVENT_FIELD_ACCESS'=>'Event Field Access', -'LBL_VENDOR_FIELD_ACCESS'=>'Vendor Field Access', -'LBL_PB_FIELD_ACCESS'=>'PriceBook Field Access', -'LBL_QUOTE_FIELD_ACCESS'=>'Quote Field Access', -'LBL_PO_FIELD_ACCESS'=>'Purchase Order Field Access', -'LBL_SO_FIELD_ACCESS'=>'Sales Order Access', -'LBL_INVOICE_FIELD_ACCESS'=>'Invoice Field Access', - -//given for calendar color for an user user -'LBL_COLOR'=>'Color in Calendar', -//added for activity view in home page -'LBL_ACTIVITY_VIEW'=>'Default Activity View', -//Added to change Home page order -'LBL_HOMEPAGE_ORDER_UPDATE'=>'Update Home Page Block Order', -'LBL_HOMEPAGE_ID'=>'Block Order', -'ERR_INVALID_USER'=>'Invalid access--Please call from My Accounts', -'ALVT'=>'Top Accounts', -'PLVT'=>'Top Potentials', -'QLTQ'=>'Top Quotes', -'CVLVT'=>'Key Metrics', -'HLT'=>'Top Trouble Tickets', -'OLV'=>'Upcoming & Pending Activities', -'GRT'=>'My Group Allocation', -'OLTSO'=>'Top Sales Orders', -'ILTI'=>'Top Invoices', -'HDB'=>'Home Page Dashboard', -'OLTPO'=>'Top Purchase Orders', -'LTFAQ'=>'My Recent FAQs', - -//Added for 5.0 alpha -'LBL_GROUP_NAME_ERROR'=>'Group Name already exists!', -'MNL'=>'My New Leads', -'LBL_LEAD_VIEW'=>'Default Leads View', -'LBL_TAG_CLOUD'=>'Tag Cloud', -'LBL_LIST_TOOLS'=>'Tools', -'LBL_STATISTICS'=>'Statistics', -'LBL_TOTAL'=>'Total :', -'LBL_OTHERS'=>'Others :', -'LBL_USERS'=>'User(s)', -'LBL_USER_LOGIN_ROLE'=>'User Login & Role', -'LBL_USER_MORE_INFN'=>'More Information', -'LBL_USER_ADDR_INFN'=>'Address Information', -'LBL_USER_IMAGE'=>'User Image', -'LBL_USR'=>'Users', - -'LBL_MY'=>'My', -'LBL_MY_DEFAULTS'=>'My Defaults', -'LBL_MY_DESG'=>'My Designation & Contact Details', -'LBL_MY_ADDR'=>'My Postal Address', -'LBL_MY_DETAILS'=>'My Details', -'LBL_MY_PHOTO'=>'My Photo', -'LBL_CHANGE_PHOTO'=>'Change Photo...', -'LBL_CHANGE'=>'Change', - - -//Added for Access Privileges - -'LBL_GLOBAL_FIELDS_MANAGER'=>'Global Fields Manager', -'LBL_GLOBAL_ACCESS_PRIVILEGES'=>'Organization-level Sharing Rules', -'LBL_CUSTOM_ACCESS_PRIVILEGES'=>'Custom Sharing Rules', -'LBL_BOTH'=>'Both', -'LBL_VIEW'=>'View', -'LBL_RECALCULATE_BUTTON'=>'Recalculate', -'LBL_ADD_PRIVILEGES_BUTTON'=>'Add Privileges', -'LBL_CUSTOM_ACCESS_MESG'=>'No Custom Access Rules defined .', -'LBL_CREATE_RULE_MESG'=>'to create a new Rule', -'LBL_SELECT_SCREEN'=>'Select the Screen / Module :', -'LBL_FIELDS_AVLBL'=>'Fields Available in', -'LBL_FIELDS_SELECT_DESELECT'=>'Fields to be shown', -'LBL_ROLE_TO_BE_DELETED'=>'Role to be Deleted', -'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role', -'LBL_DELETE_ROLE'=>'Delete Role', -'LBL_MORE_INFORMATION'=>'More Information', -'LBL_USERLOGIN_ROLE'=>'User Login & Role', -'LBL_USER_IMAGE_INFORMATION'=>'User Photograph', - -//Added for 5.0 for all fields -'Role'=>'Role', -'Email'=>'Email', -'Admin'=>'Admin', -'User Name'=>'User Name', -'First Name'=>'First Name', -'Last Name'=>'Last Name', -'Status'=>'Status', -'Default Activity View'=>'Default Calendar View', -'Default Lead View'=>'Default Lead View', -'Currency'=>'Currency', -'Title'=>'Title', -'Office Phone'=>'Office Phone', -'Department'=>'Department', -'Mobile'=>'Mobile', -'Reports To'=>'Reports To', -'Other Phone'=>'Other Phone', -'Other Email'=>'Other Email', -'Fax'=>'Fax', -'Yahoo id'=>'Yahoo id', -'Home Phone'=>'Home Phone', -'User Image'=>'Upload Photograph', -'Date Format'=>'Date Format', -'Tag Cloud'=>'Tag Cloud', -'Signature'=>'Signature', -'Notes'=>'Notes', -'Street Address'=>'Street Address', -'City'=>'City', -'State'=>'State', -'Postal Code'=>'Postal Code', -'Country'=>'Country', -'Password'=>'Password', -'Confirm Password'=>'Confirm Password', -'LBL_SHOWN'=>'Shown', -'LBL_HIDDEN'=>'Hidden', -'LBL_SHOW'=>'Show', -'LBL_HIDE'=>'Hide', -'LBL_HOME_PAGE_COMP'=>'Home Page Components', -'LBL_LOGIN_HISTORY'=>'Login History', -'LBL_USERDETAIL_INFO'=>'Viewing details about the user', -'LBL_DELETE_GROUP'=>'Delete Group', -'LBL_DELETE_GROUPNAME'=>'Group to be Deleted', -'LBL_TRANSFER_GROUP'=>'Transfer Ownership to: ', -'LBL_DELETE_USER'=>'User to be Deleted', -'LBL_TRANSFER_USER'=>'Transfer Ownership to User', -'LBL_DELETE_PROFILE'=>'Delete Profile', -'LBL_TRANSFER_ROLES_TO_PROFILE'=>'Transfer Roles to Profile', -'LBL_PROFILE_TO_BE_DELETED'=>'Profile to be Deteted', - -//Added for disabling window Recalculate - -'LBL_RECALC_MSG'=>'Are you sure, you wish to Recalculate Sharing Access?', -'LBL_YES'=>'Yes', -'LBL_NO'=>'No', - -'LBL_MANDATORY_MSG'=>'Mandatory Fields', -'LBL_DISABLE_FIELD_MSG'=>'Fields Disabled from Global Field Access Settings', - -//Added for About Us - -'LBL_CONTACT_US'=>'Contact Us', -'LBL_READ_LICENSE'=>'Read License', -'LBL_VERSION'=>'Version', -'LBL_TEAM'=>'Team', -'LBL_CREDITS'=>'Credits', -'LBL_THIRD_PARTY'=>'Third Party Packages', -'LBL_COMMUNITY'=>'And vtiger Community', - -'LBL_ASSIGN_ROLE'=>'Assign Role', - -); - -?> +'Users', +'LBL_MODULE_TITLE'=>'Users: Home', +'LBL_SEARCH_FORM_TITLE'=>'User Search', +'LBL_LIST_FORM_TITLE'=>'User List', +'LBL_NEW_FORM_TITLE'=>'New User', +'LBL_CREATE_NEW_USER'=>'Create New User', +'LBL_LOGIN'=>'Login', +'LBL_USER_ROLE'=>'Role', +'LBL_LIST_NAME'=>'Name', +'LBL_LIST_LAST_NAME'=>'Last Name', +'LBL_LIST_USER_NAME'=>'User Name', +'LBL_LIST_DEPARTMENT'=>'Department', +'LBL_LIST_EMAIL'=>'E-Mail', +'LBL_LIST_PRIMARY_PHONE'=>'Primary Phone', +'LBL_LIST_ADMIN'=>'Admin', +'LBL_LIST_CONFIRM_PASSWORD'=>'Confirm Password', +'LBL_LIST_USER_NAME_ROLE'=>'User ID , Name & Role', +'LBL_LIST_SELECT'=>'Select', +'LBL_LIST_PHONE'=>'Phone', +'LBL_LIST_NO'=>'#', + +'LBL_ADMINS'=>'Admins', +'LBL_STD_USERS'=>'Standard Users', + +'UserName'=>'UserName', +'Name'=>'Name', +'Tools'=>'Tools', + + +//added for patch2 +'LBL_GROUP'=>'Group', +'LBL_CURRENCY_NAME'=>'Currency', + +'LBL_NEW_USER_BUTTON_TITLE'=>'New User [Alt+N]', +'LBL_NEW_USER_BUTTON_LABEL'=>'New User', +'LBL_NEW_USER_BUTTON_KEY'=>'N', +'LBL_DATE_FORMAT'=>'Date Format', + +'LBL_ERROR'=>'Error:', +'LBL_PASSWORD'=>'Password', +'LBL_USER_NAME'=>'User Name', +'LBL_CRM_ID'=>'CRM ID', +'LBL_FIRST_NAME'=>'First Name', +'LBL_LAST_NAME'=>'Last Name', +'LBL_YAHOO_ID'=>'Yahoo ID', +'LBL_THEME'=>'Color Theme', +'LBL_LANGUAGE'=>'Language', +'LBL_ADMIN'=>'Admin', +'LBL_OFFICE_PHONE'=>'Office Phone', +'LBL_REPORTS_TO'=>'Reports to', +'LBL_OTHER_PHONE'=>'Other Phone', +'LBL_OTHER_EMAIL'=>'Other Email', +'LBL_DEPARTMENT'=>'Department', +'LBL_STATUS'=>'Status', +'LBL_TITLE'=>'Title', +'LBL_ANY_PHONE'=>'Any Phone:', +'LBL_ANY_EMAIL'=>'Any Email:', +'LBL_ADDRESS'=>'Street Address', +'LBL_CITY'=>'City', +'LBL_STATE'=>'State', +'LBL_POSTAL_CODE'=>'Postal Code', +'LBL_COUNTRY'=>'Country', +'LBL_USER_SETTINGS'=>'User Settings', +'LBL_USER_INFORMATION'=>'User Information', +'LBL_MOBILE_PHONE'=>'Mobile', +'LBL_OTHER'=>'Other', +'LBL_FAX'=>'Fax', +'LBL_EMAIL'=>'E-Mail Id', +'LBL_HOME_PHONE'=>'Home Phone', +'LBL_ADDRESS_INFORMATION'=>'User Address', +'LBL_CAL_HRFORMAT'=>'Calendar Time Format', +'LBL_CAL_DURATION'=>'Day starts at', +'LBL_PRIMARY_ADDRESS'=>'Primary Address:', + +'LBL_ORGANIZATION_INFORMATION'=>'Organizations', +'LBL_PRIMARY_ORGANIZATION'=>'Primary organization', +'LBL_ASSIGNED_ORGANIZATIONS'=>'Assigned to organizations', +'LBL_PRIMARY_ORGUNITS'=>'Primary organization units', + +'LBL_CHANGE_PASSWORD_BUTTON_TITLE'=>'Change Password [Alt+P]', +'LBL_CHANGE_PASSWORD_BUTTON_KEY'=>'P', +'LBL_CHANGE_PASSWORD_BUTTON_LABEL'=>'Change Password', +'LBL_LOGIN_BUTTON_TITLE'=>'Login [Alt+L]', +'LBL_LOGIN_BUTTON_KEY'=>'L', +'LBL_LOGIN_BUTTON_LABEL'=>'Login', +'LBL_LOGIN_HISTORY_BUTTON_TITLE'=>'Login History [Alt+H]', +'LBL_LOGIN_HISTORY_BUTTON_KEY'=>'H', +'LBL_LOGIN_HISTORY_BUTTON_LABEL'=>'Login History', +'LBL_LOGIN_HISTORY_TITLE'=>'Users: Login History', +'LBL_RESET_PREFERENCES'=>'Reset To Default Preferences', + +'LBL_CHANGE_PASSWORD'=>'Change Password', +'LBL_OLD_PASSWORD'=>'Old Password:', +'LBL_NEW_PASSWORD'=>'New Password:', +'LBL_CONFIRM_PASSWORD'=>'Confirm Password:', +'ERR_ENTER_OLD_PASSWORD'=>'Please enter your old password.', +'ERR_ENTER_NEW_PASSWORD'=>'Please enter your new password.', +'ERR_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', +'ERR_REENTER_PASSWORDS'=>'Please re-enter passwords. The \"new password\" and \"confirm password\" values do not match.', +'ERR_INVALID_PASSWORD'=>'You must specify a valid username and password.', +'ERR_PASSWORD_CHANGE_FAILED_1'=>'User password change failed for ', +'ERR_PASSWORD_CHANGE_FAILED_2'=>' failed. The new password must be set.', +'ERR_PASSWORD_INCORRECT_OLD'=>'Incorrect old password specified. Re-enter password information.', +'ERR_USER_NAME_EXISTS_1'=>'The user name ', +'ERR_USER_NAME_EXISTS_2'=>' already exists. Duplicate user names are not allowed.
Change the user name to be unique.', +'ERR_LAST_ADMIN_1'=>'The user name ', +'ERR_LAST_ADMIN_2'=>' is the last Admin user. At least one user must be an Admin user.
Check the Admin user setting.', + +'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.", + +// Additional Fields for i18n --- Release vtigerCRM 3.2 Patch 2 +// Users--listroles.php , createrole.php , ListPermissions.php , editpermissions.php + +'LBL_ROLES'=>'Roles', +'LBL_ROLES_SUBORDINATES'=>'Roles and Subordinates', + +'LBL_CREATE_NEW_ROLE'=>'Create New Role', +'LBL_INDICATES_REQUIRED_FIELD'=>'Indicates Required Field', +'LBL_NEW_ROLE'=>'New Role', +'LBL_PARENT_ROLE'=>'Parent Role', + +'LBL_LIST_ROLES'=>'List Roles', +'LBL_ENTITY_LEVEL_PERMISSIONS'=>'Entity Level Permissions', +'LBL_ENTITY'=>'Entity', +'LBL_CREATE_EDIT'=>'Create/Edit', +'LBL_DELETE'=>'Delete', +'LBL_LEADS'=>'Leads', +'LBL_ACCOUNTS'=>'Accounts', +'LBL_CONTACTS'=>'Contacts', +'LBL_OPPURTUNITIES'=>'Opportunities', +'LBL_TASKS'=>'Tasks', +'LBL_CASES'=>'Cases', +'LBL_EMAILS'=>'Email', +'LBL_NOTES'=>'Notes', +'LBL_MEETINGS'=>'Meetings', +'LBL_CALLS'=>'Calls', +'LBL_IMPORT_PERMISSIONS'=>'Import Permissions', +'LBL_IMPORT_LEADS'=>'Import Leads', +'LBL_IMPORT_ACCOUNTS'=>'Import Accounts', +'LBL_IMPORT_CONTACTS'=>'Import Contacts', +'LBL_IMPORT_OPPURTUNITIES'=>'Import Opportunities', + +'LBL_ROLE_DETAILS'=>'Role Details', +//added for vtigercrm4 rc +'LBL_FILE'=> 'File Name', +'LBL_FILE_TYPE'=>'File Type', +'LBL_UPLOAD'=>'Upload File', +'LBL_ATTACH_FILE'=>'Attach Mail Merge Template', +'LBL_EMAIL_TEMPLATES'=>'Email Templates', +'LBL_TEMPLATE_HEADER'=>'Template', +'LBL_TEMPLATE_DETAILS'=>'Template Details', +'LBL_EDIT_TEMPLATE'=>'Edit Template', +'LBL_TEMPLATE_FILE'=>'Template File', +'LBL_EMAIL_TEMPLATES_LIST'=>'Communication Templates > Email Templates', +'LBL_MAILMERGE_TEMPLATES_LIST'=>' > Communication Templates > Mail Merge Templates', +'LBL_MAILMERGE_TEMPLATES_ATTACHMENT' => '> Communication Templates > Attach Mail Merge Template', +'LBL_DOWNLOAD_NOW'=>'Download Now', +'LBL_DOWNLOAD'=>'Download', +'LBL_SELECT_MODULE'=>'Select Module', +'LBL_MERGE_FILE'=>'File : ', +'LBL_MERGE_MSG'=>'Select a module to assign this Template', +'LBL_MERGE_FIELDS'=>'Merge Fields', +'LBL_COPY_PASTE'=>'Copy & Paste', +'LNK_GO_TO_TOP'=>'Go to Page Top', +'LBL_COLON'=>':', +'LBL_EMAIL_TEMPLATE'=>'Email Template', +'LBL_NEW_TEMPLATE'=>'New Template', +'LBL_ADD_TEMPLATE'=>'Add Template', +'LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT'=>'Use merge fields to personalize your email content.', +'LBL_AVAILABLE_MERGE_FIELDS'=>'Available Merge Fields', +'LBL_SELECT_FIELD_TYPE'=>'Select Field Type', +'LBL_SELECT_FIELD'=>'Select Field :', +'LBL_MERGE_FIELD_VALUE'=>'Copy Merge Field Value :', +'LBL_ACCOUNT_FIELDS'=>'Account Fields', +'LBL_CONTACT_FIELDS'=>'Contact Fields', +'LBL_LEAD_FIELDS'=>'Lead Fields', +'LBL_COPY_AND_PASTE_MERGE_FIELD'=>'Copy and paste the merge field value into your template below.', +'LBL_EMAIL_TEMPLATE_INFORMATION'=>'Communication Templates > Email Templates > Viewing', +'LBL_FOLDER'=>'Folder', +'LBL_PERSONAL'=>'Personal', +'LBL_PUBLIC'=>'Public', +'LBL_TEMPLATE_NAME'=>'Template Name:', +'LBL_SUBJECT'=>'Subject', +'LBL_BODY'=>'Email Body', +'LBL_TEMPLATE_TOOLS'=>'Tools', +'LBL_TEMPLATE_PUBLIC'=>'Public Access', +'LBL_TEMPLATE_PRIVATE'=>'Private Access', +'LBL_TEMPLATE_SUBJECT'=>'Email Subject', +'LBL_TEMPLATE_MESSAGE'=>'Email Message', +'LBL_VIEWING'=>'Viewing', +'LBL_PROPERTIES'=>'Properties of', + + + +// Added fields in createnewgroup.php +'LBL_CREATE_NEW_GROUP'=>'Create New Group', +'LBL_NEW_GROUP'=>'New Group', +'LBL_EDIT_GROUP'=>'Edit Group', +'LBL_GROUP_NAME'=>'Group Name', +'LBL_GROUP_DETAILS'=>'Group Details', +'LBL_MEMBER'=>'Members', +'LBL_MEMBER_AVLBL'=>'Available Entities & Members', +'LBL_MEMBER_SELECTED'=>'Selected Members', +'LBL_DESCRIPTION'=>'Description', +'LBL_GROUP_MESG1'=>'Groups are a flexible way to assign access rights, when complex access rights has to be defined. You can combine multiple entities like Roles, Users, profiles etc into a single group.', +'LBL_GROUP_MESG2'=>'To add, select the Entity members from left and click the ">>" button.', +'LBL_GROUP_MESG3'=>'To remove, select the group members from the right and click the "<<" button.', + + +// Added fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php +'LBL_DETAIL_VIEW_OF_EMAIL_TEMPLATE'=>'Detail View of Email Template', +'LBL_DETAIL_VIEW'=>'Detail View of', +'LBL_EDIT_VIEW'=>'Editing details of the user', +'LBL_EDITING'=>'Editing user', +'LBL_GROUP_MEMBERS_LIST'=>'Group members list', +'LBL_GROUPS'=>'Groups', +'LBL_MY_GROUPS'=>'My Groups', +'LBL_ADD_GROUP_BUTTON'=>'Add Group', +'LBL_WORD_TEMPLATES'=>'Mail Merge Templates', +'LBL_NEW_WORD_TEMPLATE'=>'New Template', +'LBL_EMAIL_TEMPLATE_DESC'=>'Manage email templates used for Campaigns and Mass mailing', +'LBL_NAME'=>'Name', + +// Added fields in TabCustomise.php,html and UpdateTab.php,html +'LBL_CUSTOMISE_TABS'=>'Customize Tabs', +'LBL_CHOOSE_TABS'=>'Choose Tabs', +'LBL_AVAILABLE_TABS'=>'Available Tabs', +'LBL_SELECTED_TABS'=>'Selected Tabs', +'LBL_USER'=>'User', +'LBL_TAB_MENU_UPDATED'=>'Tab Menu Updated! kindly go to ', +'LBL_TO_VIEW_CHANGES'=>' to view the changes', + +// Added to change homepage order +'LBL_CHANGE_HOMEPAGE_LABEL'=>'Homepage Order', +'LBL_CHANGE_HOMEPAGE_TITLE'=>'Homepage', + +// Added fields in binaryfilelist.php +'LBL_OERATION'=>'Operation', + +// Added fields in CreateProfile.php +'LBL_PROFILE_NAME'=>'Create New Profile:', +'LBL_NEW_PROFILE'=>'New Profile', +'LBL_NEW_PROFILE_NAME'=>'Profile Name', +'LBL_PARENT_PROFILE'=>'Parent Profile', +'LBL_BASIC_PROFILE_DETAILS'=>'Basic details of Profile', +'LBL_STEP_1_2'=>'Step 1 of 2', +'LBL_STEP_2_2'=>'Step 2 of 2', +'LBL_STEP'=>'Step', +'LBL_SELECT_BASE_PROFILE'=>'Select Base Profile', +'LBL_PROFILE_PRIVILEGES'=>'Profile Privileges', +'LBL_GLOBAL_PRIVILEGES'=>'Global Privileges', +'LBL_TAB_PRIVILEGES'=>'Tab Privileges', +'LBL_FIELD_PRIVILEGES'=>'Field Privileges', +'LBL_STANDARD_PRIVILEGES'=>'Standard Privileges', +'LBL_UTILITY_PRIVILEGES'=>'Utility Privileges', +'LBL_UTILITIES'=>'Utilities', +'LBL_BASE_PROFILE_MESG'=>'I would like to setup a base profile and edit privileges (Recommended)', +'LBL_BASE_PROFILE'=>'Base Profile:', +'LBL_OR'=>'OR', +'LBL_BASE_PROFILE_MESG_ADV'=>'I will choose the privileges from scratch (Advanced Users)', +'LBL_FOR'=>'for', +'LBL_GLOBAL_MESG_OPTION'=>'Select the options below to change global privileges', +'LBL_VIEW_ALL'=>'View all', +'LBL_EDIT_ALL'=>'Edit all', +'LBL_ALLOW'=>'Allows', +'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM', +'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM', +'LBL_STD_MESG_OPTION'=>'Select the standard actions to be permitted', +'LBL_TAB_MESG_OPTION'=>'modules to be shown', +'LBL_UTILITY_MESG_OPTION'=>'Select the utility actions to be permitted', +'LBL_FIELD_MESG_OPTION'=>'Select the fields to be permitted', +'LBL_FINISH_BUTTON'=>'Finish', +'LBL_PROFILE_DETAIL_VIEW'=>'Detail View of Profile', +'LBL_PROFILE_MESG'=>'Viewing access privileges for', +'LBL_PROFILE_M'=>'Profile', +'LBL_DEFINE_PRIV_FOR'=>' Define Privileges for ', +'LBL_USE_OPTION_TO_SET_PRIV'=>'Use the options below to set privileges', +'LBL_SUPER_USER_PRIV'=>'Global Privileges', +'LBL_SET_PRIV_FOR_EACH_MODULE'=>'Set Privileges for each Module ', +'LBL_FIELDS_AND_TOOLS_SETTINGS'=>'Fields & Tools Settings', +'LBL_SHOW_FIELDS'=>'Show Fields', +'LBL_TOOLS_TO_BE_SHOWN'=>'Tools to be shown', +'LBL_WELCOME_PROFILE_CREATE'=>'Welcome to Privilege Profile Creator ', +'LBL_SELECT_CHOICE_NEW_PROFILE'=>'Select your choice of creating the new profile', +'LBL_ADD_CUSTOM_RULE'=>'Add Custom Privilege Rule', +'LBL_EDIT_CUSTOM_RULE'=>'Edit Custom Privilege Rule', +'LBL_CLOSE'=>'Close', +'LBL_SELECT_ENTITY'=>'Select an entity below', +'LBL_CAN_BE_ACCESSED_BY'=>'Can be accessed by', +'LBL_PERMISSIONS'=>'Permissions', +'LBL_ACCESS_RIGHTS_FOR_MODULES'=>'Access rights for relative modules', +'LBL_RULE_CONSTRUCTION'=>'Rule Construction Display', +'LBL_ADD_RULE'=>'Add Rule', +'LBL_RELATED_MODULE_RIGHTS'=>'Related Module Rights', +'LBL_IN_PERMISSION'=>'in the permission', + +//Added fields in createrole.php +'LBL_HDR_ROLE_NAME'=>'Create New Role:', +'LBL_TITLE_ROLE_NAME'=>'New Role', +'LBL_ROLE_NAME'=>'Role Name', +'LBL_ROLE_PROFILE_NAME'=>'Associate With Profile', +'LBL_SPECIFY_ROLE_NAME'=>'Specify a name for new role :', +'LBL_ASSIGN_PROFILE'=>'Assign Profile(s)', +'LBL_PROFILE_SELECT_TEXT'=>'Select the Profiles below and click on assign button', +'LBL_PROFILES_AVLBL'=>'Profiles Available', +'LBL_ASSIGN_PROFILES'=>'Assigned Profiles', +'LBL_REPORTS_TO_ROLE'=>'Reports to Role', +'LBL_ASSOCIATED_PROFILES'=>'Associated Profiles :', +'LBL_ASSOCIATED_USERS'=>'Associated Users :', + + +//Added fields in OrgSharingDetailsView.php +'LBL_ORG_SHARING_PRIVILEGES'=>'Organisation Sharing Privileges', +'LBL_EDIT_PERMISSIONS'=>'Edit Permissions', +'LBL_SAVE_PERMISSIONS'=>'Save Permissions', +'LBL_READ_ONLY'=>'Public: Read Only', +'LBL_EDIT_CREATE_ONLY'=>'Public: Read, Create/Edit', +'LBL_READ_CREATE_EDIT_DEL'=>'Public: Read, Create/Edit, Delete', +'LBL_PRIVATE'=>'Private', + +//Added fields in listnotificationschedulers.php +'LBL_HDR_EMAIL_SCHDS'=>'Users : Email Notifications', +'LBL_EMAIL_SCHDS_DESC'=>'The following is the list of notifications that are activated automatically when the corresponding event has happened.', +'LBL_ACTIVE'=>'Active', +'LBL_INACTIVE'=>'Inactive', +'LBL_NOTIFICATION'=>'Notification', +'LBL_DESCRIPTION'=>'Description', +'LBL_TASK_NOTIFICATION'=>'Delayed Task Notification', +'LBL_TASK_NOTIFICATION_DESCRITPION'=>'Notify when a task is delayed beyond 24 hrs', +'LBL_MANY_TICKETS'=>'Too many tickets Notification', +'LBL_MANY_TICKETS_DESCRIPTION'=>'Notify when a particular entity is allocated too many tickets, might reflect Service Level commitments', +'LBL_PENDING_TICKETS'=>'Pending Tickets Notification', +'LBL_TICKETS_DESCRIPTION'=>'Notify for getting attention to status of tickets which are pending', +'LBL_START_NOTIFICATION'=>'Support Start Notification', +'LBL_START_DESCRIPTION'=>'Notifiy stating the start of support/service', +'LBL_BIG_DEAL'=>'Big Deal Notification', +'LBL_BIG_DEAL_DESCRIPTION'=>'Notify on completion of big deal', +'LBL_SUPPORT_NOTICIATION'=>'Support End Notification', +'LBL_SUPPORT_DESCRIPTION'=>'Notify when support is about to end', +'LBL_BUTTON_UPDATE'=>'Update', +'LBL_MODULENAMES'=>'Module', + +//Added fields in ListFieldPermissions.html +'LBL_FIELD_PERMISSION_FIELD_NAME'=>'Field Name', +'LBL_FIELD_PERMISSION_VISIBLE'=>'Visible', +'LBL_FIELD_PERMISSIOM_TABLE_HEADER'=>'Standard Fields', +'LBL_FIELD_LEVEL_ACCESS'=>'Field Level Access', + +//Added fields after 4.0.1 +'LBL_SIGNATURE'=>'Signature', + +//Added for Event Reminder 4.2 Alpha release +'LBL_ACTIVITY_NOTIFICATION'=>'Event Reminder Notification', +'LBL_ACTIVITY_REMINDER_DESCRIPTION'=>'Notify before an event to occur based on the reminder set', +'LBL_MESSAGE'=>'Message', + +//Added for Global Privileges + +'Public: Read Only'=>'Public: Read Only', +'Public: Read, Create/Edit'=>'Public: Read, Create/Edit', +'Public: Read, Create/Edit, Delete'=>'Public: Read, Create/Edit, Delete', +'Private'=>'Private', +'Hide Details'=>'Hide Details', +'Hide Details and Add Events'=>'Hide Details and Add Events', +'Show Details'=>'Show Details', +'Show Details and Add Events'=>'Show Details and Add Events', + +'LBL_USR_CANNOT_ACCESS'=>'Users cannot access other users ', +'LBL_USR_CAN_ACCESS'=>'Users can ', +'LBL_USR_OTHERS'=>' other users ', + +'Read Only '=>'Read Only ', +'Read, Create/Edit, Delete '=>'Read, Create/Edit, Delete ', +'Read, Create/Edit '=>'Read, Create/Edit ', +'Read/Write'=>'Read/Write', +'LBL_GO_TO_TOP'=>'Go to Top', +'LNK_CLICK_HERE'=>'Click here', +'LBL_RULE_NO'=>'Rule No.', +'LBL_CAN_BE_ACCESSED'=>'can be accessed by', +'LBL_PRIVILEGES'=>'Privileges', +'LBL_OF'=>'of', + + + +//Added for 4.2GA support for mail server integration +'LBL_ADD_MAILSERVER_BUTTON_TITLE'=>'Add Mail Server', +'LBL_ADD_MAILSERVER_BUTTON_KEY'=>'M', +'LBL_ADD_MAILSERVER_BUTTON_LABEL'=>'Add Mail Server', + +'LBL_LIST_MAILSERVER_BUTTON_TITLE'=>'List Mail Server', +'LBL_LIST_MAILSERVER_BUTTON_KEY'=>'L', +'LBL_LIST_MAILSERVER_BUTTON_LABEL'=>'List Mail Server', +//added for inventory terms and conditions +'INV_TANDC'=>'Terms & Coditions', +'INV_TERMSANDCONDITIONS'=>'Inventory Terms & Coditions', +'LBL_INV_TERMSANDCONDITIONS'=>'Inventory Management', + + +'INVENTORYNOTIFICATION'=>'Inventory Notifications', +'LBL_INVENTORY_NOTIFICATIONS'=>'Edit Inventory Email Notifications', +'LBL_INV_NOT_DESC'=>'The following are the list of notifications that are sent to the product handler regarding the demand and the current quantity in hand during the creation of a Quote, SalesOrder and Invoice.', + +'InvoiceNotification'=>'Product Stock Notification during Invoice Generation', +'InvoiceNotificationDescription'=>'When the product stock level goes below the re-order level, notification will be sent to the product handler', + +'QuoteNotification'=>'Product Stock Notification during Quote Generation', +'QuoteNotificationDescription'=>'During quote generation if the product stock in warehouse is lesser than the quantity mentioned in quote then this notification will be sent to the product handler', + +'SalesOrderNotification'=>'Product Stock Notification during Sales Order Generation', +'SalesOrderNotificationDescription'=>'During sales order generation if the product stock in warehouse is lesser than the quantity mentioned in sales order then this notification will be sent to the product handler', + +//New addition for 4.2 GA +'LBL_USER_FIELDS'=>'User Fields', +'LBL_NOTE_DO_NOT_REMOVE_INFO'=>'Note: Donot remove or alter the values within { }', + +//Added for patch2 +'LBL_FILE_INFORMATION'=>'File Information', + +//Added after pathc2 +'LBL_LEAD_FIELD_ACCESS'=>'Lead Field Access', + +'LBL_ACCOUNT_FIELD_ACCESS'=>'Account Field Access', + +'LBL_CONTACT_FIELD_ACCESS'=>'Contact Field Access', + +'LBL_OPPORTUNITY_FIELD_ACCESS'=>'Potential Field Access', + +'LBL_HELPDESK_FIELD_ACCESS'=>'HelpDesk Field Access', + +'LBL_PRODUCT_FIELD_ACCESS'=>'Product Field Access', + +'LBL_NOTE_FIELD_ACCESS'=>'Note Field Access', + +'LBL_EMAIL_FIELD_ACCESS'=>'Email Field Access', + +'LBL_TASK_FIELD_ACCESS'=>'Task Field Access', + +'LBL_EVENT_FIELD_ACCESS'=>'Event Field Access', +'LBL_VENDOR_FIELD_ACCESS'=>'Vendor Field Access', +'LBL_PB_FIELD_ACCESS'=>'PriceBook Field Access', +'LBL_QUOTE_FIELD_ACCESS'=>'Quote Field Access', +'LBL_PO_FIELD_ACCESS'=>'Purchase Order Field Access', +'LBL_SO_FIELD_ACCESS'=>'Sales Order Access', +'LBL_INVOICE_FIELD_ACCESS'=>'Invoice Field Access', + +//given for calendar color for an user user +'LBL_COLOR'=>'Color in Calendar', +//added for activity view in home page +'LBL_ACTIVITY_VIEW'=>'Default Activity View', +//Added to change Home page order +'LBL_HOMEPAGE_ORDER_UPDATE'=>'Update Home Page Block Order', +'LBL_HOMEPAGE_ID'=>'Block Order', +'ERR_INVALID_USER'=>'Invalid access--Please call from My Accounts', +'ALVT'=>'Top Accounts', +'PLVT'=>'Top Potentials', +'QLTQ'=>'Top Quotes', +'CVLVT'=>'Key Metrics', +'HLT'=>'Top Trouble Tickets', +'OLV'=>'Upcoming & Pending Activities', +'GRT'=>'My Group Allocation', +'OLTSO'=>'Top Sales Orders', +'ILTI'=>'Top Invoices', +'HDB'=>'Home Page Dashboard', +'OLTPO'=>'Top Purchase Orders', +'LTFAQ'=>'My Recent FAQs', + +//Added for 5.0 alpha +'LBL_GROUP_NAME_ERROR'=>'Group Name already exists!', +'MNL'=>'My New Leads', +'LBL_LEAD_VIEW'=>'Default Leads View', +'LBL_TAG_CLOUD'=>'Tag Cloud', +'LBL_LIST_TOOLS'=>'Tools', +'LBL_STATISTICS'=>'Statistics', +'LBL_TOTAL'=>'Total :', +'LBL_OTHERS'=>'Others :', +'LBL_USERS'=>'User(s)', +'LBL_USER_LOGIN_ROLE'=>'User Login & Role', +'LBL_USER_MORE_INFN'=>'More Information', +'LBL_USER_ADDR_INFN'=>'Address Information', +'LBL_USER_IMAGE'=>'User Image', +'LBL_USR'=>'Users', + +'LBL_MY'=>'My', +'LBL_MY_DEFAULTS'=>'My Defaults', +'LBL_MY_DESG'=>'My Designation & Contact Details', +'LBL_MY_ADDR'=>'My Postal Address', +'LBL_MY_PHOTO'=>'My Photo', +'LBL_CHANGE_PHOTO'=>'Change Photo...', +'LBL_CHANGE'=>'Change', + + +//Added for Access Privileges + +'LBL_GLOBAL_FIELDS_MANAGER'=>'Global Fields Manager', +'LBL_GLOBAL_ACCESS_PRIVILEGES'=>'Organization-level Sharing Rules', +'LBL_CUSTOM_ACCESS_PRIVILEGES'=>'Custom Sharing Rules', +'LBL_BOTH'=>'Both', +'LBL_VIEW'=>'View', +'LBL_RECALCULATE_BUTTON'=>'Recalculate', +'LBL_ADD_PRIVILEGES_BUTTON'=>'Add Privileges', +'LBL_CUSTOM_ACCESS_MESG'=>'No Custom Access Rules defined .', +'LBL_CREATE_RULE_MESG'=>'to create a new Rule', +'LBL_SELECT_SCREEN'=>'Select the Screen / Module :', +'LBL_FIELDS_AVLBL'=>'Fields Available in', +'LBL_FIELDS_SELECT_DESELECT'=>'Fields to be shown', +'LBL_ROLE_TO_BE_DELETED'=>'Role to be Deleted', +'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role', +'LBL_DELETE_ROLE'=>'Delete Role', +'LBL_MORE_INFORMATION'=>'More Information', +'LBL_USERLOGIN_ROLE'=>'User Login & Role', +'LBL_USER_IMAGE_INFORMATION'=>'User Photograph', + +//Added for 5.0 for all fields +'Role'=>'Role', +'Email'=>'Email', +'Admin'=>'Admin', +'User Name'=>'User Name', +'First Name'=>'First Name', +'Last Name'=>'Last Name', +'Status'=>'Status', +'Default Activity View'=>'Default Calendar View', +'Default Lead View'=>'Default Lead View', +'Currency'=>'Currency', +'Title'=>'Title', +'Office Phone'=>'Office Phone', +'Department'=>'Department', +'Mobile'=>'Mobile', +'Reports To'=>'Reports To', +'Other Phone'=>'Other Phone', +'Other Email'=>'Other Email', +'Fax'=>'Fax', +'Yahoo id'=>'Yahoo id', +'Home Phone'=>'Home Phone', +'User Image'=>'Upload Photograph', +'Date Format'=>'Date Format', +'Tag Cloud'=>'Tag Cloud', +'Signature'=>'Signature', +'Notes'=>'Notes', +'Street Address'=>'Street Address', +'City'=>'City', +'State'=>'State', +'Postal Code'=>'Postal Code', +'Country'=>'Country', +'Password'=>'Password', +'Confirm Password'=>'Confirm Password', +'LBL_SHOWN'=>'Shown', +'LBL_HIDDEN'=>'Hidden', +'LBL_SHOW'=>'Show', +'LBL_HIDE'=>'Hide', +'LBL_HOME_PAGE_COMP'=>'Home Page Components', +'LBL_LOGIN_HISTORY'=>'Login History', +'LBL_USERDETAIL_INFO'=>'Viewing details about the user', +'LBL_DELETE_GROUP'=>'Delete Group', +'LBL_DELETE_GROUPNAME'=>'Group to be Deleted', +'LBL_TRANSFER_GROUP'=>'Transfer Ownership to: ', +'LBL_DELETE_USER'=>'User to be Deleted', +'LBL_TRANSFER_USER'=>'Transfer Ownership to User', +'LBL_DELETE_PROFILE'=>'Delete Profile', +'LBL_TRANSFER_ROLES_TO_PROFILE'=>'Transfer Roles to Profile', +'LBL_PROFILE_TO_BE_DELETED'=>'Profile to be Deteted', + +//Added for disabling window Recalculate + +'LBL_RECALC_MSG'=>'Are you sure, you wish to Recalculate Sharing Access?', +'LBL_YES'=>'Yes', +'LBL_NO'=>'No', + +'LBL_MANDATORY_MSG'=>'Mandatory Fields', +'LBL_DISABLE_FIELD_MSG'=>'Fields Disabled from Global Field Access Settings', + +//Added for About Us + +'LBL_CONTACT_US'=>'Contact Us', +'LBL_READ_LICENSE'=>'Read License', +'LBL_VERSION'=>'Version', +'LBL_TEAM'=>'Team', +'LBL_CREDITS'=>'Credits', +'LBL_THIRD_PARTY'=>'Third Party Packages', +'LBL_COMMUNITY'=>'And vtiger Community', + +'LBL_ASSIGN_ROLE'=>'Assign Role', + +//Moved from Settings to here for Webmail client integration (for 5.0.3 release) + +'LBL_ADD_MAIL_ACCOUNT'=>'Add Mail Account', +'LBL_NEW_MAIL_ACCOUNT_TITLE'=>'New Mail Account [Alt+M]', +'LBL_NEW_MAIL_ACCOUNT_KEY'=>'M', +'LBL_NEW_MAIL_ACCOUNT_LABEL'=>'New Mail Account', +'LBL_GENERAL_INFO'=>'General Information', +'LBL_DISPLAY_NAME'=>'Display Name', +'LBL_MAIL_PROTOCOL'=>'Mail Protocol', +'LBL_LIST_PASSWORD'=>'Password', +'LBL_MAIL_SERVER_NAME'=>'Mail Server Name or IP', +'LBL_INCOME_SERVER_SETTINGS'=>'Incoming Server', +'LBL_TEST_SETTINGS'=>'Test my account setting immediately', +'LBL_TEST_BUTTON_TITLE'=>'Test my account now! [Alt+T]', +'LBL_TEST_BUTTON_KEY'=>'T', +'LBL_TEST_BUTTON_LABEL'=>'Test my account now!', +'LBL_DEFAULT'=>'Default', +'LBL_IMAP2'=>'IMAP2', +'LBL_IMAP4'=>'IMAP4', +'LBL_POP'=>'POP', +'LBL_IMAP'=>'IMAP', +'LBL_MAIL_DISCLAIM'=>'Items marked with * are required
Items marked with * * are not fully supported', +'LBL_SSL_OPTIONS'=>'SSL Options', +'LBL_TLS'=>'TLS', +'LBL_NO_TLS'=>'No TLS', +'LBL_CERT_VAL'=>'Certificate Validations', +'LBL_INT_MAILER'=>'Use Internal Mailer?', +'LBL_INT_MAILER_USE'=>'Yes', +'LBL_INT_MAILER_NOUSE'=>'No', +'LBL_VAL_SSL_CERT'=>'Validate SSL Cert', +'LBL_DONOT_VAL_SSL_CERT'=>'Do Not Validate SSL Cert', +'LBL_WEB_MAIL_CONFIG'=>'Web Mail Configuration', +'LBL_CONFIGURE_WEB_MAIL'=>' - Configure Web Mail', +'LBL_LIST_MAIL_ACCOUNT'=>' List Mail Account', +'LBL_MY_MAIL_SERVER_DET'=>'My Incoming Mail Server Details', +'LBL_MY_DETAILS'=>'My Details', +'LBL_EMAIL_ID'=>'Email ID', +'LBL_EMAIL_ADDRESS'=>'Email', +'LBL_NAME_EXAMPLE'=>'(example : John Fenner)', +'LBL_EMAIL_EXAMPLE'=>'(example : johnfenner at xyz.com)', +'LBL_REFRESH_TIMEOUT'=>'Refresh Timeout', +'LBL_1_MIN'=>'1 minute', +'LBL_2_MIN'=>'2 minutes', +'LBL_3_MIN'=>'3 minutes', +'LBL_4_MIN'=>'4 minutes', +'LBL_5_MIN'=>'5 minutes', +'LBL_EMAILS_PER_PAGE'=>'Email per Page', + +// Added for 5.0.3 + +'LBL_ENTER_PROFILE'=>'Enter The Profile Name', +'TITLE_USER_DOCUMENT'=>'Untitled Document', +'TITLE_VTIGER_CRM_5'=>'vtiger CRM 5 - Free, Commercial grade Open Source CRM', +'ROLE_DRAG_ERR_MSG'=>'You cannot move a Parent Node under a Child Node', +); + +?> Modified: vtigercrm/branches/5.1_jens/modules/Users/lookupemailtemplates.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/lookupemailtemplates.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/lookupemailtemplates.php Mon Apr 16 12:27:44 2007 @@ -13,9 +13,8 @@ require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -global $theme; +global $theme,$current_user; $theme_path="themes/".$theme."/"; - ?> @@ -39,16 +38,32 @@ $sql = "select * from vtiger_emailtemplates order by templateid desc"; $result = $adb->query($sql); $temprow = $adb->fetch_array($result); + $cnt=1; require_once('include/utils/UserInfoUtil.php'); +require('user_privileges/user_privileges_'.$current_user->id.'.php'); do { - printf("
"); - $templatename = $temprow["templatename"]; - echo "".$temprow["templatename"]."%s
"); + echo "".$temprow["templatename"]."%s
"); + echo "".$temprow["templatename"]."%s
Modified: vtigercrm/branches/5.1_jens/modules/Users/massdelete.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/massdelete.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/massdelete.php Mon Apr 16 12:27:44 2007 @@ -45,6 +45,8 @@ // Perform the delete action $result = $adb->query($sql); + if($returnmodule == 'Accounts') + delAccRelRecords($id); } else { Modified: vtigercrm/branches/5.1_jens/modules/Users/notify_detail.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/notify_detail.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/notify_detail.php Mon Apr 16 12:27:44 2007 @@ -10,6 +10,8 @@ ********************************************************************************/ global $theme; +global $app_strings; +global $mod_strings; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -20,8 +22,8 @@ -Untitled Document - +<?php echo $mod_strings['TITLE_USER_DOCUMENT']; ?> +
@@ -44,7 +46,7 @@
Active: + [Deactivate]
'; @@ -29,22 +29,29 @@ echo ''; +$array_tab = Array(); +$webmail->loadMail($array_tab); -$webmail->loadMail(); - -echo ''; - -echo ""; - -foreach($webmail->attachments as $key=>$value) { +echo ''; +if($webmail->has_attachments) +{ + //check for attachments + echo ""; + echo ""; +} +/*foreach($webmail->attachments as $key=>$value) { echo '"; -} +}*/ echo '
'; echo ''; -echo ''; -echo ''; -echo ''; -echo ''; +echo ''; +echo ''; + +//Added to get the UTF-8 string - 30-11-06 - Mickie +$elist->subject = utf8_decode(imap_utf8($elist->subject)); + +echo ''; +echo ''; echo '
From:'.$elist->from.'
To:'.$elist->to.'
Subject:'.$elist->subject.'
Date:'.$elist->date.'
'.$mod_strings['LBL_FROM'].''.$elist->from.'
'.$mod_strings['LBL_TO'].''.$elist->to.'
'.$mod_strings['LBL_SUBJECT'].''.$elist->subject.'
'.$mod_strings['LBL_DATE'].''.$elist->date.'
'; echo '

Email Attachments:

".$mod_strings['LBL_EMAIL_ATTACHMENTS']."

".$webmail->att_links."
'.($key+1).') '.$value["filename"]."
'; ?> Modified: vtigercrm/branches/5.1_jens/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Webmails/ListView.php Mon Apr 16 12:27:44 2007 @@ -10,11 +10,28 @@ ********************************************************************************/ // figure out which page we are on and what mailbox we want to view -if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";} -if($_REQUEST["start"] && $_REQUEST["start"] != "") {$start=$_REQUEST["start"];} else {$start="1";} +//if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != ""){$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";} +if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != "") +{ + $mailbox=$_REQUEST["mailbox"]; +} +else +{ + $mailbox="INBOX"; +} + +if($_REQUEST["start"] && $_REQUEST["start"] != "") +{ + $start=$_REQUEST["start"]; +} +else +{ + $start="1"; +} $show_hidden=$_REQUEST["show_hidden"]; global $current_user; + require_once('Smarty_setup.php'); require_once("data/Tracker.php"); require_once('themes/'.$theme.'/layout_utils.php'); @@ -22,7 +39,7 @@ require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once("modules/Webmails/MailBox.php"); -require_once("modules/Webmails/Webmail.php"); +require_once("modules/Webmails/Webmails.php"); require_once("modules/Webmails/MailParse.php"); $MailBox = new MailBox($mailbox); @@ -39,7 +56,6 @@ $degraded_service='false'; if($MailBox->mail_protocol == "imap" || $MailBox->mail_protocol == "pop3") $degraded_service='true'; - if($_POST["command"] == "check_mbox_all") { exit(); @@ -83,38 +99,52 @@ flush(); exit(); } - +//This is invoked from Webmails.js as a result of the periodic event function call, checks only for NEW mails; this in turn checks for new mails in all the mailboxes if($_POST["command"] == "check_mbox") { $adb->println("Inside check_mbox AJAX command"); - $search = imap_search($MailBox->mbox, "ALL NEW"); - if($search === false) {echo "failed";flush();exit();} - - $data = imap_fetch_overview($MailBox->mbox,implode(',',$search)); + $search = imap_search($MailBox->mbox, 'NEW'); + + //if($search === false) {echo "failed";flush();exit();} + + $adb->println("imap_search($MailBox->mbox, $criteria) ===> "); + $adb->println($search); + + $data = imap_fetch_overview($MailBox->mbox,implode(',',$search)); $num=sizeof($data); + + $adb->println("fetched data using imap_fetch_overview ==>"); + $adb->println($data); $ret = ''; if($num > 0) { $ret = '{"mails":['; - for($i=0;$i<$num;$i++) { - $ret .= '{"mail":'; - $ret .= '{'; - $ret .= '"mailid":"'.$data[$i]->msgno.'",'; - $ret .= '"subject":"'.substr($data[$i]->subject,0,40).'",'; - $ret .= '"date":"'.substr($data[$i]->date,0,30).'",'; - $ret .= '"from":"'.substr($data[$i]->from,0,20).'",'; - $ret .= '"to":"'.$data[$i]->to.'",'; - $email = new Webmail($MailBox->mbox,$data[$i]->msgno); - if($email->has_attachments) - $ret .= '"attachments":"1"}'; - else - $ret .= '"attachments":"0"}'; - if(($i+1) == $num) - $ret .= '}'; - else - $ret .= '},'; + for($i=0;$i<$num;$i++) + { + //Added condition to avoid show the deleted mails and readed mails + if($data[$i]->deleted == 0)// && $data[$i]->seen == 0) + { + $ret .= '{"mail":'; + $ret .= '{'; + $ret .= '"mailid":"'.$data[$i]->msgno.'",'; + $ret .= '"subject":"'.substr($data[$i]->subject,0,40).'",'; + $ret .= '"date":"'.substr($data[$i]->date,0,30).'",'; + $ret .= '"from":"'.substr($data[$i]->from,0,20).'",'; + $ret .= '"to":"'.$data[$i]->to.'",'; + echo ' to field is ' .$data[$i]->to; + $email = new Webmails($MailBox->mbox,$data[$i]->msgno); + if($email->has_attachments) + $ret .= '"attachments":"1"}'; + else + $ret .= '"attachments":"0"}'; + if(($i+1) == $num) + $ret .= '}'; + else + $ret .= '},'; + } } $ret .= ']}'; + $adb->println("Ret Value ==> $ret"); } echo $ret; @@ -129,7 +159,15 @@ - - +mbox,$_REQUEST["mailid"],$_REQUEST["mvbox"]); + if(isset($_REQUEST["mailid"]) && $_REQUEST["mailid"] != '') + { + $mailids = explode(':',$_REQUEST["mailid"]); + } + foreach($mailids as $mailid) + { + imap_mail_move($MailBox->mbox,$mailid,$_REQUEST["mvbox"]); + } imap_close($MailBox->mbox); echo "SUCCESS"; flush(); @@ -176,21 +221,28 @@ $elist = $MailBox->mailList; $numEmails = $elist["count"]; $headers = $elist["headers"]; +$mails_per_page = $MailBox->mails_per_page; + if($start == 1 || $start == "") { $start_message=$numEmails; } else { - $start_message=($numEmails-($start*$mails_per_page)); -} + $start_message=($numEmails-(($start-1)*$mails_per_page)); +} + $c=$numEmails; if(!isset($_REQUEST["search"])) { - $numPages = round($numEmails/$MailBox->mails_per_page); + $numPages = ceil($numEmails/$MailBox->mails_per_page); if($numPages > 1) { + if($start != 1){ $navigationOutput = "  "; $navigationOutput .= "  "; + } + if($start <= ($numPages-1)){ $navigationOutput .= "  "; $navigationOutput .= ""; + } } } @@ -202,108 +254,155 @@ // these are mainly used in the preview window and could be ajaxified/ // during the preview window load instead. var msgCount = ""; -msgno] = $val; +if (is_array($overview)) +{ + foreach ($overview as $val) + { + $mails[$val->msgno] = $val; + $hdr = @imap_headerinfo($MailBox->mbox, $val->msgno); + //Added to get the UTF-8 string - 30-11-06 - Mickie + //we have to do this utf8 decode for the fields which may contains special characters -- Mickie - 02-02-07 + $val->from = utf8_decode(imap_utf8(addslashes($val->from))); + $val->to = utf8_decode(imap_utf8(addslashes($val->to))); + $val->subject = utf8_decode(imap_utf8($val->subject)); ?> - webmail[msgno;?>] = new Array(); - webmail[msgno;?>]["from"]="from);?>"; - webmail[msgno;?>]["to"]="to);?>"; - webmail[msgno;?>]["subject"]="subject);?>"; - webmail[msgno;?>]["date"]="date);?>"; - msgno;?>] = new Array(); + webmail[msgno;?>]["from"]="from);?>"; + webmail[msgno;?>]["to"]="to);?>"; + webmail[msgno;?>]["subject"]="subject);?>"; + webmail[msgno;?>]["date"]="date);?>"; + + webmail[msgno;?>]["cc"]="ccaddress;?>"; + + "; -$listview_header = array("		InfoSubjectDateFromDel".$mod_strings['LBL_INFO']."".$mod_strings['LBL_LIST_SUBJECT']."".$mod_strings['LABEL_DATE']."".$mod_strings['LABEL_FROM']."".$mod_strings['LBL_DEL']."No Emails In This Folder'.$mod_strings['LBL_NO_EMAILS'].'
"; - elseif (!$mails[$start_message]->seen || $mails[$start_message]->recent) { - $flags = "
"; - $new_msgs++; - } else - $flags = "
"; + $displayed_msgs++; + if ($mails[$start_message]->deleted && !$show_hidden) + { + $flags = "
"; + } + elseif (!$mails[$start_message]->seen || $mails[$start_message]->recent) + { + $flags = "
"; + $new_msgs++; + } + else + { + $flags = "
"; + + } + + + // Attachment Icons if($msg_ob->has_attachments) - $flags.=' '; + $flags.=' '; else $flags.=' '; + + // read/unread/forwarded/replied if(!$mails[$start_message]->seen || $mails[$start_message]->recent) - { - $flags.=' '; - } - elseif ($mails[$start_message]->in_reply_to || $mails[$start_message]->references || preg_match("/^re:/i",$mails[$start_message]->subject)) - $flags.=' '; - elseif (preg_match("/^fw:/i",$mails[$start_message]->subject)) - $flags.=' '; - else - $flags.=' '; + { + $flags.=' '; + } + elseif ($mails[$start_message]->in_reply_to || $mails[$start_message]->references || preg_match("/^re:/i",$mails[$start_message]->subject)) + { + $flags.=' '; + } + elseif (preg_match("/^fw:/i",$mails[$start_message]->subject)) + { + $flags.=' '; + } + else + { + $flags.=' '; + } // Set IMAP flag - if($mails[$start_message]->flagged) - $flags.=''; - else - $flags.=''; + if($mails[$start_message]->flagged) + { + $flags.=''; + } + else + { + $flags.=''; + } $tmp=imap_mime_header_decode($mails[$start_message]->from); $from = $tmp[0]->text; @@ -72,24 +97,53 @@ $listview_entries[$num][] = $flags."'.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).''.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).'            '.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).''.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).''.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).'            '.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).''.substr($from,0,20).'del
del
del
del
"; +if($num == "" || !isset($num) && count($attachments) >0 ) +{ + echo "
There are ".count($attachments)." attachment(s) to choose from:
"; - for($i=0;$i"; + for($i=0;$i"; } echo "
 There are ".count($attachments)." attachment(s) to choose from:
".count($attachments).")   ".$attachments[$i]["filename"]."
    ".($i+1).")   ".$attachments[$i]["filename"]."

"; - echo ""; + echo "
There are ".count($inline)." inline attachment(s) to choose from:
"; - for($i=0;$i"; + for($i=0;$i"; } echo "
 There are ".count($inline)." inline attachment(s) to choose from:
".count($inline).")   ".$inline[$i]["filename"]."
    ".($i+1).")   ".$inline[$i]["filename"]."


"; -} elseif (count(attachments) == 0 && count($inline) == 0) { +} +elseif (count($attachments) == 0 && count($inline) == 0) +{ echo "
No vtiger_attachments for this email


"; -} else { +} +else +{ -global $root_directory; -$save_path=$root_directory.'/modules/Webmails/tmp'; -if(!is_dir($save_path)) - mkdir($save_path); + global $root_directory; + $save_path=$root_directory.'/modules/Webmails/tmp'; + if(!is_dir($save_path)) + mkdir($save_path); -$user_dir=$save_path."/".$_SESSION["authenticated_user_id"]; -if(!is_dir($user_dir)) - mkdir($user_dir); + $user_dir=$save_path."/".$_SESSION["authenticated_user_id"]; + if(!is_dir($user_dir)) + mkdir($user_dir); -if(isset($_REQUEST["inline"]) && $_REQUEST["inline"] == "true") { - $fp = fopen($user_dir.'/'.$inline[$num]["filename"], "w") or die("Can't open file"); - fputs($fp, base64_decode($inline[$num]["filedata"])); - $filename = 'modules/Webmails/tmp/'.$_SESSION['authenticated_user_id'].'/'.$inline[$num]['filename']; -} else { - $fp = fopen($user_dir.'/'.$attachments[$num]["filename"], "w") or die("Can't open file"); - fputs($fp, base64_decode($attachments[$num]["filedata"])); - $filename = 'modules/Webmails/tmp/'.$_SESSION['authenticated_user_id'].'/'.$attachments[$num]['filename']; + if(isset($_REQUEST["inline"]) && $_REQUEST["inline"] == "true") + { + $fp = fopen($user_dir.'/'.$inline[$num]["filename"], "w") or die("Can't open file"); + fputs($fp, base64_decode($inline[$num]["filedata"])); + $filename = 'modules/Webmails/tmp/'.$_SESSION['authenticated_user_id'].'/'.$inline[$num]['filename']; + } + else + { + $fp = fopen($user_dir.'/'.$attachments[$num]["filename"], "w") or die("Can't open file"); + fputs($fp, base64_decode($attachments[$num]["filedata"])); + $filename = 'modules/Webmails/tmp/'.$_SESSION['authenticated_user_id'].'/'.$attachments[$num]['filename']; + } + fclose($fp); + imap_close($MailBox->mbox); + + ?> +

File Download

+ mbox); + ?> -

File Download

- Modified: vtigercrm/branches/5.1_jens/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Webmails/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -1,140 +1,164 @@ -'Emails', -'LBL_MODULE_TITLE'=>'Emails: Home', -'LBL_SEARCH_FORM_TITLE'=>'Email Search', -'LBL_LIST_FORM_TITLE'=>'Email List', -'LBL_NEW_FORM_TITLE'=>'Track Email', - -'LBL_LIST_SUBJECT'=>'Subject', -'LBL_LIST_CONTACT'=>'Contact', -'LBL_LIST_RELATED_TO'=>'Related to', -'LBL_LIST_DATE'=>'Date Sent', -'LBL_LIST_TIME'=>'Time Sent', +'Email', +'LBL_MODULE_TITLE'=>'Email: Home', +'LBL_SEARCH_FORM_TITLE'=>'Email Search', +'LBL_LIST_FORM_TITLE'=>'Email List', +'LBL_NEW_FORM_TITLE'=>'Track Email', + +'LBL_LIST_SUBJECT'=>'Subject', +'LBL_LIST_CONTACT'=>'Contact', +'LBL_LIST_RELATED_TO'=>'Related to', +'LBL_LIST_DATE'=>'Date Sent', +'LBL_LIST_TIME'=>'Time Sent', 'LBL_MOVE_TO'=>'Move To', 'LBL_DELETE'=>'Delete', - -'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.", -'LBL_DATE_SENT'=>'Date Sent:', -'LBL_SUBJECT'=>'Subject :', -'LBL_DATE_AND_TIME'=>'Date & Time Sent:', -'LBL_DATE'=>'Date :', -'LBL_TIME'=>'Time Sent:', -'LBL_BODY'=>'Body:', -'LBL_CONTACT_NAME'=>' Contact Name: ', -'LBL_EMAIL'=>'Email:', -'LBL_COLON'=>':', -'LBL_TO'=>'To :', -'LBL_CHK_MAIL'=>'Check Mail', -'LBL_COMPOSE'=>'Compose', -'LBL_SETTINGS'=>'Settings', -'LBL_EMAIL_FOLDERS'=>'Email Folders', -'LBL_INBOX'=>'Inbox', -'LBL_SENT_MAILS'=>'Sent Mails', -'LBL_TRASH'=>'Trash', -'LBL_JUNK_MAILS'=>'Junk Mails', -'LBL_TO_LEADS'=>'To Leads', -'LBL_TO_CONTACTS'=>'To Contacts', -'LBL_TO_ACCOUNTS'=>'To Accounts', -'LBL_MY_MAILS'=>'My Mails', -'LBL_QUAL_CONTACT'=>'Qualified Mails (As Contacts)', -'LBL_MAILS'=>'Mails', -'LBL_QUALIFY_BUTTON'=>'Qualify', -'LBL_REPLY_BUTTON'=>'Reply', -'LBL_FORWARD_BUTTON'=>'Forward', -'LBL_DOWNLOAD_ATTCH_BUTTON'=>'Download Attachments', -'LBL_FROM'=>'From :', -'LBL_CC'=>'CC :', -'LBL_REPLY_TO_SENDER'=>'Reply to Sender', -'LBL_REPLY_ALL'=>'Reply All', -'LBL_SHOW_HIDDEN'=>'Show Hidden', -'LBL_EXPUNGE_MAILBOX'=>'Expunge Mailbox', - -'NTC_REMOVE_INVITEE'=>'Are you sure you want to remove this recipient from the email?', -'LBL_INVITEE'=>'Recipients', - -// Added Fields -// Contacts-SubPanelViewContactsAndUsers.php -'LBL_BULK_MAILS'=>'Bulk Mails', -'LBL_ATTACHMENT'=>'Attachment', -'LBL_DESCRIPTION'=>'Description', -'LBL_UPLOAD'=>'Upload', -'LBL_FILE_NAME'=>'File Name', -'LBL_SEND'=>'Send', - -'LBL_EMAIL_TEMPLATES'=>'Email Templates', -'LBL_TEMPLATE_NAME'=>'Template Name', -'LBL_DESCRIPTION'=>'Description', -'LBL_EMAIL_TEMPLATES_LIST'=>'Email Templates List', -'LBL_EMAIL_INFORMATION'=>'Email Information', - - - - -//for v4 release added -'LBL_NEW_LEAD'=>'New Lead', -'LBL_LEAD_TITLE'=>'Leads', - -'LBL_NEW_PRODUCT'=>'New Product', -'LBL_PRODUCT_TITLE'=>'Products', -'LBL_NEW_CONTACT'=>'New Contact', -'LBL_CONTACT_TITLE'=>'Contacts', -'LBL_NEW_ACCOUNT'=>'New Account', -'LBL_ACCOUNT_TITLE'=>'Accounts', - -// Added vtiger_fields after vtiger4 - Beta -'LBL_USER_TITLE'=>'Users', -'LBL_NEW_USER'=>'New User', - -// Added for 4 GA -'LBL_TOOL_FORM_TITLE'=>'Email Tools', -//Added for 4GA -'Date & Time Sent'=>'Date & Time Sent', -'Sales Enity Module'=>'Sales Enity Module', -'Activtiy Type'=>'Activtiy Type', -'Related To'=>'Related To', -'Assigned To'=>'Assigned To', -'Subject'=>'Subject', -'Attachment'=>'Attachment', -'Description'=>'Description', -'Time Start'=>'Time Start', -'Created Time'=>'Created Time', -'Modified Time'=>'Modified Time', - -'MESSAGE_CHECK_MAIL_SERVER_NAME'=>'Please Check the Mail Server Name...', -'MESSAGE_CHECK_MAIL_ID'=>'Please Check the Email Id of "Assigned To" User...', -'MESSAGE_MAIL_HAS_SENT_TO_USERS'=>'Mail has been sent to the following User(s) :', -'MESSAGE_MAIL_HAS_SENT_TO_CONTACTS'=>'Mail has been sent to the following Contact(s) :', -'MESSAGE_MAIL_ID_IS_INCORRECT'=>'Mail Id is incorrect. Please Check this Mail Id...', -'MESSAGE_ADD_USER_OR_CONTACT'=>'Please Add any User(s) or Contact(s)...', -'MESSAGE_MAIL_SENT_SUCCESSFULLY'=>' Mail(s) sent successfully!', - -// Added for web mail post 4.0.1 release -'LBL_FETCH_WEBMAIL'=>'Fetch Web Mail', -//Added for 4.2 Release -- CustomView -'LBL_ALL'=>'All', -'MESSAGE_CONTACT_NOT_WANT_MAIL'=>'This Contact does not want to receive mails.', -'LBL_WEBMAILS_TITLE'=>'WebMails', -'LBL_EMAILS_TITLE'=>'Emails', -'LBL_MAIL_CONNECT_ERROR_INFO'=>'Error connecting mail server!
Check in My Accounts->List Mail Server -> List Mail Account', - -); -?> + +'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.", +'LBL_DATE_SENT'=>'Date Sent:', +'LBL_SUBJECT'=>'Subject :', +'LBL_DATE_AND_TIME'=>'Date & Time Sent:', +'LBL_DATE'=>'Date :', +'LBL_TIME'=>'Time Sent:', +'LBL_BODY'=>'Body:', +'LBL_CONTACT_NAME'=>' Contact Name: ', +'LBL_EMAIL'=>'Email:', +'LBL_COLON'=>':', +'LBL_TO'=>'To :', +'LBL_CHK_MAIL'=>'Check Mail', +'LBL_COMPOSE'=>'Compose', +'LBL_SETTINGS'=>'Incmg. MailServer Settings', +'LBL_EMAIL_FOLDERS'=>'Email Folders', +'LBL_INBOX'=>'Inbox', +'LBL_SENT_MAILS'=>'Sent Mails', +'LBL_TRASH'=>'Trash', +'LBL_JUNK_MAILS'=>'Junk Mails', +'LBL_TO_LEADS'=>'To Leads', +'LBL_TO_CONTACTS'=>'To Contacts', +'LBL_TO_ACCOUNTS'=>'To Accounts', +'LBL_MY_MAILS'=>'My Mails', +'LBL_QUAL_CONTACT'=>'Qualified Mails (As Contacts)', +'LBL_MAILS'=>'Mails', +'LBL_QUALIFY_BUTTON'=>'Qualify', +'LBL_REPLY_BUTTON'=>'Reply', +'LBL_FORWARD_BUTTON'=>'Forward', +'LBL_DOWNLOAD_ATTCH_BUTTON'=>'Download Attachments', +'LBL_FROM'=>'From :', +'LBL_CC'=>'cc :', +'LBL_REPLY_TO_SENDER'=>'Reply to Sender', +'LBL_REPLY_ALL'=>'Reply All', +'LBL_SHOW_HIDDEN'=>'Show Hidden Mails', +'LBL_EXPUNGE_MAILBOX'=>'Trim Mailbox', + +'NTC_REMOVE_INVITEE'=>'Are you sure you want to remove this recipient from the email?', +'LBL_INVITEE'=>'Recipients', + +// Added Fields +// Contacts-SubPanelViewContactsAndUsers.php +'LBL_BULK_MAILS'=>'Bulk Mails', +'LBL_ATTACHMENT'=>'Attachment', +'LBL_UPLOAD'=>'Upload', +'LBL_FILE_NAME'=>'File Name', +'LBL_SEND'=>'Send', + +'LBL_EMAIL_TEMPLATES'=>'Email Templates', +'LBL_TEMPLATE_NAME'=>'Template Name', +'LBL_DESCRIPTION'=>'Description', +'LBL_EMAIL_TEMPLATES_LIST'=>'Email Templates List', +'LBL_EMAIL_INFORMATION'=>'Email Information', + + + + +//for v4 release added +'LBL_NEW_LEAD'=>'New Lead', +'LBL_LEAD_TITLE'=>'Leads', + +'LBL_NEW_PRODUCT'=>'New Product', +'LBL_PRODUCT_TITLE'=>'Products', +'LBL_NEW_CONTACT'=>'New Contact', +'LBL_CONTACT_TITLE'=>'Contacts', +'LBL_NEW_ACCOUNT'=>'New Account', +'LBL_ACCOUNT_TITLE'=>'Accounts', + +// Added vtiger_fields after vtiger4 - Beta +'LBL_USER_TITLE'=>'Users', +'LBL_NEW_USER'=>'New User', + +// Added for 4 GA +'LBL_TOOL_FORM_TITLE'=>'Email Tools', +//Added for 4GA +'Date & Time Sent'=>'Date & Time Sent', +'Sales Enity Module'=>'Sales Enity Module', +'Activtiy Type'=>'Activtiy Type', +'Related To'=>'Related To', +'Assigned To'=>'Assigned To', +'Subject'=>'Subject', +'Attachment'=>'Attachment', +'Description'=>'Description', +'Time Start'=>'Time Start', +'Created Time'=>'Created Time', +'Modified Time'=>'Modified Time', + +'MESSAGE_CHECK_MAIL_SERVER_NAME'=>'Please Check the Mail Server Name...', +'MESSAGE_CHECK_MAIL_ID'=>'Please Check the Email Id of "Assigned To" User...', +'MESSAGE_MAIL_HAS_SENT_TO_USERS'=>'Mail has been sent to the following User(s) :', +'MESSAGE_MAIL_HAS_SENT_TO_CONTACTS'=>'Mail has been sent to the following Contact(s) :', +'MESSAGE_MAIL_ID_IS_INCORRECT'=>'Mail Id is incorrect. Please Check this Mail Id...', +'MESSAGE_ADD_USER_OR_CONTACT'=>'Please Add any User(s) or Contact(s)...', +'MESSAGE_MAIL_SENT_SUCCESSFULLY'=>' Mail(s) sent successfully!', + +// Added for web mail post 4.0.1 release +'LBL_FETCH_WEBMAIL'=>'Fetch Web Mail', +//Added for 4.2 Release -- CustomView +'LBL_ALL'=>'All', +'MESSAGE_CONTACT_NOT_WANT_MAIL'=>'This Contact does not want to receive mails.', +'LBL_WEBMAILS_TITLE'=>'WebMails', +'LBL_EMAILS_TITLE'=>'Email', +'LBL_MAIL_CONNECT_ERROR_INFO'=>'Error connecting mail server!
Check in My Accounts->List Mail Server -> List Mail Account', +// Added for 5.0.3 release +'LBL_MAIL_CONNECT_ERROR'=>'Could not connect to the mail server. Please check the mail server details', +'IN_REPLY_TO_THE_MESSAGE' => 'In reply to the message sent by ', +'LBL_CLICK_HERE' => 'Click Here ', +'LBL_GOTO_EMAILS_MODULE' => ' go to Email module', +'LBL_NO_EMAILS'=>'No Email In This Folder', +'LBL_MOVE_TO'=>'Move To...', +'LBL_DEL'=>'Del ', +'LABEL_FROM'=>'From', +'LBL_INFO'=>'Info', +'LABEL_DATE'=>'Date', +'LBL_NO_IFRAMES_SUPPORTED'=>'No Iframes supported', +'LBL_EMAIL_ATTACHMENTS'=>'Email Attachments:', +'LBL_ALLMAILS'=>'Email', +'LBL_TO_USERS'=>'To Users', +'LBL_TO_GROUPS'=>'To Groups', +'SUBJECT' => 'Subject', +'BODY' => 'Body', +'TO' => 'To:', +'CC' => 'CC:', +'BCC' => 'BCC:', +'FROM' => 'From:', +'IN'=>'in', +'ADD_FOLDER' => 'Add Folder[X]', +//Added for 5.0.3 +'LBL_LOADING_IMAGE' => 'Loading Image', +); +?> Modified: vtigercrm/branches/5.1_jens/modules/uploads/add2db.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/uploads/add2db.php (original) +++ vtigercrm/branches/5.1_jens/modules/uploads/add2db.php Mon Apr 16 12:27:44 2007 @@ -18,8 +18,10 @@ $vtigerpath = str_replace("/index.php?module=uploads&action=add2db", "", $vtigerpath); $crmid = $_REQUEST['return_id']; -$log->debug("DGDEBUG In add2db.php"); +$log->debug("DEBUG In add2db.php"); + //fix for space in file name. + $_FILES['filename']['name'] = preg_replace('/\s+/', '_', $_FILES['filename']['name']); // Arbitrary File Upload Vulnerability fix - Philip $binFile = $_FILES['filename']['name']; @@ -51,37 +53,35 @@ $desc = $_REQUEST['txtDescription']; $description = addslashes($desc); $date_var = $adb->formatDate(date('YmdHis')); - - $query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('"; - $query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."',".$date_var.")"; + $current_date = getdate(); + $current_date = $adb->formatDate(date('YmdHis')); + $query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('"; + $query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."',".$date_var.",".$current_date.")"; $result = $adb->query($query); # Added by DG 26 Oct 2005 # Attachments added to contacts are also added to their accounts - $log->debug("DGDEBUG Here's the test:"); - $log->debug("DGDEBUG return_module: ".$_REQUEST['return_module']); + $log->debug("DEBUG return_module: ".$_REQUEST['return_module']); if ($_REQUEST['return_module'] == 'Contacts') { - $log->debug("DGDEBUG Passed the test."); $crmid = $_REQUEST['return_id']; $query = 'select accountid from vtiger_contactdetails where contactid='.$crmid; - $log->debug("DGDEBUG Running query: ".$query); $result = $adb->query($query); if($adb->num_rows($result) != 0) { - $log->debug("DGDEBUG Returned a row"); + $log->debug("DEBUG Returned a row"); $associated_account = $adb->query_result($result,0,"accountid"); # Now make sure that we haven't already got this attachment associated to this account # Hmmm... if this works, should we NOT upload the attachment again, and just set the relation for the contact too? - $log->debug("DGDEBUG Associated Account: ".$associated_account); + $log->debug("DEBUG Associated Account: ".$associated_account); $query = "select name,attachmentsize from vtiger_attachments where name= '".$filename."'"; $result = $adb->query($query); if($adb->num_rows($result) != 0) { - $log->debug("DGDEBUG Matched a row"); + $log->debug("DEBUG Matched a row"); # Whoops! We matched the name. Is it the same size? $dg_size = $adb->query_result($result,0,"attachmentsize"); - $log->debug("DGDEBUG: These should be the same size: ".$dg_size." ".$filesize); + $log->debug("DEBUG: These should be the same size: ".$dg_size." ".$filesize); if ($dg_size == $filesize) { # Yup, it is probably the same file @@ -97,7 +97,6 @@ # DG 19 June 2006 # Strip out single quotes from filenames $filename = preg_replace('/\'/', '', $filename); - $sql = "insert into vtiger_attachments values("; $sql .= $current_id.",'".$filename."','".$description."','".$filetype."','".$upload_filepath."')"; $result = $adb->query($sql); @@ -111,10 +110,9 @@ # Attachments added to contacts are also added to their accounts if ($associated_account) { - $log->debug("DGDEBUG: inserting into vtiger_seattachmentsrel from add2db 2"); + $log->debug("DEBUG: inserting into vtiger_seattachmentsrel from add2db 2"); $sql1 = "insert into vtiger_seattachmentsrel values('"; $sql1 .= $associated_account."','".$current_id."')"; - $log->debug("DGDEBUG: Here's the query: ".$sql1); $result = $adb->query($sql1); } @@ -126,33 +124,36 @@
  • Invalid file OR
  • File has no data
    " ; - echo $errormessage; - include "upload.php"; + header("Location: index.php?module=uploads&action=uploadsAjax&msg=true&file=upload&errormessage=".$errormessage); } } else { $errorCode = $_FILES['binFile']['error']; + $errormessage = ""; if($errorCode == 4) { $errormessage = "Kindly give a valid file for upload!
    " ; - echo $errormessage; - include "upload.php"; } else if($errorCode == 2) { - $errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 1000000 bytes
    "; - echo $errormessage; - include "upload.php"; - //echo $errorCode; + $errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than $upload_maxsize bytes
    "; + } + else if($errorCode == 6) + { + $errormessage = "Please configure upload_tmp_dir variable in php.ini file.
    " ; } else if($errorCode == 3 || $errorcode == '') { - echo "Problems in file upload. Please try again!
    "; - include "upload.php"; + $errormessage = "Problems in file upload. Please try again!
    "; } + if($errormessage != '') + { + echo $errormessage; + include("upload.php"); + } } ?> Modified: vtigercrm/branches/5.1_jens/modules/uploads/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/uploads/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/uploads/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -24,6 +24,8 @@ //Added fields for uploads (attach files) 'LBL_ATTACH_FILE'=>'Attach File', +'LBL_ATTACH'=>'Attach', +'LBL_CANCEL'=>'Cancel', 'LBL_STEP_SELECT_FILE'=>'Step 1 : Select File', 'LBL_BROWSE_FILES'=>'Click the browse button and select the file to be attached', 'LBL_DESCRIPTION'=>'Step 2 : Write some description', Modified: vtigercrm/branches/5.1_jens/modules/uploads/upload.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/uploads/upload.php (original) +++ vtigercrm/branches/5.1_jens/modules/uploads/upload.php Mon Apr 16 12:27:44 2007 @@ -8,13 +8,13 @@ * ********************************************************************************/ --> - - + @@ -25,7 +25,7 @@ ?> - + @@ -34,7 +34,7 @@
    		• - +
     
    @@ -44,8 +44,8 @@ @@ -54,7 +54,7 @@ @@ -66,8 +66,8 @@
    -
    - +
    +
     
    - +
    -    - +  " class="crmbutton small save" />   + " class="crmbutton small cancel" onclick="self.close();" />
    Modified: vtigercrm/branches/5.1_jens/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/branches/5.1_jens/pkg/bin/startvTiger.bat (original) +++ vtigercrm/branches/5.1_jens/pkg/bin/startvTiger.bat Mon Apr 16 12:27:44 2007 @@ -43,23 +43,23 @@ echo "" echo "making an attempt to kill any existing vtigercrm service" echo "" -bin\apache -k stop -n vtigercrm501 -bin\apache -k uninstall -n vtigercrm501 +bin\apache -k stop -n vtigercrm503 +bin\apache -k uninstall -n vtigercrm503 echo "Uninstalling apache service again for confirmation after sleeping for 10 seconds" echo "" %SLEEP_STR% -n 10 127.0.0.1>nul -bin\apache -k stop -n vtigercrm501 -bin\apache -k uninstall -n vtigercrm501 +bin\apache -k stop -n vtigercrm503 +bin\apache -k uninstall -n vtigercrm503 echo "" echo "" -echo "Installing vtigercrm501 apache service after sleeping for 10 seconds" +echo "Installing vtigercrm503 apache service after sleeping for 10 seconds" echo "" %SLEEP_STR% -n 10 127.0.0.1>nul -bin\apache -k install -n vtigercrm501 -f conf\httpd.conf +bin\apache -k install -n vtigercrm503 -f conf\httpd.conf echo "" -echo "Starting vtigercrm501 apache service" +echo "Starting vtigercrm503 apache service" echo "" -bin\apache -n vtigercrm501 -k start +bin\apache -n vtigercrm503 -k start IF ERRORLEVEL 1 goto stopservice goto checkmysql @@ -105,7 +105,7 @@ echo "" echo "Starting MySQL on port specified by the user" echo "" -start mysqld-nt -b .. --skip-bdb --log-queries-not-using-indexes --log-slow-admin-statements --log-error --low-priority-updates --log-slow-queries=vtslowquery.log --datadir=../data --port=%mysql_port% +start mysqld-nt -b .. --skip-bdb --log-queries-not-using-indexes --log-slow-admin-statements --log-error --low-priority-updates --log-slow-queries=vtslowquery.log --default-storage-engine=InnoDB --datadir=../data --port=%mysql_port% %SLEEP_STR% -n 11 127.0.0.1>nul mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases" > NUL IF ERRORLEVEL 1 goto notstarted @@ -117,27 +117,27 @@ :checkdatabase echo "" -echo "check to see if vtigercrm501 database already exists" +echo "check to see if vtigercrm503 database already exists" echo "" -mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm501'" | "%WINDIR%\system32\find.exe" "vtigercrm501" > NUL +mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm503'" | "%WINDIR%\system32\find.exe" "vtigercrm503" > NUL IF ERRORLEVEL 1 goto dbnotexists echo "" -ECHO "vtigercrm501 database exists" +ECHO "vtigercrm503 database exists" echo "" goto end :dbnotexists echo "" -ECHO "vtigercrm501 database does not exist" +ECHO "vtigercrm503 database does not exist" echo "" echo %cd% echo "" -echo "Proceeding to create database vtigercrm501 and populate the same" +echo "Proceeding to create database vtigercrm503 and populate the same" echo "" -mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm501" +mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm503" echo "" -echo "vtigercrm501 database created" +echo "vtigercrm503 database created" echo "" goto end Modified: vtigercrm/branches/5.1_jens/pkg/bin/startvTiger.sh ============================================================================== --- vtigercrm/branches/5.1_jens/pkg/bin/startvTiger.sh (original) +++ vtigercrm/branches/5.1_jens/pkg/bin/startvTiger.sh Mon Apr 16 12:27:44 2007 @@ -111,14 +111,14 @@ fi echo "" -echo "Checking if the vtigercrm501 database already exists" +echo "Checking if the vtigercrm503 database already exists" echo "" -echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm501 >/dev/null +echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm503 >/dev/null if [ $? -ne 0 ]; then echo "" - echo "Database vtigercrm501 does not exist. Creating database vtigercrm501" + echo "Database vtigercrm503 does not exist. Creating database vtigercrm503" echo "" - ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm501" + ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm503" fi host=`hostname` Modified: vtigercrm/branches/5.1_jens/pkg/bin/stopvTiger.bat ============================================================================== --- vtigercrm/branches/5.1_jens/pkg/bin/stopvTiger.bat (original) +++ vtigercrm/branches/5.1_jens/pkg/bin/stopvTiger.bat Mon Apr 16 12:27:44 2007 @@ -32,13 +32,13 @@ cd /d %apache_dir% rem shut down apache echo "" -echo "stopping vtigercrm501 apache service" +echo "stopping vtigercrm503 apache service" echo "" -bin\apache -n vtigercrm501 -k stop +bin\apache -n vtigercrm503 -k stop echo "" -echo "uninstalling vtigercrm501 apache service" +echo "uninstalling vtigercrm503 apache service" echo "" -bin\apache -k uninstall -n vtigercrm501 +bin\apache -k uninstall -n vtigercrm503 rem .\bin\ShutdownApache.exe logs\httpd.pid goto StopMySQL Modified: vtigercrm/branches/5.1_jens/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/5.1_jens/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/5.1_jens/schema/DatabaseSchema.xml Mon Apr 16 12:27:44 2007 @@ -1,6300 +1,6484 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - user_name - - - user_password - - Type=InnoDB + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + user_name + + + user_password + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + smcreatorid + + + smownerid + + + modifiedby + + + deleted + smownerid + + + smownerid + deleted + + Type=InnoDB +
    + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + name + + + + modifiedby + + + tabid + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + tabid + +
    + + + ADD CONSTRAINT fk_1_vtiger_blocks FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + tabid + + + fieldname + + + block + + + displaytype + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_vtiger_field FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + account_type + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_account FOREIGN KEY (accountid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_accountbillads FOREIGN KEY (accountaddressid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_accountshipads FOREIGN KEY (accountaddressid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_accountscf FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + accountid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_contactdetails FOREIGN KEY (contactid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_contactsubdetails FOREIGN KEY (contactsubscriptionid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_contactaddress FOREIGN KEY (contactaddressid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_contactscf FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + +
    + + +ADD CONSTRAINT fk_1_vtiger_portalinfo FOREIGN KEY (id) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + +
    + + +ADD CONSTRAINT fk_1_vtiger_customerdetails FOREIGN KEY (customerid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + converted + leadstatus + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_leaddetails FOREIGN KEY (leadid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_leadsubdetails FOREIGN KEY (leadsubscriptionid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_leadaddress FOREIGN KEY (leadaddressid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_leadscf FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + title + + + notesid + + + crmid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_notes FOREIGN KEY (notesid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + accountid + + + potentialid + + + sales_stage + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_potential FOREIGN KEY (potentialid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + potentialid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_potstagehistory FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_potentialscf FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + activityid + subject + + + activitytype + date_start + + + date_start + due_date + + + date_start + time_start + + + eventstatus + + + status + eventstatus + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_activity FOREIGN KEY (activityid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + attachmentsid + + + description + name + type + attachmentsid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_attachments FOREIGN KEY (attachmentsid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + attachmentsid + + + crmid + + + attachmentsid + crmid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_seattachmentsrel FOREIGN KEY (attachmentsid) REFERENCES vtiger_attachments(attachmentsid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_seattachmentsrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + +
    + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_competitor FOREIGN KEY (competitorid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + potentialid + + + competitorid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_potcompetitorrel FOREIGN KEY (competitorid) REFERENCES vtiger_competitor(competitorid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_potcompetitorrel FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_vendor FOREIGN KEY (vendorid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_products FOREIGN KEY (productid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_products2products_rel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON UPDATE CASCADE ON DELETE CASCADE + ADD CONSTRAINT fk_2_products2products_rel FOREIGN KEY (related_productid) REFERENCES vtiger_products(productid) ON UPDATE CASCADE ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + productclass + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + producttype + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + productvalidation + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + currency + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + visibility + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + manufacturer + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + productid + filename + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_productcollaterals FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + + + roleid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_user2role FOREIGN KEY (roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_user2role FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + groupname + + + Type=InnoDB +
    + + + + + + + + + + + groupid + userid + +
    + + +ADD CONSTRAINT fk_1_vtiger_users2group FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_users2group FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_group2grouprel FOREIGN KEY (containsgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_group2grouprel FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + +
    + + +ADD CONSTRAINT fk_1_vtiger_group2role FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_group2role FOREIGN KEY (roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + +
    + + +ADD CONSTRAINT fk_1_vtiger_group2rs FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_group2rs FOREIGN KEY (roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + leadid + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_leadpotrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_leadpotrel FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + campaignstatus + + + campaignname + + + campaignid + + Type=InnoDB +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_campaignscf FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + contactid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_campaigncontrel FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_campaigncontrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + leadid + campaignid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_campaignleadrel FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_campaignleadrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + contactid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_leadcontrel FOREIGN KEY (leadcontrel_contactid_idx) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_leadcontrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + accountid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_leadacctrel FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_leadacctrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + potentialid + + + contactid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_contpotentialrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_contpotentialrel FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + dealname + + + Type=InnoDB +
    + + + + + + + + + + + + + + contactid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_cntactivityrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_cntactivityrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + name + + + + createdby + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_lar FOREIGN KEY (createdby) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + notesid + + + crmid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_crmentitynotesrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_crmentitynotesrel FOREIGN KEY (notesid) REFERENCES vtiger_notes(notesid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + ticketid + + + status + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_troubletickets FOREIGN KEY (ticketid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + ticketid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_ticketcomments FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + activityid + + + smid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_salesmanactivityrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_salesmanactivityrel FOREIGN KEY (smid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + vendorid + + + contactid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_vendorcontactrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_vendorcontactrel FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + smid + + + id + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_salesmanticketrel FOREIGN KEY (id) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_salesmanticketrel FOREIGN KEY (smid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + activityid + + + crmid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_seactivityrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_seactivityrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + productid + + + crmid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_seproductsrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_seproductsrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + crmid + + + ticketid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_seticketsrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_seticketsrel FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + assigned_user_id + module + name + deleted + +
    + + + + + + + + + + leadid + + + groupname + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_leadgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_leadgrouprelation FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + groupname + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_accountgrouprelation FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_accountgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + groupname + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_contactgrouprelation FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_contactgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + groupname + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_potentialgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_potentialgrouprelation FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + groupname + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_campaigngrouprelation FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_campaigngrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + activityid + + + groupname + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_activitygrouprelation FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_activitygrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + ticketid + + + groupname + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_ticketgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_ticketgrouprelation FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + +
    + + + + + + + + + +
    + + +ADD CONSTRAINT fk_1_vtiger_defaultcv FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + foldername + templatename + subject + +
    + + + + + + + + + + + + + + + + + + + + id + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_faq FOREIGN KEY (id) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + faqid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_faqcomments FOREIGN KEY (faqid) REFERENCES vtiger_faq(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + assigned_user_id + name + deleted + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + notesid + + + crmid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_senotesrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_senotesrel FOREIGN KEY (notesid) REFERENCES vtiger_notes(notesid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + ticket_id + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_ticketcf FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_productcf FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + assigned_user_id + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + deploymentstatus + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + ownership + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + rating + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + region + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + accounttype + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + contacttype + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + source + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + opportunity_type + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + stage + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + status + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + status + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + status + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + status + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + stage + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + priority + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + businesstype + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + industry + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + revenuetype + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + activitytype + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + usertype + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + purpose + + + Type=InnoDB +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + status + + + Type=InnoDB +
    + + + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + + + + profileid + globalactionid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_profile2globalpermissions FOREIGN KEY (profileid) REFERENCES vtiger_profile(profileid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + profileid + tabid + +
    + + + + + + + + + + + + + + + profileid + tabid + Operation + +
    + + + + + + + + + + + + + + profileid + tabid + fieldname + + + tabid + profileid + + + visible + profileid + +
    + + + + + + + + + + roleid + profileid + +
    + + + + + + + + Type=InnoDB +
    + + + + + + + + + + + + +
    + + +ADD CONSTRAINT fk_1_vtiger_def_org_share FOREIGN KEY (permission) REFERENCES vtiger_org_share_action_mapping(share_action_id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + tabid + fieldid + + + tabid + + + visible + fieldid + +
    + + + + + + + + + + + + + + + profileid + tabid + activityid + +
    + + + + + + + + + + + + + + + + + + + + productcategory + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vendorid + + + contactid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_salesorder FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_salesorder FOREIGN KEY (salesorderid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_salesorder FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + groupname + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_sogrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_sogrouprelation FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_sobillads FOREIGN KEY (sobilladdressid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_soshipads FOREIGN KEY (soshipaddressid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_salesordercf FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + schedulednotificationname + + + Type=InnoDB +
    + + + + + + + + + + + + + activityid + + + productid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_activityproductrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_activityproductrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + relation_id + +
    + + + + + + + + + + + + + + + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_vendorcf FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_pricebook FOREIGN KEY (pricebookid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_pricebookcf FOREIGN KEY (pricebookid) REFERENCES vtiger_pricebook(pricebookid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + pricebookid + + + productid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_pricebookproductrel FOREIGN KEY (pricebookid) REFERENCES vtiger_pricebook(pricebookid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_pricebookproductrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + quotestage + + + potentialid + + + contactid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_quotes FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_quotes FOREIGN KEY (quoteid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_quotes FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_quotesbillads FOREIGN KEY (quotebilladdressid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_quotesshipads FOREIGN KEY (quoteshipaddressid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + groupname + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_quotegrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_quotegrouprelation FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_quotescf FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vendorid + + + quoteid + + + contactid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_purchaseorder FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_purchaseorder FOREIGN KEY (purchaseorderid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_purchaseorder FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE +ADD CONSTRAINT fk_4_vtiger_purchaseorder FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + groupname + purchaseorderid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_pogrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_pogrouprelation FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_pobillads FOREIGN KEY (pobilladdressid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_poshipads FOREIGN KEY (poshipaddressid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_purchaseordercf FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + invoiceid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_invoice FOREIGN KEY (invoiceid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_invoice FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + groupname + invoiceid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_invoicegrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_invoicegrouprelation FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_invoicebillads FOREIGN KEY (invoicebilladdressid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_invoiceshipads FOREIGN KEY (invoiceshipaddressid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_invoicecf FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + entitytype + + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_vtiger_customview FOREIGN KEY (entitytype) REFERENCES vtiger_tab (name) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + + + + + + columnindex + + + cvid + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_vtiger_cvcolumnlist FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + cvid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_cvstdfilter FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + cvid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_cvadvfilter FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + cvid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_customaction FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + queryid + + Type=InnoDB +
    + + + + + + + + + + + + + + + + queryid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_selectcolumn FOREIGN KEY (queryid) REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + queryid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_relcriteria FOREIGN KEY (queryid) REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + queryid + + + folderid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_report FOREIGN KEY (folderid) REFERENCES vtiger_reportfolder (folderid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_report FOREIGN KEY (queryid) REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_reportmodules FOREIGN KEY (reportmodulesid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_reportsortcol FOREIGN KEY (reportid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + datefilterid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_reportdatefilter FOREIGN KEY (datefilterid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + reportsummaryid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_reportsummary FOREIGN KEY (reportsummaryid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + usageunit + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + glacct + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + quotestage + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + invoicestatus + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + postatus + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + sostatus + + + Type=InnoDB + +
    + + + + + + + + + + + + + + + + + + + + carrier + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + taxclass + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + recurringtype + + + Type=InnoDB +
    + + + + + + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_org_share_action2tab FOREIGN KEY (share_action_id) REFERENCES vtiger_org_share_action_mapping(share_action_id) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_org_share_action2tab FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + tabid + user_id + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_moduleowners FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + crmid + flag + + Type=InnoDB +
    + + + + + + + + + + + Type=InnoDB + + tabid + +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_module_rel FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + share_groupid + + + to_groupid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_grp2grp FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_grp2grp FOREIGN KEY (share_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_grp2grp FOREIGN KEY (to_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + share_groupid + + + to_roleid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_grp2role FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_grp2role FOREIGN KEY (share_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_grp2role FOREIGN KEY (to_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + share_groupid + + + to_roleandsubid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_grp2rs FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_grp2rs FOREIGN KEY (share_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_grp2rs FOREIGN KEY (to_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + share_roleid + + + to_groupid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_role2group FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_role2group FOREIGN KEY (to_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_role2group FOREIGN KEY (share_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + share_roleid + + + to_roleid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_role2role FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_role2role FOREIGN KEY (share_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_role2role FOREIGN KEY (to_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + share_roleid + + + to_roleandsubid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_role2rs FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_role2rs FOREIGN KEY (share_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_role2rs FOREIGN KEY (to_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + share_roleandsubid + + + to_groupid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_rs2grp FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_rs2grp FOREIGN KEY (to_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_rs2grp FOREIGN KEY (share_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + share_roleandsubid + + + to_roleid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_rs2role FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_rs2role FOREIGN KEY (share_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_rs2role FOREIGN KEY (to_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + share_roleandsubid + + + to_roleandsubid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_rs2rs FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_rs2rs FOREIGN KEY (share_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_rs2rs FOREIGN KEY (to_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + tabid + + + relatedto_tabid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_relatedmodules FOREIGN KEY (relatedto_tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_relatedmodules FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + shareid + permission + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + parenttabid + parenttab_label + visible + + Type=InnoDB +
    + + + + + + + + + + + + + + userid + shareduserid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_tmp_read_user_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_read_user_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_read_user_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + userid + sharedgroupid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_tmp_read_group_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_read_group_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_read_group_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + userid + shareduserid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_tmp_write_user_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_write_user_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_write_user_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + userid + sharedgroupid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_tmp_write_group_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_write_group_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_write_group_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + userid + shareduserid + relatedtabid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE +ADD CONSTRAINT fk_4_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + userid + sharedgroupid + tabid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_4_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + userid + shareduserid + tabid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE +ADD CONSTRAINT fk_4_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + userid + sharedgroupid + tabid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_4_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + tabid + parenttabid + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_vtiger_parenttabrel FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE + Type=InnoDB + + +
    + + + ADD CONSTRAINT fk_2_vtiger_parenttabrel FOREIGN KEY (parenttabid) REFERENCES vtiger_parenttab(parenttabid) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + campaigntype + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + campaignstatus + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + expectedresponse + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + portalname + + Type=InnoDB +
    + + + + + + + + + + + + + creatorid + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + nick + + + session + + + ping + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + + chat_from + + + chat_to + + + born + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_chat_msg FOREIGN KEY (chat_from) REFERENCES vtiger_chat_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + msg + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_chat_pchat FOREIGN KEY (msg) REFERENCES vtiger_chat_msg(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + msg + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_chat_pvchat FOREIGN KEY (msg) REFERENCES vtiger_chat_msg(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + tag_id + tagger_id + object_id + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + +
    + + + + + + + + + + + + + + + + taxname + + + Type=InnoDB +
    + + + + + + + + + + + + + productid + + + taxid + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_producttaxrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + source + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + source + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + source + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + source + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + purchaseorderid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_postatushistory FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + salesorderid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_sostatushistory FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + quoteid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_quotestagehistory FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + invoiceid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_invoicestatushistory FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + + + + + + id + + + productid + + Type=InnoDB +
    + + + + + + + + + + + + + + + + taxname + + + Type=InnoDB +
    + + + + + + id + + Type=InnoDB +
    + + + + + + + + + + + + + smid + + + attachmentsid + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_vtiger_salesmanattachmentsrel FOREIGN KEY (smid) REFERENCES vtiger_users(id) ON DELETE CASCADE + ADD CONSTRAINT fk_2_vtiger_salesmanattachmentsrel FOREIGN KEY (attachmentsid) REFERENCES vtiger_attachments(attachmentsid) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + tabid + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_vtiger_entityname FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + organizationname + name + + + + organizationname + type + + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_vtiger_orgunit FOREIGN KEY (organizationname) REFERENCES vtiger_organizationdetails(organizationname) ON UPDATE CASCADE ON DELETE CASCADE + Type=InnoDB
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
    + + + + + + + + + + + + + + + + + + orgunittype + + + Type=InnoDB +
    - - - - + + + + + + + + + + + + + + + + + organizationname + + + userid + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_vtiger_user2org FOREIGN KEY (organizationname) REFERENCES vtiger_organizationdetails(organizationname) ON UPDATE CASCADE ON DELETE CASCADE + ADD CONSTRAINT fk_2_vtiger_user2org FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE + Type=InnoDB +
    - -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - name - - - - modifiedby - - - tabid - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tabid - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tabid - - - fieldname - - - block - - - displaytype - - Type=InnoDB -
    - - - ADD CONSTRAINT fk_1_vtiger_field FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - account_type - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_account FOREIGN KEY (accountid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_accountbillads FOREIGN KEY (accountaddressid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_accountshipads FOREIGN KEY (accountaddressid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_accountscf FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - accountid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_contactdetails FOREIGN KEY (contactid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_contactsubdetails FOREIGN KEY (contactsubscriptionid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_contactaddress FOREIGN KEY (contactaddressid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_contactscf FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - -
    - - -ADD CONSTRAINT fk_1_vtiger_portalinfo FOREIGN KEY (id) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - -
    - - -ADD CONSTRAINT fk_1_vtiger_customerdetails FOREIGN KEY (customerid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - converted - leadstatus - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_leaddetails FOREIGN KEY (leadid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_leadsubdetails FOREIGN KEY (leadsubscriptionid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_leadaddress FOREIGN KEY (leadaddressid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_leadscf FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - title - - - notesid - - - crmid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_notes FOREIGN KEY (notesid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - accountid - - - potentialid - - - sales_stage - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_potential FOREIGN KEY (potentialid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - potentialid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_potstagehistory FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_potentialscf FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - activityid - subject - - - activitytype - date_start - - - date_start - due_date - - - date_start - time_start - - - eventstatus - - - status - eventstatus - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_activity FOREIGN KEY (activityid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - attachmentsid - - - description - name - type - attachmentsid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_attachments FOREIGN KEY (attachmentsid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - attachmentsid - - - crmid - - - attachmentsid - crmid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_seattachmentsrel FOREIGN KEY (attachmentsid) REFERENCES vtiger_attachments(attachmentsid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_seattachmentsrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - -
    - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_competitor FOREIGN KEY (competitorid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - potentialid - - - competitorid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_potcompetitorrel FOREIGN KEY (competitorid) REFERENCES vtiger_competitor(competitorid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_potcompetitorrel FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_vendor FOREIGN KEY (vendorid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_products FOREIGN KEY (productid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - currency - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - visibility - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - manufacturer - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - productid - filename - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_productcollaterals FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - - - roleid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_user2role FOREIGN KEY (roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_user2role FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - groupname - - - Type=InnoDB -
    - - - - - - - - - - - groupid - userid - -
    - - -ADD CONSTRAINT fk_1_vtiger_users2group FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_users2group FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_group2grouprel FOREIGN KEY (containsgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_group2grouprel FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - -
    - - -ADD CONSTRAINT fk_1_vtiger_group2role FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_group2role FOREIGN KEY (roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - -
    - - -ADD CONSTRAINT fk_1_vtiger_group2rs FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_group2rs FOREIGN KEY (roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - leadid - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_leadpotrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_leadpotrel FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - campaignstatus - - - campaignname - - - campaignid - - Type=InnoDB -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_campaignscf FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - contactid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_campaigncontrel FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_campaigncontrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - leadid - campaignid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_campaignleadrel FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_campaignleadrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - contactid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_leadcontrel FOREIGN KEY (leadcontrel_contactid_idx) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_leadcontrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - accountid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_leadacctrel FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_leadacctrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - potentialid - - - contactid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_contpotentialrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_contpotentialrel FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - dealname - - - Type=InnoDB -
    - - - - - - - - - - - - - - contactid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_cntactivityrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_cntactivityrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - name - - - - createdby - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_lar FOREIGN KEY (createdby) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - notesid - - - crmid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_crmentitynotesrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_crmentitynotesrel FOREIGN KEY (notesid) REFERENCES vtiger_notes(notesid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - ticketid - - - status - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_troubletickets FOREIGN KEY (ticketid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - ticketid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_ticketcomments FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - activityid - - - smid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_salesmanactivityrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_salesmanactivityrel FOREIGN KEY (smid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - vendorid - - - contactid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_vendorcontactrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_vendorcontactrel FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - smid - - - id - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_salesmanticketrel FOREIGN KEY (id) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_salesmanticketrel FOREIGN KEY (smid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - activityid - - - crmid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_seactivityrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_seactivityrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - productid - - - crmid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_seproductsrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_seproductsrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - crmid - - - ticketid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_seticketsrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_seticketsrel FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - assigned_user_id - module - name - deleted - -
    - - - - - - - - - - leadid - - - groupname - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_leadgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_leadgrouprelation FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - groupname - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_accountgrouprelation FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_accountgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - groupname - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_contactgrouprelation FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_contactgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - groupname - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_potentialgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_potentialgrouprelation FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - groupname - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_campaigngrouprelation FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_campaigngrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - activityid - - - groupname - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_activitygrouprelation FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_activitygrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - ticketid - - - groupname - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_ticketgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_ticketgrouprelation FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - -
    - - - - - - - - - -
    - - -ADD CONSTRAINT fk_1_vtiger_defaultcv FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - foldername - templatename - subject - -
    - - - - - - - - - - - - - - - - - - - - id - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_faq FOREIGN KEY (id) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - faqid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_faqcomments FOREIGN KEY (faqid) REFERENCES vtiger_faq(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - assigned_user_id - name - deleted - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - notesid - - - crmid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_senotesrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_senotesrel FOREIGN KEY (notesid) REFERENCES vtiger_notes(notesid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - ticket_id - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_ticketcf FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_productcf FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - assigned_user_id - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - deploymentstatus - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - ownership - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - rating - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - region - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - accounttype - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - contacttype - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - source - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - opportunity_type - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - stage - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - status - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - status - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - status - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - status - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - stage - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - priority - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - businesstype - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - industry - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - revenuetype - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - activitytype - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - usertype - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - purpose - - - Type=InnoDB -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - status - - - Type=InnoDB -
    - - - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - - - - profileid - globalactionid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_profile2globalpermissions FOREIGN KEY (profileid) REFERENCES vtiger_profile(profileid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - profileid - tabid - -
    - - - - - - - - - - - - - - - profileid - tabid - Operation - -
    - - - - - - - - - - - - - - profileid - tabid - fieldname - - - tabid - profileid - - - visible - profileid - -
    - - - - - - - - - - roleid - profileid - -
    - - - - - - - - Type=InnoDB -
    - - - - - - - - - - - - -
    - - -ADD CONSTRAINT fk_1_vtiger_def_org_share FOREIGN KEY (permission) REFERENCES vtiger_org_share_action_mapping(share_action_id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - tabid - fieldid - - - tabid - - - visible - fieldid - -
    - - - - - - - - - - - - - - - profileid - tabid - activityid - -
    - - - - - - - - - - - - - - - - - - - - productcategory - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - vendorid - - - contactid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_salesorder FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_salesorder FOREIGN KEY (salesorderid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_salesorder FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - groupname - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_sogrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_sogrouprelation FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_sobillads FOREIGN KEY (sobilladdressid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_soshipads FOREIGN KEY (soshipaddressid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_salesordercf FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - schedulednotificationname - - - Type=InnoDB -
    - - - - - - - - - - - - - activityid - - - productid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_activityproductrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_activityproductrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - relation_id - -
    - - - - - - - - - - - - - - - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_vendorcf FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_pricebook FOREIGN KEY (pricebookid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_pricebookcf FOREIGN KEY (pricebookid) REFERENCES vtiger_pricebook(pricebookid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - pricebookid - - - productid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_pricebookproductrel FOREIGN KEY (pricebookid) REFERENCES vtiger_pricebook(pricebookid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_pricebookproductrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - quotestage - - - potentialid - - - contactid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_quotes FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_quotes FOREIGN KEY (quoteid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_quotes FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_quotesbillads FOREIGN KEY (quotebilladdressid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_quotesshipads FOREIGN KEY (quoteshipaddressid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - groupname - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_quotegrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_quotegrouprelation FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_quotescf FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - vendorid - - - quoteid - - - contactid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_purchaseorder FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_purchaseorder FOREIGN KEY (purchaseorderid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_purchaseorder FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE -ADD CONSTRAINT fk_4_vtiger_purchaseorder FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - groupname - purchaseorderid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_pogrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_pogrouprelation FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_pobillads FOREIGN KEY (pobilladdressid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_poshipads FOREIGN KEY (poshipaddressid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_purchaseordercf FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - invoiceid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_invoice FOREIGN KEY (invoiceid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_invoice FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - groupname - invoiceid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_invoicegrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_invoicegrouprelation FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_invoicebillads FOREIGN KEY (invoicebilladdressid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_invoiceshipads FOREIGN KEY (invoiceshipaddressid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_invoicecf FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - columnindex - - - cvid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_cvcolumnlist FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - cvid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_cvstdfilter FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - cvid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_cvadvfilter FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - cvid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_customaction FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - queryid - - Type=InnoDB -
    - - - - - - - - - - - - - - - - queryid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_selectcolumn FOREIGN KEY (queryid) REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - queryid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_relcriteria FOREIGN KEY (queryid) REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - queryid - - - folderid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_report FOREIGN KEY (folderid) REFERENCES vtiger_reportfolder (folderid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_report FOREIGN KEY (queryid) REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_reportmodules FOREIGN KEY (reportmodulesid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_reportsortcol FOREIGN KEY (reportid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - datefilterid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_reportdatefilter FOREIGN KEY (datefilterid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - reportsummaryid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_reportsummary FOREIGN KEY (reportsummaryid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - usageunit - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - glacct - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - quotestage - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - invoicestatus - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - postatus - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - sostatus - - - Type=InnoDB - -
    - - - - - - - - - - - - - - - - - - - - carrier - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - taxclass - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - recurringtype - - - Type=InnoDB -
    - - - - - - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_org_share_action2tab FOREIGN KEY (share_action_id) REFERENCES vtiger_org_share_action_mapping(share_action_id) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_org_share_action2tab FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - tabid - user_id - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_moduleowners FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - crmid - flag - - Type=InnoDB -
    - - - - - - - - - - - Type=InnoDB - - tabid - -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_module_rel FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - share_groupid - - - to_groupid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_grp2grp FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_grp2grp FOREIGN KEY (share_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_datashare_grp2grp FOREIGN KEY (to_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - share_groupid - - - to_roleid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_grp2role FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_grp2role FOREIGN KEY (share_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_datashare_grp2role FOREIGN KEY (to_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - share_groupid - - - to_roleandsubid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_grp2rs FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_grp2rs FOREIGN KEY (share_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_datashare_grp2rs FOREIGN KEY (to_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - share_roleid - - - to_groupid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_role2group FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_role2group FOREIGN KEY (to_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_datashare_role2group FOREIGN KEY (share_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - share_roleid - - - to_roleid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_role2role FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_role2role FOREIGN KEY (share_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_datashare_role2role FOREIGN KEY (to_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - share_roleid - - - to_roleandsubid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_role2rs FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_role2rs FOREIGN KEY (share_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_datashare_role2rs FOREIGN KEY (to_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - share_roleandsubid - - - to_groupid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_rs2grp FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_rs2grp FOREIGN KEY (to_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_datashare_rs2grp FOREIGN KEY (share_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - share_roleandsubid - - - to_roleid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_rs2role FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_rs2role FOREIGN KEY (share_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_datashare_rs2role FOREIGN KEY (to_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - share_roleandsubid - - - to_roleandsubid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_rs2rs FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_rs2rs FOREIGN KEY (share_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_datashare_rs2rs FOREIGN KEY (to_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - tabid - - - relatedto_tabid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_relatedmodules FOREIGN KEY (relatedto_tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_relatedmodules FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - shareid - permission - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - parenttabid - parenttab_label - visible - -
    - - - - - - - - - - - - - - userid - shareduserid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_tmp_read_user_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_tmp_read_user_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_tmp_read_user_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - userid - sharedgroupid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_tmp_read_group_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_tmp_read_group_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_tmp_read_group_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - userid - shareduserid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_tmp_write_user_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_tmp_write_user_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_tmp_write_user_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - userid - sharedgroupid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_tmp_write_group_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_tmp_write_group_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_tmp_write_group_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - userid - shareduserid - relatedtabid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE -ADD CONSTRAINT fk_4_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - userid - sharedgroupid - tabid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_4_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - userid - shareduserid - tabid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE -ADD CONSTRAINT fk_4_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - userid - sharedgroupid - tabid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_4_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - tabid - parenttabid - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - campaigntype - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - campaignstatus - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - expectedresponse - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - portalname - - Type=InnoDB -
    - - - - - - - - - - - - - creatorid - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - nick - - - session - - - ping - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - - chat_from - - - chat_to - - - born - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_chat_msg FOREIGN KEY (chat_from) REFERENCES vtiger_chat_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - msg - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_chat_pchat FOREIGN KEY (msg) REFERENCES vtiger_chat_msg(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - msg - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_chat_pvchat FOREIGN KEY (msg) REFERENCES vtiger_chat_msg(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - tag_id - tagger_id - object_id - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - taxname - - - Type=InnoDB -
    - - - - - - - - - - - - - productid - - - taxid - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_producttaxrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - source - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - source - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - source - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - source - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - purchaseorderid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_postatushistory FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - salesorderid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_sostatushistory FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - quoteid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_quotestagehistory FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - invoiceid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_invoicestatushistory FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - - - - - id - - - productid - - Type=InnoDB -
    - - - - - - - - - - - - - - - - taxname - - - Type=InnoDB -
    - - - - - - id - - Type=InnoDB -
    - - - - - - - - - - - - - smid - - - attachmentsid - - Type=InnoDB -
    - - - ADD CONSTRAINT fk_1_vtiger_salesmanattachmentsrel FOREIGN KEY (smid) REFERENCES vtiger_users(id) ON DELETE CASCADE - ADD CONSTRAINT fk_2_vtiger_salesmanattachmentsrel FOREIGN KEY (attachmentsid) REFERENCES vtiger_attachments(attachmentsid) ON DELETE CASCADE - Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - tabid - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - organizationname - name - - - - organizationname - type - - - Type=InnoDB -
    - - - ADD CONSTRAINT fk_1_vtiger_orgunit FOREIGN KEY (organizationname) REFERENCES vtiger_organizationdetails(organizationname) ON UPDATE CASCADE ON DELETE CASCADE - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - orgunittype - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - organizationname - - - userid - - Type=InnoDB -
    - - - ADD CONSTRAINT fk_1_vtiger_user2org FOREIGN KEY (organizationname) REFERENCES vtiger_organizationdetails(organizationname) ON UPDATE CASCADE ON DELETE CASCADE - ADD CONSTRAINT fk_2_vtiger_user2org FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - orgunitid - - - userid - - Type=InnoDB -
    - - - ADD CONSTRAINT fk_1_vtiger_user2orgunit FOREIGN KEY (orgunitid) REFERENCES vtiger_orgunit(orgunitid) ON DELETE CASCADE - ADD CONSTRAINT fk_2_vtiger_user2orgunit FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - organizationname - - - crmid - - Type=InnoDB -
    - - +
    + + + + + + + + + + + + + + + + orgunitid + + + userid + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_vtiger_user2orgunit FOREIGN KEY (orgunitid) REFERENCES vtiger_orgunit(orgunitid) ON DELETE CASCADE + ADD CONSTRAINT fk_2_vtiger_user2orgunit FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + organizationname + + + crmid + + Type=InnoDB +
    + + ADD CONSTRAINT fk_1_vtiger_entity2org FOREIGN KEY (organizationname) REFERENCES vtiger_organizationdetails(organizationname) ON UPDATE CASCADE ON DELETE CASCADEADD CONSTRAINT fk_2_vtiger_entity2org FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - Type=InnoDB -
    - - - + Type=InnoDB +
    + + + + Modified: vtigercrm/branches/5.1_jens/soap/customerportal.php ============================================================================== --- vtigercrm/branches/5.1_jens/soap/customerportal.php (original) +++ vtigercrm/branches/5.1_jens/soap/customerportal.php Mon Apr 16 12:27:44 2007 @@ -17,11 +17,12 @@ $log = &LoggerManager::getLogger('customerportal'); -//$serializer = new XML_Serializer(); -$NAMESPACE = 'http://www.vtigercrm.com/vtigercrm'; +error_reporting(0); + +$NAMESPACE = 'http://www.vtiger.com/products/crm'; $server = new soap_server; -$server->configureWSDL('vtigersoap'); +$server->configureWSDL('customerportal'); @@ -165,6 +166,17 @@ ) ); +//Added to return the file content +$server->wsdl->addComplexType( + 'get_filecontent_array', + 'complexType', + 'array', + '', + array( + 'fileid'=>'xsd:string','type'=>'tns:xsd:string', + ) +); + $server->wsdl->addComplexType( 'add_ticket_attachment_array', 'complexType', @@ -274,6 +286,12 @@ 'get_ticket_attachments', array('id'=>'xsd:string','ticketid'=>'xsd:string'), array('return'=>'tns:get_ticket_attachments_array'), + $NAMESPACE); + +$server->register( + 'get_filecontent', + array('id'=>'xsd:string','fileid'=>'xsd:string','filename'=>'xsd:string'), + array('return'=>'tns:get_filecontent_array'), $NAMESPACE); $server->register( @@ -569,7 +587,32 @@ $updatequery = "update vtiger_crmentity set modifiedtime=".$servercreatedtime." where crmid=".$ticketid; $adb->query($updatequery); - } + + //To get the username and user email id, user means assigned to user of the ticket + $result = $adb->query("select user_name, email1 from vtiger_users inner join vtiger_crmentity on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.crmid=$ticketid"); + $owner = $adb->query_result($result,0,'user_name'); + $to_email = $adb->query_result($result,0,'email1'); + + //To get the contact name + $result1 = $adb->query("select lastname, firstname, email from vtiger_contactdetails where contactid=$ownerid"); + $customername = $adb->query_result($result1,0,'firstname').' '.$adb->query_result($result1,0,'lastname'); + $from_email = $adb->query_result($result1,0,'email'); + + //send mail to the assigned to user when customer add comment + $subject = "Respond to Ticket ID ## $ticketid ## in Customer Portal - URGENT"; + $contents = "Dear $owner,

    + Customer has provided the following additional information to your reply:

    + + ".nl2br($comments)."

    + + Kindly respond to above ticket at the earliest.

    + + Regards,
    + Support Administrator + "; + + $mailstatus = send_mail('HelpDesk',$to_email,$customername,$from_email,$subject,$contents); + } } /** function used to close the ticket @@ -781,16 +824,43 @@ $filesize = filesize($filepath.$fileid."_".$filename); $filetype = $adb->query_result($res,$i,'type'); - $filecontents = base64_encode(file_get_contents($filepath.$fileid."_".$filename));//fread(fopen($filepath.$filename, "r"), $filesize)); + //Now we will not pass the file content to CP, when the customer click on the link we will retrieve + //$filecontents = base64_encode(file_get_contents($filepath.$fileid."_".$filename));//fread(fopen($filepath.$filename, "r"), $filesize)); $output[$i]['fileid'] = $fileid; $output[$i]['filename'] = $filename; $output[$i]['filetype'] = $filetype; $output[$i]['filesize'] = $filesize; - $output[$i]['filecontents'] = $filecontents; + //$output[$i]['filecontents'] = $filecontents; } return $output; +} + +/** function used to get the contents of a file + * @param int $contactid - customer ie., contact id + * @param int $fileid - id of the file to which we want contents + * @param string $filename - name of the file to which we want contents + * return $filecontents array with single file contents like [fileid] => filecontent + */ +function get_filecontent($contactid, $fileid, $filename) +{ + global $adb; + $query = "select vtiger_attachments.path from vtiger_troubletickets + inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid = vtiger_troubletickets.ticketid + inner join vtiger_attachments on vtiger_attachments.attachmentsid = vtiger_seattachmentsrel.attachmentsid + where vtiger_troubletickets.parent_id= $contactid and + vtiger_attachments.attachmentsid= $fileid and + vtiger_attachments.name='$filename'"; + $res = $adb->query($query); + + if($adb->num_rows($res)>0) + { + $filenamewithpath = $adb->query_result($res,0,'path').$fileid."_".$filename; + $filecontents[$fileid] = base64_encode(file_get_contents($filenamewithpath)); + $adb->println("Going to return the content of the file ==> $filenamewithpath"); + } + return $filecontents; } /** function to add attachment for a ticket ie., the passed contents will be write in a file and the details will be stored in database Modified: vtigercrm/branches/5.1_jens/soap/firefoxtoolbar.php ============================================================================== --- vtigercrm/branches/5.1_jens/soap/firefoxtoolbar.php (original) +++ vtigercrm/branches/5.1_jens/soap/firefoxtoolbar.php Mon Apr 16 12:27:44 2007 @@ -1,747 +1,759 @@ -configureWSDL('vtigersoap'); - -$server->register( - 'get_version', - array('user_name'=>'xsd:string','password'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'create_lead_from_webform', - array('username'=>'xsd:string', - 'lastname'=>'xsd:string', - 'email'=>'xsd:string', - 'phone'=>'xsd:string', - 'company'=>'xsd:string', - 'country'=>'xsd:string', - 'description'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - - - - -$server->register( - 'create_site_from_webform', - array('username'=>'xsd:string', - 'portalname'=>'xsd:string', - 'portalurl'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - - - -$server->register( - 'create_rss_from_webform', - array('username'=>'xsd:string', - 'rssurl'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - - - - - -$server->register( - 'create_contacts', - array('user_name'=>'xsd:string','lastname'=>'xsd:string','phone'=>'xsd:string','mobile'=>'xsd:string','email'=>'xsd:string','street'=>'xsd:string','city'=>'xsd:string','state'=>'xsd:string','country'=>'xsd:string','zipcode'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - - - -$server->register( - 'create_account', - array('username'=>'xsd:string', 'accountname'=>'xsd:string', 'email'=>'xsd:string', 'phone'=>'xsd:string','$primary_address_street'=>'xsd:string','$primary_address_city'=>'xsd:string','$primary_address_state'=>'xsd:string','$primary_address_postalcode'=>'xsd:string','$primary_address_country'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - - - $server->register( - 'create_ticket_from_toolbar', - array('username'=>'xsd:string', 'title'=>'xsd:string','description'=>'xsd:string','priority'=>'xsd:string','severity'=>'xsd:string','category'=>'xsd:string','user_name'=>'xsd:string','parent_id'=>'xsd:string','product_id'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - - -$server->register( - 'create_vendor_from_webform', - array('username'=>'xsd:string', 'vendorname'=>'xsd:string', - 'email'=>'xsd:string', - 'phone'=>'xsd:string', - 'website'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - - -$server->register( - 'create_product_from_webform', - array('username'=>'xsd:string', 'productname'=>'xsd:string', - 'productcode'=>'xsd:string', - 'website'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - - -$server->register( - 'create_note_from_webform', - array('username'=>'xsd:string', 'title'=>'xsd:string', - 'notecontent'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'LogintoVtigerCRM', - array('user_name'=>'xsd:string','password'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'CheckLeadPermission', - array('username'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'CheckContactPermission', - array('username'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'CheckAccountPermission', - array('username'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'CheckTicketPermission', - array('username'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'CheckVendorPermission', - array('username'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'CheckProductPermission', - array('username'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'CheckNotePermission', - array('username'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'CheckSitePermission', - array('username'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'CheckRssPermission', - array('username'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - - -function CheckLeadPermission($username) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("Leads","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -function CheckContactPermission($username) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("Contacts","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -function CheckAccountPermission($username) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("Accounts","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -function CheckTicketPermission($username) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("HelpDesk","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -function CheckVendorPermission($username) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("Vendors","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -function CheckProductPermission($username) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("Products","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -function CheckNotePermission($username) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("Notes","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -function CheckSitePermission($username) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("Portal","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -function CheckRssPermission($username) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("Rss","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - - -function create_site_from_webform($username,$portalname,$portalurl) -{ - global $log; - global $adb; - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - require_once("modules/Portal/Portal.php"); - if(isPermitted("Portals","EditView") == "yes") - { - $result = SavePortal($portalname,$portalurl); - - $adb->println("Create New Portal from Web Form - Ends"); - - if($result != '') - return 'Portal added sucessfully'; - else - return "Portal creation failed. Try again"; - } - else - { - return $accessDenied; - } -} -function LogintoVtigerCRM($user_name,$password) -{ - global $log; - require_once('modules/Users/Users.php'); - - $return_access = "FALSE"; - - $objuser = new Users(); - - if($password != "") - { - $objuser->column_fields['user_name'] = $user_name; - $objuser->load_user($password); - if($objuser->is_authenticated()) - { - $return_access = "TRUE"; - }else - { - $return_access = "FALSE"; - } - }else - { - //$server->setError("Invalid username and/or password"); - $return_access = "FALSE"; - } - $objuser = $objuser; - return $return_access; -} - -function create_rss_from_webform($username,$url) -{ - - global $log; - global $adb; - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - require_once("modules/Rss/Rss.php"); - - $oRss = new vtigerRSS(); - if(isPermitted("RSS","EditView") == "yes") - { - if($oRss->setRSSUrl($url)) - { - if($oRss->saveRSSUrl($url) == false) - { - return "RSS feed addition failed. Try again"; - } - else - { - return 'RSS feed added sucessfully.'; - } - - }else - { - return "Not a valid RSS Feed or your Proxy Settings is not correct. Try again"; - } - } - else - { - return $accessDenied; - } - -} - - -function create_note_from_webform($username,$subject,$desc) -{ - global $log; - global $adb; - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - $adb->println("Create New Note from Web Form - Starts"); - require_once("modules/Notes/Notes.php"); - - $focus = new Notes(); - if(isPermitted("Notes","EditView") == "yes") - { - $focus->column_fields['notes_title'] = $subject; - $focus->column_fields['notecontent'] = $desc; - - $focus->save("Notes"); - - $focus->retrieve_entity_info($focus->id,"Notes"); - - $adb->println("Create New Note from Web Form - Ends"); - - if($focus->id != '') - return 'Note added sucessfully.'; - else - return "Note creation failed. Try again"; - } - else - { - return $accessDenied; - } - -} - -function create_product_from_webform($username,$productname,$code,$website) -{ - global $log; - global $adb; - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - $adb->println("Create New Product from Web Form - Starts"); - - require_once("modules/Products/Products.php"); - if(isPermitted("Products","EditView") == "yes") - { - $focus = new Products(); - $focus->column_fields['productname'] = $productname; - $focus->column_fields['productcode'] = $code; - $focus->column_fields['website'] = $website; - $focus->save("Products"); - $adb->println("Create New Product from Web Form - Ends"); - - if($focus->id != '') - return 'Product added sucessfully.'; - else - return "Product creation failed. Try again"; - } - else - { - return $accessDenied; - } - - -} - -function create_vendor_from_webform($username,$vendorname,$email,$phone,$website) -{ - global $log; - global $adb; - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - $adb->println("Create New Vendor from Web Form - Starts"); - require_once("modules/Vendors/Vendors.php"); - if(isPermitted("Vendors","EditView" ) == "yes") - { - $focus = new Vendors(); - $focus->column_fields['vendorname'] = $vendorname; - $focus->column_fields['email'] = $email; - $focus->column_fields['phone'] = $phone; - $focus->column_fields['website'] = $website; - - $focus->save("Vendors"); - - $focus->retrieve_entity_info($focus->id,"Vendors"); - - $adb->println("Create New Vendor from Web Form - Ends"); - - if($focus->id != '') - return 'Vendor added sucessfully'; - else - return "Vendor creation failed. Try again"; - } - else - { - return $accessDenied; - } - - -} - -function create_ticket_from_toolbar($username,$title,$description,$priority,$severity,$category,$user_name,$parent_id,$product_id) -{ - global $log; - global $adb; - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("HelpDesk","EditView") == "yes") - { - - $seed_ticket = new HelpDesk(); - $output_list = Array(); - - require_once('modules/HelpDesk/HelpDesk.php'); - $ticket = new HelpDesk(); - - $ticket->column_fields[ticket_title] = $title; - $ticket->column_fields[description]=$description; - $ticket->column_fields[ticketpriorities]=$priority; - $ticket->column_fields[ticketseverities]=$severity; - $ticket->column_fields[ticketcategories]=$category; - $ticket->column_fields[ticketstatus]='Open'; - - $ticket->column_fields[parent_id]=$parent_id; - $ticket->column_fields[product_id]=$product_id; - $ticket->column_fields[assigned_user_id]=$user_id; - //$ticket->saveentity("HelpDesk"); - $ticket->save("HelpDesk"); - - if($ticket->id != '') - return "Ticket Created Sucessfully"; - else - return "Error while creating Ticket.Try again"; - } - else - { - return $accessDenied; - } - - -} - -function create_account($username,$accountname,$email,$phone,$primary_address_street,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id,'Users'); - require_once("modules/Accounts/Accounts.php"); - if(isPermitted("Accounts","EditView") == "yes") - { - $account=new Accounts(); - $account->column_fields['accountname']=$accountname; - $account->column_fields['email1']=$email; - $account->column_fields['phone']=$phone; - $account->column_fields['bill_street']=$primary_address_street; - $account->column_fields['bill_city']=$primary_address_city; - $account->column_fields['bill_state']=$primary_address_state; - $account->column_fields['bill_code']=$primary_address_postalcode; - $account->column_fields['bill_country']=$primary_address_country; - $account->column_fields['ship_street']=$primary_address_street; - $account->column_fields['ship_city']=$primary_address_city; - $account->column_fields['ship_state']=$primary_address_state; - $account->column_fields['ship_code']=$primary_address_postalcode; - $account->column_fields['ship_country']=$primary_address_country; - $account->column_fields['assigned_user_id']=$user_id; - $account->save('Accounts'); - if($account->id != '') - return "Account added Sucessfully"; - else - return "Error while adding Account.Try again"; - } - else - { - return $accessDenied; - } - -} - - - -function get_version($user_name, $password) -{ - return "5.0.0"; -} - - - -function create_lead_from_webform($username,$lastname,$email,$phone,$company,$country,$description) -{ - - global $log; - global $adb; - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - $adb->println("Create New Lead from Web Form - Starts"); - require_once("modules/Leads/Leads.php"); - - $focus = new Leads(); - if(isPermitted("Leads","EditView") == "yes") - { - $focus->column_fields['lastname'] = $lastname; - $focus->column_fields['email'] = $email; - $focus->column_fields['phone'] = $phone; - $focus->column_fields['company'] = $company; - $focus->column_fields['country'] = $country; - $focus->column_fields['description'] = $description; - $focus->column_fields['assigned_user_id'] = $user_id; - $focus->save("Leads"); - $adb->println("Create New Lead from Web Form - Ends"); - if($focus->id != '') - return 'Thank you for your interest. Information has been successfully added as Lead.'; - else - return "Lead creation failed. Try again"; - } - else - { - return $accessDenied; - } - - -} - -function create_contacts($user_name,$lastname,$phone,$mobile,$email,$street,$city,$state,$country,$zipcode) -{ - global $log; - $log->debug($user_name); - $birthdate = "0000-00-00"; - - return create_contact1($user_name, "", $lastname, $email,"", "","", $mobile, "",$street,$city,$state,$zipcode,$country,$city,$street,$state,$zipcode,$country,$phone,"","","","",$birthdate,"",""); - -} - -function create_contact1($user_name, $first_name, $last_name, $email_address ,$account_name , $salutation , $title, $phone_mobile, $reports_to,$primary_address_street,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country,$alt_address_city,$alt_address_street,$alt_address_state,$alt_address_postalcode,$alt_address_country,$office_phone,$home_phone,$other_phone,$fax,$department,$birthdate,$assistant_name,$assistant_phone,$description='') -{ - global $adb,$log; - global $current_user; - require_once('modules/Users/Users.php'); - $seed_user = new Users(); - $user_id = $seed_user->retrieve_user_id($user_name); - $current_user = $seed_user; - $current_user->retrieve_entity_info($user_id,'Users'); - - require_once('modules/Contacts/Contacts.php'); - if(isPermitted("Contacts","EditView") == "yes") - { - $contact = new Contacts(); - $contact->column_fields[firstname]= $first_name; - $contact->column_fields[lastname]= $last_name; - //$contact->column_fields[account_id]=retrieve_account_id($account_name,$user_id);// NULL value is not supported NEED TO FIX - $contact->column_fields[salutation]=$salutation; - // EMAIL IS NOT ADDED - $contact->column_fields[title]=$title; - $contact->column_fields[email]=$email_address; - $contact->column_fields[mobile]=$phone_mobile; - //$contact->column_fields[reports_to_id] =retrievereportsto($reports_to,$user_id,$account_id);// NOT FIXED IN SAVEENTITY.PHP - $contact->column_fields[mailingstreet]=$primary_address_street; - $contact->column_fields[mailingcity]=$primary_address_city; - $contact->column_fields[mailingcountry]=$primary_address_country; - $contact->column_fields[mailingstate]=$primary_address_state; - $contact->column_fields[mailingzip]=$primary_address_postalcode; - $contact->column_fields[otherstreet]=$alt_address_street; - $contact->column_fields[othercity]=$alt_address_city; - $contact->column_fields[othercountry]=$alt_address_country; - $contact->column_fields[otherstate]=$alt_address_state; - $contact->column_fields[otherzip]=$alt_address_postalcode; - $contact->column_fields[assigned_user_id]=$user_id; - // new Fields - $contact->column_fields[phone]= $office_phone; - $contact->column_fields[homephone]= $home_phone; - $contact->column_fields[otherphone]= $other_phone; - $contact->column_fields[fax]= $fax; - $contact->column_fields[department]=$department; - $contact->column_fields[birthday]= getDisplayDate($birthdate); - $contact->column_fields[assistant]= $assistant_name; - $contact->column_fields[assistantphone]= $assistant_phone; - $contact->column_fields[description]= $description; - $contact->save("Contacts"); - if($contact->id != '') - return 'Contact added Sucessfully'; - else - return "Contact creation failed. Try again"; - } - else - { - return $accessDenied; - } - -} - -$server->service($HTTP_RAW_POST_DATA); -exit(); -?> +configureWSDL('vtigersoap'); + +$server->register( + 'get_version', + array('user_name'=>'xsd:string','password'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'create_lead_from_webform', + array('username'=>'xsd:string', + 'lastname'=>'xsd:string', + 'firstname'=>'xsd:string', + 'email'=>'xsd:string', + 'phone'=>'xsd:string', + 'company'=>'xsd:string', + 'country'=>'xsd:string', + 'description'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + + + + +$server->register( + 'create_site_from_webform', + array('username'=>'xsd:string', + 'portalname'=>'xsd:string', + 'portalurl'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + + + +$server->register( + 'create_rss_from_webform', + array('username'=>'xsd:string', + 'rssurl'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + + + + + +$server->register( + 'create_contacts', + array('user_name'=>'xsd:string','firstname'=>'xsd:string','lastname'=>'xsd:string','phone'=>'xsd:string','mobile'=>'xsd:string','email'=>'xsd:string','street'=>'xsd:string','city'=>'xsd:string','state'=>'xsd:string','country'=>'xsd:string','zipcode'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + + + +$server->register( + 'create_account', + array('username'=>'xsd:string', 'accountname'=>'xsd:string', 'email'=>'xsd:string', 'phone'=>'xsd:string','$primary_address_street'=>'xsd:string','$primary_address_city'=>'xsd:string','$primary_address_state'=>'xsd:string','$primary_address_postalcode'=>'xsd:string','$primary_address_country'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + + + $server->register( + 'create_ticket_from_toolbar', + array('username'=>'xsd:string', 'title'=>'xsd:string','description'=>'xsd:string','priority'=>'xsd:string','severity'=>'xsd:string','category'=>'xsd:string','user_name'=>'xsd:string','parent_id'=>'xsd:string','product_id'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + + +$server->register( + 'create_vendor_from_webform', + array('username'=>'xsd:string', 'vendorname'=>'xsd:string', + 'email'=>'xsd:string', + 'phone'=>'xsd:string', + 'website'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + + +$server->register( + 'create_product_from_webform', + array('username'=>'xsd:string', 'productname'=>'xsd:string', + 'productcode'=>'xsd:string', + 'website'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + + +$server->register( + 'create_note_from_webform', + array('username'=>'xsd:string', 'title'=>'xsd:string', + 'notecontent'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'LogintoVtigerCRM', + array('user_name'=>'xsd:string','password'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'CheckLeadPermission', + array('username'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'CheckContactPermission', + array('username'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'CheckAccountPermission', + array('username'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'CheckTicketPermission', + array('username'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'CheckVendorPermission', + array('username'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'CheckProductPermission', + array('username'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'CheckNotePermission', + array('username'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'CheckSitePermission', + array('username'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'CheckRssPermission', + array('username'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + + +function CheckLeadPermission($username) +{ + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("Leads","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + +function CheckContactPermission($username) +{ + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("Contacts","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + +function CheckAccountPermission($username) +{ + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("Accounts","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + +function CheckTicketPermission($username) +{ + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("HelpDesk","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + +function CheckVendorPermission($username) +{ + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("Vendors","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + +function CheckProductPermission($username) +{ + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("Products","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + +function CheckNotePermission($username) +{ + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("Notes","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + +function CheckSitePermission($username) +{ + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("Portal","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + +function CheckRssPermission($username) +{ + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("Rss","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + + +function create_site_from_webform($username,$portalname,$portalurl) +{ + global $log; + global $adb; + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + require_once("modules/Portal/Portal.php"); + if(isPermitted("Portals","EditView") == "yes") + { + $result = SavePortal($portalname,$portalurl); + + $adb->println("Create New Portal from Web Form - Ends"); + + if($result != '') + return 'URL added sucessfully'; + else + return "Portal creation failed. Try again"; + } + else + { + return $accessDenied; + } +} +function LogintoVtigerCRM($user_name,$password) +{ + global $log; + require_once('modules/Users/Users.php'); + + $return_access = "FALSE"; + + $objuser = new Users(); + + if($password != "") + { + $objuser->column_fields['user_name'] = $user_name; + $objuser->load_user($password); + if($objuser->is_authenticated()) + { + $return_access = "TRUE"; + }else + { + $return_access = "FALSE"; + } + }else + { + //$server->setError("Invalid username and/or password"); + $return_access = "FALSE"; + } + $objuser = $objuser; + return $return_access; +} + +function create_rss_from_webform($username,$url) +{ + + global $log; + global $adb; + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + require_once("modules/Rss/Rss.php"); + + $oRss = new vtigerRSS(); + if(isPermitted("RSS","EditView") == "yes") + { + if($oRss->setRSSUrl($url)) + { + if($oRss->saveRSSUrl($url) == false) + { + return "RSS feed addition failed. Try again"; + } + else + { + return 'RSS feed added sucessfully.'; + } + + }else + { + return "Not a valid RSS Feed or your Proxy Settings is not correct. Try again"; + } + } + else + { + return $accessDenied; + } + +} + + +function create_note_from_webform($username,$subject,$desc) +{ + global $log; + global $adb; + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + $adb->println("Create New Note from Web Form - Starts"); + require_once("modules/Notes/Notes.php"); + + $focus = new Notes(); + if(isPermitted("Notes","EditView") == "yes") + { + $focus->column_fields['notes_title'] = $subject; + $focus->column_fields['notecontent'] = $desc; + + $focus->save("Notes"); + + $focus->retrieve_entity_info($focus->id,"Notes"); + + $adb->println("Create New Note from Web Form - Ends"); + + if($focus->id != '') + return 'Note added sucessfully.'; + else + return "Note creation failed. Try again"; + } + else + { + return $accessDenied; + } + +} + +function create_product_from_webform($username,$productname,$code,$website) +{ + global $log; + global $adb; + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + $adb->println("Create New Product from Web Form - Starts"); + + require_once("modules/Products/Products.php"); + if(isPermitted("Products","EditView") == "yes") + { + $focus = new Products(); + $focus->column_fields['productname'] = $productname; + $focus->column_fields['productcode'] = $code; + $focus->column_fields['website'] = $website; + $focus->save("Products"); + $adb->println("Create New Product from Web Form - Ends"); + + if($focus->id != '') + return 'Product added sucessfully.'; + else + return "Product creation failed. Try again"; + } + else + { + return $accessDenied; + } + + +} + +function create_vendor_from_webform($username,$vendorname,$email,$phone,$website) +{ + global $log; + global $adb; + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + $adb->println("Create New Vendor from Web Form - Starts"); + require_once("modules/Vendors/Vendors.php"); + if(isPermitted("Vendors","EditView" ) == "yes") + { + $focus = new Vendors(); + $focus->column_fields['vendorname'] = $vendorname; + $focus->column_fields['email'] = $email; + $focus->column_fields['phone'] = $phone; + $focus->column_fields['website'] = $website; + + $focus->save("Vendors"); + + $focus->retrieve_entity_info($focus->id,"Vendors"); + + $adb->println("Create New Vendor from Web Form - Ends"); + + if($focus->id != '') + return 'Vendor added sucessfully'; + else + return "Vendor creation failed. Try again"; + } + else + { + return $accessDenied; + } + + +} + +function create_ticket_from_toolbar($username,$title,$description,$priority,$severity,$category,$user_name,$parent_id,$product_id) +{ + global $log; + global $adb; + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("HelpDesk","EditView") == "yes") + { + + $seed_ticket = new HelpDesk(); + $output_list = Array(); + + require_once('modules/HelpDesk/HelpDesk.php'); + $ticket = new HelpDesk(); + + $ticket->column_fields[ticket_title] = $title; + $ticket->column_fields[description]=$description; + $ticket->column_fields[ticketpriorities]=$priority; + $ticket->column_fields[ticketseverities]=$severity; + $ticket->column_fields[ticketcategories]=$category; + $ticket->column_fields[ticketstatus]='Open'; + + $ticket->column_fields[parent_id]=$parent_id; + $ticket->column_fields[product_id]=$product_id; + $ticket->column_fields[assigned_user_id]=$user_id; + //$ticket->saveentity("HelpDesk"); + $ticket->save("HelpDesk"); + + if($ticket->id != '') + return "Ticket Created Sucessfully"; + else + return "Error while creating Ticket.Try again"; + } + else + { + return $accessDenied; + } + + +} + +function create_account($username,$accountname,$email,$phone,$primary_address_street,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country) +{ + global $current_user,$log,$adb; + $log->DEBUG("Entering with data ".$username.$accountname.$email.$phone."
    ".$primary_address_street.$primary_address_city.$primary_address_state.$primary_address_postalcode.$primary_address_country); + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id,'Users'); + require_once("modules/Accounts/Accounts.php"); + if(isPermitted("Accounts","EditView") == "yes") + { + $query = "SELECT accountname FROM vtiger_account,vtiger_crmentity WHERE accountname ='".$accountname."' and vtiger_account.accountid = vtiger_crmentity.crmid and vtiger_crmentity.deleted != 1"; + $result = $adb->query($query); + if($adb->num_rows($result) > 0) + { + return "Account Name already exists"; + die; + } + $account=new Accounts(); + $account->column_fields['accountname']=$accountname; + $account->column_fields['email1']=$email; + $account->column_fields['phone']=$phone; + $account->column_fields['bill_street']=$primary_address_street; + $account->column_fields['bill_city']=$primary_address_city; + $account->column_fields['bill_state']=$primary_address_state; + $account->column_fields['bill_code']=$primary_address_postalcode; + $account->column_fields['bill_country']=$primary_address_country; + $account->column_fields['ship_street']=$primary_address_street; + $account->column_fields['ship_city']=$primary_address_city; + $account->column_fields['ship_state']=$primary_address_state; + $account->column_fields['ship_code']=$primary_address_postalcode; + $account->column_fields['ship_country']=$primary_address_country; + $account->column_fields['assigned_user_id']=$user_id; + $account->save('Accounts'); + if($account->id != '') + return "Account added Sucessfully"; + else + return "Error while adding Account.Try again"; + } + else + { + return $accessDenied; + } + +} + + + +function get_version($user_name, $password) +{ + return "5.0.0"; +} + + + +function create_lead_from_webform($username,$lastname,$email,$phone,$company,$country,$description,$firstname) +{ + + global $log; + global $adb; + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + $adb->println("Create New Lead from Web Form - Starts"); + require_once("modules/Leads/Leads.php"); + + $focus = new Leads(); + if(isPermitted("Leads","EditView") == "yes") + { + $focus->column_fields['lastname'] = $lastname; + $focus->column_fields['firstname'] = $firstname; + $focus->column_fields['email'] = $email; + $focus->column_fields['phone'] = $phone; + $focus->column_fields['company'] = $company; + $focus->column_fields['country'] = $country; + $focus->column_fields['description'] = $description; + $focus->column_fields['assigned_user_id'] = $user_id; + $focus->save("Leads"); + $adb->println("Create New Lead from Web Form - Ends"); + if($focus->id != '') + return 'Thank you for your interest. Information has been successfully added as Lead.'; + else + return "Lead creation failed. Try again"; + } + else + { + return $accessDenied; + } + + +} + +function create_contacts($user_name,$firstname,$lastname,$phone,$mobile,$email,$street,$city,$state,$country,$zipcode) +{ + global $log; + $log->DEBUG("Entering into create_contacts"); + $log->DEBUG($firstname."Firstisname"); + $birthdate = "0000-00-00"; + + return create_contact1($user_name, $firstname, $lastname, $email,"", "","", $mobile, "",$street,$city,$state,$zipcode,$country,$city,$street,$state,$zipcode,$country,$phone,"","","","",$birthdate,"",""); + +} + +function create_contact1($user_name, $first_name, $last_name, $email_address ,$account_name , $salutation , $title, $phone_mobile, $reports_to,$primary_address_street,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country,$alt_address_city,$alt_address_street,$alt_address_state,$alt_address_postalcode,$alt_address_country,$office_phone,$home_phone,$other_phone,$fax,$department,$birthdate,$assistant_name,$assistant_phone,$description='') +{ + global $adb,$log; + global $current_user; + require_once('modules/Users/Users.php'); + $seed_user = new Users(); + $user_id = $seed_user->retrieve_user_id($user_name); + $current_user = $seed_user; + $current_user->retrieve_entity_info($user_id,'Users'); + + require_once('modules/Contacts/Contacts.php'); + $log->DEBUG($first_name."First & Name"); + if(isPermitted("Contacts","EditView") == "yes") + { + $contact = new Contacts(); + $contact->column_fields[firstname]= $first_name; + $contact->column_fields[lastname]= $last_name; + //$contact->column_fields[account_id]=retrieve_account_id($account_name,$user_id);// NULL value is not supported NEED TO FIX + $contact->column_fields[salutation]=$salutation; + // EMAIL IS NOT ADDED + $contact->column_fields[title]=$title; + $contact->column_fields[email]=$email_address; + $contact->column_fields[mobile]=$phone_mobile; + //$contact->column_fields[reports_to_id] =retrievereportsto($reports_to,$user_id,$account_id);// NOT FIXED IN SAVEENTITY.PHP + $contact->column_fields[mailingstreet]=$primary_address_street; + $contact->column_fields[mailingcity]=$primary_address_city; + $contact->column_fields[mailingcountry]=$primary_address_country; + $contact->column_fields[mailingstate]=$primary_address_state; + $contact->column_fields[mailingzip]=$primary_address_postalcode; + $contact->column_fields[otherstreet]=$alt_address_street; + $contact->column_fields[othercity]=$alt_address_city; + $contact->column_fields[othercountry]=$alt_address_country; + $contact->column_fields[otherstate]=$alt_address_state; + $contact->column_fields[otherzip]=$alt_address_postalcode; + $contact->column_fields[assigned_user_id]=$user_id; + // new Fields + $contact->column_fields[phone]= $office_phone; + $contact->column_fields[homephone]= $home_phone; + $contact->column_fields[otherphone]= $other_phone; + $contact->column_fields[fax]= $fax; + $contact->column_fields[department]=$department; + $contact->column_fields[birthday]= getDisplayDate($birthdate); + $contact->column_fields[assistant]= $assistant_name; + $contact->column_fields[assistantphone]= $assistant_phone; + $contact->column_fields[description]= $description; + $contact->save("Contacts"); + if($contact->id != '') + return 'Contact added Sucessfully'; + else + return "Contact creation failed. Try again"; + } + else + { + return $accessDenied; + } + +} + +$server->service($HTTP_RAW_POST_DATA); +exit(); +?> Modified: vtigercrm/branches/5.1_jens/soap/thunderbirdplugin.php ============================================================================== --- vtigercrm/branches/5.1_jens/soap/thunderbirdplugin.php (original) +++ vtigercrm/branches/5.1_jens/soap/thunderbirdplugin.php Mon Apr 16 12:27:44 2007 @@ -1,547 +1,581 @@ -configureWSDL('vtigersoap'); - -$server->register( - 'create_session', - array('user_name'=>'xsd:string','password'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'end_session', - array('user_name'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'SearchContactsByEmail', - array('username'=>'xsd:string','emailaddress'=>'xsd:string'), - array('return'=>'tns:contactdetails'), - $NAMESPACE); - -$server->register( - 'GetContacts', - array('username'=>'xsd:string'), - array('return'=>'tns:contactdetails'), - $NAMESPACE); - -$server->register( - 'CheckContactPerm',array('user_name'=>'xsd:string'),array('return'=>'xsd:string'),$NAMESPACE); - -$server->register( - 'CheckContactViewPerm',array('user_name'=>'xsd:string'),array('return'=>'xsd:string'),$NAMESPACE); - -$server->register( - 'AddContact', - array('user_name'=>'xsd:string', - 'first_name'=>'xsd:string', - 'last_name'=>'xsd:string', - 'email_address'=>'xsd:string', - 'account_name'=>'xsd:string', - 'salutation'=>'xsd:string', - 'title'=>'xsd:string', - 'phone_mobile'=>'xsd:string', - 'reports_to'=>'xsd:string', - 'primary_address_street'=>'xsd:string', - 'primary_address_city'=>'xsd:string', - 'primary_address_state'=>'xsd:string' , - 'primary_address_postalcode'=>'xsd:string', - 'primary_address_country'=>'xsd:string', - 'alt_address_city'=>'xsd:string', - 'alt_address_street'=>'xsd:string', - 'alt_address_state'=>'xsd:string', - 'alt_address_postalcode'=>'xsd:string', - 'alt_address_country'=>'xsd:string', - 'office_phone'=>'xsd:string', - 'home_phone'=>'xsd:string', - 'fax'=>'xsd:string', - 'department'=>'xsd:string', - 'description'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'AddLead', - array('user_name'=>'xsd:string', - 'first_name'=>'xsd:string', - 'last_name'=>'xsd:string', - 'email_address'=>'xsd:string', - 'account_name'=>'xsd:string', - 'salutation'=>'xsd:string', - 'title'=>'xsd:string', - 'phone_mobile'=>'xsd:string', - 'reports_to'=>'xsd:string', - 'primary_address_street'=>'xsd:string', - 'primary_address_city'=>'xsd:string', - 'primary_address_state'=>'xsd:string' , - 'primary_address_postalcode'=>'xsd:string', - 'primary_address_country'=>'xsd:string', - 'alt_address_city'=>'xsd:string', - 'alt_address_street'=>'xsd:string', - 'alt_address_state'=>'xsd:string', - 'alt_address_postalcode'=>'xsd:string', - 'alt_address_country'=>'xsd:string', - 'office_phone'=>'xsd:string', - 'home_phone'=>'xsd:string', - 'fax'=>'xsd:string', - 'department'=>'xsd:string', - 'description'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'track_email', - array('user_name'=>'xsd:string', 'contact_ids'=>'xsd:string', 'date_sent'=>'xsd:date', 'email_subject'=>'xsd:string', 'email_body'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->wsdl->addComplexType( - 'contactdetail', - 'complexType', - 'struct', - 'all', - '', - array( - 'id' => array('name'=>'id','type'=>'xsd:string'), - 'firstname' => array('name'=>'firstname','type'=>'xsd:string'), - 'lastname' => array('name'=>'lastname','type'=>'xsd:string'), - 'emailaddress' => array('name'=>'emailaddress','type'=>'xsd:string'), - 'accountname' => array('name'=>'accountname','type'=>'xsd:string'), - 'middlename' => array('name'=>'middlename','type'=>'xsd:string'), - 'birthdate'=> array('name'=>'birthdate','type'=>'xsd:string'), - 'jobtitle'=> array('name'=>'jobtitle','type'=>'xsd:string'), - 'department'=> array('name'=>'department','type'=>'xsd:string'), - 'title' => array('name'=>'title','type'=>'xsd:string'), - 'officephone'=> array('name'=>'officephone','type'=>'xsd:string'), - 'homephone'=> array('name'=>'homephone','type'=>'xsd:string'), - 'otherphone'=> array('name'=>'otherphone','type'=>'xsd:string'), - 'fax'=> array('name'=>'fax','type'=>'xsd:string'), - 'mobile'=> array('name'=>'mobile','type'=>'xsd:string'), - 'asstname'=> array('name'=>'asstname','type'=>'xsd:string'), - 'asstphone'=> array('name'=>'asstphone','type'=>'xsd:string'), - 'reportsto'=> array('name'=>'reportsto','type'=>'xsd:string'), - 'mailingstreet'=> array('name'=>'mailingstreet','type'=>'xsd:string'), - 'mailingcity'=> array('name'=>'mailingcity','type'=>'xsd:string'), - 'mailingstate'=> array('name'=>'mailingstate','type'=>'xsd:string'), - 'mailingzip'=> array('name'=>'mailingzip','type'=>'xsd:string'), - 'mailingcountry'=> array('name'=>'mailingcountry','type'=>'xsd:string'), - 'otherstreet'=> array('name'=>'otherstreet','type'=>'xsd:string'), - 'othercity'=> array('name'=>'othercity','type'=>'xsd:string'), - 'otherstate'=> array('name'=>'otherstate','type'=>'xsd:string'), - 'otherzip'=> array('name'=>'otherzip','type'=>'xsd:string'), - 'othercountry'=> array('name'=>'othercountry','type'=>'xsd:string'), - 'description'=> array('name'=>'description','type'=>'xsd:string'), - 'category'=> array('name'=>'category','type'=>'xsd:string'), - ) -); - -$server->wsdl->addComplexType( - 'contactdetails', - 'complexType', - 'array', - '', - 'SOAP-ENC:Array', - array(), - array( - array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:contactdetail[]') - ), - 'tns:contactdetail' -); - - -function SearchContactsByEmail($username,$emailaddress) -{ - require_once('modules/Contacts/Contacts.php'); - - $seed_contact = new Contacts(); - $output_list = Array(); - - $response = $seed_contact->get_searchbyemailid($username,$emailaddress); - $contactList = $response['list']; - - // create a return array of names and email addresses. - foreach($contactList as $contact) - { - $output_list[] = Array( - "id" => $contact[contactid], - "firstname" => $contact[firstname], - "lastname" => $contact[lastname], - "emailaddress" => $contact[email], - "accountname" => $contact[accountname], - ); - } - - //to remove an erroneous compiler warning - $seed_contact = $seed_contact; - return $output_list; -} - -function track_email($user_name, $contact_ids, $date_sent, $email_subject, $email_body) -{ - global $adb; - require_once('modules/Users/Users.php'); - require_once('modules/Emails/Emails.php'); - - $seed_user = new Users(); - $user_id = $seed_user->retrieve_user_id($user_name); - - $email = new Emails(); - //$log->debug($msgdtls['contactid']); - $emailbody = str_replace("'", "''", $email_body); - $emailsubject = str_replace("'", "''",$email_subject); - $datesent = getDisplayDate($date_sent); - - $email->column_fields[subject] = $emailsubject; - $email->column_fields[assigned_user_id] = $user_id; - $email->column_fields[date_start] = $datesent; - $email->column_fields[description] = htmlentities($emailbody); - $email->column_fields[activitytype] = 'Emails'; - $email->plugin_save = true; - $email->save("Emails"); - - $email->set_emails_contact_invitee_relationship($email->id,$contact_ids); - $email->set_emails_se_invitee_relationship($email->id,$contact_ids); - $email->set_emails_user_invitee_relationship($email->id,$user_id); - $sql = "select email from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted =0 and vtiger_contactdetails.contactid='".$contact_ids."'"; - $result = $adb->query($sql); - $camodulerow = $adb->fetch_array($result); - if(isset($camodulerow)) - { - $emailid = $camodulerow["email"]; - $query = 'insert into vtiger_emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$contact_ids."@77|".'","THUNDERBIRD")'; - $adb->query($query); - } - return $email->id; -} - - -function GetContacts($username) -{ - global $adb; - global $log; - require_once('modules/Contacts/Contacts.php'); - - $seed_contact = new Contacts(); - $output_list = Array(); - - $query = $seed_contact->get_contactsforol($username); - $result = $adb->query($query); - - while($contact = $adb->fetch_array($result)) - { - if($contact["birthdate"] == "0000-00-00") - { - $contact["birthdate"] = ""; - } - if($contact["salutation"] == "--None--") - { - $contact["salutation"] = ""; - } - - $namelist = explode(" ", $contact["lastname"]); - if(isset($namelist)) - { - if(count($namelist) >= 2) - { - $contact["lastname"] = $namelist[count($namelist)-1]; - for($i=0; $i $contact["id"], - "title" => $contact["salutation"], - "firstname" => $contact["firstname"], - "middlename" => trim($middlename), - "lastname" => trim($contact["lastname"]), - "birthdate" => $contact["birthday"], - "emailaddress" => $contact["email"], - "jobtitle" => $contact["title"], - "department" => $contact["department"], - "accountname" => $contact["accountname"], - "officephone" => $contact["phone"], - "homephone" => $contact["homephone"], - "otherphone" => $contact["otherphone"], - "fax" => $contact["fax"], - "mobile" => $contact["mobile"], - "asstname" => $contact["assistant"], - "asstphone" => $contact["assistantphone"], - "reportsto" => $contact["reports_to_name"], - "mailingstreet" => $contact["mailingstreet"], - "mailingcity" => $contact["mailingcity"], - "mailingstate" => $contact["mailingstate"], - "mailingzip" => $contact["mailingzip"], - "mailingcountry" => $contact["mailingcountry"], - "otherstreet" => $contact["otherstreet"], - "othercity" => $contact["othercity"], - "otherstate" => $contact["otherstate"], - "otherzip" => $contact["otherzip"], - "othercountry" => $contact["othercountry"], - "description" => "", - "category" => "", - ); - } - //to remove an erroneous compiler warning - $seed_contact = $seed_contact; - return $output_list; -} - -function retrieve_account_id($account_name,$user_id) -{ - - if($account_name=="") - { - return null; - } - - $query = "select vtiger_account.accountname accountname,vtiger_account.accountid accountid from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_account.accountname='" .$account_name."'"; - - - $db = new PearDatabase(); - $result= $db->query($query) or die ("Not able to execute insert"); - - $rows_count = $db->getRowCount($result); - if($rows_count==0) - { - require_once('modules/Accounts/Accounts.php'); - $account = new Accounts(); - $account->column_fields[accountname] = $account_name; - $account->column_fields[assigned_user_id]=$user_id; - //$account->saveentity("Accounts"); - $account->save("Accounts"); - //mysql_close(); - return $account->id; - } - else if ($rows_count==1) - { - $row = $db->fetchByAssoc($result, 0); - //mysql_close(); - return $row["accountid"]; - } - else - { - $row = $db->fetchByAssoc($result, 0); - //mysql_close(); - return $row["accountid"]; - } - -} - -function AddContact($user_name, $first_name, $last_name, $email_address ,$account_name , $salutation , $title, $phone_mobile, $reports_to,$primary_address_street,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country,$alt_address_city,$alt_address_street,$alt_address_state,$alt_address_postalcode,$alt_address_country,$office_phone="",$home_phone="",$fax="",$department="",$description="") -{ - global $adb; - global $current_user; - require_once('modules/Users/Users.php'); - require_once('modules/Contacts/Contacts.php'); - - $seed_user = new Users(); - $user_id = $seed_user->retrieve_user_id($user_name); - $current_user = $seed_user; - $current_user->retrieve_entity_info($user_id,"Users"); - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) - { - $sql1 = "select fieldname,columnname from vtiger_field where tabid=4 and block <> 75 and block <> 6 and block <> 5"; - }else - { - $profileList = getCurrentUserProfileList(); - $sql1 = "select fieldname,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=4 and vtiger_field.block <> 75 and vtiger_field.block <> 6 and vtiger_field.block <> 5 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; - } - $result1 = $adb->query($sql1); - for($i=0;$i < $adb->num_rows($result1);$i++) - { - $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); - } - - $contact = new Contacts(); - $contact->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $first_name : ""; - $contact->column_fields[lastname]=in_array('lastname',$permitted_lists) ? $last_name : ""; - $contact->column_fields[birthday]=in_array('birthday',$permitted_lists) ? getDisplayDate("0000-00-00") : ""; - $contact->column_fields[email]=in_array('email',$permitted_lists) ? $email_address : ""; - $contact->column_fields[title]=in_array('title',$permitted_lists) ? $title : ""; - $contact->column_fields[department]=in_array('department',$permitted_lists) ? $department : ""; - $contact->column_fields[account_id]=in_array('account_id',$permitted_lists) ? retrieve_account_id($account_name,$user_id) : ""; - $contact->column_fields[phone]=in_array('phone',$permitted_lists) ? $office_phone : ""; - $contact->column_fields[homephone]=in_array('homephone',$permitted_lists) ? $home_phone : ""; - $contact->column_fields[fax]=in_array('fax',$permitted_lists) ? $fax : ""; - $contact->column_fields[mobile]=in_array('mobile',$permitted_lists) ? $phone_mobile : ""; - $contact->column_fields[mailingstreet]=in_array('mailingstreet',$permitted_lists) ? $primary_address_street : ""; - $contact->column_fields[mailingcity]=in_array('mailingcity',$permitted_lists) ? $primary_address_city : ""; - $contact->column_fields[mailingstate]=in_array('mailingstate',$permitted_lists) ? $primary_address_state : ""; - $contact->column_fields[mailingzip]=in_array('mailingzip',$permitted_lists) ? $primary_address_postalcode : ""; - $contact->column_fields[mailingcountry]=in_array('mailingcountry',$permitted_lists) ? $primary_address_country : ""; - $contact->column_fields[otherstreet]=in_array('otherstreet',$permitted_lists) ? $alt_address_street : ""; - $contact->column_fields[othercity]=in_array('othercity',$permitted_lists) ? $alt_address_city : ""; - $contact->column_fields[otherstate]=in_array('otherstate',$permitted_lists) ? $alt_address_state : ""; - $contact->column_fields[otherzip]=in_array('otherzip',$permitted_lists) ? $alt_address_postalcode : ""; - $contact->column_fields[othercountry]=in_array('othercountry',$permitted_lists) ? $alt_address_country : ""; - $contact->column_fields[assigned_user_id]=in_array('assigned_user_id',$permitted_lists) ? $user_id : ""; - $contact->column_fields[description]= ""; - $contact->save("Contacts"); - - $contact = $contact; - return $contact->id; -} - -function AddLead($user_name, $first_name, $last_name, $email_address ,$account_name , $salutation , $title, $phone_mobile, $reports_to ,$primary_address_street , $website ,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country,$alt_address_city,$alt_address_street,$alt_address_state,$alt_address_postalcode,$alt_address_country,$office_phone="",$home_phone="",$fax="",$department="",$description="") -{ - global $adb; - global $current_user; - require_once('modules/Users/Users.php'); - require_once('modules/Leads/Leads.php'); - - $seed_user = new Users(); - $user_id = $seed_user->retrieve_user_id($user_name); - $current_user = $seed_user; - $current_user->retrieve_entity_info($user_id,"Users"); - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) - { - $sql1 = "select fieldname,columnname from vtiger_field where tabid=7 and block <> 14"; - }else - { - $profileList = getCurrentUserProfileList(); - $sql1 = "select fieldname,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=7 and vtiger_field.block <> 14 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; - } - $result1 = $adb->query($sql1); - for($i=0;$i < $adb->num_rows($result1);$i++) - { - $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); - } - - $Lead = new Leads(); - $Lead->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $first_name : ""; - $Lead->column_fields[lastname]=in_array('lastname',$permitted_lists) ? $last_name : ""; - $Lead->column_fields[birthday]=in_array('birthday',$permitted_lists) ? getDisplayDate("0000-00-00") : ""; - $Lead->column_fields[company]=in_array('company',$permitted_lists) ? $account_name : ""; - $Lead->column_fields[email]=in_array('email',$permitted_lists) ? $email_address : ""; - $Lead->column_fields[title]=in_array('title',$permitted_lists) ? $title : ""; - $Lead->column_fields[designation]=in_array('designation',$permitted_lists) ? $department : ""; - $Lead->column_fields[phone]=in_array('phone',$permitted_lists) ? $office_phone : ""; - $Lead->column_fields[homephone]=in_array('homephone',$permitted_lists) ? $home_phone : ""; - $Lead->column_fields[website]=in_array('website',$permitted_lists) ? $website : ""; - $Lead->column_fields[fax]=in_array('fax',$permitted_lists) ? $fax : ""; - $Lead->column_fields[mobile]=in_array('mobile',$permitted_lists) ? $phone_mobile : ""; - $Lead->column_fields[mailingstreet]=in_array('mailingstreet',$permitted_lists) ? $primary_address_street : ""; - $Lead->column_fields[mailingcity]=in_array('mailingcity',$permitted_lists) ? $primary_address_city : ""; - $Lead->column_fields[mailingstate]=in_array('mailingstate',$permitted_lists) ? $primary_address_state : ""; - $Lead->column_fields[mailingzip]=in_array('mailingzip',$permitted_lists) ? $primary_address_postalcode : ""; - $Lead->column_fields[workCountry]=in_array('mailingcountry',$permitted_lists) ? $workCountry : ""; - $Lead->column_fields[street]=in_array('street',$permitted_lists) ? $alt_address_street : ""; - $Lead->column_fields[city]=in_array('city',$permitted_lists) ? $alt_address_city : ""; - $Lead->column_fields[state]=in_array('state',$permitted_lists) ? $alt_address_state : ""; - $Lead->column_fields[code]=in_array('code',$permitted_lists) ? $alt_address_postalcode : ""; - $Lead->column_fields[country]=in_array('country',$permitted_lists) ? $alt_address_country : ""; - $Lead->column_fields[assigned_user_id]=in_array('assigned_user_id',$permitted_lists) ? $user_id : ""; - $Lead->column_fields[description]= ""; -// $log->fatal($Lead->column_fields); - $Lead->save("Leads"); - - $Lead = $Lead; - return $Lead->id; -} - -function create_session($user_name, $password) -{ - global $adb,$log; - $return_access = 'failure'; - require_once('modules/Users/Users.php'); - $objuser = new Users(); - if($password != "" && $user_name != '') - { - $objuser->column_fields['user_name'] = $user_name; - $encrypted_password = $objuser->encrypt_password($password); - $query = "select id from vtiger_users where user_name='$user_name' and user_password='$encrypted_password'"; - $result = $adb->query($query); - if($adb->num_rows($result) > 0) - { - $return_access = 'success'; - $log->debug("Logged in sucessfully from thunderbirdplugin"); - }else - { - $return_access = 'failure'; - $log->debug("Logged in failure from thunderbirdplugin"); - } - }else - { - $return_access = 'failure'; - $log->debug("Logged in failure from thunderbirdplugin"); - } - return $return_access; -} - -function end_session($user_name) -{ - return "Success"; -} - -function CheckContactPerm($user_name) -{ - global $current_user; - require_once('modules/Users/Users.php'); - $seed_user = new Users(); - $user_id = $seed_user->retrieve_user_id($user_name); - $current_user = $seed_user; - $current_user->retrieve_entity_info($user_id,"Users"); - if(isPermitted("Contacts","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -function CheckContactViewPerm($user_name) -{ - global $current_user,$log; - require_once('modules/Users/Users.php'); - $seed_user = new Users(); - $user_id = $seed_user->retrieve_user_id($user_name); - $current_user = $seed_user; - $current_user->retrieve_entity_info($user_id,"Users"); - if(isPermitted("Contacts","index") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -$server->service($HTTP_RAW_POST_DATA); -exit(); -?> +configureWSDL('vtigersoap'); + +$server->register( + 'create_session', + array('user_name'=>'xsd:string','password'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'end_session', + array('user_name'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'SearchContactsByEmail', + array('username'=>'xsd:string','emailaddress'=>'xsd:string'), + array('return'=>'tns:contactdetails'), + $NAMESPACE); + +$server->register( + 'GetContacts', + array('username'=>'xsd:string'), + array('return'=>'tns:contactdetails'), + $NAMESPACE); + +$server->register( + 'CheckContactPerm',array('user_name'=>'xsd:string'),array('return'=>'xsd:string'),$NAMESPACE); + +$server->register( + 'CheckContactViewPerm',array('user_name'=>'xsd:string'),array('return'=>'xsd:string'),$NAMESPACE); + +$server->register( + 'CheckLeadViewPerm',array('user_name'=>'xsd:string'),array('return'=>'xsd:string'),$NAMESPACE); + +$server->register( + 'AddContact', + array('user_name'=>'xsd:string', + 'first_name'=>'xsd:string', + 'last_name'=>'xsd:string', + 'email_address'=>'xsd:string', + 'account_name'=>'xsd:string', + 'salutation'=>'xsd:string', + 'title'=>'xsd:string', + 'phone_mobile'=>'xsd:string', + 'reports_to'=>'xsd:string', + 'primary_address_street'=>'xsd:string', + 'primary_address_city'=>'xsd:string', + 'primary_address_state'=>'xsd:string' , + 'primary_address_postalcode'=>'xsd:string', + 'primary_address_country'=>'xsd:string', + 'alt_address_city'=>'xsd:string', + 'alt_address_street'=>'xsd:string', + 'alt_address_state'=>'xsd:string', + 'alt_address_postalcode'=>'xsd:string', + 'alt_address_country'=>'xsd:string', + 'office_phone'=>'xsd:string', + 'home_phone'=>'xsd:string', + 'fax'=>'xsd:string', + 'department'=>'xsd:string', + 'description'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'AddLead', + array('user_name'=>'xsd:string', + 'first_name'=>'xsd:string', + 'last_name'=>'xsd:string', + 'email_address'=>'xsd:string', + 'account_name'=>'xsd:string', + 'salutation'=>'xsd:string', + 'title'=>'xsd:string', + 'phone_mobile'=>'xsd:string', + 'reports_to'=>'xsd:string', + 'primary_address_street'=>'xsd:string', + 'primary_address_city'=>'xsd:string', + 'primary_address_state'=>'xsd:string' , + 'primary_address_postalcode'=>'xsd:string', + 'primary_address_country'=>'xsd:string', + 'alt_address_city'=>'xsd:string', + 'alt_address_street'=>'xsd:string', + 'alt_address_state'=>'xsd:string', + 'alt_address_postalcode'=>'xsd:string', + 'alt_address_country'=>'xsd:string', + 'office_phone'=>'xsd:string', + 'home_phone'=>'xsd:string', + 'fax'=>'xsd:string', + 'department'=>'xsd:string', + 'description'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'track_email', + array('user_name'=>'xsd:string', 'contact_ids'=>'xsd:string', 'date_sent'=>'xsd:date', 'email_subject'=>'xsd:string', 'email_body'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->wsdl->addComplexType( + 'contactdetail', + 'complexType', + 'struct', + 'all', + '', + array( + 'id' => array('name'=>'id','type'=>'xsd:string'), + 'firstname' => array('name'=>'firstname','type'=>'xsd:string'), + 'lastname' => array('name'=>'lastname','type'=>'xsd:string'), + 'emailaddress' => array('name'=>'emailaddress','type'=>'xsd:string'), + 'accountname' => array('name'=>'accountname','type'=>'xsd:string'), + 'middlename' => array('name'=>'middlename','type'=>'xsd:string'), + 'birthdate'=> array('name'=>'birthdate','type'=>'xsd:string'), + 'jobtitle'=> array('name'=>'jobtitle','type'=>'xsd:string'), + 'department'=> array('name'=>'department','type'=>'xsd:string'), + 'title' => array('name'=>'title','type'=>'xsd:string'), + 'officephone'=> array('name'=>'officephone','type'=>'xsd:string'), + 'homephone'=> array('name'=>'homephone','type'=>'xsd:string'), + 'otherphone'=> array('name'=>'otherphone','type'=>'xsd:string'), + 'fax'=> array('name'=>'fax','type'=>'xsd:string'), + 'mobile'=> array('name'=>'mobile','type'=>'xsd:string'), + 'asstname'=> array('name'=>'asstname','type'=>'xsd:string'), + 'asstphone'=> array('name'=>'asstphone','type'=>'xsd:string'), + 'reportsto'=> array('name'=>'reportsto','type'=>'xsd:string'), + 'mailingstreet'=> array('name'=>'mailingstreet','type'=>'xsd:string'), + 'mailingcity'=> array('name'=>'mailingcity','type'=>'xsd:string'), + 'mailingstate'=> array('name'=>'mailingstate','type'=>'xsd:string'), + 'mailingzip'=> array('name'=>'mailingzip','type'=>'xsd:string'), + 'mailingcountry'=> array('name'=>'mailingcountry','type'=>'xsd:string'), + 'otherstreet'=> array('name'=>'otherstreet','type'=>'xsd:string'), + 'othercity'=> array('name'=>'othercity','type'=>'xsd:string'), + 'otherstate'=> array('name'=>'otherstate','type'=>'xsd:string'), + 'otherzip'=> array('name'=>'otherzip','type'=>'xsd:string'), + 'othercountry'=> array('name'=>'othercountry','type'=>'xsd:string'), + 'description'=> array('name'=>'description','type'=>'xsd:string'), + 'category'=> array('name'=>'category','type'=>'xsd:string'), + ) +); + +$server->wsdl->addComplexType( + 'contactdetails', + 'complexType', + 'array', + '', + 'SOAP-ENC:Array', + array(), + array( + array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:contactdetail[]') + ), + 'tns:contactdetail' +); + + +function SearchContactsByEmail($username,$emailaddress) +{ + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); + $output_list = Array(); + + $response = $seed_contact->get_searchbyemailid($username,$emailaddress); + $contactList = $response['list']; + + // create a return array of names and email addresses. + foreach($contactList as $contact) + { + $output_list[] = Array( + "id" => $contact[contactid], + "firstname" => $contact[firstname], + "lastname" => $contact[lastname], + "emailaddress" => $contact[email], + "accountname" => $contact[accountname], + ); + } + + //to remove an erroneous compiler warning + $seed_contact = $seed_contact; + return $output_list; +} + +function track_email($user_name, $contact_ids, $date_sent, $email_subject, $email_body) +{ + global $current_user; + global $adb; + global $log; + require_once('modules/Users/Users.php'); + require_once('modules/Emails/Emails.php'); + + $current_user = new Users(); + $user_id = $current_user->retrieve_user_id($user_name); + $query = "select email1 from vtiger_users where id =".$user_id; + $result = $adb->query($query); + $user_emailid = $adb->query_result($result,0,"email1"); + $current_user = $current_user->retrieveCurrentUserInfoFromFile($user_id); + $email = new Emails(); + //$log->debug($msgdtls['contactid']); + $emailbody = str_replace("'", "''", $email_body); + $emailsubject = str_replace("'", "''",$email_subject); + $datesent = getDisplayDate($date_sent); + + $email->column_fields[subject] = $emailsubject; + $email->column_fields[assigned_user_id] = $user_id; + $email->column_fields[date_start] = $datesent; + $email->column_fields[description] = htmlentities($emailbody); + $email->column_fields[activitytype] = 'Emails'; + $email->plugin_save = true; + $email->save("Emails"); + $query = "select fieldid from vtiger_field where fieldname = 'email' and tabid = 4"; + $result = $adb->query($query); + $field_id = $adb->query_result($result,0,"fieldid"); + $email->set_emails_contact_invitee_relationship($email->id,$contact_ids); + $email->set_emails_se_invitee_relationship($email->id,$contact_ids); + $email->set_emails_user_invitee_relationship($email->id,$user_id); + $sql = "select email from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted =0 and vtiger_contactdetails.contactid='".$contact_ids."'"; + $result = $adb->query($sql); + $camodulerow = $adb->fetch_array($result); + if(isset($camodulerow)) + { + $emailid = $camodulerow["email"]; + $query = 'insert into vtiger_emaildetails values ('.$email->id.',"'.$emailid.'","'.$user_emailid.'","","","","'.$user_id.'@-1|'.$contact_ids.'@'.$field_id.'|","THUNDERBIRD")'; + $adb->query($query); + } + return $email->id; +} + + +function GetContacts($username) +{ + global $adb; + global $log; + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); + $output_list = Array(); + + $query = $seed_contact->get_contactsforol($username); + $result = $adb->query($query); + + while($contact = $adb->fetch_array($result)) + { + if($contact["birthdate"] == "0000-00-00") + { + $contact["birthdate"] = ""; + } + if($contact["salutation"] == "--None--") + { + $contact["salutation"] = ""; + } + + $namelist = explode(" ", $contact["lastname"]); + if(isset($namelist)) + { + if(count($namelist) >= 2) + { + $contact["lastname"] = $namelist[count($namelist)-1]; + for($i=0; $i $contact["id"], + "title" => $contact["salutation"], + "firstname" => $contact["firstname"], + "middlename" => trim($middlename), + "lastname" => trim($contact["lastname"]), + "birthdate" => $contact["birthday"], + "emailaddress" => $contact["email"], + "jobtitle" => $contact["title"], + "department" => $contact["department"], + "accountname" => $contact["accountname"], + "officephone" => $contact["phone"], + "homephone" => $contact["homephone"], + "otherphone" => $contact["otherphone"], + "fax" => $contact["fax"], + "mobile" => $contact["mobile"], + "asstname" => $contact["assistant"], + "asstphone" => $contact["assistantphone"], + "reportsto" => $contact["reports_to_name"], + "mailingstreet" => $contact["mailingstreet"], + "mailingcity" => $contact["mailingcity"], + "mailingstate" => $contact["mailingstate"], + "mailingzip" => $contact["mailingzip"], + "mailingcountry" => $contact["mailingcountry"], + "otherstreet" => $contact["otherstreet"], + "othercity" => $contact["othercity"], + "otherstate" => $contact["otherstate"], + "otherzip" => $contact["otherzip"], + "othercountry" => $contact["othercountry"], + "description" => "", + "category" => "", + ); + } + //to remove an erroneous compiler warning + $seed_contact = $seed_contact; + return $output_list; +} + +function retrieve_account_id($account_name,$user_id) +{ + + if($account_name=="") + { + return null; + } + + $query = "select vtiger_account.accountname accountname,vtiger_account.accountid accountid from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_account.accountname='" .$account_name."'"; + + + $db = new PearDatabase(); + $result= $db->query($query) or die ("Not able to execute insert"); + + $rows_count = $db->getRowCount($result); + if($rows_count==0) + { + require_once('modules/Accounts/Accounts.php'); + $account = new Accounts(); + $account->column_fields[accountname] = $account_name; + $account->column_fields[assigned_user_id]=$user_id; + //$account->saveentity("Accounts"); + $account->save("Accounts"); + //mysql_close(); + return $account->id; + } + else if ($rows_count==1) + { + $row = $db->fetchByAssoc($result, 0); + //mysql_close(); + return $row["accountid"]; + } + else + { + $row = $db->fetchByAssoc($result, 0); + //mysql_close(); + return $row["accountid"]; + } + +} + +function AddContact($user_name, $first_name, $last_name, $email_address ,$account_name , $salutation , $title, $phone_mobile, $reports_to,$primary_address_street,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country,$alt_address_city,$alt_address_street,$alt_address_state,$alt_address_postalcode,$alt_address_country,$office_phone="",$home_phone="",$fax="",$department="",$description="") +{ + global $adb; + global $current_user; + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.php'); + + $seed_user = new Users(); + $user_id = $seed_user->retrieve_user_id($user_name); + $current_user = $seed_user; + $current_user->retrieve_entity_info($user_id,"Users"); + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) + { + $sql1 = "select fieldname,columnname from vtiger_field where tabid=4 and block <> 75 and block <> 6 and block <> 5"; + }else + { + $profileList = getCurrentUserProfileList(); + $sql1 = "select fieldname,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=4 and vtiger_field.block <> 75 and vtiger_field.block <> 6 and vtiger_field.block <> 5 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; + } + $result1 = $adb->query($sql1); + for($i=0;$i < $adb->num_rows($result1);$i++) + { + $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); + } + + $contact = new Contacts(); + $contact->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $first_name : ""; + $contact->column_fields[lastname]=in_array('lastname',$permitted_lists) ? $last_name : ""; + $contact->column_fields[email]=in_array('email',$permitted_lists) ? $email_address : ""; + $contact->column_fields[title]=in_array('title',$permitted_lists) ? $title : ""; + $contact->column_fields[department]=in_array('department',$permitted_lists) ? $department : ""; + $contact->column_fields[account_id]=in_array('account_id',$permitted_lists) ? retrieve_account_id($account_name,$user_id) : ""; + $contact->column_fields[phone]=in_array('phone',$permitted_lists) ? $office_phone : ""; + $contact->column_fields[homephone]=in_array('homephone',$permitted_lists) ? $home_phone : ""; + $contact->column_fields[fax]=in_array('fax',$permitted_lists) ? $fax : ""; + $contact->column_fields[mobile]=in_array('mobile',$permitted_lists) ? $phone_mobile : ""; + $contact->column_fields[mailingstreet]=in_array('mailingstreet',$permitted_lists) ? $primary_address_street : ""; + $contact->column_fields[mailingcity]=in_array('mailingcity',$permitted_lists) ? $primary_address_city : ""; + $contact->column_fields[mailingstate]=in_array('mailingstate',$permitted_lists) ? $primary_address_state : ""; + $contact->column_fields[mailingzip]=in_array('mailingzip',$permitted_lists) ? $primary_address_postalcode : ""; + $contact->column_fields[mailingcountry]=in_array('mailingcountry',$permitted_lists) ? $primary_address_country : ""; + $contact->column_fields[otherstreet]=in_array('otherstreet',$permitted_lists) ? $alt_address_street : ""; + $contact->column_fields[othercity]=in_array('othercity',$permitted_lists) ? $alt_address_city : ""; + $contact->column_fields[otherstate]=in_array('otherstate',$permitted_lists) ? $alt_address_state : ""; + $contact->column_fields[otherzip]=in_array('otherzip',$permitted_lists) ? $alt_address_postalcode : ""; + $contact->column_fields[othercountry]=in_array('othercountry',$permitted_lists) ? $alt_address_country : ""; + $contact->column_fields[assigned_user_id]=in_array('assigned_user_id',$permitted_lists) ? $user_id : ""; + $contact->column_fields[description]= ""; + $contact->save("Contacts"); + + $contact = $contact; + return $contact->id; +} + +function AddLead($user_name, $first_name, $last_name, $email_address ,$account_name , $salutation , $title, $phone_mobile, $reports_to ,$primary_address_street , $website ,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country,$alt_address_city,$alt_address_street,$alt_address_state,$alt_address_postalcode,$alt_address_country,$office_phone="",$home_phone="",$fax="",$department="",$description="") +{ + global $adb; + global $current_user; + require_once('modules/Users/Users.php'); + require_once('modules/Leads/Leads.php'); + + $seed_user = new Users(); + $user_id = $seed_user->retrieve_user_id($user_name); + $current_user = $seed_user; + $current_user->retrieve_entity_info($user_id,"Users"); + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) + { + $sql1 = "select fieldname,columnname from vtiger_field where tabid=7 and block <> 14"; + }else + { + $profileList = getCurrentUserProfileList(); + $sql1 = "select fieldname,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=7 and vtiger_field.block <> 14 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; + } + $result1 = $adb->query($sql1); + for($i=0;$i < $adb->num_rows($result1);$i++) + { + $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); + } + + $Lead = new Leads(); + $Lead->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $first_name : ""; + $Lead->column_fields[lastname]=in_array('lastname',$permitted_lists) ? $last_name : ""; + $Lead->column_fields[company]=in_array('company',$permitted_lists) ? $account_name : ""; + $Lead->column_fields[email]=in_array('email',$permitted_lists) ? $email_address : ""; + $Lead->column_fields[title]=in_array('title',$permitted_lists) ? $title : ""; + $Lead->column_fields[designation]=in_array('designation',$permitted_lists) ? $department : ""; + $Lead->column_fields[phone]=in_array('phone',$permitted_lists) ? $office_phone : ""; + $Lead->column_fields[homephone]=in_array('homephone',$permitted_lists) ? $home_phone : ""; + $Lead->column_fields[website]=in_array('website',$permitted_lists) ? $website : ""; + $Lead->column_fields[fax]=in_array('fax',$permitted_lists) ? $fax : ""; + $Lead->column_fields[mobile]=in_array('mobile',$permitted_lists) ? $phone_mobile : ""; + $Lead->column_fields[mailingstreet]=in_array('mailingstreet',$permitted_lists) ? $primary_address_street : ""; + $Lead->column_fields[mailingcity]=in_array('mailingcity',$permitted_lists) ? $primary_address_city : ""; + $Lead->column_fields[mailingstate]=in_array('mailingstate',$permitted_lists) ? $primary_address_state : ""; + $Lead->column_fields[mailingzip]=in_array('mailingzip',$permitted_lists) ? $primary_address_postalcode : ""; + $Lead->column_fields[workCountry]=in_array('mailingcountry',$permitted_lists) ? $workCountry : ""; + $Lead->column_fields[street]=in_array('street',$permitted_lists) ? $alt_address_street : ""; + $Lead->column_fields[city]=in_array('city',$permitted_lists) ? $alt_address_city : ""; + $Lead->column_fields[state]=in_array('state',$permitted_lists) ? $alt_address_state : ""; + $Lead->column_fields[code]=in_array('code',$permitted_lists) ? $alt_address_postalcode : ""; + $Lead->column_fields[country]=in_array('country',$permitted_lists) ? $alt_address_country : ""; + $Lead->column_fields[assigned_user_id]=in_array('assigned_user_id',$permitted_lists) ? $user_id : ""; + $Lead->column_fields[description]= ""; +// $log->fatal($Lead->column_fields); + $Lead->save("Leads"); + + $Lead = $Lead; + return $Lead->id; +} + +function create_session($user_name, $password) +{ + global $adb,$log; + $return_access = 'failure'; + require_once('modules/Users/Users.php'); + $objuser = new Users(); + if($password != "" && $user_name != '') + { + $objuser->column_fields['user_name'] = $user_name; + $encrypted_password = $objuser->encrypt_password($password); + if($objuser->load_user($password) && $objuser->is_authenticated()) + { + $query = "select id from vtiger_users where user_name='$user_name' and user_password='$encrypted_password'"; + $result = $adb->query($query); + if($adb->num_rows($result) > 0) + { + $return_access = 'success'; + $log->debug("Logged in sucessfully from thunderbirdplugin"); + }else + { + $return_access = 'failure'; + $log->debug("Logged in failure from thunderbirdplugin"); + } + } + }else + { + $return_access = 'failure'; + $log->debug("Logged in failure from thunderbirdplugin"); + } + return $return_access; +} + +function end_session($user_name) +{ + return "Success"; +} + +function CheckContactPerm($user_name) +{ + global $current_user; + require_once('modules/Users/Users.php'); + $seed_user = new Users(); + $user_id = $seed_user->retrieve_user_id($user_name); + $current_user = $seed_user; + $current_user->retrieve_entity_info($user_id,"Users"); + if(isPermitted("Contacts","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + +function CheckContactViewPerm($user_name) +{ + global $current_user,$log; + require_once('modules/Users/Users.php'); + $seed_user = new Users(); + $user_id = $seed_user->retrieve_user_id($user_name); + $current_user = $seed_user; + $current_user->retrieve_entity_info($user_id,"Users"); + if(isPermitted("Contacts","index") == "yes") + { + if(isPermitted("Emails","EditView") == "yes") + { + return "allowed"; + } + else + { + return "email"; + } + }else + { + return "contact"; + } +} + +function CheckLeadViewPerm($user_name) +{ + global $current_user,$log; + require_once('modules/Users/Users.php'); + $seed_user = new Users(); + $user_id = $seed_user->retrieve_user_id($user_name); + $current_user = $seed_user; + $current_user->retrieve_entity_info($user_id,"Users"); + if(isPermitted("Leads","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} +$server->service($HTTP_RAW_POST_DATA); +exit(); +?> Modified: vtigercrm/branches/5.1_jens/soap/vtigerolservice.php ============================================================================== --- vtigercrm/branches/5.1_jens/soap/vtigerolservice.php (original) +++ vtigercrm/branches/5.1_jens/soap/vtigerolservice.php Mon Apr 16 12:27:44 2007 @@ -307,12 +307,17 @@ function AddMessageToContact($username,$contactid,$msgdtls) { + global $current_user; global $adb; require_once('modules/Users/Users.php'); require_once('modules/Emails/Emails.php'); - $seed_user = new Users(); - $user_id = $seed_user->retrieve_user_id($username); + $current_user = new Users(); + $user_id = $current_user->retrieve_user_id($username); + $query = "select email1 from vtiger_users where id =".$user_id; + $result = $adb->query($query); + $user_emailid = $adb->query_result($result,0,"email1"); + $current_user = $current_user->retrieveCurrentUserInfoFromFile($user_id); foreach($msgdtls as $msgdtl) { @@ -331,17 +336,19 @@ $email->column_fields[activitytype] = 'Emails'; $email->plugin_save = true; $email->save("Emails"); - + $query = "select fieldid from vtiger_field where fieldname = 'email' and tabid = 4"; + $result = $adb->query($query); + $field_id = $adb->query_result($result,0,"fieldid"); $email->set_emails_contact_invitee_relationship($email->id,$contactid); $email->set_emails_se_invitee_relationship($email->id,$contactid); - $email->set_emails_user_invitee_relationship($email->id,$user_id); + $email->set_emails_user_invitee_relationship($email->id,$user_id); $sql = "select email from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted =0 and vtiger_contactdetails.contactid='".$contactid."'"; $result = $adb->query($sql); $camodulerow = $adb->fetch_array($result); if(isset($camodulerow)) { $emailid = $camodulerow["email"]; - $query = 'insert into vtiger_emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$contactid."@77|".'","OUTLOOK")'; + $query = 'insert into vtiger_emaildetails values ('.$email->id.',"'.$emailid.'","'.$user_emailid.'","","","","'.$user_id.'@-1|'.$contactid.'@'.$field_id.'|","OUTLOOK")'; $adb->query($query); } return $email->id; @@ -353,31 +360,36 @@ } } -function LoginToVtiger($userid,$password) -{ +function LoginToVtiger($userid,$password,$version) +{ + global $log; global $adb; + $log->DEBUG("Entered into vtigerCRM with userid".$userid." and Version".$version); + include('vtigerversion.php'); + if($version != $vtiger_current_version) + { + return "VERSION"; + } require_once('modules/Users/Users.php'); - $return_access = "FALSE"; - $objuser = new Users(); - if($password != "") { $objuser->column_fields['user_name'] = $userid; $objuser->load_user($password); if($objuser->is_authenticated()) { - $return_access = "TRUE"; + $return_access = "TRUES"; }else { - $return_access = "FALSE"; + $return_access = "LOGIN"; } }else { //$server->setError("Invalid username and/or password"); $return_access = "FALSE"; } +$log->DEBUG("The return access to outlook was ".$return_access." from vtigerCRM"); $objuser = $objuser; return $return_access; } @@ -391,7 +403,7 @@ $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); - if(isPermitted("Emails","EditView") == "yes") + if(isPermitted("Emails","EditView") == "yes" && (isPermitted("Contacts","index") == 'yes')) { return "allowed"; }else @@ -595,7 +607,7 @@ { if(isset($cntrow)) { - $contact->column_fields[salutation]=in_array('salutation',$permitted_lists) ? $cntrow["title"] : ""; + $contact->column_fields[salutationtype]=in_array('salutationtype',$permitted_lists) ? $cntrow["title"] : ""; $contact->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $cntrow["firstname"] : ""; if($cntrow["middlename"] != "") @@ -677,7 +689,7 @@ if(isset($cntrow)) { $contact->retrieve_entity_info($cntrow["id"],"Contacts"); - $contact->column_fields[salutation]=in_array('salutation',$permitted_lists) ? $cntrow["title"] : ""; + $contact->column_fields[salutationtype]=in_array('salutationtype',$permitted_lists) ? $cntrow["title"] : ""; $contact->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $cntrow["firstname"] : ""; if($cntrow["middlename"] != "") { @@ -751,7 +763,7 @@ return null; } - $query = "select vtiger_account.accountname accountname,vtiger_account.accountid accountid from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_account.accountname='" .$account_name."'"; + $query = "select vtiger_account.accountname accountname,vtiger_account.accountid accountid from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_account.accountname='" .addslashes($account_name)."'"; $db = new PearDatabase(); Modified: vtigercrm/branches/5.1_jens/soap/wordplugin.php ============================================================================== --- vtigercrm/branches/5.1_jens/soap/wordplugin.php (original) +++ vtigercrm/branches/5.1_jens/soap/wordplugin.php Mon Apr 16 12:27:44 2007 @@ -327,19 +327,22 @@ $objuser = new Users(); if($password != "" && $user_name != '') { - $objuser->column_fields['user_name'] = $user_name; - $encrypted_password = $objuser->encrypt_password($password); - $query = "select id from vtiger_users where user_name='$user_name' and user_password='$encrypted_password'"; - $result = $adb->query($query); - if($adb->num_rows($result) > 0) - { - $return_access = "TempSessionID"; - $log->debug("Logged in sucessfully from wordplugin"); - }else - { - $return_access = "false"; - $log->debug("Logged in failure from wordplugin"); - } + $objuser->column_fields['user_name'] = $user_name; + $encrypted_password = $objuser->encrypt_password($password); + if($objuser->load_user($password) && $objuser->is_authenticated()) + { + $query = "select id from vtiger_users where user_name='$user_name' and user_password='$encrypted_password'"; + $result = $adb->query($query); + if($adb->num_rows($result) > 0) + { + $return_access = "TempSessionID"; + $log->debug("Logged in sucessfully from wordplugin"); + }else + { + $return_access = "false"; + $log->debug("Logged in failure from wordplugin"); + } + } }else { $return_access = "false"; Modified: vtigercrm/branches/5.1_jens/tabdata.php ============================================================================== --- vtigercrm/branches/5.1_jens/tabdata.php (original) +++ vtigercrm/branches/5.1_jens/tabdata.php Mon Apr 16 12:27:44 2007 @@ -11,7 +11,7 @@ //This file contains the commonly used variables -$tab_info_array=array('Home'=>3,'Leads'=>7,'Accounts'=>6,'Contacts'=>4,'Potentials'=>2,'Notes'=>8,'Calendar'=>9,'Emails'=>10,'HelpDesk'=>13,'Products'=>14,'Dashboard'=>1,'Faq'=>15,'Events'=>16,'Vendors'=>18,'PriceBooks'=>19,'Quotes'=>20,'PurchaseOrder'=>21,'SalesOrder'=>22,'Invoice'=>23,'Rss'=>24,'Reports'=>25,'Campaigns'=>26,'Portal'=>27,'Webmails'=>28,); +$tab_info_array=array('Home'=>3,'Leads'=>7,'Accounts'=>6,'Contacts'=>4,'Potentials'=>2,'Notes'=>8,'Calendar'=>9,'Emails'=>10,'HelpDesk'=>13,'Products'=>14,'Dashboard'=>1,'Faq'=>15,'Events'=>16,'Vendors'=>18,'PriceBooks'=>19,'Quotes'=>20,'PurchaseOrder'=>21,'SalesOrder'=>22,'Invoice'=>23,'Rss'=>24,'Reports'=>25,'Campaigns'=>26,'Portal'=>27,'Webmails'=>28,'Users'=>29,); $tab_seq_array=array('3'=>0,'7'=>0,'6'=>0,'4'=>0,'2'=>0,'8'=>0,'9'=>0,'10'=>0,'13'=>0,'14'=>0,'1'=>0,'15'=>0,'16'=>2,'18'=>0,'19'=>0,'20'=>0,'21'=>0,'22'=>0,'23'=>0,'24'=>0,'25'=>0,'26'=>0,'27'=>0,'28'=>0,); ?> Modified: vtigercrm/branches/5.1_jens/themes/alphagrey/images/aboutUS.jpg ============================================================================== Binary files - no diff available. Modified: vtigercrm/branches/5.1_jens/themes/alphagrey/images/cal12x12Shared.gif ============================================================================== Binary files - no diff available. Modified: vtigercrm/branches/5.1_jens/themes/alphagrey/style.css ============================================================================== --- vtigercrm/branches/5.1_jens/themes/alphagrey/style.css (original) +++ vtigercrm/branches/5.1_jens/themes/alphagrey/style.css Mon Apr 16 12:27:44 2007 @@ -1,2219 +1,2284 @@ -/********************************************************************************* - -** The contents of this file are subject to the vtiger CRM Public License Version 1.0 - * ("License"); You may not use this file except in compliance with the License - * The Original Code is: vtiger CRM Open Source - * The Initial Developer of the Original Code is vtiger. - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - ********************************************************************************/ - - -/* ALPHA GRAY - COLOR THEME*/ - -.small { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; -} -.big { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 18px; - color: #000000; - font-weight:bold; -} - -.componentName { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - line-height: 18px; - color: #000; - font-weight:bold; - border-left:2px dotted #333; - padding:10px; -} - - -.genHeaderBig{ - font-family: Arial, Helvetica, sans-serif; - font-size: 16px; - line-height: 19px; - color: #000000; - font-weight:bold; -} -.genHeaderSmall{ - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 16px; - color: #000000; - font-weight:bold; - -} - -.moduleName { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - color: #000000; - font-weight:bold; -} - - -.hdrNameBg { - background:#ffffff url(images/hdrNameBg.gif) repeat-x; - - -} - -.hdrTabBg { - /*background:#ffffff url(images/hdrTabBg.gif) bottom repeat-x ;*/ - background-color:#dadada; -} - -.tabSelected { - background:#eeeeee url(images/tabSelectedBg.gif) repeat-x; - font-family: Arial, Helvetica, sans-serif; - font-weight:bold; - font-size: 11px; - padding-left:10px; - padding-right:10px; - padding-top:2px; - padding-bottom:2px; - -} - -.tabSelected a{ - color:white; -} - -.tabUnSelected { - - background: #eaeaea url(images/tabUnSelectedBg.gif) bottom repeat-x; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:10px; - padding-right:10px; - padding-top:2px; - padding-bottom:2px; - border-bottom:1px solid #ffffff; -} - -.tabUnSelected a{ - color:#000099; -} - -.tabSeperator { - background-color:#aaa; - width:1px; -} - - - -/*.level2text { - - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:15px; - padding-right:15px; - padding-top:5px; - padding-bottom:5px; - font-weight:bold; - color:white; -} - -.level2text a{ - text-decoration:none; - color:#555555; -} - -.level2text a:hover { - text-decoration:underline; - color:#555555; - -}*/ - - -.level2Bg { - /*background:#999 url(images/level2TabBg.gif) bottom repeat-x;*/ - background-color:#9a9a9a; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - border-bottom:1px dashed #fff; - color:white; -} - -.level2Bg a{ - /* background:#1F5BFF url(images/level2TabBg.gif) bottom repeat-x; */ - color:#fff; -} - - -.level2SelTab{ - font-weight:bold; - color:#000000; - padding-left:20px; - padding-right:20px; - padding-top:5px; - padding-bottom:5px; - -} - -.level2UnSelTab{ - color:#000000; - padding-left:20px; - padding-right:20px; - padding-top:5px; - padding-bottom:5px; -} -.sep1 { - background:#999999; -} - -.showPanelBg { - background:url(images/showPanelTopBg.gif) repeat-x; -} - -a { - text-decoration:none; - color:#000099; -} - -a:hover { - text-decoration:underline; -} - -.hdrLink { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - text-decoration:none; - color:#000099; - font-weight:bold; -} - -.hdrLink:hover { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - text-decoration:underline; - color:#000099; - font-weight:bold; -} - -.searchBox { - border: 0px solid #0000aa; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:2px; - width:100px; - background-color:#ffffef; -} - -.searchBtn { - border :0px #cccccc solid; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - font-weight:bold; - width:30px; - height:19px; - background-color:#555; - color:white; -} - - -/* List View Table classes starts +++++++++++++++++ */ - -.lvt { - background-color:#ccc; - border:1px solid #ccc; -} - -.lvtBg { -} - -.lvtHeaderText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - font-weight:bold; -} - -.lvtCol { - border-top:1px solid #eaeaea; - border-left:1px solid #eaeaea; - border-right:1px solid #999; - border-bottom:1px solid #999; - background-color:#ccc; - font-weight:bold; -} - -.lvtColData { - background-color:#ffffff; -} - -.lvtColDataHover { - background-color:#ffffee; - -} - - -/* List View Table classes ends --------------------------------*/ - - - -/* Detailed View classes starts +++++++++++++++++++++++ */ -.dvHeaderText{ - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - color:#000000; - font-weight:bold; - -} - -.dvInnerHeader{ - border-bottom:2px dotted #555; - padding:5px; - background-color:#dadada; - -} - -.dvtSelectedCell { - border-left:2px solid #aaaaaa; - border-top:2px solid #aaaaaa; - border-right:2px solid #aaaaaa; - padding-left:20px; - padding-right:20px; - background-color:white; - font-weight:bold; -} - -.dvtUnSelectedCell { - border-left:2px solid #aaaaaa; - border-top:2px solid #aaaaaa; - border-right:2px solid #aaaaaa; - border-bottom:2px solid #aaaaaa; - padding-left:20px; - padding-right:20px; - background-color:#f5f5f5; - cursor:pointer; -} - -.dvtTabCache { - border-bottom:2px solid #aaaaaa; -} - -.dvtContentSpace { - border-left:2px solid #aaaaaa; - border-right:2px solid #aaaaaa; - border-bottom:2px solid #aaaaaa; - padding-left:0px; -} -.dvtCellLabel, .cellLabel { - background-color:#efefef; - padding-right:10px; - padding-left:10px; - border-bottom:1px solid #dddddd; - border-top:1px solid #ffffff ; - color:#545454; - white-space:nowrap; - font-weight:bold; -} - -.dvtCellInfo, .cellInfo { - padding-left:10px; - padding-right:10px; - border-bottom:1px dotted #efefef; - white-space:nowrap; -} - -.rightMailMerge { - border:2px solid #aaa; -} - -.rightMailMergeHeader { - border-bottom:1px solid #ddd; - padding:5px; - background-color:#efefef; - -} - -.rightMailMergeContent { - padding:5px; - background-color:#fafafa; - -} -.detailedViewHeader{ - border-bottom:2px solid #dadada; - padding:5px; - background-color:#aaaaaa; -} - -.detailedViewTextBox { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:90%; - background-color:#ffffff; -} -.detailedViewTextBoxOn { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:90%; - background-color:#ffffdd; -} - -.advSearch { - padding:10px; - border-left:1px solid #eaeaea; - border-right:1px solid #eaeaea; - border-bottom:1px solid #eaeaea; - overflow:auto; - width:600px; - height:150px; - background-color:#f5f5f5; - -} - -.searchAlph { - border:1px solid #dadada; - background-color:#ffffff; - cursor:pointer; - width:10px - -} -.searchAlphselected { - border:1px solid #666666; - background-color:#bbbbbb; - cursor:pointer; - width:10px - -} -.textbox { - border:1px solid #999999; - background-color:#ffffff; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - width:120px; - padding:2px; - -} -.mx { -} -.calListTable td{ - border-bottom:1px solid #efefef; - border-left:1px solid #efefef; -} -.calDIV { - width:100%; - border:1px solid #999999; - -} -.calDayHour { - border-top:1px solid #dddddd; - border-left:1px solid #dddddd; - border-bottom:1px solid #dddddd; - border-right:1px solid #dddddd; - background-color:#eaeaea; -} -.calAddEvent { - position:absolute; - z-index:10000; - width:500px; - left:200px; - top:150px; - background-color:#ffffff; -} -.addEventInnerBox { - border:1px dotted #dadada; - -} -.cellNormal { - border:0px; - background-color:#ffffff; -} -.EventToDo{ - -} - -.thumbnail{ - background-color:#ffffff; -padding: 7px; -border: 1px solid #ddd; -float: left; - margin-right: 10px; - margin-bottom: 15px; -} -.padTab{ - padding-top:0px; - padding-left:0px; - padding-left:10px; - padding-bottom:0px; - vertical-align:top; - -} -#company{ - position:relative; - width:100%; - height:200px; - display:block; - background-color:#FFFFFF; - white-space:nowrap; - overflow:auto; - border:1px solid #CCCCCC; -} - - -#user{position:relative;left:0px;top:0px;width:100%;display:block;} -#communication{position:relative;left:0px;top:0px;width:100%;display:block;} -#config{position:relative;left:0px;top:0px;width:100%;display:block;} -#userTab{position:relative;left:0px;top:0px;width:100%;display:none;} -#one{ - position:relative; - display:block; - width:245px; -} - -#mnuTab1{ - - position:relative; - - overflow:auto; - - width:100%; - - display:none; - -} - -#mnuTab2{ - - position:relative; - - overflow:auto; - - width:100%; - - display:none; - -} - - -/* End of Settings */ - -.bggray{ - background-color: #dfdfdf; -} -.bgwhite{ - background-color: #FFFFFF; -} -.copy{ - font-size:9px; - font-family: Verdana, Arial, Helvetica, Sans-serif; -} - -#basicTab{ - position:relative; - overflow:auto; - width:100%; - display:block; -} - -#moreTab{ - position:relative; - overflow:auto; - width:100%; - display:none; -} - -/*Added for Advance Seearch*/ - -#one{ - position:relative; - display:block; - width:245px; -} - - -/* Dashboard CSS */ -a.dash_href{ - display:block; - width:24px;height:24px; - vertical-align:middle; - margin-top:10px; -} - - -.dashHeading { - font-family:Arial, Helvetica, sans-serif; - font-size:24px; - font-weight:bold; - color:#fff; -} - -.dashSelectBg{ - background-image:url(images/dashSelectBg.gif); - background-repeat:repeat-x; -} -.dash_top{ - background-image:url(images/dashTopBg.gif); - background-repeat:repeat-x; - height:63px; - vertical-align:middle; -} - -.dash_border{ - background-color:#bfbfbf; - padding:5px; -} -.dash_white{ - background-color:#FFFFFF; - padding:5px 10px 5px 10px; -} - -.dash_bdr_btm{ - border-bottom:2px dotted #dadada; -} - -.dash_count{ - font-size:36px; - font-weight:bold; - text-decoration:none; - color:#000000; - padding-left:10px;padding-right:10px; -} -.dash_switch{ - cursor:pointer; - width:26px; - height:26px; -} - -.dash_row_sel{ - background-image:url(images/dash_sel_chart.jpg); - background-repeat:no-repeat; - background-position:center; - width:26px;height:26px; - text-align:center; - vertical-align:middle; - font-weight:bold; - font-size:10px; - text-decoration:none; -} - -.dash_row_unsel{ - background-image:url(images/dash_unsel_chart.jpg); - background-repeat:no-repeat; - background-position:center; - width:26px;height:26px; - text-align:center; - vertical-align:middle; - font-weight:normal; - font-size:10px; - text-decoration:none; - cursor:pointer; -} - -.dash_chart_btm{ - border-bottom:2px solid #000000; -} - - -.dash_bottom{ - background-image:url(images/dashBottomBg.gif); - background-repeat:repeat-x; - height:99px; - vertical-align:middle; -} - -.dash_btm{ - background-image:url(images/dash_btm_center.jpg); - background-repeat:repeat-x; - position:top; -} - -/* menu */ - - - - a.submenu{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - padding-top:5px; - padding-bottom:5px; - padding-left:10px; - border-bottom:1px solid #CCCCCC; - background-color:#ECECEC; - color:#000000; - text-align:left; - text-decoration:none; - display:block; -} - -a.submenu:Hover{ - background-color:#DDDDDD; - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - padding-top:5px; - padding-bottom:5px; - padding-left:10px; - border-bottom:1px solid #CCCCCC; - color:#000000; - text-align:left; - text-decoration:none; - display:block; -} - -#mnuKey{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - background-color:#666666; - color:#FFFFFF; - text-decoration:none; - padding:5px; - font-weight:bold; - width:8px; - cursor:pointer; - vertical-align:top; - height:100px; - position:relative; - top:0px; - left:0px; -} - -#slidemenu{ - height:525px; - vertical-align:top; - width:100px; - background-color:#CCCCCC; - border-right:1px solid #CCCCCC; - opacity:.9; - display:none; -}*/ - -/* clock */ - -.citystyle{ - position:relative; - top:0px; - left:0px; - text-align:left; - -} -#theClockLayer{ - position:relative; - height:180px; - left:20px; - text-align:center; -} -.handsanddotsstyle{ - margin-top:10px; - position:absolute; - top:0px; - left:0px; - width:2px; - height:2px; - font-size:2px; - background-color:#000000; -} -.facestyle{ - margin-top:10px; - position:absolute; - top:0px; - left:0px; - width:15px; - height:15px; - text-align:center; - font-family:arial,sans-serif; - font-size:10px; - color:#000000; -} -.datestyle{ - margin-top:20px; - position:absolute; - top:0px; - left:0px; - width:100px; - text-align:center; - font-family:arial,sans-serif; - font-size:10px; - color:#000000; -} -.ampmstyle{ - margin-top:23px; - position:absolute; - top:0px; - left:0px; - width:20px; - text-align:center; - font-family:arial,sans-serif; - font-size:10px; - color:#000000; -} - -#wclock{ - position:absolute; - left:100px; - top:100px; - display:none; - background-color:#CCCCCC; - width:175px; -} - -.leftFormBorder1 { - border: 1px solid #AFC8E4; - background-color: #FFFFFF; - opacity:.7; -} - - - - -/* Calculator */ -.calcResult { - width: 100%; - height: 25px; - background-color: #FFFFCC;/*CBDFD6*/ - border-top: 1px solid #CCC; - border-left: 0px; - border-right: 1px solid #CCC; - border-bottom: 1px solid #CCC; - font-size: 10px; - text-align: right; -} -.calcMem { - width: 100%; - height: 25px; - border-top: 1px solid #CCC; - border-left: 1px solid #CCC; - border-right: 0px; - border-bottom: 1px solid #CCC; - background-color: #FFFFCC;/*CBDFD6*/ - font-family: Arial; - font-size: 10px; - color: #BBB; - text-align: left; -} -.calcBlackBtn, .calcGreyBtn, .calcBigBtn, .calcCancBtn, .calcMemBtn, .calcBackBtn { - border: none; - height: 20px; - font-size: 11px; - color: #FFF; - text-align:center; -} -.calcBackBtn { - background: url(images/calc_back_btn.gif) no-repeat; - width:25px; -} -.calcBlackBtn { - background: url(images/calc_black_btn.gif) no-repeat; - width:25px; -} -.calcGreyBtn { - background: url(images/calc_grey_btn.gif) no-repeat; - width:25px; -} -.calcCancBtn { - background: url(images/calc_canc_btn.gif) no-repeat; - width:25px; - -} -.calcMemBtn { - background: url(images/calc_mem_btn.gif) no-repeat; - width:25px; - /*background-color: #CCC;*/ -} -#calc{ - position:absolute; - left:100px; - top:100px; - background-color:#FFFFFF; - width:185px; - border-bottom:2px solid #000000; - border-right:2px solid #666666; - border-left:2px solid #CCCCCC; - border-top:2px solid #CCCCCC; -} - -/* RSS STYLES */ - -.subHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-image:url(images/rssHeader.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; -} - -.delBg{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-image:url(images/rssdelete.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; -} - -#rssScroll{ - font-family:Arial, Helvetica, sans-serif ; - font-size:12px; - background-color:#FFFFFF; - width:100%; - height:130px; - overflow:auto; - border:0px solid #000000; -} - -.rssTable{ - width:100%; - border:0px solid #CCCCCC; -} - -.rssTable tr th{ - background-color:#a9a9a9; - text-align:left; - border-bottom:1px solid #555; - border-top:1px solid #FFFFFF; - color:#000000; - padding-left:5px; - padding-right:5px; - height:20px; -} - -.rssTable tr td{ - text-align:left; - border-bottom:1px dotted #dadada; - border-left:1px dotted #dadada; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - white-space:nowrap; - padding:2px; - -} -.forwardBg{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - color:#000000; - background-image:url(images/rssforward.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; - background-color:#D7D7D7; -} - - -/* New Styles */ - -.mnuTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#000000; - width:100%; - border:0px solid #000000; -} - -.mnuTab tr td{ - border-bottom:1px solid #EBEBEB; - padding-left:5px; - vertical-align:middle; -} -/* profile */ - -.prvPrfBigText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; -} - -.prvPrfTopBg { - background-color:#ebebeb; -} - -.prvPrfBottomBg { - background-color:#ebebeb; -} - -.prvPrfOutline { - border:1px solid #ebebeb; -} - -.prvPrfTexture { - background:url(images/prvPrfTexture1.gif); - -} -.prvPrfHoverOn { - background-color:#ffffef; - -} -/* Organization */ - -.orgTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - color:#666666; - border:0px solid #9B9B9B; - border-collapse:collapse; - width:100%; -} - -.orgTab tr th{ - text-align:left; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-decoration:none; - font-weight:bold; - height:20px; - padding-left:5px; -} - -.orgTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:none; - font-weight:normal; - padding-left:5px; - height:20px; - border-bottom:1px solid #CCCCCC; - border-right:1px solid #CCCCCC; -} - -/* Groups */ -.groupli{ - margin-left:20px; - font-family:Arial, Helvetica, sans-serif; - font-weight:normal; - font-size:12px; - text-decoration:none; - color:#333333; - list-style-type:none; - text-align:left; -} - -/* tree menu */ - -/*Oraganization Edit Features */ - -#orgLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:500px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - display:block; - position:absolute; - left:0px; - top:0px; -} - -/* Role */ - -#roleLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - display:none; - position:absolute; -} - -.classBtn{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:10px; - background-color:#DBDBDB; - border-bottom:2px solid #999999; - border-right:2px solid #999999; - border-top:2px solid #F5F5F5; - border-left:2px solid #F5F5F5; - color:#000000; - text-align:center; - padding-top:3px; - padding-bottom:3px; -} - - -.txtBox{ - width:85%; - border:1px solid #666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; -} - -/* IMPORT LEADS */ - -.leadTable{ - border:3px solid #CCCCCC; - border-collapse:collapse; -} - -.leadTable tr td{ -/* border:0px solid #CCCCCC;*/ -} - -.genHeaderGray{ - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 16px; - color: #888888; - font-weight:bold; -} - -.genHeaderGrayBig{ - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - line-height: 16px; - color: #888888; - font-weight:bold; -} - -.importBox{ - width:125px; - border:1px solid #666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; -} -.txtGreen{ - color:green; -} - -/* PICK LIST */ -ul li{ - padding-bottom:2px; - padding-top:2px; -} -/* MY PREFERENCES */ -/* CSS FOR REPORTS */ - -.reportHdr{ - background-color:#DDDDDD; - font-size:12px; - font-weight:bold; - vertical-align:middle; - text-align:left; - height:30px; - border-bottom:2px solid #959595; - color:#000000; - padding-left:10px; -} - -#reportLay{ - width:175px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; - z-index:2000; -} - -#locateMap{ - width:120px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; - z-index:2000; -} - - - a.reportMnu{ - font-size:11px; - color:#0070BA; - text-decoration:none; - display:block; - width:155px; - height:20px; - border-bottom:1px solid #E1E1E1; - padding-left:20px; - padding-top:3px; -} - -a.reportMnu:Hover{ - font-size:11px; - color:#0070BA; - text-decoration:underline; - display:block; - width:155px; - height:20px; - border-bottom:1px solid #E1E1E1; - padding-left:20px; - padding-top:3px; -} - -#Generate{ - position:relative; - width:100%; - text-align:center; - display:none; -} - -/* END OF REPORT */ -/* WEB MAIL */ - a.webMnu{ - font-size:11px; - color:#0070BA; - text-decoration:underline; -} -a.webMnu:Hover{ - font-size:11px; - color:#0070BA; - text-decoration:underline; -} -/* END OF WEB MAIL */ -/* POPUP */ - a.alpha{ - font-size:11px; - color:gray; - text-decoration:none; - padding-Left:5px; - padding-right:5px; - border:1px dotted #CCCCCC; - background-color:#FFFFCC; -} - -a.alpha:Hover{ - font-size:11px; - color:gray; - text-decoration:underline; - padding-Left:5px; - padding-right:5px; - border:1px dotted #CCCCCC; - background-color:#FFFFCC; -} - -/* Home Page */ -.MatrixLayer{ - border:2px solid #aaaaaa; - background-color:#FFFFFF; - width:29%; - position:relative; - visibility:visible; - margin:9px; - height:280px; -} - -.fontBold{ - font-size:13px; - color:#000000; - text-decoration:none; - font-weight:bold; -} - -.style_Gray{ - color:gray; -} - -/* End of Home Page */ - -/* All Menu */ -#allMenu{ - width:500px; - border:4px solid #aaa; - left:200px; - top:100px; - position:absolute; - z-index:1000001; - display:none; - padding:10px; - background:#ffffff url(images/layerPopUpBg.gif); -} - - -.allMnuTable{ - width:100%; - background-color:#FFFFFF; -} - -.allMnuHandle td{ - height:20px; - color:#FFFFFF; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - text-decoration:none; - background-color:#555; - cursor:move; - padding:2px; - border-bottom:2px solid #666666; -} - -.allMnuHdr{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-weight:Bold; - font-size:11px; - text-decoration:none; - display:block; - background-color:#FFFFFF; - color:#333; - padding-top:5px; - padding-bottom:5px; -} - -a.allMnu{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:10px; - text-decoration:none; - font-weight:normal; - display:block; - width:125px; - height:15px; - padding-left:5px; - padding-top:0px; - padding-bottom:0px; - background-color:#FFFFFF; - border:1px solid #FFFFFF; - color:#000099; - margin-left:10px; -} - -a.allMnu:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:10px; - text-decoration:none; - font-weight:normal; - display:block; - width:125px; - height:15px; - padding-left:5px; - padding-top:0px; - padding-bottom:0px; - background-color:#ddd; - -} -/* End Of All Menu */ -/* Calendar */ -.calHdr{ - background-image:url(images/mailSubHeaderBg.gif); - background-repeat:repeat-x; - background-position:left top; -} - -.calSel{ - background-image:url(images/dashSelectBg.gif); - background-repeat:repeat-x; - text-align:center; - color:#FFFFFF; - font-weight:bold; - width:8%; -} - -.calAddButton { - border: 1px solid #999; - background:#ddd url(images/calAddButtonBg.gif) repeat-x; - cursor:pointer; - height:20px; - - -} -.calInnerBorder { - border-left:2px solid #a5a5a5; - border-right:2px solid #a5a5a5; - border-bottom:2px solid #a5a5a5; -} - -.calBorder { - border-left: 1px solid #a5a5a5; - border-right: 1px solid #a5a5a5; - border-bottom: 1px solid #a5a5a5; - background:#fefefe url(images/layerPopupBg.gif); - -} -.calTopRight { - border-right: 1px solid #a5a5a5; -} - - -.calUnSel{ - color:#000000; - font-weight:normal; - text-align:center; - width:8%; -} - -a.calMnu{ - font-size:11px; - color:#009; - text-decoration:none; - display:block; - height:20px; - padding-left:5px; - padding-top:3px; -} - -a.calMnu:Hover{ - font-size:11px; - color:#009; - text-decoration:underline; - display:block; - height:20px; - padding-left:5px; - padding-top:3px; -} - -/*.bggray{ - background-color: #dfdfdf; -}*/ -.bgwhite{ - background-color: #FFFFFF; -} -.copy{ - font-size:9px; - font-family: Verdana, Arial, Helvetica, Sans-serif; -} - -#mnuTab{ - position:relative; - width:100%; - display:block; -} - -#mnuTab2{ - position:relative; - overflow:auto; - width:100%; - display:none; -} -.style1 {color: #FF0000} -.event{ - background-color:#ddd; - border:1px solid #999999; - text-align:left; - width:100%; - position:relative; - left:0px; - top:0px; - vertical-align:middle; - padding:1px; -} - -#hrView{ - display:block; -} -.calendarNav{ - font-size:12px; - color:#FFFFFF; - white-space:nowrap; - text-align:center; - font-weight:bold; - padding-left:10px; - padding-right:10px; - background-image:url(images/cal_nav.gif); - background-repeat:repeat-x; -} -#addEventDropDown{ - position:absolute; - display:none; - width:150px; - border:1px solid #666666; - left:0px; - top:0px; - overflow:visible; - z-index:5000; -} - -.calAction{ - width:175px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; - z-index:2000; -} - -.calSettings{ - position:absolute; - z-index:20000; - width:500px; - left:200px; - top:150px; - background-color:#ffffff; -} -.outer{ - border-bottom:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - border-right:1px solid #CCCCCC; -} -.calTxt{ - width:50%; - border:1px solid #CCCCCC; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - padding-left:5px; -} - -#leadLay{ - position:relative; - width:100%; - float:left; - visibility:hidden; - padding:5px; - z-index:10000; -} - -/* End of Calendar */ - -/* Cal Year View */ -.eventDay{ - background-color:#FF9966; - font-weight:bold; -} - -.currDay{ - background-color:#006600; - font-weight:bold; - text-decoration:underline; -} - -.currDay a{ - color:#FFFFFF; - font-weight:bold; - text-decoration:underline; -} - - -/* End of Cal Year View */ - -/* Level 2 Menu Selected*/ - -level2Sel{ - color:#000000; - font-weight:bold; - text-decoration:underline; -} - -#DeleteLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; -} - -#CurrencyDeleteLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:350px; -} - - -/* For Report HTML Generation*/ -.rptCellLabel { - background-color:#f6f6f6; - padding-right:10px; - border-right: 1px solid #DDDDDD; - border-bottom:1px solid #eaeaea; - color:#737373; - font-weight: bold; - white-space:nowrap; -} -.rptTable { - border-left: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; - border-top: 1px solid #DDDDDD; -} -.rptTitle, .rptHead, .rptData, .rptGrpHead{ - font-family: Verdana, Arial, Helvetica, Sans-serif; - font-size: 11px; - text-align:left; - font-weight: normal; - height: 20px; - padding: 4px; - border-right: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; - background: #DDDDDD; -} -.rptGrp1Total, .rptGrp2Total, .rptTotal { - font-family: Verdana, Arial, Helvetica, Sans-serif; - font-size: 11px; - text-align:center; - font-weight: normal; - background: #FFF; - height: 20px; - padding: 4px; - border-right: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; -} -.rptGrpHead { - background: #FFF; - border-bottom: 1px solid #FFF; - border-top: 1px solid #DDDDDD; - font-weight: normal; -} - -.rptData { - background: #FFF; - font-weight: normal; -} -.rptEmptyGrp { - background: #FFF; - border-right: 1px solid #DDDDDD; -} -.statechange -{ - position:absolute; - visibility:hidden; - left:10px; - top:20px; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; -} -#PopupLay{ - position:absolute; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:500px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; - display:none; - left:100px; - top:100px; -} - -#folderLay{ - width:175px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; -} - -/* Css for quick Create */ - -.qcTransport{ - background-color:#dadada; - -} - -#role_popup{ - position:relative; - left:0px; - top:0px; - width:95%; - height:300px; - overflow:auto; - border:1px solid #999999; - text-align:left; - background-color:#FFFFFF; - } - -.unread_email { - font-weight:bold; -} - - -/* MY SITES */ - -.unread_email { - font-weight:bold; -} - - -.tagCloud { - border:1px solid #737373; -} - - -.tagCloudTopBg { - background: url(images/tagCloudBg.gif) repeat-x; - -} - -.tagCloudDisplay { - background-color:#e5e5e5; - padding:10px; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 14px; - color: #000000; - -} -.h2 { - - font-size:18px; - line-height:20px; - -} - -.gray { - - color:gray; -} -ul { - list-style:circle; - line-height:20px; - padding-left:5px; - margin-left:20px; - font-weight:normal; - -} -.tagCloudTopBg { - background-image: url(images/tagCloudBg.gif); - background-repeat: repeat-x; -} - -.tagCloudDisplay { - background-color:#e5e5e5; - padding:5px; -} - -.heading2 { - font-family: Arial, Helvetica, sans-serif; - font-size: 16px; - line-height: 16px; - font-weight:bold; - color: #000000; -} - -.settingsUI { - - text-align:left; - background-color:#fff; - background-image:url(images/layerPopupBg.gif); - border:2px solid #aaaaaa; - -} - - -.settingsTabHeader { - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height:22px; - font-weight:bold; - color:#333; - background-image: url(images/mailSubHeaderBg.gif); - background-color:#dddddd; - background-repeat: repeat-x; - padding-left:10px; - padding-right:10px; - -} - -.settingsTabList { - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:20px; - font-weight:normal; - color:#000000; - background-color:#e5e5e5; - padding-left:30px; - border-bottom:1px solid #ccc; - border-top:1px solid #fff; -} -.settingsTabSelected { - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:20px; - font-weight:bold; - color:#000000; - background-color:#ffffff; - padding-left:30px; - border-left:1px solid #ddd; -} -.settingsSelectedUI { - padding:10px; - background:url(images/settingsSelUIBg.gif) repeat-x; - background-color:#ffffff; -} -.settingsIconDisplay { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:14px; - padding:10px; - - color:#000000; - background-color:#ffffff; - padding-left:10px; -} -.settingsSelUITopLine{ - border-bottom:2px dotted #999999; - -} - -.tableHeading{ - background-color:#ffffff; - border-bottom:2px solid #555; -} -.colHeader{ - background-color:#ddd; - border-left:1px solid #fff; - border-top:1px solid #fff; - border-right:1px solid #aaa; - border-bottom:1px solid #aaa; - font-weight:bold; - -} -.cellLabel { - background-color:#eaebd9; - border-top:1px solid #efefef; - border-bottom:1px solid #dadada; - color:#555555; - -} -.cellText { - color:#333333; - border-bottom:1px solid #dadada; -} - -.listTable{ - border-left:1px solid #cccccc; - border-right:1px solid #cccccc; - border-bottom:1px solid #cccccc; - -} - -.listTableRow{ - border-bottom:1px solid #eaeaea; - border-right :1px solid #eaeaea; - border-bottom:1px solid #eaeaea; - border-bottom:1px solid #eaeaea; -} -.listRow{ - border-bottom:2px solid #eaeaea; - -} - -.listTableTopButtons{ - background-color:#efefef; - background-image:url(images/layerPopupBg.gif); - -} - - -/* Buttons */ -.crmButton{ - - border-left:1px solid #ffffff; - border-top:1px solid #ffffff; - border-right:1px solid #555555; - border-bottom:1px solid #555555; -} - -.create{ - background-color:#55aa55; - color:#fff; - font-weight:bold; -} -.delete { - background-color:#ffaa22; - color:#000; - font-weight:bold; -} -.edit { - background-color:#55aa55; - color:#fff; - font-weight:bold; -} -.save{ - background-color:#55aa55; - color:#fff; - font-weight:bold; -} -.cancel { - background-color:#ffaa22; - color:#000; - font-weight:bold; -} - -.inactive{ -color:#999999; -} - -.active{ -color:#229922; - -} - -/* Buttons ends */ - - - -textarea { - width:95%; - height:70px; - border:1px solid #dadada; -} -.treeTable1{ - padding:0px; -} - -.prvPrfBigText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; -} - -.prvPrfTopBg { - background-color:#ebebeb; -} - -.prvPrfBottomBg { - background-color:#ebebeb; -} - -.prvPrfOutline { - border:1px solid #ebebeb; -} -.prvPrfTexture { - background:url(images/prvPrfTexture1.gif); - -} - -.prvPrfHoverOn { - background-color:#ffffef; - -} -.cellBottomDotLine { - border-bottom-width: 2px; - border-bottom-style: dotted; - border-bottom-color: #CCCCCC; - background-color:#ededed; -} -.crmFormList{ - border:1px solid #cccccc; - width:90%; - height:120px; - -} -.cellBottomDotLinePlain { - border-bottom-width: 2px; - border-bottom-style: dotted; - border-bottom-color: #CCCCCC; - -} - -.thickBorder { - border: 2px solid #999999; -} -.trackerHeading { - background-color:#efefef; -} -.trackerListBullet { - border-right:1px dotted #cccccc; - background-color:#f9f9f9; -} -.trackerList { - border-bottom:1px solid #eeeeee; -} - -/* Table Definitions */ -.crmTable { - border:1px solid #dadada; -} - -.crmTableRow { - border-bottom:1px dotted #dadada; - border-right:1px dotted #dadada -} - -/* Inventory */ - -.lineOnTop { - border-top:1px solid #999999; -} - -.discountUI{ - border:3px solid #CCCCCC; - width:250px; - padding:5px; - position:absolute; - background-color:#FFFFFF; - display:none; -} - -.TaxShow{ - display:inline-table; -} - -.TaxHide{ - display:none; -} - -/* Inventory */ - - -/* Email Client Classes ++++++++++++++++++++++ */ - -.emailSelected{ - background-color:#eaeaea; - color:#000000; - font-size:bold; -} - - -.mailClient{ - border:2px solid #656565; -} - -.mailClientBg { - background-color:#efefef; - background-image:url(images/layerPopupBg.gif); -} - -.mailSubHeader { - background:#d9d9d9 url(images/mailSubHeaderBg.gif) repeat-x; - padding:4px; -} -.mailClientWriteEmailHeader { - font-family:arial, helvetica, sans-serif; - font-size:20px; - line-height:24px; - font-weight:bold; - background:#e0e0e0 url(images/mailSubHeaderBg.gif) repeat-x; - padding:10px; - border-left:1px solid #eaeaea; - border-top:1px solid #eaeaea; - border-right:1px solid #999; - border-left:1px solid #999;; -} - -.mailClientCSSButton { - border-left:1px solid #fff; - border-top:1px solid #fff; - border-right:1px solid #333; - border-bottom:1px solid #333; - padding:2px; - background-color:#cfcfcf; -} - -/* Email Client Classes ends ------------------------------------ */ - - - -/* Layer Popup */ -.layerPopup { - border:3px solid #959595; - background:#fffff5 url(images/layerPopupBg.gif) ; - position:absolute; -} - -.layerPopupHeading { - font-family:arial, helvetica, sans-serif; - font-size:16px; - line-height:24px; - font-weight:bold; -} -.layerHeadingULine { - border-bottom:2px solid #777; -} -.layerPopupTransport { - background-color:#eaeaea; - -} -.homePageSeperator { - border-right:1px dotted #ddd; -} -.homePageMatrixHdr { - border-bottom:1px solid #d3d3d3; - background:#fffff5 url(images/layerPopupBg.gif) ; -} - -.reportsListTable { - background-color:white; - border-left:1px solid #aaa; - border-right:1px solid #aaa; - border-bottom:1px solid #aaa; -} - -.reportGenerateTable{ - background-image:url(images/layerPopupBg.gif); - border-left:2px dotted #aaa; - border-right:2px dotted #aaa; - border-bottom:2px dotted #aaa; -} -.reportCreateBottom{ - background-color:#eaeaea; - border-bottom:2px solid #777; - -} -.importLeadUI{ - /*background:#ffffff url(images/select.gif) ; */ - background-color:#fff; -} - -a.customMnu{ - padding-left:30px; - padding-top:5px; - padding-bottom:5px; - display:block; - background-repeat:no-repeat; - background-position:left; - width:155px; - color:#000000; - text-decoration:none; -} - -a.customMnuSelected{ - padding-left:30px; - padding-top:5px; - padding-bottom:5px; - display:block; - background-repeat:no-repeat; - background-position:left; - width:155px; - background-color:#0099FF; - color:#FFFFFF; - text-decoration:none; -} - - -/* Drop Down Menu */ -.drop_mnu{ - position:absolute; - left:0px; - top:0px; - z-index:1000000001; - border-left:1px solid #a5a5a5; - border-right:1px solid #a5a5a5; - border-bottom:1px solid #a5a5a5; - width:150px; - display:none; - padding:0px; - text-align:left; - overflow-x:hidden; - overflow-y:hidden; - background-color:#eee; -} - -a.drop_down{ - width:150px; - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:20px; - font-weight:normal; - color:#009; - background-color:#eee; - padding:2px 5px 2px 5px; - border-top:1px solid #fafafa; - border-bottom:1px solid #d3d3d3; - display:block; -} - -a.drop_down:Hover{ - padding:2px 5px 2px 5px; - width:150px; - text-align:left; - color:#33a; - font-weight:normal; - text-decoration:underline; - background-color:#dadada; -} - -.bgwhite{ - background-color:white; -} - -.searchUIBasic { - background-image:url(images/layerPopupBg.gif); - border:2px solid #a5a5a5; -} -.searchUIAdv1{ - background-image:url(images/layerPopupBg.gif); - border-top:2px solid #a5a5a5; - border-left:2px solid #a5a5a5; - border-right:2px solid #a5a5a5; -} -.searchUIAdv2{ - background-image:url(images/layerPopupBg.gif); - border-left:2px solid #a5a5a5; - border-right:2px solid #a5a5a5; -} -.searchUIAdv3{ - background-image:url(images/layerPopupBg.gif); - border-bottom:2px solid #a5a5a5; - border-left:2px solid #a5a5a5; - border-right:2px solid #a5a5a5; -} - - - -/* Recalculate Disabling Window */ - -.veil{ - background: url(images/layerPopupBg.gif) ; - height: 100%; - width: 100%; - top: 0px; - left: 0px; - overflow: hidden; - z-index: 10000; - Filter: Alpha(opacity = 70); - -moz-opacity: 0.7; - text-align: center; - vertical-align: middle; - position: absolute; -} - -.veil_new{ - background: url(images/layerPopupBg.gif) ; - height: 100%; - width: 100%; - top: 0px; - left: 0px; - overflow: hidden; - z-index: 50000; - Filter: Alpha(opacity = 70); - -moz-opacity: 0.7; - text-align: center; - vertical-align: middle; - position: absolute; -} - -.optioncontainer{ - vertical-align: middle; - height: 100%; - width: 100%; - position: absolute; - z-index: 90000; -} - - -.options{ - vertical-align: middle; - margin-left: 25%; - margin-top: 16%; - color: #FFFFFF; - width:650px; - background-color: Black; - border: 2px solid #222; - position: relative; - text-align: left; - z-index: 80000; -} - -.options h2{ - color: White; - font-family: Verdana, Arial, Helvetica, sans-serif; - border-bottom: 1px solid #373D4C; - margin: 0; - font-weight: normal; -} - -/* Recalculate Disable Ends */ - +/********************************************************************************* + +** The contents of this file are subject to the vtiger CRM Public License Version 1.0 + * ("License"); You may not use this file except in compliance with the License + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + ********************************************************************************/ + + +/* ALPHA GRAY - COLOR THEME*/ + +.small { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; +} +.big { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height: 18px; + color: #000000; + font-weight:bold; +} + +.componentName { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + line-height: 3px; + color: #000; + font-weight:bold; + border-left:2px dotted #333; + padding:10px; +} + + +.genHeaderBig{ + font-family: Arial, Helvetica, sans-serif; + font-size: 16px; + line-height: 19px; + color: #000000; + font-weight:bold; +} +.genHeaderSmall{ + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + line-height: 16px; + color: #000000; + font-weight:bold; + +} + +.moduleName { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + color: #000000; + font-weight:bold; +} + + +.hdrNameBg { + background:#ffffff url(images/hdrNameBg.gif) repeat-x; + + +} + +.hdrTabBg { + /*background:#ffffff url(images/hdrTabBg.gif) bottom repeat-x ;*/ + background-color:#dadada; +} + +.tabSelected { + background:#eeeeee url(images/tabSelectedBg.gif) repeat-x; + font-family: Arial, Helvetica, sans-serif; + font-weight:bold; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + +} + +.tabSelected a{ + color:white; +} + +.tabUnSelected { + + background: #eaeaea url(images/tabUnSelectedBg.gif) bottom repeat-x; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + border-bottom:1px solid #ffffff; +} + +.tabUnSelected a{ + color:#000099; +} + +.tabSeperator { + background-color:#aaa; + width:1px; +} + + + +/*.level2text { + + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding-left:15px; + padding-right:15px; + padding-top:5px; + padding-bottom:5px; + font-weight:bold; + color:white; +} + +.level2text a{ + text-decoration:none; + color:#555555; +} + +.level2text a:hover { + text-decoration:underline; + color:#555555; + +}*/ + + +.level2Bg { + /*background:#999 url(images/level2TabBg.gif) bottom repeat-x;*/ + background-color:#9a9a9a; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + border-bottom:1px dashed #fff; + color:white; +} + +.level2Bg a{ + /* background:#1F5BFF url(images/level2TabBg.gif) bottom repeat-x; */ + color:#fff; +} + + +.level2SelTab{ + font-weight:bold; + color:#000000; + padding-left:20px; + padding-right:20px; + padding-top:5px; + padding-bottom:5px; + +} + +.level2UnSelTab{ + color:#000000; + padding-left:20px; + padding-right:20px; + padding-top:5px; + padding-bottom:5px; +} +.sep1 { + background:#999999; +} + +.showPanelBg { + background:url(images/showPanelTopBg.gif) repeat-x; +} + +a { + text-decoration:none; + color:#000099; +} + +a:hover { + text-decoration:underline; +} + +.hdrLink { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + text-decoration:none; + color:#000099; + font-weight:bold; +} + +.hdrLink:hover { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + text-decoration:underline; + color:#000099; + font-weight:bold; +} + +.searchBox { + border: 0px solid #0000aa; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding-left:2px; + width:100px; + background-color:#ffffef; +} + +.searchBtn { + border :0px #cccccc solid; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + font-weight:bold; + width:30px; + height:19px; + background-color:#555; + color:white; +} + + +/* List View Table classes starts +++++++++++++++++ */ + +.lvt { + background-color:#ccc; + border:1px solid #ccc; +} + +.lvtBg { +} + +.lvtHeaderText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + font-weight:bold; +} + +.lvtCol { + border-top:1px solid #eaeaea; + border-left:1px solid #eaeaea; + border-right:1px solid #999; + border-bottom:1px solid #999; + background-color:#ccc; + font-weight:bold; +} + +.lvtColData { + background-color:#ffffff; +} + +.lvtColDataHover { + background-color:#ffffee; + +} + + +/* List View Table classes ends --------------------------------*/ + + + +/* Detailed View classes starts +++++++++++++++++++++++ */ +.dvHeaderText{ + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + color:#000000; + font-weight:bold; + +} + +.dvInnerHeader{ + border-bottom:2px dotted #555; + padding:5px; + background-color:#dadada; + +} + +.dvtSelectedCell { + border-left:2px solid #aaaaaa; + border-top:2px solid #aaaaaa; + border-right:2px solid #aaaaaa; + padding-left:20px; + padding-right:20px; + background-color:white; + font-weight:bold; +} + +.dvtUnSelectedCell { + border-left:2px solid #aaaaaa; + border-top:2px solid #aaaaaa; + border-right:2px solid #aaaaaa; + border-bottom:2px solid #aaaaaa; + padding-left:20px; + padding-right:20px; + background-color:#f5f5f5; + cursor:pointer; +} + +.dvtTabCache { + border-bottom:2px solid #aaaaaa; +} + +.dvtContentSpace { + border-left:2px solid #aaaaaa; + border-right:2px solid #aaaaaa; + border-bottom:2px solid #aaaaaa; + padding-left:0px; +} +.dvtCellLabel, .cellLabel { + background-color:#efefef; + padding-right:10px; + padding-left:10px; + border-bottom:1px solid #dddddd; + border-top:1px solid #ffffff ; + color:#545454; + white-space:nowrap; + font-weight:bold; +} + +.dvtCellInfo, .cellInfo { + padding-left:10px; + padding-right:10px; + border-bottom:1px dotted #efefef; +} + +.rightMailMerge { + border:2px solid #aaa; +} + +.rightMailMergeHeader { + border-bottom:1px solid #ddd; + padding:5px; + background-color:#efefef; + +} + +.rightMailMergeContent { + padding:5px; + background-color:#fafafa; + +} +.detailedViewHeader{ + border-bottom:2px solid #dadada; + padding:5px; + background-color:#aaaaaa; +} + +.detailedViewTextBox { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:90%; + background-color:#ffffff; +} +.detailedViewTextBoxOn { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:90%; + background-color:#ffffdd; +} + +.detailedViewTextBoxDis { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #555555; + border:1px solid #bababa; + padding-left:5px; + width:90%; + background-color:#aaaaaa; +} + +.detailedViewTextArea { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:95%; + height:100px; + background-color:#ffffff; + text-align:left; +} + +.advSearch { + padding:10px; + border-left:1px solid #eaeaea; + border-right:1px solid #eaeaea; + border-bottom:1px solid #eaeaea; + overflow:auto; + width:600px; + height:150px; + background-color:#f5f5f5; + +} + +.searchAlph { + border:1px solid #dadada; + background-color:#ffffff; + cursor:pointer; + width:10px + +} +.searchAlphselected { + border:1px solid #666666; + background-color:#bbbbbb; + cursor:pointer; + width:10px + +} +.textbox { + border:1px solid #999999; + background-color:#ffffff; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + width:120px; + padding:2px; + +} +.mx { +} +.calListTable td{ + border-bottom:1px solid #efefef; + border-left:1px solid #efefef; +} +.calDIV { + width:100%; + border:1px solid #999999; + +} +.calDayHour { + border-top:1px solid #dddddd; + border-left:1px solid #dddddd; + border-bottom:1px solid #dddddd; + border-right:1px solid #dddddd; + background-color:#eaeaea; +} +.calAddEvent { + position:absolute; + z-index:10000; + width:500px; + left:200px; + top:150px; + background-color:#ffffff; +} +.addEventInnerBox { + border:1px dotted #dadada; + +} +.cellNormal { + border:0px; + background-color:#ffffff; +} +.EventToDo{ + +} + +.thumbnail{ + background-color:#ffffff; +padding: 7px; +border: 1px solid #ddd; +float: left; + margin-right: 10px; + margin-bottom: 15px; +} +.padTab{ + padding-top:0px; + padding-left:0px; + padding-left:10px; + padding-bottom:0px; + vertical-align:top; + +} +#company{ + position:relative; + width:100%; + height:200px; + display:block; + background-color:#FFFFFF; + white-space:nowrap; + overflow:auto; + border:1px solid #CCCCCC; +} + + +#user{position:relative;left:0px;top:0px;width:100%;display:block;} +#communication{position:relative;left:0px;top:0px;width:100%;display:block;} +#config{position:relative;left:0px;top:0px;width:100%;display:block;} +#userTab{position:relative;left:0px;top:0px;width:100%;display:none;} +#one{ + position:relative; + display:block; + width:245px; +} + +#mnuTab1{ + + position:relative; + + overflow:auto; + + width:100%; + + display:none; + +} + +#mnuTab2{ + + position:relative; + + overflow:auto; + + width:100%; + + display:none; + +} + + +/* End of Settings */ + +.bggray{ + background-color: #dfdfdf; +} +.bgwhite{ + background-color: #FFFFFF; +} +.copy{ + font-size:9px; + font-family: Verdana, Arial, Helvetica, Sans-serif; +} + +#basicTab{ + position:relative; + overflow:auto; + width:100%; + display:block; +} + +#moreTab{ + position:relative; + overflow:auto; + width:100%; + display:none; +} + +/*Added for Advance Seearch*/ + +#one{ + position:relative; + display:block; + width:245px; +} + + +/* Dashboard CSS */ +a.dash_href{ + display:block; + width:24px;height:24px; + vertical-align:middle; + margin-top:10px; +} + + +.dashHeading { + font-family:Arial, Helvetica, sans-serif; + font-size:24px; + font-weight:bold; + color:#fff; +} + +.dashSelectBg{ + background-image:url(images/dashSelectBg.gif); + background-repeat:repeat-x; +} +.dash_top{ + background-image:url(images/dashTopBg.gif); + background-repeat:repeat-x; + height:63px; + vertical-align:middle; +} + +.dash_border{ + background-color:#bfbfbf; + padding:5px; +} +.dash_white{ + background-color:#FFFFFF; + padding:5px 10px 5px 10px; +} + +.dash_bdr_btm{ + border-bottom:2px dotted #dadada; +} + +.dash_count{ + font-size:36px; + font-weight:bold; + text-decoration:none; + color:#000000; + padding-left:10px;padding-right:10px; +} +.dash_switch{ + cursor:pointer; + width:26px; + height:26px; +} + +.dash_row_sel{ + background-image:url(images/dash_sel_chart.jpg); + background-repeat:no-repeat; + background-position:center; + width:26px;height:26px; + text-align:center; + vertical-align:middle; + font-weight:bold; + font-size:10px; + text-decoration:none; +} + +.dash_row_unsel{ + background-image:url(images/dash_unsel_chart.jpg); + background-repeat:no-repeat; + background-position:center; + width:26px;height:26px; + text-align:center; + vertical-align:middle; + font-weight:normal; + font-size:10px; + text-decoration:none; + cursor:pointer; +} + +.dash_chart_btm{ + border-bottom:2px solid #000000; +} + + +.dash_bottom{ + background-image:url(images/dashBottomBg.gif); + background-repeat:repeat-x; + height:99px; + vertical-align:middle; +} + +.dash_btm{ + background-image:url(images/dash_btm_center.jpg); + background-repeat:repeat-x; + position:top; +} + +/* menu */ + + + + a.submenu{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + padding-top:5px; + padding-bottom:5px; + padding-left:10px; + border-bottom:1px solid #CCCCCC; + background-color:#ECECEC; + color:#000000; + text-align:left; + text-decoration:none; + display:block; +} + +a.submenu:Hover{ + background-color:#DDDDDD; + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + padding-top:5px; + padding-bottom:5px; + padding-left:10px; + border-bottom:1px solid #CCCCCC; + color:#000000; + text-align:left; + text-decoration:none; + display:block; +} + +#mnuKey{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + background-color:#666666; + color:#FFFFFF; + text-decoration:none; + padding:5px; + font-weight:bold; + width:8px; + cursor:pointer; + vertical-align:top; + height:100px; + position:relative; + top:0px; + left:0px; +} + +#slidemenu{ + height:525px; + vertical-align:top; + width:100px; + background-color:#CCCCCC; + border-right:1px solid #CCCCCC; + opacity:.9; + display:none; +}*/ + +/* clock */ + +.citystyle{ + position:relative; + top:0px; + left:0px; + text-align:left; + +} +#theClockLayer{ + position:relative; + height:180px; + left:20px; + text-align:center; +} +.handsanddotsstyle{ + margin-top:10px; + position:absolute; + top:0px; + left:0px; + width:2px; + height:2px; + font-size:2px; + background-color:#000000; +} +.facestyle{ + margin-top:10px; + position:absolute; + top:0px; + left:0px; + width:15px; + height:15px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} +.datestyle{ + margin-top:20px; + position:absolute; + top:0px; + left:0px; + width:100px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} +.ampmstyle{ + margin-top:23px; + position:absolute; + top:0px; + left:0px; + width:20px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} + +#wclock{ + position:absolute; + left:100px; + top:100px; + display:none; + background-color:#CCCCCC; + width:175px; +} + +.leftFormBorder1 { + border: 1px solid #AFC8E4; + background-color: #FFFFFF; + opacity:.7; +} + + + + +/* Calculator */ +.calcResult { + width: 100%; + height: 25px; + background-color: #FFFFCC;/*CBDFD6*/ + border-top: 1px solid #CCC; + border-left: 0px; + border-right: 1px solid #CCC; + border-bottom: 1px solid #CCC; + font-size: 10px; + text-align: right; +} +.calcMem { + width: 100%; + height: 25px; + border-top: 1px solid #CCC; + border-left: 1px solid #CCC; + border-right: 0px; + border-bottom: 1px solid #CCC; + background-color: #FFFFCC;/*CBDFD6*/ + font-family: Arial; + font-size: 10px; + color: #BBB; + text-align: left; +} +.calcBlackBtn, .calcGreyBtn, .calcBigBtn, .calcCancBtn, .calcMemBtn, .calcBackBtn { + border: none; + height: 20px; + font-size: 11px; + color: #FFF; + text-align:center; +} +.calcBackBtn { + background: url(images/calc_back_btn.gif) no-repeat; + width:25px; +} +.calcBlackBtn { + background: url(images/calc_black_btn.gif) no-repeat; + width:25px; +} +.calcGreyBtn { + background: url(images/calc_grey_btn.gif) no-repeat; + width:25px; +} +.calcCancBtn { + background: url(images/calc_canc_btn.gif) no-repeat; + width:25px; + +} +.calcMemBtn { + background: url(images/calc_mem_btn.gif) no-repeat; + width:25px; + /*background-color: #CCC;*/ +} +#calc{ + position:absolute; + left:100px; + top:100px; + background-color:#FFFFFF; + width:185px; + border-bottom:2px solid #000000; + border-right:2px solid #666666; + border-left:2px solid #CCCCCC; + border-top:2px solid #CCCCCC; +} + +/* RSS STYLES */ + +.subHdr{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#FFFFFF; + background-image:url(images/rssHeader.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; +} + +.delBg{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#FFFFFF; + background-image:url(images/rssdelete.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; +} + +#rssScroll{ + font-family:Arial, Helvetica, sans-serif ; + font-size:12px; + background-color:#FFFFFF; + width:100%; + height:175px; + overflow:auto; + border:0px solid #000000; +} + +.rssTable{ + width:100%; + border:0px solid #CCCCCC; +} + +.rssTable tr th{ + background-color:#a9a9a9; + text-align:left; + border-bottom:1px solid #555; + border-top:1px solid #FFFFFF; + color:#000000; + padding-left:5px; + padding-right:5px; + height:20px; +} + +.rssTable tr td{ + text-align:left; + border-bottom:1px dotted #dadada; + border-left:1px dotted #dadada; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + font-weight:normal; + white-space:nowrap; + padding:2px; + +} +.forwardBg{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#000000; + background-image:url(images/rssforward.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; + background-color:#D7D7D7; +} + + +/* New Styles */ + +.mnuTab{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:12px; + color:#000000; + width:100%; + border:0px solid #000000; +} + +.mnuTab tr td{ + border-bottom:1px solid #EBEBEB; + padding-left:5px; + vertical-align:middle; +} +/* profile */ + +.prvPrfBigText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; +} + +.prvPrfTopBg { + background-color:#ebebeb; +} + +.prvPrfBottomBg { + background-color:#ebebeb; +} + +.prvPrfOutline { + border:1px solid #ebebeb; +} + +.prvPrfTexture { + background:url(images/prvPrfTexture1.gif); + +} +.prvPrfHoverOn { + background-color:#ffffef; + +} +/* Organization */ + +.orgTab{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + font-weight:normal; + color:#666666; + border:0px solid #9B9B9B; + border-collapse:collapse; + width:100%; +} + +.orgTab tr th{ + text-align:left; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + text-decoration:none; + font-weight:bold; + height:20px; + padding-left:5px; +} + +.orgTab tr td{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-decoration:none; + font-weight:normal; + padding-left:5px; + height:20px; + border-bottom:1px solid #CCCCCC; + border-right:1px solid #CCCCCC; +} + +/* Groups */ +.groupli{ + margin-left:20px; + font-family:Arial, Helvetica, sans-serif; + font-weight:normal; + font-size:12px; + text-decoration:none; + color:#333333; + list-style-type:none; + text-align:left; +} + +/* tree menu */ + +/*Oraganization Edit Features */ + +#orgLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:500px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + display:block; + position:absolute; + left:0px; + top:0px; +} + +/* Role */ + +#roleLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + display:none; + position:absolute; +} + +.classBtn{ + font-family:Verdana, Arial, Helvetica, sans-serif; + text-decoration:none; + font-weight:normal; + font-size:10px; + background-color:#DBDBDB; + border-bottom:2px solid #999999; + border-right:2px solid #999999; + border-top:2px solid #F5F5F5; + border-left:2px solid #F5F5F5; + color:#000000; + text-align:center; + padding-top:3px; + padding-bottom:3px; +} + + +.txtBox{ + width:85%; + border:1px solid #666666; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; +} + +/* IMPORT LEADS */ + +.leadTable{ + border:3px solid #CCCCCC; + border-collapse:collapse; +} + +.leadTable tr td{ +/* border:0px solid #CCCCCC;*/ +} + +.genHeaderGray{ + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + line-height: 16px; + color: #888888; + font-weight:bold; +} + +.genHeaderGrayBig{ + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + line-height: 16px; + color: #888888; + font-weight:bold; +} + +.importBox{ + width:125px; + border:1px solid #666666; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; +} +.txtGreen{ + color:green; +} + +/* PICK LIST */ +ul li{ + padding-bottom:2px; + padding-top:2px; +} +/* MY PREFERENCES */ +/* CSS FOR REPORTS */ + +.reportHdr{ + background-color:#DDDDDD; + font-size:12px; + font-weight:bold; + vertical-align:middle; + text-align:left; + height:30px; + border-bottom:2px solid #959595; + color:#000000; + padding-left:10px; +} + +#reportLay{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; + z-index:2000; +} + +#locateMap{ + width:120px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; + z-index:2000; +} + + + a.reportMnu{ + font-size:11px; + color:#0070BA; + text-decoration:none; + display:block; + width:155px; + height:20px; + border-bottom:1px solid #E1E1E1; + padding-left:20px; + padding-top:3px; +} + +a.reportMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; + display:block; + width:155px; + height:20px; + border-bottom:1px solid #E1E1E1; + padding-left:20px; + padding-top:3px; +} + +#Generate{ + position:relative; + width:100%; + text-align:center; + display:none; +} + +/* END OF REPORT */ +/* WEB MAIL */ + a.webMnu{ + font-size:11px; + color:#0070BA; + text-decoration:underline; +} +a.webMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; +} +/* END OF WEB MAIL */ +/* POPUP */ + a.alpha{ + font-size:11px; + color:gray; + text-decoration:none; + padding-Left:5px; + padding-right:5px; + border:1px dotted #CCCCCC; + background-color:#FFFFCC; +} + +a.alpha:Hover{ + font-size:11px; + color:gray; + text-decoration:underline; + padding-Left:5px; + padding-right:5px; + border:1px dotted #CCCCCC; + background-color:#FFFFCC; +} + +/* Home Page */ +.MatrixLayer{ + border:2px solid #aaaaaa; + background-color:#FFFFFF; + width:29%; + position:relative; + visibility:visible; + margin:9px; + height:280px; +} + +.fontBold{ + font-size:13px; + color:#000000; + text-decoration:none; + font-weight:bold; +} + +.style_Gray{ + color:gray; +} + +/* End of Home Page */ + +/* All Menu */ +#allMenu{ + width:500px; + border:4px solid #aaa; + left:200px; + top:100px; + position:absolute; + z-index:1000001; + display:none; + padding:10px; + background:#ffffff url(images/layerPopUpBg.gif); +} + + +.allMnuTable{ + width:100%; + background-color:#FFFFFF; +} + +.allMnuHandle td{ + height:20px; + color:#FFFFFF; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + font-weight:bold; + text-decoration:none; + background-color:#555; + cursor:move; + padding:2px; + border-bottom:2px solid #666666; +} + +.allMnuHdr{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-weight:Bold; + font-size:11px; + text-decoration:none; + display:block; + background-color:#FFFFFF; + color:#333; + padding-top:5px; + padding-bottom:5px; +} + +a.allMnu{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:10px; + text-decoration:none; + font-weight:normal; + display:block; + width:125px; + height:15px; + padding-left:5px; + padding-top:0px; + padding-bottom:0px; + background-color:#FFFFFF; + border:1px solid #FFFFFF; + color:#000099; + margin-left:10px; +} + +a.allMnu:Hover{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:10px; + text-decoration:none; + font-weight:normal; + display:block; + width:125px; + height:15px; + padding-left:5px; + padding-top:0px; + padding-bottom:0px; + background-color:#ddd; + +} +/* End Of All Menu */ +/* Calendar */ +.calHdr{ + background-image:url(images/mailSubHeaderBg.gif); + background-repeat:repeat-x; + background-position:left top; +} + +.calSel{ + background-image:url(images/dashSelectBg.gif); + background-repeat:repeat-x; + text-align:center; + color:#FFFFFF; + font-weight:bold; + width:8%; +} + +.calAddButton { + border: 1px solid #999; + background:#ddd url(images/calAddButtonBg.gif) repeat-x; + cursor:pointer; + height:20px; + + +} +.calInnerBorder { + border-left:2px solid #a5a5a5; + border-right:2px solid #a5a5a5; + border-bottom:2px solid #a5a5a5; +} + +.calBorder { + border-left: 1px solid #a5a5a5; + border-right: 1px solid #a5a5a5; + border-bottom: 1px solid #a5a5a5; + background:#fefefe url(images/layerPopupBg.gif); + +} +.calTopRight { + border-right: 1px solid #a5a5a5; +} + + +.calUnSel{ + color:#000000; + font-weight:normal; + text-align:center; + width:8%; +} + +a.calMnu{ + font-size:11px; + color:#009; + text-decoration:none; + display:block; + height:20px; + padding-left:5px; + padding-top:3px; +} + +a.calMnu:Hover{ + font-size:11px; + color:#009; + text-decoration:underline; + display:block; + height:20px; + padding-left:5px; + padding-top:3px; +} + +/*.bggray{ + background-color: #dfdfdf; +}*/ +.bgwhite{ + background-color: #FFFFFF; +} +.copy{ + font-size:9px; + font-family: Verdana, Arial, Helvetica, Sans-serif; +} + +#mnuTab{ + position:relative; + width:100%; + display:block; +} + +#mnuTab2{ + position:relative; + overflow:auto; + width:100%; + display:none; +} +.style1 {color: #FF0000} +.event{ + background-color:#ddd; + border:1px solid #999999; + text-align:left; + width:100%; + position:relative; + left:0px; + top:0px; + vertical-align:middle; + padding:1px; +} + +#hrView{ + display:block; +} +.calendarNav{ + font-size:12px; + color:#FFFFFF; + white-space:nowrap; + text-align:center; + font-weight:bold; + padding-left:10px; + padding-right:10px; + background-image:url(images/cal_nav.gif); + background-repeat:repeat-x; +} +#addEventDropDown{ + position:absolute; + display:none; + width:150px; + border:1px solid #666666; + left:0px; + top:0px; + overflow:visible; + z-index:5000; +} + +.calAction{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; + z-index:2000; +} + +.calSettings{ + position:absolute; + z-index:20000; + width:500px; + left:200px; + top:150px; + background-color:#ffffff; +} +.outer{ + border-bottom:1px solid #CCCCCC; + border-left:1px solid #CCCCCC; + border-right:1px solid #CCCCCC; +} +.calTxt{ + width:50%; + border:1px solid #CCCCCC; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + padding-left:5px; +} + +#leadLay{ + position:relative; + width:100%; + float:left; + visibility:hidden; + padding:5px; + z-index:10000; +} + +/* End of Calendar */ + +/* Cal Year View */ +.eventDay{ + background-color:#FF9966; + font-weight:bold; +} + +.currDay{ + background-color:#006600; + font-weight:bold; + text-decoration:underline; +} + +.currDay a{ + color:#FFFFFF; + font-weight:bold; + text-decoration:underline; +} + + +/* End of Cal Year View */ + +/* Level 2 Menu Selected*/ + +level2Sel{ + color:#000000; + font-weight:bold; + text-decoration:underline; +} + +#DeleteLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; +} + +#CurrencyDeleteLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:350px; +} + + +/* For Report HTML Generation*/ +.rptCellLabel { + background-color:#f6f6f6; + padding-right:10px; + border-right: 1px solid #DDDDDD; + border-bottom:1px solid #eaeaea; + color:#737373; + font-weight: bold; + white-space:nowrap; +} +.rptTable { + border-left: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; + border-top: 1px solid #DDDDDD; +} +.rptTitle, .rptHead, .rptData, .rptGrpHead{ + font-family: Verdana, Arial, Helvetica, Sans-serif; + font-size: 11px; + text-align:left; + font-weight: normal; + height: 20px; + padding: 4px; + border-right: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; + background: #DDDDDD; +} +.rptGrp1Total, .rptGrp2Total, .rptTotal { + font-family: Verdana, Arial, Helvetica, Sans-serif; + font-size: 11px; + text-align:center; + font-weight: normal; + background: #FFF; + height: 20px; + padding: 4px; + border-right: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; +} +.rptGrpHead { + background: #FFF; + border-bottom: 1px solid #FFF; + border-top: 1px solid #DDDDDD; + font-weight: normal; +} + +.rptData { + background: #FFF; + font-weight: normal; +} +.rptEmptyGrp { + background: #FFF; + border-right: 1px solid #DDDDDD; +} +.statechange +{ + position:absolute; + visibility:hidden; + left:10px; + top:20px; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; +} +#PopupLay{ + position:absolute; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:500px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; + display:none; + left:100px; + top:100px; +} + +#folderLay{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; +} + +/* Css for quick Create */ + +.qcTransport{ + background-color:#dadada; + +} + +#role_popup{ + position:relative; + left:0px; + top:0px; + width:95%; + height:300px; + overflow:auto; + border:1px solid #999999; + text-align:left; + background-color:#FFFFFF; + } + +.unread_email { + font-weight:bold; + background-color:#00FF00; +} +.delete_email { + font-weight:bold; + background-color:#FF5151; + +} +.qualify_email { + font-weight:bold; + background-color:#CDB5CD; + + } + + + + +.mailSelected { + font-family: Arial, Helvetica, sans-serif; + font-weight:bold; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + +} +.mailSelected_select { + background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; + background-color:#1F5EFF; + font-family: Arial, Helvetica, sans-serif; + font-weight:bold; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + +} + +/* MY SITES */ + +.unread_email:hover { + font-weight:bold; +} + + +.tagCloud { + border:1px solid #737373; +} + + +.tagCloudTopBg { + background: url(images/tagCloudBg.gif) repeat-x; + +} + +.tagCloudDisplay { + background-color:#e5e5e5; + padding:10px; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height: 14px; + color: #000000; + +} +.h2 { + + font-size:18px; + line-height:20px; + +} + +.gray { + + color:gray; +} +ul { + list-style:circle; + line-height:20px; + padding-left:5px; + margin-left:20px; + font-weight:normal; + +} +.tagCloudTopBg { + background-image: url(images/tagCloudBg.gif); + background-repeat: repeat-x; +} + +.tagCloudDisplay { + background-color:#e5e5e5; + padding:5px; +} + +.heading2 { + font-family: Arial, Helvetica, sans-serif; + font-size: 16px; + line-height: 16px; + font-weight:bold; + color: #000000; +} + +.settingsUI { + + text-align:left; + background-color:#fff; + background-image:url(images/layerPopupBg.gif); + border:2px solid #aaaaaa; + +} + + +.settingsTabHeader { + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height:22px; + font-weight:bold; + color:#333; + background-image: url(images/mailSubHeaderBg.gif); + background-color:#dddddd; + background-repeat: repeat-x; + padding-left:10px; + padding-right:10px; + +} + +.settingsTabList { + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:20px; + font-weight:normal; + color:#000000; + background-color:#e5e5e5; + padding-left:30px; + border-bottom:1px solid #ccc; + border-top:1px solid #fff; +} +.settingsTabSelected { + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:20px; + font-weight:bold; + color:#000000; + background-color:#ffffff; + padding-left:30px; + border-left:1px solid #ddd; +} +.settingsSelectedUI { + padding:10px; + background:url(images/settingsSelUIBg.gif) repeat-x; + background-color:#ffffff; +} +.settingsIconDisplay { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:14px; + padding:10px; + + color:#000000; + background-color:#ffffff; + padding-left:10px; +} +.settingsSelUITopLine{ + border-bottom:2px dotted #999999; + +} + +.tableHeading{ + background-color:#ffffff; + border-bottom:2px solid #555; +} +.colHeader{ + background-color:#ddd; + border-left:1px solid #fff; + border-top:1px solid #fff; + border-right:1px solid #aaa; + border-bottom:1px solid #aaa; + font-weight:bold; + +} +.cellLabel { + background-color:#eaebd9; + border-top:1px solid #efefef; + border-bottom:1px solid #dadada; + color:#555555; + +} +.cellText { + color:#333333; + border-bottom:1px solid #dadada; +} + +.listTable{ + border-left:1px solid #cccccc; + border-right:1px solid #cccccc; + border-bottom:1px solid #cccccc; + +} + +.listTableRow{ + border-bottom:1px solid #eaeaea; + border-right :1px solid #eaeaea; + border-bottom:1px solid #eaeaea; + border-bottom:1px solid #eaeaea; +} +.listRow{ + border-bottom:2px solid #eaeaea; + +} + +.listTableTopButtons{ + background-color:#efefef; + background-image:url(images/layerPopupBg.gif); + +} + + +/* Buttons */ +.crmButton{ + + border-left:1px solid #ffffff; + border-top:1px solid #ffffff; + border-right:1px solid #555555; + border-bottom:1px solid #555555; +} + +.create{ + background-color:#55aa55; + color:#fff; + font-weight:bold; +} +.delete { + background-color:#ffaa22; + color:#000; + font-weight:bold; +} +.edit { + background-color:#55aa55; + color:#fff; + font-weight:bold; +} +.save{ + background-color:#55aa55; + color:#fff; + font-weight:bold; +} +.cancel { + background-color:#ffaa22; + color:#000; + font-weight:bold; +} + +.inactive{ +color:#999999; +} + +.active{ +color:#229922; + +} + +/* Buttons ends */ + + + +textarea { + width:95%; + height:70px; + border:1px solid #dadada; +} +.treeTable1{ + padding:0px; +} + +.prvPrfBigText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; +} + +.prvPrfTopBg { + background-color:#ebebeb; +} + +.prvPrfBottomBg { + background-color:#ebebeb; +} + +.prvPrfOutline { + border:1px solid #ebebeb; +} +.prvPrfTexture { + background:url(images/prvPrfTexture1.gif); + +} + +.prvPrfHoverOn { + background-color:#ffffef; + +} +.cellBottomDotLine { + border-bottom-width: 2px; + border-bottom-style: dotted; + border-bottom-color: #CCCCCC; + background-color:#ededed; +} +.crmFormList{ + border:1px solid #cccccc; + width:90%; + height:120px; + +} +.cellBottomDotLinePlain { + border-bottom-width: 2px; + border-bottom-style: dotted; + border-bottom-color: #CCCCCC; + +} + +.thickBorder { + border: 2px solid #999999; +} +.trackerHeading { + background-color:#efefef; +} +.trackerListBullet { + border-right:1px dotted #cccccc; + background-color:#f9f9f9; +} +.trackerList { + border-bottom:1px solid #eeeeee; +} + +/* Table Definitions */ +.crmTable { + border:1px solid #dadada; +} + +.crmTableRow { + border-bottom:1px dotted #dadada; + border-right:1px dotted #dadada +} + +/* Inventory */ + +.lineOnTop { + border-top:1px solid #999999; +} + +.discountUI{ + border:3px solid #CCCCCC; + width:250px; + padding:5px; + position:absolute; + background-color:#FFFFFF; + display:none; +} + +.TaxShow{ + display:inline-table; +} + +.TaxHide{ + display:none; +} + +/* Inventory */ + + +/* Email Client Classes ++++++++++++++++++++++ */ + +.emailSelected{ + background-color:#eaeaea; + color:#000000; + font-size:bold; +} + + +.mailClient{ + border:2px solid #656565; +} + +.mailClientBg { + background-color:#efefef; + background-image:url(images/layerPopupBg.gif); +} + +.mailSubHeader { + background:#d9d9d9 url(images/mailSubHeaderBg.gif) repeat-x; + padding:4px; +} +.mailClientWriteEmailHeader { + font-family:arial, helvetica, sans-serif; + font-size:20px; + line-height:24px; + font-weight:bold; + background:#e0e0e0 url(images/mailSubHeaderBg.gif) repeat-x; + padding:10px; + border-left:1px solid #eaeaea; + border-top:1px solid #eaeaea; + border-right:1px solid #999; + border-left:1px solid #999;; +} + +.mailClientCSSButton { + border-left:1px solid #fff; + border-top:1px solid #fff; + border-right:1px solid #333; + border-bottom:1px solid #333; + padding:2px; + background-color:#cfcfcf; +} + +/* Email Client Classes ends ------------------------------------ */ + + + +/* Layer Popup */ +.layerPopup { + border:3px solid #959595; + background:#fffff5 url(images/layerPopupBg.gif) ; + position:absolute; +} + +.layerPopupHeading { + font-family:arial, helvetica, sans-serif; + font-size:16px; + line-height:24px; + font-weight:bold; +} +.layerHeadingULine { + border-bottom:2px solid #777; +} +.layerPopupTransport { + background-color:#eaeaea; + +} +.homePageSeperator { + border-right:1px dotted #ddd; +} +.homePageMatrixHdr { + border-bottom:1px solid #d3d3d3; + background:#fffff5 url(images/layerPopupBg.gif) ; +} + +.reportsListTable { + background-color:white; + border-left:1px solid #aaa; + border-right:1px solid #aaa; + border-bottom:1px solid #aaa; +} + +.reportGenerateTable{ + background-image:url(images/layerPopupBg.gif); + border-left:2px dotted #aaa; + border-right:2px dotted #aaa; + border-bottom:2px dotted #aaa; +} +.reportCreateBottom{ + background-color:#eaeaea; + border-bottom:2px solid #777; + +} +.importLeadUI{ + /*background:#ffffff url(images/select.gif) ; */ + background-color:#fff; +} + +a.customMnu{ + padding-left:30px; + padding-top:5px; + padding-bottom:5px; + display:block; + background-repeat:no-repeat; + background-position:left; + width:155px; + color:#000000; + text-decoration:none; +} + +a.customMnuSelected{ + padding-left:30px; + padding-top:5px; + padding-bottom:5px; + display:block; + background-repeat:no-repeat; + background-position:left; + width:155px; + background-color:#0099FF; + color:#FFFFFF; + text-decoration:none; +} + + +/* Drop Down Menu */ +.drop_mnu{ + position:absolute; + left:0px; + top:0px; + z-index:1000000001; + border-left:1px solid #a5a5a5; + border-right:1px solid #a5a5a5; + border-bottom:1px solid #a5a5a5; + width:150px; + display:none; + padding:0px; + text-align:left; + overflow-x:hidden; + overflow-y:hidden; + background-color:#eee; +} + +a.drop_down{ + width:150px; + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:20px; + font-weight:normal; + color:#009; + background-color:#eee; + padding:2px 5px 2px 5px; + border-top:1px solid #fafafa; + border-bottom:1px solid #d3d3d3; + display:block; +} + +a.drop_down:Hover{ + padding:2px 5px 2px 5px; + width:150px; + text-align:left; + color:#33a; + font-weight:normal; + text-decoration:underline; + background-color:#dadada; +} + +.bgwhite{ + background-color:white; +} + +.searchUIBasic { + background-image:url(images/layerPopupBg.gif); + border:2px solid #a5a5a5; +} +.searchUIAdv1{ + background-image:url(images/layerPopupBg.gif); + border-top:2px solid #a5a5a5; + border-left:2px solid #a5a5a5; + border-right:2px solid #a5a5a5; +} +.searchUIAdv2{ + background-image:url(images/layerPopupBg.gif); + border-left:2px solid #a5a5a5; + border-right:2px solid #a5a5a5; +} +.searchUIAdv3{ + background-image:url(images/layerPopupBg.gif); + border-bottom:2px solid #a5a5a5; + border-left:2px solid #a5a5a5; + border-right:2px solid #a5a5a5; +} + + + +/* Recalculate Disabling Window */ + +.veil{ + background: url(images/layerPopupBg.gif) ; + height: 100%; + width: 100%; + top: 0px; + left: 0px; + overflow: hidden; + z-index: 10000; + Filter: Alpha(opacity = 70); + -moz-opacity: 0.7; + text-align: center; + vertical-align: middle; + position: absolute; +} + +.veil_new{ + background: url(images/layerPopupBg.gif) ; + height: 100%; + width: 100%; + top: 0px; + left: 0px; + overflow: hidden; + z-index: 50000; + Filter: Alpha(opacity = 70); + -moz-opacity: 0.7; + text-align: center; + vertical-align: middle; + position: absolute; +} + +.optioncontainer{ + vertical-align: middle; + height: 100%; + width: 100%; + position: absolute; + z-index: 90000; +} + + +.options{ + vertical-align: middle; + margin-left: 25%; + margin-top: 16%; + color: #FFFFFF; + width:650px; + background-color: Black; + border: 2px solid #222; + position: relative; + text-align: left; + z-index: 80000; +} + +.options h2{ + color: White; + font-family: Verdana, Arial, Helvetica, sans-serif; + border-bottom: 1px solid #373D4C; + margin: 0; + font-weight: normal; +} +.groupname{ + width:125px; + } +.winmarkModulesdef{ + background-image:url(images/alphagrayHomeMark.gif); + background-position:top; + background-repeat:repeat-x; + + +/* Recalculate Disable Ends */ + Modified: vtigercrm/branches/5.1_jens/themes/bluelagoon/images/aboutUS.jpg ============================================================================== Binary files - no diff available. Modified: vtigercrm/branches/5.1_jens/themes/bluelagoon/images/cal12x12Shared.gif ============================================================================== Binary files - no diff available. Modified: vtigercrm/branches/5.1_jens/themes/bluelagoon/style.css ============================================================================== --- vtigercrm/branches/5.1_jens/themes/bluelagoon/style.css (original) +++ vtigercrm/branches/5.1_jens/themes/bluelagoon/style.css Mon Apr 16 12:27:44 2007 @@ -1,2234 +1,2284 @@ -/********************************************************************************* - -** The contents of this file are subject to the vtiger CRM Public License Version 1.0 - * ("License"); You may not use this file except in compliance with the License - * The Original Code is: vtiger CRM Open Source - * The Initial Developer of the Original Code is vtiger. - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - ********************************************************************************/ - - -/* WOOD SPICE - COLOR THEME*/ - -.small { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; -} -.big { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 18px; - color: #000000; - font-weight:bold; -} - -.componentName { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - line-height: 18px; - color: #3333ff; - font-weight:bold; - border-left:2px dotted #fff; - padding:10px; -} - - -.genHeaderBig{ - font-family: Arial, Helvetica, sans-serif; - font-size: 16px; - line-height: 19px; - color: #000000; - font-weight:bold; -} -.genHeaderSmall{ - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 16px; - color: #000000; - font-weight:bold; -} - -.moduleName { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - color: #000033; - font-weight:bold; -} - - -.hdrNameBg { - background:#ffffff url(images/hdrNameBg.gif) repeat-x; - - -} - -.hdrTabBg { - background:#ffffff url(images/hdrTabBg.gif) bottom repeat-x ; - background-color:#fff; -} - -.tabSelected { - background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; - background-color:#1F5EFF; - font-family: Arial, Helvetica, sans-serif; - font-weight:bold; - font-size: 11px; - padding-left:10px; - padding-right:10px; - padding-top:2px; - padding-bottom:2px; - -} - -.tabSelected a{ - color:white; -} - -.tabUnSelected { - - background: #efedd4 url(images/tabUnSelectedBg.gif) bottom repeat-x; - background-color:#AFDBFF; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:10px; - padding-right:10px; - padding-top:2px; - padding-bottom:2px; - border-bottom:1px solid #ffffff; -} - -.tabUnSelected a{ - color:#000099; -} - -.tabSeperator { - background-color:#aae; - width:1px; -} - - - -.level2text { - - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:15px; - padding-right:15px; - padding-top:5px; - padding-bottom:5px; - font-weight:bold; - color:white; -} - -.level2text a{ - text-decoration:none; - color:#555555; -} - -.level2text a:hover { - text-decoration:underline; - color:#555555; - -} - - -.level2Bg { - background:#1F5BFF url(images/level2TabBg.gif) bottom repeat-x; - background-color:#1F5BFF; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - border-bottom:1px solid #222255; - color:white; -} - -.level2Bg a{ - /* background:#1F5BFF url(images/level2TabBg.gif) bottom repeat-x; */ - color:white; -} - - -.level2SelTab{ - font-weight:bold; - color:#000000; - padding-left:20px; - padding-right:20px; - padding-top:5px; - padding-bottom:5px; - -} - -.level2UnSelTab{ - color:#000000; - padding-left:20px; - padding-right:20px; - padding-top:5px; - padding-bottom:5px; -} -.sep1 { - background:#999999; -} - -.showPanelBg { - background:url(images/showPanelTopBg.gif) repeat-x; -} - -a { - text-decoration:none; - color:#3344bb; -} - -a:hover { - text-decoration:underline; -} - -.hdrLink { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - text-decoration:none; - color:#0000cc; - font-weight:bold; -} - -.hdrLink:hover { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - text-decoration:underline; - color:#0000cc; - font-weight:bold; -} - -.searchBox { - border: 0px solid #0000aa; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:2px; - width:100px; - background-color:#ffffef; -} - -.searchBtn { - border :0px #cccccc solid; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - font-weight:bold; - width:30px; - height:19px; - background-color:#009; - color:white; -} - - -/* List View Table classes starts +++++++++++++++++ */ - -.lvt { - background-color:#ddf; - border:1px solid #cce; -} - -.lvtBg { -} - -.lvtHeaderText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - font-weight:bold; -} - -.lvtCol { - border-top:1px solid #eeeeff; - border-left:1px solid #eeeeff; - border-right:1px solid #9999dd; - border-bottom:1px solid #9999dd; - background-color:#eef; - font-weight:bold; -} - -.lvtColData { - background-color:#ffffff; -} - -.lvtColDataHover { - background-color:#eeefff; - -} - - -/* List View Table classes ends --------------------------------*/ - - - -/* Detailed View classes starts +++++++++++++++++++++++ */ -.dvHeaderText{ - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - color:#000000; - font-weight:bold; - -} - -.dvInnerHeader{ - border-bottom:2px solid #4F94CD; - padding:5px; - background-color:#afdbff; - -} - -.dvtSelectedCell { - border-left:2px solid #00BFFF; - border-top:2px solid #00BFFF; - border-right:2px solid #00BFFF; - padding-left:20px; - padding-right:20px; - background-color:white; - font-weight:bold; -} - -.dvtUnSelectedCell { - border-left:2px solid #00BFFF; - border-top:2px solid #00BFFF; - border-right:2px solid #00BFFF; - border-bottom:2px solid #00BFFF; - padding-left:20px; - padding-right:20px; - background-color:#ffffee; - cursor:pointer; -} - -.dvtTabCache { - border-bottom:2px solid #00BFFF; -} - -.dvtContentSpace { - border-left:2px solid #00BFFF; - border-right:2px solid #00BFFF; - border-bottom:2px solid #00BFFF; - padding-left:0px; -} - -.dvtCellLabel, .cellLabel { - background-color:#f5f5ff; - padding-right:10px; - padding-left:10px; - border-bottom:1px solid #dadaee ; - border-top:1px solid #ffffff ; - color:#545454; - white-space:nowrap; -} - -.dvtCellInfo, .cellInfo { - padding-left:10px; - padding-right:10px; - border-bottom:1px solid #efefef; - white-space:nowrap; -} - -.rightMailMerge { - border:2px solid #aae; -} - -.rightMailMergeHeader { - border-bottom:1px solid #dde; - padding:5px; - background-color:#eef; - -} - -.rightMailMergeContent { - padding:5px; - background-color:#fafafa; - -} - -.detailedViewHeader{ - border-bottom:2px solid #4F94CD; - padding:5px; - background-color:#afdbff; -} - -.detailedViewTextBox { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:90%; - background-color:#ffffff; -} - -.detailedViewTextBoxOn { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:90%; - background-color:#ffffdd; -} - -.detailedViewTextBoxDis { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #555555; - border:1px solid #bababa; - padding-left:5px; - width:90%; - background-color:#aaaaaa; -} - -.detailedViewTextArea { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:95%; - height:100px; - background-color:#ffffff; - text-align:left; -} - -.advSearch { - padding:10px; - border-left:1px solid #eaeaea; - border-right:1px solid #eaeaea; - border-bottom:1px solid #eaeaea; - overflow:auto; - width:600px; - height:150px; - background-color:#ffffef; - -} - -.searchAlph { - border:1px solid #dadada; - background-color:#ffffff; - cursor:pointer; - width:10px - -} -.searchAlphselected { - border:1px solid #666666; - background-color:#bbbbbb; - cursor:pointer; - width:10px - -} -.textbox { - border:1px solid #999999; - background-color:#ffffff; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - width:120px; - padding:2px; - -} - - -.mx { -} - -.calListTable td{ - border-bottom:1px solid #efefef; - border-left:1px solid #efefef; -} -.calDIV { - width:100%; - border:1px solid #999999; - -} - -.calDayHour { - border-top:1px solid #c5d5ff; - border-left:1px solid #c5d5ff; - border-bottom:1px solid #c5d5ff; - border-right:1px solid #c5d5ff; - background-color:#eae7da; -} - -.calAddEvent { - position:absolute; - z-index:10000; - width:500px; - left:200px; - top:150px; - background-color:#ffffff; -} -.addEventInnerBox { - border:1px dotted #dadada; - -} - - -.cellNormal { - border:0px; - background-color:#ffffff; -} - - -.thumbnail{ - background-color:#ffffff; -padding: 7px; -border: 1px solid #ddd; -float: left; - margin-right: 10px; - margin-bottom: 15px; -} - - -.padTab{ - padding-top:0px; - padding-left:0px; - padding-left:10px; - padding-bottom:0px; - vertical-align:top; - -} -#company{ - position:relative; - width:100%; - height:200px; - display:block; - background-color:#FFFFFF; - white-space:nowrap; - overflow:auto; - border:1px solid #CCCCCC; -} - - -#user{position:relative;left:0px;top:0px;width:100%;display:block;} -/*#studio{position:relative;left:0px;top:0px;width:100%;display:block;}*/ -#communication{position:relative;left:0px;top:0px;width:100%;display:block;} -#config{position:relative;left:0px;top:0px;width:100%;display:block;} - -#userTab{position:relative;left:0px;top:0px;width:100%;display:none;} -#one{ - position:relative; - display:block; - width:245px; -} - -#mnuTab1{ - - position:relative; - - overflow:auto; - - width:100%; - - display:none; - -} - -#mnuTab2{ - - position:relative; - - overflow:auto; - - width:100%; - - display:none; - -} - - -/* End of Settings */ - -.bgwhite{ - background-color: #FFFFFF; -} -.copy{ - font-size:9px; - font-family: Verdana, Arial, Helvetica, Sans-serif; -} - -#basicTab{ - position:relative; - overflow:auto; - width:100%; - display:block; -} - -#moreTab{ - position:relative; - overflow:auto; - width:100%; - display:none; -} - -/*Added for Advance Seearch*/ - - -#one{ - position:relative; - display:block; - width:245px; -} - -/* Dashboard CSS */ -a.dash_href{ - display:block; - width:24px;height:24px; - vertical-align:middle; - margin-top:10px; -} -.dashHeading { - font-family:Arial, Helvetica, sans-serif; - font-size:24px; - font-weight:bold; - color:#fff; -} -.dashSelectBg{ - background-image:url(images/dashSelectBg.gif); - background-repeat:repeat-x; -} -.dash_top{ - background-image:url(images/dashTopBg.gif); - background-repeat:repeat-x; - height:63px; - vertical-align:middle; -} - -.dash_border{ - background-color:#738bff; - padding:5px; -} - - -.dash_white{ - background-color:#FFFFFF; - padding:5px 10px 5px 10px; -} - -.dash_bdr_btm{ - border-bottom:2px dotted #939271; -} - -.dash_count{ - font-size:36px; - font-weight:bold; - text-decoration:none; - color:#000000; - padding-left:10px;padding-right:10px; -} -.dash_switch{ - cursor:pointer; - width:26px; - height:26px; -} - -.dash_row_sel{ - background-image:url(images/dash_sel_chart.jpg); - background-repeat:no-repeat; - background-position:center; - width:26px;height:26px; - text-align:center; - vertical-align:middle; - font-weight:bold; - font-size:10px; - text-decoration:none; -} - -.dash_row_unsel{ - background-image:url(images/dash_unsel_chart.jpg); - background-repeat:no-repeat; - background-position:center; - width:26px;height:26px; - text-align:center; - vertical-align:middle; - font-weight:normal; - font-size:10px; - text-decoration:none; - cursor:pointer; -} - -.dash_chart_btm{ - border-bottom:2px solid #000000; -} - - -.dash_bottom{ - background-image:url(images/dashBottomBg.gif); - background-repeat:repeat-x; - height:99px; - vertical-align:middle; -} - -.dash_btm{ - background-image:url(images/dash_btm_center.jpg); - background-repeat:repeat-x; - position:top; -} - - -/* clock */ - -.citystyle{ - position:relative; - top:0px; - left:0px; - text-align:left; - -} -#theClockLayer{ - position:relative; - height:180px; - left:20px; - text-align:center; -} -.handsanddotsstyle{ - margin-top:10px; - position:absolute; - top:0px; - left:0px; - width:2px; - height:2px; - font-size:2px; - background-color:#000000; -} -.facestyle{ - margin-top:10px; - position:absolute; - top:0px; - left:0px; - width:15px; - height:15px; - text-align:center; - font-family:arial,sans-serif; - font-size:10px; - color:#000000; -} -.datestyle{ - margin-top:20px; - position:absolute; - top:0px; - left:0px; - width:100px; - text-align:center; - font-family:arial,sans-serif; - font-size:10px; - color:#000000; -} -.ampmstyle{ - margin-top:23px; - position:absolute; - top:0px; - left:0px; - width:20px; - text-align:center; - font-family:arial,sans-serif; - font-size:10px; - color:#000000; -} - -#wclock{ - position:absolute; - left:100px; - top:100px; - display:none; - background-color:#CCCCCC; - width:175px; -} - -.leftFormBorder1 { - border: 1px solid #AFC8E4; - background-color: #FFFFFF; - opacity:.7; -} - - - - -/* Calculator */ -.calcResult { - width: 100%; - height: 25px; - background-color: #FFFFCC;/*CBDFD6*/ - border-top: 1px solid #CCC; - border-left: 0px; - border-right: 1px solid #CCC; - border-bottom: 1px solid #CCC; - font-size: 10px; - text-align: right; -} -.calcMem { - width: 100%; - height: 25px; - border-top: 1px solid #CCC; - border-left: 1px solid #CCC; - border-right: 0px; - border-bottom: 1px solid #CCC; - background-color: #FFFFCC;/*CBDFD6*/ - font-family: Arial; - font-size: 10px; - color: #BBB; - text-align: left; -} -.calcBlackBtn, .calcGreyBtn, .calcBigBtn, .calcCancBtn, .calcMemBtn, .calcBackBtn { - border: none; - height: 20px; - font-size: 11px; - color: #FFF; - text-align:center; -} -.calcBackBtn { - background: url(images/calc_back_btn.gif) no-repeat; - width:25px; -} -.calcBlackBtn { - background: url(images/calc_black_btn.gif) no-repeat; - width:25px; -} -.calcGreyBtn { - background: url(images/calc_grey_btn.gif) no-repeat; - width:25px; -} -.calcCancBtn { - background: url(images/calc_canc_btn.gif) no-repeat; - width:25px; - -} -.calcMemBtn { - background: url(images/calc_mem_btn.gif) no-repeat; - width:25px; - /*background-color: #CCC;*/ -} - -#calc{ - position:absolute; - left:100px; - top:100px; - background-color:#FFFFFF; - width:185px; - border-bottom:2px solid #000000; - border-right:2px solid #666666; - border-left:2px solid #CCCCCC; - border-top:2px solid #CCCCCC; -} - -/* RSS STYLES */ - -.subHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-image:url(images/rssHeader.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; -} - -.delBg{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-image:url(images/rssdelete.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; -} - -#rssScroll{ - font-family:Arial, Helvetica, sans-serif ; - font-size:12px; - background-color:#FFFFFF; - width:100%; - height:130px; - overflow:auto; - border:0px solid #000000; -} - -.rssTable{ - width:100%; - border:0px solid #CCCCCC; -} - -.rssTable tr th{ - background-color:#00BFFF; - text-align:left; - border-bottom:1px solid #99F; - border-top:1px solid #FFFFFF; - color:#000000; - padding-left:5px; - padding-right:5px; - height:20px; -} - -.rssTable tr td{ - text-align:left; - border-bottom:1px dotted #dadada; - border-left:1px dotted #dadada; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - white-space:nowrap; - padding:2px; - -} - - -.forwardBg{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - color:#000000; - background-image:url(images/rssforward.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; - background-color:#D7D7D7; -} - - -/* New Styles */ - -.mnuTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#000000; - width:100%; - border:0px solid #000000; -} - -.mnuTab tr td{ - border-bottom:1px solid #EBEBEB; - padding-left:5px; - vertical-align:middle; -} - -/* profile */ - -.prvPrfBigText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; -} - -.prvPrfTopBg { - background-color:#ebebeb; -} - -.prvPrfBottomBg { - background-color:#ebebeb; -} - -.prvPrfOutline { - border:1px solid #ebebeb; -} - -.prvPrfTexture { - background:url(images/prvPrfTexture1.gif); - -} -.prvPrfHoverOn { - background-color:#ffffef; - -} - -/* Organization */ - -.orgTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - color:#666666; - border:0px solid #9B9B9B; - border-collapse:collapse; - width:100%; -} - -.orgTab tr th{ - text-align:left; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-decoration:none; - font-weight:bold; - height:20px; - padding-left:5px; -} - -.orgTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:none; - font-weight:normal; - padding-left:5px; - height:20px; - border-bottom:1px solid #CCCCCC; - border-right:1px solid #CCCCCC; -} - - -.groupli{ - margin-left:20px; - font-family:Arial, Helvetica, sans-serif; - font-weight:normal; - font-size:12px; - text-decoration:none; - color:#333333; - list-style-type:none; - text-align:left; -} - -/* tree menu */ - -/*Oraganization Edit Features */ - -#orgLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:500px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - display:block; - position:absolute; - left:0px; - top:0px; -} - -/* Role */ - -#roleLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - display:none; - position:absolute; -} - -.classBtn{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:10px; - background-color:#DBDBDB; - border-bottom:2px solid #999999; - border-right:2px solid #999999; - border-top:2px solid #F5F5F5; - border-left:2px solid #F5F5F5; - color:#000000; - text-align:center; - padding-top:3px; - padding-bottom:3px; -} - - -.txtBox{ - width:85%; - border:1px solid #666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; -} - -/* IMPORT LEADS */ - -.leadTable{ - border:3px solid #CCCCCC; - border-collapse:collapse; -} - -.leadTable tr td{ -/* border:0px solid #CCCCCC;*/ -} - -.genHeaderGray{ - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 16px; - color: #888888; - font-weight:bold; -} - -.genHeaderGrayBig{ - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - line-height: 16px; - color: #888888; - font-weight:bold; -} - -.importBox{ - width:125px; - border:1px solid #666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; -} - - -.txtGreen{ - color:green; -} - -/* PICK LIST */ -ul li{ - padding-bottom:2px; - padding-top:2px; -} -/* MY PREFERENCES */ - - -/* CSS FOR REPORTS */ - -.reportHdr{ - background-color:#DDDDDD; - font-size:12px; - font-weight:bold; - vertical-align:middle; - text-align:left; - height:30px; - border-bottom:2px solid #959595; - color:#000000; - padding-left:10px; -} - -#reportLay{ - width:175px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; - z-index:2000; -} - -#locateMap{ - width:120px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; - z-index:2000; -} - - -a.reportMnu{ - font-size:11px; - color:#0070BA; - text-decoration:none; - display:block; - width:155px; - height:20px; - border-bottom:1px solid #E1E1E1; - padding-left:20px; - padding-top:3px; -} - -a.reportMnu:Hover{ - font-size:11px; - color:#0070BA; - text-decoration:underline; - display:block; - width:155px; - height:20px; - border-bottom:1px solid #E1E1E1; - padding-left:20px; - padding-top:3px; -} - -#Generate{ - position:relative; - width:100%; - text-align:center; - display:none; -} -/* END OF REPORT */ -/* WEB MAIL */ -a.webMnu{ - font-size:11px; - color:#0070BA; - text-decoration:underline; -} -a.webMnu:Hover{ - font-size:11px; - color:#0070BA; - text-decoration:underline; -} - - -/* END OF WEB MAIL */ - -/* POPUP */ - - a.alpha{ - font-size:11px; - color:gray; - text-decoration:none; - padding-Left:5px; - padding-right:5px; - border:1px dotted #CCCCCC; - background-color:#FFFFCC; -} - -a.alpha:Hover{ - font-size:11px; - color:gray; - text-decoration:underline; - padding-Left:5px; - padding-right:5px; - border:1px dotted #CCCCCC; - background-color:#FFFFCC; -} - -/* Home Page */ -.MatrixLayer{ - border:2px solid #a5b5ee; - background-color:#FFFFFF; - width:29%; - position:relative; - visibility:visible; - margin:9px; - height:280px; -} - -.fontBold{ - font-size:13px; - color:#000000; - text-decoration:none; - font-weight:bold; -} - -.style_Gray{ - color:gray; -} - -/* End of Home Page */ - -/* All Menu */ -#allMenu{ - width:500px; - border:4px solid #a5b5ff; - left:300px; - top:100px; - position:absolute; - z-index:1000001; - display:none; - padding:10px; - background:#ffffff url(images/layerPopUpBg.gif); -} - - -.allMnuTable{ - width:100%; - background-color:#FFFFFF; -} - -.allMnuHandle td{ - height:20px; - color:#FFFFFF; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - text-decoration:none; - background-color:#000066; - cursor:move; - padding:2px; - border-bottom:2px solid #666666; -} - -.allMnuHdr{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-weight:Bold; - font-size:11px; - text-decoration:none; - display:block; - background-color:#FFFFFF; - color:#000099; - padding-top:5px; - padding-bottom:5px; -} - -a.allMnu{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:10px; - text-decoration:none; - font-weight:normal; - display:block; - width:125px; - height:15px; - padding-left:5px; - padding-top:0px; - padding-bottom:0px; - background-color:#FFFFFF; - border:1px solid #FFFFFF; - color:#000033; - margin-left:20px; -} - -a.allMnu:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:10px; - text-decoration:none; - font-weight:normal; - display:block; - width:125px; - height:15px; - padding-left:5px; - padding-top:0px; - padding-bottom:0px; - background-color:#eef; - color:#333; -} -/* End Of All Menu */ - - - -/* Calendar */ -.calHdr{ - background-image:url(images/mailSubHeaderBg.gif); - background-repeat:repeat-x; - background-position:left top; - -} - -.calSel{ - background-image:url(images/dashSelectBg.gif); - background-repeat:repeat-x; - text-align:center; - color:#FFFFFF; - font-weight:bold; - width:8%; -} - -.calAddButton { - border: 1px solid #A5B5EF; - background:#D6D2AB url(images/calAddButtonBg.gif) repeat-x; - cursor:pointer; - height:20px; - - -} - -.calInnerBorder { - border-left:2px solid #A5B5EE; - border-right:2px solid #A5B5EE; - border-bottom:2px solid #A5B5EE; -} - -.calBorder { - border-left: 1px solid #A5B5EE; - border-right: 1px solid #A5B5EE; - border-bottom: 1px solid #A5B5EE; - background:#fefefe url(images/layerPopupBg.gif); - -} -.calTopRight { - border-right: 1px solid #A5B5EE; -} -.calUnSel{ - color:#000000; - font-weight:normal; - text-align:center; - width:8%; -} - - -a.calMnu{ - font-size:11px; - color:#0070BA; - text-decoration:none; - display:block; - height:20px; - padding-left:5px; - padding-top:3px; -} - -a.calMnu:Hover{ - font-size:11px; - color:#0070BA; - text-decoration:underline; - display:block; - height:20px; - padding-left:5px; - padding-top:3px; -} - -.bgwhite{ - background-color: #FFFFFF; -} -.copy{ - font-size:9px; - font-family: Verdana, Arial, Helvetica, Sans-serif; -} - -#mnuTab{ - position:relative; - width:100%; - display:block; -} - -#mnuTab2{ - position:relative; - overflow:auto; - width:100%; - display:none; -} -.style1 {color: #FF0000} - - -.event{ - background-color:#D3EAF0; - border:1px solid #999999; - text-align:left; - width:100%; - position:relative; - left:0px; - top:0px; - vertical-align:middle; - padding:1px; -} - -#hrView{ - display:block; -} - - -.calendarNav{ - font-size:12px; - color:#FFFFFF; - white-space:nowrap; - text-align:center; - font-weight:bold; - padding-left:10px; - padding-right:10px; - background-image:url(images/cal_nav.gif); - background-repeat:repeat-x; -} - -#addEventDropDown{ - position:absolute; - display:none; - width:150px; - border:1px solid #666666; - left:0px; - top:0px; - overflow:visible; - z-index:5000; -} - -.calAction{ - width:175px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; - z-index:2000; -} - -.calSettings{ - position:absolute; - z-index:20000; - width:500px; - left:200px; - top:150px; - background-color:#ffffff; -} - - -.outer{ - border-bottom:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - border-right:1px solid #CCCCCC; -} - - -.calTxt{ - width:50%; - border:1px solid #CCCCCC; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - padding-left:5px; -} - -#leadLay{ - position:relative; - width:100%; - float:left; - visibility:hidden; - padding:5px; - z-index:10000; -} - -/* End of Calendar */ - -/* Cal Year View */ -.eventDay{ - background-color:#FF9966; - font-weight:bold; -} - -.currDay{ - background-color:#006600; - font-weight:bold; - text-decoration:underline; -} - -.currDay a{ - color:#FFFFFF; - font-weight:bold; - text-decoration:underline; -} - - -/* End of Cal Year View */ - -/* Level 2 Menu Selected*/ - -level2Sel{ - color:#000000; - font-weight:bold; - text-decoration:underline; -} - -#DeleteLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; -} - -#CurrencyDeleteLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:350px; -} - - -/* For Report HTML Generation*/ -.rptCellLabel { - background-color:#f6f6f6; - padding-right:10px; - border-right: 1px solid #DDDDDD; - border-bottom:1px solid #eaeaea; - color:#737373; - font-weight: bold; - white-space:nowrap; -} -.rptTable { - border-left: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; - border-top: 1px solid #DDDDDD; -} -.rptTitle, .rptHead, .rptData, .rptGrpHead{ - font-family: Verdana, Arial, Helvetica, Sans-serif; - font-size: 11px; - text-align:left; - font-weight: normal; - height: 20px; - padding: 4px; - border-right: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; - background: #DDDDDD; -} -.rptGrp1Total, .rptGrp2Total, .rptTotal { - font-family: Verdana, Arial, Helvetica, Sans-serif; - font-size: 11px; - text-align:center; - font-weight: normal; - background: #FFF; - height: 20px; - padding: 4px; - border-right: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; -} -.rptGrpHead { - background: #FFF; - border-bottom: 1px solid #FFF; - border-top: 1px solid #DDDDDD; - font-weight: normal; -} - -.rptData { - background: #FFF; - font-weight: normal; -} -.rptEmptyGrp { - background: #FFF; - border-right: 1px solid #DDDDDD; -} -.statechange -{ - position:absolute; - visibility:hidden; - left:10px; - top:20px; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; -} -#PopupLay{ - position:absolute; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:500px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; - display:none; - left:100px; - top:100px; -} - -#folderLay{ - width:175px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; -} - -/* Css for quick Create */ - -.qcTransport{ - background-color:#d5d6ff; - -} - -#role_popup{ - position:relative; - left:0px; - top:0px; - width:95%; - height:300px; - overflow:auto; - border:1px solid #999999; - text-align:left; - background-color:#FFFFFF; - } - -.unread_email { - font-weight:bold; -} - - -/* MY SITES */ - -.unread_email { - font-weight:bold; -} - - -.tagCloud { - border:1px solid #aaf; -} - - -.tagCloudTopBg { - background: url(images/tagCloudBg.gif) repeat-x; - -} - -.tagCloudDisplay { - background-color:#fff; - padding:10px; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 14px; - color: #000000; - -} - -.h2 { - - font-size:18px; - line-height:20px; - -} - -.gray { - - color:gray; -} - - -ul { - list-style:circle; - line-height:20px; - padding-left:5px; - margin-left:20px; - font-weight:normal; - -} -.tagCloudTopBg { - background-image: url(images/tagCloudBg.gif); - background-repeat: repeat-x; -} - -.tagCloudDisplay { - background-color:#fff; - padding:5px; -} -.heading2 { - font-family: Arial, Helvetica, sans-serif; - font-size: 16px; - line-height: 16px; - font-weight:bold; - color: #000000; -} -.settingsUI { - - text-align:left; - background-color:#fff; - background-image:url(images/layerPopupBg.gif); - border:2px solid #aaaaff; -} - -.settingsTabHeader { - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height:22px; - font-weight:bold; - color:#ddf; - /* background-image: url(images/mailSubHeaderBg.gif); */ - background-color:#222299; - background-repeat: repeat-x; - padding-left:10px; - padding-right:10px; - -} - -.settingsTabList { - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:20px; - font-weight:normal; - color:#000000; - background-color:#efefff; - padding-left:30px; - border-top:1px solid #fff; - border-bottom:1px solid #99a; - border-right:1px solid #99a; - border-left:1px solid #fff; -} -.settingsTabSelected { - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:20px; - font-weight:bold; - color:#000000; - background-color:#ffffff; - padding-left:30px; - border-left:2px solid #ddf; - border-bottom:2px solid #ddf; - border-top:2px solid #ddf; -} -.settingsSelectedUI { - padding:10px; - background:url(images/settingsSelUIBg.gif) repeat-x; - background-color:#ffffff; -} -.settingsIconDisplay { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:14px; - padding:10px; - - color:#000000; - background-color:#ffffff; - padding-left:10px; -} -.settingsSelUITopLine{ - border-bottom:2px dotted #999999; - -} - -.tableHeading{ - background-color:#ffffff; - border-bottom:2px solid #555599; -} -.colHeader{ - background-color:#ddf; - border-left:1px solid #fff; - border-top:1px solid #fff; - border-right:1px solid #aaf; - border-bottom:1px solid #aaf; - font-weight:bold; - -} -.cellLabel { - background-color:#eaebd9; - border-top:1px solid #efefef; - border-bottom:1px solid #dadada; - color:#555555; - -} -.cellText { - color:#333333; - border-bottom:1px solid #dadada; -} - -.listTable{ - border-left:1px solid #cccccc; - border-right:1px solid #cccccc; - border-bottom:1px solid #cccccc; - -} - -.listTableRow{ - border-bottom:1px solid #eaeaea; - border-right :1px solid #eaeaea; - border-bottom:1px solid #eaeaea; - border-bottom:1px solid #eaeaea; -} -.listRow{ - border-bottom:2px solid #eaeaea; - -} - -.listTableTopButtons{ - background-color:#efefff; - background-image:url(images/layerPopupBg.gif); - -} - - -/* Buttons */ -.crmButton{ - - border-left:1px solid #ffffff; - border-top:1px solid #ffffff; - border-right:1px solid #555555; - border-bottom:1px solid #555555; -} - -.create{ - background-color:#0000CD; - color:#fff; - font-weight:bold; -} -.delete { - background-color:#C6E2FF; - color:#000; - font-weight:bold; -} -.edit { - background-color:#0000CD; - color:#fff; - font-weight:bold; -} -.save{ - background-color:#0000CD; - color:#fff; - font-weight:bold; -} -.cancel { - background-color:#C6E2FF; - color:#000; - font-weight:bold; -} - -.inactive{ -color:#999999; -} - -.active{ -color:#229922; - -} - -/* Buttons ends */ - - - -textarea { - width:95%; - height:70px; - border:1px solid #dadada; -} -.treeTable1{ - padding:0px; -} - -.prvPrfBigText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; -} - -.prvPrfTopBg { - background-color:#ebebeb; -} - -.prvPrfBottomBg { - background-color:#ebebeb; -} - -.prvPrfOutline { - border:1px solid #ebebeb; -} - - - -.prvPrfTexture { - background:url(images/prvPrfTexture1.gif); - -} - -.prvPrfHoverOn { - background-color:#ffffef; - -} - -.cellBottomDotLine { - border-bottom-width: 2px; - border-bottom-style: dotted; - border-bottom-color: #CCCCCC; - background-color:#ededed; -} -.crmFormList{ - border:1px solid #cccccc; - width:90%; - height:120px; - -} -.cellBottomDotLinePlain { - border-bottom-width: 2px; - border-bottom-style: dotted; - border-bottom-color: #CCCCCC; - -} -.thickBorder { - border: 2px solid #999999; -} -.trackerHeading { - background-color:#efefef; -} -.trackerListBullet { - border-right:1px dotted #cccccc; - background-color:#f9f9f9; -} -.trackerList { - border-bottom:1px solid #eeeeee; -} - -/* Table Definitions */ -.crmTable { - border:1px solid #dadada; -} -.crmTableRow { - border-bottom:1px dotted #dadada; - border-right:1px dotted #dadada -} -/* Inventory */ - -.lineOnTop { - border-top:1px solid #999999; -} - -.discountUI{ - border:3px solid #CCCCCC; - width:250px; - padding:5px; - position:absolute; - background-color:#FFFFFF; - display:none; -} - -.TaxShow{ - display:inline-table; -} - -.TaxHide{ - display:none; -} - -/* Inventory */ - - - - - -/* styles for RSS Display starts */ -/*.rssDisplay{ - background-color:#e8e3ca; -}*/ - - -/* styles for RSS Display ends */ - - - - - - - - -/* Email Client Classes ++++++++++++++++++++++ */ - -.emailSelected{ - background-color:#eaeaea; - color:#000000; - font-size:bold; -} - - -.mailClient{ - border:2px solid #6565ee; -} - -.mailClientBg { - background-color:#efefff; - background-image:url(images/layerPopupBg.gif); -} - -.mailSubHeader { - background:#b4b8ff url(images/mailSubHeaderBg.gif) repeat-x; - padding:4px; -} - -.mailClientWriteEmailHeader { - font-family:arial, helvetica, sans-serif; - font-size:20px; - line-height:24px; - font-weight:bold; - background:#e0dbb0 url(images/mailSubHeaderBg.gif) repeat-x; - padding:10px; - border-left:1px solid #eaeaea; - border-top:1px solid #eaeaea; - border-right:1px solid #939271; - border-left:1px solid #939271;; -} - -.mailClientCSSButton { - border-left:1px solid #fff; - border-top:1px solid #fff; - border-right:1px solid #333; - border-bottom:1px solid #333; - padding:2px; - background-color:#c3c2b1; -} - -/* Email Client Classes ends ------------------------------------ */ - - - -/* Layer Popup */ -.layerPopup { - border:3px solid #95a5ff; - background:#fffff5 url(images/layerPopupBg.gif) ; - position:absolute; -} - -.layerPopupHeading { - font-family:arial, helvetica, sans-serif; - font-size:16px; - line-height:24px; - font-weight:bold; -} -.layerHeadingULine { - border-bottom:2px solid #717351; -} -.layerPopupTransport { - background-color:#e2e5ff; - -} -.homePageSeperator { - border-right:1px dotted #d3d2c1; -} -.homePageMatrixHdr { - border-bottom:1px solid #d3d2c1; - background:#fffff5 url(images/layerPopupBg.gif) ; -} - -.reportsListTable { - background-color:white; - border-left:1px solid #a3a29f; - border-right:1px solid #a3a29f; - border-bottom:1px solid #a3a29f; -} - -.reportGenerateTable{ - background-image:url(images/layerPopupBg.gif); - border-left:2px dotted #a5b5ee; - border-right:2px dotted #a5b5ee; - border-bottom:2px dotted #a5b5ee; -} -.reportCreateBottom{ - background-color:#ddf; - border-bottom:2px solid #737251; - -} -.importLeadUI{ - /*background:#fffff5 url(images/select.gif) ; */ - background-color:white; -} - -a.customMnu{ - padding-left:30px; - padding-top:5px; - padding-bottom:5px; - display:block; - background-repeat:no-repeat; - background-position:left; - width:155px; - color:#000000; - text-decoration:none; -} - -a.customMnuSelected{ - padding-left:30px; - padding-top:5px; - padding-bottom:5px; - display:block; - background-repeat:no-repeat; - background-position:left; - width:155px; - background-color:#0099FF; - color:#FFFFFF; - text-decoration:none; -} - - -/* Drop Down Menu */ -.drop_mnu{ - position:absolute; - left:0px; - top:0px; - z-index:1000000001; - border-left:1px solid #a5b5ee; - border-right:1px solid #a5b5ee; - border-bottom:1px solid #a5b5ee; - width:150px; - display:none; - padding:0px; - text-align:left; - overflow-x:hidden; - overflow-y:hidden; - background-color:#eef; -} - -a.drop_down{ - width:150px; - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:20px; - font-weight:normal; - color:#33a; - background-color:#eef; - padding:2px 5px 2px 5px; - border-top:1px solid #fafafa; - border-bottom:1px solid #d3d3f3; - display:block; -} - -a.drop_down:Hover{ - padding:2px 5px 2px 5px; - width:150px; - text-align:left; - color:#33a; - font-weight:normal; - text-decoration:underline; - background-color:#ccf; -} - -.bgwhite{ - background-color:white; -} - -.searchUIBasic { - background-image:url(images/layerPopupBg.gif); - border:2px solid #a5b5ee; -} -.searchUIAdv1{ - background-image:url(images/layerPopupBg.gif); - border-top:2px solid #a5b5ee; - border-left:2px solid #a5b5ee; - border-right:2px solid #a5b5ee; -} -.searchUIAdv2{ - background-image:url(images/layerPopupBg.gif); - border-left:2px solid #a5b5ee; - border-right:2px solid #a5b5ee; -} -.searchUIAdv3{ - background-image:url(images/layerPopupBg.gif); - border-bottom:2px solid #a5b5ee; - border-left:2px solid #a5b5ee; - border-right:2px solid #a5b5ee; -} - -/* Recalculate Disabling Window */ - -.veil{ - background: url(images/layerPopupBg.gif) ; - height: 100%; - width: 100%; - top: 0px; - left: 0px; - overflow: hidden; - z-index: 10000; - Filter: Alpha(opacity = 70); - -moz-opacity: 0.7; - text-align: center; - vertical-align: middle; - position: absolute; -} - -.veil_new{ - background: url(images/layerPopupBg.gif) ; - height: 100%; - width: 100%; - top: 0px; - left: 0px; - overflow: hidden; - z-index: 50000; - Filter: Alpha(opacity = 70); - -moz-opacity: 0.7; - text-align: center; - vertical-align: middle; - position: absolute; -} - -.optioncontainer{ - vertical-align: middle; - height: 100%; - width: 100%; - position: absolute; - z-index: 90000; -} - - -.options{ - vertical-align: middle; - margin-left: 25%; - margin-top: 16%; - color: #FFFFFF; - width:650px; - background-color: Black; - border: 2px solid #222; - position: relative; - text-align: left; - z-index: 80000; -} - -.options h2{ - color: White; - font-family: Verdana, Arial, Helvetica, sans-serif; - border-bottom: 1px solid #373D4C; - margin: 0; - font-weight: normal; -} - -/* Recalculate Disable Ends */ - +/********************************************************************************* + +** The contents of this file are subject to the vtiger CRM Public License Version 1.0 + * ("License"); You may not use this file except in compliance with the License + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + ********************************************************************************/ + + +/* WOOD SPICE - COLOR THEME*/ + +.small { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; +} +.big { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height: 18px; + color: #000000; + font-weight:bold; +} + +.componentName { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + line-height: 18px; + color: #3333ff; + font-weight:bold; + border-left:2px dotted #fff; + padding:10px; +} + + +.genHeaderBig{ + font-family: Arial, Helvetica, sans-serif; + font-size: 16px; + line-height: 19px; + color: #000000; + font-weight:bold; +} +.genHeaderSmall{ + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + line-height: 16px; + color: #000000; + font-weight:bold; +} + +.moduleName { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + color: #000033; + font-weight:bold; +} + + +.hdrNameBg { + background:#ffffff url(images/hdrNameBg.gif) repeat-x; + + +} + +.hdrTabBg { + background:#ffffff url(images/hdrTabBg.gif) bottom repeat-x ; + background-color:#fff; +} + +.tabSelected { + background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; + background-color:#1F5EFF; + font-family: Arial, Helvetica, sans-serif; + font-weight:bold; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + +} + +.tabSelected a{ + color:white; +} + +.tabUnSelected { + + background: #efedd4 url(images/tabUnSelectedBg.gif) bottom repeat-x; + background-color:#AFDBFF; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + border-bottom:1px solid #ffffff; +} + +.tabUnSelected a{ + color:#000099; +} + +.tabSeperator { + background-color:#aae; + width:1px; +} + + + +.level2text { + + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding-left:15px; + padding-right:15px; + padding-top:5px; + padding-bottom:5px; + font-weight:bold; + color:white; +} + +.level2text a{ + text-decoration:none; + color:#555555; +} + +.level2text a:hover { + text-decoration:underline; + color:#555555; + +} + + +.level2Bg { + background:#1F5BFF url(images/level2TabBg.gif) bottom repeat-x; + background-color:#1F5BFF; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + border-bottom:1px solid #222255; + color:white; +} + +.level2Bg a{ + /* background:#1F5BFF url(images/level2TabBg.gif) bottom repeat-x; */ + color:white; +} + + +.level2SelTab{ + font-weight:bold; + color:#000000; + padding-left:20px; + padding-right:20px; + padding-top:5px; + padding-bottom:5px; + +} + +.level2UnSelTab{ + color:#000000; + padding-left:20px; + padding-right:20px; + padding-top:5px; + padding-bottom:5px; +} +.sep1 { + background:#999999; +} + +.showPanelBg { + background:url(images/showPanelTopBg.gif) repeat-x; +} + +a { + text-decoration:none; + color:#3344bb; +} + +a:hover { + text-decoration:underline; +} + +.hdrLink { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + text-decoration:none; + color:#0000cc; + font-weight:bold; +} + +.hdrLink:hover { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + text-decoration:underline; + color:#0000cc; + font-weight:bold; +} + +.searchBox { + border: 0px solid #0000aa; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding-left:2px; + width:100px; + background-color:#ffffef; +} + +.searchBtn { + border :0px #cccccc solid; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + font-weight:bold; + width:30px; + height:19px; + background-color:#009; + color:white; +} + + +/* List View Table classes starts +++++++++++++++++ */ + +.lvt { + background-color:#ddf; + border:1px solid #cce; +} + +.lvtBg { +} + +.lvtHeaderText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + font-weight:bold; +} + +.lvtCol { + border-top:1px solid #eeeeff; + border-left:1px solid #eeeeff; + border-right:1px solid #9999dd; + border-bottom:1px solid #9999dd; + background-color:#eef; + font-weight:bold; +} + +.lvtColData { + background-color:#ffffff; +} + +.lvtColDataHover { + background-color:#eeefff; + +} + + +/* List View Table classes ends --------------------------------*/ + + + +/* Detailed View classes starts +++++++++++++++++++++++ */ +.dvHeaderText{ + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + color:#000000; + font-weight:bold; + +} + +.dvInnerHeader{ + border-bottom:2px solid #4F94CD; + padding:5px; + background-color:#afdbff; + +} + +.dvtSelectedCell { + border-left:2px solid #00BFFF; + border-top:2px solid #00BFFF; + border-right:2px solid #00BFFF; + padding-left:20px; + padding-right:20px; + background-color:white; + font-weight:bold; +} + +.dvtUnSelectedCell { + border-left:2px solid #00BFFF; + border-top:2px solid #00BFFF; + border-right:2px solid #00BFFF; + border-bottom:2px solid #00BFFF; + padding-left:20px; + padding-right:20px; + background-color:#ffffee; + cursor:pointer; +} + +.dvtTabCache { + border-bottom:2px solid #00BFFF; +} + +.dvtContentSpace { + border-left:2px solid #00BFFF; + border-right:2px solid #00BFFF; + border-bottom:2px solid #00BFFF; + padding-left:0px; +} + +.dvtCellLabel, .cellLabel { + background-color:#f5f5ff; + padding-right:10px; + padding-left:10px; + border-bottom:1px solid #dadaee ; + border-top:1px solid #ffffff ; + color:#545454; + white-space:nowrap; +} + +.dvtCellInfo, .cellInfo { + padding-left:10px; + padding-right:10px; + border-bottom:1px solid #efefef; +} + +.rightMailMerge { + border:2px solid #aae; +} + +.rightMailMergeHeader { + border-bottom:1px solid #dde; + padding:5px; + background-color:#eef; + +} + +.rightMailMergeContent { + padding:5px; + background-color:#fafafa; + +} + +.detailedViewHeader{ + border-bottom:2px solid #4F94CD; + padding:5px; + background-color:#afdbff; +} + +.detailedViewTextBox { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:90%; + background-color:#ffffff; +} + +.detailedViewTextBoxOn { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:90%; + background-color:#ffffdd; +} + +.detailedViewTextBoxDis { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #555555; + border:1px solid #bababa; + padding-left:5px; + width:90%; + background-color:#aaaaaa; +} + +.detailedViewTextArea { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:95%; + height:100px; + background-color:#ffffff; + text-align:left; +} + +.advSearch { + padding:10px; + border-left:1px solid #eaeaea; + border-right:1px solid #eaeaea; + border-bottom:1px solid #eaeaea; + overflow:auto; + width:600px; + height:150px; + background-color:#ffffef; + +} + +.searchAlph { + border:1px solid #dadada; + background-color:#ffffff; + cursor:pointer; + width:10px + +} +.searchAlphselected { + border:1px solid #666666; + background-color:#bbbbbb; + cursor:pointer; + width:10px + +} +.textbox { + border:1px solid #999999; + background-color:#ffffff; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + width:120px; + padding:2px; + +} + + +.mx { +} + +.calListTable td{ + border-bottom:1px solid #efefef; + border-left:1px solid #efefef; +} +.calDIV { + width:100%; + border:1px solid #999999; + +} + +.calDayHour { + border-top:1px solid #c5d5ff; + border-left:1px solid #c5d5ff; + border-bottom:1px solid #c5d5ff; + border-right:1px solid #c5d5ff; + background-color:#eae7da; +} + +.calAddEvent { + position:absolute; + z-index:10000; + width:500px; + left:200px; + top:150px; + background-color:#ffffff; +} +.addEventInnerBox { + border:1px dotted #dadada; + +} + + +.cellNormal { + border:0px; + background-color:#ffffff; +} + + +.thumbnail{ + background-color:#ffffff; +padding: 7px; +border: 1px solid #ddd; +float: left; + margin-right: 10px; + margin-bottom: 15px; +} + + +.padTab{ + padding-top:0px; + padding-left:0px; + padding-left:10px; + padding-bottom:0px; + vertical-align:top; + +} +#company{ + position:relative; + width:100%; + height:200px; + display:block; + background-color:#FFFFFF; + white-space:nowrap; + overflow:auto; + border:1px solid #CCCCCC; +} + + +#user{position:relative;left:0px;top:0px;width:100%;display:block;} +/*#studio{position:relative;left:0px;top:0px;width:100%;display:block;}*/ +#communication{position:relative;left:0px;top:0px;width:100%;display:block;} +#config{position:relative;left:0px;top:0px;width:100%;display:block;} + +#userTab{position:relative;left:0px;top:0px;width:100%;display:none;} +#one{ + position:relative; + display:block; + width:245px; +} + +#mnuTab1{ + + position:relative; + + overflow:auto; + + width:100%; + + display:none; + +} + +#mnuTab2{ + + position:relative; + + overflow:auto; + + width:100%; + + display:none; + +} + + +/* End of Settings */ + +.bgwhite{ + background-color: #FFFFFF; +} +.copy{ + font-size:9px; + font-family: Verdana, Arial, Helvetica, Sans-serif; +} + +#basicTab{ + position:relative; + overflow:auto; + width:100%; + display:block; +} + +#moreTab{ + position:relative; + overflow:auto; + width:100%; + display:none; +} + +/*Added for Advance Seearch*/ + + +#one{ + position:relative; + display:block; + width:245px; +} + +/* Dashboard CSS */ +a.dash_href{ + display:block; + width:24px;height:24px; + vertical-align:middle; + margin-top:10px; +} +.dashHeading { + font-family:Arial, Helvetica, sans-serif; + font-size:24px; + font-weight:bold; + color:#fff; +} +.dashSelectBg{ + background-image:url(images/dashSelectBg.gif); + background-repeat:repeat-x; +} +.dash_top{ + background-image:url(images/dashTopBg.gif); + background-repeat:repeat-x; + height:63px; + vertical-align:middle; +} + +.dash_border{ + background-color:#738bff; + padding:5px; +} + + +.dash_white{ + background-color:#FFFFFF; + padding:5px 10px 5px 10px; +} + +.dash_bdr_btm{ + border-bottom:2px dotted #939271; +} + +.dash_count{ + font-size:36px; + font-weight:bold; + text-decoration:none; + color:#000000; + padding-left:10px;padding-right:10px; +} +.dash_switch{ + cursor:pointer; + width:26px; + height:26px; +} + +.dash_row_sel{ + background-image:url(images/dash_sel_chart.jpg); + background-repeat:no-repeat; + background-position:center; + width:26px;height:26px; + text-align:center; + vertical-align:middle; + font-weight:bold; + font-size:10px; + text-decoration:none; +} + +.dash_row_unsel{ + background-image:url(images/dash_unsel_chart.jpg); + background-repeat:no-repeat; + background-position:center; + width:26px;height:26px; + text-align:center; + vertical-align:middle; + font-weight:normal; + font-size:10px; + text-decoration:none; + cursor:pointer; +} + +.dash_chart_btm{ + border-bottom:2px solid #000000; +} + + +.dash_bottom{ + background-image:url(images/dashBottomBg.gif); + background-repeat:repeat-x; + height:99px; + vertical-align:middle; +} + +.dash_btm{ + background-image:url(images/dash_btm_center.jpg); + background-repeat:repeat-x; + position:top; +} + + +/* clock */ + +.citystyle{ + position:relative; + top:0px; + left:0px; + text-align:left; + +} +#theClockLayer{ + position:relative; + height:180px; + left:20px; + text-align:center; +} +.handsanddotsstyle{ + margin-top:10px; + position:absolute; + top:0px; + left:0px; + width:2px; + height:2px; + font-size:2px; + background-color:#000000; +} +.facestyle{ + margin-top:10px; + position:absolute; + top:0px; + left:0px; + width:15px; + height:15px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} +.datestyle{ + margin-top:20px; + position:absolute; + top:0px; + left:0px; + width:100px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} +.ampmstyle{ + margin-top:23px; + position:absolute; + top:0px; + left:0px; + width:20px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} + +#wclock{ + position:absolute; + left:100px; + top:100px; + display:none; + background-color:#CCCCCC; + width:175px; +} + +.leftFormBorder1 { + border: 1px solid #AFC8E4; + background-color: #FFFFFF; + opacity:.7; +} + + + + +/* Calculator */ +.calcResult { + width: 100%; + height: 25px; + background-color: #FFFFCC;/*CBDFD6*/ + border-top: 1px solid #CCC; + border-left: 0px; + border-right: 1px solid #CCC; + border-bottom: 1px solid #CCC; + font-size: 10px; + text-align: right; +} +.calcMem { + width: 100%; + height: 25px; + border-top: 1px solid #CCC; + border-left: 1px solid #CCC; + border-right: 0px; + border-bottom: 1px solid #CCC; + background-color: #FFFFCC;/*CBDFD6*/ + font-family: Arial; + font-size: 10px; + color: #BBB; + text-align: left; +} +.calcBlackBtn, .calcGreyBtn, .calcBigBtn, .calcCancBtn, .calcMemBtn, .calcBackBtn { + border: none; + height: 20px; + font-size: 11px; + color: #FFF; + text-align:center; +} +.calcBackBtn { + background: url(images/calc_back_btn.gif) no-repeat; + width:25px; +} +.calcBlackBtn { + background: url(images/calc_black_btn.gif) no-repeat; + width:25px; +} +.calcGreyBtn { + background: url(images/calc_grey_btn.gif) no-repeat; + width:25px; +} +.calcCancBtn { + background: url(images/calc_canc_btn.gif) no-repeat; + width:25px; + +} +.calcMemBtn { + background: url(images/calc_mem_btn.gif) no-repeat; + width:25px; + /*background-color: #CCC;*/ +} + +#calc{ + position:absolute; + left:100px; + top:100px; + background-color:#FFFFFF; + width:185px; + border-bottom:2px solid #000000; + border-right:2px solid #666666; + border-left:2px solid #CCCCCC; + border-top:2px solid #CCCCCC; +} + +/* RSS STYLES */ + +.subHdr{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#FFFFFF; + background-image:url(images/rssHeader.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; +} + +.delBg{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#FFFFFF; + background-image:url(images/rssdelete.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; +} + +#rssScroll{ + font-family:Arial, Helvetica, sans-serif ; + font-size:12px; + background-color:#FFFFFF; + width:100%; + height:200px; + overflow:auto; + border:0px solid #000000; +} + +.rssTable{ + width:100%; + border:0px solid #CCCCCC; +} + +.rssTable tr th{ + background-color:#00BFFF; + text-align:left; + border-bottom:1px solid #99F; + border-top:1px solid #FFFFFF; + color:#000000; + padding-left:5px; + padding-right:5px; + height:20px; +} + +.rssTable tr td{ + text-align:left; + border-bottom:1px dotted #dadada; + border-left:1px dotted #dadada; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + font-weight:normal; + white-space:nowrap; + padding:2px; + +} + + +.forwardBg{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#000000; + background-image:url(images/rssforward.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; + background-color:#D7D7D7; +} + + +/* New Styles */ + +.mnuTab{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:12px; + color:#000000; + width:100%; + border:0px solid #000000; +} + +.mnuTab tr td{ + border-bottom:1px solid #EBEBEB; + padding-left:5px; + vertical-align:middle; +} + +/* profile */ + +.prvPrfBigText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; +} + +.prvPrfTopBg { + background-color:#ebebeb; +} + +.prvPrfBottomBg { + background-color:#ebebeb; +} + +.prvPrfOutline { + border:1px solid #ebebeb; +} + +.prvPrfTexture { + background:url(images/prvPrfTexture1.gif); + +} +.prvPrfHoverOn { + background-color:#ffffef; + +} + +/* Organization */ + +.orgTab{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + font-weight:normal; + color:#666666; + border:0px solid #9B9B9B; + border-collapse:collapse; + width:100%; +} + +.orgTab tr th{ + text-align:left; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + text-decoration:none; + font-weight:bold; + height:20px; + padding-left:5px; +} + +.orgTab tr td{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-decoration:none; + font-weight:normal; + padding-left:5px; + height:20px; + border-bottom:1px solid #CCCCCC; + border-right:1px solid #CCCCCC; +} + + +.groupli{ + margin-left:20px; + font-family:Arial, Helvetica, sans-serif; + font-weight:normal; + font-size:12px; + text-decoration:none; + color:#333333; + list-style-type:none; + text-align:left; +} + +/* tree menu */ + +/*Oraganization Edit Features */ + +#orgLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:500px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + display:block; + position:absolute; + left:0px; + top:0px; +} + +/* Role */ + +#roleLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + display:none; + position:absolute; +} + +.classBtn{ + font-family:Verdana, Arial, Helvetica, sans-serif; + text-decoration:none; + font-weight:normal; + font-size:10px; + background-color:#DBDBDB; + border-bottom:2px solid #999999; + border-right:2px solid #999999; + border-top:2px solid #F5F5F5; + border-left:2px solid #F5F5F5; + color:#000000; + text-align:center; + padding-top:3px; + padding-bottom:3px; +} + + +.txtBox{ + width:85%; + border:1px solid #666666; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; +} + +/* IMPORT LEADS */ + +.leadTable{ + border:3px solid #CCCCCC; + border-collapse:collapse; +} + +.leadTable tr td{ +/* border:0px solid #CCCCCC;*/ +} + +.genHeaderGray{ + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + line-height: 16px; + color: #888888; + font-weight:bold; +} + +.genHeaderGrayBig{ + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + line-height: 16px; + color: #888888; + font-weight:bold; +} + +.importBox{ + width:125px; + border:1px solid #666666; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; +} + + +.txtGreen{ + color:green; +} + +/* PICK LIST */ +ul li{ + padding-bottom:2px; + padding-top:2px; +} +/* MY PREFERENCES */ + + +/* CSS FOR REPORTS */ + +.reportHdr{ + background-color:#DDDDDD; + font-size:12px; + font-weight:bold; + vertical-align:middle; + text-align:left; + height:30px; + border-bottom:2px solid #959595; + color:#000000; + padding-left:10px; +} + +#reportLay{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; + z-index:2000; +} + +#locateMap{ + width:120px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; + z-index:2000; +} + + +a.reportMnu{ + font-size:11px; + color:#0070BA; + text-decoration:none; + display:block; + width:155px; + height:20px; + border-bottom:1px solid #E1E1E1; + padding-left:20px; + padding-top:3px; +} + +a.reportMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; + display:block; + width:155px; + height:20px; + border-bottom:1px solid #E1E1E1; + padding-left:20px; + padding-top:3px; +} + +#Generate{ + position:relative; + width:100%; + text-align:center; + display:none; +} +/* END OF REPORT */ +/* WEB MAIL */ +a.webMnu{ + font-size:11px; + color:#0070BA; + text-decoration:underline; +} +a.webMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; +} + + +/* END OF WEB MAIL */ + +/* POPUP */ + + a.alpha{ + font-size:11px; + color:gray; + text-decoration:none; + padding-Left:5px; + padding-right:5px; + border:1px dotted #CCCCCC; + background-color:#FFFFCC; +} + +a.alpha:Hover{ + font-size:11px; + color:gray; + text-decoration:underline; + padding-Left:5px; + padding-right:5px; + border:1px dotted #CCCCCC; + background-color:#FFFFCC; +} + +/* Home Page */ +.MatrixLayer{ + border:2px solid #a5b5ee; + background-color:#FFFFFF; + width:29%; + position:relative; + visibility:visible; + margin:9px; + height:280px; +} + +.fontBold{ + font-size:13px; + color:#000000; + text-decoration:none; + font-weight:bold; +} + +.style_Gray{ + color:gray; +} + +/* End of Home Page */ + +/* All Menu */ +#allMenu{ + width:500px; + border:4px solid #a5b5ff; + left:300px; + top:100px; + position:absolute; + z-index:1000001; + display:none; + padding:10px; + background:#ffffff url(images/layerPopUpBg.gif); +} + + +.allMnuTable{ + width:100%; + background-color:#FFFFFF; +} + +.allMnuHandle td{ + height:20px; + color:#FFFFFF; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + font-weight:bold; + text-decoration:none; + background-color:#000066; + cursor:move; + padding:2px; + border-bottom:2px solid #666666; +} + +.allMnuHdr{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-weight:Bold; + font-size:11px; + text-decoration:none; + display:block; + background-color:#FFFFFF; + color:#000099; + padding-top:5px; + padding-bottom:5px; +} + +a.allMnu{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:10px; + text-decoration:none; + font-weight:normal; + display:block; + width:125px; + height:15px; + padding-left:5px; + padding-top:0px; + padding-bottom:0px; + background-color:#FFFFFF; + border:1px solid #FFFFFF; + color:#000033; + margin-left:20px; +} + +a.allMnu:Hover{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:10px; + text-decoration:none; + font-weight:normal; + display:block; + width:125px; + height:15px; + padding-left:5px; + padding-top:0px; + padding-bottom:0px; + background-color:#eef; + color:#333; +} +/* End Of All Menu */ + + + +/* Calendar */ +.calHdr{ + background-image:url(images/mailSubHeaderBg.gif); + background-repeat:repeat-x; + background-position:left top; + +} + +.calSel{ + background-image:url(images/dashSelectBg.gif); + background-repeat:repeat-x; + text-align:center; + color:#FFFFFF; + font-weight:bold; + width:8%; +} + +.calAddButton { + border: 1px solid #A5B5EF; + background:#D6D2AB url(images/calAddButtonBg.gif) repeat-x; + cursor:pointer; + height:20px; + + +} + +.calInnerBorder { + border-left:2px solid #A5B5EE; + border-right:2px solid #A5B5EE; + border-bottom:2px solid #A5B5EE; +} + +.calBorder { + border-left: 1px solid #A5B5EE; + border-right: 1px solid #A5B5EE; + border-bottom: 1px solid #A5B5EE; + background:#fefefe url(images/layerPopupBg.gif); + +} +.calTopRight { + border-right: 1px solid #A5B5EE; +} +.calUnSel{ + color:#000000; + font-weight:normal; + text-align:center; + width:8%; +} + + +a.calMnu{ + font-size:11px; + color:#0070BA; + text-decoration:none; + display:block; + height:20px; + padding-left:5px; + padding-top:3px; +} + +a.calMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; + display:block; + height:20px; + padding-left:5px; + padding-top:3px; +} + +.bgwhite{ + background-color: #FFFFFF; +} +.copy{ + font-size:9px; + font-family: Verdana, Arial, Helvetica, Sans-serif; +} + +#mnuTab{ + position:relative; + width:100%; + display:block; +} + +#mnuTab2{ + position:relative; + overflow:auto; + width:100%; + display:none; +} +.style1 {color: #FF0000} + + +.event{ + background-color:#D3EAF0; + border:1px solid #999999; + text-align:left; + width:100%; + position:relative; + left:0px; + top:0px; + vertical-align:middle; + padding:1px; +} + +#hrView{ + display:block; +} + + +.calendarNav{ + font-size:12px; + color:#FFFFFF; + white-space:nowrap; + text-align:center; + font-weight:bold; + padding-left:10px; + padding-right:10px; + background-image:url(images/cal_nav.gif); + background-repeat:repeat-x; +} + +#addEventDropDown{ + position:absolute; + display:none; + width:150px; + border:1px solid #666666; + left:0px; + top:0px; + overflow:visible; + z-index:5000; +} + +.calAction{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; + z-index:2000; +} + +.calSettings{ + position:absolute; + z-index:20000; + width:500px; + left:200px; + top:150px; + background-color:#ffffff; +} + + +.outer{ + border-bottom:1px solid #CCCCCC; + border-left:1px solid #CCCCCC; + border-right:1px solid #CCCCCC; +} + + +.calTxt{ + width:50%; + border:1px solid #CCCCCC; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + padding-left:5px; +} + +#leadLay{ + position:relative; + width:100%; + float:left; + visibility:hidden; + padding:5px; + z-index:10000; +} + +/* End of Calendar */ + +/* Cal Year View */ +.eventDay{ + background-color:#FF9966; + font-weight:bold; +} + +.currDay{ + background-color:#006600; + font-weight:bold; + text-decoration:underline; +} + +.currDay a{ + color:#FFFFFF; + font-weight:bold; + text-decoration:underline; +} + + +/* End of Cal Year View */ + +/* Level 2 Menu Selected*/ + +level2Sel{ + color:#000000; + font-weight:bold; + text-decoration:underline; +} + +#DeleteLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; +} + +#CurrencyDeleteLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:350px; +} + + +/* For Report HTML Generation*/ +.rptCellLabel { + background-color:#f6f6f6; + padding-right:10px; + border-right: 1px solid #DDDDDD; + border-bottom:1px solid #eaeaea; + color:#737373; + font-weight: bold; + white-space:nowrap; +} +.rptTable { + border-left: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; + border-top: 1px solid #DDDDDD; +} +.rptTitle, .rptHead, .rptData, .rptGrpHead{ + font-family: Verdana, Arial, Helvetica, Sans-serif; + font-size: 11px; + text-align:left; + font-weight: normal; + height: 20px; + padding: 4px; + border-right: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; + background: #DDDDDD; +} +.rptGrp1Total, .rptGrp2Total, .rptTotal { + font-family: Verdana, Arial, Helvetica, Sans-serif; + font-size: 11px; + text-align:center; + font-weight: normal; + background: #FFF; + height: 20px; + padding: 4px; + border-right: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; +} +.rptGrpHead { + background: #FFF; + border-bottom: 1px solid #FFF; + border-top: 1px solid #DDDDDD; + font-weight: normal; +} + +.rptData { + background: #FFF; + font-weight: normal; +} +.rptEmptyGrp { + background: #FFF; + border-right: 1px solid #DDDDDD; +} +.statechange +{ + position:absolute; + visibility:hidden; + left:10px; + top:20px; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; +} +#PopupLay{ + position:absolute; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:500px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; + display:none; + left:100px; + top:100px; +} + +#folderLay{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; +} + +/* Css for quick Create */ + +.qcTransport{ + background-color:#d5d6ff; + +} + +#role_popup{ + position:relative; + left:0px; + top:0px; + width:95%; + height:300px; + overflow:auto; + border:1px solid #999999; + text-align:left; + background-color:#FFFFFF; + } + +.unread_email { + font-weight:bold; + background-color:#00FF00; + +} + + +/* MY SITES */ + +.unread_email:hover{ + font-weight:bold; +} + + + + +.qualify_email { + font-weight:bold; + background-color:#FF7F50; + + } + + +.delete_email { + font-weight:bold; + background-color:#FF5151; + +} + + +.tagCloud { + border:1px solid #aaf; +} + + +.tagCloudTopBg { + background: url(images/tagCloudBg.gif) repeat-x; + +} + +.tagCloudDisplay { + background-color:#fff; + padding:10px; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height: 14px; + color: #000000; + +} + +.h2 { + + font-size:18px; + line-height:20px; + +} + +.gray { + + color:gray; +} + + +ul { + list-style:circle; + line-height:20px; + padding-left:5px; + margin-left:20px; + font-weight:normal; + +} +.tagCloudTopBg { + background-image: url(images/tagCloudBg.gif); + background-repeat: repeat-x; +} + +.tagCloudDisplay { + background-color:#fff; + padding:5px; +} +.heading2 { + font-family: Arial, Helvetica, sans-serif; + font-size: 16px; + line-height: 16px; + font-weight:bold; + color: #000000; +} +.settingsUI { + + text-align:left; + background-color:#fff; + background-image:url(images/layerPopupBg.gif); + border:2px solid #aaaaff; +} + +.settingsTabHeader { + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height:22px; + font-weight:bold; + color:#ddf; + /* background-image: url(images/mailSubHeaderBg.gif); */ + background-color:#222299; + background-repeat: repeat-x; + padding-left:10px; + padding-right:10px; + +} + +.settingsTabList { + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:20px; + font-weight:normal; + color:#000000; + background-color:#efefff; + padding-left:30px; + border-top:1px solid #fff; + border-bottom:1px solid #99a; + border-right:1px solid #99a; + border-left:1px solid #fff; +} +.settingsTabSelected { + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:20px; + font-weight:bold; + color:#000000; + background-color:#ffffff; + padding-left:30px; + border-left:2px solid #ddf; + border-bottom:2px solid #ddf; + border-top:2px solid #ddf; +} +.settingsSelectedUI { + padding:10px; + background:url(images/settingsSelUIBg.gif) repeat-x; + background-color:#ffffff; +} +.settingsIconDisplay { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:14px; + padding:10px; + + color:#000000; + background-color:#ffffff; + padding-left:10px; +} +.settingsSelUITopLine{ + border-bottom:2px dotted #999999; + +} + +.tableHeading{ + background-color:#ffffff; + border-bottom:2px solid #555599; +} +.colHeader{ + background-color:#ddf; + border-left:1px solid #fff; + border-top:1px solid #fff; + border-right:1px solid #aaf; + border-bottom:1px solid #aaf; + font-weight:bold; + +} + +.cellLabel { + background-color:#f5f5ff; + border-top:1px solid #efefef; + border-bottom:1px solid #dadada; + color:#555555; + +} +.cellText { + color:#333333; + border-bottom:1px solid #dadada; +} + +.listTable{ + border-left:1px solid #cccccc; + border-right:1px solid #cccccc; + border-bottom:1px solid #cccccc; + +} + +.listTableRow{ + border-bottom:1px solid #eaeaea; + border-right :1px solid #eaeaea; + border-bottom:1px solid #eaeaea; + border-bottom:1px solid #eaeaea; +} +.listRow{ + border-bottom:2px solid #eaeaea; + +} + +.listTableTopButtons{ + background-color:#efefff; + background-image:url(images/layerPopupBg.gif); + +} + + +/* Buttons */ +.crmButton{ + + border-left:1px solid #ffffff; + border-top:1px solid #ffffff; + border-right:1px solid #555555; + border-bottom:1px solid #555555; +} + +.create{ + background-color:#0000CD; + color:#fff; + font-weight:bold; +} +.delete { + background-color:#C6E2FF; + color:#000; + font-weight:bold; +} +.edit { + background-color:#0000CD; + color:#fff; + font-weight:bold; +} +.save{ + background-color:#0000CD; + color:#fff; + font-weight:bold; +} +.cancel { + background-color:#C6E2FF; + color:#000; + font-weight:bold; +} + +.inactive{ +color:#999999; +} + +.active{ +color:#229922; + +} + +/* Buttons ends */ + + + +textarea { + width:95%; + height:70px; + border:1px solid #dadada; +} +.treeTable1{ + padding:0px; +} + +.prvPrfBigText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; +} + +.prvPrfTopBg { + background-color:#ebebeb; +} + +.prvPrfBottomBg { + background-color:#ebebeb; +} + +.prvPrfOutline { + border:1px solid #ebebeb; +} + + + +.prvPrfTexture { + background:url(images/prvPrfTexture1.gif); + +} + +.prvPrfHoverOn { + background-color:#ffffef; + +} + +.cellBottomDotLine { + border-bottom-width: 2px; + border-bottom-style: dotted; + border-bottom-color: #CCCCCC; + background-color:#ededed; +} +.crmFormList{ + border:1px solid #cccccc; + width:90%; + height:120px; + +} +.cellBottomDotLinePlain { + border-bottom-width: 2px; + border-bottom-style: dotted; + border-bottom-color: #CCCCCC; + +} +.thickBorder { + border: 2px solid #999999; +} +.trackerHeading { + background-color:#efefef; +} +.trackerListBullet { + border-right:1px dotted #cccccc; + background-color:#f9f9f9; +} +.trackerList { + border-bottom:1px solid #eeeeee; +} + +/* Table Definitions */ +.crmTable { + border:1px solid #dadada; +} +.crmTableRow { + border-bottom:1px dotted #dadada; + border-right:1px dotted #dadada +} +/* Inventory */ + +.lineOnTop { + border-top:1px solid #999999; +} + +.discountUI{ + border:3px solid #CCCCCC; + width:250px; + padding:5px; + position:absolute; + background-color:#FFFFFF; + display:none; +} + +.TaxShow{ + display:inline-table; +} + +.TaxHide{ + display:none; +} + +/* Inventory */ + + + + + +/* styles for RSS Display starts */ +/*.rssDisplay{ + background-color:#e8e3ca; +}*/ + + +/* styles for RSS Display ends */ + + + + + + + + +/* Email Client Classes ++++++++++++++++++++++ */ + +.emailSelected{ + background-color:#eaeaea; + color:#000000; + font-size:bold; +} + + +.mailClient{ + border:2px solid #6565ee; +} + +.mailClientBg { + background-color:#efefff; + background-image:url(images/layerPopupBg.gif); +} + +.mailSubHeader { + background:#b4b8ff url(images/mailSubHeaderBg.gif) repeat-x; + padding:4px; +} + +.mailClientWriteEmailHeader { + font-family:arial, helvetica, sans-serif; + font-size:20px; + line-height:24px; + font-weight:bold; + background:#e0dbb0 url(images/mailSubHeaderBg.gif) repeat-x; + padding:10px; + border-left:1px solid #eaeaea; + border-top:1px solid #eaeaea; + border-right:1px solid #939271; + border-left:1px solid #939271;; +} + +.mailClientCSSButton { + border-left:1px solid #fff; + border-top:1px solid #fff; + border-right:1px solid #333; + border-bottom:1px solid #333; + padding:2px; + background-color:#c3c2b1; +} + +/* Email Client Classes ends ------------------------------------ */ + + + +/* Layer Popup */ +.layerPopup { + border:3px solid #95a5ff; + background:#fffff5 url(images/layerPopupBg.gif) ; + position:absolute; +} + +.layerPopupHeading { + font-family:arial, helvetica, sans-serif; + font-size:16px; + line-height:24px; + font-weight:bold; +} +.layerHeadingULine { + border-bottom:2px solid #717351; +} +.layerPopupTransport { + background-color:#e2e5ff; + +} +.homePageSeperator { + border-right:1px dotted #d3d2c1; +} +.homePageMatrixHdr { + border-bottom:1px solid #d3d2c1; + background:#fffff5 url(images/layerPopupBg.gif) ; +} + +.reportsListTable { + background-color:white; + border-left:1px solid #a3a29f; + border-right:1px solid #a3a29f; + border-bottom:1px solid #a3a29f; +} + +.reportGenerateTable{ + background-image:url(images/layerPopupBg.gif); + border-left:2px dotted #a5b5ee; + border-right:2px dotted #a5b5ee; + border-bottom:2px dotted #a5b5ee; +} +.reportCreateBottom{ + background-color:#ddf; + border-bottom:2px solid #737251; + +} +.importLeadUI{ + /*background:#fffff5 url(images/select.gif) ; */ + background-color:white; +} + +a.customMnu{ + padding-left:30px; + padding-top:5px; + padding-bottom:5px; + display:block; + background-repeat:no-repeat; + background-position:left; + width:155px; + color:#000000; + text-decoration:none; +} + +a.customMnuSelected{ + padding-left:30px; + padding-top:5px; + padding-bottom:5px; + display:block; + background-repeat:no-repeat; + background-position:left; + width:155px; + background-color:#0099FF; + color:#FFFFFF; + text-decoration:none; +} + + +/* Drop Down Menu */ +.drop_mnu{ + position:absolute; + left:0px; + top:0px; + z-index:1000000001; + border-left:1px solid #a5b5ee; + border-right:1px solid #a5b5ee; + border-bottom:1px solid #a5b5ee; + width:150px; + display:none; + padding:0px; + text-align:left; + overflow-x:hidden; + overflow-y:hidden; + background-color:#eef; +} + +a.drop_down{ + width:150px; + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:20px; + font-weight:normal; + color:#33a; + background-color:#eef; + padding:2px 5px 2px 5px; + border-top:1px solid #fafafa; + border-bottom:1px solid #d3d3f3; + display:block; +} + +a.drop_down:Hover{ + padding:2px 5px 2px 5px; + width:150px; + text-align:left; + color:#33a; + font-weight:normal; + text-decoration:underline; + background-color:#ccf; +} + +.bgwhite{ + background-color:white; +} + +.searchUIBasic { + background-image:url(images/layerPopupBg.gif); + border:2px solid #a5b5ee; +} +.searchUIAdv1{ + background-image:url(images/layerPopupBg.gif); + border-top:2px solid #a5b5ee; + border-left:2px solid #a5b5ee; + border-right:2px solid #a5b5ee; +} +.searchUIAdv2{ + background-image:url(images/layerPopupBg.gif); + border-left:2px solid #a5b5ee; + border-right:2px solid #a5b5ee; +} +.searchUIAdv3{ + background-image:url(images/layerPopupBg.gif); + border-bottom:2px solid #a5b5ee; + border-left:2px solid #a5b5ee; + border-right:2px solid #a5b5ee; +} + +/* Recalculate Disabling Window */ + +.veil{ + background: url(images/layerPopupBg.gif) ; + height: 100%; + width: 100%; + top: 0px; + left: 0px; + overflow: hidden; + z-index: 10000; + Filter: Alpha(opacity = 70); + -moz-opacity: 0.7; + text-align: center; + vertical-align: middle; + position: absolute; +} + +.veil_new{ + background: url(images/layerPopupBg.gif) ; + height: 100%; + width: 100%; + top: 0px; + left: 0px; + overflow: hidden; + z-index: 50000; + Filter: Alpha(opacity = 70); + -moz-opacity: 0.7; + text-align: center; + vertical-align: middle; + position: absolute; +} + +.optioncontainer{ + vertical-align: middle; + height: 100%; + width: 100%; + position: absolute; + z-index: 90000; +} + + +.options{ + vertical-align: middle; + margin-left: 25%; + margin-top: 16%; + color: #FFFFFF; + width:650px; + background-color: Black; + border: 2px solid #222; + position: relative; + text-align: left; + z-index: 80000; +} + +.options h2{ + color: White; + font-family: Verdana, Arial, Helvetica, sans-serif; + border-bottom: 1px solid #373D4C; + margin: 0; + font-weight: normal; +} + +/* Recalculate Disable Ends */ +.mailSelected { + font-family: Arial, Helvetica, sans-serif; + font-weight:bold; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + +} +.mailSelected_select { + background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; + background-color:#1F5EFF; + font-family: Arial, Helvetica, sans-serif; + font-weight:bold; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + +} + +.groupname{ + width:125px; + } + +.winmarkModulesdef{ + background-image:url(images/blueLagoonHomeMark.gif); + background-position:top left; + background-repeat:no-repeat; +} + Modified: vtigercrm/branches/5.1_jens/themes/woodspice/images/aboutUS.jpg ============================================================================== Binary files - no diff available. Modified: vtigercrm/branches/5.1_jens/themes/woodspice/images/cal12x12Shared.gif ============================================================================== Binary files - no diff available. Modified: vtigercrm/branches/5.1_jens/themes/woodspice/style.css ============================================================================== --- vtigercrm/branches/5.1_jens/themes/woodspice/style.css (original) +++ vtigercrm/branches/5.1_jens/themes/woodspice/style.css Mon Apr 16 12:27:44 2007 @@ -1,2259 +1,2326 @@ -/********************************************************************************* - -** The contents of this file are subject to the vtiger CRM Public License Version 1.0 - * ("License"); You may not use this file except in compliance with the License - * The Original Code is: vtiger CRM Open Source - * The Initial Developer of the Original Code is vtiger. - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - ********************************************************************************/ - -.small { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; -} -.big { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 18px; - color: #000000; - font-weight:bold; -} - -.componentName { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - line-height: 18px; - color: #998877; - font-weight:bold; - border-left:2px dotted #332211; - padding:10px; -} -.genHeaderBig{ - font-family: Arial, Helvetica, sans-serif; - font-size: 16px; - line-height: 19px; - color: #000000; - font-weight:bold; -} -.genHeaderSmall{ - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 16px; - color: #000000; - font-weight:bold; -} - -.moduleName { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - color: #000000; - font-weight:bold; -} -.hdrNameBg { - background:#ffffff url(images/primeTopBg.gif) repeat-x; - -} - -.hdrTabBg { - /*background:#ffffff url(images/hdrTabBg.gif) bottom repeat-x ;*/ - background-color:#eae9da; -} - -.tabSelected { - background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; - font-family: Arial, Helvetica, sans-serif; - font-weight:bold; - font-size: 11px; - padding-left:10px; - padding-right:10px; - padding-top:2px; - padding-bottom:2px; - - -} - -.tabUnSelected { - - /* background: #efedd4 url(images/tabUnSelectedBg.gif) repeat-x; */ - background-color:#D7D5BE; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:10px; - padding-right:10px; - padding-top:2px; - padding-bottom:2px; - border-bottom:1px solid #efedda; -} - - -.tabSeperator { - background-color:#cccbb5; - - width:2px; -} - - -.searchUIBasic { - border:2px dotted #aaaaaa; - background-color:#FFF6CF; - background-image:url(images/searchUIBg.gif); -} - -.searchUIAdv1{ - border-top:2px dotted #aaaaaa; - border-left:2px dotted #aaaaaa; - border-right:2px dotted #aaaaaa; - background-color:#fff6cf; - background-image:url(images/searchUIBg.gif); -} - -.searchUIAdv2{ - border-left:2px dotted #aaaaaa; - border-right:2px dotted #aaaaaa; - background-color:#fff6cf; - background-image:url(images/searchUIBg.gif); -} - -.searchUIAdv3{ - border-bottom:2px dotted #aaaaaa; - border-left:2px dotted #aaaaaa; - border-right:2px dotted #aaaaaa; - background-image:url(images/searchUIBg.gif); - background-color:#fff6cf; -} -.searchUIName { - border-right:1px solid #333333; - padding-right:40px; -} - -.level2Bg { - background:#e0dbb0 url(images/level2TabBg.gif) bottom repeat-x; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - border-bottom:1px solid #a2a77f; -} - -.level2SelTab{ - font-weight:bold; - color:#000000; - padding-left:20px; - padding-right:20px; - padding-top:5px; - padding-bottom:5px; - -} - -.level2UnSelTab{ - color:#000000; - padding-left:20px; - padding-right:20px; - padding-top:5px; - padding-bottom:5px; -} - - -.sep1 { - background:#999999; -} - -.showPanelBg { - background:url(images/showPanelTopBg.gif) repeat-x; -} - -a { - text-decoration:none; - color:#776643; - - -} - -a:hover { - text-decoration:underline; - -} - -.hdrLink { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - text-decoration:none; - color:#333333; - font-weight:bold; -} - -.hdrLink:hover { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - text-decoration:underline; - color:#333333; - font-weight:bold; -} - -.searchBox { - border: 0px solid #999999; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:2px; - width:100px; - background-color:#ffffef; -} - -.searchBtn { - border : 1px #cccccc solid; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - width:30px; - height:19px; - background-color:#cccccc; -} - - -/* List View Table classes starts +++++++++++++++++ */ - -.lvt { - background-color:#e3e2d1; - border:1px solid #939281; -} - -.lvtBg { - - -} - -.lvtHeaderText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - font-weight:bold; -} - -.lvtCol { - border-top:1px solid #eeeecc; - border-left:1px solid #fafafa; - border-right:1px solid #999988; - border-bottom:1px solid #999988; - background-color:#d3d2c1; - font-weight:bold; -} - -.lvtColData { - background-color:#ffffff; -} - -.lvtColDataHover { - background-color:#ffffea; - -} - - -/* List View Table classes ends --------------------------------*/ - - - -/* Detailed View classes starts +++++++++++++++++++++++ */ -.dvHeaderText{ - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - color:#000000; - font-weight:bold; - -} - -.dvInnerHeader{ - border-bottom:2px solid #999999; - padding:5px; - background-color:#fffffff; - -} - -.dvtSelectedCell { - border-left:2px solid #ddccaa; - border-top:3px solid #ddccaa; - border-right:2px solid #ddccaa; - padding-left:20px; - padding-right:20px; - background-color:white; - font-weight:bold; -} - -.dvtUnSelectedCell { - border-left:2px solid #cacaca; - border-top:2px solid #cacaca; - border-right:2px solid #cacaca; - border-bottom:2px solid #ddccaa; - padding-left:20px; - padding-right:20px; - background-color:#efefef; - cursor:pointer; -} - -.dvtTabCache { - border-bottom:2px solid #ddccaa; -} - -.dvtContentSpace { - border-left:2px solid #ddccaa; - border-right:2px solid #ddccaa; - border-bottom:2px solid #ddccaa; - padding-left:0px; -} - -.dvtCellLabel, .cellLabel { - background-color:#efefe2; - padding-right:10px; - padding-left:10px; - border-bottom:1px solid #dadacc ; - color:#333333; - white-space:nowrap; -} - -.dvtCellInfo, .cellInfo { - padding-left:10px; - padding-right:10px; - border-bottom:1px solid #999; - white-space:nowrap; -} - -.rightMailMerge { - border:1px solid #dddddd -} - -.rightMailMergeHeader { - border-bottom:1px solid #dadaaa; - padding:5px; - background-color:#eaeacc; - -} - -.rightMailMergeContent { - padding:5px; - background-color:#fafafa; - -} - -.detailedViewHeader{ - border-bottom:1px solid #ddddcc; - padding:5px; - background-color:#ddddcc; - -} - -.detailedViewTextBox { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:90%; - background-color:#ffffff; -} - -.detailedViewTextBoxOn { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:90%; - background-color:#ffffdd; -} - - -/* Detailed View classes ends ------------------------------------------- */ - - -.advSearch { - padding:10px; - border-left:1px solid #eaeaea; - border-right:1px solid #eaeaea; - border-bottom:1px solid #eaeaea; - overflow:auto; - width:600px; - height:150px; - background-color:#ffffef; - -} - -.searchAlph { - border:1px solid #dadada; - background-color:#ffffff; - cursor:pointer; - width:10px - -} -.searchAlphselected { - border:1px solid #666666; - background-color:#bbbbbb; - cursor:pointer; - width:10px - -} - -.textbox { - border:1px solid #999999; - background-color:#ffffff; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - width:120px; - padding:2px; - -} - - - -.mx { -} - -.calListTable td{ - border-bottom:1px solid #efefef; - border-left:1px solid #efefef; -} -.calDIV { - width:100%; - border:1px solid #999999; - -} - -.calDayHour { - border-top:1px solid #a8a591; - border-left:1px solid #a8a591; - border-bottom:1px solid #a8a591; - border-right:1px solid #a8a591; - background-color:#eae7da; -} - - -.calAddEvent { - position:absolute; - z-index:10000; - width:500px; - left:200px; - top:150px; - background-color:#ffffff; -} - - - -.addEventInnerBox { - border:1px dotted #dadada; - -} - - -.cellNormal { - border:0px; - background-color:#ffffff; -} - -.EventToDo{ - -} - -.thumbnail{ - background-color:#ffffff; -padding: 7px; -border: 1px solid #ddd; -float: left; - margin-right: 10px; - margin-bottom: 15px; -} - -.padTab{ - padding-top:0px; - padding-left:0px; - padding-left:10px; - padding-bottom:0px; - vertical-align:top; - -} - -#company{ - position:relative; - width:100%; - height:200px; - display:block; - background-color:#FFFFFF; - white-space:nowrap; - overflow:auto; - border:1px solid #CCCCCC; -} - - -#user{position:relative;left:0px;top:0px;width:100%;display:block;} - -#communication{position:relative;left:0px;top:0px;width:100%;display:block;} -#config{position:relative;left:0px;top:0px;width:100%;display:block;} - -#userTab{position:relative;left:0px;top:0px;width:100%;display:none;} - - -#one{ - position:relative; - display:block; - width:245px; -} - -#mnuTab1{ - - position:relative; - - overflow:auto; - - width:100%; - - display:none; - -} - -#mnuTab2{ - - position:relative; - - overflow:auto; - - width:100%; - - display:none; - -} - - -/* End of Settings */ - - -.bgwhite{ - background-color: #FFFFFF; -} -.copy{ - font-size:9px; - font-family: Verdana, Arial, Helvetica, Sans-serif; -} - -#basicTab{ - position:relative; - overflow:auto; - width:100%; - display:block; -} - -#moreTab{ - position:relative; - overflow:auto; - width:100%; - display:none; -} - -#one{ - position:relative; - display:block; - width:245px; -} - - -.dashHeading { - font-family:Arial, Helvetica, sans-serif; - font-size:24px; - font-weight:bold; - color:#000; -} - -.dashSelectBg{ - background-image:url(images/dashSelectBg.gif); - background-repeat:repeat-x; -} -.dash_top{ - background-image:url(images/dashTopBg.gif); - background-repeat:repeat-x; - height:63px; - vertical-align:middle; -} - -.dash_border{ - background-color:#e0dbb0; - padding:5px; -} - - -.dash_white{ - background-color:#FFFFFF; - padding:5px 10px 5px 10px; -} - -.dash_bdr_btm{ - border-bottom:2px dotted #939271; -} - -.dash_count{ - font-size:36px; - font-weight:bold; - text-decoration:none; - color:#000000; - padding-left:10px;padding-right:10px; -} - - -.dash_switch{ - cursor:pointer; - width:26px; - height:26px; -} - -.dash_row_sel{ - background-image:url(images/dash_sel_chart.jpg); - background-repeat:no-repeat; - background-position:center; - width:26px;height:26px; - text-align:center; - vertical-align:middle; - font-weight:bold; - font-size:10px; - text-decoration:none; -} - -.dash_row_unsel{ - background-image:url(images/dash_unsel_chart.jpg); - background-repeat:no-repeat; - background-position:center; - width:26px;height:26px; - text-align:center; - vertical-align:middle; - font-weight:normal; - font-size:10px; - text-decoration:none; - cursor:pointer; -} - -.dash_chart_btm{ - border-bottom:2px solid #000000; -} - - -.dash_bottom{ - background-image:url(images/dashBottomBg.gif); - background-repeat:repeat-x; - height:63px; - vertical-align:middle; -} - -.dash_btm{ - background-image:url(images/dash_btm_center.jpg); - background-repeat:repeat-x; - position:top; -} - - -/* menu */ - - - - a.submenu{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - padding-top:5px; - padding-bottom:5px; - padding-left:10px; - border-bottom:1px solid #CCCCCC; - background-color:#ECECEC; - color:#000000; - text-align:left; - text-decoration:none; - display:block; -} - -a.submenu:Hover{ - background-color:#DDDDDD; - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - padding-top:5px; - padding-bottom:5px; - padding-left:10px; - border-bottom:1px solid #CCCCCC; - color:#000000; - text-align:left; - text-decoration:none; - display:block; -} - -#mnuKey{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - background-color:#666666; - color:#FFFFFF; - text-decoration:none; - padding:5px; - font-weight:bold; - width:8px; - cursor:pointer; - vertical-align:top; - height:100px; - position:relative; - top:0px; - left:0px; -} - -#slidemenu{ - height:525px; - vertical-align:top; - width:100px; - background-color:#CCCCCC; - border-right:1px solid #CCCCCC; - opacity:.9; - display:none; -} - -/* clock */ - -.citystyle{ - position:relative; - top:0px; - left:0px; - text-align:left; - -} -#theClockLayer{ - position:relative; - height:180px; - left:20px; - text-align:center; -} -.handsanddotsstyle{ - margin-top:10px; - position:absolute; - top:0px; - left:0px; - width:2px; - height:2px; - font-size:2px; - background-color:#000000; -} -.facestyle{ - margin-top:10px; - position:absolute; - top:0px; - left:0px; - width:15px; - height:15px; - text-align:center; - font-family:arial,sans-serif; - font-size:10px; - color:#000000; -} -.datestyle{ - margin-top:20px; - position:absolute; - top:0px; - left:0px; - width:100px; - text-align:center; - font-family:arial,sans-serif; - font-size:10px; - color:#000000; -} -.ampmstyle{ - margin-top:23px; - position:absolute; - top:0px; - left:0px; - width:20px; - text-align:center; - font-family:arial,sans-serif; - font-size:10px; - color:#000000; -} - -#wclock{ - position:absolute; - left:100px; - top:100px; - display:none; - background-color:#CCCCCC; - width:175px; -} - -.leftFormBorder1 { - border: 1px solid #AFC8E4; - background-color: #FFFFFF; - opacity:.7; -} - - - - -/* Calculator */ - -.calcResult { - width: 100%; - height: 25px; - background-color: #FFFFCC;/*CBDFD6*/ - border-top: 1px solid #CCC; - border-left: 0px; - border-right: 1px solid #CCC; - border-bottom: 1px solid #CCC; - font-size: 10px; - text-align: right; -} -.calcMem { - width: 100%; - height: 25px; - border-top: 1px solid #CCC; - border-left: 1px solid #CCC; - border-right: 0px; - border-bottom: 1px solid #CCC; - background-color: #FFFFCC;/*CBDFD6*/ - font-family: Arial; - font-size: 10px; - color: #BBB; - text-align: left; -} -.calcBlackBtn, .calcGreyBtn, .calcBigBtn, .calcCancBtn, .calcMemBtn, .calcBackBtn { - border: none; - height: 20px; - font-size: 11px; - color: #FFF; - text-align:center; -} -.calcBackBtn { - background: url(images/calc_back_btn.gif) no-repeat; - width:25px; -} -.calcBlackBtn { - background: url(images/calc_black_btn.gif) no-repeat; - width:25px; -} -.calcGreyBtn { - background: url(images/calc_grey_btn.gif) no-repeat; - width:25px; -} -.calcCancBtn { - background: url(images/calc_canc_btn.gif) no-repeat; - width:25px; - -} -.calcMemBtn { - background: url(images/calc_mem_btn.gif) no-repeat; - width:25px; - /*background-color: #CCC;*/ -} -#calc{ - position:absolute; - left:100px; - top:100px; - background-color:#FFFFFF; - width:185px; - border-bottom:2px solid #000000; - border-right:2px solid #666666; - border-left:2px solid #CCCCCC; - border-top:2px solid #CCCCCC; -} - -/* RSS STYLES */ - -.subHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-image:url(images/rssHeader.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; -} - -.delBg{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-image:url(images/rssdelete.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; -} - -#rssScroll{ - font-family:Arial, Helvetica, sans-serif ; - font-size:12px; - background-color:#FFFFFF; - width:100%; - height:130px; - overflow:auto; - border:0px solid #000000; -} - -.rssTable{ - width:100%; - border:0px solid #CCCCCC; -} - -.rssTable tr th{ - background-color:#ead9a2; - text-align:left; - border-bottom:1px solid #c2c7a2; - border-top:1px solid #FFFFFF; - color:#000000; - padding-left:5px; - padding-right:5px; - height:20px; -} - -.rssTable tr td{ - text-align:left; - border-bottom:1px dotted #dadada; - border-left:1px dotted #dadada; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - white-space:nowrap; - padding:2px; - -} - -.forwardBg{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - color:#000000; - background-image:url(images/rssforward.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; - background-color:#D7D7D7; -} - - -/* New Styles */ - - - -.mnuTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#000000; - width:100%; - border:0px solid #000000; -} - -.mnuTab tr td{ - border-bottom:1px solid #EBEBEB; - padding-left:5px; - vertical-align:middle; -} - -/* profile */ - -.prvPrfBigText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; -} - -.prvPrfTopBg { - background-color:#ebebeb; -} - -.prvPrfBottomBg { - background-color:#ebebeb; -} - -.prvPrfOutline { - border:1px solid #ebebeb; -} - - - -.prvPrfTexture { - background:url(images/prvPrfTexture1.gif); - -} - -.prvPrfHoverOn { - background-color:#ffffef; - -} - -/* Organization */ - -.orgTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - color:#666666; - border:0px solid #9B9B9B; - border-collapse:collapse; - width:100%; -} - -.orgTab tr th{ - text-align:left; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-decoration:none; - font-weight:bold; - height:20px; - padding-left:5px; -} - -.orgTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:none; - font-weight:normal; - padding-left:5px; - height:20px; - border-bottom:1px solid #CCCCCC; - border-right:1px solid #CCCCCC; -} - - -/* Groups */ - - -.groupli{ - margin-left:20px; - font-family:Arial, Helvetica, sans-serif; - font-weight:normal; - font-size:12px; - text-decoration:none; - color:#333333; - list-style-type:none; - text-align:left; -} - -/* tree menu */ - -/*Oraganization Edit Features */ - -#orgLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:500px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - display:block; - position:absolute; - left:0px; - top:0px; -} - -/* Role */ - -#roleLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - display:none; - position:absolute; -} - -.classBtn{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:10px; - background-color:#DBDBDB; - border-bottom:2px solid #999999; - border-right:2px solid #999999; - border-top:2px solid #F5F5F5; - border-left:2px solid #F5F5F5; - color:#000000; - text-align:center; - padding-top:3px; - padding-bottom:3px; -} - -.txtBox{ - width:85%; - border:1px solid #666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; -} - -/* IMPORT LEADS */ - -.leadTable{ - border:3px solid #CCCCCC; - border-collapse:collapse; -} - -.leadTable tr td{ -/* border:0px solid #CCCCCC;*/ -} - -.genHeaderGray{ - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 16px; - color: #888888; - font-weight:bold; -} - -.genHeaderGrayBig{ - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - line-height: 16px; - color: #888888; - font-weight:bold; -} - -.importBox{ - width:125px; - border:1px solid #666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; -} - - -.txtGreen{ - color:green; -} - -/* PICK LIST */ -ul li{ - padding-bottom:2px; - padding-top:2px; -} -/* MY PREFERENCES */ - - -/* CSS FOR REPORTS */ - -.reportHdr{ - background-color:#DDDDDD; - font-size:12px; - font-weight:bold; - vertical-align:middle; - text-align:left; - height:30px; - border-bottom:2px solid #959595; - color:#000000; - padding-left:10px; -} - -#reportLay{ - width:175px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; - z-index:2000; -} - -#locateMap{ - width:120px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; - z-index:2000; -} - - -a.reportMnu{ - font-size:11px; - color:#0070BA; - text-decoration:none; - display:block; - width:155px; - height:20px; - border-bottom:1px solid #E1E1E1; - padding-left:20px; - padding-top:3px; -} - -a.reportMnu:Hover{ - font-size:11px; - color:#0070BA; - text-decoration:underline; - display:block; - width:155px; - height:20px; - border-bottom:1px solid #E1E1E1; - padding-left:20px; - padding-top:3px; -} - -#Generate{ - position:relative; - width:100%; - text-align:center; - display:none; -} - - -/* END OF REPORT */ - - - -/* WEB MAIL */ - a.webMnu{ - font-size:11px; - color:#0070BA; - text-decoration:underline; -} -a.webMnu:Hover{ - font-size:11px; - color:#0070BA; - text-decoration:underline; -} - - -/* END OF WEB MAIL */ - -/* POPUP */ - - a.alpha{ - font-size:11px; - color:gray; - text-decoration:none; - padding-Left:5px; - padding-right:5px; - border:1px dotted #CCCCCC; - background-color:#FFFFCC; -} - -a.alpha:Hover{ - font-size:11px; - color:gray; - text-decoration:underline; - padding-Left:5px; - padding-right:5px; - border:1px dotted #CCCCCC; - background-color:#FFFFCC; -} - -/* Home Page */ -.MatrixLayer{ - border:2px solid #a3a295; - background-color:#FFFFFF; - width:29%; - position:relative; - visibility:visible; - margin:9px; - height:280px; -} - -.fontBold{ - font-size:13px; - color:#000000; - text-decoration:none; - font-weight:bold; -} - -.style_Gray{ - color:gray; -} - -/* End of Home Page */ - -/* All Menu */ -#allMenu{ - width:500px; - border:4px solid #C3C2a1; - left:300px; - top:100px; - position:absolute; - z-index:1000001; - display:none; - padding:10px; - background:#ffffff url(images/layerPopUpBg.gif); -} - - -.allMnuTable{ - width:100%; - background-color:#FFFFFF; -} - -.allMnuHandle td{ - height:20px; - color:#FFFFFF; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - text-decoration:none; - background-color:#000066; - cursor:move; - padding:2px; - border-bottom:2px solid #666666; -} - -.allMnuHdr{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-weight:Bold; - font-size:11px; - text-decoration:none; - display:block; - background-color:#FFFFFF; - color:#737251; - padding-top:5px; - padding-bottom:5px; -} - -a.allMnu{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:10px; - text-decoration:none; - font-weight:normal; - display:block; - width:125px; - height:15px; - padding-left:5px; - padding-top:0px; - padding-bottom:0px; - background-color:#FFFFFF; - border:1px solid #FFFFFF; - color:#000033; - margin-left:20px; -} - -a.allMnu:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:10px; - text-decoration:none; - font-weight:normal; - display:block; - width:125px; - height:15px; - padding-left:5px; - padding-top:0px; - padding-bottom:0px; - background-color:#dad7b5; - color:#333; -} -/* End Of All Menu */ - - - -/* Calendar */ -.calHdr{ - background-image:url(images/mailSubHeaderBg.gif); - background-repeat:repeat-x; - background-position:left top; - -} - -.calSel{ - background-image:url(images/dashSelectBg.gif); - background-repeat:repeat-x; - text-align:center; - color:#FFFFFF; - font-weight:bold; - width:8%; -} - -.calAddButton { - border: 1px solid #666666; - background:#D6D2AB url(images/calAddButtonBg.gif) repeat-x; - cursor:pointer; - height:20px; - - -} -.calInnerBorder { - border-left:1px solid #d6d2ab; - border-right:1px solid #d6d2ab; - border-bottom:1px solid #d6d2ab; -} - -.calBorder { - border-left: 1px solid #939271; - border-right: 1px solid #939271; - border-bottom: 1px solid #939271; - background:#fefefe url(images/layerPopupBg.gif); - -} - -.calTopRight { - border-right: 1px solid #939271; -} - - -.calUnSel{ - color:#000000; - font-weight:normal; - text-align:center; - width:8%; -} - - -a.calMnu{ - font-size:11px; - color:#0070BA; - text-decoration:none; - display:block; - height:20px; - padding-left:5px; - padding-top:3px; -} - -a.calMnu:Hover{ - font-size:11px; - color:#0070BA; - text-decoration:underline; - display:block; - height:20px; - padding-left:5px; - padding-top:3px; -} -.bgwhite{ - background-color: #FFFFFF; -} -.copy{ - font-size:9px; - font-family: Verdana, Arial, Helvetica, Sans-serif; -} - -#mnuTab{ - position:relative; - width:100%; - display:block; -} - -#mnuTab2{ - position:relative; - overflow:auto; - width:100%; - display:none; -} -.style1 {color: #FF0000} - -.event{ - background-color:#D3EAF0; - border:1px solid #999999; - text-align:left; - width:100%; - position:relative; - left:0px; - top:0px; - vertical-align:middle; - padding:1px; -} - -#hrView{ - display:block; -} -.calendarNav{ - font-size:12px; - color:#FFFFFF; - white-space:nowrap; - text-align:center; - font-weight:bold; - padding-left:10px; - padding-right:10px; - background-image:url(images/cal_nav.gif); - background-repeat:repeat-x; -} - -#addEventDropDown{ - position:absolute; - display:none; - width:150px; - border:1px solid #666666; - left:0px; - top:0px; - overflow:visible; - z-index:5000; -} - -.calAction{ - width:175px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; - z-index:2000; -} - -.calSettings{ - position:absolute; - z-index:20000; - width:500px; - left:200px; - top:150px; - background-color:#ffffff; -} - -.outer{ - border-bottom:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - border-right:1px solid #CCCCCC; -} - -.calTxt{ - width:50%; - border:1px solid #CCCCCC; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - padding-left:5px; -} - -#leadLay{ - position:relative; - width:100%; - float:left; - visibility:hidden; - padding:5px; - z-index:10000; -} - -/* End of Calendar */ - -/* Cal Year View */ - - -.eventDay{ - background-color:#FF9966; - font-weight:bold; -} - -.currDay{ - background-color:#006600; - font-weight:bold; - text-decoration:underline; -} - -.currDay a{ - color:#FFFFFF; - font-weight:bold; - text-decoration:underline; -} - - -/* End of Cal Year View */ - -/* Level 2 Menu Selected*/ - -level2Sel{ - color:#000000; - font-weight:bold; - text-decoration:underline; -} - -#DeleteLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; -} - -#CurrencyDeleteLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:350px; -} - - -/* For Report HTML Generation*/ -.rptCellLabel { - background-color:#f6f6f6; - padding-right:10px; - border-right: 1px solid #DDDDDD; - border-bottom:1px solid #eaeaea; - color:#737373; - font-weight: bold; - white-space:nowrap; -} -.rptTable { - border-left: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; - border-top: 1px solid #DDDDDD; -} -.rptTitle, .rptHead, .rptData, .rptGrpHead{ - font-family: Verdana, Arial, Helvetica, Sans-serif; - font-size: 11px; - text-align:left; - font-weight: normal; - height: 20px; - padding: 4px; - border-right: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; - background: #DDDDDD; -} -.rptGrp1Total, .rptGrp2Total, .rptTotal { - font-family: Verdana, Arial, Helvetica, Sans-serif; - font-size: 11px; - text-align:center; - font-weight: normal; - background: #FFF; - height: 20px; - padding: 4px; - border-right: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; -} - -.rptGrpHead { - background: #FFF; - border-bottom: 1px solid #FFF; - border-top: 1px solid #DDDDDD; - font-weight: normal; -} - -.rptData { - background: #FFF; - font-weight: normal; -} -.rptEmptyGrp { - background: #FFF; - border-right: 1px solid #DDDDDD; -} -.statechange -{ - position:absolute; - visibility:hidden; - left:10px; - top:20px; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; -} -#PopupLay{ - position:absolute; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:500px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; - display:none; - left:100px; - top:100px; -} - -#folderLay{ - width:175px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; -} - -/* Css for quick Create */ - - -.qcTransport{ - background-color:#d3d2c1; - -} - -#role_popup{ - position:relative; - left:0px; - top:0px; - width:95%; - height:300px; - overflow:auto; - border:1px solid #999999; - text-align:left; - background-color:#FFFFFF; - } - -.unread_email { - font-weight:bold; -} - - -/* MY SITES */ - - -.unread_email { - font-weight:bold; -} - - -.tagCloud { - border:1px solid #737373; -} - - -.tagCloudTopBg { - background: url(images/tagCloudBg.gif) repeat-x; - -} - -.tagCloudDisplay { - background-color:#e5e5e5; - padding:10px; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 14px; - color: #000000; - -} - -.h2 { - - font-size:18px; - line-height:20px; - -} - -.gray { - - color:gray; -} - - -ul { - list-style:circle; - line-height:20px; - padding-left:5px; - margin-left:20px; - font-weight:normal; - -} - - - - - -.tagCloudTopBg { - background-image: url(images/tagCloudBg.gif); - background-repeat: repeat-x; -} - -.tagCloudDisplay { - background-color:#e5e5e5; - padding:5px; -} - - - - - -.heading2 { - font-family: Arial, Helvetica, sans-serif; - font-size: 16px; - line-height: 16px; - font-weight:bold; - color: #000000; -} - - - -.settingsUI { - - text-align:left; - background-color:#d3d4c2; - border:2px solid #999a77; - -} - - -.settingsTabHeader { - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height:25px; - font-weight:bold; - color:#000000; - background-image: url(images/mailSubHeaderBg.gif); - background-repeat: repeat-x; - padding-left:10px; - padding-right:10px; - - -} - -.settingsTabList { - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:20px; - font-weight:normal; - color:#000000; - background-color:#efede2; - padding-left:30px; - border-top:1px solid #eaeaea; - border-bottom:1px solid #d3d1a3; -} -.settingsTabSelected { - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:20px; - font-weight:bold; - color:#000000; - background-color:#ffffff; - padding-left:30px; -} -.settingsSelectedUI { - padding:10px; - background:url(images/settingsSelUIBg.gif) repeat-x; - background-color:#ffffff; -} -.settingsIconDisplay { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:14px; - padding:10px; - - color:#000000; - background-color:#ffffff; - padding-left:10px; -} -.settingsSelUITopLine{ - border-bottom:2px dotted #999999; - -} - -.tableHeading{ - background-color:#ffffff; - border-bottom:2px solid #5a5b41; -} -.colHeader{ - background-color:#EFECD1; - border-left:1px solid #eaeaea; - border-top:1px solid #eaeaea; - border-right:1px solid #999a77; - border-bottom:1px solid #999a77; - font-weight:bold; - -} -.cellLabel { - background-color:#eaebd9; - border-top:1px solid #efefef; - border-bottom:1px solid #dadada; - color:#555555; - -} -.cellText { - color:#333333; - border-bottom:1px solid #dadada; -} - -.listTable{ - border-left:1px solid #cccccc; - border-right:1px solid #cccccc; - border-bottom:1px solid #cccccc; - -} - -.listTableRow{ - border-bottom:1px solid #eaeaea; - border-right :1px solid #eaeaea; - border-bottom:1px solid #eaeaea; - border-bottom:1px solid #eaeaea; -} -.listRow{ - border-bottom:2px solid #eaeaea; - -} - -.listTableTopButtons{ - background-color:#fafbe3; - -} - - -/* Buttons */ -.crmButton{ - - border-left:1px solid #ffffff; - border-top:1px solid #ffffff; - border-right:1px solid #555555; - border-bottom:1px solid #555555; -} - -.create{ - background-color:#ddccaa; - color:#333333; - font-weight:bold; -} -.delete { - background-color:#8F8C74; - color:#ffffff; - font-weight:bold; -} -.edit { - background-color:#ddccaa; - color:#333333; - font-weight:bold; -} -.save{ - background-color:#ddccaa; - color:#333333; - font-weight:bold; -} -.cancel { - background-color:#8F8C74; - color:#ffffff; - font-weight:bold; -} - -.inactive{ -color:#999999; -} - -.active{ -color:#229922; - -} - -/* Buttons ends */ - - - -textarea { - width:95%; - height:70px; - border:1px solid #dadada; -} -.treeTable1{ - padding:0px; -} - -.prvPrfBigText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; -} - -.prvPrfTopBg { - background-color:#ebebeb; -} - -.prvPrfBottomBg { - background-color:#ebebeb; -} - -.prvPrfOutline { - border:1px solid #ebebeb; -} - - - -.prvPrfTexture { - background:url(images/prvPrfTexture1.gif); - -} - - -.prvPrfHoverOn { - background-color:#ffffef; - -} - - -.cellBottomDotLine { - border-bottom-width: 2px; - border-bottom-style: dotted; - border-bottom-color: #CCCCCC; - background-color:#ededed; -} -.crmFormList{ - border:1px solid #cccccc; - width:90%; - height:120px; - -} -.cellBottomDotLinePlain { - border-bottom-width: 2px; - border-bottom-style: dotted; - border-bottom-color: #CCCCCC; - -} - -.thickBorder { - border: 2px solid #999999; -} - -.trackerHeading { - background-color:#efefef; -} -.trackerListBullet { - border-right:1px dotted #cccccc; - background-color:#f9f9f9; -} -.trackerList { - border-bottom:1px solid #eeeeee; -} - -/* Table Definitions */ -.crmTable { - border:1px solid #dadada; -} - -.crmTableRow { - border-bottom:1px dotted #dadada; - border-right:1px dotted #dadada -} - - -/* Inventory */ - -.lineOnTop { - border-top:1px solid #999999; -} - -.discountUI{ - border:3px solid #CCCCCC; - width:250px; - padding:5px; - position:absolute; - background-color:#FFFFFF; - display:none; -} - -.TaxShow{ - display:inline-table; -} - -.TaxHide{ - display:none; -} - -/* Inventory */ - - -/* Email Client Classes ++++++++++++++++++++++ */ - -.emailSelected{ - background-color:#eaeaea; - color:#000000; - font-size:bold; -} - - -.mailClient{ - border:2px solid #999a77; -} - -.mailClientBg { - background-color:#e3e1cd; -} - -.mailSubHeader { - background:#e0dbb0 url(images/mailSubHeaderBg.gif) repeat-x; - padding:4px; -} - - -.mailClientWriteEmailHeader{ - font-family:arial, helvetica, sans-serif; - font-size:20px; - line-height:24px; - font-weight:bold; - background:#e0dbb0 url(images/mailSubHeaderBg.gif) repeat-x; - padding:10px; - border-left:1px solid #eaeaea; - border-top:1px solid #eaeaea; - border-right:1px solid #939271; - border-left:1px solid #939271;; - - -} -.mailClientCSSButton { - border-left:1px solid #fff; - border-top:1px solid #fff; - border-right:1px solid #333; - border-bottom:1px solid #333; - padding:2px; - background-color:#c3c2b1; - -} - -/* Email Client Classes ends ------------------------------------ */ - - - -/* Layer Popup */ -.layerPopup { - border:3px solid #939271; - background:#fffff5 url(images/layerPopupBg.gif) ; - position:absolute; -} - -.layerPopupHeading { - font-family:arial, helvetica, sans-serif; - font-size:16px; - line-height:24px; - font-weight:bold; -} -.layerHeadingULine { - border-bottom:2px solid #717351; -} -.layerPopupTransport { - background-color:#DFDFC2; - -} -.homePageSeperator { - border-right:1px dotted #d3d2c1; -} -.homePageMatrixHdr { - border-bottom:1px solid #d3d2c1; - background:#fffff5 url(images/layerPopupBg.gif) ; -} - -.reportsListTable { - background-color:white; - border-left:1px solid #a3a29f; - border-right:1px solid #a3a29f; - border-bottom:1px solid #a3a29f; -} - -.reportGenerateTable{ - background-image:url(images/searchUIBg.gif); - border-left:2px dotted #a3a29a; - border-right:2px dotted #a3a29a; - border-bottom:2px dotted #a3a29a; -} -.reportCreateBottom{ - background-color:#939271; - border-bottom:2px solid #737251; - -} -.importLeadUI{ - - background:#fffff5 url(images/layerPopupBg.gif) ; -} - -a.customMnu{ - padding-left:30px; - padding-top:5px; - padding-bottom:5px; - display:block; - background-repeat:no-repeat; - background-position:left; - width:155px; - color:#000000; - text-decoration:none; -} - -a.customMnuSelected{ - padding-left:30px; - padding-top:5px; - padding-bottom:5px; - display:block; - background-repeat:no-repeat; - background-position:left; - width:155px; - background-color:#0099FF; - color:#FFFFFF; - text-decoration:none; -} - - -/* Drop Down Menu */ -.drop_mnu{ - position:absolute; - left:0px; - top:0px; - z-index:1000000001; - border-left:1px solid #E7E3C0; - border-right:1px solid #E7E3C0; - border-bottom:1px solid #E7E3C0; - width:150px; - display:none; - padding:0px; - text-align:left; - overflow-x:hidden; - overflow-y:hidden; - background-color:#F6F4E7; -} -a.drop_down{ - width:150px; - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:20px; - font-weight:normal; - color:#000000; - background-color:#F6F4E7; - padding:2px 5px 2px 5px; - border-top:1px solid #fafafa; - border-bottom:1px solid #d3d3c3; - display:block; -} - -a.drop_down:Hover{ - padding:2px 5px 2px 5px; - width:150px; - text-align:left; - color:#FFFFFF; - font-weight:normal; - text-decoration:underline; - background-color:#D7D5BE; -} - -.bgwhite{ - background-color:white; -} - -/* Recalculate Disabling Window */ - -.veil{ - background: url(images/searchUIBg.gif) ; - height: 100%; - width: 100%; - top: 0px; - left: 0px; - overflow: hidden; - z-index: 10000; - Filter: Alpha(opacity = 70); - -moz-opacity: 0.7; - text-align: center; - vertical-align: middle; - position: absolute; -} - -.veil_new{ - background: url(images/searchUIBg.gif) ; - height: 100%; - width: 100%; - top: 0px; - left: 0px; - overflow: hidden; - z-index: 50000; - Filter: Alpha(opacity = 70); - -moz-opacity: 0.7; - text-align: center; - vertical-align: middle; - position: absolute; -} - -.optioncontainer{ - vertical-align: middle; - height: 100%; - width: 100%; - position: absolute; - z-index: 90000; -} - - -.options{ - vertical-align: middle; - margin-left: 25%; - margin-top: 16%; - color: #FFFFFF; - width:650px; - background-color: Black; - border: 2px solid #222; - position: relative; - text-align: left; - z-index: 80000; -} - -.options h2{ - color: White; - font-family: Verdana, Arial, Helvetica, sans-serif; - border-bottom: 1px solid #373D4C; - margin: 0; - font-weight: normal; -} - -/* Recalculate Disable Ends */ +/********************************************************************************* + +** The contents of this file are subject to the vtiger CRM Public License Version 1.0 + * ("License"); You may not use this file except in compliance with the License + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + ********************************************************************************/ + +.small { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; +} +.big { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height: 18px; + color: #000000; + font-weight:bold; +} + +.componentName { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + line-height: 3px; + color: #998877; + font-weight:bold; + border-left:2px dotted #332211; + padding:10px; +} +.genHeaderBig{ + font-family: Arial, Helvetica, sans-serif; + font-size: 16px; + line-height: 19px; + color: #000000; + font-weight:bold; +} +.genHeaderSmall{ + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + line-height: 16px; + color: #000000; + font-weight:bold; +} + +.moduleName { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + color: #000000; + font-weight:bold; +} +.hdrNameBg { + background:#ffffff url(images/primeTopBg.gif) repeat-x; + +} + +.hdrTabBg { + /*background:#ffffff url(images/hdrTabBg.gif) bottom repeat-x ;*/ + background-color:#eae9da; +} + +.tabSelected { + background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; + font-family: Arial, Helvetica, sans-serif; + font-weight:bold; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + + +} + +.tabUnSelected { + + /* background: #efedd4 url(images/tabUnSelectedBg.gif) repeat-x; */ + background-color:#D7D5BE; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + border-bottom:1px solid #efedda; +} + + +.tabSeperator { + background-color:#cccbb5; + + width:2px; +} + + +.searchUIBasic { + border:2px dotted #aaaaaa; + background-color:#FFF6CF; + background-image:url(images/searchUIBg.gif); +} + +.searchUIAdv1{ + border-top:2px dotted #aaaaaa; + border-left:2px dotted #aaaaaa; + border-right:2px dotted #aaaaaa; + background-color:#fff6cf; + background-image:url(images/searchUIBg.gif); +} + +.searchUIAdv2{ + border-left:2px dotted #aaaaaa; + border-right:2px dotted #aaaaaa; + background-color:#fff6cf; + background-image:url(images/searchUIBg.gif); +} + +.searchUIAdv3{ + border-bottom:2px dotted #aaaaaa; + border-left:2px dotted #aaaaaa; + border-right:2px dotted #aaaaaa; + background-image:url(images/searchUIBg.gif); + background-color:#fff6cf; +} +.searchUIName { + border-right:1px solid #333333; + padding-right:40px; +} + +.level2Bg { + background:#e0dbb0 url(images/level2TabBg.gif) bottom repeat-x; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + border-bottom:1px solid #a2a77f; +} + +.level2SelTab{ + font-weight:bold; + color:#000000; + padding-left:20px; + padding-right:20px; + padding-top:5px; + padding-bottom:5px; + +} + +.level2UnSelTab{ + color:#000000; + padding-left:20px; + padding-right:20px; + padding-top:5px; + padding-bottom:5px; +} + + +.sep1 { + background:#999999; +} + +.showPanelBg { + background:url(images/showPanelTopBg.gif) repeat-x; +} + +a { + text-decoration:none; + color:#776643; + + +} + +a:hover { + text-decoration:underline; + +} + +.hdrLink { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + text-decoration:none; + color:#333333; + font-weight:bold; +} + +.hdrLink:hover { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + text-decoration:underline; + color:#333333; + font-weight:bold; +} + +.searchBox { + border: 0px solid #999999; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding-left:2px; + width:100px; + background-color:#ffffef; +} + +.searchBtn { + border : 1px #cccccc solid; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + width:30px; + height:19px; + background-color:#cccccc; +} + + +/* List View Table classes starts +++++++++++++++++ */ + +.lvt { + background-color:#e3e2d1; + border:1px solid #939281; +} + +.lvtBg { + + +} + +.lvtHeaderText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + font-weight:bold; +} + +.lvtCol { + border-top:1px solid #eeeecc; + border-left:1px solid #fafafa; + border-right:1px solid #999988; + border-bottom:1px solid #999988; + background-color:#d3d2c1; + font-weight:bold; +} + +.lvtColData { + background-color:#ffffff; +} + +.lvtColDataHover { + background-color:#ffffea; + +} + + +/* List View Table classes ends --------------------------------*/ + + + +/* Detailed View classes starts +++++++++++++++++++++++ */ +.dvHeaderText{ + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + color:#000000; + font-weight:bold; + +} + +.dvInnerHeader{ + border-bottom:2px solid #999999; + padding:5px; + background-color:#fffffff; + +} + +.dvtSelectedCell { + border-left:2px solid #ddccaa; + border-top:3px solid #ddccaa; + border-right:2px solid #ddccaa; + padding-left:20px; + padding-right:20px; + background-color:white; + font-weight:bold; +} + +.dvtUnSelectedCell { + border-left:2px solid #cacaca; + border-top:2px solid #cacaca; + border-right:2px solid #cacaca; + border-bottom:2px solid #ddccaa; + padding-left:20px; + padding-right:20px; + background-color:#efefef; + cursor:pointer; +} + +.dvtTabCache { + border-bottom:2px solid #ddccaa; +} + +.dvtContentSpace { + border-left:2px solid #ddccaa; + border-right:2px solid #ddccaa; + border-bottom:2px solid #ddccaa; + padding-left:0px; +} + +.dvtCellLabel, .cellLabel { + background-color:#efefe2; + padding-right:10px; + padding-left:10px; + border-bottom:1px solid #dadacc ; + color:#333333; + white-space:nowrap; +} + +.dvtCellInfo, .cellInfo { + padding-left:10px; + padding-right:10px; + border-bottom:1px solid #999; +} + +.rightMailMerge { + border:1px solid #dddddd +} + +.rightMailMergeHeader { + border-bottom:1px solid #dadaaa; + padding:5px; + background-color:#eaeacc; + +} + +.rightMailMergeContent { + padding:5px; + background-color:#fafafa; + +} + +.detailedViewHeader{ + border-bottom:1px solid #ddddcc; + padding:5px; + background-color:#ddddcc; + +} + +.detailedViewTextBox { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:90%; + background-color:#ffffff; +} + +.detailedViewTextBoxOn { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:90%; + background-color:#ffffdd; +} + +.detailedViewTextBoxDis { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #555555; + border:1px solid #bababa; + padding-left:5px; + width:90%; + background-color:#aaaaaa; +} + +.detailedViewTextArea { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:95%; + height:100px; + background-color:#ffffff; + text-align:left; +} + + +/* Detailed View classes ends ------------------------------------------- */ + + +.advSearch { + padding:10px; + border-left:1px solid #eaeaea; + border-right:1px solid #eaeaea; + border-bottom:1px solid #eaeaea; + overflow:auto; + width:600px; + height:150px; + background-color:#ffffef; + +} + +.searchAlph { + border:1px solid #dadada; + background-color:#ffffff; + cursor:pointer; + width:10px + +} +.searchAlphselected { + border:1px solid #666666; + background-color:#bbbbbb; + cursor:pointer; + width:10px + +} + +.textbox { + border:1px solid #999999; + background-color:#ffffff; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + width:120px; + padding:2px; + +} + + + +.mx { +} + +.calListTable td{ + border-bottom:1px solid #efefef; + border-left:1px solid #efefef; +} +.calDIV { + width:100%; + border:1px solid #999999; + +} + +.calDayHour { + border-top:1px solid #a8a591; + border-left:1px solid #a8a591; + border-bottom:1px solid #a8a591; + border-right:1px solid #a8a591; + background-color:#eae7da; +} + + +.calAddEvent { + position:absolute; + z-index:10000; + width:500px; + left:200px; + top:150px; + background-color:#ffffff; +} + + + +.addEventInnerBox { + border:1px dotted #dadada; + +} + + +.cellNormal { + border:0px; + background-color:#ffffff; +} + +.EventToDo{ + +} + +.thumbnail{ + background-color:#ffffff; +padding: 7px; +border: 1px solid #ddd; +float: left; + margin-right: 10px; + margin-bottom: 15px; +} + +.padTab{ + padding-top:0px; + padding-left:0px; + padding-left:10px; + padding-bottom:0px; + vertical-align:top; + +} + +#company{ + position:relative; + width:100%; + height:200px; + display:block; + background-color:#FFFFFF; + white-space:nowrap; + overflow:auto; + border:1px solid #CCCCCC; +} + + +#user{position:relative;left:0px;top:0px;width:100%;display:block;} + +#communication{position:relative;left:0px;top:0px;width:100%;display:block;} +#config{position:relative;left:0px;top:0px;width:100%;display:block;} + +#userTab{position:relative;left:0px;top:0px;width:100%;display:none;} + + +#one{ + position:relative; + display:block; + width:245px; +} + +#mnuTab1{ + + position:relative; + + overflow:auto; + + width:100%; + + display:none; + +} + +#mnuTab2{ + + position:relative; + + overflow:auto; + + width:100%; + + display:none; + +} + + +/* End of Settings */ + + +.bgwhite{ + background-color: #FFFFFF; +} +.copy{ + font-size:9px; + font-family: Verdana, Arial, Helvetica, Sans-serif; +} + +#basicTab{ + position:relative; + overflow:auto; + width:100%; + display:block; +} + +#moreTab{ + position:relative; + overflow:auto; + width:100%; + display:none; +} + +#one{ + position:relative; + display:block; + width:245px; +} + + +.dashHeading { + font-family:Arial, Helvetica, sans-serif; + font-size:24px; + font-weight:bold; + color:#000; +} + +.dashSelectBg{ + background-image:url(images/dashSelectBg.gif); + background-repeat:repeat-x; +} +.dash_top{ + background-image:url(images/dashTopBg.gif); + background-repeat:repeat-x; + height:63px; + vertical-align:middle; +} + +.dash_border{ + background-color:#e0dbb0; + padding:5px; +} + + +.dash_white{ + background-color:#FFFFFF; + padding:5px 10px 5px 10px; +} + +.dash_bdr_btm{ + border-bottom:2px dotted #939271; +} + +.dash_count{ + font-size:36px; + font-weight:bold; + text-decoration:none; + color:#000000; + padding-left:10px;padding-right:10px; +} + + +.dash_switch{ + cursor:pointer; + width:26px; + height:26px; +} + +.dash_row_sel{ + background-image:url(images/dash_sel_chart.jpg); + background-repeat:no-repeat; + background-position:center; + width:26px;height:26px; + text-align:center; + vertical-align:middle; + font-weight:bold; + font-size:10px; + text-decoration:none; +} + +.dash_row_unsel{ + background-image:url(images/dash_unsel_chart.jpg); + background-repeat:no-repeat; + background-position:center; + width:26px;height:26px; + text-align:center; + vertical-align:middle; + font-weight:normal; + font-size:10px; + text-decoration:none; + cursor:pointer; +} + +.dash_chart_btm{ + border-bottom:2px solid #000000; +} + + +.dash_bottom{ + background-image:url(images/dashBottomBg.gif); + background-repeat:repeat-x; + height:63px; + vertical-align:middle; +} + +.dash_btm{ + background-image:url(images/dash_btm_center.jpg); + background-repeat:repeat-x; + position:top; +} + + +/* menu */ + + + + a.submenu{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + padding-top:5px; + padding-bottom:5px; + padding-left:10px; + border-bottom:1px solid #CCCCCC; + background-color:#ECECEC; + color:#000000; + text-align:left; + text-decoration:none; + display:block; +} + +a.submenu:Hover{ + background-color:#DDDDDD; + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + padding-top:5px; + padding-bottom:5px; + padding-left:10px; + border-bottom:1px solid #CCCCCC; + color:#000000; + text-align:left; + text-decoration:none; + display:block; +} + +#mnuKey{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + background-color:#666666; + color:#FFFFFF; + text-decoration:none; + padding:5px; + font-weight:bold; + width:8px; + cursor:pointer; + vertical-align:top; + height:100px; + position:relative; + top:0px; + left:0px; +} + +#slidemenu{ + height:525px; + vertical-align:top; + width:100px; + background-color:#CCCCCC; + border-right:1px solid #CCCCCC; + opacity:.9; + display:none; +} + +/* clock */ + +.citystyle{ + position:relative; + top:0px; + left:0px; + text-align:left; + +} +#theClockLayer{ + position:relative; + height:180px; + left:20px; + text-align:center; +} +.handsanddotsstyle{ + margin-top:10px; + position:absolute; + top:0px; + left:0px; + width:2px; + height:2px; + font-size:2px; + background-color:#000000; +} +.facestyle{ + margin-top:10px; + position:absolute; + top:0px; + left:0px; + width:15px; + height:15px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} +.datestyle{ + margin-top:20px; + position:absolute; + top:0px; + left:0px; + width:100px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} +.ampmstyle{ + margin-top:23px; + position:absolute; + top:0px; + left:0px; + width:20px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} + +#wclock{ + position:absolute; + left:100px; + top:100px; + display:none; + background-color:#CCCCCC; + width:175px; +} + +.leftFormBorder1 { + border: 1px solid #AFC8E4; + background-color: #FFFFFF; + opacity:.7; +} + + + + +/* Calculator */ + +.calcResult { + width: 100%; + height: 25px; + background-color: #FFFFCC;/*CBDFD6*/ + border-top: 1px solid #CCC; + border-left: 0px; + border-right: 1px solid #CCC; + border-bottom: 1px solid #CCC; + font-size: 10px; + text-align: right; +} +.calcMem { + width: 100%; + height: 25px; + border-top: 1px solid #CCC; + border-left: 1px solid #CCC; + border-right: 0px; + border-bottom: 1px solid #CCC; + background-color: #FFFFCC;/*CBDFD6*/ + font-family: Arial; + font-size: 10px; + color: #BBB; + text-align: left; +} +.calcBlackBtn, .calcGreyBtn, .calcBigBtn, .calcCancBtn, .calcMemBtn, .calcBackBtn { + border: none; + height: 20px; + font-size: 11px; + color: #FFF; + text-align:center; +} +.calcBackBtn { + background: url(images/calc_back_btn.gif) no-repeat; + width:25px; +} +.calcBlackBtn { + background: url(images/calc_black_btn.gif) no-repeat; + width:25px; +} +.calcGreyBtn { + background: url(images/calc_grey_btn.gif) no-repeat; + width:25px; +} +.calcCancBtn { + background: url(images/calc_canc_btn.gif) no-repeat; + width:25px; + +} +.calcMemBtn { + background: url(images/calc_mem_btn.gif) no-repeat; + width:25px; + /*background-color: #CCC;*/ +} +#calc{ + position:absolute; + left:100px; + top:100px; + background-color:#FFFFFF; + width:185px; + border-bottom:2px solid #000000; + border-right:2px solid #666666; + border-left:2px solid #CCCCCC; + border-top:2px solid #CCCCCC; +} + +/* RSS STYLES */ + +.subHdr{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#FFFFFF; + background-image:url(images/rssHeader.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; +} + +.delBg{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#FFFFFF; + background-image:url(images/rssdelete.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; +} + +#rssScroll{ + font-family:Arial, Helvetica, sans-serif ; + font-size:12px; + background-color:#FFFFFF; + width:100%; + height:175px; + overflow:auto; + border:0px solid #000000; +} + +.rssTable{ + width:100%; + border:0px solid #CCCCCC; +} + +.rssTable tr th{ + background-color:#ead9a2; + text-align:left; + border-bottom:1px solid #c2c7a2; + border-top:1px solid #FFFFFF; + color:#000000; + padding-left:5px; + padding-right:5px; + height:20px; +} + +.rssTable tr td{ + text-align:left; + border-bottom:1px dotted #dadada; + border-left:1px dotted #dadada; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + font-weight:normal; + white-space:nowrap; + padding:2px; + +} + +.forwardBg{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#000000; + background-image:url(images/rssforward.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; + background-color:#D7D7D7; +} + + +/* New Styles */ + + + +.mnuTab{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:12px; + color:#000000; + width:100%; + border:0px solid #000000; +} + +.mnuTab tr td{ + border-bottom:1px solid #EBEBEB; + padding-left:5px; + vertical-align:middle; +} + +/* profile */ + +.prvPrfBigText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; +} + +.prvPrfTopBg { + background-color:#ebebeb; +} + +.prvPrfBottomBg { + background-color:#ebebeb; +} + +.prvPrfOutline { + border:1px solid #ebebeb; +} + + + +.prvPrfTexture { + background:url(images/prvPrfTexture1.gif); + +} + +.prvPrfHoverOn { + background-color:#ffffef; + +} + +/* Organization */ + +.orgTab{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + font-weight:normal; + color:#666666; + border:0px solid #9B9B9B; + border-collapse:collapse; + width:100%; +} + +.orgTab tr th{ + text-align:left; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + text-decoration:none; + font-weight:bold; + height:20px; + padding-left:5px; +} + +.orgTab tr td{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-decoration:none; + font-weight:normal; + padding-left:5px; + height:20px; + border-bottom:1px solid #CCCCCC; + border-right:1px solid #CCCCCC; +} + + +/* Groups */ + + +.groupli{ + margin-left:20px; + font-family:Arial, Helvetica, sans-serif; + font-weight:normal; + font-size:12px; + text-decoration:none; + color:#333333; + list-style-type:none; + text-align:left; +} + +/* tree menu */ + +/*Oraganization Edit Features */ + +#orgLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:500px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + display:block; + position:absolute; + left:0px; + top:0px; +} + +/* Role */ + +#roleLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + display:none; + position:absolute; +} + +.classBtn{ + font-family:Verdana, Arial, Helvetica, sans-serif; + text-decoration:none; + font-weight:normal; + font-size:10px; + background-color:#DBDBDB; + border-bottom:2px solid #999999; + border-right:2px solid #999999; + border-top:2px solid #F5F5F5; + border-left:2px solid #F5F5F5; + color:#000000; + text-align:center; + padding-top:3px; + padding-bottom:3px; +} + +.txtBox{ + width:85%; + border:1px solid #666666; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; +} + +/* IMPORT LEADS */ + +.leadTable{ + border:3px solid #CCCCCC; + border-collapse:collapse; +} + +.leadTable tr td{ +/* border:0px solid #CCCCCC;*/ +} + +.genHeaderGray{ + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + line-height: 16px; + color: #888888; + font-weight:bold; +} + +.genHeaderGrayBig{ + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + line-height: 16px; + color: #888888; + font-weight:bold; +} + +.importBox{ + width:125px; + border:1px solid #666666; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; +} + + +.txtGreen{ + color:green; +} + +/* PICK LIST */ +ul li{ + padding-bottom:2px; + padding-top:2px; +} +/* MY PREFERENCES */ + + +/* CSS FOR REPORTS */ + +.reportHdr{ + background-color:#DDDDDD; + font-size:12px; + font-weight:bold; + vertical-align:middle; + text-align:left; + height:30px; + border-bottom:2px solid #959595; + color:#000000; + padding-left:10px; +} + +#reportLay{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; + z-index:2000; +} + +#locateMap{ + width:120px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; + z-index:2000; +} + + +a.reportMnu{ + font-size:11px; + color:#0070BA; + text-decoration:none; + display:block; + width:155px; + height:20px; + border-bottom:1px solid #E1E1E1; + padding-left:20px; + padding-top:3px; +} + +a.reportMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; + display:block; + width:155px; + height:20px; + border-bottom:1px solid #E1E1E1; + padding-left:20px; + padding-top:3px; +} + +#Generate{ + position:relative; + width:100%; + text-align:center; + display:none; +} + + +/* END OF REPORT */ + + + +/* WEB MAIL */ + a.webMnu{ + font-size:11px; + color:#0070BA; + text-decoration:underline; +} +a.webMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; +} + + +/* END OF WEB MAIL */ + +/* POPUP */ + + a.alpha{ + font-size:11px; + color:gray; + text-decoration:none; + padding-Left:5px; + padding-right:5px; + border:1px dotted #CCCCCC; + background-color:#FFFFCC; +} + +a.alpha:Hover{ + font-size:11px; + color:gray; + text-decoration:underline; + padding-Left:5px; + padding-right:5px; + border:1px dotted #CCCCCC; + background-color:#FFFFCC; +} + +/* Home Page */ +.MatrixLayer{ + border:2px solid #a3a295; + background-color:#FFFFFF; + width:29%; + position:relative; + visibility:visible; + margin:9px; + height:280px; +} + +.fontBold{ + font-size:13px; + color:#000000; + text-decoration:none; + font-weight:bold; +} + +.style_Gray{ + color:gray; +} + +/* End of Home Page */ + +/* All Menu */ +#allMenu{ + width:500px; + border:4px solid #C3C2a1; + left:300px; + top:100px; + position:absolute; + z-index:1000001; + display:none; + padding:10px; + background:#ffffff url(images/layerPopUpBg.gif); +} + + +.allMnuTable{ + width:100%; + background-color:#FFFFFF; +} + +.allMnuHandle td{ + height:20px; + color:#FFFFFF; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + font-weight:bold; + text-decoration:none; + background-color:#000066; + cursor:move; + padding:2px; + border-bottom:2px solid #666666; +} + +.allMnuHdr{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-weight:Bold; + font-size:11px; + text-decoration:none; + display:block; + background-color:#FFFFFF; + color:#737251; + padding-top:5px; + padding-bottom:5px; +} + +a.allMnu{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:10px; + text-decoration:none; + font-weight:normal; + display:block; + width:125px; + height:15px; + padding-left:5px; + padding-top:0px; + padding-bottom:0px; + background-color:#FFFFFF; + border:1px solid #FFFFFF; + color:#000033; + margin-left:20px; +} + +a.allMnu:Hover{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:10px; + text-decoration:none; + font-weight:normal; + display:block; + width:125px; + height:15px; + padding-left:5px; + padding-top:0px; + padding-bottom:0px; + background-color:#dad7b5; + color:#333; +} +/* End Of All Menu */ + + + +/* Calendar */ +.calHdr{ + background-image:url(images/mailSubHeaderBg.gif); + background-repeat:repeat-x; + background-position:left top; + +} + +.calSel{ + background-image:url(images/dashSelectBg.gif); + background-repeat:repeat-x; + text-align:center; + color:#FFFFFF; + font-weight:bold; + width:8%; +} + +.calAddButton { + border: 1px solid #666666; + background:#D6D2AB url(images/calAddButtonBg.gif) repeat-x; + cursor:pointer; + height:20px; + + +} +.calInnerBorder { + border-left:1px solid #d6d2ab; + border-right:1px solid #d6d2ab; + border-bottom:1px solid #d6d2ab; +} + +.calBorder { + border-left: 1px solid #939271; + border-right: 1px solid #939271; + border-bottom: 1px solid #939271; + background:#fefefe url(images/layerPopupBg.gif); + +} + +.calTopRight { + border-right: 1px solid #939271; +} + + +.calUnSel{ + color:#000000; + font-weight:normal; + text-align:center; + width:8%; +} + + +a.calMnu{ + font-size:11px; + color:#0070BA; + text-decoration:none; + display:block; + height:20px; + padding-left:5px; + padding-top:3px; +} + +a.calMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; + display:block; + height:20px; + padding-left:5px; + padding-top:3px; +} +.bgwhite{ + background-color: #FFFFFF; +} +.copy{ + font-size:9px; + font-family: Verdana, Arial, Helvetica, Sans-serif; +} + +#mnuTab{ + position:relative; + width:100%; + display:block; +} + +#mnuTab2{ + position:relative; + overflow:auto; + width:100%; + display:none; +} +.style1 {color: #FF0000} + +.event{ + background-color:#D3EAF0; + border:1px solid #999999; + text-align:left; + width:100%; + position:relative; + left:0px; + top:0px; + vertical-align:middle; + padding:1px; +} + +#hrView{ + display:block; +} +.calendarNav{ + font-size:12px; + color:#FFFFFF; + white-space:nowrap; + text-align:center; + font-weight:bold; + padding-left:10px; + padding-right:10px; + background-image:url(images/cal_nav.gif); + background-repeat:repeat-x; +} + +#addEventDropDown{ + position:absolute; + display:none; + width:150px; + border:1px solid #666666; + left:0px; + top:0px; + overflow:visible; + z-index:5000; +} + +.calAction{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; + z-index:2000; +} + +.calSettings{ + position:absolute; + z-index:20000; + width:500px; + left:200px; + top:150px; + background-color:#ffffff; +} + +.outer{ + border-bottom:1px solid #CCCCCC; + border-left:1px solid #CCCCCC; + border-right:1px solid #CCCCCC; +} + +.calTxt{ + width:50%; + border:1px solid #CCCCCC; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + padding-left:5px; +} + +#leadLay{ + position:relative; + width:100%; + float:left; + visibility:hidden; + padding:5px; + z-index:10000; +} + +/* End of Calendar */ + +/* Cal Year View */ + + +.eventDay{ + background-color:#FF9966; + font-weight:bold; +} + +.currDay{ + background-color:#006600; + font-weight:bold; + text-decoration:underline; +} + +.currDay a{ + color:#FFFFFF; + font-weight:bold; + text-decoration:underline; +} + + +/* End of Cal Year View */ + +/* Level 2 Menu Selected*/ + +level2Sel{ + color:#000000; + font-weight:bold; + text-decoration:underline; +} + +#DeleteLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; +} + +#CurrencyDeleteLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:350px; +} + + +/* For Report HTML Generation*/ +.rptCellLabel { + background-color:#f6f6f6; + padding-right:10px; + border-right: 1px solid #DDDDDD; + border-bottom:1px solid #eaeaea; + color:#737373; + font-weight: bold; + white-space:nowrap; +} +.rptTable { + border-left: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; + border-top: 1px solid #DDDDDD; +} +.rptTitle, .rptHead, .rptData, .rptGrpHead{ + font-family: Verdana, Arial, Helvetica, Sans-serif; + font-size: 11px; + text-align:left; + font-weight: normal; + height: 20px; + padding: 4px; + border-right: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; + background: #DDDDDD; +} +.rptGrp1Total, .rptGrp2Total, .rptTotal { + font-family: Verdana, Arial, Helvetica, Sans-serif; + font-size: 11px; + text-align:center; + font-weight: normal; + background: #FFF; + height: 20px; + padding: 4px; + border-right: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; +} + +.rptGrpHead { + background: #FFF; + border-bottom: 1px solid #FFF; + border-top: 1px solid #DDDDDD; + font-weight: normal; +} + +.rptData { + background: #FFF; + font-weight: normal; +} +.rptEmptyGrp { + background: #FFF; + border-right: 1px solid #DDDDDD; +} +.statechange +{ + position:absolute; + visibility:hidden; + left:10px; + top:20px; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; +} +#PopupLay{ + position:absolute; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:500px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; + display:none; + left:100px; + top:100px; +} + +#folderLay{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; +} + +/* Css for quick Create */ + + +.qcTransport{ + background-color:#d3d2c1; + +} + +#role_popup{ + position:relative; + left:0px; + top:0px; + width:95%; + height:300px; + overflow:auto; + border:1px solid #999999; + text-align:left; + background-color:#FFFFFF; + } +.unread_email { + font-weight:bold; + background-color:#00FF00; +} + + +.qualify_email { + font-weight:bold; + background-color:#FFA500; + + } + + +.delete_email { + font-weight:bold; + background-color:#FF5151; + +} + +.mailSelected { + font-family: Arial, Helvetica, sans-serif; + font-weight:bold; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + +} +.mailSelected_select { + background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; + background-color:#1F5EFF; + font-family: Arial, Helvetica, sans-serif; + font-weight:bold; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + +} + +/* MY SITES */ + +.unread_email:hover { + font-weight:bold; +} + + + +.tagCloud { + border:1px solid #737373; +} + + +.tagCloudTopBg { + background: url(images/tagCloudBg.gif) repeat-x; + +} + +.tagCloudDisplay { + background-color:#e5e5e5; + padding:10px; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height: 14px; + color: #000000; + +} + +.h2 { + + font-size:18px; + line-height:20px; + +} + +.gray { + + color:gray; +} + + +ul { + list-style:circle; + line-height:20px; + padding-left:5px; + margin-left:20px; + font-weight:normal; + +} + + + + + +.tagCloudTopBg { + background-image: url(images/tagCloudBg.gif); + background-repeat: repeat-x; +} + +.tagCloudDisplay { + background-color:#e5e5e5; + padding:5px; +} + + + + + +.heading2 { + font-family: Arial, Helvetica, sans-serif; + font-size: 16px; + line-height: 16px; + font-weight:bold; + color: #000000; +} + + + +.settingsUI { + + text-align:left; + background-color:#d3d4c2; + border:2px solid #999a77; + +} + + +.settingsTabHeader { + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height:25px; + font-weight:bold; + color:#000000; + background-image: url(images/mailSubHeaderBg.gif); + background-repeat: repeat-x; + padding-left:10px; + padding-right:10px; + + +} + +.settingsTabList { + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:20px; + font-weight:normal; + color:#000000; + background-color:#efede2; + padding-left:30px; + border-top:1px solid #eaeaea; + border-bottom:1px solid #d3d1a3; +} +.settingsTabSelected { + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:20px; + font-weight:bold; + color:#000000; + background-color:#ffffff; + padding-left:30px; +} +.settingsSelectedUI { + padding:10px; + background:url(images/settingsSelUIBg.gif) repeat-x; + background-color:#ffffff; +} +.settingsIconDisplay { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:14px; + padding:10px; + + color:#000000; + background-color:#ffffff; + padding-left:10px; +} +.settingsSelUITopLine{ + border-bottom:2px dotted #999999; + +} + +.tableHeading{ + background-color:#ffffff; + border-bottom:2px solid #5a5b41; +} +.colHeader{ + background-color:#EFECD1; + border-left:1px solid #eaeaea; + border-top:1px solid #eaeaea; + border-right:1px solid #999a77; + border-bottom:1px solid #999a77; + font-weight:bold; + +} +.cellLabel { + background-color:#eaebd9; + border-top:1px solid #efefef; + border-bottom:1px solid #dadada; + color:#555555; + +} +.cellText { + color:#333333; + border-bottom:1px solid #dadada; +} + +.listTable{ + border-left:1px solid #cccccc; + border-right:1px solid #cccccc; + border-bottom:1px solid #cccccc; + +} + +.listTableRow{ + border-bottom:1px solid #eaeaea; + border-right :1px solid #eaeaea; + border-bottom:1px solid #eaeaea; + border-bottom:1px solid #eaeaea; +} +.listRow{ + border-bottom:2px solid #eaeaea; + +} + +.listTableTopButtons{ + background-color:#fafbe3; + +} + + +/* Buttons */ +.crmButton{ + + border-left:1px solid #ffffff; + border-top:1px solid #ffffff; + border-right:1px solid #555555; + border-bottom:1px solid #555555; +} + +.create{ + background-color:#ddccaa; + color:#333333; + font-weight:bold; +} +.delete { + background-color:#8F8C74; + color:#ffffff; + font-weight:bold; +} +.edit { + background-color:#ddccaa; + color:#333333; + font-weight:bold; +} +.save{ + background-color:#ddccaa; + color:#333333; + font-weight:bold; +} +.cancel { + background-color:#8F8C74; + color:#ffffff; + font-weight:bold; +} + +.inactive{ +color:#999999; +} + +.active{ +color:#229922; + +} + +/* Buttons ends */ + + + +textarea { + width:95%; + height:70px; + border:1px solid #dadada; +} +.treeTable1{ + padding:0px; +} + +.prvPrfBigText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; +} + +.prvPrfTopBg { + background-color:#ebebeb; +} + +.prvPrfBottomBg { + background-color:#ebebeb; +} + +.prvPrfOutline { + border:1px solid #ebebeb; +} + + + +.prvPrfTexture { + background:url(images/prvPrfTexture1.gif); + +} + + +.prvPrfHoverOn { + background-color:#ffffef; + +} + + +.cellBottomDotLine { + border-bottom-width: 2px; + border-bottom-style: dotted; + border-bottom-color: #CCCCCC; + background-color:#ededed; +} +.crmFormList{ + border:1px solid #cccccc; + width:90%; + height:120px; + +} +.cellBottomDotLinePlain { + border-bottom-width: 2px; + border-bottom-style: dotted; + border-bottom-color: #CCCCCC; + +} + +.thickBorder { + border: 2px solid #999999; +} + +.trackerHeading { + background-color:#efefef; +} +.trackerListBullet { + border-right:1px dotted #cccccc; + background-color:#f9f9f9; +} +.trackerList { + border-bottom:1px solid #eeeeee; +} + +/* Table Definitions */ +.crmTable { + border:1px solid #dadada; +} + +.crmTableRow { + border-bottom:1px dotted #dadada; + border-right:1px dotted #dadada +} + + +/* Inventory */ + +.lineOnTop { + border-top:1px solid #999999; +} + +.discountUI{ + border:3px solid #CCCCCC; + width:250px; + padding:5px; + position:absolute; + background-color:#FFFFFF; + display:none; +} + +.TaxShow{ + display:inline-table; +} + +.TaxHide{ + display:none; +} + +/* Inventory */ + + +/* Email Client Classes ++++++++++++++++++++++ */ + +.emailSelected{ + background-color:#eaeaea; + color:#000000; + font-size:bold; +} + + +.mailClient{ + border:2px solid #999a77; +} + +.mailClientBg { + background-color:#e3e1cd; +} + +.mailSubHeader { + background:#e0dbb0 url(images/mailSubHeaderBg.gif) repeat-x; + padding:4px; +} + + +.mailClientWriteEmailHeader{ + font-family:arial, helvetica, sans-serif; + font-size:20px; + line-height:24px; + font-weight:bold; + background:#e0dbb0 url(images/mailSubHeaderBg.gif) repeat-x; + padding:10px; + border-left:1px solid #eaeaea; + border-top:1px solid #eaeaea; + border-right:1px solid #939271; + border-left:1px solid #939271;; + + +} +.mailClientCSSButton { + border-left:1px solid #fff; + border-top:1px solid #fff; + border-right:1px solid #333; + border-bottom:1px solid #333; + padding:2px; + background-color:#c3c2b1; + +} + +/* Email Client Classes ends ------------------------------------ */ + + + +/* Layer Popup */ +.layerPopup { + border:3px solid #939271; + background:#fffff5 url(images/layerPopupBg.gif) ; + position:absolute; +} + +.layerPopupHeading { + font-family:arial, helvetica, sans-serif; + font-size:16px; + line-height:24px; + font-weight:bold; +} +.layerHeadingULine { + border-bottom:2px solid #717351; +} +.layerPopupTransport { + background-color:#DFDFC2; + +} +.homePageSeperator { + border-right:1px dotted #d3d2c1; +} +.homePageMatrixHdr { + border-bottom:1px solid #d3d2c1; + background:#fffff5 url(images/layerPopupBg.gif) ; +} + +.reportsListTable { + background-color:white; + border-left:1px solid #a3a29f; + border-right:1px solid #a3a29f; + border-bottom:1px solid #a3a29f; +} + +.reportGenerateTable{ + background-image:url(images/searchUIBg.gif); + border-left:2px dotted #a3a29a; + border-right:2px dotted #a3a29a; + border-bottom:2px dotted #a3a29a; +} +.reportCreateBottom{ + background-color:#939271; + border-bottom:2px solid #737251; + +} +.importLeadUI{ + + background:#fffff5 url(images/layerPopupBg.gif) ; +} + +a.customMnu{ + padding-left:30px; + padding-top:5px; + padding-bottom:5px; + display:block; + background-repeat:no-repeat; + background-position:left; + width:155px; + color:#000000; + text-decoration:none; +} + +a.customMnuSelected{ + padding-left:30px; + padding-top:5px; + padding-bottom:5px; + display:block; + background-repeat:no-repeat; + background-position:left; + width:155px; + background-color:#0099FF; + color:#FFFFFF; + text-decoration:none; +} + + +/* Drop Down Menu */ +.drop_mnu{ + position:absolute; + left:0px; + top:0px; + z-index:1000000001; + border-left:1px solid #E7E3C0; + border-right:1px solid #E7E3C0; + border-bottom:1px solid #E7E3C0; + width:150px; + display:none; + padding:0px; + text-align:left; + overflow-x:hidden; + overflow-y:hidden; + background-color:#F6F4E7; +} +a.drop_down{ + width:150px; + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:20px; + font-weight:normal; + color:#000000; + background-color:#F6F4E7; + padding:2px 5px 2px 5px; + border-top:1px solid #fafafa; + border-bottom:1px solid #d3d3c3; + display:block; +} + +a.drop_down:Hover{ + padding:2px 5px 2px 5px; + width:150px; + text-align:left; + color:#FFFFFF; + font-weight:normal; + text-decoration:underline; + background-color:#D7D5BE; +} + +.bgwhite{ + background-color:white; +} + +/* Recalculate Disabling Window */ + +.veil{ + background: url(images/searchUIBg.gif) ; + height: 100%; + width: 100%; + top: 0px; + left: 0px; + overflow: hidden; + z-index: 10000; + Filter: Alpha(opacity = 70); + -moz-opacity: 0.7; + text-align: center; + vertical-align: middle; + position: absolute; +} + +.veil_new{ + background: url(images/searchUIBg.gif) ; + height: 100%; + width: 100%; + top: 0px; + left: 0px; + overflow: hidden; + z-index: 50000; + Filter: Alpha(opacity = 70); + -moz-opacity: 0.7; + text-align: center; + vertical-align: middle; + position: absolute; +} + +.optioncontainer{ + vertical-align: middle; + height: 100%; + width: 100%; + position: absolute; + z-index: 90000; +} + + +.options{ + vertical-align: middle; + margin-left: 25%; + margin-top: 16%; + color: #FFFFFF; + width:650px; + background-color: Black; + border: 2px solid #222; + position: relative; + text-align: left; + z-index: 80000; +} + +.options h2{ + color: White; + font-family: Verdana, Arial, Helvetica, sans-serif; + border-bottom: 1px solid #373D4C; + margin: 0; + font-weight: normal; +} +.groupname{ + width:125px; + } + + +.winmarkModulesdef{ + background-image:url(images/woodspiceHomeMark.gif); + background-position:top; + background-repeat:repeat-x; +} + +/* Recalculate Disable Ends */ Modified: vtigercrm/branches/5.1_jens/user_privileges/default_module_view.php ============================================================================== --- vtigercrm/branches/5.1_jens/user_privileges/default_module_view.php (original) +++ vtigercrm/branches/5.1_jens/user_privileges/default_module_view.php Mon Apr 16 12:27:44 2007 @@ -1,14 +1,14 @@ - + +?> Modified: vtigercrm/branches/5.1_jens/vtigerversion.php ============================================================================== --- vtigercrm/branches/5.1_jens/vtigerversion.php (original) +++ vtigercrm/branches/5.1_jens/vtigerversion.php Mon Apr 16 12:27:44 2007 @@ -10,5 +10,6 @@ ********************************************************************************/ $patch_version = ''; $modified_database = ''; -$vtiger_current_version = '5.0.2'; +$vtiger_current_version = '5.0.3'; +$_SESSION['vtiger_version'] = $vtiger_current_version; ?> From chamberlain at goldak.com Mon Apr 16 12:52:58 2007 From: chamberlain at goldak.com (Dorcas I. Desalinates) Date: Mon, 16 Apr 2007 19:52:58 +0000 Subject: [Vtigercrm-commits] Some useful advices for your health Message-ID: <6894903390.20070416195258@goldak.com> The most powerful medicines for you! Quick-detox - $35.99 - Rid your body of all traces of toxins in as little as two hours with this highly effective detoxification formula. Lipotrexate - $35.99 - one of the safest and most powerful dietary supplements on the market. Its special proprietary blend of pharmaceutical grade botanicals provides you with consistent levels of sustained energy all day without the nervousness or jitters commonly associated with other diet pills. Clearitol - $40.5 - specially formulated to help correct acne-causing internal imbalances in both adults and adolescents. and more! our site http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istian at getto.de Mon Apr 16 13:10:17 2007 From: istian at getto.de (Dr. Renee Vance) Date: Mon, 16 Apr 2007 20:10:17 +0000 Subject: [Vtigercrm-commits] Master Penis Message-ID: <5476124749.20070416201017@getto.de> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070416/bd7fe872/attachment.html From istang at giftchecksadventures.com Mon Apr 16 19:17:05 2007 From: istang at giftchecksadventures.com (Plumping D. Shells) Date: Mon, 16 Apr 2007 22:17:05 -0400 Subject: [Vtigercrm-commits] Can't afford medications you need? Message-ID: <3488171196.20070416221705@giftchecksadventures.com> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://mmera.hk Make right choice: buy medications at LegalRXMedications drug store! From ackerman at greaternycrusade.org Mon Apr 16 16:07:09 2007 From: ackerman at greaternycrusade.org (Audibles A. Gimlet) Date: Mon, 16 Apr 2007 19:07:09 -0400 Subject: [Vtigercrm-commits] Pharmacy for everyone Message-ID: <9220528900.20070416190709@greaternycrusade.org> The most powerful medicines for you! Horny Goat Weed - $35.99 - Epimedium is a genus of twenty-one related plant species. It boosts libido (sex drive), increases energy levels and enhances recovery from exercise. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. Aciphex - $1.08 - used for the treatment of persistent, frequent heartburn and other symptoms associated with acid reflux disease. Persistent and frequent occurrences are classified as 2 or more days a week. and more! our site http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extremists at goldenarms.net Mon Apr 16 14:02:39 2007 From: extremists at goldenarms.net (Frustrate U. Dorm) Date: Mon, 16 Apr 2007 17:02:39 -0400 Subject: [Vtigercrm-commits] Pharmacy for everyone Message-ID: <1118305817.20070416170239@goldenarms.net> The most powerful medicines for you! Aciphex - $1.08 - used for the treatment of persistent, frequent heartburn and other symptoms associated with acid reflux disease. Persistent and frequent occurrences are classified as 2 or more days a week. Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. Premium Diet Patch - $37.12 - Lose weight fast and safe with the most potent weight loss patch on the market today! and more! our site http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istler at gibsonconsult.com Mon Apr 16 14:53:02 2007 From: istler at gibsonconsult.com (Inferno I. Acclimates) Date: Mon, 16 Apr 2007 17:53:02 -0400 Subject: [Vtigercrm-commits] Any health troubles? Message-ID: <5549591224.20070416175302@gibsonconsult.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft – the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://mmera.hk any pill you need! Absolutely Confidential and Secure purchase From tjohnson at godscope.com Mon Apr 16 23:32:57 2007 From: tjohnson at godscope.com (Tanner J. Weirs) Date: Tue, 17 Apr 2007 02:32:57 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2820852166.20070417023257@godscope.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/c8db4cd9/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: graphology.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/c8db4cd9/graphology.gif From kiishiha at gpmonnin.com Mon Apr 16 19:04:43 2007 From: kiishiha at gpmonnin.com (Heading K. Indeterminate) Date: Tue, 17 Apr 2007 02:04:43 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2164289991.20070417020443@gpmonnin.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/76645341/attachment.htm From crusherms at goveconstruction.com Mon Apr 16 19:26:24 2007 From: crusherms at goveconstruction.com (Obviously I. Eight) Date: Tue, 17 Apr 2007 02:26:24 +0000 Subject: [Vtigercrm-commits] Pharmacy for everyone Message-ID: <8299005512.20070417022624@goveconstruction.com> The most powerful medicines for you! Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. Wellbutrin SR - $3 - antidepressant used to treat depression. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. and more! our site http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From owen at good315.com Tue Apr 17 01:34:52 2007 From: owen at good315.com (Ritual I. Slog) Date: Tue, 17 Apr 2007 04:34:52 -0400 Subject: [Vtigercrm-commits] Looking for medications? Message-ID: <8822203029.20070417043452@good315.com> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://mmera.hk Only Secure and Confidential purchase! Verified buy VISA! From extralyrical at gretch.com Mon Apr 16 21:33:15 2007 From: extralyrical at gretch.com (Wallenstein O. Jewelry) Date: Tue, 17 Apr 2007 00:33:15 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <3351987542.20070417003315@gretch.com> The most powerful medicines for you! Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. Hangover Pills - $35.99 Uncle Rummies Hangover Pills are an all-natural dietary supplement providing protection from the "morning after" symptoms experienced after prolonged or excessive alcohol consumption. If taken as directed, Uncle Rummie's Hangover Helper can completely eliminate unpleasant side-effects such as headaches, nausea and dehydration. Glucosamine - $35.99 - used in case of the alleviation of the symptoms of arthritis. and more! our site http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extrameaty at getregistrar.com Mon Apr 16 19:22:10 2007 From: extrameaty at getregistrar.com (Antlered I. Peopling) Date: Mon, 16 Apr 2007 22:22:10 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6034547125.20070416222210@getregistrar.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070416/a226627d/attachment.html From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 16 21:57:37 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 04:57:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10698 - in /vtigercrm/branches/5.0.3: Smarty/templates/DetailViewUI.tpl Smarty/templates/DisplayFields.tpl include/js/general.js Message-ID: <20070417045737.D2A527C090F@vtiger.fosslabs.com> Author: richie Date: Mon Apr 16 22:57:29 2007 New Revision: 10698 Log: fix for The URL goes like http://http//vtiger.com. Fixes #3372 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl vtigercrm/branches/5.0.3/include/js/general.js Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl Mon Apr 16 22:57:29 2007 @@ -119,7 +119,7 @@ {elseif $keyid eq '17'}     		 {$keyval} Modified: vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl Mon Apr 16 22:57:29 2007 @@ -280,7 +280,7 @@   http:// - +
    From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 01:01:43 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 08:01:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10702 - in /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Webmails/ modules/Webmails/language/ Message-ID: <20070417080143.C076F7DA6EC@vtiger.fosslabs.com> Author: richie Date: Tue Apr 17 02:01:28 2007 New Revision: 10702 Log: * Fixed the issues in mail delete and navigation, Fixed #3246#3551 Added: vtigercrm/branches/5.0.3/Smarty/templates/ListViewAjax.tpl vtigercrm/branches/5.0.3/modules/Webmails/ListViewAjax.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl vtigercrm/branches/5.0.3/modules/Webmails/ListView.php vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl Tue Apr 17 02:01:28 2007 @@ -50,7 +50,7 @@ - + {/foreach} {/foreach} + + {if $ROWS_COUNT eq 0} + + {/if} +
    {$MOD.LBL_EMAIL_FOLDERS}{$ACCOUNT} > {$MAILBOX} {$NAVIGATION}{$ACCOUNT} > {$MAILBOX}
    Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Tue Apr 17 02:01:28 2007 @@ -195,8 +195,15 @@ { imap_mail_move($MailBox->mbox,$mailid,$_REQUEST["mvbox"]); } + imap_expunge($MailBox->mbox); imap_close($MailBox->mbox); - echo "SUCCESS"; + $MailBox = new MailBox($mailbox); + $elist = $MailBox->mailList; + $num_mails = $elist['count']; + $start_page = ceil($num_mails/$MailBox->mails_per_page); + imap_close($MailBox->mbox); + echo "start=".$start_page.";"; + echo "id=".$mailid.";"; flush(); exit(); } @@ -254,6 +261,7 @@ // these are mainly used in the preview window and could be ajaxified/ // during the preview window load instead. var msgCount = ""; +var start = ""; 0) { + $(mailbox+"_unread").innerHTML = unread_count; + } + else{ + $(mailbox+"_count").innerHTML = ""; + } + $("nav").innerHTML = $("navTemp").innerHTML; + $("navTemp").innerHTML = ''; + $(mailbox+"_tempcount").innerHTML = ""; + break; case 'expunge': // NOTE: we either have to reload the page or count up from the messages that // are deleted and moved or we introduce a bug from invalid mail ids - window.location = window.location; + //window.location = window.location; + start = resp; + runEmailCommand("reload",0); break; case 'delete_multi_msg': - var ids=resp; + var ids; + eval(resp); var rows = ids.split(":"); for(i=0;imbox); + $MailBox = new MailBox($mailbox); + $elist = $MailBox->mailList; + $num_mails = $elist['count']; + $start_page = ceil($num_mails/$MailBox->mails_per_page); imap_close($MailBox->mbox); + echo $start_page; flush(); exit(); } if($command == "delete_msg") { $adb->println("DELETE SINGLE WEBMAIL MESSAGE $mailid"); $MailBox = new MailBox($mailbox); - imap_mail_move($MailBox->mbox,$mailid,"Deleted"); + imap_delete($MailBox->mbox,$mailid); + imap_expunge($MailBox->mbox); $email = new Webmails($MailBox->mbox,$mailid); + $MailBox = new MailBox($mailbox); + $elist = $MailBox->mailList; + $num_mails = $elist['count']; + $start_page = ceil($num_mails/$MailBox->mails_per_page); imap_close($MailBox->mbox); - echo $mailid; + echo "start=".$start_page.";"; + echo "id=".$mailid.";"; flush(); exit(); } @@ -72,16 +87,44 @@ $MailBox = new MailBox($mailbox); $tlist = explode(":",$mailid); foreach($tlist as $id) { - imap_mail_move($MailBox->mbox,$id,"Trash"); + imap_delete($MailBox->mbox,$id); $adb->println("DELETE MULTI MESSAGE $id"); $email = new Webmails($MailBox->mbox,$id); $email->delete(); } + imap_expunge($MailBox->mbox); + $MailBox = new MailBox($mailbox); + $elist = $MailBox->mailList; + $num_mails = $elist['count']; + $start_page = ceil($num_mails/$MailBox->mails_per_page); imap_close($MailBox->mbox); - echo $mailid; + echo "start=".$start_page.";"; + echo "ids='".$mailid."';"; flush(); exit(); } + if($_POST["command"] == "move_msg" && $_POST["ajax"] == "true") { + $MailBox = new MailBox($mailbox); + if(isset($_REQUEST["mailid"]) && $_REQUEST["mailid"] != '') + { + $mailids = explode(':',$_REQUEST["mailid"]); + } + foreach($mailids as $mailid) + { + imap_mail_move($MailBox->mbox,$mailid,$_REQUEST["mvbox"]); + } + imap_expunge($MailBox->mbox); + imap_close($MailBox->mbox); + $MailBox = new MailBox($mailbox); + $elist = $MailBox->mailList; + $num_mails = $elist['count']; + $start_page = ceil($num_mails/$MailBox->mails_per_page); + imap_close($MailBox->mbox); + echo $start_page; + flush(); + exit(); + } + if($command == "undelete_msg") { $MailBox = new MailBox($mailbox); $email = new Webmails($MailBox->mbox,$mailid); Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Tue Apr 17 02:01:28 2007 @@ -45,7 +45,7 @@ 'LBL_TO'=>'To :', 'LBL_CHK_MAIL'=>'Check Mail', 'LBL_COMPOSE'=>'Compose', -'LBL_SETTINGS'=>'Incmg. MailServer Settings', +'LBL_SETTINGS'=>'Incoming MailServer Settings', 'LBL_EMAIL_FOLDERS'=>'Email Folders', 'LBL_INBOX'=>'Inbox', 'LBL_SENT_MAILS'=>'Sent Mails', From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 01:18:37 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 08:18:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10703 - in /vtigercrm/branches/5.0.3: Smarty/templates/Reports.tpl include/language/en_us.lang.php modules/Reports/CheckReport.php modules/Reports/SaveReportFolder.php Message-ID: <20070417081838.332DD7C7FC1@vtiger.fosslabs.com> Author: richie Date: Tue Apr 17 02:18:25 2007 New Revision: 10703 Log: * Fixed the issues in Folder name of Reports, Now we can give special characters and the length should be less than or equal to 20, Fixed #3385#3637 Modified: vtigercrm/branches/5.0.3/Smarty/templates/Reports.tpl vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/Reports.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Reports.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Reports.tpl Tue Apr 17 02:18:25 2007 @@ -166,6 +166,13 @@ return false; {literal} } + else if(getObj('folder_name').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length > 20 ) + { + {/literal} + alert('{$APP.FOLDER_NAME_ALLOW_20CHARS}'); + return false; + {literal} + } else { new Ajax.Request( @@ -174,21 +181,22 @@ method: 'post', postBody: 'action=ReportsAjax&mode=ajax&file=CheckReport&module=Reports&check=folderCheck&folderName='+getObj('folder_name').value, onComplete: function(response) { - if((response.responseText==1) && (mode == 'Edit')) + var mode = getObj('fldrsave_mode').value; + if((response.responseText ==1 || response.responseText != 0) && (mode == 'Edit' || mode =='save') &&response.responseText != 999) { {/literal} alert("{$APP.FOLDER_NAME_ALREADY_EXISTS}"); return false; {literal} } - else if((response.responseText !=0) && (mode == 'Edit')) + else if(response.responseText == 999) // 999 check for special chars { - {/literal}; - alert("{$APP.FOLDER_NAME_ALREADY_EXISTS}"); + {/literal} + alert("{$APP.SPECIAL_CHARS_NOT_ALLOWED}"); return false; {literal} } - else + else { fninvsh('orgLay'); var foldername = getObj('folder_name').value; @@ -197,7 +205,6 @@ getObj('folder_desc').value = ''; foldername = foldername.replace(/&/gi,'*amp*') folderdesc = folderdesc.replace(/&/gi,'*amp*') - var mode = getObj('fldrsave_mode').value; if(mode == 'save') { url ='&savemode=Save&foldername='+foldername+'&folderdesc='+folderdesc; Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Tue Apr 17 02:18:25 2007 @@ -851,6 +851,8 @@ 'LNK_READ_LICENSE'=>'Read License', 'ACTIVITIES' => 'Activities', 'MAP_NAME_EXISTS'=>'This map name already exists. \n Do you want to overwrite it?', +'FOLDER_NAME_ALLOW_20CHARS'=> 'Folder name allowed 20 characters only', +'SPECIAL_CHARS_NOT_ALLOWED' => 'Special characters not allowed. try again...', ); $app_list_strings = array ( Modified: vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php Tue Apr 17 02:18:25 2007 @@ -26,11 +26,16 @@ else if($_REQUEST['check']== 'folderCheck') { $folderName = $_REQUEST['folderName']; - $folderName = iconv("UTF-8",$default_charset,$folderName); - $sSQL="select * from vtiger_reportfolder where foldername='".$folderName."'"; - - $sqlresult = $adb->query($sSQL); - echo $adb->num_rows($sqlresult); + $folderName =str_replace(array("'",'"'),'',iconv("UTF-8",$default_charset,$folderName)); + if($folderName == "" || !$folderName) + { + echo "999"; + }else + { + $SQL="select * from vtiger_reportfolder where foldername='".$folderName."'"; + $sqlresult = $adb->query($SQL); + echo trim($adb->num_rows($sqlresult)); + } } ?> Modified: vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php Tue Apr 17 02:18:25 2007 @@ -24,6 +24,13 @@ $folderdesc = addslashes($_REQUEST["folderdesc"]); $foldername = str_replace('*amp*','&',$foldername); $folderdesc = str_replace('*amp*','&',$folderdesc); +/*if($foldername =="") +{ + echo "Please Enter valid Name"; +// header("Location: index.php?action=ReportsAjax&file=ListView&mode=ajax&module=Reports"); + +} +else*/ if($mode=="Save") { if($rfid=="") From aobrien at glorychurch.com Tue Apr 17 06:26:06 2007 From: aobrien at glorychurch.com (Gucci H. Upend) Date: Tue, 17 Apr 2007 09:26:06 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <5148830567.20070417092606@glorychurch.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://mmera.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From istillrise at globalsupply.com Tue Apr 17 06:45:09 2007 From: istillrise at globalsupply.com (Firmness M. Nilling) Date: Tue, 17 Apr 2007 09:45:09 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6571665503.20070417094509@globalsupply.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/578e6c1c/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Alistair.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/578e6c1c/Alistair.gif From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 02:32:06 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 09:32:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10704 - in /vtigercrm/branches/5.0.3: include/js/QuickCreate.js include/js/general.js modules/Users/DefaultDataPopulator.php schema/DatabaseSchema.xml Message-ID: <20070417093206.E4CCC7DA6C6@vtiger.fosslabs.com> Author: richie Date: Tue Apr 17 03:31:48 2007 New Revision: 10704 Log: fix for emailid and noofemployees validation. Fixes #3278 #3309 #3461 --minnie Modified: vtigercrm/branches/5.0.3/include/js/QuickCreate.js vtigercrm/branches/5.0.3/include/js/general.js vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml Modified: vtigercrm/branches/5.0.3/include/js/QuickCreate.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/QuickCreate.js (original) +++ vtigercrm/branches/5.0.3/include/js/QuickCreate.js Tue Apr 17 03:31:48 2007 @@ -43,7 +43,11 @@ function qcpatternValidate(fldName,fldLabel,type) { var currObj=window.document.QcEditView[fldName]; if (type.toUpperCase()=="EMAIL") //Email ID validation - var re=new RegExp(/^.+ at .+\..+$/) + { + /*changes made to fix -- ticket#3278 & ticket#3461 + var re=new RegExp(/^.+ at .+\..+$/)*/ + var re=new RegExp(/^[a-z0-9]([a-z0-9_\-\.]*)@([a-z0-9_\-\.]*)(\.[a-z]{2,3}(\.[a-z]{2}){0,2})$/) + } if (type.toUpperCase()=="DATE") {//DATE validation //YMD @@ -176,13 +180,17 @@ alert(alert_arr.INVALID+fldLabel) window.document.QcEditView[fldName].focus() return false - } - else if( val < -2147483648 || val > 2147483647) - { - alert(fldLabel +alert_arr.OUT_OF_RANGE); - return false; - } - + } + else if( (fldName != 'employees' || fldName != 'noofemployees') && (val < -2147483648 || val > 2147483647)) + { + alert(fldLabel +alert_arr.OUT_OF_RANGE); + return false; + } + else if((fldName == 'employees' || fldName == 'noofemployees') && (val < 0 || val > 2147483647)) + { + alert(fldLabel +alert_arr.OUT_OF_RANGE); + return false; + } else { return true Modified: vtigercrm/branches/5.0.3/include/js/general.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/general.js (original) +++ vtigercrm/branches/5.0.3/include/js/general.js Tue Apr 17 03:31:48 2007 @@ -240,8 +240,12 @@ function patternValidate(fldName,fldLabel,type) { var currObj=getObj(fldName) if (type.toUpperCase()=="EMAIL") //Email ID validation - var re=new RegExp(/^.+ at .+\..+$/) - + { + /*changes made to fix -- ticket#3278 & ticket#3461 + var re=new RegExp(/^.+ at .+\..+$/)*/ + var re=new RegExp(/^[a-z0-9]([a-z0-9_\-\.]*)@([a-z0-9_\-\.]*)(\.[a-z]{2,3}(\.[a-z]{2}){0,2})$/) + } + if (type.toUpperCase()=="DATE") {//DATE validation //YMD //var reg1 = /^\d{2}(\-|\/|\.)\d{1,2}\1\d{1,2}$/ //2 digit year @@ -700,12 +704,12 @@ getObj(fldName).focus() return false } - else if((fldName != 'employees') && (val < -2147483648 || val > 2147483647)) + else if((fldName != 'employees' || fldName != 'noofemployees') && (val < -2147483648 || val > 2147483647)) { alert(fldLabel +alert_arr.OUT_OF_RANGE); return false; } - else if((fldName == 'employees') && (val < 0 || val > 2147483647)) + else if((fldName == 'employees' || fldName != 'noofemployees') && (val < 0 || val > 2147483647)) { alert(fldLabel +alert_arr.OUT_OF_RANGE); return false; Modified: vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php Tue Apr 17 03:31:48 2007 @@ -248,7 +248,7 @@ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'rating','vtiger_leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')"); $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'noofemployees','vtiger_leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')"); $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'yahooid','vtiger_leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'yahooid','vtiger_leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'E~O',1,null,'ADV')"); $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')"); @@ -294,7 +294,7 @@ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'email','vtiger_contactdetails',1,'13','email','Email',1,0,0,100,15,4,1,'E~O',0,5,'BAS')"); $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'reportsto','vtiger_contactdetails',1,'57','contact_id','Reports To',1,0,0,100,16,4,1,'V~O',1,null,'ADV')"); $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'assistant','vtiger_contactsubdetails',1,'1','assistant','Assistant',1,0,0,100,17,4,1,'V~O',1,null,'ADV')"); - $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'yahooid','vtiger_contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'yahooid','vtiger_contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'E~O',1,null,'ADV')"); $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'assistantphone','vtiger_contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,null,'ADV')"); $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'donotcall','vtiger_contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,null,'ADV')"); $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'emailoptout','vtiger_contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,null,'ADV')"); Modified: vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml Tue Apr 17 03:31:48 2007 @@ -625,7 +625,7 @@ - + From sihusband at greencloud.com Tue Apr 17 00:28:35 2007 From: sihusband at greencloud.com (Pram V. Wowing) Date: Tue, 17 Apr 2007 03:28:35 -0400 Subject: [Vtigercrm-commits] Looking for perfect sex? Message-ID: <9341482286.20070417032835@greencloud.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://mmera.hk Make right choice: buy medications at LegalRXMedications drug store! From cedric at gprdehler.com Tue Apr 17 03:07:05 2007 From: cedric at gprdehler.com (Categorized H. Papergirl) Date: Tue, 17 Apr 2007 06:07:05 -0400 Subject: [Vtigercrm-commits] No doctor appointment is necessary Message-ID: <5307958730.20070417060705@gprdehler.com> The most powerful medicines for you! Singulair - $1.28 - medicine approved to help control asthma in adults and children as young as 12 months old. It also helps to relieve the symptoms of seasonal allergies in adults and children as young as 2 years old. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. Cloalis Soft Tabs - $5.78 - Just like regular Clualis but specially formulated, these pills are soft and dissolvable under the tongue. The effect of this is more direct absorption into the bloodstream, rather than through the stomach. Result – a powerful, lasting effect of up to 36 hours. and more! our site http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 03:52:21 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 10:52:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10705 - in /vtigercrm/branches/5.0.3: Smarty/templates/ReportColumnsTotal.tpl modules/Reports/ReportColumnsTotal.php modules/Reports/Reports.php modules/Reports/language/en_us.lang.php Message-ID: <20070417105221.CE9607DA6C6@vtiger.fosslabs.com> Author: richie Date: Tue Apr 17 04:52:11 2007 New Revision: 10705 Log: * Avoid display the related entity fields (accountname in contacts etc.,) in SUM, AVG in Reports, Fixed #3629 Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportColumnsTotal.tpl vtigercrm/branches/5.0.3/modules/Reports/ReportColumnsTotal.php vtigercrm/branches/5.0.3/modules/Reports/Reports.php vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportColumnsTotal.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ReportColumnsTotal.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ReportColumnsTotal.tpl Tue Apr 17 04:52:11 2007 @@ -39,6 +39,11 @@
    {$MOD.NO_COLUMN}
    Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportColumnsTotal.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/ReportColumnsTotal.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/ReportColumnsTotal.php Tue Apr 17 04:52:11 2007 @@ -48,5 +48,6 @@ $BLOCK1 = $oReport->sgetColumntoTotal($primarymodule,$secondarymodule); $report_column_tot->assign("BLOCK1",$BLOCK1); } +$report_column_tot->assign("ROWS_COUNT", count($BLOCK1[0])); $report_column_tot->display('ReportColumnsTotal.tpl'); ?> Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Reports.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Reports.php Tue Apr 17 04:52:11 2007 @@ -1058,13 +1058,57 @@ $escapedchars = Array('_SUM','_AVG','_MIN','_MAX'); if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0) { - $ssql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.displaytype = 1 order by sequence"; + $ssql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.displaytype = 1 "; + } else { $profileList = getCurrentUserProfileList(); - $ssql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.displaytype = 1 and vtiger_def_org_field.visible=0 and vtiger_profile2field.visible=0 and vtiger_profile2field.profileid in ".$profileList." order by sequence"; - } + $ssql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.displaytype = 1 and vtiger_def_org_field.visible=0 and vtiger_profile2field.visible=0 and vtiger_profile2field.profileid in ".$profileList; + } + + //Added to avoid display the Related fields (Account name,Vandor name,product name, etc) in Report Calculations(SUM,AVG..) + switch($tabid) + { + case 2://Potentials + //ie. Campaign name will not displayed in Potential's report calcullation + $ssql.= "and vtiger_field.fieldname not in ('campaignid') "; + break; + case 4://Contacts + $ssql.= "and vtiger_field.fieldname not in ('account_id') "; + break; + case 6://Accounts + $ssql.= "and vtiger_field.fieldname not in ('account_id') "; + break; + case 9://Calandar + $ssql.= "and vtiger_field.fieldname not in ('parent_id','contact_id') "; + break; + case 13://Trouble tickets(HelpDesk) + $ssql.= "and vtiger_field.fieldname not in ('parent_id','product_id') "; + break; + case 14://Products + $ssql.= "and vtiger_field.fieldname not in ('vendor_id') "; + break; + case 20://Quotes + $ssql.= "and vtiger_field.fieldname not in ('potential_id','assigned_user_id1','account_id') "; + break; + case 21://Purchase Order + $ssql.= "and vtiger_field.fieldname not in ('contact_id','vendor_id') "; + break; + case 22://SalesOrder + $ssql.= "and vtiger_field.fieldname not in ('potential_id','account_id','contact_id','quote_id') "; + break; + case 23://Invoice + $ssql.= "and vtiger_field.fieldname not in ('salesorder_id','contact_id','account_id') "; + break; + case 26://Campaings + $ssql.= "and vtiger_field.fieldname not in ('product_id') "; + break; + + } + + $ssql.= "order by sequence"; + $result = $adb->query($ssql); $columntototalrow = $adb->fetch_array($result); $options_list = Array(); Modified: vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php Tue Apr 17 04:52:11 2007 @@ -204,7 +204,7 @@ 'LBL_CUSTOM_REPORTS'=>'Custom Reports', 'ticketid'=>'Ticket Id', - +'NO_COLUMN'=>'No Columns available to Total', ) ?> From basil at green-wood.com Tue Apr 17 04:17:39 2007 From: basil at green-wood.com (Horseshoe A. Molecular) Date: Tue, 17 Apr 2007 11:17:39 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2371696489.20070417111739@green-wood.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/aa19443f/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: glissandos.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/aa19443f/glissandos.gif From cbrown at globalhealers.com Tue Apr 17 05:07:32 2007 From: cbrown at globalhealers.com (Northrup T. Clicks) Date: Tue, 17 Apr 2007 12:07:32 +0000 Subject: [Vtigercrm-commits] Straining yourself when you are with woman? Message-ID: <1466552842.20070417120732@globalhealers.com> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://mmera.hk Verified by VISA and sell FDA Approved Drugs only! From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 05:19:18 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 12:19:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10706 - /vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Message-ID: <20070417121919.230A778D64E@vtiger.fosslabs.com> Author: richie Date: Tue Apr 17 06:19:12 2007 New Revision: 10706 Log: * Fixed the issue in average because of null values ie., to get average we will use AVG function in MySQL. when we use this NULL values will not be taken to get the average so that we have used sum()/count() to get average instead of avg(), Fixed #3566 Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Tue Apr 17 06:19:12 2007 @@ -2011,7 +2011,9 @@ } if($fieldlist[4] == 3) { - $stdfilterlist[$fieldcolname] = "avg(".$fieldlist[1].".".$fieldlist[2].") '".$fieldlist[3]."'"; + //Fixed average calculation issue due to NULL values ie., when we use avg() function, NULL values will be ignored.to avoid this we use (sum/count) to find average. + //$stdfilterlist[$fieldcolname] = "avg(".$fieldlist[1].".".$fieldlist[2].") '".$fieldlist[3]."'"; + $stdfilterlist[$fieldcolname] = "(sum(".$fieldlist[1].".".$fieldlist[2].")/count(*)) '".$fieldlist[3]."'"; } if($fieldlist[4] == 4) { From smrupp at grantwilson.com Tue Apr 17 06:22:18 2007 From: smrupp at grantwilson.com (Handmaiden Q. Admissibility) Date: Tue, 17 Apr 2007 13:22:18 +0000 Subject: [Vtigercrm-commits] Any health troubles? Message-ID: <7680077976.20070417132218@grantwilson.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://mmera.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From extrahotwings at greensquare.com Tue Apr 17 11:58:58 2007 From: extrahotwings at greensquare.com (Best J. Unemployment) Date: Tue, 17 Apr 2007 14:58:58 -0400 Subject: [Vtigercrm-commits] You can't find cure that you need? Message-ID: <9201471304.20070417145858@greensquare.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://mmera.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From central at grika.com Tue Apr 17 04:50:53 2007 From: central at grika.com (Yachting P. Antiviral) Date: Tue, 17 Apr 2007 07:50:53 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <0318513705.20070417075053@grika.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://mmera.hk Verified by VISA and sell FDA Approved Drugs only! From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 07:48:31 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 14:48:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10707 - in /vtigercrm/branches/5.0.3/modules/Webmails: ListView.php Webmails.js WebmailsAjax.php Message-ID: <20070417144831.DEEAF7DA6FD@vtiger.fosslabs.com> Author: richie Date: Tue Apr 17 08:48:26 2007 New Revision: 10707 Log: * Fixed some issues in webmails Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Tue Apr 17 08:48:26 2007 @@ -295,7 +295,9 @@ $listview_entries = array(); $displayed_msgs=0; -$new_msgs=0; +$info = imap_mailboxmsginfo($MailBox->mbox); +$unread_msgs = $info->Unread; +//$new_msgs=0; if(($numEmails) <= 0) $listview_entries[0][] = '    		'.$mod_strings['LBL_NO_EMAILS'].'
    - - - -
    - - - - - - - - - - - -
    - {foreach key=button_check item=button_label from=$BUTTONS} - {if $button_check eq 'del'} - - {elseif $button_check eq 's_mail'} - - {elseif $button_check eq 's_cmail'} - - {elseif $button_check eq 'c_status'} - - {elseif $button_check eq 'c_owner'} - {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} - - {/if} - {/if} - - {/foreach} - {$RECORD_COUNTS} - - {$NAVIGATION} -
    -     		- - {if $HIDE_CUSTOM_LINKS neq '1'} - - - - - {if $ALL eq 'All'} - - {else} - - {/if} - -
    {$APP.LBL_VIEW} - {$APP.LNK_CV_CREATEVIEW} - | - {$APP.LNK_CV_EDIT} - | - {$APP.LNK_CV_DELETE}{$APP.LNK_CV_CREATEVIEW} - | - {$APP.LNK_CV_EDIT} - | - {$APP.LNK_CV_DELETE}
    - - {/if} - -
    - - -
    - - - - - {foreach name="listviewforeach" item=header from=$LISTHEADER} - - {/foreach} - - - {foreach item=entity key=entity_id from=$LISTENTITY} - - - {foreach item=data from=$entity} - - {/foreach} - - {foreachelse} - - {/foreach} -
    {$header}
    {$data}
    -
    - {assign var=vowel_conf value='LBL_A'} - {if $MODULE eq 'Accounts' || $MODULE eq 'Invoice'} - {assign var=vowel_conf value='LBL_AN'} - {/if} - {assign var=MODULE_CREATE value=$SINGLE_MOD} - {if $MODULE eq 'HelpDesk'} - {assign var=MODULE_CREATE value='Ticket'} - {/if} - - {if $CHECK.EditView eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'} - - - - - - - - - -
    - {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} - {$APP.LBL_NO} {$APP.$MODULE_CREATE} {$APP.LBL_FOUND} ! - {elseif $MODULE eq 'Calendar'} - {$APP.LBL_NO} {$APP.ACTIVITIES} {$APP.LBL_FOUND} ! - {else} - {$APP.LBL_NO} {$APP.$MODULE_CREATE}s {$APP.LBL_FOUND} ! - {/if} -
    {$APP.LBL_YOU_CAN_CREATE} {$APP.$vowel_conf} - - {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} - {$MOD.$MODULE_CREATE} - {else} - {$APP.$MODULE_CREATE} - {/if} - - {$APP.LBL_NOW}. {$APP.LBL_CLICK_THE_LINK}:
    - {if $MODULE neq 'Calendar'} -   -{$APP.LBL_CREATE} {$APP.$vowel_conf} - {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} - {$MOD.$MODULE_CREATE} - {else} - {$APP.$MODULE_CREATE} - {/if} -
    - {else} -   -{$APP.LBL_CREATE} {$APP.LBL_AN} {$APP.Event}
    -   -{$APP.LBL_CREATE} {$APP.LBL_A} {$APP.Task} - {/if} -
    - {else} - - - - - {else} - {$APP.LBL_NO} {$APP.$MODULE_CREATE}s {$APP.LBL_FOUND} ! - {/if} - - - - -
    - {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} - {$APP.LBL_NO} {$APP.$MODULE_CREATE} {$APP.LBL_FOUND} !
    {$APP.LBL_YOU_ARE_NOT_ALLOWED_TO_CREATE} {$APP.$vowel_conf} - {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} - {$MOD.$MODULE_CREATE} - {else} - {$APP.$MODULE_CREATE} - {/if} -
    -
    - {/if} -
    -
    -
    - - - - - - - - -
    - {foreach key=button_check item=button_label from=$BUTTONS} - {if $button_check eq 'del'} - - {elseif $button_check eq 's_mail'} - - {elseif $button_check eq 's_cmail'} - - {elseif $button_check eq 'c_status'} - - {elseif $button_check eq 'c_owner'} - {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} - - {/if} - {/if} - - {/foreach} - {$RECORD_COUNTS} - - {$NAVIGATION} -
    -     		- - - {$WORDTEMPLATEOPTIONS}{$MERGEBUTTON} - -
    -
    -
    - - -{$SELECT_SCRIPT} - +{**} +{if $smarty.request.ajax neq ''} +&#&#&#{$ERROR}&#&#&# +{/if} + +
    + + + + + + + + + + +
    + + + + + + + + + + + +
    + {foreach key=button_check item=button_label from=$BUTTONS} + {if $button_check eq 'del'} + + {elseif $button_check eq 's_mail'} + + {elseif $button_check eq 's_cmail'} + + {elseif $button_check eq 'c_status'} + + {elseif $button_check eq 'c_owner'} + {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} + + {/if} + {/if} + + {/foreach} + {$RECORD_COUNTS} + + {$NAVIGATION} +
    +     		+ + {if $HIDE_CUSTOM_LINKS neq '1'} + + + + + {if $ALL eq 'All'} + + {else} + + {/if} + +
    {$APP.LBL_VIEW} + {$APP.LNK_CV_CREATEVIEW} + | + {$APP.LNK_CV_EDIT} + | + {$APP.LNK_CV_DELETE}{$APP.LNK_CV_CREATEVIEW} + | + {$APP.LNK_CV_EDIT} + | + {$APP.LNK_CV_DELETE}
    + + {/if} + +
    + + +
    + + + + + {foreach name="listviewforeach" item=header from=$LISTHEADER} + + {/foreach} + + + {foreach item=entity key=entity_id from=$LISTENTITY} + + + {foreach item=data from=$entity} + + {/foreach} + + {foreachelse} + + {/foreach} +
    {$header}
    {$data}
    +
    + {assign var=vowel_conf value='LBL_A'} + {if $MODULE eq 'Accounts' || $MODULE eq 'Invoice'} + {assign var=vowel_conf value='LBL_AN'} + {/if} + {assign var=MODULE_CREATE value=$SINGLE_MOD} + {if $MODULE eq 'HelpDesk'} + {assign var=MODULE_CREATE value='Ticket'} + {/if} + + {if $CHECK.EditView eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'} + + + + + + + + + +
    + {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} + {$APP.LBL_NO} {$APP.$MODULE_CREATE} {$APP.LBL_FOUND} ! + {elseif $MODULE eq 'Calendar'} + {$APP.LBL_NO} {$APP.ACTIVITIES} {$APP.LBL_FOUND} ! + {else} + {$APP.LBL_NO} {$APP.$MODULE_CREATE}s {$APP.LBL_FOUND} ! + {/if} +
    {$APP.LBL_YOU_CAN_CREATE} {$APP.$vowel_conf} + + {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} + {$MOD.$MODULE_CREATE} + {else} + {$APP.$MODULE_CREATE} + {/if} + + {$APP.LBL_NOW}. {$APP.LBL_CLICK_THE_LINK}:
    + {if $MODULE neq 'Calendar'} +   -{$APP.LBL_CREATE} {$APP.$vowel_conf} + {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} + {$MOD.$MODULE_CREATE} + {else} + {$APP.$MODULE_CREATE} + {/if} +
    + {else} +   -{$APP.LBL_CREATE} {$APP.LBL_AN} {$APP.Event}
    +   -{$APP.LBL_CREATE} {$APP.LBL_A} {$APP.Task} + {/if} +
    + {else} + + + + + {else} + {$APP.LBL_NO} {$APP.$MODULE_CREATE}s {$APP.LBL_FOUND} ! + {/if} + + + + +
    + {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} + {$APP.LBL_NO} {$APP.$MODULE_CREATE} {$APP.LBL_FOUND} !
    {$APP.LBL_YOU_ARE_NOT_ALLOWED_TO_CREATE} {$APP.$vowel_conf} + {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} + {$MOD.$MODULE_CREATE} + {else} + {$APP.$MODULE_CREATE} + {/if} +
    +
    + {/if} +
    +
    +
    + + + + + + + + +
    + {foreach key=button_check item=button_label from=$BUTTONS} + {if $button_check eq 'del'} + + {elseif $button_check eq 's_mail'} + + {elseif $button_check eq 's_cmail'} + + {elseif $button_check eq 'c_status'} + + {elseif $button_check eq 'c_owner'} + {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} + + {/if} + {/if} + + {/foreach} + {$RECORD_COUNTS} + + {$NAVIGATION} +
    +     		+ + + {$WORDTEMPLATEOPTIONS}{$MERGEBUTTON} + +
    +
    +
    + +
    +{$SELECT_SCRIPT} + Modified: vtigercrm/branches/5.0.3/include/js/Merge.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/Merge.js (original) +++ vtigercrm/branches/5.0.3/include/js/Merge.js Tue Apr 17 09:43:35 2007 @@ -11,56 +11,35 @@ //to merge a list of acounts with a template function massMerge(module) { - x = document.massdelete.selected_id.length; - var viewid = document.massdelete.viewname.value; - idstring = ""; + var select_options = document.getElementsByName('selected_id'); + var x = select_options.length; + var viewid =getviewId(); + idstring = ""; - if ( x == undefined) - { - - if (document.massdelete.selected_id.checked) - { - document.massdelete.idlist.value=document.massdelete.selected_id.value; - } - else - { - - alert(alert_arr.SELECT); - return false; - } - } - else - { - xx = 0; - for(i = 0; i < x ; i++) - { - if(document.massdelete.selected_id[i].checked) - { - idstring = document.massdelete.selected_id[i].value +";"+idstring - xx++ - } - } - if (xx != 0) - { - document.massdelete.idlist.value=idstring; - } - else - { - - alert(alert_arr.SELECT); - return false; - } - } - - if(getObj('selectall').checked == true) - { - getObj('idlist').value = getObj('allids').value - } - if(getObj('mergefile').value == '') { alert(alert_arr.SELECT_TEMPLATE_TO_MERGE); return false; } - document.massdelete.action="index.php?module="+module+"&action=Merge&return_module="+module+"&return_action=index"; + xx = 0; + for(i = 0; i < x ; i++) + { + if(select_options[i].checked) + { + idstring = select_options[i].value +";"+idstring + xx++ + } + } + if (xx != 0) + { + document.getElementById('idlist').value=idstring; + } + else + { + alert(alert_arr.SELECT); + return false; + } + + + document.getElementById('massdelete').action="index.php?module="+module+"&action=Merge&return_module="+module+"&return_action=index"; } From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 08:47:02 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 15:47:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10711 - in /vtigercrm/branches/5.0.3/modules/Reports: ReportRun.php Reports.php Message-ID: <20070417154703.2069F78D86B@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 17 09:46:57 2007 New Revision: 10711 Log: salutation for Leads does not export in reports - fixed. Fixes #2650 Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php vtigercrm/branches/5.0.3/modules/Reports/Reports.php Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Tue Apr 17 09:46:57 2007 @@ -144,11 +144,11 @@ $query = "select vtiger_field.fieldname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where"; if($module == "Calendar") { - $query .= " vtiger_field.tabid in (9,16) and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; + $query .= " vtiger_field.tabid in (9,16) and vtiger_field.displaytype in (1,2,3) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; } else { - $query .= " vtiger_field.tabid in (select tabid from vtiger_tab where vtiger_tab.name in ('".$this->primarymodule."','".$this->secondarymodule."')) and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; + $query .= " vtiger_field.tabid in (select tabid from vtiger_tab where vtiger_tab.name in ('".$this->primarymodule."','".$this->secondarymodule."')) and vtiger_field.displaytype in (1,2,3) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; } $result = $adb->query($query); Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Reports.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Reports.php Tue Apr 17 09:46:57 2007 @@ -819,11 +819,11 @@ $query = "select vtiger_field.fieldname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where"; if($module == "Calendar") { - $query .= " vtiger_field.tabid in (9,16) and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; + $query .= " vtiger_field.tabid in (9,16) and vtiger_field.displaytype in (1,2,3) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; } else { - $query .= " vtiger_field.tabid in (select tabid from vtiger_tab where vtiger_tab.name in ('".$this->primodule."','".$this->secmodule."')) and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; + $query .= " vtiger_field.tabid in (select tabid from vtiger_tab where vtiger_tab.name in ('".$this->primodule."','".$this->secmodule."')) and vtiger_field.displaytype in (1,2,3) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; } $result = $adb->query($query); From cce at got-webdesign.com Tue Apr 17 14:02:28 2007 From: cce at got-webdesign.com (Dieted K. Oncology) Date: Tue, 17 Apr 2007 17:02:28 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2051608720.20070417170228@got-webdesign.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/6e1d9527/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: exaggerates.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/6e1d9527/exaggerates.gif From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 09:21:34 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 16:21:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10712 - /vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php Message-ID: <20070417162134.46FB17D26B4@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Apr 17 10:21:26 2007 New Revision: 10712 Log: Firefox plugin version compatibility has been fixed.by Bharath Modified: vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php Modified: vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php ============================================================================== --- vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php (original) +++ vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php Tue Apr 17 10:21:26 2007 @@ -114,7 +114,7 @@ $server->register( 'LogintoVtigerCRM', - array('user_name'=>'xsd:string','password'=>'xsd:string'), + array('user_name'=>'xsd:string','password'=>'xsd:string','version'=>'xsd:string'), array('return'=>'xsd:string'), $NAMESPACE); @@ -363,12 +363,16 @@ return $accessDenied; } } -function LogintoVtigerCRM($user_name,$password) +function LogintoVtigerCRM($user_name,$password,$version) { global $log; require_once('modules/Users/Users.php'); - - $return_access = "FALSE"; + include('vtigerversion.php'); + if($version != $vtiger_current_version) + { + return "VERSION"; + } + $return_access = "FALSES"; $objuser = new Users(); @@ -378,15 +382,15 @@ $objuser->load_user($password); if($objuser->is_authenticated()) { - $return_access = "TRUE"; + $return_access = "TRUES"; }else { - $return_access = "FALSE"; + $return_access = "FALSES"; } }else { //$server->setError("Invalid username and/or password"); - $return_access = "FALSE"; + $return_access = "FALSES"; } $objuser = $objuser; return $return_access; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 09:24:09 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 16:24:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10713 - /vtigertoolbar/trunk/firefox/chrome/content/vtigercrm_toolbar.js Message-ID: <20070417162409.F0A497DA6F8@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Apr 17 10:24:02 2007 New Revision: 10713 Log: firefox plugin version compatibility issue fixed.by Bharath Modified: vtigertoolbar/trunk/firefox/chrome/content/vtigercrm_toolbar.js Modified: vtigertoolbar/trunk/firefox/chrome/content/vtigercrm_toolbar.js ============================================================================== Binary files - no diff available. From celia at gp-ts.com Tue Apr 17 10:16:41 2007 From: celia at gp-ts.com (Nan C. Sealer) Date: Tue, 17 Apr 2007 13:16:41 -0400 Subject: [Vtigercrm-commits] Why should you pay more? Message-ID: <1059131351.20070417131641@gp-ts.com> The most powerful medicines for you! All-Natural Magnesium Oxide - $35.99 - All-Natural Magnesium Oxide is a rich source of elemental magnesium, an essential mineral. Magnesium plays a role in many vital body functions, including protein biosynthesis, as well as bone and muscle formation, and as a cofactor in hundreds of enzymatic reactions. Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. Clearitol - $40.5 - specially formulated to help correct acne-causing internal imbalances in both adults and adolescents. and more! our site http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From rmaynar at ghosthack.net Tue Apr 17 08:15:33 2007 From: rmaynar at ghosthack.net (Intermingling H. Demarcating) Date: Tue, 17 Apr 2007 11:15:33 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3265908972.20070417111533@ghosthack.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/886cc14a/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Qiqihar.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/886cc14a/Qiqihar-0001.gif From mcmillan at gowebtechnology.com Tue Apr 17 10:33:07 2007 From: mcmillan at gowebtechnology.com (Hounded A. Marx) Date: Tue, 17 Apr 2007 17:33:07 +0000 Subject: [Vtigercrm-commits] Good health is above wealth Message-ID: <7006112668.20070417173307@gowebtechnology.com> The most powerful medicines for you! Pure Natural Hoodia - $35.99 - Pure Natural Hoodia is a natural weght loss pill containing Hoodia Gordoni extract. Lipothin - $35.99 - the finest lipotropic fat burner ever! Made from only the finest pharmaceutical grade botanicals, Lipothin contains a unique and highly effective formula of all-natural ingredients which will increase your heart rate, suppress your appetite, and greatly accelerate the burning of fat. Augmetin - $4.8 - FDA-approved antibiotic for both acute bacterial sinusitis (ABS) and community-acquired pneumonia (CAP). and more! our site http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From noen at godiaygarcia.com Tue Apr 17 11:45:39 2007 From: noen at godiaygarcia.com (George Cooley) Date: Tue, 17 Apr 2007 18:45:39 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <1980706705.20070417184539@godiaygarcia.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/5ceddf6a/attachment.html From choco at greentinted.net Tue Apr 17 12:04:49 2007 From: choco at greentinted.net (Clarke L. Hellenization) Date: Tue, 17 Apr 2007 19:04:49 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2564579236.20070417190449@greentinted.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/1377e5d3/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: bonnet.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/1377e5d3/bonnet.gif From butcher at gorasrd.com Tue Apr 17 12:52:11 2007 From: butcher at gorasrd.com (Nurseryman H. Jealousy) Date: Tue, 17 Apr 2007 19:52:11 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4354428979.20070417195211@gorasrd.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/e5666a83/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Hellenistic.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/e5666a83/Hellenistic-0001.gif From darwin at gonzalezgroupinc.com Tue Apr 17 13:24:18 2007 From: darwin at gonzalezgroupinc.com (Refashioned U. Sisyphus) Date: Tue, 17 Apr 2007 16:24:18 -0400 Subject: [Vtigercrm-commits] You can't find cure that you need? Message-ID: <4150851801.20070417162418@gonzalezgroupinc.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://zuaj.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From extrapingon at global-transmission.com Tue Apr 17 13:27:39 2007 From: extrapingon at global-transmission.com (Dissemble H. Jackboot) Date: Tue, 17 Apr 2007 16:27:39 -0400 Subject: [Vtigercrm-commits] Can you imagine that you are healthy? Message-ID: <0330853257.20070417162739@global-transmission.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://zuaj.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From istaggerin at glenmoreantiques.com Tue Apr 17 13:27:45 2007 From: istaggerin at glenmoreantiques.com (Voided V. Bestiality) Date: Tue, 17 Apr 2007 16:27:45 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9103350757.20070417162745@glenmoreantiques.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/e8b6b2b7/attachment.html From extrakrispy at grempompes.com Tue Apr 17 13:28:42 2007 From: extrakrispy at grempompes.com (Unstressed O. Nanchang) Date: Tue, 17 Apr 2007 16:28:42 -0400 Subject: [Vtigercrm-commits] No need to visit local drug store. Message-ID: <1364295647.20070417162842@grempompes.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://zuaj.hk Make right choice: buy medications at LegalRXMedications drug store! From pttaylor at ginecologiapreventiva.com Tue Apr 17 13:32:21 2007 From: pttaylor at ginecologiapreventiva.com (Furnished O. Cathedral) Date: Tue, 17 Apr 2007 16:32:21 -0400 Subject: [Vtigercrm-commits] All medications at low price! Message-ID: <2249491128.20070417163221@ginecologiapreventiva.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://zuaj.hk Only Secure and Confidential purchase! Verified buy VISA! From nicholsonl at goldenvoiceaudio.com Tue Apr 17 13:38:07 2007 From: nicholsonl at goldenvoiceaudio.com (Bushwhacker F. Unparalleled) Date: Tue, 17 Apr 2007 16:38:07 -0400 Subject: [Vtigercrm-commits] The most widely prescribed drugs Message-ID: <9782537917.20070417163807@goldenvoiceaudio.com> The most powerful medicines for you! Delay Ejaculation Pills - $139.48 - Premature ejaculation is a problem faced by men and couples for years. The new delay ejaculation pills is the answer you have to this small but devastating problem Premature ejaculation not only makes the man keep craving for more but has very bad consequences on the sexual psyche of a couple. Ultram - $1.83 - an analgesic used to treat or prevent pain. Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. and more! our site http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From lynch at gianluca-pacchioni.com Tue Apr 17 13:52:30 2007 From: lynch at gianluca-pacchioni.com (Wen E. Pressurization) Date: Tue, 17 Apr 2007 16:52:30 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1794808439.20070417165230@gianluca-pacchioni.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/8b9fd2af/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: funnel.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/8b9fd2af/funnel.gif From phhma at goofballlogic.com Tue Apr 17 19:05:11 2007 From: phhma at goofballlogic.com (Ordinals V. Nissan) Date: Tue, 17 Apr 2007 22:05:11 -0400 Subject: [Vtigercrm-commits] See the results after using V1 agra Message-ID: <9326738141.20070417220511@goofballlogic.com> The most powerful medicines for you! Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. Lipitor - $1.42 - used with diet changes to reduce the amount of cholesterol and certain fatty substances in the blood. Lowering blood levels of cholesterol and fats may help to prevent heart disease, angina, strokes, and heart attacks. and more! our site http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extraterrestos at gesaman.com Tue Apr 17 20:14:24 2007 From: extraterrestos at gesaman.com (Othello O. Spirituality) Date: Tue, 17 Apr 2007 23:14:24 -0400 Subject: [Vtigercrm-commits] Need to buy medications but don't know where? Message-ID: <6450892305.20070417231424@gesaman.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://mmera.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From cnt at gfms-metalsconsulting.com Tue Apr 17 16:59:14 2007 From: cnt at gfms-metalsconsulting.com (Restricted O. Revealings) Date: Tue, 17 Apr 2007 23:59:14 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3796900392.20070417235914@gfms-metalsconsulting.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/223503c8/attachment.htm From rainbowkevin at gk-biz.com Tue Apr 17 17:15:03 2007 From: rainbowkevin at gk-biz.com (Stacey H. Fireplug) Date: Tue, 17 Apr 2007 20:15:03 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1463391163.20070417201503@gk-biz.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/3bea8f87/attachment.html From crusherdm at gpgraph.net Tue Apr 17 17:25:04 2007 From: crusherdm at gpgraph.net (Crystallography O. Categorization) Date: Tue, 17 Apr 2007 20:25:04 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9756894143.20070417202504@gpgraph.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/03fa107e/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: shampoos.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/03fa107e/shampoos.gif From extrad at gomediapost.com Tue Apr 17 17:25:34 2007 From: extrad at gomediapost.com (Rhomboides Q. Arno) Date: Tue, 17 Apr 2007 20:25:34 -0400 Subject: [Vtigercrm-commits] To buy or not to buy? Message-ID: <6200017034.20070417202534@gomediapost.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://zuaj.hk any pill you need! Absolutely Confidential and Secure purchase From pbkmr_x at gladle.net Tue Apr 17 17:25:43 2007 From: pbkmr_x at gladle.net (Kooking L. Baaed) Date: Tue, 17 Apr 2007 20:25:43 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0524826993.20070417202543@gladle.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/b6aa6e3b/attachment-0001.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: guffaw.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/b6aa6e3b/guffaw-0001.gif From istobe at greenflask.com Tue Apr 17 17:28:34 2007 From: istobe at greenflask.com (Quickness H. Glinted) Date: Tue, 17 Apr 2007 20:28:34 -0400 Subject: [Vtigercrm-commits] Cheapest way to solve health problems. Message-ID: <4458420122.20070417202834@greenflask.com> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://zuaj.hk Make right choice: buy medications at LegalRXMedications drug store! From istenn at glro.com Tue Apr 17 17:29:44 2007 From: istenn at glro.com (Downstage S. Goiter) Date: Tue, 17 Apr 2007 20:29:44 -0400 Subject: [Vtigercrm-commits] On-line generic store Message-ID: <6751183527.20070417202944@glro.com> The most powerful medicines for you! Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. Delay Ejaculation Pills - $139.48 - Premature ejaculation is a problem faced by men and couples for years. The new delay ejaculation pills is the answer you have to this small but devastating problem Premature ejaculation not only makes the man keep craving for more but has very bad consequences on the sexual psyche of a couple. and more! our site http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From edward at great-grades.com Tue Apr 17 17:33:04 2007 From: edward at great-grades.com (Tientsin A. Juan) Date: Tue, 17 Apr 2007 20:33:04 -0400 Subject: [Vtigercrm-commits] Worry about your erection? Message-ID: <5418350250.20070417203304@great-grades.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://zuaj.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From ark at gnaty.com Tue Apr 17 17:46:06 2007 From: ark at gnaty.com (Caparison G. Dahomey) Date: Tue, 17 Apr 2007 20:46:06 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2697457226.20070417204606@gnaty.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/3c728ec7/attachment.htm From sjohnson at giboon.com Tue Apr 17 18:48:47 2007 From: sjohnson at giboon.com (Hugeness E. Reconcilable) Date: Tue, 17 Apr 2007 21:48:47 -0400 Subject: [Vtigercrm-commits] Medications that you need! Message-ID: <0962085323.20070417214847@giboon.com> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://zuaj.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From harris at globalservicesrl.com Tue Apr 17 20:33:44 2007 From: harris at globalservicesrl.com (Sensitives T. Titus) Date: Tue, 17 Apr 2007 23:33:44 -0400 Subject: [Vtigercrm-commits] Can't afford medications you need? Message-ID: <8575903631.20070417233344@globalservicesrl.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://zuaj.hk Instant shipping worldwide! CONFIDENTIAL purchase! From istakal at gokearney.com Tue Apr 17 20:45:55 2007 From: istakal at gokearney.com (Introspective K. Hijacking) Date: Tue, 17 Apr 2007 23:45:55 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6684585694.20070417234555@gokearney.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/46c97fc9/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Foch.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/46c97fc9/Foch.gif From cesar at gigele.com Tue Apr 17 20:46:31 2007 From: cesar at gigele.com (Moaning B. Torus) Date: Tue, 17 Apr 2007 23:46:31 -0400 Subject: [Vtigercrm-commits] Pharmacy for everyone Message-ID: <5294705848.20070417234631@gigele.com> The most powerful medicines for you! Phentermine - $2.98 - a drug used in the short-term management of obesity. It comes in tablets or capsules of various colors depending on the strength of the medication; 15, 30 and 37.5 milligram pills available. Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. and more! our site http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From butler at goldenalaska.rydex.com Tue Apr 17 20:46:46 2007 From: butler at goldenalaska.rydex.com (Battle J. Charlatans) Date: Tue, 17 Apr 2007 23:46:46 -0400 Subject: [Vtigercrm-commits] Girls don't like you? Message-ID: <7437787418.20070417234646@goldenalaska.rydex.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://zuaj.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From crusherdaddy at gluvbox.com Tue Apr 17 20:36:19 2007 From: crusherdaddy at gluvbox.com (Waylon Soto) Date: Wed, 18 Apr 2007 03:36:19 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <4409491539.20070418033619@gluvbox.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070418/c1d73249/attachment.htm From stefylynn at granitbleu.com Tue Apr 17 20:53:01 2007 From: stefylynn at granitbleu.com (Comprehensible M. Ostracizing) Date: Tue, 17 Apr 2007 23:53:01 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1766736594.20070417235301@granitbleu.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/689d63e3/attachment.htm From arvind at globalcut.com Tue Apr 17 21:32:32 2007 From: arvind at globalcut.com (Cinched K. Gladdens) Date: Wed, 18 Apr 2007 00:32:32 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <6340432910.20070418003232@globalcut.com> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://zuaj.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 21:53:30 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 18 Apr 2007 04:53:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10714 - /vtigercrm/branches/5.0.3/include/js/customview.js Message-ID: <20070418045330.F25557C7FDF@vtiger.fosslabs.com> Author: richie Date: Tue Apr 17 22:53:23 2007 New Revision: 10714 Log: fix for Custom fields type 'number' not work in products. Fixes #3649 --minnie Modified: vtigercrm/branches/5.0.3/include/js/customview.js Modified: vtigercrm/branches/5.0.3/include/js/customview.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/customview.js (original) +++ vtigercrm/branches/5.0.3/include/js/customview.js Tue Apr 17 22:53:23 2007 @@ -82,7 +82,7 @@ return false } var decimallength = document.addtodb.fldDecimal.value; - if(fieldtype == 'Percent' || fieldtype == 'Currency' || fieldtype == 'Number') + if(fieldValueArr[fieldtype] == 'Percent' || fieldValueArr[fieldtype] == 'Currency' || fieldValueArr[fieldtype] == 'Number') { if(decimallength == '') decimallength = 0; From crushercurtis at gouldby.com Tue Apr 17 22:07:13 2007 From: crushercurtis at gouldby.com (Rebuttals A. Differentiation) Date: Wed, 18 Apr 2007 01:07:13 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3917261204.20070418010713@gouldby.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070418/84a725f0/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: brethren.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070418/84a725f0/brethren.gif From sales.email.q at gholmes.plus.com Tue Apr 17 23:16:29 2007 From: sales.email.q at gholmes.plus.com (Portfolio U. Kurdistan) Date: Wed, 18 Apr 2007 02:16:29 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <6849005018.20070418021629@gholmes.plus.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://zuaj.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From istobbe at getyourown.net Tue Apr 17 23:28:10 2007 From: istobbe at getyourown.net (Far M. Goofs) Date: Wed, 18 Apr 2007 02:28:10 -0400 Subject: [Vtigercrm-commits] Say I can have sex all night long! Message-ID: <3210988701.20070418022810@getyourown.net> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://zuaj.hk Only Secure and Confidential purchase! Verified buy VISA! From hooks at globalvisions.com Tue Apr 17 23:28:58 2007 From: hooks at globalvisions.com (Mixer F. Incompetents) Date: Wed, 18 Apr 2007 02:28:58 -0400 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <3260537071.20070418022858@globalvisions.com> The most powerful medicines for you! Pheromone perfume for women - $35.99 - The human pheromones that attracts males has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of women, these natural pheromones are an evolutionary remnant from a time when human males relied on scent to locate female mates. Zolioft - $1.08 - a type of antidepressant known as a selective serotonin reuptake inhibitor (SSRI). Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. and more! our site http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 23:32:14 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 18 Apr 2007 06:32:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10715 - /vtigercrm/branches/5.0.3/Smarty/templates/GlobalListView.tpl Message-ID: <20070418063214.4FE9A7DA6F6@vtiger.fosslabs.com> Author: richie Date: Wed Apr 18 00:32:06 2007 New Revision: 10715 Log: * Fixed the issue that vendors is not displayed when we click on tag from Home page, Fixed #3378 Modified: vtigercrm/branches/5.0.3/Smarty/templates/GlobalListView.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/GlobalListView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/GlobalListView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/GlobalListView.tpl Wed Apr 18 00:32:06 2007 @@ -21,12 +21,6 @@
    {/if} - -{if $SEARCH_MODULE eq 'All'} - -{/if} {**} @@ -114,5 +108,11 @@
    +{if $SEARCH_MODULE eq 'All'} + +{/if} + {$SELECT_SCRIPT} From parms at gomen.klfree.net Tue Apr 17 23:56:26 2007 From: parms at gomen.klfree.net (Reincarnated Q. Suggestible) Date: Wed, 18 Apr 2007 02:56:26 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9687240310.20070418025626@gomen.klfree.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070418/2229cf65/attachment.htm From posey at globalfreightsolutions.com Wed Apr 18 00:05:08 2007 From: posey at globalfreightsolutions.com (Midway Q. Redness) Date: Wed, 18 Apr 2007 03:05:08 -0400 Subject: [Vtigercrm-commits] Don't have time to visit local drug store? Message-ID: <3876309682.20070418030508@globalfreightsolutions.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://zuaj.hk Verified by VISA and sell FDA Approved Drugs only! From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 18 00:35:41 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 18 Apr 2007 07:35:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10716 - /vtigercrm/branches/5.0.3/modules/Portal/Popup.php Message-ID: <20070418073541.8F6647DA6FD@vtiger.fosslabs.com> Author: richie Date: Wed Apr 18 01:35:36 2007 New Revision: 10716 Log: fix for Site :Problem in editing an existing site. Fixes #3394 --minnie Modified: vtigercrm/branches/5.0.3/modules/Portal/Popup.php Modified: vtigercrm/branches/5.0.3/modules/Portal/Popup.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Portal/Popup.php (original) +++ vtigercrm/branches/5.0.3/modules/Portal/Popup.php Wed Apr 18 01:35:36 2007 @@ -10,12 +10,7 @@ ********************************************************************************/ require_once('modules/Portal/Portal.php'); -global $app_strings; -global $app_list_strings; -global $mod_strings; -global $adb; - -global $theme; +global $app_strings,$app_list_strings,$mod_strings,$adb,$theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; if(isset($_REQUEST['record']) && $_REQUEST['record'] !='') @@ -24,7 +19,9 @@ $query="select * from vtiger_portal where portalid =$portalid"; $result=$adb->query($query); $portalname = $adb->query_result($result,0,'portalname'); - $portalurl = $adb->query_result($result,0,'portalurl'); + $portalurl = $adb->query_result($result,0,'portalurl'); + /* to remove http:// from portal url*/ + $portalurl = preg_replace("/http:\/\//i","",$portalurl); } $portal_inputs=''; $portal_inputs.='
    From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 18 00:37:07 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 18 Apr 2007 07:37:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10717 - /vtigercrm/branches/5.0.3/modules/Calendar/ListView.php Message-ID: <20070418073707.50F3E7DA6F6@vtiger.fosslabs.com> Author: richie Date: Wed Apr 18 01:37:02 2007 New Revision: 10717 Log: fix for Basic Search fields include the Close action. Fixes #3345 --minnie Modified: vtigercrm/branches/5.0.3/modules/Calendar/ListView.php Modified: vtigercrm/branches/5.0.3/modules/Calendar/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/ListView.php Wed Apr 18 01:37:02 2007 @@ -210,6 +210,7 @@ $smarty->assign("LISTHEADER", $listview_header); $listview_header_search=getSearchListHeaderValues($focus,"Calendar",$url_string,$sorder,$order_by,"",$oCustomView); +unset($listview_header_search["eventstatus"]); $smarty->assign("SEARCHLISTHEADER", $listview_header_search); $listview_entries = getListViewEntries($focus,"Calendar",$list_result,$navigation_array,"","","EditView","Delete",$oCustomView); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 18 00:51:41 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 18 Apr 2007 07:51:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10718 - in /vtigercrm/branches/5.0.3/modules: Calendar/addEventUI.php Settings/CurrencyListView.php Settings/CustomFieldList.php Settings/listroles.php Users/Login.php Message-ID: <20070418075141.9003F7DA6FD@vtiger.fosslabs.com> Author: richie Date: Wed Apr 18 01:51:32 2007 New Revision: 10718 Log: fix for i18n issue: lots of untranslatable alt= and title=. minnie Modified: vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php vtigercrm/branches/5.0.3/modules/Settings/CurrencyListView.php vtigercrm/branches/5.0.3/modules/Settings/CustomFieldList.php vtigercrm/branches/5.0.3/modules/Settings/listroles.php vtigercrm/branches/5.0.3/modules/Users/Login.php Modified: vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php Wed Apr 18 01:51:32 2007 @@ -296,7 +296,7 @@ hour_format,'start');?> - Set date.. + <?php echo $mod_strings['LBL_SET_DATE']?> Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Fri Apr 20 02:23:45 2007 @@ -171,6 +171,7 @@ var mailbox = "mailbox;?>"; var box_refresh=box_refresh;?>; var webmail = new Array(); +var webmail2 = new Array(); var timer; var command; var id; @@ -262,6 +263,7 @@ // during the preview window load instead. var msgCount = ""; var start = ""; +var gselected_mail = ''; msgno] = $val; $hdr = @imap_headerinfo($MailBox->mbox, $val->msgno); - //Added to get the UTF-8 string - 30-11-06 - Mickie - //we have to do this utf8 decode for the fields which may contains special characters -- Mickie - 02-02-07 $val->from = utf8_decode(imap_utf8(addslashes($val->from))); $val->to = utf8_decode(imap_utf8(addslashes($val->to))); $val->subject = utf8_decode(imap_utf8($val->subject)); + $list = explode("<",$val->from); + $js_array .= "webmail2[".$val->msgno."] = new Array();"; + $js_array .= "webmail2[".$val->msgno."]['from'] = '".addslashes($list[0])."';"; + $js_array .= "webmail2[".$val->msgno."]['to'] = '".addslashes($val->to)."';"; + $js_array .= "webmail2[".$val->msgno."]['subject'] = '".addslashes($val->subject)."';"; + $js_array .= "webmail2[".$val->msgno."]['date'] = '".addslashes($val->date)."';"; + $js_array .= "webmail2[".$val->msgno."]['cc'] = '".$hdr->ccaddress."';"; } } $search_fields = Array("SUBJECT","BODY","TO","CC","BCC","FROM"); @@ -205,8 +210,8 @@ if($numEmails==0) {$num=$numEmails;} else {$num=($numEmails-1);} $folders .= '
  •   '.$tmpval.'  '; - if($new_msgs > 0) - $folders .= '('.$new_msgs.')  
    • '; + if($unread_msgs > 0) + $folders .= '('.$unread_msgs.')  '; } else { $box = imap_status($MailBox->mbox, "{".$MailBox->imapServerAddress."}".$tmpval, SA_ALL); @@ -222,7 +227,7 @@ $boxes .= ''; } imap_close($MailBox->mbox); - +echo ''; $smarty = new vtigerCRM_Smarty; //$smarty->assign("USERID", $current_user->id); $smarty->assign("MOD", $mod_strings); @@ -242,6 +247,7 @@ $smarty->assign("MAILBOX", $MailBox->mailbox); $smarty->assign("ACCOUNT", $MailBox->display_name); $smarty->assign("BOXLIST",$folders); +$smarty->assign("MAIL_INFO",$js_array); //$smarty->assign("DEGRADED_SERVICE",$degraded_service); $smarty->display("ListViewAjax.tpl"); ?> Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Fri Apr 20 02:23:45 2007 @@ -9,6 +9,12 @@ ********************************************************************************/ function load_webmail(mid) { var node = $("row_"+mid); + var webmail2 = new Array(); + if(getObj("js_arr")){ + eval(getObj("js_arr").innerHTML); + } + else + webmail2 = null; if(typeof($('fnt_subject_'+mid)) != "undefined" && $('fnt_subject_'+mid).color=="green") { $('fnt_subject_'+mid).color=""; @@ -36,13 +42,20 @@ )); } node.className='read_email'; - - $("from_addy").innerHTML = " "+webmail[mid]["from"]; - $("to_addy").innerHTML = " "+webmail[mid]["to"]; - $("webmail_subject").innerHTML = " "+webmail[mid]["subject"]; - $("webmail_date").innerHTML = " "+webmail[mid]["date"]; - $("webmail_cc").innerHTML = " "+webmail[mid]["cc"]; - + if(webmail2 == null){ + $("from_addy").innerHTML = " "+webmail[mid]["from"]; + $("to_addy").innerHTML = " "+webmail[mid]["to"]; + $("webmail_subject").innerHTML = " "+webmail[mid]["subject"]; + $("webmail_date").innerHTML = " "+webmail[mid]["date"]; + $("webmail_cc").innerHTML = " "+webmail[mid]["cc"]; + } + else{ + $("from_addy").innerHTML = " "+webmail2[mid]["from"]; + $("to_addy").innerHTML = " "+webmail2[mid]["to"]; + $("webmail_subject").innerHTML = " "+webmail2[mid]["subject"]; + $("webmail_date").innerHTML = " "+webmail2[mid]["date"]; + $("webmail_cc").innerHTML = " "+webmail2[mid]["cc"]; + } //Fix for webmails body display in IE - dartagnanlaf /* new Ajax.Request( @@ -88,13 +101,50 @@ $("full_view").removeChild($("full_view").firstChild); $("full_view").appendChild(Builder.node('a',{href: 'javascript:;', onclick: 'OpenCompose('+mid+',\'full_view\')'},'Full Email View')); - makeSelected(node.id) } function displayAttachments(mid) { var url = "index.php?module=Webmails&action=dlAttachments&mailid="+mid+"&mailbox="+mailbox; window.open(url,"Download Attachments",'menubar=no,toolbar=no,location=no,status=no,resizable=no,width=450,height=450'); } +function OpenCompose(id,mode) +{ + switch(mode) + { + case 'edit': + url = 'index.php?module=Webmails&action=EditView&record='+id; + break; + case 'create': + url = 'index.php?module=Emails&action=EmailsAjax&file=EditView'; + break; + case 'forward': + url = 'index.php?module=Emails&action=EmailsAjax&mailid='+id+'&forward=true&webmail=true&file=EditView&mailbox='+mailbox; + break; + case 'reply': + url = 'index.php?module=Emails&action=EmailsAjax&mailid='+id+'&reply=single&webmail=true&file=EditView&mailbox='+mailbox; + break; + case 'replyall': + url = 'index.php?module=Emails&action=EmailsAjax&mailid='+id+'&reply=all&webmail=true&file=EditView&mailbox='+mailbox; + break; + case 'attachments': + url = 'index.php?module=Webmails&action=dlAttachments&mailid='+id+'&mailbox='+mailbox; + break; + case 'full_view': + url = 'index.php?module=Webmails&action=DetailView&record='+id+'&mailid='+id+'&mailbox='+mailbox; + break; + } + openPopUp('xComposeEmail',this,url,'createemailWin',830,662,'menubar=no,toolbar=no,location=no,status=no,resizable=yes,scrollbars=yes'); +} + +function makeSelected(rowId) +{ + if(gselected_mail != '') + $(gselected_mail).className = ''; + + $(rowId).className = 'mailSelected_select'; + gselected_mail = rowId; +} + function showRelationships(mid) { // TODO: present the user with a simple DHTML div to // choose what type of relationship they would like to create @@ -166,10 +216,12 @@ ); } function check_for_new_mail(mbox) { - window.location=window.location; + //window.location=window.location; if(degraded_service == 'true') { return; } + mailbox = mbox; + runEmailCommand("reload",0); $("status").style.display="block"; /* new Ajax.Request( @@ -454,6 +506,7 @@ function runEmailCommand(com,id) { command=com; id=id; + gselected_mail = ''; if(com == 'delete_msg') { if(!confirm(alert_arr.DELETE+" "+alert_arr.MAIL+" ?")) @@ -470,7 +523,8 @@ } else qry_str = ""; - $("status").style.display="block"; + + $("status").style.display="block"; new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'command'}, @@ -484,7 +538,6 @@ case 'reload': $("rssScroll").innerHTML = resp; var unread_count = parseInt($(mailbox+"_tempcount").innerHTML); - //$("nav").innerHTML = $("navTemp").innerHTML; if(unread_count > 0) { $(mailbox+"_unread").innerHTML = unread_count; } @@ -492,12 +545,9 @@ $(mailbox+"_count").innerHTML = ""; } $("nav").innerHTML = $("navTemp").innerHTML; - if(change_box != 1){ - $("box_list").innerHTML = $("temp_boxlist").innerHTML; - change_box = 0; - } + $("box_list").innerHTML = $("temp_boxlist").innerHTML; $("move_pane").innerHTML = $("temp_movepane").innerHTML; - $("temp_boxlist").innerHTML = ""; + // $("temp_boxlist").innerHTML = ""; $("temp_movepane").innerHTML = ""; $("navTemp").innerHTML = ''; $(mailbox+"_tempcount").innerHTML = ""; @@ -536,7 +586,7 @@ ); try { - $("del_link_"+id).innerHTML = ''+alert_arr.LBL_DEL+''; + $("del_link_"+id).innerHTML = 'del'; new Effect.Fade(row,{queue: {position: 'end', scope: 'effect'},duration: '0.5'}); tmp = document.getElementsByClassName("previewWindow"); @@ -573,7 +623,7 @@ } ); - $("del_link_"+id).innerHTML = ''+alert_arr.LBL_DEL+''; + $("del_link_"+id).innerHTML = 'del'; new Effect.Fade(row,{queue: {position: 'end', scope: 'effect'},duration: '1.0'}); tmp = document.getElementsByClassName("previewWindow"); @@ -591,7 +641,7 @@ node.style.display = ''; var newhtml = remove(remove(node.innerHTML,''),''); node.innerHTML=newhtml; - $("del_link_"+id).innerHTML = ''+alert_arr.LBL_DEL+''; + $("del_link_"+id).innerHTML = 'del'; $("status").style.display="none"; break; case 'clear_flag': @@ -635,7 +685,8 @@ } function changeMbox(box) { mailbox=box; - start = 0; + start = 0; + change_box=1; runEmailCommand("reload",0); //location.href = "index.php?module=Webmails&action=index&mailbox="+box; } From ksbmorck at graddo.com Fri Apr 20 01:38:12 2007 From: ksbmorck at graddo.com (Mealies H. Oratory) Date: Fri, 20 Apr 2007 04:38:12 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <2398500233.20070420043812@graddo.com> The most powerful medicines for you! Nymphomax - $35.99 - Helps women to achieve multiple and more powerful orgasms with this unique female sexual stimulant. Cloalis Soft Tabs - $5.78 - Just like regular Clualis but specially formulated, these pills are soft and dissolvable under the tongue. The effect of this is more direct absorption into the bloodstream, rather than through the stomach. Result – a powerful, lasting effect of up to 36 hours. Proprecia - $1.03 - first and only FDA-approved pill demonstrated to treat male pattern hair loss on the vertex (top of head) and anterior mid-scalp area (middle front of head) in men only. and more! our site http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 01:32:41 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 08:32:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10742 - in /vtigercrm/branches/5.0.3: Smarty/templates/ComposeEmail.tpl modules/Emails/EditView.php modules/Emails/Save.php modules/Emails/language/en_us.lang.php Message-ID: <20070420083241.A6C0A7DA476@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 02:32:12 2007 New Revision: 10742 Log: * Fixed the file validation issue, Fixed #3131 Modified: vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl vtigercrm/branches/5.0.3/modules/Emails/EditView.php vtigercrm/branches/5.0.3/modules/Emails/Save.php vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl Fri Apr 20 02:32:12 2007 @@ -62,7 +62,7 @@ -   +   {else} @@ -131,7 +131,7 @@ {elseif $elements.2.0 eq 'description'} - {if $WEBMAIL eq 'true'} + {if $WEBMAIL eq 'true' or $RET_ERROR eq 1} {else} {/if} Modified: vtigercrm/branches/5.0.3/modules/Emails/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/EditView.php Fri Apr 20 02:32:12 2007 @@ -288,7 +288,20 @@ $smarty->assign("FILENAME_TEXT", "(".$focus->filename.")"); $smarty->assign("FILENAME", $focus->filename); } - +if($ret_error == 1) { + $smarty->assign("RET_ERROR",$ret_error); + if($ret_toadd != '') + $smarty->assign("TO_MAIL",$ret_toadd); + $ret_toadd = ''; + if($ret_subject != '') + $smarty->assign("SUBJECT",$ret_subject); + if($ret_ccaddress != '') + $smarty->assign("CC_MAIL",$ret_ccaddress); + if($ret_bccaddress != '') + $smarty->assign("BCC_MAIL",$ret_bccaddress); + if($ret_description != '') + $smarty->assign("DESCRIPTION", $ret_description); +} $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); Modified: vtigercrm/branches/5.0.3/modules/Emails/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/Save.php Fri Apr 20 02:32:12 2007 @@ -59,9 +59,46 @@ $focus = new Emails(); -global $current_user; +global $current_user,$mod_strings,$app_strings; setObjectValuesFromRequest(&$focus); //Check if the file is exist or not. +//$file_name = ''; +$file_name = $_FILES['filename']['name'];//preg_replace('/\s+/', '_', $_FILES['filename']['name']); +$errorCode = $_FILES['filename']['error']; +$errormessage = ""; +if($file_name != '' && $_FILES['filename']['size'] == 0){ + if($errorCode == 4 || $errorCode == 0) + { + if($_FILES['filename']['size'] == 0) + $errormessage = "".$mod_strings['LBL_PLEASE_ATTACH']."
    "; + } + else if($errorCode == 2) + { + $errormessage = "".$mod_strings['LBL_EXCEED_MAX'].$upload_maxsize.$mod_strings['LBL_BYTES']."
    "; + } + else if($errorCode == 6) + { + $errormessage = "".$mod_strings['LBL_KINDLY_UPLOAD']."
    " ; + } + else if($errorCode == 3 ) + { + if($_FILES['filename']['size'] == 0) + $errormessage = "".$mod_strings['LBL_PLEASE_ATTACH']."
    "; + } + else{} + if($errormessage != ""){ + $ret_error = 1; + $ret_toadd = $_REQUEST['to_add']; + $ret_subject = $_REQUEST['subject']; + $ret_ccaddress = $_REQUEST['ccmail']; + $ret_bccaddress = $_REQUEST['bccmail']; + $ret_description = $_REQUEST['description']; + echo $errormessage; + include("EditView.php"); + exit(); + } +} + if($_FILES["filename"]["size"] == 0 && $_FILES["filename"]["name"] != '') { $file_upload_error = true; Modified: vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php Fri Apr 20 02:32:12 2007 @@ -169,6 +169,10 @@ 'FEATURE_AVAILABLE_INFO' => 'This feature is currently only available for Microsoft Internet Explorer 5.5+ users\n\nWait f or an update!', 'DOWNLOAD_CONFIRAMATION' => 'Do you want to download the file ?', +'LBL_PLEASE_ATTACH' => 'Please give a valid file to attach and try again!', +'LBL_KINDLY_UPLOAD' => 'Please configure upload_tmp_dir variable in php.ini file.', +'LBL_EXCEED_MAX' => 'Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than ', +'LBL_BYTES' => ' bytes', ); From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 01:41:43 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 08:41:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10743 - /vtigercrm/branches/5.0.3/include/utils/export.php Message-ID: <20070420084143.062167DA76C@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 02:41:38 2007 New Revision: 10743 Log: * Fixed the issue in export, Fixed #3647 Modified: vtigercrm/branches/5.0.3/include/utils/export.php Modified: vtigercrm/branches/5.0.3/include/utils/export.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/export.php (original) +++ vtigercrm/branches/5.0.3/include/utils/export.php Fri Apr 20 02:41:38 2007 @@ -134,7 +134,7 @@ { $value=br2nl_vt($value); } - $value = preg_replace("/(<\/?)(\w+)([^>]*>)/i","",$value); + $value = preg_replace("/(<\/?)(\w+)([^>]*>)/i","",html_entity_decode($value, ENT_QUOTES, "ISO-8859-1")); array_push($new_arr, preg_replace("/\"/","\"\"",$value)); } $line = implode("\",\"",$new_arr); From extremeja at gregpearson.ca Fri Apr 20 02:17:55 2007 From: extremeja at gregpearson.ca (Boll E. McDonald) Date: Fri, 20 Apr 2007 05:17:55 -0400 Subject: [Vtigercrm-commits] Say I can have sex all night long! Message-ID: <2793312147.20070420051755@gregpearson.ca> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://zuaj.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From istophertidmore at gordonanderson.net Fri Apr 20 02:45:07 2007 From: istophertidmore at gordonanderson.net (Immutability I. Applied) Date: Fri, 20 Apr 2007 05:45:07 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5149412487.20070420054507@gordonanderson.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/9ecaa0ab/attachment.html From arthur at gorman.esc14.net Fri Apr 20 02:52:51 2007 From: arthur at gorman.esc14.net (Sociably E. Emblem) Date: Fri, 20 Apr 2007 05:52:51 -0400 Subject: [Vtigercrm-commits] Want to on the top all night? Message-ID: <2598321071.20070420055251@gorman.esc14.net> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://zuaj.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From jms at ghostboy.com Fri Apr 20 03:21:44 2007 From: jms at ghostboy.com (Attacked Q. Tumor) Date: Fri, 20 Apr 2007 06:21:44 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8938777712.20070420062144@ghostboy.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/0d039da7/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: assassins.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/0d039da7/assassins-0001.gif From krasmusson at ginebro.com Fri Apr 20 03:32:32 2007 From: krasmusson at ginebro.com (Dosages P. Blueprint) Date: Fri, 20 Apr 2007 06:32:32 -0400 Subject: [Vtigercrm-commits] Nobody will know bout your problems. Message-ID: <7372571845.20070420063232@ginebro.com> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://zuaj.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From harvest at getaninsight.com Fri Apr 20 04:48:27 2007 From: harvest at getaninsight.com (Catbird J. Herniae) Date: Fri, 20 Apr 2007 07:48:27 -0400 Subject: [Vtigercrm-commits] Say NO to erectile dysfunction! Message-ID: <7740283435.20070420074827@getaninsight.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://uuzj.hk Completely secure and confidential purchase. Instant shipping worldwide. From jeffih at goodboyz.com Fri Apr 20 04:49:00 2007 From: jeffih at goodboyz.com (Dilemma F. Darwinism) Date: Fri, 20 Apr 2007 07:49:00 -0400 Subject: [Vtigercrm-commits] Why should you pay more? Message-ID: <1336690644.20070420074900@goodboyz.com> The most powerful medicines for you! Delay Ejaculation Pills - $139.48 - Premature ejaculation is a problem faced by men and couples for years. The new delay ejaculation pills is the answer you have to this small but devastating problem Premature ejaculation not only makes the man keep craving for more but has very bad consequences on the sexual psyche of a couple. Zero Nicotine - $47.99 - innovative stop smoking patch designed to help you give up smoking safely and naturally. With its unique blend of ingredients, Zero Nicotine offers you the best possible chance to finally kick the deadly habit for good! If you are serious about your decision to quit smoking, you’ve come to the right place. Cumpills - are a great concept formulated by our highly trained speclalists working in the field of natural therapy. Using the knowledge of thousands of years of cumulative research in herbals, this specially designed formula helps in achieving high levels of semen volume and quality. and more! our site http://uuzj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istohr at go-on-vacation.com Fri Apr 20 05:01:55 2007 From: istohr at go-on-vacation.com (Adultery L. Webbing) Date: Fri, 20 Apr 2007 08:01:55 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1108949104.20070420080155@go-on-vacation.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://uuzj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/76eb978b/attachment.htm From jbowers at globalvision.org Fri Apr 20 05:35:49 2007 From: jbowers at globalvision.org (Beachcombers K. Whoops) Date: Fri, 20 Apr 2007 08:35:49 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <8349287017.20070420083549@globalvision.org> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://uuzj.hk Instant shipping worldwide! CONFIDENTIAL purchase! From amt at gonzoaccess.com Fri Apr 20 05:30:55 2007 From: amt at gonzoaccess.com (Derek Buckley) Date: Fri, 20 Apr 2007 12:30:55 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <1304369417.20070420123055@gonzoaccess.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/a4227c46/attachment.html From isteyn at gjennestad.com Fri Apr 20 06:33:06 2007 From: isteyn at gjennestad.com (Employable P. Geographer) Date: Fri, 20 Apr 2007 09:33:06 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9199365775.20070420093306@gjennestad.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/12948c09/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Gregg.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/12948c09/Gregg.gif From ortega at girczyc.net Fri Apr 20 06:37:34 2007 From: ortega at girczyc.net (Chimpanzee K. Wrangling) Date: Fri, 20 Apr 2007 09:37:34 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <9162047450.20070420093734@girczyc.net> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://uuzj.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From clayton at greatfallsgourmet.com Fri Apr 20 07:11:28 2007 From: clayton at greatfallsgourmet.com (Moveables V. Golder) Date: Fri, 20 Apr 2007 10:11:28 -0400 Subject: [Vtigercrm-commits] sexual drive Message-ID: <5932365315.20070420101128@greatfallsgourmet.com> The most powerful medicines for you! Suregasm - $35.99 - Achieve stronger and more powerful orgasms with this all-natural female sexual stimulant. Cumpills - are a great concept formulated by our highly trained speclalists working in the field of natural therapy. Using the knowledge of thousands of years of cumulative research in herbals, this specially designed formula helps in achieving high levels of semen volume and quality. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. and more! our site http://uuzj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 07:35:44 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 14:35:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10744 - in /vtigercrm/branches/5.0.3: Smarty/templates/Settings/BackupServer.tpl modules/Settings/language/en_us.lang.php Message-ID: <20070420143544.AF2107DA476@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 08:35:33 2007 New Revision: 10744 Log: fix for Manage Backup Server Settings. Fixes #1634 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/BackupServer.tpl vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/BackupServer.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/BackupServer.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/BackupServer.tpl Fri Apr 20 08:35:33 2007 @@ -60,6 +60,13 @@ + + + + +
    +
    {$MOD.LBL_BACKUP_DESC} +
    Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Fri Apr 20 08:35:33 2007 @@ -921,5 +921,7 @@ 'LBL_ADD_ROLE'=>'Add Role', 'LBL_EDIT_ROLE'=>'Edit Role', 'LBL_MOVE_ROLE'=>'Move Role', + +'LBL_BACKUP_DESC'=>' The CRM system allows you to make a backup of the database to your FTP server. The CRM will take backup of all data whenever an admin user logs out. Make sure you have enough disk space available on your FTP server. The created backup file will be in the following format: "backup-date-time.sql".', ); ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 07:36:53 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 14:36:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10745 - in /vtigercrm/branches/5.0.3: Smarty/templates/CustomView.tpl modules/CustomView/EditView.php Message-ID: <20070420143653.69EC97DA780@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 08:36:42 2007 New Revision: 10745 Log: fix for select a columns field. Fixes #3507 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl Fri Apr 20 08:36:42 2007 @@ -364,12 +364,19 @@ + {if $STDCOLUMNSCOUNT neq 0} + {else} + + + {/if} @@ -378,7 +385,14 @@ + {else} + + {/if} + {else} + + {/if} {elseif $header eq 'Users'} {if $MODULE eq 'Calendar'} Modified: vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl Mon Apr 30 06:44:55 2007 @@ -24,7 +24,6 @@
      {$MOD.LBL_STEP_3_TITLE} {$MOD.LBL_STEP_4_TITLE} + {$MOD.LBL_STEP_4_TITLE} +  
    -
    + {if $STDCOLUMNSCOUNT eq 0} + {assign var=stddiv value="style=display:none"} + {assign var=advdiv value="style=display:block"} + {else} + {assign var=stddiv value="style=display:block"} + {assign var=advdiv value="style=display:none"} + {/if} +
    '; $array_tab = Array(); $webmail->loadMail($array_tab); -echo ''; -if($webmail->has_attachments) +echo ''; +/*if($webmail->has_attachments) { //check for attachments echo ""; Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Fri Apr 27 08:21:59 2007 @@ -37,12 +37,12 @@ $("unread_img_"+mid).removeChild($("unread_img_"+mid).firstChild); $("unread_img_"+mid).appendChild(Builder.node('a', - {href: 'javascript:;', onclick: 'OpenCompose('+mid+',"reply")'}, + {href: 'javascript:;', onclick: 'OpenComposer('+mid+',"reply")'}, [Builder.node('img',{src: 'modules/Webmails/images/stock_mail-read.png', border: '0', width: '10', height: '11'})] )); } node.className='read_email'; - if(webmail2 == null){ + /*if(webmail2 == null){ $("from_addy").innerHTML = " "+webmail[mid]["from"]; $("to_addy").innerHTML = " "+webmail[mid]["to"]; $("webmail_subject").innerHTML = " "+webmail[mid]["subject"]; @@ -55,7 +55,7 @@ $("webmail_subject").innerHTML = " "+webmail2[mid]["subject"]; $("webmail_date").innerHTML = " "+webmail2[mid]["date"]; $("webmail_cc").innerHTML = " "+webmail2[mid]["cc"]; - } + }*/ //Fix for webmails body display in IE - dartagnanlaf /* new Ajax.Request( @@ -85,13 +85,13 @@ $("delete_button").appendChild(Builder.node('input',{type: 'button', name: 'Button', value: 'Delete', className: 'crmbutton small delete', onclick: 'runEmailCommand(\'delete_msg\','+mid+')'})); $("reply_button_all").removeChild($("reply_button_all").firstChild); - $("reply_button_all").appendChild(Builder.node('input',{type: 'button', name: 'reply', value: ' Reply To All ', className: 'crmbutton small create', onclick: 'OpenCompose('+mid+',\'replyall\')'})); + $("reply_button_all").appendChild(Builder.node('input',{type: 'button', name: 'reply', value: ' Reply To All ', className: 'crmbutton small create', onclick: 'OpenComposer('+mid+',\'replyall\')'})); $("reply_button").removeChild($("reply_button").firstChild); - $("reply_button").appendChild(Builder.node('input',{type: 'button', name: 'reply', value: ' Reply To Sender ', className: 'crmbutton small create', onclick: 'OpenCompose('+mid+',\'reply\')'})); + $("reply_button").appendChild(Builder.node('input',{type: 'button', name: 'reply', value: ' Reply To Sender ', className: 'crmbutton small create', onclick: 'OpenComposer('+mid+',\'reply\')'})); $("forward_button").removeChild($("forward_button").firstChild); - $("forward_button").appendChild(Builder.node('input',{type: 'button', name: 'forward', value: ' Forward ', className: 'crmbutton small create', onclick: 'OpenCompose('+mid+',\'forward\')'})); + $("forward_button").appendChild(Builder.node('input',{type: 'button', name: 'forward', value: ' Forward ', className: 'crmbutton small create', onclick: 'OpenComposer('+mid+',\'forward\')'})); $("qualify_button").removeChild($("qualify_button").firstChild); $("qualify_button").appendChild(Builder.node('input',{type: 'button', name: 'Qualify2', value: ' Qualify ', className: 'crmbutton small save', onclick: 'showRelationships('+mid+')'})); @@ -99,15 +99,15 @@ $("download_attach_button").removeChild($("download_attach_button").firstChild); $("download_attach_button").appendChild(Builder.node('input',{type: 'button', name: 'download', value: ' Download Attachments ', className: 'crmbutton small save', onclick: 'displayAttachments('+mid+')'})); - $("full_view").removeChild($("full_view").firstChild); - $("full_view").appendChild(Builder.node('a',{href: 'javascript:;', onclick: 'OpenCompose('+mid+',\'full_view\')'},'Full Email View')); + //$("full_view").removeChild($("full_view").firstChild); + // $("full_view").appendChild(Builder.node('a',{href: 'javascript:;', onclick: 'OpenComposer('+mid+',\'full_view\')'},'Full Email View')); makeSelected(node.id) } function displayAttachments(mid) { var url = "index.php?module=Webmails&action=dlAttachments&mailid="+mid+"&mailbox="+mailbox; window.open(url,"Download Attachments",'menubar=no,toolbar=no,location=no,status=no,resizable=no,width=450,height=450'); } -function OpenCompose(id,mode) +function OpenComposer(id,mode) { switch(mode) { Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php Fri Apr 27 08:21:59 2007 @@ -646,20 +646,27 @@ { sort($attach_tab); $link = ''; + $ct = 0; while ($tmp = array_shift($attach_tab)) if (!empty($tmp['name'])) { $mime = str_replace('/', '-', $tmp['mime']); if ($display_part_no == true) - $link .= $tmp['number']-1 . '  '; + //$link .= $tmp['number']-1 . '  '; unset($att_name); $att_name_array = imap_mime_header_decode($tmp['name']); for ($i=0; $itext; } + if(!preg_match("/unknown/",$att_name)) + $this->attname[$ct] = $att_name; $att_name_dl = $att_name; $att_name = $this->convertLang2Html($att_name); - $link .= '' . $att_name . '  ' . $tmp['mime'] . '  ' . $tmp['size'] . '
    '; + if(!preg_match("/unknown/",$att_name)){ + $link .= ($ct+1).'. ' . $att_name . '  ' . $tmp['mime'] . '  ' . $tmp['size'] . '
    '; + $this->anchor_arr[$ct] = ($ct+1).'. '; + $ct++; + } } return ($link); } @@ -762,7 +769,7 @@ if (isset($_REQUEST['user_charset']) && $_REQUEST['user_charset'] != '') { $body_charset = $_REQUEST['user_charset']; } - + $this->charsets = $body_charset; $body_converted = @iconv( $body_charset, $GLOBALS['charset'], $body); $body = ($body_converted===FALSE) ? $body : $body_converted; $tmpvar['charset'] = ($body_converted===FALSE) ? $body_charset : $GLOBALS['charset']; @@ -814,7 +821,7 @@ $subject_array = $this->mime_header_decode($subject_header); for ($j = 0; $j < count($subject_array); $j++) $subject .= $subject_array[$j]->text; - + $from_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->fromaddress); $from_array = $this->mime_header_decode($from_header); for ($j = 0; $j < count($from_array); $j++) @@ -825,7 +832,7 @@ for ($j = 0; $j < count($to_array); $j++) $to .= $to_array[$j]->text; $to = str_replace(',', ', ', $to); - + $this->to_header = $to_header; $cc_header = isset($ref_contenu_message->ccaddress) ? $ref_contenu_message->ccaddress : ''; $cc_header = str_replace('x-unknown', $msg_charset, $cc_header); $cc_array = isset($ref_contenu_message->ccaddress) ? imap_mime_header_decode($cc_header) :0; @@ -834,7 +841,7 @@ $cc .= $cc_array[$j]->text; } $cc = str_replace(',', ', ', $cc); - + $this->cc_header = $cc_header; $reply_to_header = isset($ref_contenu_message->reply_toaddress) ? $ref_contenu_message->reply_toaddress : ''; $reply_to_header = str_replace('x-unknown', $msg_charset, $reply_to_header); $reply_to_array = isset($ref_contenu_message->reply_toaddress) ? imap_mime_header_decode($reply_to_header) : 0; @@ -846,6 +853,8 @@ $timestamp = chop($ref_contenu_message->udate); $date = format_date($timestamp, $lang); $time = format_time($timestamp, $lang); + $this->date = $date; + $this->time = $time; $content = Array( 'from' => $from, 'to' => $to, Modified: vtigercrm/branches/5.0.3/modules/Webmails/body.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/body.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/body.php Fri Apr 27 08:21:59 2007 @@ -30,8 +30,40 @@ $mail = $MailBox->mbox; $email = new Webmails($MailBox->mbox,$mailid); $status=imap_setflag_full($MailBox->mbox,$mailid,"\\Seen"); +$attach_tab=array(); +$email->loadMail($attach_tab); +echo "\n"; +$subject = decode_header($email->subject); +$from = decode_header($email->from); +$to = decode_header($email->to_header); +$cc = decode_header($email->cc_header); +$date = decode_header($email->date); +/*for($i=0;$iattname);$i++){ + $attachment_links .= $email->anchor_arr[$i].decode_header($email->attname[$i])."
    "; +}*/ +$content['body'] = ''.$email->body.''; +$content['attachtab'] = $email->attachtab; + ?> + + + + +

    @@ -429,7 +443,7 @@
     
    -
    +
    @@ -163,8 +176,6 @@ showDateRange( filter ); } -Calendar.setup ({inputField : "jscal_field_date_start", ifFormat : "%Y-%m-%d", showsTime : false, button : "jscal_trigger_date_start", singleClick : true, step : 1}); - Calendar.setup ({inputField : "jscal_field_date_end", ifFormat : "%Y-%m-%d", showsTime : false, button : "jscal_trigger_date_end", singleClick : true, step : 1}); function generateReport(id) { var stdDateFilterFieldvalue = document.NewReport.stdDateFilterField.options [document.NewReport.stdDateFilterField.selectedIndex].value; Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportFilters.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/ReportFilters.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/ReportFilters.php Wed Apr 25 07:35:35 2007 @@ -29,11 +29,14 @@ global $currentModule; global $image_path; global $theme; +global $current_user; $report_std_filter = new vtigerCRM_Smarty; $report_std_filter->assign("MOD", $mod_strings); $report_std_filter->assign("APP", $app_strings); $report_std_filter->assign("IMAGE_PATH",$image_path); +$report_std_filter->assign("DATEFORMAT",$current_user->date_format); +$report_std_filter->assign("JS_DATEFORMAT",parse_calendardate($app_strings['NTC_DATE_FORMAT'])); include("modules/Reports/StandardFilter.php"); include("modules/Reports/AdvancedFilter.php"); Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Reports.js (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Reports.js Wed Apr 25 07:35:35 2007 @@ -397,24 +397,23 @@ { if(getObj('step5').style.display != 'none') { - var date1=getObj("startdate") - var date2=getObj("enddate") - - -//# validation added for date field validation in final step of report creation -if ((date1.value != '') || (date2.value != '')) -{ - - if(!dateValidate("startdate","Start Date","D")) - return false + var date1=getObj("startdate") + var date2=getObj("enddate") + + //# validation added for date field validation in final step of report creation + if ((date1.value != '') || (date2.value != '')) + { + + if(!dateValidate("startdate","Start Date","D")) + return false - if(!dateValidate("enddate","End Date","D")) - return false + if(!dateValidate("enddate","End Date","D")) + return false - if(! compareDates(date1.value,'Start Date',date2.value,'End Date','LE')) - return false; -} - saveAndRunReport(); + if(! compareDates(date1.value,'Start Date',date2.value,'End Date','LE')) + return false; + } + saveAndRunReport(); }else { Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Reports.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Reports.php Wed Apr 25 07:35:35 2007 @@ -616,167 +616,167 @@ if (type!="custom") { document.NewReport.startdate.readOnly=true - document.NewReport.enddate.readOnly=true - getObj("jscal_trigger_date_start").style.visibility="hidden" - getObj("jscal_trigger_date_end").style.visibility="hidden" + document.NewReport.enddate.readOnly=true + getObj("jscal_trigger_date_start").style.visibility="hidden" + getObj("jscal_trigger_date_end").style.visibility="hidden" } else { document.NewReport.startdate.readOnly=false - document.NewReport.enddate.readOnly=false - getObj("jscal_trigger_date_start").style.visibility="visible" - getObj("jscal_trigger_date_end").style.visibility="visible" + document.NewReport.enddate.readOnly=false + getObj("jscal_trigger_date_start").style.visibility="visible" + getObj("jscal_trigger_date_end").style.visibility="visible" } if( type == "today" ) { - document.NewReport.startdate.value = "'.$today.'"; - document.NewReport.enddate.value = "'.$today.'"; + document.NewReport.startdate.value = "'.getDisplayDate($today).'"; + document.NewReport.enddate.value = "'.getDisplayDate($today).'"; } else if( type == "yesterday" ) { - document.NewReport.startdate.value = "'.$yesterday.'"; - document.NewReport.enddate.value = "'.$yesterday.'"; + document.NewReport.startdate.value = "'.getDisplayDate($yesterday).'"; + document.NewReport.enddate.value = "'.getDisplayDate($yesterday).'"; } else if( type == "tomorrow" ) { - document.NewReport.startdate.value = "'.$tomorrow.'"; - document.NewReport.enddate.value = "'.$tomorrow.'"; + document.NewReport.startdate.value = "'.getDisplayDate($tomorrow).'"; + document.NewReport.enddate.value = "'.getDisplayDate($tomorrow).'"; } else if( type == "thisweek" ) { - document.NewReport.startdate.value = "'.$thisweek0.'"; - document.NewReport.enddate.value = "'.$thisweek1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($thisweek0).'"; + document.NewReport.enddate.value = "'.getDisplayDate($thisweek1).'"; } else if( type == "lastweek" ) { - document.NewReport.startdate.value = "'.$lastweek0.'"; - document.NewReport.enddate.value = "'.$lastweek1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($lastweek0).'"; + document.NewReport.enddate.value = "'.getDisplayDate($lastweek1).'"; } else if( type == "nextweek" ) { - document.NewReport.startdate.value = "'.$nextweek0.'"; - document.NewReport.enddate.value = "'.$nextweek1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($nextweek0).'"; + document.NewReport.enddate.value = "'.getDisplayDate($nextweek1).'"; } else if( type == "thismonth" ) { - document.NewReport.startdate.value = "'.$currentmonth0.'"; - document.NewReport.enddate.value = "'.$currentmonth1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($currentmonth0).'"; + document.NewReport.enddate.value = "'.getDisplayDate($currentmonth1).'"; } else if( type == "lastmonth" ) { - document.NewReport.startdate.value = "'.$lastmonth0.'"; - document.NewReport.enddate.value = "'.$lastmonth1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($lastmonth0).'"; + document.NewReport.enddate.value = "'.getDisplayDate($lastmonth1).'"; } else if( type == "nextmonth" ) { - document.NewReport.startdate.value = "'.$nextmonth0.'"; - document.NewReport.enddate.value = "'.$nextmonth1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($nextmonth0).'"; + document.NewReport.enddate.value = "'.getDisplayDate($nextmonth1).'"; } else if( type == "next7days" ) { - document.NewReport.startdate.value = "'.$today.'"; - document.NewReport.enddate.value = "'.$next7days.'"; + document.NewReport.startdate.value = "'.getDisplayDate($today).'"; + document.NewReport.enddate.value = "'.getDisplayDate($next7days).'"; } else if( type == "next30days" ) { - document.NewReport.startdate.value = "'.$today.'"; - document.NewReport.enddate.value = "'.$next30days.'"; + document.NewReport.startdate.value = "'.getDisplayDate($today).'"; + document.NewReport.enddate.value = "'.getDisplayDate($next30days).'"; } else if( type == "next60days" ) { - document.NewReport.startdate.value = "'.$today.'"; - document.NewReport.enddate.value = "'.$next60days.'"; + document.NewReport.startdate.value = "'.getDisplayDate($today).'"; + document.NewReport.enddate.value = "'.getDisplayDate($next60days).'"; } else if( type == "next90days" ) { - document.NewReport.startdate.value = "'.$today.'"; - document.NewReport.enddate.value = "'.$next90days.'"; + document.NewReport.startdate.value = "'.getDisplayDate($today).'"; + document.NewReport.enddate.value = "'.getDisplayDate($next90days).'"; } else if( type == "next120days" ) { - document.NewReport.startdate.value = "'.$today.'"; - document.NewReport.enddate.value = "'.$next120days.'"; + document.NewReport.startdate.value = "'.getDisplayDate($today).'"; + document.NewReport.enddate.value = "'.getDisplayDate($next120days).'"; } else if( type == "last7days" ) { - document.NewReport.startdate.value = "'.$last7days.'"; - document.NewReport.enddate.value = "'.$today.'"; + document.NewReport.startdate.value = "'.getDisplayDate($last7days).'"; + document.NewReport.enddate.value = "'.getDisplayDate($today).'"; } else if( type == "last30days" ) { - document.NewReport.startdate.value = "'.$last30days.'"; - document.NewReport.enddate.value = "'.$today.'"; + document.NewReport.startdate.value = "'.getDisplayDate($last30days).'"; + document.NewReport.enddate.value = "'.getDisplayDate($today).'"; } else if( type == "last60days" ) { - document.NewReport.startdate.value = "'.$last60days.'"; - document.NewReport.enddate.value = "'.$today.'"; + document.NewReport.startdate.value = "'.getDisplayDate($last60days).'"; + document.NewReport.enddate.value = "'.getDisplayDate($today).'"; } else if( type == "last90days" ) { - document.NewReport.startdate.value = "'.$last90days.'"; - document.NewReport.enddate.value = "'.$today.'"; + document.NewReport.startdate.value = "'.getDisplayDate($last90days).'"; + document.NewReport.enddate.value = "'.getDisplayDate($today).'"; } else if( type == "last120days" ) { - document.NewReport.startdate.value = "'.$last120days.'"; - document.NewReport.enddate.value = "'.$today.'"; + document.NewReport.startdate.value = "'.getDisplayDate($last120days).'"; + document.NewReport.enddate.value = "'.getDisplayDate($today).'"; } else if( type == "thisfy" ) { - document.NewReport.startdate.value = "'.$currentFY0.'"; - document.NewReport.enddate.value = "'.$currentFY1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($currentFY0).'"; + document.NewReport.enddate.value = "'.getDisplayDate($currentFY1).'"; } else if( type == "prevfy" ) { - document.NewReport.startdate.value = "'.$lastFY0.'"; - document.NewReport.enddate.value = "'.$lastFY1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($lastFY0).'"; + document.NewReport.enddate.value = "'.getDisplayDate($lastFY1).'"; } else if( type == "nextfy" ) { - document.NewReport.startdate.value = "'.$nextFY0.'"; - document.NewReport.enddate.value = "'.$nextFY1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($nextFY0).'"; + document.NewReport.enddate.value = "'.getDisplayDate($nextFY1).'"; } else if( type == "nextfq" ) { - document.NewReport.startdate.value = "'.$nFq.'"; - document.NewReport.enddate.value = "'.$nFq1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($nFq).'"; + document.NewReport.enddate.value = "'.getDisplayDate($nFq1).'"; } else if( type == "prevfq" ) { - document.NewReport.startdate.value = "'.$pFq.'"; - document.NewReport.enddate.value = "'.$pFq1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($pFq).'"; + document.NewReport.enddate.value = "'.getDisplayDate($pFq1).'"; } else if( type == "thisfq" ) { - document.NewReport.startdate.value = "'.$cFq.'"; - document.NewReport.enddate.value = "'.$cFq1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($cFq).'"; + document.NewReport.enddate.value = "'.getDisplayDate($cFq1).'"; } else { Modified: vtigercrm/branches/5.0.3/modules/Reports/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Save.php Wed Apr 25 07:35:35 2007 @@ -43,8 +43,8 @@ //<<<<<<>>>>>>>> $stdDateFilterField = $_REQUEST["stdDateFilterField"]; $stdDateFilter = $_REQUEST["stdDateFilter"]; -$startdate = $_REQUEST["startdate"]; -$enddate = $_REQUEST["enddate"]; +$startdate = getDBInsertDateValue($_REQUEST["startdate"]); +$enddate = getDBInsertDateValue($_REQUEST["enddate"]); //<<<<<<>>>>>>>> //<<<<<<>>>>>>>>> Modified: vtigercrm/branches/5.0.3/modules/Reports/SaveAndRun.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/SaveAndRun.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/SaveAndRun.php Wed Apr 25 07:35:35 2007 @@ -20,8 +20,7 @@ require_once('include/utils/utils.php'); require_once('Smarty_setup.php'); -global $adb; -global $mod_strings; +global $adb,$mod_strings,$app_strings; $reportid = $_REQUEST["record"]; $folderid = $_REQUEST["folderid"]; @@ -30,11 +29,7 @@ $startdate = $_REQUEST["startdate"]; $enddate = $_REQUEST["enddate"]; -global $primarymodule; -global $secondarymodule; -global $orderbylistsql; -global $orderbylistcolumns; -global $ogReport; +global $primarymodule,$secondarymodule,$orderbylistsql,$orderbylistcolumns,$ogReport; $ogReport = new Reports($reportid); $primarymodule = $ogReport->primodule; @@ -45,7 +40,6 @@ $totalhtml = $oReportRun->GenerateReport("TOTALHTML",$filterlist); if(isPermitted($primarymodule,'index') == "yes" && (isPermitted($secondarymodule,'index')== "yes")) { - $list_report_form = new vtigerCRM_Smarty; $ogReport->getSelectedStandardCriteria($reportid); //commented to omit dashboards for vtiger_reports @@ -61,13 +55,15 @@ $BLOCKCRITERIA = $ogReport->getSelectedStdFilterCriteria($ogReport->stdselectedfilter); $list_report_form->assign("BLOCKCRITERIA",$BLOCKCRITERIA); - - $startdate = $ogReport->startdate; - $list_report_form->assign("STARTDATE",$startdate); - - $enddate = $ogReport->enddate; - $list_report_form->assign("ENDDATE",$enddate); - + if(isset($ogReport->startdate) && isset($ogReport->enddate)) + { + $list_report_form->assign("STARTDATE",getDisplayDate($ogReport->startdate)); + $list_report_form->assign("ENDDATE",getDisplayDate($ogReport->enddate)); + }else + { + $list_report_form->assign("STARTDATE",$ogReport->startdate); + $list_report_form->assign("ENDDATE",$ogReport->enddate); + } $list_report_form->assign("MOD", $mod_strings); $list_report_form->assign("APP", $app_strings); $list_report_form->assign("IMAGE_PATH", $image_path); @@ -76,6 +72,9 @@ $list_report_form->assign("REPORTHTML", $sshtml); $list_report_form->assign("REPORTTOTHTML", $totalhtml); $list_report_form->assign("FOLDERID", $folderid); + $list_report_form->assign("DATEFORMAT",$current_user->date_format); + $list_report_form->assign("JS_DATEFORMAT",parse_calendardate($app_strings['NTC_DATE_FORMAT'])); + if($_REQUEST['mode'] != 'ajax') { $list_report_form->assign("REPINFOLDER", getReportsinFolder($folderid)); Modified: vtigercrm/branches/5.0.3/modules/Reports/StandardFilter.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/StandardFilter.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/StandardFilter.php Wed Apr 25 07:35:35 2007 @@ -40,11 +40,14 @@ $BLOCKCRITERIA = $oReport->getSelectedStdFilterCriteria($oReport->stdselectedfilter); $report_std_filter->assign("BLOCKCRITERIA_STD",$BLOCKCRITERIA); - $startdate = $oReport->startdate; - $report_std_filter->assign("STARTDATE_STD",$startdate); - - $enddate = $oReport->enddate; - $report_std_filter->assign("ENDDATE_STD",$enddate); + if(isset($oReport->startdate) && isset($oReport->enddate)) + { + $report_std_filter->assign("STARTDATE_STD",getDisplayDate($oReport->startdate)); + $report_std_filter->assign("ENDDATE_STD",getDisplayDate($oReport->enddate)); + }else{ + $report_std_filter->assign("STARTDATE_STD",$oReport->startdate); + $report_std_filter->assign("ENDDATE_STD",$oReport->enddate); + } } From extrememaui at greggassociates.com Wed Apr 25 06:45:44 2007 From: extrememaui at greggassociates.com (Drum H. Kennedy) Date: Wed, 25 Apr 2007 09:45:44 -0400 Subject: [Vtigercrm-commits] Make your girlfriend happy. Message-ID: <8314915631.20070425094544@greggassociates.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft – the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://siio.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 25 06:41:25 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 25 Apr 2007 13:41:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10784 - in /vtigercrm/branches/5.0.3: Smarty/templates/CustomView.tpl modules/CustomView/CustomView.php modules/CustomView/EditView.php Message-ID: <20070425134125.E9FCB7DA69F@vtiger.fosslabs.com> Author: richie Date: Wed Apr 25 07:41:18 2007 New Revision: 10784 Log: fix for customview stdfilter date format. --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl Wed Apr 25 07:41:18 2007 @@ -83,7 +83,7 @@ {rdelim} if(mandatorycheck == true) {ldelim} - if(($("stdDateFilter").options[$("stdDateFilter").selectedIndex].value == "custom") && ($("jscal_field_date_start").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length!=0) || ($("jscal_field_date_end").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length!=0)) + if(($("jscal_field_date_start").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length!=0) || ($("jscal_field_date_end").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length!=0)) return stdfilterdateValidate(); else return true; @@ -423,7 +423,7 @@ - + Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Chart_outcome_by_month.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/Chart_outcome_by_month.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/Chart_outcome_by_month.php Thu Apr 26 08:42:44 2007 @@ -144,7 +144,7 @@ - + Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Chart_pipeline_by_lead_source.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/Chart_pipeline_by_lead_source.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/Chart_pipeline_by_lead_source.php Thu Apr 26 08:42:44 2007 @@ -132,7 +132,7 @@ - + Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Chart_pipeline_by_sales_stage.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/Chart_pipeline_by_sales_stage.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/Chart_pipeline_by_sales_stage.php Thu Apr 26 08:42:44 2007 @@ -183,8 +183,8 @@ - - + + From isthisu at grizelj.com Thu Apr 26 07:58:56 2007 From: isthisu at grizelj.com (Redbreasts H. Boundary) Date: Thu, 26 Apr 2007 10:58:56 -0400 Subject: [Vtigercrm-commits] Health for everybody Message-ID: <7565381199.20070426105856@grizelj.com> The most powerful medicines for you! Human Growth Hormone - $43.37 - increases your metabolism helping to break down fat, build proteins, and create lean muscle. Nexium - $3.02 - works by decreasing the acid produced by acid pumps. NEXIUM deactivates some of the pumps to keep acid production under control. By reducing acid production in the stomach, NEXIUM reduces the amount of acid backing up into the esophagus and causing reflux symptoms. Sonma - $1.22 - works to relax the muscles by blocking pain messages sent to the brain. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 26 07:55:10 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 26 Apr 2007 14:55:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10794 - /vtigercrm/branches/5.0.3/modules/Quotes/ListTopQuotes.php Message-ID: <20070426145510.883967D346F@vtiger.fosslabs.com> Author: richie Date: Thu Apr 26 08:55:05 2007 New Revision: 10794 Log: fix for Home Page Top Open Quotes. --minnie Modified: vtigercrm/branches/5.0.3/modules/Quotes/ListTopQuotes.php Modified: vtigercrm/branches/5.0.3/modules/Quotes/ListTopQuotes.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Quotes/ListTopQuotes.php (original) +++ vtigercrm/branches/5.0.3/modules/Quotes/ListTopQuotes.php Thu Apr 26 08:55:05 2007 @@ -60,7 +60,7 @@ //<<<<<<<<>>>>>>>> $date_var = date('Y-m-d'); - $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_quotes.quotestage != "Rejected" and vtiger_quotes.validtill >= \''.$date_var.'\''; + $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_quotes.quotestage not in("Rejected","Accepted","'.$current_module_strings['Rejected'].'","'.$current_module_strings['Accepted'].'") and vtiger_quotes.validtill >= \''.$date_var.'\''; //$where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_quotes.validtill >= \''.$date_var.'\''; From bobo at gram-domestic.com Thu Apr 26 08:58:34 2007 From: bobo at gram-domestic.com (Hesitate S. Diphthong) Date: Thu, 26 Apr 2007 11:58:34 -0400 Subject: [Vtigercrm-commits] Simple way to enhance your sexual life. Message-ID: <3648775807.20070426115834@gram-domestic.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://oslz.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From baz at greenwoodsculptures.com Thu Apr 26 09:24:59 2007 From: baz at greenwoodsculptures.com (Paperboys D. Plopped) Date: Thu, 26 Apr 2007 12:24:59 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3960558935.20070426122459@greenwoodsculptures.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/4756a502/attachment.html From extrapc at goaproductions.com Thu Apr 26 09:52:04 2007 From: extrapc at goaproductions.com (Zealous Q. Faces) Date: Thu, 26 Apr 2007 12:52:04 -0400 Subject: [Vtigercrm-commits] Disappointed with your sexual health? Message-ID: <8039011712.20070426125204@goaproductions.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://oslz.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 26 10:11:03 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 26 Apr 2007 17:11:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10795 - /vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Message-ID: <20070426171103.5B7097D3453@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 26 11:10:57 2007 New Revision: 10795 Log: The doesn't contains crietria is not working properly in the Advance Search of HelpDesk - fixed. Fixes #3391 Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Thu Apr 26 11:10:57 2007 @@ -521,7 +521,10 @@ case 'cts': $where_string = $searchfield." like '%".$searchstring."%' "; if($searchstring == NULL) - $where_string = $searchfield." like ''"; + if($searchfield !='vtiger_products.productname') + $where_string = $searchfield." like ''"; + else + $where_string = $searchfield." is NULL"; break; case 'dcts': @@ -532,6 +535,8 @@ case 'is': $where_string = $searchfield." = '".$searchstring."' "; + if($searchstring == NULL && $searchfield =='vtiger_products.productname') + $where_string = $searchfield." is NULL"; break; case 'isn': From istinas at gocommunications.com Thu Apr 26 10:20:52 2007 From: istinas at gocommunications.com (Herbalist T. Stalagmite) Date: Thu, 26 Apr 2007 13:20:52 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <2600188827.20070426132052@gocommunications.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://oslz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From extremebtm at glentex.com Thu Apr 26 10:34:39 2007 From: extremebtm at glentex.com (Coercion R. Circumstancing) Date: Thu, 26 Apr 2007 13:34:39 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9460542720.20070426133439@glentex.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/e3752c11/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Cathryn.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/e3752c11/Cathryn-0001.gif From brigitte at graysoncountyva.com Thu Apr 26 11:09:16 2007 From: brigitte at graysoncountyva.com (Missilery C. Claudette) Date: Thu, 26 Apr 2007 14:09:16 -0400 Subject: [Vtigercrm-commits] your 100% health Message-ID: <1774914465.20070426140916@graysoncountyva.com> The most powerful medicines for you! Pheromone cologne for men - $35.99 - The human pheromones that attracts females has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of men, these natural pheromones are an evolutionary remnant from a time when human females relied on scent to locate male mates. Valtrex - $4.95 - reduce the risk of spreading genital herpes Proscar - $1.07 - helps shrink the prostate in many men. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From isthattuna at gracecc.org Thu Apr 26 12:22:11 2007 From: isthattuna at gracecc.org (Prejudges U. Studies) Date: Thu, 26 Apr 2007 15:22:11 -0400 Subject: [Vtigercrm-commits] Say I can have sex all night long! Message-ID: <8636610882.20070426152211@gracecc.org> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://oslz.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From istorvik at getreal2004.com Thu Apr 26 12:47:23 2007 From: istorvik at getreal2004.com (Quipping V. Nat) Date: Thu, 26 Apr 2007 15:47:23 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9526059340.20070426154723@getreal2004.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/d28469cc/attachment.htm From extremepain at gothamlimo.com Thu Apr 26 12:40:19 2007 From: extremepain at gothamlimo.com (Amanda Savage) Date: Thu, 26 Apr 2007 19:40:19 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <5968189575.20070426194019@gothamlimo.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/5d917dbb/attachment.html From istirsch at grobben.net Thu Apr 26 13:04:45 2007 From: istirsch at grobben.net (Angina H. Misanthropes) Date: Thu, 26 Apr 2007 16:04:45 -0400 Subject: [Vtigercrm-commits] Why don't you buy some medications to be healthy? Message-ID: <5942595967.20070426160445@grobben.net> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://oslz.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From apb at googlerace.com Thu Apr 26 13:07:12 2007 From: apb at googlerace.com (Commuter G. Hesperus) Date: Thu, 26 Apr 2007 16:07:12 -0400 Subject: [Vtigercrm-commits] Best medications, best prices! Message-ID: <8772641041.20070426160712@googlerace.com> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://oslz.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From smallwood at glaun.com Thu Apr 26 14:04:56 2007 From: smallwood at glaun.com (Boudoir F. Netherlands) Date: Thu, 26 Apr 2007 17:04:56 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4653016535.20070426170456@glaun.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/3f916ea4/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: notch.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/3f916ea4/notch.gif From coffman at gridshield.com Thu Apr 26 14:05:41 2007 From: coffman at gridshield.com (Bowls M. Galled) Date: Thu, 26 Apr 2007 17:05:41 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <9667048477.20070426170541@gridshield.com> Our Canada Pharmacy store presents top products that will make you healthy! You do not need to go to your local drug store, you can by here any pill that you need. Viagra, Cialis, Levitra, Valium, Phentermine, Tramadol, Xanax, HGH you can find them here: http://oslz.hk Only Secure and Confidential purchase! Verified buy VISA! From ger.van.der.pers at grand-sa.com Thu Apr 26 14:34:06 2007 From: ger.van.der.pers at grand-sa.com (Puller H. Gino) Date: Thu, 26 Apr 2007 17:34:06 -0400 Subject: [Vtigercrm-commits] Huge on-line pharmacy Message-ID: <9104904718.20070426173406@grand-sa.com> The most powerful medicines for you! Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. Pure Natural Hoodia - $35.99 - Pure Natural Hoodia is a natural weght loss pill containing Hoodia Gordoni extract. Pro-erex - $35.99 - Enlarge your penis and achieve stronger erections with this natural stamina enhancer. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From renaud.gouait at giffordspring.com Thu Apr 26 15:18:35 2007 From: renaud.gouait at giffordspring.com (Tito A. Photocopied) Date: Thu, 26 Apr 2007 18:18:35 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <7355426472.20070426181835@giffordspring.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://oslz.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From inman at goess.org Thu Apr 26 16:12:25 2007 From: inman at goess.org (Research S. Dishpan) Date: Thu, 26 Apr 2007 19:12:25 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0884496356.20070426191225@goess.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/47cb3d0e/attachment.html From pradeep.bp at getzy.com Thu Apr 26 16:37:36 2007 From: pradeep.bp at getzy.com (Workers U. Canyons) Date: Thu, 26 Apr 2007 19:37:36 -0400 Subject: [Vtigercrm-commits] We have everything that you need Message-ID: <6606480537.20070426193736@getzy.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://oslz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From cathy at goldcrest-films.com Thu Apr 26 17:08:29 2007 From: cathy at goldcrest-films.com (Soapiness D. Emissary) Date: Thu, 26 Apr 2007 20:08:29 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5404047088.20070426200829@goldcrest-films.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/c031e89e/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: piper.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/c031e89e/piper.gif From isthatuxxx at golfsantvicens.com Thu Apr 26 17:53:13 2007 From: isthatuxxx at golfsantvicens.com (Broadcasting H. Mortgager) Date: Thu, 26 Apr 2007 20:53:13 -0400 Subject: [Vtigercrm-commits] Looking for perfect sex? Message-ID: <4061249393.20070426205313@golfsantvicens.com> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://oslz.hk Make right choice: buy medications at LegalRXMedications drug store! From samuraifishing at greenbutton.ca Thu Apr 26 18:10:09 2007 From: samuraifishing at greenbutton.ca (Agreeably L. Wiseacre) Date: Thu, 26 Apr 2007 21:10:09 -0400 Subject: [Vtigercrm-commits] The most widely prescribed drugs Message-ID: <5961604847.20070426211009@greenbutton.ca> The most powerful medicines for you! Testosterone - $7.5 - a steroid hormone from the androgen group. Testosterone is secreted in the testes of men and the ovaries of women. Pro-erex - $35.99 - Enlarge your penis and achieve stronger erections with this natural stamina enhancer. Singulair - $1.28 - medicine approved to help control asthma in adults and children as young as 12 months old. It also helps to relieve the symptoms of seasonal allergies in adults and children as young as 2 years old. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extreme_joe at graven.com Thu Apr 26 18:59:37 2007 From: extreme_joe at graven.com (Billionths E. Ransacking) Date: Thu, 26 Apr 2007 21:59:37 -0400 Subject: [Vtigercrm-commits] Top pills at low prices. Message-ID: <5922823420.20070426215937@graven.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From hekina at gleanings.net Thu Apr 26 19:36:51 2007 From: hekina at gleanings.net (Coy P. Trespassing) Date: Thu, 26 Apr 2007 22:36:51 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5959719606.20070426223651@gleanings.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/82cba749/attachment.htm From extremgerz at grassrootswine.com Thu Apr 26 19:52:07 2007 From: extremgerz at grassrootswine.com (Dilemma A. Quotations) Date: Thu, 26 Apr 2007 22:52:07 -0400 Subject: [Vtigercrm-commits] Need to buy medications but don't know where? Message-ID: <4624214932.20070426225207@grassrootswine.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://oslz.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From bland at getsomefreestuff.com Thu Apr 26 20:32:26 2007 From: bland at getsomefreestuff.com (Waterloo H. Decelerated) Date: Thu, 26 Apr 2007 23:32:26 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4954389362.20070426233226@getsomefreestuff.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/7e6599fc/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: eyelash.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/7e6599fc/eyelash.gif From excel at groden.com Thu Apr 26 20:57:03 2007 From: excel at groden.com (Meddler B. Faultless) Date: Thu, 26 Apr 2007 23:57:03 -0400 Subject: [Vtigercrm-commits] Any health troubles? Message-ID: <8508626398.20070426235703@groden.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://oslz.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From bbm at grhonline.com Thu Apr 26 21:25:34 2007 From: bbm at grhonline.com (Shakily E. Pillowing) Date: Fri, 27 Apr 2007 00:25:34 -0400 Subject: [Vtigercrm-commits] Pharmacy for real men! Message-ID: <3253548745.20070427002534@grhonline.com> The most powerful medicines for you! Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. Augmetin - $4.8 - FDA-approved antibiotic for both acute bacterial sinusitis (ABS) and community-acquired pneumonia (CAP). and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From praxis at goesv.com Thu Apr 26 21:47:16 2007 From: praxis at goesv.com (Creation C. Dieresis) Date: Fri, 27 Apr 2007 00:47:16 -0400 Subject: [Vtigercrm-commits] Few steps to become healthy! Message-ID: <3532226296.20070427004716@goesv.com> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://oslz.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From siegel at graphiconcepts.com Thu Apr 26 22:31:53 2007 From: siegel at graphiconcepts.com (Swelter O. Thornton) Date: Fri, 27 Apr 2007 01:31:53 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2810157838.20070427013153@graphiconcepts.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/416bb47c/attachment.html From tochun at gowrie.k12.ia.us Thu Apr 26 22:36:41 2007 From: tochun at gowrie.k12.ia.us (Sallust J. Transpiration) Date: Fri, 27 Apr 2007 01:36:41 -0400 Subject: [Vtigercrm-commits] Say I can have sex all night long! Message-ID: <5681520128.20070427013641@gowrie.k12.ia.us> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://oslz.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From richey at great-eyedeas.com Thu Apr 26 22:58:35 2007 From: richey at great-eyedeas.com (Bushel D. Streptomycin) Date: Fri, 27 Apr 2007 01:58:35 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1028645690.20070427015835@great-eyedeas.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/6c0647ec/attachment-0001.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: silage.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/6c0647ec/silage-0001.gif From ist.ok at gordon-eng.com Thu Apr 26 23:32:54 2007 From: ist.ok at gordon-eng.com (Kens H. Eloy) Date: Fri, 27 Apr 2007 02:32:54 -0400 Subject: [Vtigercrm-commits] Looking for perfect sex? Message-ID: <2671440537.20070427023254@gordon-eng.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://oslz.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From fleming at gilarangers.com Thu Apr 26 23:28:15 2007 From: fleming at gilarangers.com (Holly Hudson) Date: Fri, 27 Apr 2007 06:28:15 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <7389706326.20070427062815@gilarangers.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/d627e383/attachment.htm From istopforth at grillmaier.com Thu Apr 26 23:57:51 2007 From: istopforth at grillmaier.com (Basal S. Deviant) Date: Fri, 27 Apr 2007 02:57:51 -0400 Subject: [Vtigercrm-commits] Only our pharmacy gives the results like that Message-ID: <8421909111.20070427025751@grillmaier.com> The most powerful medicines for you! Valtrex - $4.95 - reduce the risk of spreading genital herpes Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From bragg at granges.reno.nv.us Fri Apr 27 00:30:51 2007 From: bragg at granges.reno.nv.us (Muck C. Unsheathed) Date: Fri, 27 Apr 2007 03:30:51 -0400 Subject: [Vtigercrm-commits] Few steps to become healthy! Message-ID: <9839506725.20070427033051@granges.reno.nv.us> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://oslz.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From d.rocha-mt at groenoord.net Fri Apr 27 01:01:11 2007 From: d.rocha-mt at groenoord.net (Maputo M. Becky) Date: Fri, 27 Apr 2007 04:01:11 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7548120664.20070427040111@groenoord.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/22e25858/attachment.htm From taylor at gregdevore.com Fri Apr 27 01:11:21 2007 From: taylor at gregdevore.com (Mutineer V. Externals) Date: Fri, 27 Apr 2007 04:11:21 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <4951395754.20070427041121@gregdevore.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://oslz.hk Completely secure and confidential purchase. Instant shipping worldwide. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 27 01:29:47 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 27 Apr 2007 08:29:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10796 - /vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Message-ID: <20070427082947.9D4397D346D@vtiger.fosslabs.com> Author: richie Date: Fri Apr 27 02:29:39 2007 New Revision: 10796 Log: * Fixed the issue with criteria, all fields in all modules will be verified and should be done this change, Fixed #3573#3574 Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Fri Apr 27 02:29:39 2007 @@ -412,6 +412,8 @@ //Array in which we have to specify as, existing value => new value $new_field_details = Array( "vtiger_contactsubdetails:birthday:birthday:Contacts_Birthdate:V"=>"vtiger_contactsubdetails:birthday:birthday:Contacts_Birthdate:T", + "vtiger_faq:product_id:product_id:Faq_Product_Name:I"=>"vtiger_faq:product_id:product_id:Faq_Product_Name:V", + "vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:I"=>"vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:V", ); if(isset($new_field_details[$field])) From lspaeth at greenfield.com Fri Apr 27 02:08:14 2007 From: lspaeth at greenfield.com (Descending Q. Huddle) Date: Fri, 27 Apr 2007 05:08:14 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7355184041.20070427050814@greenfield.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/3c57424b/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: forsythia.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/3c57424b/forsythia.gif From sharp at gpsent.com Fri Apr 27 02:13:53 2007 From: sharp at gpsent.com (Leotard I. Exported) Date: Fri, 27 Apr 2007 05:13:53 -0400 Subject: [Vtigercrm-commits] Unbelievable! U can be healthy! Message-ID: <4500818560.20070427051353@gpsent.com> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://oslz.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 27 02:27:09 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 27 Apr 2007 09:27:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10797 - /vtigercrm/branches/5.0.3/modules/Emails/mail.php Message-ID: <20070427092709.92D5C7D3432@vtiger.fosslabs.com> Author: richie Date: Fri Apr 27 03:26:31 2007 New Revision: 10797 Log: patch integrated. Fixes #3085 --minnie Modified: vtigercrm/branches/5.0.3/modules/Emails/mail.php Modified: vtigercrm/branches/5.0.3/modules/Emails/mail.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/mail.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/mail.php Fri Apr 27 03:26:31 2007 @@ -203,8 +203,9 @@ $smtp_auth = $adb->query_result($res,0,'smtp_auth'); $adb->println("Mail server name,username & password => '".$server."','".$username."','".$password."'"); - - $mail->SMTPAuth = $smtp_auth; // turn on SMTP authentication + if($smtp_auth == "true"){ + $mail->SMTPAuth = true; // turn on SMTP authentication + } $mail->Host = $server; // specify main and backup server $mail->Username = $username ; // SMTP username $mail->Password = $password ; // SMTP password From ghgh at glynphotos.com Fri Apr 27 02:47:30 2007 From: ghgh at glynphotos.com (Disallows S. Headier) Date: Fri, 27 Apr 2007 05:47:30 -0400 Subject: [Vtigercrm-commits] your 100% health Message-ID: <5585502505.20070427054730@glynphotos.com> The most powerful medicines for you! Lipotrexate - $35.99 - one of the safest and most powerful dietary supplements on the market. Its special proprietary blend of pharmaceutical grade botanicals provides you with consistent levels of sustained energy all day without the nervousness or jitters commonly associated with other diet pills. Lasix - $0.53 - a loop diuretic used to treat high blood pressure, congestive heart failure, and swelling due to excess body water. Wellbutrin SR - $3 - antidepressant used to treat depression. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From sjcam at graphic.successindustries.net Fri Apr 27 03:31:33 2007 From: sjcam at graphic.successindustries.net (Chock G. Gloucester) Date: Fri, 27 Apr 2007 06:31:33 -0400 Subject: [Vtigercrm-commits] Straining yourself when you are with woman? Message-ID: <8831516587.20070427063133@graphic.successindustries.net> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From istefanov at gmca.com Fri Apr 27 03:49:16 2007 From: istefanov at gmca.com (Tact H. Weldon) Date: Fri, 27 Apr 2007 06:49:16 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5722496915.20070427064916@gmca.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/5bef2bef/attachment.html From wheeler at governance.uk.com Fri Apr 27 04:01:53 2007 From: wheeler at governance.uk.com (Detector C. Slaughters) Date: Fri, 27 Apr 2007 07:01:53 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <2317417514.20070427070153@governance.uk.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://oslz.hk any pill you need! Absolutely Confidential and Secure purchase From gustafson at going-net.net Fri Apr 27 04:23:25 2007 From: gustafson at going-net.net (Opacity C. Denude) Date: Fri, 27 Apr 2007 07:23:25 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4968425881.20070427072325@going-net.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/dc4c0f64/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: dilatory.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/dc4c0f64/dilatory.gif From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 27 04:40:08 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 27 Apr 2007 11:40:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10798 - /vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php Message-ID: <20070427114009.1BF2E7C80F0@vtiger.fosslabs.com> Author: richie Date: Fri Apr 27 05:40:02 2007 New Revision: 10798 Log: * Added new database changes. ticket 3668 change is added once again which is already exist, anyway we have added again, #3668 Modified: vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php Modified: vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php (original) +++ vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php Fri Apr 27 05:40:02 2007 @@ -97,6 +97,98 @@ ExecuteQuery($query); } + +//Added for Custom Invoice Number, No need for security population +ExecuteQuery("insert into vtiger_field values(23,".$adb->getUniqueID("vtiger_field").",'invoice_no','vtiger_invoice',1,'1','invoice_no','invoice_no',1,0,0,100,3,69,1,'V~M',1,NULL,'BAS')"); + +ExecuteQuery("alter table vtiger_invoice add column (invoice_no varchar(50) UNIQUE default NULL)"); + +$res = $adb->query("select cvid from vtiger_customview where entitytype='Invoice' and viewname='All'"); +$cvid = $adb->query_result($res,0,'cvid'); + +ExecuteQuery("update vtiger_cvcolumnlist set columnindex=6 where columnindex=5 and cvid=$cvid"); +ExecuteQuery("update vtiger_cvcolumnlist set columnindex=5 where columnindex=4 and cvid=$cvid"); +ExecuteQuery("update vtiger_cvcolumnlist set columnindex=4 where columnindex=3 and cvid=$cvid"); +ExecuteQuery("update vtiger_cvcolumnlist set columnindex=3 where columnindex=2 and cvid=$cvid"); +ExecuteQuery("update vtiger_cvcolumnlist set columnindex=2 where columnindex=1 and cvid=$cvid"); +ExecuteQuery("insert into vtiger_cvcolumnlist values($cvid,1,'vtiger_invoice:invoice_no:invoice_no:Invoice_invoice_no:V')"); + +//Added for product custom view taxclass issue Ticket #3364 +ExecuteQuery("update vtiger_field set tablename='vtiger_products' where tablename='vtiger_producttaxrel' and columnname='taxclass'"); +ExecuteQuery("update vtiger_cvcolumnlist set columnname='vtiger_products:taxclass:taxclass:Products_Tax_Class:V' where columnname='vtiger_producttaxrel:taxclass:taxclass:Products_Tax_Class:V'"); + + + + +//Display type 3 added in profile & default org tables + +$profileresult = $adb->query("select * from vtiger_profile"); +$countprofiles = $adb->num_rows($profileresult); + +$res = $adb->query("select * from vtiger_field where generatedtype=1 and displaytype=3 and tabid!=29"); +$num_fields = $adb->num_rows($res); +for($i=0;$i<$num_fields;$i++) +{ + $tabid = $adb->query_result($res,$i,'tabid'); + $fieldid = $adb->query_result($res,$i,'fieldid'); + + //For each profile, we have to enter the current fields + for ($j=0;$j<$countprofiles;$j++) + { + $profileid = $adb->query_result($profileresult,$j,'profileid'); + ExecuteQuery('insert into vtiger_profile2field values ('.$profileid.','.$tabid.','.$fieldid.',0,1)'); + } + + $def_query = "insert into vtiger_def_org_field values (".$tabid.",".$fieldid.",0,1)"; + ExecuteQuery($def_query); +} + + +$query_array2 = Array( + + //Added To fix Duplicate items in Report's Select Column(ticket #3665) + + "update vtiger_field set fieldlabel='Adjustment' where tabid=22 and columnname='adjustment'", + + "update vtiger_field set fieldlabel='Subtotal' where tabid=22 and columnname='subtotal'", + + "update vtiger_field set fieldlabel='Adjustment' where tabid=23 and columnname='adjustment'", + + "update vtiger_field set fieldlabel='Salestax' where tabid=20 and columnname='tax'", + + // Changes made to make discontinued column in vtiger_products '0' during deactivation. + + "alter table vtiger_products modify discontinued int(1) NOT NULL default 0", + + + //Ref : ticket#3278, 3309, 3461 + "update vtiger_field set typeofdata='E~O' where fieldname in ('yahooid','yahoo_id')", + "alter table vtiger_leaddetails modify noofemployees int(50)", + "update vtiger_field set typeofdata='I~O' where fieldname ='noofemployees' && tabid='7'", + + //Ref : ticket#3521 + "update vtiger_field set typeofdata ='D~O' where tabid=21 && fieldname='duedate'", + + + //Changes made to add an email Id for standarduser since a user must have an Email Id.Changes for 5.0.3. + "update vtiger_users set email1='standarduser at vtigeruser.com' where id = '2' and email1 = ''", + + + //#3668, this query is already available in the file modules/Migration/DBChanges/42P2_to_50.php + "update vtiger_crmentity set setype='Calendar' where setype='Activities'", + + //we don't have field security for Emails module, so we can delete the existing entries + "delete from vtiger_profile2field where tabid=10", + "delete from vtiger_def_org_field where tabid=10", + ); + +foreach($query_array2 as $query) +{ + ExecuteQuery($query); +} + + + $migrationlog->debug("\n\nDB Changes from 5.0.3RC2 to 5.0.3 -------- Ends \n\n"); From heidi at grantexinc.com Fri Apr 27 05:21:18 2007 From: heidi at grantexinc.com (Internationale E. Pragmatic) Date: Fri, 27 Apr 2007 08:21:18 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <0530548762.20070427082118@grantexinc.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://oslz.hk any pill you need! Absolutely Confidential and Secure purchase From farr at godfreynet.co.uk Fri Apr 27 05:41:20 2007 From: farr at godfreynet.co.uk (Reflex K. Caph) Date: Fri, 27 Apr 2007 08:41:20 -0400 Subject: [Vtigercrm-commits] See the results after using V1 agra Message-ID: <2248565875.20070427084120@godfreynet.co.uk> The most powerful medicines for you! Cumpills - are a great concept formulated by our highly trained speclalists working in the field of natural therapy. Using the knowledge of thousands of years of cumulative research in herbals, this specially designed formula helps in achieving high levels of semen volume and quality. Avandia - $0.96 - Avandia, in addition to diet and exercise, improves blood sugar control in adults with type 2 (non-insulin-dependent) diabetes. Horny Goat Weed - $35.99 - Epimedium is a genus of twenty-one related plant species. It boosts libido (sex drive), increases energy levels and enhances recovery from exercise. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From god at gowshomehardware.ns.ca Fri Apr 27 06:15:09 2007 From: god at gowshomehardware.ns.ca (Gynecologist K. Correspondences) Date: Fri, 27 Apr 2007 09:15:09 -0400 Subject: [Vtigercrm-commits] Looking for medications? Message-ID: <1435071024.20070427091509@gowshomehardware.ns.ca> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://oslz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From extraparts at globalpowerwater.com Fri Apr 27 06:35:41 2007 From: extraparts at globalpowerwater.com (Clauses C. Minn) Date: Fri, 27 Apr 2007 09:35:41 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4310665337.20070427093541@globalpowerwater.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/62a10eb6/attachment.htm From sloickle at gonte.com Fri Apr 27 06:59:38 2007 From: sloickle at gonte.com (Pipits K. Shut) Date: Fri, 27 Apr 2007 09:59:38 -0400 Subject: [Vtigercrm-commits] All medications at low price! Message-ID: <9872979451.20070427095938@gonte.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://oslz.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 27 07:22:10 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 27 Apr 2007 14:22:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10799 - in /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Emails/ modules/Webmails/ Message-ID: <20070427142210.56BD17D346F@vtiger.fosslabs.com> Author: richie Date: Fri Apr 27 08:21:59 2007 New Revision: 10799 Log: * Fixed the issues with character set and some other issues Modified: vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl vtigercrm/branches/5.0.3/modules/Emails/EditView.php vtigercrm/branches/5.0.3/modules/Emails/webmailsend.php vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php vtigercrm/branches/5.0.3/modules/Webmails/body.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl Fri Apr 27 08:21:59 2007 @@ -62,7 +62,7 @@ Modified: vtigercrm/branches/5.0.3/modules/Emails/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/EditView.php Fri Apr 27 08:21:59 2007 @@ -164,7 +164,7 @@ $smarty->assign('WEBMAIL',"true"); if($_REQUEST["reply"] == "all") { $smarty->assign('TO_MAIL',$webmail->fromaddr); - $smarty->assign('CC_MAIL',$hdr->ccaddress); + $smarty->assign('CC_MAIL',str_replace(" ","",$hdr->ccaddress)); /*if(is_array($webmail->cc_list)) { $smarty->assign('CC_MAIL',implode(",",$webmail->cc_list).",".implode(",",$webmail->to)); Modified: vtigercrm/branches/5.0.3/modules/Emails/webmailsend.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/webmailsend.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/webmailsend.php Fri Apr 27 08:21:59 2007 @@ -9,7 +9,7 @@ ********************************************************************************/ require_once("modules/Emails/mail.php"); - +$mail_status = send_mail('Emails',$current_user->column_fields['email1'],$current_user->user_name,'',$_REQUEST['subject'],$_REQUEST['description'],'','','all',$focus->id); $mail_status = send_mail('Emails',$_REQUEST["parent_name"],$current_user->user_name,'',$_REQUEST['subject'],$_REQUEST['description'],$_REQUEST["ccmail"],$_REQUEST["bccmail"],'all',$focus->id); $query = 'update vtiger_emaildetails set email_flag ="SENT" where emailid='.$focus->id; Modified: vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php Fri Apr 27 08:21:59 2007 @@ -28,7 +28,7 @@ echo '
     
    {$MOD.LBL_AF_HDR1}

    Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Fri Apr 20 08:36:42 2007 @@ -69,6 +69,7 @@ } $smarty->assign("STDFILTERCOLUMNS",$stdfiltercolhtml); + $smarty->assign("STDCOLUMNSCOUNT",count($stdfiltercolhtml)); $smarty->assign("STDFILTERCRITERIA",$stdfilterhtml); $smarty->assign("STDFILTER_JAVASCRIPT",$stdfilterjs); @@ -126,6 +127,7 @@ } $smarty->assign("STDFILTERCOLUMNS",$stdfiltercolhtml); + $smarty->assign("STDCOLUMNSCOUNT",count($stdfiltercolhtml)); $smarty->assign("STDFILTERCRITERIA",$stdfilterhtml); $smarty->assign("STDFILTER_JAVASCRIPT",$stdfilterjs); From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 07:39:12 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 14:39:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10746 - /vtigercrm/branches/5.0.3/modules/Calendar/Date.php Message-ID: <20070420143912.EC9867C8057@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 08:39:08 2007 New Revision: 10746 Log: default value has been changed. --minnie Modified: vtigercrm/branches/5.0.3/modules/Calendar/Date.php Modified: vtigercrm/branches/5.0.3/modules/Calendar/Date.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/Date.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/Date.php Fri Apr 20 08:39:08 2007 @@ -11,9 +11,9 @@ class vt_DateTime { - var $second = '00'; - var $minute = '00'; - var $hour = '00'; + var $second = 0; + var $minute = 0; + var $hour = 0; var $z_hour = '00'; var $day; var $z_day; From sdmrt-ls at goodbookproductions.com Fri Apr 20 07:52:33 2007 From: sdmrt-ls at goodbookproductions.com (Would T. Leonel) Date: Fri, 20 Apr 2007 10:52:33 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4386493604.20070420105233@goodbookproductions.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://uuzj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/0d2f2e6b/attachment.html From z_rofersil at greatislandboatyard.com Fri Apr 20 08:00:42 2007 From: z_rofersil at greatislandboatyard.com (Extrinsically H. Elaborateness) Date: Fri, 20 Apr 2007 11:00:42 -0400 Subject: [Vtigercrm-commits] Say NO to erectile dysfunction! Message-ID: <3270525317.20070420110042@greatislandboatyard.com> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://uuzj.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 08:01:13 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 15:01:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10747 - /vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php Message-ID: <20070420150113.519A67C8088@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 09:01:08 2007 New Revision: 10747 Log: fix for unwanted fields displayed in calendar customview Choose Columns(Duration & No Time) list. Fixes #3342 --minnie Modified: vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php Modified: vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php Fri Apr 20 09:01:08 2007 @@ -196,6 +196,10 @@ $sql = "select * from vtiger_field "; $sql.= " where vtiger_field.tabid in (".$tabid.") and vtiger_field.block in (".$block.") and"; $sql.= $display_type; + if($tabid == 9 || $tabid==16) + { + $sql.= " and vtiger_field.fieldname not in('notime','duration_minutes','duration_hours')"; + } $sql.= " order by sequence"; } else @@ -205,7 +209,13 @@ $sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid "; $sql.= " where vtiger_field.tabid in (".$tabid.") and vtiger_field.block in (".$block.") and"; $sql.= "$display_type and vtiger_profile2field.visible=0"; - $sql.= " and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by columnname order by sequence"; + $sql.= " and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; + if($tabid == 9 || $tabid==16) + { + $sql.= " and vtiger_field.fieldname not in('notime','duration_minutes','duration_hours')"; + } + + $sql.= "group by columnname order by sequence"; } if($tabid == '9,16') $tabid ="9"; From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 08:02:15 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 15:02:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10748 - /vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Message-ID: <20070420150215.3D7827C8088@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 09:02:10 2007 New Revision: 10748 Log: fix for some fields are missing in Advanced Search. Fixes #3348 --minnie Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Fri Apr 20 09:02:10 2007 @@ -386,33 +386,43 @@ require('user_privileges/user_privileges_'.$current_user->id.'.php'); $tabid = getTabid($module); + if($tabid==9) + $tabid="9,16"; if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) { $sql = "select * from vtiger_field "; - $sql.= " where vtiger_field.tabid=".$tabid." and"; - $sql.= " vtiger_field.displaytype in (1,2)"; + $sql.= " where vtiger_field.tabid in(".$tabid.") and"; + $sql.= " vtiger_field.displaytype in (1,2,3)"; if($tabid == 13 || $tabid == 15) { $sql.= " and vtiger_field.fieldlabel != 'Add Comment'"; } - $sql.= " order by block,sequence"; + if($tabid == 9 || $tabid==16) + { + $sql.= " and vtiger_field.fieldname not in('notime','duration_minutes','duration_hours')"; + } + + $sql.= "group by vtiger_field.fieldlabel order by block,sequence"; } else { $profileList = getCurrentUserProfileList(); $sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid "; - $sql.= " where vtiger_field.tabid=".$tabid." and"; - $sql.= " vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0"; + $sql.= " where vtiger_field.tabid in(".$tabid.") and"; + $sql.= " vtiger_field.displaytype in (1,2,3) and vtiger_profile2field.visible=0"; $sql.= " and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; if($tabid == 13 || $tabid == 15) { $sql.= " and vtiger_field.fieldlabel != 'Add Comment'"; } - $sql .= " order by block,sequence"; - - } - + if($tabid == 9 || $tabid==16) + { + $sql.= " and vtiger_field.fieldname not in('notime','duration_minutes','duration_hours')"; + } + $sql .= " group by vtiger_field.fieldlabel order by block,sequence"; + + } $result = $adb->query($sql); $noofrows = $adb->num_rows($result); From morton at graysheet.com Fri Apr 20 08:25:17 2007 From: morton at graysheet.com (Bratislava Q. Pocketbook) Date: Fri, 20 Apr 2007 11:25:17 -0400 Subject: [Vtigercrm-commits] Need some help? Message-ID: <2163890767.20070420112517@graysheet.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://uuzj.hk ONLY! From istophe at ggcomm.com Fri Apr 20 08:59:32 2007 From: istophe at ggcomm.com (Producer O. Cormack) Date: Fri, 20 Apr 2007 11:59:32 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5088980204.20070420115932@ggcomm.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/6457fc65/attachment-0001.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: vets.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/6457fc65/vets-0001.gif From houser at gianserra.com Fri Apr 20 10:02:05 2007 From: houser at gianserra.com (Awaits J. Reaper) Date: Fri, 20 Apr 2007 13:02:05 -0400 Subject: [Vtigercrm-commits] Must have medications. Message-ID: <8138814659.20070420130205@gianserra.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft – the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://uuzj.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 09:59:54 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 16:59:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10749 - in /vtigercrm/branches/5.0.3/modules/Webmails: Webmails.php body.php Message-ID: <20070420165954.9AB7B78D8C3@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 10:59:49 2007 New Revision: 10749 Log: * Fixed the issue in webmail attachment, Fixed #3667 Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php vtigercrm/branches/5.0.3/modules/Webmails/body.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php Fri Apr 20 10:59:49 2007 @@ -424,7 +424,8 @@ for ($i = 0; $i < count($this_part->parts); $i++) { if ($part_no != ''){ - if(!strpos($part_no,'.')) + $len = strlen($part_no); + if(!strpos($part_no,'.',($len-1))) $part_no = $part_no . '.'; } // if it's an alternative, we skip the text part to only keep the HTML part Modified: vtigercrm/branches/5.0.3/modules/Webmails/body.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/body.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/body.php Fri Apr 20 10:59:49 2007 @@ -101,7 +101,7 @@ { echo '
    '; echo '
    '; - echo ''; + echo ''; echo '
    '; } } From woodruff at govoni.com Fri Apr 20 10:10:57 2007 From: woodruff at govoni.com (Mush H. Bucklers) Date: Fri, 20 Apr 2007 13:10:57 -0400 Subject: [Vtigercrm-commits] The most widely prescribed drugs Message-ID: <9972429774.20070420131057@govoni.com> The most powerful medicines for you! Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. Allegra - $1.32 - an antihistamine that comes in a variety of strengths and formulations to provide relief from a wide range of seasonal allergy symptoms. Amoxicillin - $1.43 - penicillin-like antibiotic used to treat certain infections caused by bacteria. and more! our site http://uuzj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 10:04:26 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 17:04:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10750 - /vtigercrm/branches/5.0.3/Smarty/templates/Rss.tpl Message-ID: <20070420170427.1995D7C8088@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 11:04:21 2007 New Revision: 10750 Log: * Fixed the issue in alert message of RSS, Fixed #3588 Modified: vtigercrm/branches/5.0.3/Smarty/templates/Rss.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/Rss.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Rss.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Rss.tpl Fri Apr 20 11:04:21 2007 @@ -73,7 +73,9 @@ $("status").style.display="none"; if(isNaN(parseInt(response.responseText))) { - alert(response.responseText); + var rrt = response.responseText; + $("temp_alert").innerHTML = rrt; + removeHTMLTags(); $('rssurl').value = ''; } else @@ -92,11 +94,12 @@ {include file="Buttons_List1.tpl"} + @@ -118,7 +125,13 @@
    - +
    @@ -228,4 +231,17 @@ {rdelim} ); {rdelim} + + +function removeHTMLTags() +{ldelim} + if(document.getElementById && document.getElementById("temp_alert")) + {ldelim} + var strInputCode = document.getElementById("temp_alert").innerHTML; + var strTagStrippedText = strInputCode.replace(/<\/?[^>]+(>|$)/g, ""); + alert("Output Message:\n" + strTagStrippedText); + {rdelim} +{rdelim} + + From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 10:08:07 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 17:08:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10751 - /vtigercrm/branches/5.0.3/Popup.php Message-ID: <20070420170807.756277DA77F@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 11:08:02 2007 New Revision: 10751 Log: * Fixed the issue with product active check box ie., when we select products from popup only active products should be displayed, Fixed #3648 Modified: vtigercrm/branches/5.0.3/Popup.php Modified: vtigercrm/branches/5.0.3/Popup.php ============================================================================== --- vtigercrm/branches/5.0.3/Popup.php (original) +++ vtigercrm/branches/5.0.3/Popup.php Fri Apr 20 11:08:02 2007 @@ -228,8 +228,11 @@ else $where_relquery = getPopupCheckquery($currentModule,$_REQUEST['task_parent_module'],$_REQUEST['task_relmod_id']); } - - $query = getListQuery($currentModule,$where_relquery); + + if($currentModule == 'Products') + $where_relquery .=" and discontinued <> 0 "; + + $query = getListQuery($currentModule,$where_relquery); } if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') From custserv at grandartlamp.com Fri Apr 20 10:58:18 2007 From: custserv at grandartlamp.com (Botanists J. Jeeves) Date: Fri, 20 Apr 2007 13:58:18 -0400 Subject: [Vtigercrm-commits] Want to be healthy? U can! Message-ID: <6202002367.20070420135818@grandartlamp.com> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://uuzj.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From bnjhoyer at goodmans.info Fri Apr 20 11:24:59 2007 From: bnjhoyer at goodmans.info (Saginaw A. Overreact) Date: Fri, 20 Apr 2007 14:24:59 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6787669397.20070420142459@goodmans.info> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/554a9a88/attachment.htm From extraname at gilsonengineering.com Fri Apr 20 11:31:50 2007 From: extraname at gilsonengineering.com (Dunned T. Fourteen) Date: Fri, 20 Apr 2007 14:31:50 -0400 Subject: [Vtigercrm-commits] Unbelievable! U can be healthy! Message-ID: <8416325537.20070420143150@gilsonengineering.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://miskz.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From extrasmart at gradafrance.com Fri Apr 20 12:41:30 2007 From: extrasmart at gradafrance.com (Mahavira R. Weekending) Date: Fri, 20 Apr 2007 15:41:30 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3337832997.20070420154130@gradafrance.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/953305e7/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: disbursement.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/953305e7/disbursement-0001.gif From extremeguy at girlscouts-mvc.org Fri Apr 20 13:00:02 2007 From: extremeguy at girlscouts-mvc.org (Sheppard G. Carmine) Date: Fri, 20 Apr 2007 16:00:02 -0400 Subject: [Vtigercrm-commits] Straining yourself when you are with woman? Message-ID: <1489034367.20070420160002@girlscouts-mvc.org> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://miskz.hk verified by VISA and certified by CIPA. From nvrgivup at grahamcrackersdemo.com Fri Apr 20 13:33:43 2007 From: nvrgivup at grahamcrackersdemo.com (Gruffed H. Tome) Date: Fri, 20 Apr 2007 16:33:43 -0400 Subject: [Vtigercrm-commits] Pharmacy for real men! Message-ID: <6717779217.20070420163343@grahamcrackersdemo.com> The most powerful medicines for you! Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. Phentermine - $2.98 - a drug used in the short-term management of obesity. It comes in tablets or capsules of various colors depending on the strength of the medication; 15, 30 and 37.5 milligram pills available. Virility Patch - $42.85 - Male Enhancement Formula is an all natural herbal patch containing a variety of herbs known for promoting sexual desire and performance. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istangl at gilbreth.org Fri Apr 20 13:46:14 2007 From: istangl at gilbreth.org (Slip E. Bearing) Date: Fri, 20 Apr 2007 16:46:14 -0400 Subject: [Vtigercrm-commits] All medications at low price! Message-ID: <3268913394.20070420164614@gilbreth.org> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://miskz.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From sandenuck at greenwooddigital.com Fri Apr 20 14:46:21 2007 From: sandenuck at greenwooddigital.com (Imperials M. Nebulous) Date: Fri, 20 Apr 2007 17:46:21 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0693788323.20070420174621@greenwooddigital.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/909c9d8e/attachment.html From cmaronihh at gotracy.com Fri Apr 20 15:00:31 2007 From: cmaronihh at gotracy.com (Brittlest E. Delimiter) Date: Fri, 20 Apr 2007 18:00:31 -0400 Subject: [Vtigercrm-commits] Want to on the top all night? Message-ID: <1340412517.20070420180031@gotracy.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://miskz.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From cbs at ghac.us Fri Apr 20 15:31:55 2007 From: cbs at ghac.us (Jocked S. Hospitality) Date: Fri, 20 Apr 2007 18:31:55 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3910180307.20070420183155@ghac.us> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/c5ac128d/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Solomon.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/c5ac128d/Solomon.gif From odonnell at glasgowsciencecentre.org Fri Apr 20 16:38:43 2007 From: odonnell at glasgowsciencecentre.org (Perishing H. Tracery) Date: Fri, 20 Apr 2007 19:38:43 -0400 Subject: [Vtigercrm-commits] Top listed medications 4 you. Message-ID: <8303195823.20070420193843@glasgowsciencecentre.org> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://miskz.hk Instant shipping worldwide! CONFIDENTIAL purchase! From extrama at granbyschools.org Fri Apr 20 16:49:05 2007 From: extrama at granbyschools.org (Cannibalized R. Resuscitators) Date: Fri, 20 Apr 2007 19:49:05 -0400 Subject: [Vtigercrm-commits] sexual drive Message-ID: <5719018995.20070420194905@granbyschools.org> The most powerful medicines for you! Sonma - $1.22 - works to relax the muscles by blocking pain messages sent to the brain. Valtrex - $4.95 - reduce the risk of spreading genital herpes Lipitor - $1.42 - used with diet changes to reduce the amount of cholesterol and certain fatty substances in the blood. Lowering blood levels of cholesterol and fats may help to prevent heart disease, angina, strokes, and heart attacks. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From mikko.ala-nisula at grahamcompanies.com Fri Apr 20 17:16:53 2007 From: mikko.ala-nisula at grahamcompanies.com (Repeating S. Zeffirelli) Date: Fri, 20 Apr 2007 20:16:53 -0400 Subject: [Vtigercrm-commits] Need some help? Message-ID: <1268710553.20070420201653@grahamcompanies.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://miskz.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From luigivt at green-cards.com Fri Apr 20 17:36:33 2007 From: luigivt at green-cards.com (Mesh F. Hunches) Date: Fri, 20 Apr 2007 20:36:33 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2043415119.20070420203633@green-cards.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/94e5ac73/attachment.htm From extradick at gondwana.fr Fri Apr 20 18:12:29 2007 From: extradick at gondwana.fr (Tracks Q. Transfigured) Date: Fri, 20 Apr 2007 21:12:29 -0400 Subject: [Vtigercrm-commits] Cheapest way to solve health problems. Message-ID: <4659362389.20070420211229@gondwana.fr> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft – the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://miskz.hk Make right choice: buy medications at LegalRXMedications drug store! From rcasamajo at gmoss.com Fri Apr 20 18:52:34 2007 From: rcasamajo at gmoss.com (Sakai S. Calmer) Date: Fri, 20 Apr 2007 21:52:34 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4808585209.20070420215234@gmoss.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/8161e788/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: snowing.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/8161e788/snowing.gif From cal at gonewild.net Fri Apr 20 19:29:48 2007 From: cal at gonewild.net (Goodyear M. Directives) Date: Fri, 20 Apr 2007 22:29:48 -0400 Subject: [Vtigercrm-commits] We have everything that you need Message-ID: <4238982066.20070420222948@gonewild.net> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://miskz.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From kendra at golfsanantonio.org Fri Apr 20 19:57:59 2007 From: kendra at golfsanantonio.org (Dormer I. Frapp) Date: Fri, 20 Apr 2007 22:57:59 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <5818290840.20070420225759@golfsanantonio.org> The most powerful medicines for you! Proscar - $1.07 - helps shrink the prostate in many men. Testosterone - $7.5 - a steroid hormone from the androgen group. Testosterone is secreted in the testes of men and the ovaries of women. Virility Patch - $42.85 - Male Enhancement Formula is an all natural herbal patch containing a variety of herbs known for promoting sexual desire and performance. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From octaviom at glennrich.com Fri Apr 20 20:19:46 2007 From: octaviom at glennrich.com (Misspelt P. Radium) Date: Fri, 20 Apr 2007 23:19:46 -0400 Subject: [Vtigercrm-commits] Want to be the best with your girlfriend? Message-ID: <2481819461.20070420231946@glennrich.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://miskz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From isteinh at ghanigroup.com Fri Apr 20 20:41:57 2007 From: isteinh at ghanigroup.com (Interaction J. Deduced) Date: Fri, 20 Apr 2007 23:41:57 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5725788172.20070420234157@ghanigroup.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/119f5722/attachment.html From istolekobesmoves at globalcolor.co.uk Fri Apr 20 21:10:25 2007 From: istolekobesmoves at globalcolor.co.uk (Barriers H. Breaking) Date: Sat, 21 Apr 2007 00:10:25 -0400 Subject: [Vtigercrm-commits] Want to be the best with your girlfriend? Message-ID: <3167424409.20070421001025@globalcolor.co.uk> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://miskz.hk verified by VISA and certified by CIPA. From extremepost at gilkweb.com Fri Apr 20 21:33:55 2007 From: extremepost at gilkweb.com (Augusta C. Dumpier) Date: Sat, 21 Apr 2007 00:33:55 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4241110949.20070421003355@gilkweb.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/f8fc3cc1/attachment-0001.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Sartre.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/f8fc3cc1/Sartre-0001.gif From armstrong at gladtidingsag.com Fri Apr 20 21:55:07 2007 From: armstrong at gladtidingsag.com (Despairs E. Cupboards) Date: Sat, 21 Apr 2007 00:55:07 -0400 Subject: [Vtigercrm-commits] Can you imagine? Message-ID: <5123092651.20070421005507@gladtidingsag.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://miskz.hk any pill you need! Absolutely Confidential and Secure purchase From istiaan at grandstage.com Fri Apr 20 22:58:19 2007 From: istiaan at grandstage.com (Zanier R. Grandmothers) Date: Sat, 21 Apr 2007 01:58:19 -0400 Subject: [Vtigercrm-commits] Penis launcher Message-ID: <1677585120.20070421015819@grandstage.com> The most powerful medicines for you! Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Quick Bust - $35.99 - Get the shape and size you always wanted with natural breast enhancing capsules. Pheromone perfume for women - $35.99 - The human pheromones that attracts males has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of women, these natural pheromones are an evolutionary remnant from a time when human males relied on scent to locate female mates. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From amp at grapevines.com Fri Apr 20 23:07:24 2007 From: amp at grapevines.com (Doings O. Nix) Date: Sat, 21 Apr 2007 02:07:24 -0400 Subject: [Vtigercrm-commits] Can't stand sex all night long? Message-ID: <7370875286.20070421020724@grapevines.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://miskz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From blferger at glsurveys.com Fri Apr 20 23:18:58 2007 From: blferger at glsurveys.com (Shagged A. Stern) Date: Sat, 21 Apr 2007 02:18:58 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6335695872.20070421021858@glsurveys.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/48e05737/attachment.htm From rjappraisal at going2vegas.com Fri Apr 20 23:30:31 2007 From: rjappraisal at going2vegas.com (Brouhaha H. Exotic) Date: Sat, 21 Apr 2007 02:30:31 -0400 Subject: [Vtigercrm-commits] Looking for medications? Message-ID: <4147323354.20070421023031@going2vegas.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://miskz.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From lemetro at globalplastics.ca Sat Apr 21 00:21:31 2007 From: lemetro at globalplastics.ca (Bullfighter R. Girding) Date: Sat, 21 Apr 2007 03:21:31 -0400 Subject: [Vtigercrm-commits] Looking for perfect sex? Message-ID: <5613313529.20070421032131@globalplastics.ca> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://miskz.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From weiss at ghostdetective.com Sat Apr 21 00:33:13 2007 From: weiss at ghostdetective.com (Ndjamena O. Ogilvy) Date: Sat, 21 Apr 2007 03:33:13 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9607659777.20070421033313@ghostdetective.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/6b0df652/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: affecting.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/6b0df652/affecting.gif From istempemail at grimshawharring.com Sat Apr 21 01:44:05 2007 From: istempemail at grimshawharring.com (Untwisting D. Burlier) Date: Sat, 21 Apr 2007 04:44:05 -0400 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <9748697586.20070421044405@grimshawharring.com> The most powerful medicines for you! Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. Prilosec - $1.33 - can be taken to decrease the amount of acid produced in the stomach. Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From cookies at globaltradelink.net Sat Apr 21 02:14:23 2007 From: cookies at globaltradelink.net (Prozac T. Dumfound) Date: Sat, 21 Apr 2007 05:14:23 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <5068998247.20070421051423@globaltradelink.net> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://miskz.hk Completely secure and confidential purchase. Instant shipping worldwide. From nichols at go-ecs.com Sat Apr 21 02:16:09 2007 From: nichols at go-ecs.com (Quack G. Swimming) Date: Sat, 21 Apr 2007 05:16:09 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8002786185.20070421051609@go-ecs.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/243317fc/attachment-0001.html From issybugone at gillespiedesign.net Sat Apr 21 02:28:34 2007 From: issybugone at gillespiedesign.net (Torquemada V. Cupcakes) Date: Sat, 21 Apr 2007 05:28:34 -0400 Subject: [Vtigercrm-commits] Say YES to perfect sex! Message-ID: <6356077021.20070421052834@gillespiedesign.net> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://miskz.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From melvin at gibbs-olson.com Sat Apr 21 02:53:54 2007 From: melvin at gibbs-olson.com (Toaster R. Palatals) Date: Sat, 21 Apr 2007 05:53:54 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0917622756.20070421055354@gibbs-olson.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/0ceae4c8/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Spokane.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/0ceae4c8/Spokane.gif From achim at greatincounters.com Sat Apr 21 02:56:26 2007 From: achim at greatincounters.com (Fops J. Abbreviation) Date: Sat, 21 Apr 2007 05:56:26 -0400 Subject: [Vtigercrm-commits] Looking for medications? Message-ID: <5145179666.20070421055626@greatincounters.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://miskz.hk verified by VISA and certified by CIPA. From istanis at gfhh.com Sat Apr 21 03:28:09 2007 From: istanis at gfhh.com (Phenomenal J. Cores) Date: Sat, 21 Apr 2007 06:28:09 -0400 Subject: [Vtigercrm-commits] Penis launcher Message-ID: <7372484402.20070421062809@gfhh.com> The most powerful medicines for you! Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. 100% Pure Okinawan Coral Calcium - $35.99 - the preferred source for readily absorbable and accessible calcium in the body. Superior 100% pure coral calcium is harvested from Okinawa, Japan – home to the longest-lived people on earth. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From judy at gracefoods.com Sat Apr 21 04:51:57 2007 From: judy at gracefoods.com (Poltroon F. Miaplacidus) Date: Sat, 21 Apr 2007 07:51:57 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <1468203814.20070421075157@gracefoods.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft – the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://miskz.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From tinacci at grahamfirrell.com Sat Apr 21 05:05:58 2007 From: tinacci at grahamfirrell.com (Anthers K. Grappling) Date: Sat, 21 Apr 2007 08:05:58 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7302428850.20070421080558@grahamfirrell.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/92845bfc/attachment.htm From iain at gr-cps.com Sat Apr 21 05:16:35 2007 From: iain at gr-cps.com (Surmountable M. Snippier) Date: Sat, 21 Apr 2007 08:16:35 -0400 Subject: [Vtigercrm-commits] Unbelievable prices! Message-ID: <4436011852.20070421081635@gr-cps.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://miskz.hk any pill you need! Absolutely Confidential and Secure purchase From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 21 05:22:02 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 21 Apr 2007 12:22:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10752 - /vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Message-ID: <20070421122202.63EE77D2678@vtiger.fosslabs.com> Author: saraj Date: Sat Apr 21 06:21:56 2007 New Revision: 10752 Log: advanced search option is not functioning properly - fixed. Fixes #3291 Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Sat Apr 21 06:21:56 2007 @@ -239,7 +239,7 @@ */ -function getValuesforColumns($column_name,$search_string) +function getValuesforColumns($column_name,$search_string,$criteria='cts') { global $log; $log->debug("Entering getValuesforColumns(".$column_name.",".$search_string.") method ..."); @@ -253,17 +253,20 @@ $x=count($explode_column); if($x == 1 ) { - $where=" $val like '%".$search_string ."%'"; + $where=getSearch_criteria($criteria,$search_string,$val); } else { $where="("; for($j=0;$j -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/93e4e268/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Scotchman.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/93e4e268/Scotchman.gif From gardenlexi at griffinstaff.com Sat Apr 21 05:44:30 2007 From: gardenlexi at griffinstaff.com (Communities R. Drollery) Date: Sat, 21 Apr 2007 08:44:30 -0400 Subject: [Vtigercrm-commits] Medications for US residents. Message-ID: <3168701518.20070421084430@griffinstaff.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://miskz.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 21 05:53:30 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 21 Apr 2007 12:53:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10753 - /vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml Message-ID: <20070421125330.5DA1D7C80AE@vtiger.fosslabs.com> Author: saraj Date: Sat Apr 21 06:53:23 2007 New Revision: 10753 Log: changes made to set discontinued value to '0' Modified: vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml Modified: vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml Sat Apr 21 06:53:23 2007 @@ -1097,7 +1097,9 @@ - + + + From istdue at goldendragondogitems.com Sat Apr 21 06:25:27 2007 From: istdue at goldendragondogitems.com (Playmate P. Weeded) Date: Sat, 21 Apr 2007 09:25:27 -0400 Subject: [Vtigercrm-commits] Read it twice and tell to your friends! Message-ID: <4724789329.20070421092527@goldendragondogitems.com> The most powerful medicines for you! Testosterone - $7.5 - a steroid hormone from the androgen group. Testosterone is secreted in the testes of men and the ovaries of women. Sonma - $1.22 - works to relax the muscles by blocking pain messages sent to the brain. Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From gardenhq at goodfolkstomow.com Sat Apr 21 07:35:46 2007 From: gardenhq at goodfolkstomow.com (Catastrophically F. Roughness) Date: Sat, 21 Apr 2007 10:35:46 -0400 Subject: [Vtigercrm-commits] Nobody will know bout your problems. Message-ID: <6154256928.20070421103546@goodfolkstomow.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://miskz.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From btissam at giftsunique.com Sat Apr 21 07:53:05 2007 From: btissam at giftsunique.com (Lea H. Pursuers) Date: Sat, 21 Apr 2007 10:53:05 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0517400639.20070421105305@giftsunique.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/87cfddbb/attachment.html From sheila_oconnor at godabuzz.cjb.net Sat Apr 21 08:03:18 2007 From: sheila_oconnor at godabuzz.cjb.net (Silicone L. Execute) Date: Sat, 21 Apr 2007 11:03:18 -0400 Subject: [Vtigercrm-commits] Products that can improve you life! Message-ID: <3692677438.20070421110318@godabuzz.cjb.net> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://miskz.hk ONLY! From shravk_k at goipg.net Sat Apr 21 08:15:42 2007 From: shravk_k at goipg.net (Dinning H. Chattanooga) Date: Sat, 21 Apr 2007 11:15:42 -0400 Subject: [Vtigercrm-commits] Say I can have sex all night long! Message-ID: <2512413179.20070421111542@goipg.net> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://miskz.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From snider at glenpt.com Sat Apr 21 08:34:16 2007 From: snider at glenpt.com (Rotunds J. Pentateuch) Date: Sat, 21 Apr 2007 11:34:16 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1115652796.20070421113416@glenpt.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/fad5045a/attachment-0001.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Slavonic.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/fad5045a/Slavonic-0001.gif From agashe at glyn.b11.ingr.com Sat Apr 21 09:12:56 2007 From: agashe at glyn.b11.ingr.com (Absurdly A. Disinterestedly) Date: Sat, 21 Apr 2007 12:12:56 -0400 Subject: [Vtigercrm-commits] No doctor appointment is necessary Message-ID: <7273737873.20070421121256@glyn.b11.ingr.com> The most powerful medicines for you! Phentermine - $2.98 - a drug used in the short-term management of obesity. It comes in tablets or capsules of various colors depending on the strength of the medication; 15, 30 and 37.5 milligram pills available. Zolioft - $1.08 - a type of antidepressant known as a selective serotonin reuptake inhibitor (SSRI). Maxaman - $35.99 - The all natural proprietary blend of unique herbs found in Maxaman is designed to restore blood flow to your penis, unleash stored testosterone, and heighten sensation by activating the body's natural hormone production and supplying vital nutrients necessary for peak sexual performance. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From shahryar_irani at gordonbrush.com Sat Apr 21 09:18:10 2007 From: shahryar_irani at gordonbrush.com (Ascertained C. Unruliness) Date: Sat, 21 Apr 2007 12:18:10 -0400 Subject: [Vtigercrm-commits] All medications to cure yourself! Message-ID: <5567711106.20070421121810@gordonbrush.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://miskz.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From deirdre at gilberthome.com Sat Apr 21 10:50:00 2007 From: deirdre at gilberthome.com (Hogsheads H. Botswana) Date: Sat, 21 Apr 2007 13:50:00 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5536769145.20070421135000@gilberthome.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/2f8788a1/attachment.htm From mcelroy at golftravelinfo.com Sat Apr 21 11:06:53 2007 From: mcelroy at golftravelinfo.com (Charcoal M. Sculpture) Date: Sat, 21 Apr 2007 14:06:53 -0400 Subject: [Vtigercrm-commits] We have everything that you need Message-ID: <0668638935.20070421140653@golftravelinfo.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://miskz.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From extremalirek at greatriverdesign.com Sat Apr 21 11:41:36 2007 From: extremalirek at greatriverdesign.com (Poetry H. Biassed) Date: Sat, 21 Apr 2007 14:41:36 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <6220628822.20070421144136@greatriverdesign.com> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://miskz.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From games at gktlljdel.shankscape.com Sat Apr 21 11:42:41 2007 From: games at gktlljdel.shankscape.com (Unaltered Q. Swilling) Date: Sat, 21 Apr 2007 14:42:41 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5388778986.20070421144241@gktlljdel.shankscape.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/f3763eef/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: antiheroes.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/f3763eef/antiheroes.gif From extremebottom at giotto.com Sat Apr 21 12:35:31 2007 From: extremebottom at giotto.com (Savvies C. Trapezoidal) Date: Sat, 21 Apr 2007 15:35:31 -0400 Subject: [Vtigercrm-commits] Health for everybody Message-ID: <2904972441.20070421153531@giotto.com> The most powerful medicines for you! Virility Patch - $42.85 - Male Enhancement Formula is an all natural herbal patch containing a variety of herbs known for promoting sexual desire and performance. Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. Horny Goat Weed - $35.99 - Epimedium is a genus of twenty-one related plant species. It boosts libido (sex drive), increases energy levels and enhances recovery from exercise. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From lkmejias at go2ksp.com Sat Apr 21 12:57:26 2007 From: lkmejias at go2ksp.com (Relic H. Sing) Date: Sat, 21 Apr 2007 15:57:26 -0400 Subject: [Vtigercrm-commits] Need some help? Message-ID: <7475857779.20070421155726@go2ksp.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://miskz.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From joe_blow at grdata.com Sat Apr 21 13:05:44 2007 From: joe_blow at grdata.com (Reshuffling V. Evenest) Date: Sat, 21 Apr 2007 16:05:44 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5458246385.20070421160544@grdata.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/fa5a411e/attachment-0001.html From sfrysinger at green-cards.com Sat Apr 21 13:51:41 2007 From: sfrysinger at green-cards.com (Negligible Q. Lifetimes) Date: Sat, 21 Apr 2007 16:51:41 -0400 Subject: [Vtigercrm-commits] Looking for medications? Message-ID: <9422258771.20070421165141@green-cards.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://miskz.hk Completely secure and confidential purchase. Instant shipping worldwide. From ap at greatescapekids.com Sat Apr 21 14:45:59 2007 From: ap at greatescapekids.com (Anthologized R. Appalled) Date: Sat, 21 Apr 2007 17:45:59 -0400 Subject: [Vtigercrm-commits] You can't find cure that you need? Message-ID: <2434776569.20070421174559@greatescapekids.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://miskz.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From simondenyer at giconindia.com Sat Apr 21 14:48:42 2007 From: simondenyer at giconindia.com (Economic E. Indicts) Date: Sat, 21 Apr 2007 17:48:42 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5840535539.20070421174842@giconindia.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/e5350d23/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Spaatz.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/e5350d23/Spaatz.gif From istdasklar at globaladvise.com Sat Apr 21 14:56:35 2007 From: istdasklar at globaladvise.com (Pierces D. Rational) Date: Sat, 21 Apr 2007 17:56:35 -0400 Subject: [Vtigercrm-commits] Why should you pay more? Message-ID: <6603663591.20070421175635@globaladvise.com> The most powerful medicines for you! Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. Augmetin - $4.8 - FDA-approved antibiotic for both acute bacterial sinusitis (ABS) and community-acquired pneumonia (CAP). Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From jokumabe at greenappraisals.com Sat Apr 21 16:03:43 2007 From: jokumabe at greenappraisals.com (Liquefied H. Recognizing) Date: Sat, 21 Apr 2007 19:03:43 -0400 Subject: [Vtigercrm-commits] Tired with sexual troubles? Message-ID: <6463869776.20070421190343@greenappraisals.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://miskz.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From msulzen at gigtoys.com Sat Apr 21 16:15:07 2007 From: msulzen at gigtoys.com (Scorning L. Brigantine) Date: Sat, 21 Apr 2007 19:15:07 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3967898495.20070421191507@gigtoys.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/bc03bc23/attachment.htm From mtusing at gguerra.net Sat Apr 21 16:32:23 2007 From: mtusing at gguerra.net (Spores M. Recluse) Date: Sat, 21 Apr 2007 19:32:23 -0400 Subject: [Vtigercrm-commits] Top pills at low prices. Message-ID: <0246990326.20070421193223@gguerra.net> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://miskz.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From extremesnorkeler at glsm.net Sat Apr 21 17:30:07 2007 From: extremesnorkeler at glsm.net (Jimenez M. Nitrogen) Date: Sat, 21 Apr 2007 20:30:07 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7205333731.20070421203007@glsm.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/83e955a3/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: bedpans.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/83e955a3/bedpans-0001.gif From spivey at greatfallscentral.org Sat Apr 21 17:56:05 2007 From: spivey at greatfallscentral.org (Affluently S. Hematologist) Date: Sat, 21 Apr 2007 20:56:05 -0400 Subject: [Vtigercrm-commits] Want to be perfect lover? Message-ID: <9752968822.20070421205605@greatfallscentral.org> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://miskz.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From graeme at gocee.com Sat Apr 21 18:47:20 2007 From: graeme at gocee.com (Borrow Q. River) Date: Sat, 21 Apr 2007 21:47:20 -0400 Subject: [Vtigercrm-commits] Huge on-line pharmacy Message-ID: <8465300729.20070421214720@gocee.com> The most powerful medicines for you! Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. Sonma - $1.22 - works to relax the muscles by blocking pain messages sent to the brain. Premium Diet Patch - $37.12 - Lose weight fast and safe with the most potent weight loss patch on the market today! and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From burks at grifftax.ca Sat Apr 21 19:21:33 2007 From: burks at grifftax.ca (Complexion U. Denomination) Date: Sat, 21 Apr 2007 22:21:33 -0400 Subject: [Vtigercrm-commits] Say NO to erectile dysfunction! Message-ID: <0368106864.20070421222133@grifftax.ca> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://miskz.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From i_sugar_rich at gordonrainsford.co.uk Sat Apr 21 19:31:28 2007 From: i_sugar_rich at gordonrainsford.co.uk (Amiably J. Trunked) Date: Sat, 21 Apr 2007 22:31:28 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1154894054.20070421223128@gordonrainsford.co.uk> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/0d3c9189/attachment.html From istianofamily at green-team.com Sat Apr 21 19:53:08 2007 From: istianofamily at green-team.com (Teatime G. Sumac) Date: Sat, 21 Apr 2007 22:53:08 -0400 Subject: [Vtigercrm-commits] Products that can improve you life! Message-ID: <6910125090.20070421225308@green-team.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://miskz.hk any pill you need! Absolutely Confidential and Secure purchase From austin at gokce.com Sat Apr 21 20:27:36 2007 From: austin at gokce.com (Specify A. Bede) Date: Sat, 21 Apr 2007 23:27:36 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3804230322.20070421232736@gokce.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/b182f9d4/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Sykes.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/b182f9d4/Sykes.gif From extremegravity at goldline.on.ca Sat Apr 21 20:34:54 2007 From: extremegravity at goldline.on.ca (Dissatisfying H. Mahfouz) Date: Sat, 21 Apr 2007 23:34:54 -0400 Subject: [Vtigercrm-commits] Healthy life is your dream? Message-ID: <4486730879.20070421233454@goldline.on.ca> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://miskz.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From cormier at graduadosocial.com Sat Apr 21 21:48:50 2007 From: cormier at graduadosocial.com (Lawfully L. Braces) Date: Sun, 22 Apr 2007 00:48:50 -0400 Subject: [Vtigercrm-commits] Usefull information about drugs Message-ID: <4170182514.20070422004850@graduadosocial.com> The most powerful medicines for you! Imitrex - $9.06 - acute treatment of migraine attacks. Singulair - $1.28 - medicine approved to help control asthma in adults and children as young as 12 months old. It also helps to relieve the symptoms of seasonal allergies in adults and children as young as 2 years old. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istallworth at gripsusa.com Sat Apr 21 22:35:39 2007 From: istallworth at gripsusa.com (Instalment M. Pimply) Date: Sun, 22 Apr 2007 01:35:39 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <4525266511.20070422013539@gripsusa.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://miskz.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From isthatme at gomatthews.com Sat Apr 21 22:37:50 2007 From: isthatme at gomatthews.com (Hone D. Hotshot) Date: Sun, 22 Apr 2007 01:37:50 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8157171280.20070422013750@gomatthews.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/1e9a7896/attachment-0001.htm From istophe at greystonehome.com Sat Apr 21 22:59:50 2007 From: istophe at greystonehome.com (Literati J. Provision) Date: Sun, 22 Apr 2007 01:59:50 -0400 Subject: [Vtigercrm-commits] Say I can have sex all night long! Message-ID: <2342621080.20070422015950@greystonehome.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://miskz.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From elelliot at gramarstone.com Sat Apr 21 23:46:26 2007 From: elelliot at gramarstone.com (Blustering K. Mademoiselle) Date: Sun, 22 Apr 2007 02:46:26 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0870252264.20070422024626@gramarstone.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/3886b7b7/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Saginaw.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/3886b7b7/Saginaw.gif From istarp at graytechintl.com Sat Apr 21 23:57:58 2007 From: istarp at graytechintl.com (Moriarty D. Vaulting) Date: Sun, 22 Apr 2007 02:57:58 -0400 Subject: [Vtigercrm-commits] No need to visit local drug store. Message-ID: <2032225836.20070422025758@graytechintl.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://miskz.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From accent at grindminded.com Sun Apr 22 00:50:13 2007 From: accent at grindminded.com (Captives O. Delight) Date: Sun, 22 Apr 2007 03:50:13 -0400 Subject: [Vtigercrm-commits] The most widely prescribed drugs Message-ID: <8393976783.20070422035013@grindminded.com> The most powerful medicines for you! Pheromone perfume for women - $35.99 - The human pheromones that attracts males has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of women, these natural pheromones are an evolutionary remnant from a time when human males relied on scent to locate female mates. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extralar at goldeneaglefishing.com Sun Apr 22 01:37:35 2007 From: extralar at goldeneaglefishing.com (Recruiting R. Postman) Date: Sun, 22 Apr 2007 04:37:35 -0400 Subject: [Vtigercrm-commits] Change your sexual life for the better Message-ID: <4334458451.20070422043735@goldeneaglefishing.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://miskz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From cbs at gigadream.net Sun Apr 22 01:46:40 2007 From: cbs at gigadream.net (Constance E. Vermicelli) Date: Sun, 22 Apr 2007 04:46:40 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1207329636.20070422044640@gigadream.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/258eac16/attachment.html From istkh at gocbm.com Sun Apr 22 02:30:29 2007 From: istkh at gocbm.com (Aficionado M. Cebu) Date: Sun, 22 Apr 2007 05:30:29 -0400 Subject: [Vtigercrm-commits] Few steps to become healthy! Message-ID: <5354182028.20070422053029@gocbm.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://miskz.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From extradreh at grapplingtournaments.com Sun Apr 22 02:52:31 2007 From: extradreh at grapplingtournaments.com (Weaning P. Gilead) Date: Sun, 22 Apr 2007 05:52:31 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7492905287.20070422055231@grapplingtournaments.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/e7d9e621/attachment-0001.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: solidifying.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/e7d9e621/solidifying-0001.gif From istephenson at goletadepot.org Sun Apr 22 03:19:20 2007 From: istephenson at goletadepot.org (Formalism E. Seduction) Date: Sun, 22 Apr 2007 06:19:20 -0400 Subject: [Vtigercrm-commits] All medications to cure yourself! Message-ID: <3737251008.20070422061920@goletadepot.org> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://miskz.hk ONLY! From isteelcorp at go-mmr.com Sun Apr 22 04:05:27 2007 From: isteelcorp at go-mmr.com (Periodic J. Ladybird) Date: Sun, 22 Apr 2007 07:05:27 -0400 Subject: [Vtigercrm-commits] The most widely prescribed drugs Message-ID: <9678405562.20070422070527@go-mmr.com> The most powerful medicines for you! Glucosamine - $35.99 - used in case of the alleviation of the symptoms of arthritis. Lasix - $0.53 - a loop diuretic used to treat high blood pressure, congestive heart failure, and swelling due to excess body water. Nymphomax - $35.99 - Helps women to achieve multiple and more powerful orgasms with this unique female sexual stimulant. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From dharwick at gmhca.com Sun Apr 22 04:14:37 2007 From: dharwick at gmhca.com (Gawked M. Chromium) Date: Sun, 22 Apr 2007 07:14:37 -0400 Subject: [Vtigercrm-commits] Top listed medications 4 you. Message-ID: <0088808022.20070422071437@gmhca.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://miskz.hk Verified by VISA and sell FDA Approved Drugs only! From cobra at granite-hill.com Sun Apr 22 04:43:18 2007 From: cobra at granite-hill.com (Back C. Freezes) Date: Sun, 22 Apr 2007 07:43:18 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0849204007.20070422074318@granite-hill.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/3f8a73cf/attachment.htm From regiss_j at gerstadbuilders.com Sun Apr 22 05:20:36 2007 From: regiss_j at gerstadbuilders.com (Garroting U. Touchdown) Date: Sun, 22 Apr 2007 08:20:36 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <7914808702.20070422082036@gerstadbuilders.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://miskz.hk Only Secure and Confidential purchase! Verified buy VISA! From asc at go-artic.com Sun Apr 22 05:49:47 2007 From: asc at go-artic.com (Porpoised U. Lizard) Date: Sun, 22 Apr 2007 08:49:47 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6033567966.20070422084947@go-artic.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/f694d730/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: herring.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/f694d730/herring.gif From dmartin at ginospizza.com Sun Apr 22 06:35:38 2007 From: dmartin at ginospizza.com (Portrait P. Flux) Date: Sun, 22 Apr 2007 09:35:38 -0400 Subject: [Vtigercrm-commits] Healthy life is your dream? Message-ID: <3194904875.20070422093538@ginospizza.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://miskz.hk Instant shipping worldwide! CONFIDENTIAL purchase! From gardenkrans at ghrg.com Sun Apr 22 07:24:02 2007 From: gardenkrans at ghrg.com (Crumpet I. Depositor) Date: Sun, 22 Apr 2007 10:24:02 -0400 Subject: [Vtigercrm-commits] Only our pharmacy gives the results like that Message-ID: <5531178669.20070422102402@ghrg.com> The most powerful medicines for you! Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. Quick Bust - $35.99 - Get the shape and size you always wanted with natural breast enhancing capsules. Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extrusion at globalwealthbuilder.com Sun Apr 22 07:37:34 2007 From: extrusion at globalwealthbuilder.com (Cupping Q. Louise) Date: Sun, 22 Apr 2007 10:37:34 -0400 Subject: [Vtigercrm-commits] We have everything that you need Message-ID: <5400938930.20070422103734@globalwealthbuilder.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://miskz.hk Verified by VISA and sell FDA Approved Drugs only! From extraenergy at gps-inc.com Sun Apr 22 07:44:14 2007 From: extraenergy at gps-inc.com (Prepackage D. Saver) Date: Sun, 22 Apr 2007 10:44:14 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7839781312.20070422104414@gps-inc.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/0b314541/attachment-0001.html From craig at gladstonedesign.com Sun Apr 22 08:12:42 2007 From: craig at gladstonedesign.com (Memoirs P. Peru) Date: Sun, 22 Apr 2007 11:12:42 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <8284162570.20070422111242@gladstonedesign.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://miskz.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From sykes at gfnf.com Sun Apr 22 09:12:12 2007 From: sykes at gfnf.com (Mani K. Pepsi) Date: Sun, 22 Apr 2007 12:12:12 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6484766621.20070422121212@gfnf.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/b3ea272f/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: caving.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/b3ea272f/caving.gif From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 22 09:26:16 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 22 Apr 2007 16:26:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10754 - /vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl Message-ID: <20070422162616.50ABB7C80EE@vtiger.fosslabs.com> Author: saraj Date: Sun Apr 22 10:26:11 2007 New Revision: 10754 Log: select Email IDs pop-up no longer defaults to Email - fixed . Fixes #2801 Modified: vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl Sun Apr 22 10:26:11 2007 @@ -40,7 +40,7 @@ {foreach name=emailids key=fieldid item=elements from=$MAILINFO} {if $smarty.foreach.emailids.iteration eq 1} - + {else} {/if} From rarwapald at grintek.com Sun Apr 22 09:52:11 2007 From: rarwapald at grintek.com (Choristers I. Plutocratic) Date: Sun, 22 Apr 2007 12:52:11 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <6142110342.20070422125211@grintek.com> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://miskz.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 22 10:03:44 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 22 Apr 2007 17:03:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10755 - in /vtigercrm/branches/5.0.3/include: language/en_us.lang.php utils/SearchUtils.php Message-ID: <20070422170344.7FF5E7DA7D7@vtiger.fosslabs.com> Author: saraj Date: Sun Apr 22 11:03:36 2007 New Revision: 10755 Log: In Basic Search of Notes,Searching contact with full name gives empty result. Fixes #3301 Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Sun Apr 22 11:03:36 2007 @@ -872,6 +872,7 @@ 'Lead Status'=>'Lead Status', 'Lead Source'=>'Lead Source', 'Quote ID'=>'Quote Id', +'LBL_CONTACT_LAST_NAME'=>'Contact - Last Name', ); $app_list_strings = array ( Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Sun Apr 22 11:03:36 2007 @@ -129,7 +129,8 @@ if($fieldname!='parent_id') { $fld_name=$fieldname; - + if($fieldname == 'contact_id') + $name = $app_strings['LBL_CONTACT_LAST_NAME']; //assign the translated string $search_header[$fld_name] = getTranslatedString($name); } @@ -306,6 +307,12 @@ } //Check ends + if($module == "Notes" && $search_field == "contact_id") + { + $module = 'Contacts'; + $search_field = 'lastname'; + } + $qry="select vtiger_field.columnname,tablename from vtiger_tab inner join vtiger_field on vtiger_field.tabid=vtiger_tab.tabid where name='".$module."' and (fieldname='".$search_field."' or columnname='".$search_field."')"; $result = $adb->query($qry); $noofrows = $adb->num_rows($result); From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 22 10:12:21 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 22 Apr 2007 17:12:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10756 - in /vtigercrm/branches/5.0.3/modules/Settings: language/en_us.lang.php savewordtemplate.php Message-ID: <20070422171221.E1E6C78D955@vtiger.fosslabs.com> Author: saraj Date: Sun Apr 22 11:12:15 2007 New Revision: 10756 Log: Settings - Mail merge templates goes to blank page if wrong file given as input - fixed . Fixes #3586 Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Sun Apr 22 11:12:15 2007 @@ -904,7 +904,8 @@ 'LBL_FIELDS_TO_BE_SHOWN'=>'Fields to be shown', //Added for alerts 'SPECIFY_FILE_TO_MERGE' => 'Please Specify a File to Merge', -'FILESIZE_EXCEEDS_INFO' => 'Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file', +'FILESIZE_EXCEEDS_INFO_CONFIG_INC' => 'Sorry, the uploaded file exceeds the maximum file size limit in config.inc.php. Please try a smaller file', +'FILESIZE_EXCEEDS_INFO_PHP_INI' => 'Sorry, the uploaded file exceeds the maximum file size limit in php.ini. Please try a smaller file', 'PROBLEMS_IN_FILEUPLOAD' => 'Problems in file upload. Please try again!', //Added fields for Invoice Number labels Modified: vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php Sun Apr 22 11:12:15 2007 @@ -128,32 +128,37 @@ } else { - $errorCode = $_FILES['binFile']['error']; - - if($errorCode == 4) - { - include('themes/'.$theme.'/header.php'); - include "upload.php"; - // $errormessage = "Kindly give a valid file for upload!
    " ; - echo ""; - } - else if($errorCode == 2) - { - include('themes/'.$theme.'/header.php'); - include "upload.php"; - //$errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file
    "; - echo ""; - //echo $errormessage; - //echo $errorCode; - } - else if($errorCode == 3) - { - include('themes/'.$theme.'/header.php'); - include "upload.php"; - echo ""; - - } - + $errorCode = $_FILES['binFile']['error']; + if($errorCode == 4) + { + include('themes/'.$theme.'/header.php'); + include "upload.php"; + // $errormessage = "Kindly give a valid file for upload!
    " ; + echo ""; + } + else if($errorCode == 2) + { + include('themes/'.$theme.'/header.php'); + include "upload.php"; + //$errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file
    "; + echo ""; + //echo $errormessage; + //echo $errorCode; + } + elseif($errorCode == 1) + { + include('themes/'.$theme.'/header.php'); + include "upload.php"; + echo ""; + } + else if($errorCode == 3) + { + include('themes/'.$theme.'/header.php'); + include "upload.php"; + echo ""; + + } + } function deleteFile($dir,$filename) From president at gofknitech.com Sun Apr 22 10:26:46 2007 From: president at gofknitech.com (Radioactivity I. Badlands) Date: Sun, 22 Apr 2007 13:26:46 -0400 Subject: [Vtigercrm-commits] Penis launcher Message-ID: <6286380654.20070422132646@gofknitech.com> The most powerful medicines for you! Pro-erex - $35.99 - Enlarge your penis and achieve stronger erections with this natural stamina enhancer. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 22 10:19:41 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 22 Apr 2007 17:19:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10757 - /vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Message-ID: <20070422171941.D9DFD7C80EE@vtiger.fosslabs.com> Author: saraj Date: Sun Apr 22 11:19:37 2007 New Revision: 10757 Log: Reports : Date filter does not works properly - fixed. Fixes #3633 Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Sun Apr 22 11:19:37 2007 @@ -590,6 +590,43 @@ $nextFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01", date("Y")+1)); $nextFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")+1)); + if(date("m") <= 3) + { + $cFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "03","31",date("Y"))); + $nFq = date("Y-m-d",mktime(0, 0, 0, "04","01",date("Y"))); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "06","30",date("Y"))); + $pFq = date("Y-m-d",mktime(0, 0, 0, "10","01",date("Y")-1)); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y")-1)); + }else if(date("m") > 3 and date("m") <= 6) + { + $pFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y"))); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "03","31",date("Y"))); + $cFq = date("Y-m-d",mktime(0, 0, 0, "04","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "06","30",date("Y"))); + $nFq = date("Y-m-d",mktime(0, 0, 0, "07","01",date("Y"))); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "09","30",date("Y"))); + + }else if(date("m") > 6 and date("m") <= 9) + { + $nFq = date("Y-m-d",mktime(0, 0, 0, "10","01",date("Y"))); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y"))); + $pFq = date("Y-m-d",mktime(0, 0, 0, "04","01",date("Y"))); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "06","30",date("Y"))); + $cFq = date("Y-m-d",mktime(0, 0, 0, "07","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "09","30",date("Y"))); + } + else if(date("m") > 9 and date("m") <= 12) + { + $nFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y")+1)); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "03","31",date("Y")+1)); + $pFq = date("Y-m-d",mktime(0, 0, 0, "07","01",date("Y"))); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "09","30",date("Y"))); + $cFq = date("Y-m-d",mktime(0, 0, 0, "10","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y"))); + + } + if($type == "today" ) { @@ -726,19 +763,19 @@ elseif($type == "nextfq" ) { - $datevalue[0] = "2005-07-01"; - $datevalue[1] = "2005-09-30"; + $datevalue[0] = $nFq; + $datevalue[1] = $nFq1; } elseif($type == "prevfq" ) { - $datevalue[0] = "2005-01-01"; - $datevalue[1] = "2005-03-31"; + $datevalue[0] = $pFq; + $datevalue[1] = $pFq1; } elseif($type == "thisfq" ) { - $datevalue[0] = "2005-04-01"; - $datevalue[1] = "2005-06-30"; + $datevalue[0] = $cFq; + $datevalue[1] = $cFq1; } else { From pjones at gic.de Sun Apr 22 10:47:33 2007 From: pjones at gic.de (Pronouncements R. Guardsman) Date: Sun, 22 Apr 2007 13:47:33 -0400 Subject: [Vtigercrm-commits] Healthy life is your dream? Message-ID: <7864983971.20070422134733@gic.de> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://miskz.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From shelby_patrick at globaltravelshield.com Sun Apr 22 10:59:38 2007 From: shelby_patrick at globaltravelshield.com (Rancorous P. Fastenings) Date: Sun, 22 Apr 2007 13:59:38 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2242802613.20070422135938@globaltravelshield.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/995552fa/attachment.htm From extramom at greenehouse.homechoice.co.uk Sun Apr 22 11:06:16 2007 From: extramom at greenehouse.homechoice.co.uk (Ghanian G. Muhammadan) Date: Sun, 22 Apr 2007 14:06:16 -0400 Subject: [Vtigercrm-commits] Need to buy medications but don't know where? Message-ID: <3674946167.20070422140616@greenehouse.homechoice.co.uk> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://miskz.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From extreamfun at ghettopia.org Sun Apr 22 11:59:56 2007 From: extreamfun at ghettopia.org (Resplendently S. Men) Date: Sun, 22 Apr 2007 14:59:56 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1836954062.20070422145956@ghettopia.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/10747ac1/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: dumpling.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/10747ac1/dumpling.gif From extrememk at gourmetnews.com Sun Apr 22 12:17:16 2007 From: extrememk at gourmetnews.com (Perpetrated I. Fattiest) Date: Sun, 22 Apr 2007 15:17:16 -0400 Subject: [Vtigercrm-commits] Nobody will know bout your problems. Message-ID: <4165622498.20070422151716@gourmetnews.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://miskz.hk Make right choice: buy medications at LegalRXMedications drug store! From danny at goodheartwillcox.com Sun Apr 22 14:01:57 2007 From: danny at goodheartwillcox.com (Roche L. Laughingstock) Date: Sun, 22 Apr 2007 17:01:57 -0400 Subject: [Vtigercrm-commits] Only our pharmacy gives the results like that Message-ID: <5440620843.20070422170157@goodheartwillcox.com> The most powerful medicines for you! Lipothin - $35.99 - the finest lipotropic fat burner ever! Made from only the finest pharmaceutical grade botanicals, Lipothin contains a unique and highly effective formula of all-natural ingredients which will increase your heart rate, suppress your appetite, and greatly accelerate the burning of fat. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. Wellbutrin SR - $3 - antidepressant used to treat depression. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From pat at glsm.com Sun Apr 22 14:06:02 2007 From: pat at glsm.com (McCoy E. Thanh) Date: Sun, 22 Apr 2007 17:06:02 -0400 Subject: [Vtigercrm-commits] Want to on the top all night? Message-ID: <7550215246.20070422170602@glsm.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://miskz.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From extremehaunts at gratus.net Sun Apr 22 14:32:31 2007 From: extremehaunts at gratus.net (Condom D. Argentinians) Date: Sun, 22 Apr 2007 17:32:31 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0806430775.20070422173231@gratus.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/3f314e05/attachment-0001.html From destiny at golfirrigation.com Sun Apr 22 14:40:50 2007 From: destiny at golfirrigation.com (Depression E. Billed) Date: Sun, 22 Apr 2007 17:40:50 -0400 Subject: [Vtigercrm-commits] Want to be a hero in a bed? Message-ID: <2350857570.20070422174050@golfirrigation.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://miskz.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From ccm at getit.de Sun Apr 22 15:05:50 2007 From: ccm at getit.de (Gofers F. Masturbate) Date: Sun, 22 Apr 2007 18:05:50 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0118012870.20070422180550@getit.de> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/daf6b2d4/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: diner.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/daf6b2d4/diner.gif From extreme_loco at getunderground.com Sun Apr 22 15:57:19 2007 From: extreme_loco at getunderground.com (Chosen P. Integration) Date: Sun, 22 Apr 2007 18:57:19 -0400 Subject: [Vtigercrm-commits] Looking for medications? Message-ID: <4501657792.20070422185719@getunderground.com> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://miskz.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From istafa at getsemani-estudios.com Sun Apr 22 16:42:26 2007 From: istafa at getsemani-estudios.com (Zones V. Predicative) Date: Sun, 22 Apr 2007 19:42:26 -0400 Subject: [Vtigercrm-commits] V1 agra vs sexual disorder Message-ID: <5561855686.20070422194226@getsemani-estudios.com> The most powerful medicines for you! Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. Suprax - $3- a medication belonging to a class of antibiotics called Cephalosporins. The active ingredient in Suprax is Cefixime. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extremeexc at grangerbernieropto.com Sun Apr 22 17:16:48 2007 From: extremeexc at grangerbernieropto.com (Hefts G. Producer) Date: Sun, 22 Apr 2007 20:16:48 -0400 Subject: [Vtigercrm-commits] Want to be the best with your girlfriend? Message-ID: <7889825130.20070422201648@grangerbernieropto.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://miskz.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From beyond at godofdomains.com Sun Apr 22 17:42:36 2007 From: beyond at godofdomains.com (Guardrails U. Dudgeon) Date: Sun, 22 Apr 2007 20:42:36 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9820245239.20070422204236@godofdomains.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/6e164697/attachment.htm From sebgui at ggosselin.com Sun Apr 22 18:19:43 2007 From: sebgui at ggosselin.com (Champed S. Kipling) Date: Sun, 22 Apr 2007 21:19:43 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <7630441768.20070422211943@ggosselin.com> Our Canada Pharmacy store presents top products that will make you healthy! You do not need to go to your local drug store, you can by here any pill that you need. Viagra, Cialis, Levitra, Valium, Phentermine, Tramadol, Xanax, HGH you can find them here: http://miskz.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From das at gleason-insurance.com Sun Apr 22 18:59:16 2007 From: das at gleason-insurance.com (Barlow J. Stung) Date: Sun, 22 Apr 2007 21:59:16 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1989954571.20070422215916@gleason-insurance.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/2af71517/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Solomon.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/2af71517/Solomon-0001.gif From agassia at grenix.com Sun Apr 22 19:16:09 2007 From: agassia at grenix.com (Faltering T. Grime) Date: Sun, 22 Apr 2007 22:16:09 -0400 Subject: [Vtigercrm-commits] To buy or not to buy? Message-ID: <3779252957.20070422221609@grenix.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://miskz.hk Completely secure and confidential purchase. Instant shipping worldwide. From a.hohnhorst at gothiapower.com Sun Apr 22 19:22:45 2007 From: a.hohnhorst at gothiapower.com (Goriest V. Dreamer) Date: Sun, 22 Apr 2007 22:22:45 -0400 Subject: [Vtigercrm-commits] On-line generic store Message-ID: <5508951118.20070422222245@gothiapower.com> The most powerful medicines for you! Allegra - $1.32 - an antihistamine that comes in a variety of strengths and formulations to provide relief from a wide range of seasonal allergy symptoms. Clearitol - $40.5 - specially formulated to help correct acne-causing internal imbalances in both adults and adolescents. Ultram - $1.83 - an analgesic used to treat or prevent pain. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From internet at globalpro.com Sun Apr 22 19:54:27 2007 From: internet at globalpro.com (Fliers J. Vaughan) Date: Sun, 22 Apr 2007 22:54:27 -0400 Subject: [Vtigercrm-commits] Perfect sex? It is possible! Message-ID: <5904643155.20070422225427@globalpro.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://miskz.hk Instant shipping worldwide! CONFIDENTIAL purchase! From bompane at girolama.com Sun Apr 22 20:48:57 2007 From: bompane at girolama.com (Vitiation L. Editorializing) Date: Sun, 22 Apr 2007 23:48:57 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6882506468.20070422234857@girolama.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/7d1715b2/attachment.html From maspelin at green1.force9.net Sun Apr 22 21:31:54 2007 From: maspelin at green1.force9.net (Incised Q. Carla) Date: Mon, 23 Apr 2007 00:31:54 -0400 Subject: [Vtigercrm-commits] Healthy life is your dream? Message-ID: <6268826963.20070423003154@green1.force9.net> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://miskz.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 22 22:04:13 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 23 Apr 2007 05:04:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10758 - in /vtigercrm/branches/5.0.3: Smarty/templates/ActivityEditView.tpl Smarty/templates/Header.tpl include/js/en_us.lang.js include/js/general.js modules/Calendar/language/en_us.lang.php modules/Calendar/script.js Message-ID: <20070423050414.190447DA7C9@vtiger.fosslabs.com> Author: richie Date: Sun Apr 22 23:03:58 2007 New Revision: 10758 Log: fix for Calendar : start date & time is not validated properly while creating an event with the status as planned. Fixes #3462 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl vtigercrm/branches/5.0.3/include/js/en_us.lang.js vtigercrm/branches/5.0.3/include/js/general.js vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Calendar/script.js Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl Sun Apr 22 23:03:58 2007 @@ -898,9 +898,9 @@ var fieldlabel = new Array('{$MOD.LBL_LIST_SUBJECT}','{$MOD.LBL_START_DATE}','{$MOD.LBL_TIME}','{$MOD.LBL_DUE_DATE}','{$MOD.LBL_STATUS}'); var fielddatatype = new Array('V~M','D~M~time_start','T~O','D~M~OTH~GE~date_start~Start Date & Time','V~O'); {else} - var fieldname = new Array('subject','date_start','due_date','taskpriority','sendnotification','parent_id','contact_id','reminder_time','recurringtype'); - var fieldlabel = new Array('{$MOD.LBL_LIST_SUBJECT}','{$MOD.LBL_START_DATE}','{$MOD.LBL_DUE_DATE}','{$MOD.Priority}','{$MOD.LBL_SENDNOTIFICATION}','{$MOD.LBL_RELATEDTO}','{$MOD.LBL_CONTACT_NAME}','{$MOD.LBL_SENDREMINDER}','{$MOD.Recurrence}'); - var fielddatatype = new Array('V~M','D~M','D~M~OTH~GE~date_start~Start Date','V~O','C~O','I~O','I~O','I~O','O~O'); + var fieldname = new Array('subject','date_start','time_start','due_date','eventstatus','taskpriority','sendnotification','parent_id','contact_id','reminder_time','recurringtype'); + var fieldlabel = new Array('{$MOD.LBL_LIST_SUBJECT}','{$MOD.LBL_START_DATE}','{$MOD.LBL_START_TIME}','{$MOD.LBL_DUE_DATE}','{$MOD.LBL_STATUS}','{$MOD.Priority}','{$MOD.LBL_SENDNOTIFICATION}','{$MOD.LBL_RELATEDTO}','{$MOD.LBL_CONTACT_NAME}','{$MOD.LBL_SENDREMINDER}','{$MOD.Recurrence}'); + var fielddatatype = new Array('V~M','D~M','T~O','D~M~OTH~GE~date_start~Start Date','V~O','V~O','C~O','I~O','I~O','I~O','O~O'); {/if} Modified: vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Mon Apr 23 04:10:34 2007 @@ -170,7 +170,7 @@ 'LBL_START_TIME' => 'Start Time', 'LBL_END_TIME' => 'End Time', 'LBL_START_DATE'=>'Start Date', -'LBL_START_TIME'=>'Time Start', +'LBL_TIME_START'=>'Time Start', 'LBL_DUE_DATE'=>'Due Date', 'LBL_START_DATE_TIME'=>'Start Date & Time', 'LBL_END_DATE_TIME'=>'End Date & Time', From issydhan at globeground-berlin.com Mon Apr 23 03:37:07 2007 From: issydhan at globeground-berlin.com (Tasting G. Treats) Date: Mon, 23 Apr 2007 06:37:07 -0400 Subject: [Vtigercrm-commits] Medications for US residents. Message-ID: <2538958591.20070423063707@globeground-berlin.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://miskz.hk Instant shipping worldwide! CONFIDENTIAL purchase! From atlantic at giftingprogram.net Mon Apr 23 03:58:18 2007 From: atlantic at giftingprogram.net (Deann E. Mickie) Date: Mon, 23 Apr 2007 06:58:18 -0400 Subject: [Vtigercrm-commits] Change your sexual life for the better Message-ID: <1723589447.20070423065818@giftingprogram.net> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://miskz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From shanglov at gersema.net Mon Apr 23 04:04:58 2007 From: shanglov at gersema.net (Quieting Q. Foiling) Date: Mon, 23 Apr 2007 07:04:58 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3518832265.20070423070458@gersema.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/63825143/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: America.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/63825143/America-0001.gif From ptyma at greentrees.com.au Mon Apr 23 05:29:24 2007 From: ptyma at greentrees.com.au (Motivates F. Horses) Date: Mon, 23 Apr 2007 08:29:24 -0400 Subject: [Vtigercrm-commits] US Drugs pharmacy Message-ID: <4177537110.20070423082924@greentrees.com.au> The most powerful medicines for you! Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. Zero Nicotine - $47.99 - innovative stop smoking patch designed to help you give up smoking safely and naturally. With its unique blend of ingredients, Zero Nicotine offers you the best possible chance to finally kick the deadly habit for good! If you are serious about your decision to quit smoking, you’ve come to the right place. Premium Diet Patch - $37.12 - Lose weight fast and safe with the most potent weight loss patch on the market today! and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 23 05:28:18 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 23 Apr 2007 12:28:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10762 - /vtigercrm/branches/5.0.3/Smarty/templates/ReportFilters.tpl Message-ID: <20070423122818.B29177DA7E8@vtiger.fosslabs.com> Author: richie Date: Mon Apr 23 06:28:05 2007 New Revision: 10762 Log: * Call the updatefOptions to show the applicable conditions only when edit the report, Fixed #3612 Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportFilters.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportFilters.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ReportFilters.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ReportFilters.tpl Mon Apr 23 06:28:05 2007 @@ -174,4 +174,14 @@ Calendar.setup ({inputField : "jscal_field_date_start", ifFormat : "%Y-%m-%d", showsTime : false, button : "jscal_trigger_date_start", singleClick : true, step : 1}); Calendar.setup ({inputField : "jscal_field_date_end", ifFormat : "%Y-%m-%d", showsTime : false, button : "jscal_trigger_date_end", singleClick : true, step : 1}); + + + {/literal} From audio at graftonland.org Mon Apr 23 06:06:04 2007 From: audio at graftonland.org (Languages Q. Kiddied) Date: Mon, 23 Apr 2007 09:06:04 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <0573112932.20070423090604@graftonland.org> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://siio.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From dance at glas.cork.rtsg.mot.com Mon Apr 23 06:06:40 2007 From: dance at glas.cork.rtsg.mot.com (Slit J. Braille) Date: Mon, 23 Apr 2007 09:06:40 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9206236579.20070423090640@glas.cork.rtsg.mot.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/7591db0c/attachment.htm From bryson at gervin.net Mon Apr 23 06:21:14 2007 From: bryson at gervin.net (Jock V. Dart) Date: Mon, 23 Apr 2007 09:21:14 -0400 Subject: [Vtigercrm-commits] Make your girlfriend happy. Message-ID: <7054886014.20070423092114@gervin.net> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://siio.hk Instant shipping worldwide! CONFIDENTIAL purchase! From bradshaw at globalvoiz.com Mon Apr 23 07:36:36 2007 From: bradshaw at globalvoiz.com (Assistance Q. Coccyx) Date: Mon, 23 Apr 2007 10:36:36 -0400 Subject: [Vtigercrm-commits] You need these pills. Message-ID: <1104796548.20070423103636@globalvoiz.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://siio.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From istashouse at gppedtdkq.shankscape.com Mon Apr 23 07:51:04 2007 From: istashouse at gppedtdkq.shankscape.com (Huffman P. Correctness) Date: Mon, 23 Apr 2007 10:51:04 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1583831498.20070423105104@gppedtdkq.shankscape.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/c3a1c9de/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: synapses.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/c3a1c9de/synapses.gif From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 23 07:56:14 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 23 Apr 2007 14:56:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10763 - in /vtigercrm/branches/5.0.3: Smarty/templates/CustomView.tpl include/js/en_us.lang.js modules/CustomView/CustomView.js modules/CustomView/CustomView.php modules/CustomView/EditView.php modules/CustomView/Save.php Message-ID: <20070423145614.5A0617DA7DA@vtiger.fosslabs.com> Author: richie Date: Mon Apr 23 08:56:01 2007 New Revision: 10763 Log: fix for customview-filter related issue. Fixes #3485 #3456 #3579 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl vtigercrm/branches/5.0.3/include/js/en_us.lang.js vtigercrm/branches/5.0.3/modules/CustomView/CustomView.js vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php vtigercrm/branches/5.0.3/modules/CustomView/EditView.php vtigercrm/branches/5.0.3/modules/CustomView/Save.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl Mon Apr 23 08:56:01 2007 @@ -22,6 +22,7 @@ + @@ -456,7 +469,7 @@ - + {$AND_TEXT1} + - + {$AND_TEXT2} + - + {$AND_TEXT3} + - + {$AND_TEXT4} + - + {$AND_TEXT5} + {*section name=advancedFilter start=1 loop=6 step=1} @@ -635,5 +653,25 @@ return true; } checkDuplicate(); +function stdfilterdateValidate() +{ + if(!dateValidate("startdate",alert_arr.STDFILTER+" - "+alert_arr.STARTDATE,"OTH")) + { + getObj("startdate").focus() + return false; + } + else if(!dateValidate("enddate",alert_arr.STDFILTER+" - "+alert_arr.ENDDATE,"OTH")) + { + getObj("enddate").focus() + return false; + } + else + { + if (!dateComparison("enddate",alert_arr.STDFILTER+" - "+alert_arr.ENDDATE,"startdate",alert_arr.STDFILTER+" - "+alert_arr.STARTDATE,"GE")) { + getObj("enddate").focus() + return false + } else return true; + } +} {/literal} Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Mon Apr 23 08:56:01 2007 @@ -120,6 +120,7 @@ START_DATE_TIME : 'Start Date & Time', START_TIME : 'Start Time', DATE_SHOULDNOT_PAST :'Current date & time for Activities with status as Planned', - TIME_SHOULDNOT_PAST :'Current Time for Activities with status as Planned' + TIME_SHOULDNOT_PAST :'Current Time for Activities with status as Planned', + LBL_AND : 'And' }; Modified: vtigercrm/branches/5.0.3/modules/CustomView/CustomView.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/CustomView.js (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/CustomView.js Mon Apr 23 08:56:01 2007 @@ -20,6 +20,24 @@ var currOption = selObj.options[selObj.selectedIndex]; var currField = sel.options[sel.selectedIndex]; + + var fld = currField.value.split(":"); + var tod = fld[4]; + if(fld[4] == 'D' || (fld[4] == 'T' && fld[1] != 'time_start' && fld[1] != 'time_end') || fld[4] == 'DT') + { + $("and"+sel.id).innerHTML = ""; + if(sel.id != "fcol5") + $("and"+sel.id).innerHTML = "("+$("user_dateformat").value+") "+alert_arr.LBL_AND; + else + $("and"+sel.id).innerHTML = "("+$("user_dateformat").value+") "; + } + else { + $("and"+sel.id).innerHTML = ""; + if(sel.id != "fcol5") + $("and"+sel.id).innerHTML = " "+alert_arr.LBL_AND; + else + $("and"+sel.id).innerHTML = " "; + } if(currField.value != null && currField.value.length != 0) { Modified: vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php Mon Apr 23 08:56:01 2007 @@ -536,16 +536,20 @@ if (type!="custom") { document.CustomView.startdate.readOnly=true - document.CustomView.enddate.readOnly=true - getObj("jscal_trigger_date_start").style.visibility="hidden" - getObj("jscal_trigger_date_end").style.visibility="hidden" + document.CustomView.enddate.readOnly=true + getObj("jscal_trigger_date_start").style.visibility="hidden" + getObj("jscal_trigger_date_end").style.visibility="hidden" + getObj("jscal_trigger_start_format").style.visibility="hidden" + getObj("jscal_trigger_end_format").style.visibility="hidden" } else { document.CustomView.startdate.readOnly=false - document.CustomView.enddate.readOnly=false - getObj("jscal_trigger_date_start").style.visibility="visible" - getObj("jscal_trigger_date_end").style.visibility="visible" + document.CustomView.enddate.readOnly=false + getObj("jscal_trigger_date_start").style.visibility="visible" + getObj("jscal_trigger_date_end").style.visibility="visible" + getObj("jscal_trigger_start_format").style.visibility="visible" + getObj("jscal_trigger_end_format").style.visibility="visible" } if( type == "today" ) { @@ -719,7 +723,6 @@ $stdfilterlist["startdate"] = $datefilter[0]; $stdfilterlist["enddate"] = $datefilter[1]; } - return $stdfilterlist; } @@ -747,7 +750,6 @@ $advft["value"] = $advfilterrow["value"]; $advfilterlist[] = $advft; } - return $advfilterlist; } Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Mon Apr 23 08:56:01 2007 @@ -39,7 +39,8 @@ $smarty->assign("MODULE",$cv_module); $smarty->assign("CVMODULE", $cv_module); $smarty->assign("CUSTOMVIEWID",$recordid); -$smarty->assign("DATAFORMAT",$current_user->date_format); +$smarty->assign("DATEFORMAT",$current_user->date_format); +$smarty->assign("JS_DATEFORMAT",parse_calendardate($app_strings['NTC_DATE_FORMAT'])); if($recordid == "") { $oCustomView = new CustomView(); @@ -111,8 +112,14 @@ if(isset($stdfilterlist["startdate"]) && isset($stdfilterlist["enddate"])) { - $smarty->assign("STARTDATE",$stdfilterlist["startdate"]); - $smarty->assign("ENDDATE",$stdfilterlist["enddate"]); + if($stdfilterhtml[0]['value'] == 'custom') + { + $smarty->assign("STARTDATE",getDisplayDate($stdfilterlist["startdate"])); + $smarty->assign("ENDDATE",getDisplayDate($stdfilterlist["enddate"])); + }else{ + $smarty->assign("STARTDATE",$stdfilterlist["startdate"]); + $smarty->assign("ENDDATE",$stdfilterlist["enddate"]); + } } $advfilterlist = $oCustomView->getAdvFilterByCvid($recordid); @@ -123,7 +130,19 @@ $advcolumnhtml = getByModule_ColumnsHTML($cv_module,$modulecollist,$advfilterlist[$i-1]["columnname"]); $smarty->assign("FOPTION".$i,$advfilterhtml); $smarty->assign("BLOCK".$i,$advcolumnhtml); + $col = explode(":",$advfilterlist[$i-1]["columnname"]); + $temp_val = explode(",",$advfilterlist[$i-1]["value"]); + $and_text = " ".$mod_strings['LBL_AND']; + if($col[4] == 'D' || ($col[4] == 'T' && $col[1] != 'time_start' && $col[1] != 'time_end') || $col[4] == 'DT') + { + $val = Array(); + for($x=0;$xdate_format.") ".$mod_strings['LBL_AND']; + } $smarty->assign("VALUE".$i,$advfilterlist[$i-1]["value"]); + $smarty->assign("AND_TEXT".$i,$and_text); } $smarty->assign("STDFILTERCOLUMNS",$stdfiltercolhtml); Modified: vtigercrm/branches/5.0.3/modules/CustomView/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/Save.php Mon Apr 23 08:56:01 2007 @@ -55,8 +55,13 @@ $stdcriteria = $_REQUEST["stdDateFilter"]; $std_filter_list["stdfilter"] = $stdcriteria; $startdate = $_REQUEST["startdate"]; + $enddate = $_REQUEST["enddate"]; + if($stdcriteria == "custom") + { + $startdate = getDBInsertDateValue($startdate); + $enddate = getDBInsertDateValue($enddate); + } $std_filter_list["startdate"] = $startdate; - $enddate = $_REQUEST["enddate"]; $std_filter_list["enddate"]=$enddate; //<<<<<<>>>>>>>> @@ -69,7 +74,6 @@ $adv_filter_col[] = $_REQUEST[$allKeys[$i]]; } } - for ($i=0;$i From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 23 08:28:39 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 23 Apr 2007 15:28:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10765 - in /vtigercrm/branches/5.0.3: data/CRMEntity.php modules/Contacts/Contacts.php modules/Emails/Emails.php modules/HelpDesk/HelpDesk.php modules/Notes/Notes.php modules/Products/Products.php Message-ID: <20070423152839.C0C9479C6AD@vtiger.fosslabs.com> Author: richie Date: Mon Apr 23 09:28:26 2007 New Revision: 10765 Log: * Fixed the issue with attachment becuase of not null constraint, Fixed #3673 Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php vtigercrm/branches/5.0.3/modules/Emails/Emails.php vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.php vtigercrm/branches/5.0.3/modules/Notes/Notes.php vtigercrm/branches/5.0.3/modules/Products/Products.php Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/5.0.3/data/CRMEntity.php (original) +++ vtigercrm/branches/5.0.3/data/CRMEntity.php Mon Apr 23 09:28:26 2007 @@ -654,8 +654,18 @@ $fieldcolname = $adb->query_result($result1,$i,"columnname"); $tablename = $adb->query_result($result1,$i,"tablename"); $fieldname = $adb->query_result($result1,$i,"fieldname"); - - $fld_value = $adb->query_result($result[$tablename],0,$fieldcolname); + + //when we don't have entry in the $tablename then we have to avoid retrieve, otherwise adodb error will occur(ex. when we don't have attachment for troubletickets, $result[vtiger_attachments] will not be set so here we should not retrieve) + if(isset($result[$tablename])) + { + $fld_value = $adb->query_result($result[$tablename],0,$fieldcolname); + } + else + { + $adb->println("There is no entry for this entity $record ($module) in the table $tablename"); + $fld_value = ""; + } + $this->column_fields[$fieldname] = $fld_value; Modified: vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php (original) +++ vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php Mon Apr 23 09:28:26 2007 @@ -40,8 +40,8 @@ var $db; var $table_name = "contactdetails"; - var $tab_name = Array('vtiger_crmentity','vtiger_contactdetails','vtiger_contactaddress','vtiger_contactsubdetails','vtiger_contactscf','vtiger_customerdetails','vtiger_attachments'); - var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_contactdetails'=>'contactid','vtiger_contactaddress'=>'contactaddressid','vtiger_contactsubdetails'=>'contactsubscriptionid','vtiger_contactscf'=>'contactid','vtiger_customerdetails'=>'customerid','vtiger_attachments'=>'attachmentsid'); + var $tab_name = Array('vtiger_crmentity','vtiger_contactdetails','vtiger_contactaddress','vtiger_contactsubdetails','vtiger_contactscf','vtiger_customerdetails'); + var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_contactdetails'=>'contactid','vtiger_contactaddress'=>'contactaddressid','vtiger_contactsubdetails'=>'contactsubscriptionid','vtiger_contactscf'=>'contactid','vtiger_customerdetails'=>'customerid'); Modified: vtigercrm/branches/5.0.3/modules/Emails/Emails.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/Emails.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/Emails.php Mon Apr 23 09:28:26 2007 @@ -46,7 +46,7 @@ var $tab_name = Array('vtiger_crmentity','vtiger_activity'); - var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_activity'=>'activityid','vtiger_seactivityrel'=>'activityid','vtiger_cntactivityrel'=>'activityid','vtiger_attachments'=>'attachmentsid'); + var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_activity'=>'activityid','vtiger_seactivityrel'=>'activityid','vtiger_cntactivityrel'=>'activityid'); // This is the list of vtiger_fields that are in the lists. var $list_fields = Array( Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.php (original) +++ vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.php Mon Apr 23 09:28:26 2007 @@ -25,7 +25,7 @@ var $db; var $tab_name = Array('vtiger_crmentity','vtiger_troubletickets','vtiger_ticketcf'); - var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_troubletickets'=>'ticketid','vtiger_seticketsrel'=>'ticketid','vtiger_ticketcf'=>'ticketid','vtiger_ticketcomments'=>'ticketid','vtiger_attachments'=>'attachmentsid'); + var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_troubletickets'=>'ticketid','vtiger_seticketsrel'=>'ticketid','vtiger_ticketcf'=>'ticketid','vtiger_ticketcomments'=>'ticketid'); var $column_fields = Array(); var $sortby_fields = Array('title','status','priority','crmid','firstname','smownerid'); Modified: vtigercrm/branches/5.0.3/modules/Notes/Notes.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Notes/Notes.php (original) +++ vtigercrm/branches/5.0.3/modules/Notes/Notes.php Mon Apr 23 09:28:26 2007 @@ -35,8 +35,8 @@ var $default_note_name_dom = array('Meeting vtiger_notes', 'Reminder'); - var $tab_name = Array('vtiger_crmentity','vtiger_notes','vtiger_attachments'); - var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_notes'=>'notesid','vtiger_senotesrel'=>'notesid','vtiger_attachments'=>'attachmentsid'); + var $tab_name = Array('vtiger_crmentity','vtiger_notes'); + var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_notes'=>'notesid','vtiger_senotesrel'=>'notesid'); var $column_fields = Array(); Modified: vtigercrm/branches/5.0.3/modules/Products/Products.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Products/Products.php (original) +++ vtigercrm/branches/5.0.3/modules/Products/Products.php Mon Apr 23 09:28:26 2007 @@ -32,8 +32,8 @@ ); - var $tab_name = Array('vtiger_crmentity','vtiger_products','vtiger_productcf','vtiger_attachments'); - var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_products'=>'productid','vtiger_productcf'=>'productid','vtiger_seproductsrel'=>'productid','vtiger_producttaxrel'=>'productid','vtiger_attachments'=>'attachmentsid'); + var $tab_name = Array('vtiger_crmentity','vtiger_products','vtiger_productcf'); + var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_products'=>'productid','vtiger_productcf'=>'productid','vtiger_seproductsrel'=>'productid','vtiger_producttaxrel'=>'productid'); var $column_fields = Array(); var $sortby_fields = Array('productname','productcode','commissionrate'); From extrasen at grmc-online.com Mon Apr 23 09:18:38 2007 From: extrasen at grmc-online.com (Evaporation V. Compensations) Date: Mon, 23 Apr 2007 12:18:38 -0400 Subject: [Vtigercrm-commits] Only our pharmacy gives the results like that Message-ID: <1019729739.20070423121838@grmc-online.com> The most powerful medicines for you! Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. Zinc - $35.99 - naturally produced by human organism mineral. Zinc is important for growth and for the development and health of body tissues. Lipitor - $1.42 - used with diet changes to reduce the amount of cholesterol and certain fatty substances in the blood. Lowering blood levels of cholesterol and fats may help to prevent heart disease, angina, strokes, and heart attacks. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From ldmead at graffinity.com Mon Apr 23 09:20:25 2007 From: ldmead at graffinity.com (Gallantry P. Islam) Date: Mon, 23 Apr 2007 12:20:25 -0400 Subject: [Vtigercrm-commits] Read it twice and tell to your friends! Message-ID: <2331138718.20070423122025@graffinity.com> The most powerful medicines for you! Glucosamine - $35.99 - used in case of the alleviation of the symptoms of arthritis. Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. Premium Diet Patch - $37.12 - Lose weight fast and safe with the most potent weight loss patch on the market today! and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extremists at globalbeautyconcepts.com Mon Apr 23 09:40:24 2007 From: extremists at globalbeautyconcepts.com (Floweriness G. Memoirs) Date: Mon, 23 Apr 2007 12:40:24 -0400 Subject: [Vtigercrm-commits] Disappointed with your sexual health? Message-ID: <3412472950.20070423124024@globalbeautyconcepts.com> Make your dreams come true with licensed medications from US Drug Store! Any pills at your choice. There is no need to visit your local drug store at all. http://siio.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From issybel at greenbush.k12.mn.us Mon Apr 23 09:34:19 2007 From: issybel at greenbush.k12.mn.us (Robert Washington) Date: Mon, 23 Apr 2007 16:34:19 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <0957940630.20070423163419@greenbush.k12.mn.us> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/04a98f79/attachment.html From selectioncommittee at glbtccu.org Mon Apr 23 09:44:58 2007 From: selectioncommittee at glbtccu.org (Ingestion U. Acton) Date: Mon, 23 Apr 2007 12:44:58 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7558142939.20070423124458@glbtccu.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/faee5689/attachment.html From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 23 09:40:05 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 23 Apr 2007 16:40:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10766 - /vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Message-ID: <20070423164005.D463079C6AD@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 23 10:40:00 2007 New Revision: 10766 Log: Advanced search - Searching for empty string not working properly- fixed. Fixes #3503 Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Mon Apr 23 10:40:00 2007 @@ -519,43 +519,36 @@ { global $log; $log->debug("Entering getSearch_criteria(".$criteria.",".$searchstring.",".$searchfield.") method ..."); + $searchstring = ltrim(rtrim($searchstring)); $where_string = ''; switch($criteria) { case 'cts': $where_string = $searchfield." like '%".$searchstring."%' "; if($searchstring == NULL) - $where_string = $searchfield." is NULL"; + $where_string = $searchfield." like ''"; break; case 'dcts': $where_string = $searchfield." not like '%".$searchstring."%' "; if($searchstring == NULL) - $where_string = $searchfield." is not NULL"; + $where_string = $searchfield." not like ''"; break; case 'is': $where_string = $searchfield." = '".$searchstring."' "; - if($searchstring == NULL) - $where_string = $searchfield." is NULL"; break; case 'isn': $where_string = $searchfield." <> '".$searchstring."' "; - if($searchstring == NULL) - $where_string = $searchfield." is not NULL"; break; case 'bwt': $where_string = $searchfield." like '".$searchstring."%' "; - if($searchstring == NULL) - $where_string = $searchfield." is NULL"; break; case 'ewt': $where_string = $searchfield." like '%".$searchstring."' "; - if($searchstring == NULL) - $where_string = $searchfield." is NULL"; break; case 'grt': From isteiner at gillrecords.com Mon Apr 23 10:11:07 2007 From: isteiner at gillrecords.com (Swoons V. Trickier) Date: Mon, 23 Apr 2007 13:11:07 -0400 Subject: [Vtigercrm-commits] Make your girlfriend happy. Message-ID: <3845100052.20070423131107@gillrecords.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://siio.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From bev at goldmail.net Mon Apr 23 10:49:46 2007 From: bev at goldmail.net (Berate U. Tangent) Date: Mon, 23 Apr 2007 13:49:46 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7614314111.20070423134946@goldmail.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/719a4876/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: truisms.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/719a4876/truisms.gif From amadeus at gopacific.net Mon Apr 23 11:05:25 2007 From: amadeus at gopacific.net (Dichotomy B. Hierarchies) Date: Mon, 23 Apr 2007 14:05:25 -0400 Subject: [Vtigercrm-commits] Best medications, best prices! Message-ID: <6485275184.20070423140525@gopacific.net> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://siio.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From mullins at globaltrim.com Mon Apr 23 11:41:25 2007 From: mullins at globaltrim.com (Terse J. Exaggerates) Date: Mon, 23 Apr 2007 14:41:25 -0400 Subject: [Vtigercrm-commits] Why should you pay more? Message-ID: <1388566115.20070423144125@globaltrim.com> The most powerful medicines for you! Pure Natural Hoodia - $35.99 - Pure Natural Hoodia is a natural weght loss pill containing Hoodia Gordoni extract. Valtrex - $4.95 - reduce the risk of spreading genital herpes Pheromone cologne for men - $35.99 - The human pheromones that attracts females has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of men, these natural pheromones are an evolutionary remnant from a time when human females relied on scent to locate male mates. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From www at glazegroup.com Mon Apr 23 11:54:53 2007 From: www at glazegroup.com (Prow I. Amphitheater) Date: Mon, 23 Apr 2007 14:54:53 -0400 Subject: [Vtigercrm-commits] Want to be healthy? U can! Message-ID: <0042365402.20070423145453@glazegroup.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://siio.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 23 12:05:10 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 23 Apr 2007 19:05:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10767 - /vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Message-ID: <20070423190510.A70807C8177@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 23 13:05:06 2007 New Revision: 10767 Log: Account Name in listview header invisible to non-admin user Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Mon Apr 23 13:05:06 2007 @@ -75,6 +75,10 @@ $fieldname = $oCv->list_fields_name[$name]; } } + if($fieldname == 'accountname') + { + $fieldname = 'account_id'; + } if($j != 0) { $field_list .= ', '; @@ -123,6 +127,11 @@ if(isset($oCv->list_fields_name)) { $fieldname = $oCv->list_fields_name[$name]; + if($fieldname == 'accountname') + { + $fieldname = 'account_id'; + } + }else { $fieldname = $focus->list_fields_name[$name]; @@ -198,13 +207,12 @@ } } //added to display vtiger_currency symbol in related listview header - if($name =='Amount' && $relatedlist !='' ) + if($name =='Amount' && $relatedlist !='' ) { $rate_symbol=getCurrencySymbolandCRate($user_info['currency_id']); $curr_symbol = $rate_symbol['symbol']; $name .=' (in '.$curr_symbol.')'; } - //Added condition to hide the close column in Related Lists if($name == $app_strings['Close'] && $relatedlist != '' && $relatedlist != 'global') { @@ -491,6 +499,11 @@ $fieldname = $oCv->list_fields_name[$name]; } } + if($fieldname == 'accountname') + { + $fieldname = 'account_id'; + } + if($j != 0) { $field_list .= ', '; @@ -601,11 +614,14 @@ if(isset($oCv->list_fields_name)) { $fieldname = $oCv->list_fields_name[$name]; + if($fieldname == 'accountname') + { + $fieldname = 'account_id'; + } } } if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || in_array($fieldname,$field) || $fieldname == '') { - if($fieldname == '') From ptyma at gopherelectronics.com Mon Apr 23 12:58:38 2007 From: ptyma at gopherelectronics.com (Brubeck T. Postulate) Date: Mon, 23 Apr 2007 15:58:38 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3356889652.20070423155838@gopherelectronics.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/f729e6c9/attachment.htm From kat at gibbsconstruction.net Mon Apr 23 13:11:06 2007 From: kat at gibbsconstruction.net (Wildflower V. Epistemology) Date: Mon, 23 Apr 2007 16:11:06 -0400 Subject: [Vtigercrm-commits] Want to be a hero in a bed? Message-ID: <4170006879.20070423161106@gibbsconstruction.net> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://siio.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From istobigal at gobigvideo.com Mon Apr 23 13:42:38 2007 From: istobigal at gobigvideo.com (Virology I. Cradling) Date: Mon, 23 Apr 2007 16:42:38 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8042816484.20070423164238@gobigvideo.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/9d2eb75c/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: balanced.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/9d2eb75c/balanced-0001.gif From kurt.jaeger at greengrocerythemovie.com Mon Apr 23 14:41:20 2007 From: kurt.jaeger at greengrocerythemovie.com (Enameling F. Observational) Date: Mon, 23 Apr 2007 17:41:20 -0400 Subject: [Vtigercrm-commits] Worry about your erection? Message-ID: <5775628738.20070423174120@greengrocerythemovie.com> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://siio.hk Make right choice: buy medications at LegalRXMedications drug store! From extroverted at glogistics.net Mon Apr 23 15:06:20 2007 From: extroverted at glogistics.net (Incubators S. Vindictiveness) Date: Mon, 23 Apr 2007 18:06:20 -0400 Subject: [Vtigercrm-commits] Only our pharmacy gives the results like that Message-ID: <5752520329.20070423180620@glogistics.net> The most powerful medicines for you! Proscar - $1.07 - helps shrink the prostate in many men. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From isthatwild at grid-eu.com Mon Apr 23 15:36:31 2007 From: isthatwild at grid-eu.com (Strangles D. Exulted) Date: Mon, 23 Apr 2007 18:36:31 -0400 Subject: [Vtigercrm-commits] Medications that you need. Message-ID: <6980635155.20070423183631@grid-eu.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://siio.hk Verified by VISA and sell FDA Approved Drugs only! From roger at greatbaymortgage.com Mon Apr 23 15:43:17 2007 From: roger at greatbaymortgage.com (Amorality H. Clog) Date: Mon, 23 Apr 2007 18:43:17 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7028631473.20070423184317@greatbaymortgage.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/6b9a8b45/attachment.html From simonrpalmer at gpsllqdlj.shankscape.com Mon Apr 23 16:58:13 2007 From: simonrpalmer at gpsllqdlj.shankscape.com (Culprits Q. Acquisitions) Date: Mon, 23 Apr 2007 19:58:13 -0400 Subject: [Vtigercrm-commits] Any health troubles? Message-ID: <7965917746.20070423195813@gpsllqdlj.shankscape.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://siio.hk ONLY! From hollingsworth at graphicdet.com Mon Apr 23 17:20:21 2007 From: hollingsworth at graphicdet.com (Dabblers A. Horrendous) Date: Mon, 23 Apr 2007 20:20:21 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3801076420.20070423202021@graphicdet.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/df27ad3c/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: flaunts.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/df27ad3c/flaunts.gif From baird at getassessed.com Mon Apr 23 17:43:21 2007 From: baird at getassessed.com (Obtainable C. Newsreel) Date: Mon, 23 Apr 2007 20:43:21 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <4717115697.20070423204321@getassessed.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://siio.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From issycee at goldcoastafrica.com Mon Apr 23 18:38:27 2007 From: issycee at goldcoastafrica.com (Disarranges V. Redirected) Date: Mon, 23 Apr 2007 21:38:27 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <0135706375.20070423213827@goldcoastafrica.com> The most powerful medicines for you! Pure Natural Hoodia - $35.99 - Pure Natural Hoodia is a natural weght loss pill containing Hoodia Gordoni extract. Lipitor - $1.42 - used with diet changes to reduce the amount of cholesterol and certain fatty substances in the blood. Lowering blood levels of cholesterol and fats may help to prevent heart disease, angina, strokes, and heart attacks. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From alberto at glas-huege.de Mon Apr 23 18:50:18 2007 From: alberto at glas-huege.de (Consignment C. Accent) Date: Mon, 23 Apr 2007 21:50:18 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <6552589043.20070423215018@glas-huege.de> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://siio.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From istacie at gluten.net Mon Apr 23 18:50:51 2007 From: istacie at gluten.net (Heyday T. Pennington) Date: Mon, 23 Apr 2007 21:50:51 -0400 Subject: [Vtigercrm-commits] Disappointed with your sexual health? Message-ID: <8024283539.20070423215051@gluten.net> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://siio.hk verified by VISA and certified by CIPA. From team at greenwichedprep.com Mon Apr 23 19:09:39 2007 From: team at greenwichedprep.com (Phosphorescent V. Snapping) Date: Mon, 23 Apr 2007 22:09:39 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2357905386.20070423220939@greenwichedprep.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/a7e13d9b/attachment.htm From crusherdr at getthedeed.com Mon Apr 23 19:13:18 2007 From: crusherdr at getthedeed.com (Wycliffe K. Goldener) Date: Mon, 23 Apr 2007 22:13:18 -0400 Subject: [Vtigercrm-commits] Why don't you buy some medications to be healthy? Message-ID: <7306520321.20070423221318@getthedeed.com> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://siio.hk Only Secure and Confidential purchase! Verified buy VISA! From afox at golfukraine.com Mon Apr 23 19:51:40 2007 From: afox at golfukraine.com (Banters E. Popcorn) Date: Mon, 23 Apr 2007 22:51:40 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4333125842.20070423225140@golfukraine.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/501c83ac/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: guzzler.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/501c83ac/guzzler.gif From elaine at giardiniangelo.com Mon Apr 23 19:57:34 2007 From: elaine at giardiniangelo.com (Natalie Ball) Date: Tue, 24 Apr 2007 02:57:34 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <7724400570.20070424025734@giardiniangelo.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/44aadb13/attachment.html From mjckjc at goalamo.com Mon Apr 23 20:50:27 2007 From: mjckjc at goalamo.com (Soldering P. Walleye) Date: Mon, 23 Apr 2007 23:50:27 -0400 Subject: [Vtigercrm-commits] Can you imagine that you are healthy? Message-ID: <9542905009.20070423235027@goalamo.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://siio.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From ims at grinningmoray.com Mon Apr 23 21:48:07 2007 From: ims at grinningmoray.com (Misted R. Pusher) Date: Tue, 24 Apr 2007 00:48:07 -0400 Subject: [Vtigercrm-commits] V1 agra vs sexual disorder Message-ID: <2959443406.20070424004807@grinningmoray.com> The most powerful medicines for you! Cumpills - are a great concept formulated by our highly trained speclalists working in the field of natural therapy. Using the knowledge of thousands of years of cumulative research in herbals, this specially designed formula helps in achieving high levels of semen volume and quality. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. 100% Pure Okinawan Coral Calcium - $35.99 - the preferred source for readily absorbable and accessible calcium in the body. Superior 100% pure coral calcium is harvested from Okinawa, Japan – home to the longest-lived people on earth. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From aaitl at glasswillow.com Mon Apr 23 22:09:03 2007 From: aaitl at glasswillow.com (Grandees Q. Swampier) Date: Tue, 24 Apr 2007 01:09:03 -0400 Subject: [Vtigercrm-commits] Don't have time to visit local drug store? Message-ID: <8814832045.20070424010903@glasswillow.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://siio.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From gardenly at goldica.com Mon Apr 23 22:22:46 2007 From: gardenly at goldica.com (Noncompliance E. Romano) Date: Tue, 24 Apr 2007 01:22:46 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5027105976.20070424012246@goldica.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/cbf1b5bd/attachment.html From littlenomad at gousainc.com Mon Apr 23 22:28:09 2007 From: littlenomad at gousainc.com (Unroll T. Delightfully) Date: Tue, 24 Apr 2007 01:28:09 -0400 Subject: [Vtigercrm-commits] Unbelievable prices! Message-ID: <6413812862.20070424012809@gousainc.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft – the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://siio.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From istandridge at goldgic.com Mon Apr 23 23:07:27 2007 From: istandridge at goldgic.com (Wolfhound J. Hutched) Date: Tue, 24 Apr 2007 02:07:27 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3661906317.20070424020727@goldgic.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/beb3351d/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: exam.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/beb3351d/exam.gif From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 23 23:03:27 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 06:03:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10768 - in /vtigercrm/branches/5.0.3/include: RelatedListView.php utils/ListViewUtils.php Message-ID: <20070424060327.B94D27DA7EB@vtiger.fosslabs.com> Author: richie Date: Tue Apr 24 00:03:02 2007 New Revision: 10768 Log: fix for notes list misplace issue. Fixes #3274 #3320 --minnie Modified: vtigercrm/branches/5.0.3/include/RelatedListView.php vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Modified: vtigercrm/branches/5.0.3/include/RelatedListView.php ============================================================================== --- vtigercrm/branches/5.0.3/include/RelatedListView.php (original) +++ vtigercrm/branches/5.0.3/include/RelatedListView.php Tue Apr 24 00:03:02 2007 @@ -305,7 +305,7 @@ { $entries[] = ""; } - + $row['description'] = preg_replace("/(<\/?)(\w+)([^>]*>)/i","",$row['description']); if(strlen($row['description']) > 40) { $row['description'] = substr($row['description'],0,40).'...'; Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Tue Apr 24 00:03:02 2007 @@ -1082,12 +1082,11 @@ } //Ends $field_val = $adb->query_result($list_result,$list_result_count,$colname); - $temp_val = $field_val; + $temp_val = preg_replace("/(<\/?)(\w+)([^>]*>)/i","",$field_val); if(strlen($field_val) > 40) { - $temp_val = substr($field_val,0,40).'...'; + $temp_val = substr(preg_replace("/(<\/?)(\w+)([^>]*>)/i","",$field_val),0,40).'...'; } - if($uitype == 53) { $value = $adb->query_result($list_result,$list_result_count,'user_name'); From lorim at gestoriamas.net Tue Apr 24 00:12:55 2007 From: lorim at gestoriamas.net (Orion E. Treachery) Date: Tue, 24 Apr 2007 03:12:55 -0400 Subject: [Vtigercrm-commits] Want to cure yourself? Message-ID: <9763566836.20070424031255@gestoriamas.net> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://siio.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 24 00:32:54 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 07:32:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10769 - in /vtigercrm/branches/5.0.3: include/utils/ListViewUtils.php modules/Calendar/calendarLayout.php Message-ID: <20070424073254.B49227C8101@vtiger.fosslabs.com> Author: richie Date: Tue Apr 24 01:32:41 2007 New Revision: 10769 Log: fix for Calendar: Related To ,Contact and Status in List View. Fixes #3617 --minnie Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Tue Apr 24 01:32:41 2007 @@ -102,14 +102,16 @@ INNER JOIN vtiger_profile2field ON vtiger_profile2field.fieldid = vtiger_field.fieldid INNER JOIN vtiger_def_org_field - ON vtiger_def_org_field.fieldid = vtiger_field.fieldid - WHERE vtiger_field.tabid = ".$tabid." - AND vtiger_profile2field.visible = 0 + ON vtiger_def_org_field.fieldid = vtiger_field.fieldid"; + if($module == "Calendar") + $query .=" WHERE vtiger_field.tabid in (9,16)"; + else + $query .=" WHERE vtiger_field.tabid =".$tabid; + $query.=" AND vtiger_profile2field.visible = 0 AND vtiger_def_org_field.visible = 0 AND vtiger_profile2field.profileid IN ".$profileList." AND vtiger_field.fieldname IN ".$field_list; } - $result = $adb->query($query); for($k=0;$k < $adb->num_rows($result);$k++) { @@ -221,7 +223,17 @@ else { - $list_header[]=$name; + if($module == "Calendar" && $name == $app_strings['Close']) + { + if((getFieldVisibilityPermission('Events',$current_user->id,'eventstatus') == '0') || (getFieldVisibilityPermission('Calendar',$current_user->id,'taskstatus') == '0')) + { + array_push($list_header,$name); + } + } + else + { + $list_header[]=$name; + } } } } @@ -777,7 +789,15 @@ } else { - $list_header[] = $value; + if($module == "Calendar" && $name == $app_strings['Close']) + { + if((getFieldVisibilityPermission('Events',$current_user->id,'eventstatus') == '0') || (getFieldVisibilityPermission('Calendar',$current_user->id,'taskstatus') == '0')) + { + array_push($list_header,$value); + } + } + else + $list_header[] = $value; } if($fieldname=='filename') { Modified: vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php Tue Apr 24 01:32:41 2007 @@ -1334,14 +1334,22 @@ $image_tag = " ".$app_strings['Meeting']; $element['eventtype'] = $image_tag; $element['eventdetail'] = $contact_data." ".$subject." ".$more_link; - $element['relatedto']= getRelatedTo('Calendar',$result,$i); + if(getFieldVisibilityPermission('Events',$current_user->id,'parent_id') == '0') + { + $element['relatedto']= getRelatedTo('Calendar',$result,$i); + } + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete")=="yes") $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->get_formatted_date()."\",\"event\",\"".$idShared."\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; - $element['status'] = $mod_strings[$adb->query_result($result,$i,"eventstatus")]; + if(getFieldVisibilityPermission('Events',$current_user->id,'eventstatus') == '0') + { + $element['status'] = $mod_strings[$adb->query_result($result,$i,"eventstatus")]; + } if(!empty($assignedto)) $element['assignedto'] = $assignedto; else $element['assignedto'] = $adb->query_result($result,$i,"groupname"); + $Entries[] = $element; } @@ -1442,9 +1450,18 @@ $status = $adb->query_result($result,$i,"status"); $more_link = "".$subject.""; $element['tododetail'] = $more_link; - $element['task_relatedto'] = getRelatedTo('Calendar',$result,$i); - $element['task_contact'] = "".$contact_name.""; - $element['status'] = $adb->query_result($result,$i,"status"); + if(getFieldVisibilityPermission('Calendar',$current_user->id,'parent_id') == '0') + { + $element['task_relatedto'] = getRelatedTo('Calendar',$result,$i); + } + if(getFieldVisibilityPermission('Calendar',$current_user->id,'contact_id') == '0') + { + $element['task_contact'] = "".$contact_name.""; + } + if(getFieldVisibilityPermission('Calendar',$current_user->id,'taskstatus') == '0') + { + $element['status'] = $adb->query_result($result,$i,"status"); + } if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->get_formatted_date()."\",\"todo\",\"normal\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; $assignedto = $adb->query_result($result,$i,"user_name"); @@ -1516,30 +1533,32 @@ '1'=>$start_datetime, '2'=>$end_datetime, '3'=>$mod_strings['LBL_EVENTTYPE'], - '4'=>$mod_strings['LBL_EVENTDETAILS'], - '5'=>$mod_strings['LBL_RELATEDTO'], - ); - if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") - { - array_push($header,$mod_strings['LBL_ACTION']); - } - - array_push($header,$mod_strings['LBL_STATUS'],$mod_strings['LBL_ASSINGEDTO']); - $header_width = Array('0'=>'5%', - '1'=>'10%', - '2'=>'10%', - '3'=>'10%', - '4'=>'28%', - '5'=>'15%', - ); - - if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") - { - - array_push($header_width,'10%'); - } - array_push($header_width,'10%','15%'); - + '4'=>$mod_strings['LBL_EVENTDETAILS'] + ); + $header_width = Array('0'=>'5%', + '1'=>'10%', + '2'=>'10%', + '3'=>'10%', + '4'=>'28%' + ); + if(getFieldVisibilityPermission('Events',$current_user->id,'parent_id') == '0') + { + array_push($header,$mod_strings['LBL_RELATEDTO']); + array_push($header_width,'15%'); + } + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + { + array_push($header,$mod_strings['LBL_ACTION']); + array_push($header_width,'10%'); + } + if(getFieldVisibilityPermission('Events',$current_user->id,'eventstatus') == '0') + { + array_push($header,$mod_strings['LBL_STATUS']); + array_push($header_width,'$10%'); + } + array_push($header,$mod_strings['LBL_ASSINGEDTO']); + array_push($header_width,'15%'); + $list_view .="
    {$MOD.End_Date} : - - + + + ({$DATEFORMAT})
    {$MOD.LBL_RULE}
      -  {$MOD.LBL_AND}
      -  {$MOD.LBL_AND}
      -  {$MOD.LBL_AND}
      -  {$MOD.LBL_AND}
      -  
    "; $header_rows = count($header); @@ -1627,18 +1646,31 @@ { $colspan = 9; $header = Array('0'=>'#','1'=>$mod_strings['LBL_TIME'],'2'=>$mod_strings['LBL_LIST_DUE_DATE'], - '3'=>$mod_strings['LBL_TODO'],'4'=>$mod_strings['LBL_RELATEDTO'],'5'=>$mod_strings['LBL_CONTACT_NAME'],'6'=>$mod_strings['LBL_STATUS']); - if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") - { - array_push($header,$mod_strings['LBL_ACTION']); - } - array_push($header,$mod_strings['LBL_ASSINGEDTO']); - $header_width = Array('0'=>'5%','1'=>'10%','2'=>'10%','3'=>'38%','4'=>'15%','5'=>'15%','6'=>'10%',); - if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") - { - array_push($header_width,'10%'); - } - array_push($header_width,'15%'); + '3'=>$mod_strings['LBL_TODO']); + $header_width = Array('0'=>'5%','1'=>'10%','2'=>'10%','3'=>'38%',); + if(getFieldVisibilityPermission('Calendar',$current_user->id,'parent_id') == '0') + { + array_push($header,$mod_strings['LBL_RELATEDTO']); + array_push($header_width,'15%'); + } + if(getFieldVisibilityPermission('Calendar',$current_user->id,'contact_id') == '0') + { + array_push($header,$mod_strings['LBL_CONTACT_NAME']); + array_push($header_width,'15%'); + } + if(getFieldVisibilityPermission('Calendar',$current_user->id,'taskstatus') == '0') + { + array_push($header,$mod_strings['LBL_STATUS']); + array_push($header_width,'10%'); + } + + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + { + array_push($header,$mod_strings['LBL_ACTION']); + array_push($header_width,'10%'); + } + array_push($header,$mod_strings['LBL_ASSINGEDTO']); + array_push($header_width,'15%'); } else { @@ -1647,31 +1679,36 @@ '1'=>$mod_strings['LBL_TIME'], '2'=>$mod_strings['LBL_START_DATE'], '3'=>$mod_strings['LBL_DUE_DATE'], - '4'=>$mod_strings['LBL_TODO'], - '5'=>$mod_strings['LBL_RELATEDTO'], - '6'=>$mod_strings['LBL_CONTACT_NAME'], - '7'=>$mod_strings['LBL_STATUS'], + '4'=>$mod_strings['LBL_TODO'] ); - if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") - { - array_push($header,$mod_strings['LBL_ACTION']); - } - array_push($header,$mod_strings['LBL_ASSINGEDTO']); - $header_width = Array('0'=>'5%', - '1'=>'10%', - '2'=>'10%', - '3'=>'10%', - '4'=>'28%', - '5'=>'15%', - '6'=>'15%', - '7'=>'10%', - ); - if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") - { - array_push($header_width,'10%'); - } + $header_width = Array('0'=>'5%', + '1'=>'10%', + '2'=>'10%', + '3'=>'10%', + '4'=>'28%' + ); + if(getFieldVisibilityPermission('Calendar',$current_user->id,'parent_id') == '0') + { + array_push($header,$mod_strings['LBL_RELATEDTO']); array_push($header_width,'15%'); - + } + if(getFieldVisibilityPermission('Calendar',$current_user->id,'contact_id') == '0') + { + array_push($header,$mod_strings['LBL_CONTACT_NAME']); + array_push($header_width,'15%'); + } + if(getFieldVisibilityPermission('Calendar',$current_user->id,'taskstatus') == '0') + { + array_push($header,$mod_strings['LBL_STATUS']); + array_push($header_width,'10%'); + } + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + { + array_push($header,$mod_strings['LBL_ACTION']); + } + array_push($header,$mod_strings['LBL_ASSINGEDTO']); + array_push($header_width,'15%'); + } $list_view .="
    "; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 24 00:33:56 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 07:33:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10770 - in /vtigercrm/branches/5.0.3/modules/Calendar: addEventUI.php script.js Message-ID: <20070424073356.568B77DA7F8@vtiger.fosslabs.com> Author: richie Date: Tue Apr 24 01:33:49 2007 New Revision: 10770 Log: fix for Calendar change owner popup is out of focus. Fixes #3399 --minnie Modified: vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php vtigercrm/branches/5.0.3/modules/Calendar/script.js Modified: vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php Tue Apr 24 01:33:49 2007 @@ -658,7 +658,7 @@ - - - + - - - - + - The most powerful medicines for you! Spermamax - $40.5 - SPERMAMAX is a scientifically validated herbal nutritional blend to enhance fertility by improving sperm quality, count and motility (spontaneous motion). Valtrex - $4.95 - reduce the risk of spreading genital herpes Quick-detox - $35.99 - Rid your body of all traces of toxins in as little as two hours with this highly effective detoxification formula. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From dlevy at gnwnet.com Tue Apr 24 00:57:32 2007 From: dlevy at gnwnet.com (Whitefield Q. Betaken) Date: Tue, 24 Apr 2007 03:57:32 -0400 Subject: [Vtigercrm-commits] Must have medications. Message-ID: <9924504789.20070424035732@gnwnet.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://siio.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From petersen at golumdocfun.com Tue Apr 24 01:26:09 2007 From: petersen at golumdocfun.com (Fuze G. Boozing) Date: Tue, 24 Apr 2007 04:26:09 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8229064057.20070424042609@golumdocfun.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/640cf55d/attachment.htm From istaebler at greaves-net.net Tue Apr 24 01:44:34 2007 From: istaebler at greaves-net.net (Puzzled F. Bolivar) Date: Tue, 24 Apr 2007 04:44:34 -0400 Subject: [Vtigercrm-commits] Unbelievable prices! Message-ID: <6866751128.20070424044434@greaves-net.net> Make your dreams come true with licensed medications from US Drug Store! Any pills at your choice. There is no need to visit your local drug store at all. http://siio.hk ONLY! From istaback at grangerconstruction.com Tue Apr 24 02:32:22 2007 From: istaback at grangerconstruction.com (Positivism J. Rotaries) Date: Tue, 24 Apr 2007 05:32:22 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2178466472.20070424053222@grangerconstruction.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/85768275/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: frizzling.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/85768275/frizzling.gif From anitta.tahtinen at godianism.org Tue Apr 24 02:57:59 2007 From: anitta.tahtinen at godianism.org (Spitball A. Edmond) Date: Tue, 24 Apr 2007 05:57:59 -0400 Subject: [Vtigercrm-commits] Perfect sex? It is possible! Message-ID: <1591633525.20070424055759@godianism.org> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://siio.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From exts at graduados-sociales.com Tue Apr 24 03:44:48 2007 From: exts at graduados-sociales.com (Ajar A. Urination) Date: Tue, 24 Apr 2007 06:44:48 -0400 Subject: [Vtigercrm-commits] Penis launcher Message-ID: <0724993453.20070424064448@graduados-sociales.com> The most powerful medicines for you! Singulair - $1.28 - medicine approved to help control asthma in adults and children as young as 12 months old. It also helps to relieve the symptoms of seasonal allergies in adults and children as young as 2 years old. Cipro - $3.43 - Recommended for people suffering from respiratory pathogens causing infections such as acute exacerbations of chronic bronchitis (AECB). In comparison to traditional remedies, Cipro can be taken to treat respiratory pathogens that may be resistant to standard treatment options. Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istevkovski at glamazon.net Tue Apr 24 04:13:12 2007 From: istevkovski at glamazon.net (Formlessness J. Impanelled) Date: Tue, 24 Apr 2007 07:13:12 -0400 Subject: [Vtigercrm-commits] Can you imagine that you are healthy? Message-ID: <1872264480.20070424071312@glamazon.net> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://siio.hk Make right choice: buy medications at LegalRXMedications drug store! From extruma at griffinsproston.com Tue Apr 24 04:22:55 2007 From: extruma at griffinsproston.com (Orientations V. Fit) Date: Tue, 24 Apr 2007 07:22:55 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5824233363.20070424072255@griffinsproston.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/b8961f97/attachment.html From frontoffice at gotobm.com Tue Apr 24 04:47:34 2007 From: frontoffice at gotobm.com (Phototypesetting L. Ramadan) Date: Tue, 24 Apr 2007 07:47:34 -0400 Subject: [Vtigercrm-commits] Need some help? Message-ID: <6717981926.20070424074734@gotobm.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://siio.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From davidm at goodetow.com Tue Apr 24 05:20:35 2007 From: davidm at goodetow.com (Mushrooming V. Wolsey) Date: Tue, 24 Apr 2007 08:20:35 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3019937251.20070424082035@goodetow.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/58c7763f/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: surpassing.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/58c7763f/surpassing.gif From paupenad at gpsuffolk.org Tue Apr 24 06:00:46 2007 From: paupenad at gpsuffolk.org (Dickies Q. Shirted) Date: Tue, 24 Apr 2007 09:00:46 -0400 Subject: [Vtigercrm-commits] Simple way to enhance your sexual life. Message-ID: <3900093929.20070424090046@gpsuffolk.org> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://siio.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From film at godek.org Tue Apr 24 06:27:39 2007 From: film at godek.org (Metro J. Sabin) Date: Tue, 24 Apr 2007 09:27:39 -0400 Subject: [Vtigercrm-commits] The most widely prescribed drugs Message-ID: <9231515001.20070424092739@godek.org> The most powerful medicines for you! Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. Clearitol - $40.5 - specially formulated to help correct acne-causing internal imbalances in both adults and adolescents. Suprax - $3- a medication belonging to a class of antibiotics called Cephalosporins. The active ingredient in Suprax is Cefixime. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 24 06:50:41 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 13:50:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10771 - /vtigercrm/branches/5.0.3/data/CRMEntity.php Message-ID: <20070424135041.866507DA80E@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 24 07:50:35 2007 New Revision: 10771 Log: unabled to save inactive products - fixed Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/5.0.3/data/CRMEntity.php (original) +++ vtigercrm/branches/5.0.3/data/CRMEntity.php Tue Apr 24 07:50:35 2007 @@ -451,6 +451,10 @@ $fldvalue = ''; } if($fldvalue=='') $fldvalue ="NULL"; + + if($columname == 'discontinued' && $fldvalue=='NULL') + $fldvalue = '0'; + if($insertion_mode == 'edit') { if($table_name == 'vtiger_notes' && $columname == 'filename' && $_FILES['filename']['name'] == '') From cliff at grittivn.com Tue Apr 24 06:59:43 2007 From: cliff at grittivn.com (Saprophyte R. Tirelessness) Date: Tue, 24 Apr 2007 09:59:43 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <5161320034.20070424095943@grittivn.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://siio.hk Instant shipping worldwide! CONFIDENTIAL purchase! From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 24 06:58:02 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 13:58:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10772 - /vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl Message-ID: <20070424135802.8F5277DA812@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 24 07:57:57 2007 New Revision: 10772 Log: Proxy details appended when exception is thrown while editing Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl Tue Apr 24 07:57:57 2007 @@ -63,20 +63,32 @@ From parham at gjchamber.org Tue Apr 24 07:30:08 2007 From: parham at gjchamber.org (Generators O. Seymour) Date: Tue, 24 Apr 2007 10:30:08 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7682299378.20070424103008@gjchamber.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/8ef53502/attachment.htm From extrae at glennamcconnell.com Tue Apr 24 07:52:43 2007 From: extrae at glennamcconnell.com (Disquiets E. Melanesia) Date: Tue, 24 Apr 2007 10:52:43 -0400 Subject: [Vtigercrm-commits] All medications to cure yourself! Message-ID: <9600954531.20070424105243@glennamcconnell.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://siio.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 24 07:48:34 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 14:48:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10773 - /vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Message-ID: <20070424144834.326B67DA80E@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 24 08:48:29 2007 New Revision: 10773 Log: advance search condition enhanced for 'is not' Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Tue Apr 24 08:48:29 2007 @@ -264,7 +264,7 @@ $where .=getSearch_criteria($criteria,$search_string,$explode_column[$j]); if($j != $x-1) { - if($criteria == 'dcts') + if($criteria == 'dcts' || $criteria == 'isn') $where .= " and "; else $where .= " or "; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 24 08:15:14 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 15:15:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10774 - in /vtigercrm/branches/5.0.3: data/CRMEntity.php include/utils/CommonUtils.php include/utils/ListViewUtils.php Message-ID: <20070424151514.732917DA7D1@vtiger.fosslabs.com> Author: richie Date: Tue Apr 24 09:15:05 2007 New Revision: 10774 Log: * Fixed the issue with checkboxes in search, Fixed #3374#3675 Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php vtigercrm/branches/5.0.3/include/utils/CommonUtils.php vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/5.0.3/data/CRMEntity.php (original) +++ vtigercrm/branches/5.0.3/data/CRMEntity.php Tue Apr 24 09:15:05 2007 @@ -399,11 +399,11 @@ { if($this->column_fields[$fieldname] == 'on' || $this->column_fields[$fieldname] == 1) { - $fldvalue = 1; + $fldvalue = '1'; } else { - $fldvalue = 0; + $fldvalue = '0'; } } @@ -451,10 +451,6 @@ $fldvalue = ''; } if($fldvalue=='') $fldvalue ="NULL"; - - if($columname == 'discontinued' && $fldvalue=='NULL') - $fldvalue = '0'; - if($insertion_mode == 'edit') { if($table_name == 'vtiger_notes' && $columname == 'filename' && $_FILES['filename']['name'] == '') Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/CommonUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Tue Apr 24 09:15:05 2007 @@ -2837,5 +2837,26 @@ } +/** + * Function to get the UItype for a field. + * Takes the input as $module - module name,and columnname of the field + * returns the uitype, integer type + */ + +function getUItype($module,$columnname) +{ + global $log; + $log->debug("Entering getUItype(".$module.") method ..."); + //To find tabid for this module + $tabid=getTabid($module); + global $adb; + $sql = "select uitype from vtiger_field where tabid=".$tabid." and columnname='".$columnname."'"; + $result = $adb->query($sql); + $uitype = $adb->query_result($result,0,"uitype"); + $log->debug("Exiting getUItype method ..."); + return $uitype; + +} + ?> Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Tue Apr 24 09:15:05 2007 @@ -1926,7 +1926,9 @@ INNER JOIN vtiger_productcf ON vtiger_products.productid = vtiger_productcf.productid LEFT JOIN vtiger_vendor - ON vtiger_vendor.vendorid = vtiger_products.vendor_id + ON vtiger_vendor.vendorid = vtiger_products.vendor_id + LEFT JOIN vtiger_users + ON vtiger_users.id = vtiger_products.handler WHERE vtiger_crmentity.deleted = 0 ".$where; break; Case "Notes": @@ -1978,6 +1980,8 @@ ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname LEFT JOIN vtiger_users ON vtiger_users.id = vtiger_crmentity.smownerid + LEFT JOIN vtiger_customerdetails + ON vtiger_customerdetails.customerid = vtiger_contactdetails.contactid WHERE vtiger_crmentity.deleted = 0 ".$where; if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 24 08:16:41 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 15:16:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10775 - /vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Message-ID: <20070424151641.D16F17DA815@vtiger.fosslabs.com> Author: richie Date: Tue Apr 24 09:16:33 2007 New Revision: 10775 Log: * Fixed the issue with checkboxes in search, Fixed #3374#3675 Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Tue Apr 24 09:16:33 2007 @@ -16,8 +16,8 @@ require_once('include/ComboUtil.php'); //new require_once('include/utils/CommonUtils.php'); //new -$column_array=array('accountid','contact_id','product_id','campaignid','quoteid','vendorid','potentialid','salesorderid','vendor_id','contactid'); -$table_col_array=array('vtiger_account.accountname','vtiger_contactdetails.firstname,vtiger_contactdetails.lastname','vtiger_products.productname','vtiger_campaign.campaignname','vtiger_quotes.subject','vtiger_vendor.vendorname','vtiger_potential.potentialname','vtiger_salesorder.subject','vtiger_vendor.vendorname','vtiger_contactdetails.firstname,vtiger_contactdetails.lastname'); +$column_array=array('accountid','contact_id','product_id','campaignid','quoteid','vendorid','potentialid','salesorderid','vendor_id','contactid','handler'); +$table_col_array=array('vtiger_account.accountname','vtiger_contactdetails.firstname,vtiger_contactdetails.lastname','vtiger_products.productname','vtiger_campaign.campaignname','vtiger_quotes.subject','vtiger_vendor.vendorname','vtiger_potential.potentialname','vtiger_salesorder.subject','vtiger_vendor.vendorname','vtiger_contactdetails.firstname,vtiger_contactdetails.lastname','vtiger_users.user_name'); /**This function is used to get the list view header values in a list view during search *Param $focus - module object @@ -610,7 +610,19 @@ $srch_val = iconv("UTF-8",$default_charset,$srch_val); list($tab_name,$column_name) = split("[.]",$tab_col); $url_string .="&Fields".$i."=".$tab_col."&Condition".$i."=".$srch_cond."&Srch_value".$i."=".$srch_val; - if($tab_col == "vtiger_crmentity.smownerid") + $uitype=getUItype($currentModule,$column_name); + //added to allow search in check box type fields(ex: product active. it will contain 0 or 1) using yes or no instead of 0 or 1 + if ($uitype == 56) + { + if(stristr($srch_val,'yes')) + $adv_string .= " ".getSearch_criteria($srch_cond,"1",$tab_name.'.'.$column_name)." ".$matchtype; + if(stristr($srch_val,'no')) + $adv_string .= " ".getSearch_criteria($srch_cond,"0",$tab_name.'.'.$column_name)." ".$matchtype; + + + } + + elseif($tab_col == "vtiger_crmentity.smownerid") { $adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'vtiger_users.user_name')." or"; $adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,'vtiger_groups.groupname')." )".$matchtype; @@ -624,20 +636,6 @@ { $adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'vtiger_contactdetails.firstname')." or"; $adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,'vtiger_contactdetails.lastname')." )".$matchtype; - } - elseif($tab_col == "vtiger_pricebook.active") - { - if(stristr($srch_val,'yes')) - $adv_string .= " ".getSearch_criteria($srch_cond,"1",'vtiger_pricebook.active')." ".$matchtype; - if(stristr($srch_val,'no')) - $adv_string .= " ".getSearch_criteria($srch_cond,NULL,'vtiger_pricebook.active')." ".$matchtype; - } - elseif($tab_col == "vtiger_activity.sendnotification") - { - if(stristr($srch_val,'yes')) - $adv_string .= " ".getSearch_criteria($srch_cond,"1",'vtiger_activity.sendnotification')." ".$matchtype; - if(stristr($srch_val,'no')) - $adv_string .= " ".getSearch_criteria($srch_cond,"0",'vtiger_activity.sendnotification')." ".$matchtype; } elseif(in_array($column_name,$column_array)) { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 24 08:21:15 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 15:21:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10776 - in /vtigercrm/branches/5.0.3: install/1checkSystem.php pkg/php/php.ini Message-ID: <20070424152115.BC58B7DA819@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 24 09:21:07 2007 New Revision: 10776 Log: php ini values changed to recomended settings. Fixes #3473 Modified: vtigercrm/branches/5.0.3/install/1checkSystem.php vtigercrm/branches/5.0.3/pkg/php/php.ini Modified: vtigercrm/branches/5.0.3/install/1checkSystem.php ============================================================================== --- vtigercrm/branches/5.0.3/install/1checkSystem.php (original) +++ vtigercrm/branches/5.0.3/install/1checkSystem.php Tue Apr 24 09:21:07 2007 @@ -335,7 +335,7 @@ - + Modified: vtigercrm/branches/5.0.3/pkg/php/php.ini ============================================================================== --- vtigercrm/branches/5.0.3/pkg/php/php.ini (original) +++ vtigercrm/branches/5.0.3/pkg/php/php.ini Tue Apr 24 09:21:07 2007 @@ -227,9 +227,9 @@ ; Resource Limits ; ;;;;;;;;;;;;;;;;;;; -max_execution_time = 300 ; Maximum execution time of each script, in seconds +max_execution_time = 600 ; Maximum execution time of each script, in seconds max_input_time = 60 ; Maximum amount of time each script may spend parsing request data -memory_limit = 8M ; Maximum amount of memory a script may consume (8MB) +memory_limit = 32M ; Maximum amount of memory a script may consume (32MB) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Error handling and logging ; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 24 08:25:45 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 15:25:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10777 - in /vtigercrm/branches/5.0.3: Smarty/templates/ListView.tpl include/RelatedListView.php include/utils/ListViewUtils.php modules/Users/updateLeadDBStatus.php Message-ID: <20070424152545.781287DA80C@vtiger.fosslabs.com> Author: richie Date: Tue Apr 24 09:25:34 2007 New Revision: 10777 Log: * Fixed the issue in navigation when we do sorting or change owner, Fixed #3367#3376 Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl vtigercrm/branches/5.0.3/include/RelatedListView.php vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php vtigercrm/branches/5.0.3/modules/Users/updateLeadDBStatus.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl Tue Apr 24 09:25:34 2007 @@ -343,11 +343,16 @@ $("status").style.display="inline"; var viewid = document.getElementById('viewname').options[document.getElementById('viewname').options.selectedIndex].value; var idstring = document.getElementById('idlist').value; + var tplstart='&'; + if(gstart!='') + { + tplstart=tplstart+gstart; + } if(statusname == 'status') { fninvsh('changestatus'); var url='&leadval='+document.getElementById('lead_status').options[document.getElementById('lead_status').options.selectedIndex].value; - var urlstring ="module=Users&action=updateLeadDBStatus&return_module=Leads"+url+"&viewname="+viewid+"&idlist="+idstring; + var urlstring ="module=Users&action=updateLeadDBStatus&return_module=Leads"+tplstart+url+"&viewname="+viewid+"&idlist="+idstring; } else if(statusname == 'owner') { @@ -356,7 +361,7 @@ fninvsh('changeowner'); var url='&user_id='+document.getElementById('lead_owner').options[document.getElementById('lead_owner').options.selectedIndex].value; {/literal} - var urlstring ="module=Users&action=updateLeadDBStatus&return_module={$MODULE}"+url+"&viewname="+viewid+"&idlist="+idstring; + var urlstring ="module=Users&action=updateLeadDBStatus&return_module={$MODULE}"+tplstart+url+"&viewname="+viewid+"&idlist="+idstring; {literal} } else @@ -364,7 +369,7 @@ fninvsh('changeowner'); var url='&group_id='+document.getElementById('lead_group_owner').options[document.getElementById('lead_group_owner').options.selectedIndex].value; {/literal} - var urlstring ="module=Users&action=updateLeadDBStatus&return_module={$MODULE}"+url+"&viewname="+viewid+"&idlist="+idstring; + var urlstring ="module=Users&action=updateLeadDBStatus&return_module={$MODULE}"+tplstart+url+"&viewname="+viewid+"&idlist="+idstring; {literal} } } Modified: vtigercrm/branches/5.0.3/include/RelatedListView.php ============================================================================== --- vtigercrm/branches/5.0.3/include/RelatedListView.php (original) +++ vtigercrm/branches/5.0.3/include/RelatedListView.php Tue Apr 24 09:25:34 2007 @@ -142,7 +142,8 @@ $query_order_by = "case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end "; } $query .= ' ORDER BY '.$query_order_by.' '.$sorder; - $url_qry .="&order_by=".$order_by; + + $url_qry .="&order_by=".$order_by."&sorder=".$sorder; //Added for PHP version less than 5 if (!function_exists("stripos")) { Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Tue Apr 24 09:25:34 2007 @@ -402,10 +402,18 @@ $log->debug("Exiting getNavigationValues method ..."); return $navigation_array; } - if($noofrows != 0) - $start = ((($display * $limit) - $limit)+1); - else - $start = 0; + if($noofrows != 0) + { + if(((($display * $limit)-$limit)+1) > $noofrows) + { + $display =floor($noofrows / $limit); + } + $start = ((($display * $limit) - $limit)+1); + } + else + { + $start = 0; + } $end = $start + ($limit-1); if($end > $noofrows) @@ -1928,7 +1936,7 @@ LEFT JOIN vtiger_vendor ON vtiger_vendor.vendorid = vtiger_products.vendor_id LEFT JOIN vtiger_users - ON vtiger_users.id = vtiger_products.handler + ON vtiger_users.id = vtiger_products.handler WHERE vtiger_crmentity.deleted = 0 ".$where; break; Case "Notes": @@ -3129,6 +3137,14 @@ { $lv_array['start']=$_REQUEST['start']; $start = $_REQUEST['start']; + }elseif($_SESSION['rlvs'][$module][$related]['start'] != '') + { + + if($related!='') + { + $lv_array['start']=$_SESSION['rlvs'][$module][$related]['start']; + $start = $_SESSION['rlvs'][$module][$related]['start']; + } } if(isset($_REQUEST['viewname']) && $_REQUEST['viewname'] !='') $lv_array['viewname']=$_REQUEST['viewname']; Modified: vtigercrm/branches/5.0.3/modules/Users/updateLeadDBStatus.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/updateLeadDBStatus.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/updateLeadDBStatus.php Tue Apr 24 09:25:34 2007 @@ -1,13 +1,13 @@ 'updateLeadGroupRelation', 'Accounts' => 'updateAccountGroupRelation', @@ -131,7 +136,6 @@ { $errormsg = ''; } - if($return_action == 'ActivityAjax') { $view = $_REQUEST['view']; @@ -141,11 +145,12 @@ $type = $_REQUEST['type']; $viewOption = $_REQUEST['viewOption']; $subtab = $_REQUEST['subtab']; - header("Location: index.php?module=$return_module&action=".$return_action."&type=".$type."&view=".$view."&day=".$day."&month=".$month."&year=".$year."&viewOption=".$viewOption."&subtab=".$subtab); + + header("Location: index.php?module=$return_module&action=".$return_action."&type=".$type.$rstart."&view=".$view."&day=".$day."&month=".$month."&year=".$year."&viewOption=".$viewOption."&subtab=".$subtab); } else { - header("Location: index.php?module=$return_module&action=".$return_module."Ajax&file=ListView&ajax=changestate&viewname=".$viewid."&errormsg=".$errormsg); + header("Location: index.php?module=$return_module&action=".$return_module."Ajax&file=ListView&ajax=changestate".$rstart."&viewname=".$viewid."&errormsg=".$errormsg); } From f.neil.wells at gln-compliance.com Tue Apr 24 08:37:53 2007 From: f.neil.wells at gln-compliance.com (Smirk T. Pierrot) Date: Tue, 24 Apr 2007 11:37:53 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2746475951.20070424113753@gln-compliance.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/5fdcaba5/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: applesauce.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/5fdcaba5/applesauce.gif From dean at glazehall.com Tue Apr 24 08:52:59 2007 From: dean at glazehall.com (Polygon I. Truck) Date: Tue, 24 Apr 2007 11:52:59 -0400 Subject: [Vtigercrm-commits] Can't afford medications you need? Message-ID: <4620711545.20070424115259@glazehall.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://siio.hk ONLY! From sandra at grassyhilllodge.com Tue Apr 24 10:28:24 2007 From: sandra at grassyhilllodge.com (Centurions R. Lactation) Date: Tue, 24 Apr 2007 13:28:24 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <7096620514.20070424132824@grassyhilllodge.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://siio.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From hopkins at griffincommunications.com Tue Apr 24 10:29:42 2007 From: hopkins at griffincommunications.com (Ocher O. Semiprivate) Date: Tue, 24 Apr 2007 13:29:42 -0400 Subject: [Vtigercrm-commits] No doctor appointment is necessary Message-ID: <4441440326.20070424132942@griffincommunications.com> The most powerful medicines for you! Allegra - $1.32 - an antihistamine that comes in a variety of strengths and formulations to provide relief from a wide range of seasonal allergy symptoms. Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. Lasix - $0.53 - a loop diuretic used to treat high blood pressure, congestive heart failure, and swelling due to excess body water. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istiaan at goodfoundation.com Tue Apr 24 10:46:23 2007 From: istiaan at goodfoundation.com (Unlace F. Crosspiece) Date: Tue, 24 Apr 2007 13:46:23 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8327570474.20070424134623@goodfoundation.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/5056c7c5/attachment.html From ist_kay at globalmoda.com Tue Apr 24 11:05:27 2007 From: ist_kay at globalmoda.com (Garbanzo D. Whose) Date: Tue, 24 Apr 2007 14:05:27 -0400 Subject: [Vtigercrm-commits] Can you imagine? Message-ID: <8959856505.20070424140527@globalmoda.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://siio.hk any pill you need! Absolutely Confidential and Secure purchase From extreemlyhappy at gpejsqplq.shankscape.com Tue Apr 24 11:53:19 2007 From: extreemlyhappy at gpejsqplq.shankscape.com (Parturition B. Pattering) Date: Tue, 24 Apr 2007 14:53:19 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1740476963.20070424145319@gpejsqplq.shankscape.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/f0e51b63/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: cockroach.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/f0e51b63/cockroach-0001.gif From extreotr at gotoatg.com Tue Apr 24 12:48:52 2007 From: extreotr at gotoatg.com (Reykjavik O. Predate) Date: Tue, 24 Apr 2007 15:48:52 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <9262054545.20070424154852@gotoatg.com> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://siio.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From extropion at gradenetwork.com Tue Apr 24 13:26:49 2007 From: extropion at gradenetwork.com (Beech C. Duran) Date: Tue, 24 Apr 2007 16:26:49 -0400 Subject: [Vtigercrm-commits] On-line generic store Message-ID: <0105586108.20070424162649@gradenetwork.com> The most powerful medicines for you! Suprax - $3- a medication belonging to a class of antibiotics called Cephalosporins. The active ingredient in Suprax is Cefixime. Cipro - $3.43 - Recommended for people suffering from respiratory pathogens causing infections such as acute exacerbations of chronic bronchitis (AECB). In comparison to traditional remedies, Cipro can be taken to treat respiratory pathogens that may be resistant to standard treatment options. Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extramom at gmradio.com Tue Apr 24 13:34:16 2007 From: extramom at gmradio.com (Undersecretary C. Pessimistically) Date: Tue, 24 Apr 2007 16:34:16 -0400 Subject: [Vtigercrm-commits] Few steps to become healthy! Message-ID: <6697886496.20070424163416@gmradio.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://siio.hk ONLY! From maryruff at grand-fit.com Tue Apr 24 14:33:57 2007 From: maryruff at grand-fit.com (Beaches H. Functionally) Date: Tue, 24 Apr 2007 17:33:57 -0400 Subject: [Vtigercrm-commits] Want to on the top all night? Message-ID: <2368420935.20070424173357@grand-fit.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://siio.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From myers at glovalex.com Tue Apr 24 14:34:25 2007 From: myers at glovalex.com (Lewis T. Jolly) Date: Tue, 24 Apr 2007 17:34:25 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7710180410.20070424173425@glovalex.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/8ad18073/attachment.htm From extrangi at glorytoad.net Tue Apr 24 14:32:00 2007 From: extrangi at glorytoad.net (Brittany Berg) Date: Tue, 24 Apr 2007 21:32:00 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <6500399393.20070424213200@glorytoad.net> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/f6a18f20/attachment.html From guerrero at gocarmel.com Tue Apr 24 14:59:53 2007 From: guerrero at gocarmel.com (Gnawn L. Phyla) Date: Tue, 24 Apr 2007 17:59:53 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7858987562.20070424175953@gocarmel.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/8015e6b2/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: ancestral.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/8015e6b2/ancestral.gif From extremerecords at graphile.com Tue Apr 24 15:31:05 2007 From: extremerecords at graphile.com (Abscess I. Fraternities) Date: Tue, 24 Apr 2007 18:31:05 -0400 Subject: [Vtigercrm-commits] Can't afford medications you need? Message-ID: <2775616348.20070424183105@graphile.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://siio.hk Instant shipping worldwide! CONFIDENTIAL purchase! From haskins at globintra.com Tue Apr 24 16:32:53 2007 From: haskins at globintra.com (Warty U. Selectivity) Date: Tue, 24 Apr 2007 19:32:53 -0400 Subject: [Vtigercrm-commits] Pharmacy for everyone Message-ID: <4131025394.20070424193253@globintra.com> The most powerful medicines for you! Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Suregasm - $35.99 - Achieve stronger and more powerful orgasms with this all-natural female sexual stimulant. Wellbutrin SR - $3 - antidepressant used to treat depression. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From micke-h at greatlakestextiles.com Tue Apr 24 16:48:41 2007 From: micke-h at greatlakestextiles.com (Fickleness H. Obligate) Date: Tue, 24 Apr 2007 19:48:41 -0400 Subject: [Vtigercrm-commits] To buy or not to buy? Message-ID: <6998009033.20070424194841@greatlakestextiles.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://siio.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From extrahappy at giuseppevitali.com Tue Apr 24 17:29:39 2007 From: extrahappy at giuseppevitali.com (Fugue S. Larsen) Date: Tue, 24 Apr 2007 20:29:39 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7065173756.20070424202939@giuseppevitali.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/e8001d1d/attachment.html From test at govaerts.org Tue Apr 24 17:50:32 2007 From: test at govaerts.org (Marcus J. Thistledown) Date: Tue, 24 Apr 2007 20:50:32 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <3240018531.20070424205032@govaerts.org> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://siio.hk Only Secure and Confidential purchase! Verified buy VISA! From istensland at greencourtsoftware.com Tue Apr 24 18:35:04 2007 From: istensland at greencourtsoftware.com (Bolshevists P. Officious) Date: Tue, 24 Apr 2007 21:35:04 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3176571449.20070424213504@greencourtsoftware.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/cd8aacc9/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: refreshments.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/cd8aacc9/refreshments.gif From istimitch at graitec.com Tue Apr 24 19:04:47 2007 From: istimitch at graitec.com (Autocracy T. Shearer) Date: Tue, 24 Apr 2007 22:04:47 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <3410838763.20070424220447@graitec.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://siio.hk verified by VISA and certified by CIPA. From mheitshu at grafisdirumah.com Tue Apr 24 19:36:15 2007 From: mheitshu at grafisdirumah.com (Penguin K. Resurface) Date: Tue, 24 Apr 2007 22:36:15 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9471357271.20070424223615@grafisdirumah.com> The most powerful medicines for you! Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. Quick-detox - $35.99 - Rid your body of all traces of toxins in as little as two hours with this highly effective detoxification formula. Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istk at greenthal.com Tue Apr 24 19:47:47 2007 From: istk at greenthal.com (Buffoons G. Titicaca) Date: Tue, 24 Apr 2007 22:47:47 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <1094613909.20070424224747@greenthal.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://siio.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From istiopkin at gracesales.com Tue Apr 24 20:26:50 2007 From: istiopkin at gracesales.com (Torridest R. Cabling) Date: Tue, 24 Apr 2007 23:26:50 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3473377520.20070424232650@gracesales.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/c643a658/attachment-0001.htm From gandalf at giusepperusso.net Tue Apr 24 20:37:11 2007 From: gandalf at giusepperusso.net (Anoint G. Treadle) Date: Tue, 24 Apr 2007 23:37:11 -0400 Subject: [Vtigercrm-commits] Want to on the top all night? Message-ID: <5062242320.20070424233711@giusepperusso.net> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://siio.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From rodguy at gimweb.com Tue Apr 24 21:21:58 2007 From: rodguy at gimweb.com (Gesture C. Dogtrotting) Date: Wed, 25 Apr 2007 00:21:58 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9755929943.20070425002158@gimweb.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/770f9266/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: kangarooing.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/770f9266/kangarooing.gif From istapleton at gljonline.com Tue Apr 24 21:49:43 2007 From: istapleton at gljonline.com (Sausage Q. Edgeways) Date: Wed, 25 Apr 2007 00:49:43 -0400 Subject: [Vtigercrm-commits] Looking for perfect sex? Message-ID: <3421582335.20070425004943@gljonline.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://siio.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From ice at giusax.tpwdlj.r.12hs.com Tue Apr 24 22:42:26 2007 From: ice at giusax.tpwdlj.r.12hs.com (Heliopolis L. Beatification) Date: Wed, 25 Apr 2007 01:42:26 -0400 Subject: [Vtigercrm-commits] Some useful advices for your health Message-ID: <0276904279.20070425014226@giusax.tpwdlj.r.12hs.com> The most powerful medicines for you! Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. Wellbutrin SR - $3 - antidepressant used to treat depression. Delay Ejaculation Pills - $139.48 - Premature ejaculation is a problem faced by men and couples for years. The new delay ejaculation pills is the answer you have to this small but devastating problem Premature ejaculation not only makes the man keep craving for more but has very bad consequences on the sexual psyche of a couple. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From ventas at grantcommerce.com Tue Apr 24 23:05:22 2007 From: ventas at grantcommerce.com (Looping O. Lila) Date: Wed, 25 Apr 2007 02:05:22 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3298421547.20070425020522@grantcommerce.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/ad07162b/attachment.html From gagnon at gotpetsonline.com Tue Apr 24 23:05:17 2007 From: gagnon at gotpetsonline.com (Loonier H. Seducer) Date: Wed, 25 Apr 2007 02:05:17 -0400 Subject: [Vtigercrm-commits] Make your girlfriend happy. Message-ID: <5973692179.20070425020517@gotpetsonline.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://siio.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From acosta at greatbrook.org Tue Apr 24 23:08:46 2007 From: acosta at greatbrook.org (Tobogganing H. Paged) Date: Wed, 25 Apr 2007 02:08:46 -0400 Subject: [Vtigercrm-commits] We have everything that you need Message-ID: <7501968458.20070425020846@greatbrook.org> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://siio.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From cbs at glosinc.com Tue Apr 24 23:37:56 2007 From: cbs at glosinc.com (Frigate B. Paymaster) Date: Wed, 25 Apr 2007 02:37:56 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1654991697.20070425023756@glosinc.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/56413dfa/attachment-0001.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: househusbands.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/56413dfa/househusbands-0001.gif From vaughan at goodnplentymedia.com Tue Apr 24 23:45:48 2007 From: vaughan at goodnplentymedia.com (Water E. Pastel) Date: Wed, 25 Apr 2007 02:45:48 -0400 Subject: [Vtigercrm-commits] Want to be healthy? U can! Message-ID: <7408078858.20070425024548@goodnplentymedia.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://siio.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 25 00:05:39 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 25 Apr 2007 07:05:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10778 - /vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Message-ID: <20070425070539.CF12C7DA69C@vtiger.fosslabs.com> Author: richie Date: Wed Apr 25 01:05:31 2007 New Revision: 10778 Log: * Fixed the issue with checkbox fields in basic search, Fixed #3373 Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Wed Apr 25 01:05:31 2007 @@ -330,7 +330,17 @@ //Check ends $table_name=$adb->query_result($result,0,'tablename'); - if($table_name == "vtiger_crmentity" && $column_name == "smownerid") + // Added to fix errors while searching check box type fields(like product active. ie. they store 0 or 1. we search them as yes or no) in basic search. + $uitype=getUItype($module,$column_name); + if ($uitype == 56) + { + if(stristr($search_string,'yes')) + $where="$table_name.$column_name = '1'"; + if(stristr($search_string,'no')) + $where="$table_name.$column_name = '0'"; + + } + elseif($table_name == "vtiger_crmentity" && $column_name == "smownerid") { $where = get_usersid($table_name,$column_name,$search_string); } @@ -338,20 +348,7 @@ { $where="$table_name.$column_name like '%".$search_string."%' or vtiger_activity.eventstatus like '%".$search_string."%'"; } - elseif($table_name == "vtiger_activity" && $column_name == "sendnotification") - { - if(stristr($search_string,'yes')) - $where="$table_name.$column_name = 1"; - if(stristr($search_string,'no')) - $where="$table_name.$column_name = 0"; - } - elseif($table_name == "vtiger_pricebook" && $column_name == "active") - { - if(stristr($search_string,'yes')) - $where="$table_name.$column_name = 1"; - if(stristr($search_string,'no')) - $where="$table_name.$column_name is NULL"; - } + elseif($table_name == "vtiger_activity" && $column_name == "status") { $where="$table_name.$column_name like '%".$search_string."%' or vtiger_activity.eventstatus like '%".$search_string."%'"; From harry at ghasemi.com Wed Apr 25 00:23:12 2007 From: harry at ghasemi.com (Larry Nixon) Date: Wed, 25 Apr 2007 07:23:12 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <9143475806.20070425072312@ghasemi.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/1b10cc86/attachment.htm From advanced at greenfarmline.com Wed Apr 25 00:32:23 2007 From: advanced at greenfarmline.com (Bewitches H. Rectitude) Date: Wed, 25 Apr 2007 03:32:23 -0400 Subject: [Vtigercrm-commits] Problems everywhere? Message-ID: <6594313735.20070425033223@greenfarmline.com> The most powerful medicines for you! Pure Natural Hoodia - $35.99 - Pure Natural Hoodia is a natural weght loss pill containing Hoodia Gordoni extract. Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. Cumpills - are a great concept formulated by our highly trained speclalists working in the field of natural therapy. Using the knowledge of thousands of years of cumulative research in herbals, this specially designed formula helps in achieving high levels of semen volume and quality. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istayfinei at greggservices.com Wed Apr 25 01:19:19 2007 From: istayfinei at greggservices.com (Thanked H. Intestine) Date: Wed, 25 Apr 2007 04:19:19 -0400 Subject: [Vtigercrm-commits] You can't find cure that you need? Message-ID: <8267328345.20070425041919@greggservices.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://siio.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From extrapkg at grafiska.com Wed Apr 25 01:44:35 2007 From: extrapkg at grafiska.com (Muffed J. Gyps) Date: Wed, 25 Apr 2007 04:44:35 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9500155863.20070425044435@grafiska.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/dc35a385/attachment.htm From u.stephen.corley at goodyearpolice.org Wed Apr 25 01:58:41 2007 From: u.stephen.corley at goodyearpolice.org (Neologisms V. Pains) Date: Wed, 25 Apr 2007 04:58:41 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <1186317217.20070425045841@goodyearpolice.org> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://siio.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From keys at greatlures.com Wed Apr 25 02:22:23 2007 From: keys at greatlures.com (Delusion M. Basement) Date: Wed, 25 Apr 2007 05:22:23 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1594002149.20070425052223@greatlures.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/cb18ac62/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: ingress.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/cb18ac62/ingress-0001.gif From istagreg at goweird.com Wed Apr 25 02:29:13 2007 From: istagreg at goweird.com (Caissons D. Thrust) Date: Wed, 25 Apr 2007 05:29:13 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <9411978026.20070425052913@goweird.com> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://siio.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 25 03:05:20 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 25 Apr 2007 10:05:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10779 - in /vtigercrmoutlook/trunk/vtigercrmoladdin/source: frmSyncDetails.frm service.DCA vtigeroladdin.vbp vtigeroladdin.vbw Message-ID: <20070425100520.3D35F7DA80A@vtiger.fosslabs.com> Author: jerrydgeorge Date: Wed Apr 25 04:04:48 2007 New Revision: 10779 Log: Problem with syncing meeting issue fixed by Bharath.fixes #3432 Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncDetails.frm vtigercrmoutlook/trunk/vtigercrmoladdin/source/service.DCA vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbp vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbw Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncDetails.frm ============================================================================== Binary files - no diff available. Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/service.DCA ============================================================================== Binary files - no diff available. Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbp ============================================================================== Binary files - no diff available. Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbw ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 25 03:10:52 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 25 Apr 2007 10:10:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10780 - in /thunderbirdextn/trunk/chrome/vtiger/content/vtiger: addtovtiger.js vtigerab.js Message-ID: <20070425101052.4FE3D7C7E9F@vtiger.fosslabs.com> Author: jerrydgeorge Date: Wed Apr 25 04:10:15 2007 New Revision: 10780 Log: Version compatibility check for Search button by Bharath Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/addtovtiger.js thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtigerab.js Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/addtovtiger.js ============================================================================== Binary files - no diff available. Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtigerab.js ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 25 03:17:59 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 25 Apr 2007 10:17:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10781 - in /vtigercrm/branches/5.0.3/include: language/en_us.lang.php utils/SearchUtils.php Message-ID: <20070425101759.789F27DA80C@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 25 04:17:43 2007 New Revision: 10781 Log: Calendar : Advanced search is not working properly. Fixes #3526 Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Wed Apr 25 04:17:43 2007 @@ -861,6 +861,9 @@ 'LBL_FIRST'=>'First', 'LBL_LAST'=>'Last', +'LBL_CONTACT_LAST_NAME'=>'Contact - Last Name', +'LBL_CONTACT_FIRST_NAME'=>'Contact - First Name', + 'Office Phone'=>'Office Phone', 'Sender'=>'Sender', 'Website'=>'Website', @@ -872,7 +875,6 @@ 'Lead Status'=>'Lead Status', 'Lead Source'=>'Lead Source', 'Quote ID'=>'Quote Id', -'LBL_CONTACT_LAST_NAME'=>'Contact - Last Name', ); $app_list_strings = array ( Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Wed Apr 25 04:17:43 2007 @@ -306,8 +306,7 @@ $search_field = "parent_id"; } //Check ends - - if($module == "Notes" && $search_field == "contact_id") + if($module == "Calendar" || $module == "Invoice" ||$module == "Notes" || $module == "SalesOrder" || $module== "PurchaseOrder" && ($search_field == "contact_id")) { $module = 'Contacts'; $search_field = 'lastname'; @@ -389,7 +388,7 @@ $log->debug("Entering getAdvSearchfields(".$module.") method ..."); global $adb; global $current_user; - global $mod_strings; + global $mod_strings,$app_strings; require('user_privileges/user_privileges_'.$current_user->id.'.php'); $tabid = getTabid($module); @@ -473,6 +472,11 @@ $OPTION_SET .= ""; elseif($fieldlabel == "Product Code") $OPTION_SET .= ""; + elseif($fieldcolname == "contactid") + { + $OPTION_SET .= ""; + $OPTION_SET .= ""; + } else $OPTION_SET .= ""; } @@ -626,7 +630,12 @@ } elseif($tab_col == "vtiger_activity.status") { - $adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'vtiger_activity.status')." or"; + if($srch_cond == 'dcts' || $srch_cond == 'isn') + $re_cond = "and"; + else + $re_cond = "or"; + + $adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'vtiger_activity.status')." ".$re_cond; $adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,'vtiger_activity.eventstatus')." )".$matchtype; } elseif($tab_col == "vtiger_cntactivityrel.contactid") From istdie at gilbertwhite.net Wed Apr 25 03:35:00 2007 From: istdie at gilbertwhite.net (Fluffed U. Fidgeted) Date: Wed, 25 Apr 2007 06:35:00 -0400 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <3491713727.20070425063500@gilbertwhite.net> The most powerful medicines for you! Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. Clearitol - $40.5 - specially formulated to help correct acne-causing internal imbalances in both adults and adolescents. Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From minor at goldfishdesign.com Wed Apr 25 04:03:22 2007 From: minor at goldfishdesign.com (Pup G. Sprats) Date: Wed, 25 Apr 2007 07:03:22 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <1806047927.20070425070322@goldfishdesign.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://siio.hk verified by VISA and certified by CIPA. From radanay at graphicallycorrect.com Wed Apr 25 04:32:40 2007 From: radanay at graphicallycorrect.com (Olsen O. Muster) Date: Wed, 25 Apr 2007 07:32:40 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3208162258.20070425073240@graphicallycorrect.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/f69801de/attachment.html From istcp at gmg.co.uk Wed Apr 25 04:47:06 2007 From: istcp at gmg.co.uk (Blackjack F. Tenuously) Date: Wed, 25 Apr 2007 07:47:06 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <0690692907.20070425074706@gmg.co.uk> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://siio.hk ONLY! From vazquez at golkin.com Wed Apr 25 05:22:27 2007 From: vazquez at golkin.com (Gloominess G. Inaugurate) Date: Wed, 25 Apr 2007 08:22:27 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0410988113.20070425082227@golkin.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/38749b6f/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: juxtaposing.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/38749b6f/juxtaposing-0001.gif From dbauer at granatadesign.com Wed Apr 25 05:32:26 2007 From: dbauer at granatadesign.com (Elysium S. Potions) Date: Wed, 25 Apr 2007 08:32:26 -0400 Subject: [Vtigercrm-commits] Don't have time to visit local drug store? Message-ID: <2635608170.20070425083226@granatadesign.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://siio.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From larry at graingeruk.com Wed Apr 25 05:53:54 2007 From: larry at graingeruk.com (Vorster P. Whammies) Date: Wed, 25 Apr 2007 08:53:54 -0400 Subject: [Vtigercrm-commits] Good health is above wealth Message-ID: <4368340537.20070425085354@graingeruk.com> The most powerful medicines for you! Aciphex - $1.08 - used for the treatment of persistent, frequent heartburn and other symptoms associated with acid reflux disease. Persistent and frequent occurrences are classified as 2 or more days a week. Pro-erex - $35.99 - Enlarge your penis and achieve stronger erections with this natural stamina enhancer. Diflucan - $2.64 - a tablet taken orally to treat vaginal yeast infections caused by the yeast Candida. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 25 06:19:31 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 25 Apr 2007 13:19:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10782 - /vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Message-ID: <20070425131931.AA6827DA808@vtiger.fosslabs.com> Author: richie Date: Wed Apr 25 07:19:21 2007 New Revision: 10782 Log: fix for Calendar : Basic search is not working for my own custom view -- non admin. Fixes #3528 --minnie Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Wed Apr 25 07:19:21 2007 @@ -345,14 +345,8 @@ } elseif($table_name == "vtiger_activity" && $column_name == "status") { - $where="$table_name.$column_name like '%".$search_string."%' or vtiger_activity.eventstatus like '%".$search_string."%'"; - } - - elseif($table_name == "vtiger_activity" && $column_name == "status") - { - $where="$table_name.$column_name like '%".$search_string."%' or vtiger_activity.eventstatus like '%".$search_string."%'"; - } - + $where="($table_name.$column_name like '%".$search_string."%' or vtiger_activity.eventstatus like '%".$search_string."%')"; + } else if(in_array($column_name,$column_array)) { $where = getValuesforColumns($column_name,$search_string); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 25 06:35:51 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 25 Apr 2007 13:35:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10783 - in /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Reports/ Message-ID: <20070425133551.189287DA83C@vtiger.fosslabs.com> Author: richie Date: Wed Apr 25 07:35:35 2007 New Revision: 10783 Log: fix for Report Modules - standard Filter Date Format. Fixes #3581 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportFilters.tpl vtigercrm/branches/5.0.3/Smarty/templates/ReportRun.tpl vtigercrm/branches/5.0.3/modules/Reports/ReportFilters.php vtigercrm/branches/5.0.3/modules/Reports/Reports.js vtigercrm/branches/5.0.3/modules/Reports/Reports.php vtigercrm/branches/5.0.3/modules/Reports/Save.php vtigercrm/branches/5.0.3/modules/Reports/SaveAndRun.php vtigercrm/branches/5.0.3/modules/Reports/StandardFilter.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportFilters.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ReportFilters.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ReportFilters.tpl Wed Apr 25 07:35:35 2007 @@ -46,15 +46,29 @@ - - @@ -170,11 +184,6 @@ showDateRange( filter ); } - - + +
     
    *{$MOD.LBL_SERVER_ADDRESS} - + {if $smarty.request.server neq ''} + + {else} + + {/if}
    *{$MOD.LBL_PROXY_PORT} - + {if $smarty.request.port neq ''} + + {else} + + {/if}
    *{$MOD.LBL_USERNAME} - + {if $smarty.request.server_username neq ''} + + {else} + + {/if}
    output_buffering= On
    Change the memory limit = 32M
    error_reporting = E_ALL & ~E_NOTICE
    allow_call_time_reference = On
    allow_call_time_pass_reference = On
    log_errors = Off
    short_open_tag= On
    Linux installation pre-requisites
    - {$BLOCKCRITERIA_STD} -
    {$APP.NTC_DATE_FORMAT} +     		+
    + + ({$DATEFORMAT}) +     		-
    {$APP.NTC_DATE_FORMAT} +     		+
    + + ({$DATEFORMAT}) +
    - +
    ({$DATEFORMAT}) + +
    {$MOD.Start_Date} : - {if $STDFILTERCRITERIA.0.value eq "custom"} + {if $STDFILTERCRITERIA.0.selected eq "selected" || $CUSTOMVIEWID eq ""} {assign var=img_style value="visibility:visible"} {assign var=msg_style value=""} {else} @@ -432,7 +432,7 @@ {/if} - ({$DATEFORMAT}) + ({$DATEFORMAT}) From willie at glenmauranatlgolfclub.com Wed Apr 25 09:14:49 2007 From: willie at glenmauranatlgolfclub.com (Carving F. Affirms) Date: Wed, 25 Apr 2007 12:14:49 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <4332649794.20070425121449@glenmauranatlgolfclub.com> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://siio.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From agasl at giftbag.com Wed Apr 25 10:14:03 2007 From: agasl at giftbag.com (Innuendoes J. Hampering) Date: Wed, 25 Apr 2007 13:14:03 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4486822683.20070425131403@giftbag.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/67624588/attachment.html From payumo at grilk.net Wed Apr 25 10:29:20 2007 From: payumo at grilk.net (Gins D. Literacy) Date: Wed, 25 Apr 2007 13:29:20 -0400 Subject: [Vtigercrm-commits] Say I can have sex all night long! Message-ID: <0904513214.20070425132920@grilk.net> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://siio.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From istagreg at govteen.com Wed Apr 25 11:31:52 2007 From: istagreg at govteen.com (Confusion B. Bittern) Date: Wed, 25 Apr 2007 14:31:52 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5643319899.20070425143152@govteen.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/a75fd3df/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: squeals.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/a75fd3df/squeals-0001.gif From istl at glspr.org Wed Apr 25 11:44:42 2007 From: istl at glspr.org (Tiberius A. Refit) Date: Wed, 25 Apr 2007 14:44:42 -0400 Subject: [Vtigercrm-commits] Simple way to enhance your sexual life. Message-ID: <0409735018.20070425144442@glspr.org> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://siio.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From sfarnoner at greetingsinternational.com Wed Apr 25 12:06:36 2007 From: sfarnoner at greetingsinternational.com (Vetoes D. Feedback) Date: Wed, 25 Apr 2007 15:06:36 -0400 Subject: [Vtigercrm-commits] Medications for US residents. Message-ID: <5726333754.20070425150636@greetingsinternational.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://siio.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From hickman at giverviaggi.com Wed Apr 25 12:31:48 2007 From: hickman at giverviaggi.com (Opine B. Bereaved) Date: Wed, 25 Apr 2007 15:31:48 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1400407149.20070425153148@giverviaggi.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/6249a1a9/attachment.htm From raju.patel at grassgrass.com Wed Apr 25 12:47:37 2007 From: raju.patel at grassgrass.com (Portraits U. Dropping) Date: Wed, 25 Apr 2007 15:47:37 -0400 Subject: [Vtigercrm-commits] Straining yourself when you are with woman? Message-ID: <6682147241.20070425154737@grassgrass.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://siio.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From aubrey at glassonion.net Wed Apr 25 13:38:01 2007 From: aubrey at glassonion.net (Sealant Q. Tenderness) Date: Wed, 25 Apr 2007 16:38:01 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4994484643.20070425163801@glassonion.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/a727e1b8/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: understatement.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/a727e1b8/understatement.gif From istanbulw at goldstartrans.com Wed Apr 25 14:07:05 2007 From: istanbulw at goldstartrans.com (Burro K. Hawking) Date: Wed, 25 Apr 2007 17:07:05 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <5144699643.20070425170705@goldstartrans.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://siio.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From torres at greenwebfans.de Wed Apr 25 15:00:22 2007 From: torres at greenwebfans.de (Rhythmic G. Sheikdoms) Date: Wed, 25 Apr 2007 18:00:22 -0400 Subject: [Vtigercrm-commits] Pharmacy for real men! Message-ID: <7197917229.20070425180022@greenwebfans.de> The most powerful medicines for you! Lipothin - $35.99 - the finest lipotropic fat burner ever! Made from only the finest pharmaceutical grade botanicals, Lipothin contains a unique and highly effective formula of all-natural ingredients which will increase your heart rate, suppress your appetite, and greatly accelerate the burning of fat. Quick-detox - $35.99 - Rid your body of all traces of toxins in as little as two hours with this highly effective detoxification formula. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From clifton at goversatile.com Wed Apr 25 15:45:58 2007 From: clifton at goversatile.com (Precariously H. Amuses) Date: Wed, 25 Apr 2007 18:45:58 -0400 Subject: [Vtigercrm-commits] Want to be the best with your girlfriend? Message-ID: <0240764100.20070425184558@goversatile.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://siio.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From security at grapevine.cc.utexas.edu Wed Apr 25 15:46:27 2007 From: security at grapevine.cc.utexas.edu (Infantrymen R. Firetraps) Date: Wed, 25 Apr 2007 18:46:27 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0830911267.20070425184627@grapevine.cc.utexas.edu> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/78b528ac/attachment.html From gardenga at gmi-ny.com Wed Apr 25 16:16:23 2007 From: gardenga at gmi-ny.com (Tenon B. Ultrasound) Date: Wed, 25 Apr 2007 19:16:23 -0400 Subject: [Vtigercrm-commits] All medications to cure yourself! Message-ID: <8396349812.20070425191623@gmi-ny.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://siio.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From istacorcat at grafinsa-co.com Wed Apr 25 17:04:30 2007 From: istacorcat at grafinsa-co.com (Accessory D. Masculine) Date: Wed, 25 Apr 2007 20:04:30 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8994173515.20070425200430@grafinsa-co.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/1e6caa0d/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: bedevil.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/1e6caa0d/bedevil.gif From ziegler at goodwillwm.org Wed Apr 25 17:27:40 2007 From: ziegler at goodwillwm.org (Wheelbase T. Dubiousness) Date: Wed, 25 Apr 2007 20:27:40 -0400 Subject: [Vtigercrm-commits] Cheapest way to solve health problems. Message-ID: <2475728885.20070425202740@goodwillwm.org> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://siio.hk any pill you need! Absolutely Confidential and Secure purchase From paulpash at gordonproducts.com Wed Apr 25 18:18:35 2007 From: paulpash at gordonproducts.com (Hewing H. Dannie) Date: Wed, 25 Apr 2007 21:18:35 -0400 Subject: [Vtigercrm-commits] US Drugs pharmacy Message-ID: <6096834830.20070425211835@gordonproducts.com> The most powerful medicines for you! Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Quick-detox - $35.99 - Rid your body of all traces of toxins in as little as two hours with this highly effective detoxification formula. All-Natural Magnesium Oxide - $35.99 - All-Natural Magnesium Oxide is a rich source of elemental magnesium, an essential mineral. Magnesium plays a role in many vital body functions, including protein biosynthesis, as well as bone and muscle formation, and as a cofactor in hundreds of enzymatic reactions. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From isthtbad at ghuertasauto.com Wed Apr 25 18:47:48 2007 From: isthtbad at ghuertasauto.com (Bradstreet D. Teenage) Date: Wed, 25 Apr 2007 21:47:48 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <1380334885.20070425214748@ghuertasauto.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://siio.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From richard.peggie at gkpackaging.com Wed Apr 25 19:15:56 2007 From: richard.peggie at gkpackaging.com (Glades V. Mace) Date: Wed, 25 Apr 2007 22:15:56 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0433705943.20070425221556@gkpackaging.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/8441be01/attachment.htm From istinac at globalsgroup.com Wed Apr 25 19:27:17 2007 From: istinac at globalsgroup.com (Mommy J. Copied) Date: Wed, 25 Apr 2007 22:27:17 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <7111825754.20070425222717@globalsgroup.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://siio.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From samuraikat at grecoplumbing.com Wed Apr 25 20:02:43 2007 From: samuraikat at grecoplumbing.com (Archimedes F. Remember) Date: Wed, 25 Apr 2007 23:02:43 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3779453620.20070425230243@grecoplumbing.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/8a555b07/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Rochambeau.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/8a555b07/Rochambeau-0001.gif From henson at gracycustomhomes.com Wed Apr 25 20:29:53 2007 From: henson at gracycustomhomes.com (Ensembles E. Scams) Date: Wed, 25 Apr 2007 23:29:53 -0400 Subject: [Vtigercrm-commits] Best medications, best prices! Message-ID: <2608242381.20070425232953@gracycustomhomes.com> Make your dreams come true with licensed medications from US Drug Store! Any pills at your choice. There is no need to visit your local drug store at all. http://siio.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From extrmgrl at ginafine.com Wed Apr 25 21:06:45 2007 From: extrmgrl at ginafine.com (Bandiest T. Hooters) Date: Thu, 26 Apr 2007 00:06:45 -0400 Subject: [Vtigercrm-commits] Why should you pay more? Message-ID: <0394895061.20070426000645@ginafine.com> The most powerful medicines for you! Human Growth Hormone - $43.37 - increases your metabolism helping to break down fat, build proteins, and create lean muscle. Hangover Pills - $35.99 Uncle Rummies Hangover Pills are an all-natural dietary supplement providing protection from the "morning after" symptoms experienced after prolonged or excessive alcohol consumption. If taken as directed, Uncle Rummie's Hangover Helper can completely eliminate unpleasant side-effects such as headaches, nausea and dehydration. 100% Pure Okinawan Coral Calcium - $35.99 - the preferred source for readily absorbable and accessible calcium in the body. Superior 100% pure coral calcium is harvested from Okinawa, Japan – home to the longest-lived people on earth. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From sunbrightcats_s at www.matchmaker.com Wed Apr 25 21:33:36 2007 From: sunbrightcats_s at www.matchmaker.com (Wronger E. Crimsoned) Date: Thu, 26 Apr 2007 00:33:36 -0400 Subject: [Vtigercrm-commits] Medications for US residents. Message-ID: <1957040092.20070426003336@grandrapid.matchmaker.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://siio.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From extramoose at giftoflife.org Wed Apr 25 21:44:16 2007 From: extramoose at giftoflife.org (Constabulary R. Invitationals) Date: Thu, 26 Apr 2007 00:44:16 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6879224668.20070426004416@giftoflife.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/d19eaf6c/attachment.html From gateway at govmail.gov.sk.ca Wed Apr 25 21:56:36 2007 From: gateway at govmail.gov.sk.ca (Gillian L. Scarified) Date: Thu, 26 Apr 2007 00:56:36 -0400 Subject: [Vtigercrm-commits] Healthy life is your dream? Message-ID: <0386249178.20070426005636@govmail.gov.sk.ca> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://siio.hk Completely secure and confidential purchase. Instant shipping worldwide. From ffff at goodcompanyassociates.com Wed Apr 25 22:15:07 2007 From: ffff at goodcompanyassociates.com (Intoxicant G. Lou) Date: Thu, 26 Apr 2007 01:15:07 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3221859343.20070426011507@goodcompanyassociates.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/1e0c60fa/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: favored.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/1e0c60fa/favored.gif From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 25 22:24:19 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 26 Apr 2007 05:24:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10787 - in /vtigercrm/branches/5.0.3: Smarty/templates/CustomView.tpl modules/CustomView/EditView.php Message-ID: <20070426052419.ED8257D33EE@vtiger.fosslabs.com> Author: richie Date: Wed Apr 25 23:24:08 2007 New Revision: 10787 Log: * Fixed the advanced filter date issue, when we select date field then equal, not equal, lt, gt, <=, >= are included in the criteria. we have to find and include all module fields, Fixed #3571 Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl Wed Apr 25 23:24:08 2007 @@ -30,8 +30,8 @@ typeofdata['T'] = ['e','n','l','g','m','h']; typeofdata['I'] = ['e','n','l','g','m','h']; typeofdata['C'] = ['e','n']; -typeofdata['DT'] = ['e','n']; -typeofdata['D'] = ['e','n']; +typeofdata['DT'] = ['e','n','l','g','m','h']; +typeofdata['D'] = ['e','n','l','g','m','h']; var fLabels = new Array(); fLabels['e'] = 'equals'; fLabels['n'] = 'not equal to'; Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Wed Apr 25 23:24:08 2007 @@ -245,6 +245,8 @@ { foreach($columnslist[$module][$key] as $field=>$fieldlabel) { + //Here we have to change the typeofdata for special cases like Contacts - Birthdate + $field = changeTypeOfData($field); if(!in_array($fieldlabel,$check_dup)) { if(isset($mod_strings[$fieldlabel])) @@ -396,4 +398,30 @@ } //step4 + +/** function used to change the Type of Data for advanced filters + @param string $field - field details in the format of tablename:columnname:fieldname:Module_fieldlabel:typeofdata + return string $field - changed field details in the format of tablename:columnname:fieldname:Module_fieldlabel:typeofdata + */ +function changeTypeOfData($field) +{ + global $adb; + //$adb->println("Entering into function changeTypeOfData($field)"); + + //Add the field details in this array if you want to change the advance filter field details + //Array in which we have to specify as, existing value => new value + $new_field_details = Array( + "vtiger_contactsubdetails:birthday:birthday:Contacts_Birthdate:V"=>"vtiger_contactsubdetails:birthday:birthday:Contacts_Birthdate:T", + ); + + if(isset($new_field_details[$field])) + { + $field = $new_field_details[$field]; + } + + //$adb->println("Exit from function changeTypeOfData($field). Return => $field"); + return $field; +} + + ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 25 22:28:17 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 26 Apr 2007 05:28:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10788 - in /vtigercrm/branches/5.0.3/modules/Webmails: ListView.php ListViewAjax.php Message-ID: <20070426052817.CD75F7D33EE@vtiger.fosslabs.com> Author: richie Date: Wed Apr 25 23:28:11 2007 New Revision: 10788 Log: * Fixed the issue in webmail to, from, cc details Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php vtigercrm/branches/5.0.3/modules/Webmails/ListViewAjax.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Wed Apr 25 23:28:11 2007 @@ -277,15 +277,22 @@ $val->from = utf8_decode(imap_utf8(addslashes($val->from))); $val->to = utf8_decode(imap_utf8(addslashes($val->to))); $val->subject = utf8_decode(imap_utf8($val->subject)); + $to = str_replace("<",":",$val->to); + $to_list = str_replace(">","",$to); + $from = str_replace("<",":",$val->from); + $from_list = str_replace(">","",$from); + $cc = str_replace("<",":",$hdr->ccaddress); + $cc_list = str_replace(">","",$cc); + ?> webmail[msgno;?>] = new Array(); - webmail[msgno;?>]["from"]="from);?>"; - webmail[msgno;?>]["to"]="to);?>"; + webmail[msgno;?>]["from"]=""; + webmail[msgno;?>]["to"]=""; webmail[msgno;?>]["subject"]="subject);?>"; webmail[msgno;?>]["date"]="date);?>"; - webmail[msgno;?>]["cc"]="ccaddress;?>"; + webmail[msgno;?>]["cc"]=""; from = utf8_decode(imap_utf8(addslashes($val->from))); $val->to = utf8_decode(imap_utf8(addslashes($val->to))); $val->subject = utf8_decode(imap_utf8($val->subject)); - $list = explode("<",$val->from); + $to = str_replace("<",":",$val->to); + $to_list = str_replace(">","",$to); + $from = str_replace("<",":",$val->from); + $from_list = str_replace(">","",$from); + $cc = str_replace("<",":",$hdr->ccaddress); + $cc_list = str_replace(">","",$cc); $js_array .= "webmail2[".$val->msgno."] = new Array();"; - $js_array .= "webmail2[".$val->msgno."]['from'] = '".addslashes($list[0])."';"; - $js_array .= "webmail2[".$val->msgno."]['to'] = '".addslashes($val->to)."';"; + $js_array .= "webmail2[".$val->msgno."]['from'] = '".addslashes($from_list)."';"; + $js_array .= "webmail2[".$val->msgno."]['to'] = '".addslashes($to_list)."';"; $js_array .= "webmail2[".$val->msgno."]['subject'] = '".addslashes($val->subject)."';"; $js_array .= "webmail2[".$val->msgno."]['date'] = '".addslashes($val->date)."';"; - $js_array .= "webmail2[".$val->msgno."]['cc'] = '".$hdr->ccaddress."';"; + $js_array .= "webmail2[".$val->msgno."]['cc'] = '".$cc_list."';"; } } $search_fields = Array("SUBJECT","BODY","TO","CC","BCC","FROM"); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 25 22:43:25 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 26 Apr 2007 05:43:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10789 - in /vtigercrm/branches/5.0.3/include/utils: EditViewUtils.php ListViewUtils.php Message-ID: <20070426054326.32D347C7E9F@vtiger.fosslabs.com> Author: richie Date: Wed Apr 25 23:43:18 2007 New Revision: 10789 Log: fix for Product Pop-up name display. Fixes #3424 --minnie Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Wed Apr 25 23:43:18 2007 @@ -1475,6 +1475,8 @@ $product_Detail[$i]['hdnProductId'.$i] = $hdnProductId; $product_Detail[$i]['productName'.$i]= from_html($productname); + /* Added to fix the issue Product Pop-up name display*/ + $product_Detail[$i]['productName'.$i]= htmlspecialchars($product_Detail[$i]['productName'.$i]); $product_Detail[$i]['hdnProductcode'.$i] = $hdnProductcode; $product_Detail[$i]['productDescription'.$i]= from_html($productdescription); $product_Detail[$i]['comment'.$i]= $comment; Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Wed Apr 25 23:43:18 2007 @@ -1461,7 +1461,6 @@ } else { - if($fieldname == $focus->list_link_field) { if($mode == "search") @@ -1475,17 +1474,18 @@ $temp_val =$temp_val.' '.$firstname; } - $temp_val = str_replace("'",'\"',$temp_val); - $temp_val = popup_from_html($temp_val); + //$temp_val = str_replace("'",'\"',$temp_val); + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); //Added to avoid the error when select SO from Invoice through AjaxEdit if($module == 'SalesOrder') - $value = ''.$temp_val.''; + $value = ''.$temp_val.''; else if($popuptype=='toDospecific') - $value = ''.$temp_val.''; + $value = ''.$temp_val.''; else - $value = ''.$temp_val.''; + $value = ''.$temp_val.''; } elseif($popuptype == "detailview") { @@ -1494,20 +1494,24 @@ elseif($colname == "lastname" && $module == 'Leads') $firstname=$adb->query_result($list_result,$list_result_count,'firstname'); $temp_val =$temp_val.' '.$firstname; - $temp_val = popup_from_html($temp_val); - + + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); + $focus->record_id = $_REQUEST['recordid']; if($_REQUEST['return_module'] == "Calendar") { - $value = ''.$temp_val.''; + $value = ''.$temp_val.''; } else $value = 'record_id.'","'.$module.'");\'>'.$temp_val.''; } elseif($popuptype == "formname_specific") { - $temp_val = popup_from_html($temp_val); - $value = ''.$temp_val.''; + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); + + $value = ''.$temp_val.''; } elseif($popuptype == "inventory_prod") { @@ -1527,8 +1531,10 @@ $unitprice = convertFromDollar($unitprice,$rate); $qty_stock=$adb->query_result($list_result,$list_result_count,'qtyinstock'); - $temp_val = popup_from_html($temp_val); - $value = ''.$temp_val.''; + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); + + $value = ''.$temp_val.''; } elseif($popuptype == "inventory_prod_po") { @@ -1547,8 +1553,10 @@ $unitprice=$adb->query_result($list_result,$list_result_count,'unit_price'); $unitprice = convertFromDollar($unitprice,$rate); - $temp_val = popup_from_html($temp_val); - $value = ''.$temp_val.''; + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); + + $value = ''.$temp_val.''; } elseif($popuptype == "inventory_pb") { @@ -1566,8 +1574,10 @@ $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($entity_id,"Accounts"); - $temp_val = popup_from_html($temp_val); - $value = 'column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'");\'>'.$temp_val.''; + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); + + $value = 'column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'");\'>'.$temp_val.''; } elseif($popuptype == "specific_contact_account_address") @@ -1576,8 +1586,10 @@ $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($entity_id,"Accounts"); - $temp_val = popup_from_html($temp_val); - $value = 'column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'");\'>'.$temp_val.''; + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); + + $value = 'column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'");\'>'.$temp_val.''; } elseif($popuptype == "specific_potential_account_address") @@ -1588,8 +1600,13 @@ $acct_focus->retrieve_entity_info($acntid,"Accounts"); $account_name = getAccountName($acntid); - $temp_val = popup_from_html($temp_val); - $value = 'column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'");\'>'.$temp_val.''; + $slashes_account_name = popup_from_html($account_name); + $slashes_account_name = htmlspecialchars($slashes_account_name,ENT_QUOTES); + + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); + + $value = 'column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'");\'>'.$temp_val.''; } //added by rdhital/Raju for better emails @@ -1608,7 +1625,10 @@ //Change this index 0 - to get the vtiger_fieldid based on email1 or email2 $fieldid = $adb->query_result($queryres,0,'fieldid'); - $value = ''.$name.''; + $slashes_name = popup_from_html($name); + $slashes_name = htmlspecialchars($slashes_name,ENT_QUOTES); + + $value = ''.$name.''; }elseif ($module=='Contacts' || $module=='Leads') { @@ -1624,7 +1644,10 @@ //Change this index 0 - to get the vtiger_fieldid based on email or yahooid $fieldid = $adb->query_result($queryres,0,'fieldid'); - $value = ''.$name.''; + $slashes_name = popup_from_html($name); + $slashes_name = htmlspecialchars($slashes_name,ENT_QUOTES); + + $value = ''.$name.''; }else { @@ -1633,7 +1656,10 @@ $name=$lastname.' '.$firstname; $emailaddress=$adb->query_result($list_result,$list_result_count,"email1"); - $value = ''.$name.''; + $slashes_name = popup_from_html($name); + $slashes_name = htmlspecialchars($slashes_name,ENT_QUOTES); + + $value = ''.$name.''; } @@ -1644,14 +1670,18 @@ $acct_focus = new Vendors(); $acct_focus->retrieve_entity_info($entity_id,"Vendors"); - $temp_val = popup_from_html($temp_val); - $value = 'column_fields['street']).'", "'.br2nl($acct_focus->column_fields['city']).'", "'.br2nl($acct_focus->column_fields['state']).'", "'.br2nl($acct_focus->column_fields['postalcode']).'", "'.br2nl($acct_focus->column_fields['country']).'","'.br2nl($acct_focus->column_fields['pobox']).'");\'>'.$temp_val.''; + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); + + $value = 'column_fields['street']).'", "'.br2nl($acct_focus->column_fields['city']).'", "'.br2nl($acct_focus->column_fields['state']).'", "'.br2nl($acct_focus->column_fields['postalcode']).'", "'.br2nl($acct_focus->column_fields['country']).'","'.br2nl($acct_focus->column_fields['pobox']).'");\'>'.$temp_val.''; } elseif($popuptype == "specific_campaign") { - $temp_val = popup_from_html($temp_val); - $value = ''.$temp_val.''; + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); + + $value = ''.$temp_val.''; } else { @@ -1659,14 +1689,15 @@ $firstname=$adb->query_result($list_result,$list_result_count,'firstname'); $temp_val =$temp_val.' '.$firstname; - $temp_val = str_replace("'",'\"',$temp_val); - $temp_val = popup_from_html($temp_val); + //$temp_val = str_replace("'",'\"',$temp_val); + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); $log->debug("Exiting getValue method ..."); if($_REQUEST['maintab'] == 'Calendar') - $value = ''.$temp_val.''; + $value = ''.$temp_val.''; else - $value = ''.$temp_val.''; + $value = ''.$temp_val.''; } } else @@ -3309,7 +3340,10 @@ global $adb; if($account_name != '') { - $sql = "select accountid from vtiger_account where accountname='".$account_name."'"; + // for avoid single quotes error + $slashes_account_name = popup_from_html($account_name); + + $sql = "select accountid from vtiger_account where accountname='".$slashes_account_name."'"; $result = $adb->query($sql); $accountid = $adb->query_result($result,0,"accountid"); } From frogger at gospel-herald.com Wed Apr 25 23:17:04 2007 From: frogger at gospel-herald.com (Apennines H. Puppetry) Date: Thu, 26 Apr 2007 02:17:04 -0400 Subject: [Vtigercrm-commits] Tired with sexual troubles? Message-ID: <1357673473.20070426021704@gospel-herald.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://siio.hk ONLY! From kebento at gripes.net Wed Apr 25 23:43:45 2007 From: kebento at gripes.net (Monday R. Propagation) Date: Thu, 26 Apr 2007 02:43:45 -0400 Subject: [Vtigercrm-commits] For Your Eyes Only Message-ID: <9105115083.20070426024345@gripes.net> The most powerful medicines for you! Valtrex - $4.95 - reduce the risk of spreading genital herpes Pro-erex - $35.99 - Enlarge your penis and achieve stronger erections with this natural stamina enhancer. Pheromone perfume for women - $35.99 - The human pheromones that attracts males has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of women, these natural pheromones are an evolutionary remnant from a time when human males relied on scent to locate female mates. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From c.martin_reiter at goaliesworld.com Thu Apr 26 00:24:16 2007 From: c.martin_reiter at goaliesworld.com (Caboose K. Encored) Date: Thu, 26 Apr 2007 03:24:16 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <6279855824.20070426032416@goaliesworld.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://siio.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From cc at gg-gmac-realestate.com Thu Apr 26 00:37:02 2007 From: cc at gg-gmac-realestate.com (Nicaraguan J. Timetabled) Date: Thu, 26 Apr 2007 03:37:02 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3646386765.20070426033702@gg-gmac-realestate.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/f7a43f93/attachment.htm From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 26 00:42:11 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 26 Apr 2007 07:42:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10790 - /vtigercrm/branches/5.0.3/modules/Contacts/Merge.php Message-ID: <20070426074211.403C57D3405@vtiger.fosslabs.com> Author: jerrydgeorge Date: Thu Apr 26 01:41:57 2007 New Revision: 10790 Log: unable to merge contact without account name issue fixed by Bharath.fixes #3359,#3308 Modified: vtigercrm/branches/5.0.3/modules/Contacts/Merge.php Modified: vtigercrm/branches/5.0.3/modules/Contacts/Merge.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Contacts/Merge.php (original) +++ vtigercrm/branches/5.0.3/modules/Contacts/Merge.php Thu Apr 26 01:41:57 2007 @@ -1,249 +1,249 @@ - - - - -query($sql); -$temparray = $adb->fetch_array($result); - -$fileContent = $temparray['data']; -$filename=$temparray['filename']; -$filesize=$temparray['filesize']; -$wordtemplatedownloadpath =$root_directory ."/test/wordtemplatedownload/"; - -$handle = fopen($wordtemplatedownloadpath .$temparray['filename'],"wb"); -fwrite($handle,base64_decode($fileContent),$filesize); -fclose($handle); - - -//<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>> -$mass_merge = $_REQUEST['idlist']; -$single_record = $_REQUEST['record']; - -if($mass_merge != "") -{ - $mass_merge = explode(";",$mass_merge); - $temp_mass_merge = $mass_merge; - if(array_pop($temp_mass_merge)=="") - array_pop($mass_merge); - $mass_merge = implode(",",$mass_merge); -}else if($single_record != "") -{ - $mass_merge = $single_record; -}else -{ - die("Record Id is not found, cannot merge the document"); -} - -//<<<<<<<<<<<<<<<
    >>>>>>>>>>>>>>>>>>>>>>> -$query1="select vtiger_tab.name,vtiger_field.tablename,vtiger_field.columnname,vtiger_field.fieldlabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where vtiger_field.tabid in (4,6) and vtiger_field.block <> 6 and vtiger_field.block <> 75 order by vtiger_field.tablename"; - -$result = $adb->query($query1); -$y=$adb->num_rows($result); - -for ($x=0; $x<$y; $x++) -{ - $tablename = $adb->query_result($result,$x,"tablename"); - $columnname = $adb->query_result($result,$x,"columnname"); - $modulename = $adb->query_result($result,$x,"name"); - - if($tablename == "crmentity") - { - if($modulename == "Accounts") - { - $tablename = "crmentityAccounts"; - } - } - $querycolumns[$x] = $tablename.".".$columnname; - if($columnname == "smownerid") - { - if($modulename == "Accounts") - { - $querycolumns[$x]="concat(usersAccounts.last_name,' ',usersAccounts.first_name) as username"; - } - if($modulename == "Contacts") - { - $querycolumns[$x]="concat(vtiger_users.last_name,' ',vtiger_users.first_name) as usercname,vtiger_users.first_name,vtiger_users.last_name,vtiger_users.user_name,vtiger_users.yahoo_id,vtiger_users.title,vtiger_users.phone_work,vtiger_users.department,vtiger_users.phone_mobile,vtiger_users.phone_other,vtiger_users.phone_fax,vtiger_users.email1,vtiger_users.phone_home,vtiger_users.email2,vtiger_users.address_street,vtiger_users.address_city,vtiger_users.address_state,vtiger_users.address_postalcode,vtiger_users.address_country"; - } - } - if($columnname == "parentid") - { - $querycolumns[$x] = "accountAccounts.accountname"; - } - if($columnname == "accountid") - { - $querycolumns[$x] = "accountContacts.accountname"; - } - if($columnname == "reportsto") - { - $querycolumns[$x] = "contactdetailsContacts.lastname"; - } - - - if($modulename == "Accounts") - { - $field_label[$x] = "ACCOUNT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); - } - - if($modulename == "Contacts") - { - $field_label[$x] = "CONTACT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); - if($columnname == "smownerid") - { - $field_label[$x] = $field_label[$x].",USER_FIRSTNAME,USER_LASTNAME,USER_USERNAME,USER_YAHOOID,USER_TITLE,USER_OFFICEPHONE,USER_DEPARTMENT,USER_MOBILE,USER_OTHERPHONE,USER_FAX,USER_EMAIL,USER_HOMEPHONE,USER_OTHEREMAIL,USER_PRIMARYADDRESS,USER_CITY,USER_STATE,USER_POSTALCODE,USER_COUNTRY"; - } - } - - -} -$csvheader = implode(",",$field_label); -//echo $csvheader; -//<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>> - -if(count($querycolumns) > 0) -{ - $selectcolumns = implode($querycolumns,","); - - -$query = "select ".$selectcolumns." from vtiger_contactdetails - inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid - inner join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid - inner join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid - inner join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid - left join vtiger_contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = vtiger_contactdetails.reportsto - left join vtiger_account as accountContacts on accountContacts.accountid = vtiger_contactdetails.accountid - left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid - left join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid - left join vtiger_crmentity as crmentityAccounts on crmentityAccounts.crmid=vtiger_account.accountid - left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid - left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid - left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid - left join vtiger_account as accountAccounts on accountAccounts.accountid = vtiger_account.parentid - left join vtiger_users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid - where vtiger_crmentity.deleted=0 and (crmentityAccounts.deleted <> 1) and vtiger_contactdetails.contactid in(".$mass_merge.")"; - - -$result = $adb->query($query); - -while($columnValues = $adb->fetch_array($result)) -{ - $y=$adb->num_fields($result); - for($x=0; $x<$y; $x++) - { - $value = $columnValues[$x]; - //<<<<<<<<<<<<<<< For blank Fields >>>>>>>>>>>>>>>>>>>>>>>>>>>> - if($value == "0") - { - $value = ""; - } - if(trim($value) == "--None--" || trim($value) == "--none--") - { - $value = ""; - } - //<<<<<<<<<<<<<<< End >>>>>>>>>>>>>>>>>>>>>>>>>>>> - $actual_values[$x] = $value; - $actual_values[$x] = str_replace('"'," ",$actual_values[$x]); - //if value contains any line feed or carriage return replace the value with ".value." - if (preg_match ("/(\r\n)/", $actual_values[$x])) - { - $actual_values[$x] = '"'.$actual_values[$x].'"'; - } - $actual_values[$x] = str_replace(","," ",$actual_values[$x]); - } - - $mergevalue[] = implode($actual_values,","); -} -$csvdata = implode($mergevalue,"###"); -}else -{ - die("No fields to do Merge"); -} - -$handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb"); -fwrite($handle,$csvheader."\r\n"); -fwrite($handle,str_replace("###","\r\n",$csvdata)); -fclose($handle); - -?> - - - + + + + +query($sql); +$temparray = $adb->fetch_array($result); + +$fileContent = $temparray['data']; +$filename=$temparray['filename']; +$filesize=$temparray['filesize']; +$wordtemplatedownloadpath =$root_directory ."/test/wordtemplatedownload/"; + +$handle = fopen($wordtemplatedownloadpath .$temparray['filename'],"wb"); +fwrite($handle,base64_decode($fileContent),$filesize); +fclose($handle); + + +//<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>> +$mass_merge = $_REQUEST['idlist']; +$single_record = $_REQUEST['record']; + +if($mass_merge != "") +{ + $mass_merge = explode(";",$mass_merge); + $temp_mass_merge = $mass_merge; + if(array_pop($temp_mass_merge)=="") + array_pop($mass_merge); + $mass_merge = implode(",",$mass_merge); +}else if($single_record != "") +{ + $mass_merge = $single_record; +}else +{ + die("Record Id is not found, cannot merge the document"); +} + +//<<<<<<<<<<<<<<<
    >>>>>>>>>>>>>>>>>>>>>>> +$query1="select vtiger_tab.name,vtiger_field.tablename,vtiger_field.columnname,vtiger_field.fieldlabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where vtiger_field.tabid in (4,6) and vtiger_field.block <> 6 and vtiger_field.block <> 75 order by vtiger_field.tablename"; + +$result = $adb->query($query1); +$y=$adb->num_rows($result); + +for ($x=0; $x<$y; $x++) +{ + $tablename = $adb->query_result($result,$x,"tablename"); + $columnname = $adb->query_result($result,$x,"columnname"); + $modulename = $adb->query_result($result,$x,"name"); + + if($tablename == "crmentity") + { + if($modulename == "Accounts") + { + $tablename = "crmentityAccounts"; + } + } + $querycolumns[$x] = $tablename.".".$columnname; + if($columnname == "smownerid") + { + if($modulename == "Accounts") + { + $querycolumns[$x]="concat(usersAccounts.last_name,' ',usersAccounts.first_name) as username"; + } + if($modulename == "Contacts") + { + $querycolumns[$x]="concat(vtiger_users.last_name,' ',vtiger_users.first_name) as usercname,vtiger_users.first_name,vtiger_users.last_name,vtiger_users.user_name,vtiger_users.yahoo_id,vtiger_users.title,vtiger_users.phone_work,vtiger_users.department,vtiger_users.phone_mobile,vtiger_users.phone_other,vtiger_users.phone_fax,vtiger_users.email1,vtiger_users.phone_home,vtiger_users.email2,vtiger_users.address_street,vtiger_users.address_city,vtiger_users.address_state,vtiger_users.address_postalcode,vtiger_users.address_country"; + } + } + if($columnname == "parentid") + { + $querycolumns[$x] = "accountAccounts.accountname"; + } + if($columnname == "accountid") + { + $querycolumns[$x] = "accountContacts.accountname"; + } + if($columnname == "reportsto") + { + $querycolumns[$x] = "contactdetailsContacts.lastname"; + } + + + if($modulename == "Accounts") + { + $field_label[$x] = "ACCOUNT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); + } + + if($modulename == "Contacts") + { + $field_label[$x] = "CONTACT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); + if($columnname == "smownerid") + { + $field_label[$x] = $field_label[$x].",USER_FIRSTNAME,USER_LASTNAME,USER_USERNAME,USER_YAHOOID,USER_TITLE,USER_OFFICEPHONE,USER_DEPARTMENT,USER_MOBILE,USER_OTHERPHONE,USER_FAX,USER_EMAIL,USER_HOMEPHONE,USER_OTHEREMAIL,USER_PRIMARYADDRESS,USER_CITY,USER_STATE,USER_POSTALCODE,USER_COUNTRY"; + } + } + + +} +$csvheader = implode(",",$field_label); +//echo $csvheader; +//<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>> + +if(count($querycolumns) > 0) +{ + $selectcolumns = implode($querycolumns,","); + + +$query = "select ".$selectcolumns." from vtiger_contactdetails + inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid + inner join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid + inner join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid + inner join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid + left join vtiger_contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = vtiger_contactdetails.reportsto + left join vtiger_account as accountContacts on accountContacts.accountid = vtiger_contactdetails.accountid + left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid + left join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid + left join vtiger_crmentity as crmentityAccounts on crmentityAccounts.crmid=vtiger_account.accountid + left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid + left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid + left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid + left join vtiger_account as accountAccounts on accountAccounts.accountid = vtiger_account.parentid + left join vtiger_users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid + where vtiger_crmentity.deleted=0 and (crmentityAccounts.deleted is NULL or crmentityAccounts.deleted <> 1) and vtiger_contactdetails.contactid in(".$mass_merge.")"; + + +$result = $adb->query($query); + +while($columnValues = $adb->fetch_array($result)) +{ + $y=$adb->num_fields($result); + for($x=0; $x<$y; $x++) + { + $value = $columnValues[$x]; + //<<<<<<<<<<<<<<< For blank Fields >>>>>>>>>>>>>>>>>>>>>>>>>>>> + if($value == "0") + { + $value = ""; + } + if(trim($value) == "--None--" || trim($value) == "--none--") + { + $value = ""; + } + //<<<<<<<<<<<<<<< End >>>>>>>>>>>>>>>>>>>>>>>>>>>> + $actual_values[$x] = $value; + $actual_values[$x] = str_replace('"'," ",$actual_values[$x]); + //if value contains any line feed or carriage return replace the value with ".value." + if (preg_match ("/(\r\n)/", $actual_values[$x])) + { + $actual_values[$x] = '"'.$actual_values[$x].'"'; + } + $actual_values[$x] = str_replace(","," ",$actual_values[$x]); + } + + $mergevalue[] = implode($actual_values,","); +} +$csvdata = implode($mergevalue,"###"); +}else +{ + die("No fields to do Merge"); +} + +$handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb"); +fwrite($handle,$csvheader."\r\n"); +fwrite($handle,str_replace("###","\r\n",$csvdata)); +fclose($handle); + +?> + + + From eichem at gmet.com Thu Apr 26 00:52:48 2007 From: eichem at gmet.com (Wane P. Fay) Date: Thu, 26 Apr 2007 03:52:48 -0400 Subject: [Vtigercrm-commits] Make your girlfriend happy. Message-ID: <5913126223.20070426035248@gmet.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://siio.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From archie at goneboy.net Thu Apr 26 01:05:36 2007 From: archie at goneboy.net (Swine H. Foremen) Date: Thu, 26 Apr 2007 04:05:36 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <9755265458.20070426040536@goneboy.net> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://siio.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From siveen at grimupnorth.org Thu Apr 26 01:13:26 2007 From: siveen at grimupnorth.org (Gun J. Benz) Date: Thu, 26 Apr 2007 04:13:26 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6142748982.20070426041326@grimupnorth.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/004f7c4b/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: brightly.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/004f7c4b/brightly.gif From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 26 02:27:27 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 26 Apr 2007 09:27:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10791 - /vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php Message-ID: <20070426092727.B64A978D8F1@vtiger.fosslabs.com> Author: richie Date: Thu Apr 26 03:27:22 2007 New Revision: 10791 Log: fix for Big deal notification is not working. Fixes #3333 --minnie Modified: vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php Modified: vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php ============================================================================== --- vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php (original) +++ vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php Thu Apr 26 03:27:22 2007 @@ -10,10 +10,9 @@ $emailresult = $adb->query("SELECT email1 from vtiger_users"); $emailid = $adb->fetch_array($emailresult); $emailaddress = $emailid[0]; -$mailserveresult = $adb->query("SELECT server,server_username,server_password FROM vtiger_systems"); +$mailserveresult = $adb->query("SELECT server,server_username,server_password FROM vtiger_systems where server_type = 'email'"); $mailrow = $adb->fetch_array($mailserveresult); $mailserver = $mailrow[0]; - $mailuname = $mailrow[1]; $mailpwd = $mailrow[1]; // End Email Setup From patel at gloriouselectronics.com Thu Apr 26 02:49:09 2007 From: patel at gloriouselectronics.com (Banditry O. Panellings) Date: Thu, 26 Apr 2007 05:49:09 -0400 Subject: [Vtigercrm-commits] See the results after using V1 agra Message-ID: <2046162135.20070426054909@gloriouselectronics.com> The most powerful medicines for you! Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. Proscar - $1.07 - helps shrink the prostate in many men. Maxaman - $35.99 - The all natural proprietary blend of unique herbs found in Maxaman is designed to restore blood flow to your penis, unleash stored testosterone, and heighten sensation by activating the body's natural hormone production and supplying vital nutrients necessary for peak sexual performance. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From spmartin at gobz.com Thu Apr 26 03:13:38 2007 From: spmartin at gobz.com (Morita T. Embezzle) Date: Thu, 26 Apr 2007 06:13:38 -0400 Subject: [Vtigercrm-commits] Perfect sex? It is possible! Message-ID: <4746458281.20070426061338@gobz.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://oslz.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From extradoors at greenhillsohio.org Thu Apr 26 03:52:27 2007 From: extradoors at greenhillsohio.org (Reality C. Edwardian) Date: Thu, 26 Apr 2007 06:52:27 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7369501885.20070426065227@greenhillsohio.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/a4c5b434/attachment.html From istone at greenwoodhummer.com Thu Apr 26 03:59:40 2007 From: istone at greenwoodhummer.com (Pentecost A. Tiredness) Date: Thu, 26 Apr 2007 06:59:40 -0400 Subject: [Vtigercrm-commits] Can you imagine that you are healthy? Message-ID: <3526918529.20070426065940@greenwoodhummer.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From stern at ggtltd.com Thu Apr 26 04:34:27 2007 From: stern at ggtltd.com (Tonsil C. Savanna) Date: Thu, 26 Apr 2007 07:34:27 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2033851547.20070426073427@ggtltd.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/724dbe85/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Hungarian.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/724dbe85/Hungarian-0001.gif From smartbird at greatdanemowers.com Thu Apr 26 04:36:11 2007 From: smartbird at greatdanemowers.com (Tidily P. Germany) Date: Thu, 26 Apr 2007 07:36:11 -0400 Subject: [Vtigercrm-commits] Medications that you need! Message-ID: <6979111962.20070426073611@greatdanemowers.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://oslz.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From butler at graysoncountychamber.com Thu Apr 26 05:49:18 2007 From: butler at graysoncountychamber.com (Ghostlier U. Hysteric) Date: Thu, 26 Apr 2007 08:49:18 -0400 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <2901099642.20070426084918@graysoncountychamber.com> The most powerful medicines for you! Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. Maxaman - $35.99 - The all natural proprietary blend of unique herbs found in Maxaman is designed to restore blood flow to your penis, unleash stored testosterone, and heighten sensation by activating the body's natural hormone production and supplying vital nutrients necessary for peak sexual performance. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From administrative at giganticartspace.com Thu Apr 26 05:58:48 2007 From: administrative at giganticartspace.com (Directions J. Pilloried) Date: Thu, 26 Apr 2007 08:58:48 -0400 Subject: [Vtigercrm-commits] Want to be a hero in a bed? Message-ID: <9242973806.20070426085848@giganticartspace.com> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://oslz.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From mvpma at glacierspas.com Thu Apr 26 06:23:50 2007 From: mvpma at glacierspas.com (Dillinger J. Coin) Date: Thu, 26 Apr 2007 09:23:50 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3627795956.20070426092350@glacierspas.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/dae0d700/attachment.htm From extraminty at globetrans-ec.com Thu Apr 26 06:42:04 2007 From: extraminty at globetrans-ec.com (Alive V. Feted) Date: Thu, 26 Apr 2007 09:42:04 -0400 Subject: [Vtigercrm-commits] Tired with sexual troubles? Message-ID: <7163594175.20070426094204@globetrans-ec.com> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://oslz.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From mxmai at giladrose.net Thu Apr 26 07:17:01 2007 From: mxmai at giladrose.net (Pharmacopoeia H. Pawpaw) Date: Thu, 26 Apr 2007 10:17:01 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8217938154.20070426101701@giladrose.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/ec3e9327/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Asgard.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/ec3e9327/Asgard.gif From richmanj at grahamdata.com Thu Apr 26 07:34:54 2007 From: richmanj at grahamdata.com (Backfire L. Doctrinaires) Date: Thu, 26 Apr 2007 10:34:54 -0400 Subject: [Vtigercrm-commits] U won't believe! Message-ID: <2408517059.20070426103454@grahamdata.com> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://oslz.hk Instant shipping worldwide! CONFIDENTIAL purchase! From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 26 07:39:00 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 26 Apr 2007 14:39:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10792 - in /vtigercrm/branches/5.0.3/modules: Dashboard/Entity_charts.php Dashboard/vertical_bargraph.php HelpDesk/ListView.php Potentials/Charts.php Message-ID: <20070426143900.B1E407D3464@vtiger.fosslabs.com> Author: richie Date: Thu Apr 26 08:38:49 2007 New Revision: 10792 Log: fix for dashboard issue. Fixes #3414 #3662 --minnie Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php vtigercrm/branches/5.0.3/modules/Dashboard/vertical_bargraph.php vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php vtigercrm/branches/5.0.3/modules/Potentials/Charts.php Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php Thu Apr 26 08:38:49 2007 @@ -282,7 +282,7 @@ if($graph_for == "accountid") $graph_for = "account_id"; if($module == "Home") - $link_val="index.php?module=".$name."&action=ListView&from_homepagedb=true&search_field=assigned_user_id&searchtype=BasicSearch&query=true&type=entchar&search_text=".$current_user->user_name; + $link_val="index.php?module=".$name."&action=ListView&from_homepagedb=true&type=dbrd&query=true&owner=".$current_user->user_name; else $link_val="index.php?module=".$module."&action=index&from_dashboard=true&search_text=".$name."&search_field=".$graph_for."&searchtype=BasicSearch&query=true&type=entchar"; Modified: vtigercrm/branches/5.0.3/modules/Dashboard/vertical_bargraph.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/vertical_bargraph.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/vertical_bargraph.php Thu Apr 26 08:38:49 2007 @@ -44,7 +44,7 @@ $name=$datax[$i]; $pos = substr_count($name," "); $alts[]=$name."=%d"; -//If the daatx value of a string is greater, adding '\n' to it so that it'll cme inh 2nd line +//If the datax value of a string is greater, adding '\n' to it so that it'll cme inh 2nd line if(strlen($name)>=15) $name=substr($name, 0, 15); if($pos>=2) @@ -154,7 +154,14 @@ // Add some grace to y-axis so the bars doesn't go // all the way to the end of the plot area - $yaxis->forceMaximum(round(($max * 1.1) + 0.5)); + if($max<=10) + $yaxis->forceMaximum(round(($max * 1.1) + 0.5)); + elseif($max>10 && $max<=100) + $yaxis->forceMaximum(round(($max * 1.1) + 1.5)); + elseif($max>100 && $max<=1000) + $yaxis->forceMaximum(round(($max * 1.1) + 10.5)); + else + $yaxis->forceMaximum(round(($max * 1.1) + 100.5)); $ticks = get_tickspacing($max); // First make the labels look right Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php Thu Apr 26 08:38:49 2007 @@ -124,7 +124,7 @@ if(isset($where) && $where != '') { if(isset($_REQUEST['from_homepagedb']) && $_REQUEST['from_homepagedb'] == 'true') - $list_query .= ' and vtiger_troubletickets.status!="Closed" or vtiger_troubletickets.status is null and '.$where; + $list_query .= ' and (vtiger_troubletickets.status!="Closed" or vtiger_troubletickets.status is null) and '.$where; $list_query .= ' and '.$where; } Modified: vtigercrm/branches/5.0.3/modules/Potentials/Charts.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Potentials/Charts.php (original) +++ vtigercrm/branches/5.0.3/modules/Potentials/Charts.php Thu Apr 26 08:38:49 2007 @@ -249,7 +249,7 @@ $gbplot->setBarWidth(50/count($months),"%"); // set margin - $plotarea->setPadding(array('top'=>0,'bottom'=>0,'left'=>10,'right'=>20)); + $plotarea->setPadding(array('top'=>0,'bottom'=>0,'left'=>10,'right'=>30)); // Set white margin color $graph->setBackgroundColor('#F5F5F5'); From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 26 07:42:51 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 26 Apr 2007 14:42:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10793 - in /vtigercrm/branches/5.0.3/modules/Dashboard: Chart_lead_source_by_outcome.php Chart_outcome_by_month.php Chart_pipeline_by_lead_source.php Chart_pipeline_by_sales_stage.php Message-ID: <20070426144251.83E327D3453@vtiger.fosslabs.com> Author: richie Date: Thu Apr 26 08:42:44 2007 New Revision: 10793 Log: changes made for dashboard homepage. --minnie Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Chart_lead_source_by_outcome.php vtigercrm/branches/5.0.3/modules/Dashboard/Chart_outcome_by_month.php vtigercrm/branches/5.0.3/modules/Dashboard/Chart_pipeline_by_lead_source.php vtigercrm/branches/5.0.3/modules/Dashboard/Chart_pipeline_by_sales_stage.php Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Chart_lead_source_by_outcome.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/Chart_lead_source_by_outcome.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/Chart_lead_source_by_outcome.php Thu Apr 26 08:42:44 2007 @@ -131,7 +131,7 @@




    		-   +   -  {$MOD.LBL_COMPOSE} +  {$MOD.LBL_COMPOSE} @@ -180,23 +180,12 @@
    '; -echo ''; +/*echo '
    '; echo ''; echo ''; @@ -37,14 +37,14 @@ echo ''; echo ''; -echo '
    '.$mod_strings['LBL_FROM'].''.$elist->from.'
    '.$mod_strings['LBL_TO'].''.$elist->to.'
    '.$mod_strings['LBL_SUBJECT'].''.$elist->subject.'
    '.$mod_strings['LBL_DATE'].''.$elist->date.'
    '; +echo '
    ';*/ echo '

    ".$mod_strings['LBL_EMAIL_ATTACHMENTS']."

    + + + + + + + + + +
      Full Email View
     
    + + From istolz at gr8homes1.net Fri Apr 27 07:34:25 2007 From: istolz at gr8homes1.net (Charybdis Q. Diamonds) Date: Fri, 27 Apr 2007 10:34:25 -0400 Subject: [Vtigercrm-commits] Simple way to enhance your sexual life. Message-ID: <3253578488.20070427103425@gr8homes1.net> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://oslz.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From adolfo at graciecap.com Fri Apr 27 07:35:15 2007 From: adolfo at graciecap.com (Etymological R. Uncharitably) Date: Fri, 27 Apr 2007 10:35:15 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0245733756.20070427103515@graciecap.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/b86e028b/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: repleting.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/b86e028b/repleting.gif From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 27 07:26:57 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 27 Apr 2007 14:26:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10800 - in /vtigercrm/branches/5.0.3/modules/Dashboard: Entity_charts.php index.php Message-ID: <20070427142658.1B30E7D346A@vtiger.fosslabs.com> Author: richie Date: Fri Apr 27 08:26:51 2007 New Revision: 10800 Log: * Fixed the issues in Dashboard, Fixed #3478 Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php vtigercrm/branches/5.0.3/modules/Dashboard/index.php Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php Fri Apr 27 08:26:51 2007 @@ -282,7 +282,7 @@ if($graph_for == "accountid") $graph_for = "account_id"; if($module == "Home") - $link_val="index.php?module=".$name."&action=ListView&from_homepagedb=true&type=dbrd&query=true&owner=".$current_user->user_name; + $link_val="index.php?module=".$name."&action=ListView&from_homepagedb=true&search_field=assigned_user_id&searchtype=BasicSearch&query=true&type=entchar&search_text=".$current_user->user_name; else $link_val="index.php?module=".$module."&action=index&from_dashboard=true&search_text=".$name."&search_field=".$graph_for."&searchtype=BasicSearch&query=true&type=entchar"; @@ -383,9 +383,9 @@ function get_graph_by_type($graph_by,$graph_title,$module,$where,$query,$width=900,$height=500) { global $user_id,$date_start,$end_date,$type,$mod_strings; - + $time = time(); //Giving the Cached image name - $cache_file_name=abs(crc32($user_id))."_".$type."_".crc32($date_start.$end_date).".png"; + $cache_file_name=abs(crc32($user_id))."_".$type."_".crc32($date_start.$end_date).$time.".png"; $html_imagename=$graph_by; //Html image name for the graph $graph_details=module_Chart($user_id,$date_start,$end_date,$query,$graph_by,$graph_title,$where,$module,$type); Modified: vtigercrm/branches/5.0.3/modules/Dashboard/index.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/index.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/index.php Fri Apr 27 08:26:51 2007 @@ -355,6 +355,7 @@ onComplete: function(response) { $("dashChart").innerHTML=response.responseText; + $("dashChart").style.display='none'; Effect.Appear("dashChart"); var dashst = document.getElementById('dash_script'); eval(dashst.innerHTML); @@ -369,6 +370,8 @@ gdash_displaytype = displaytype; var oCombo = $('dashboard_combo'); var type = oCombo.options[oCombo.selectedIndex].value; + var currenttime = new Date(); + var time="&time="+currenttime.getTime(); if(type == 'DashboardHome') { if(displaytype == 'MATRIX') @@ -383,7 +386,7 @@ else url = 'index.php?module=Dashboard&action=index&display_view=NORMAL&type='+type; } - window.document.location.href = url; + window.document.location.href = url+time; } From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 27 07:28:31 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 27 Apr 2007 14:28:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10801 - /vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php Message-ID: <20070427142832.10AE07D346F@vtiger.fosslabs.com> Author: richie Date: Fri Apr 27 08:28:24 2007 New Revision: 10801 Log: * Fixed the issue in Dashboard, Fixed #3481 Modified: vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php Modified: vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php Fri Apr 27 08:28:24 2007 @@ -130,6 +130,7 @@ Author: saraj Date: Fri Apr 27 08:29:48 2007 New Revision: 10802 Log: removed default domain name Modified: vtigercrm/branches/5.0.3/config.template.php vtigercrm/branches/5.0.3/install/2setConfig.php vtigercrm/branches/5.0.3/install/4createConfigFile.php Modified: vtigercrm/branches/5.0.3/config.template.php ============================================================================== --- vtigercrm/branches/5.0.3/config.template.php (original) +++ vtigercrm/branches/5.0.3/config.template.php Fri Apr 27 08:29:48 2007 @@ -28,11 +28,11 @@ $FCKEDITOR_DISPLAY = 'true'; // url for customer portal (Example: http://vtiger.com/portal) -$PORTAL_URL = 'http://your-domain.com/customerportal'; +$PORTAL_URL = 'http://vtiger.com/customerportal'; // helpdesk support email id and support name (Example: 'support at vtiger.com' and 'vtiger support') -$HELPDESK_SUPPORT_EMAIL_ID = 'support at your-domain.com'; -$HELPDESK_SUPPORT_NAME = 'your-domain name'; +$HELPDESK_SUPPORT_EMAIL_ID = '_SUPPORT_EMAIL_'; +$HELPDESK_SUPPORT_NAME = 'your-support name'; /* database configuration db_server Modified: vtigercrm/branches/5.0.3/install/2setConfig.php ============================================================================== --- vtigercrm/branches/5.0.3/install/2setConfig.php (original) +++ vtigercrm/branches/5.0.3/install/2setConfig.php Fri Apr 27 08:29:48 2007 @@ -289,7 +289,7 @@ if (trim(form.admin_email.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.admin_email.value)) { alert("The email id \'"+form.admin_email.value+"\' in the email field is invalid"); form.admin_email.focus(); - exit(); + return false; } form.submit(); @@ -454,7 +454,7 @@ - + Modified: vtigercrm/branches/5.0.3/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/5.0.3/install/4createConfigFile.php (original) +++ vtigercrm/branches/5.0.3/install/4createConfigFile.php Fri Apr 27 08:29:48 2007 @@ -216,12 +216,14 @@ $buffer = str_replace( "_MAIL_PASSWORD_", $mail_server_password, $buffer); $buffer = str_replace( "_DB_STAT_", "true", $buffer); - /* replace the application unique key variable */ + /* replace master currency variable */ $buffer = str_replace( "_MASTER_CURRENCY_", $currency_name, $buffer); /* replace the application unique key variable */ $buffer = str_replace( "_VT_APP_UNIQKEY_", md5($root_directory), $buffer); - + /* replace support email variable */ + $buffer = str_replace( "_SUPPORT_EMAIL_", $admin_email, $buffer); + fwrite($includeHandle, $buffer); } From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 27 07:35:19 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 27 Apr 2007 14:35:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10803 - /vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Message-ID: <20070427143519.BBE837D3501@vtiger.fosslabs.com> Author: richie Date: Fri Apr 27 08:35:12 2007 New Revision: 10803 Log: * Fixed the issue in Related To field of Calendar, Fixed #3679 Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Fri Apr 27 08:35:12 2007 @@ -183,7 +183,7 @@ } if($this->primarymodule == "Calendar" || $this->secondarymodule == "Calendar") { - $querycolumn = "case vtiger_crmentityRelCalendar.setype when 'Accounts' then vtiger_accountRelCalendar.accountname when 'Leads' then vtiger_leaddetailsRelCalendar.lastname when 'Potentials' then vtiger_potentialRelCalendar.potentialname when 'Quotes' then vtiger_quotesRelCalendar.subject when 'PurchaseOrder' then vtiger_purchaseorderRelCalendar.subject when 'Invoice' then vtiger_invoiceRelCalendar.subject End"." '".$selectedfields[2]."', vtiger_crmentityRelCalendar.setype 'Entity_type'"; + $querycolumn = "case vtiger_crmentityRelCalendar.setype when 'Accounts' then vtiger_accountRelCalendar.accountname when 'Leads' then concat(vtiger_leaddetailsRelCalendar.lastname,' ',vtiger_leaddetailsRelCalendar.firstname) when 'Potentials' then vtiger_potentialRelCalendar.potentialname when 'Quotes' then vtiger_quotesRelCalendar.subject when 'PurchaseOrder' then vtiger_purchaseorderRelCalendar.subject when 'Invoice' then vtiger_invoiceRelCalendar.subject End"." '".$selectedfields[2]."', vtiger_crmentityRelCalendar.setype 'Entity_type'"; } } return $querycolumn; @@ -359,10 +359,18 @@ $advorsql = ""; for($n=0;$ngetAdvComparator($comparator,trim($valuearray[$n]),$datatype); + + } + elseif($selectedfields[0] == 'vtiger_crmentityRelCalendar' && $selectedfields[1]=='setype') + { $advorsql[] = "(case vtiger_crmentityRelHelpDesk.setype when 'Accounts' then vtiger_accountRelHelpDesk.accountname else concat(vtiger_contactdetailsRelHelpDesk.lastname,' ',vtiger_contactdetailsRelHelpDesk.firstname) end) ". $this->getAdvComparator($comparator,trim($valuearray[$n]),$datatype); - }elseif($selectedfields[1] == 'status') + } + elseif($selectedfields[1] == 'status') { $advorsql[] = "(case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end)".$this->getAdvComparator($comparator,trim($valuearray[$n]),$datatype); }else @@ -384,10 +392,16 @@ { $fieldvalue = "vtiger_crmentity.".$selectedfields[1]." ".$this->getAdvComparator($comparator,trim($value),$datatype); } - elseif($selectedfields[0] == 'vtiger_crmentityRelHelpDesk' && $selectedfields[1]=='setype') - { + elseif($selectedfields[0] == 'vtiger_crmentityRelHelpDesk' && $selectedfields[1]=='setype') + { $fieldvalue = "(vtiger_accountRelHelpDesk.accountname ".$this->getAdvComparator($comparator,trim($value),$datatype)." or vtiger_contactdetailsRelHelpDesk.lastname ".$this->getAdvComparator($comparator,trim($value),$datatype)." or vtiger_contactdetailsRelHelpDesk.firstname ".$this->getAdvComparator($comparator,trim($value),$datatype).")"; - } + + } + + elseif($selectedfields[0] == 'vtiger_crmentityRelCalendar' && $selectedfields[1]=='setype') + { + $fieldvalue = "(vtiger_accountRelCalendar.accountname ".$this->getAdvComparator($comparator,trim($value),$datatype)." or concat(vtiger_leaddetailsRelCalendar.lastname,' ',vtiger_leaddetailsRelCalendar.firstname) ".$this->getAdvComparator($comparator,trim($value),$datatype)." or vtiger_potentialRelCalendar.potentialname ".$this->getAdvComparator($comparator,trim($value),$datatype).")"; + } else { $fieldvalue = $selectedfields[0].".".$selectedfields[1].$this->getAdvComparator($comparator,trim($value),$datatype); From wayne at gkejtzkqp.blmngp.com Fri Apr 27 08:15:37 2007 From: wayne at gkejtzkqp.blmngp.com (Teresa Decker) Date: Fri, 27 Apr 2007 15:15:37 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <8382943529.20070427151537@gkejtzkqp.blmngp.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/53221d1d/attachment.html From krispyb at gflegal.com Fri Apr 27 08:36:33 2007 From: krispyb at gflegal.com (Amassing R. Regular) Date: Fri, 27 Apr 2007 11:36:33 -0400 Subject: [Vtigercrm-commits] Huge on-line pharmacy Message-ID: <9478654929.20070427113633@gflegal.com> The most powerful medicines for you! Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. Cloalis Soft Tabs - $5.78 - Just like regular Clualis but specially formulated, these pills are soft and dissolvable under the tongue. The effect of this is more direct absorption into the bloodstream, rather than through the stomach. Result – a powerful, lasting effect of up to 36 hours. 100% Pure Okinawan Coral Calcium - $35.99 - the preferred source for readily absorbable and accessible calcium in the body. Superior 100% pure coral calcium is harvested from Okinawa, Japan – home to the longest-lived people on earth. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From friedman at gkm-therapieforschung.de Fri Apr 27 08:48:41 2007 From: friedman at gkm-therapieforschung.de (Gangplank V. Cannonballs) Date: Fri, 27 Apr 2007 11:48:41 -0400 Subject: [Vtigercrm-commits] Unbelievable prices! Message-ID: <3869335860.20070427114841@gkm-therapieforschung.de> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://oslz.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From issygirl at gro-bark.com Fri Apr 27 08:52:38 2007 From: issygirl at gro-bark.com (Melded B. Lounging) Date: Fri, 27 Apr 2007 11:52:38 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6980498671.20070427115238@gro-bark.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/61db8ba8/attachment.html From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 27 08:53:26 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 27 Apr 2007 15:53:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10804 - /vtigercrm/branches/5.0.3/include/js/Inventory.js Message-ID: <20070427155326.7DDCD7D34E6@vtiger.fosslabs.com> Author: richie Date: Fri Apr 27 09:53:17 2007 New Revision: 10804 Log: * Fixed the issue in calculating Netprice when tax loaded in ajax, Fixed #3669 Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/Inventory.js (original) +++ vtigercrm/branches/5.0.3/include/js/Inventory.js Fri Apr 27 09:53:17 2007 @@ -393,6 +393,7 @@ { $("tax_div"+curr_row).innerHTML=response.responseText; document.getElementById("taxTotal"+curr_row).innerHTML = getObj('hdnTaxTotal'+curr_row).value; + calcTotal(); } } ); From pat at greenaspen.com Fri Apr 27 09:35:04 2007 From: pat at greenaspen.com (Smollett I. Awkwardest) Date: Fri, 27 Apr 2007 12:35:04 -0400 Subject: [Vtigercrm-commits] Need some help? Message-ID: <0678602181.20070427123504@greenaspen.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://oslz.hk verified by VISA and certified by CIPA. From rjandal at golfnorthumbria.com Fri Apr 27 10:07:38 2007 From: rjandal at golfnorthumbria.com (Luftwaffe H. Dramatist) Date: Fri, 27 Apr 2007 13:07:38 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3913358642.20070427130738@golfnorthumbria.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/05bbff8a/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: identical.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/05bbff8a/identical.gif From dbattistoni at goundreywines.com.au Fri Apr 27 10:17:42 2007 From: dbattistoni at goundreywines.com.au (Minuteness M. Kentucky) Date: Fri, 27 Apr 2007 13:17:42 -0400 Subject: [Vtigercrm-commits] Looking for medications? Message-ID: <4989807009.20070427131742@goundreywines.com.au> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://oslz.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From domain at gestipro.com Fri Apr 27 11:20:05 2007 From: domain at gestipro.com (Stuttering Q. Memoranda) Date: Fri, 27 Apr 2007 14:20:05 -0400 Subject: [Vtigercrm-commits] Good health is above wealth Message-ID: <0913772800.20070427142005@gestipro.com> The most powerful medicines for you! Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. Nexium - $3.02 - works by decreasing the acid produced by acid pumps. NEXIUM deactivates some of the pumps to keep acid production under control. By reducing acid production in the stomach, NEXIUM reduces the amount of acid backing up into the esophagus and causing reflux symptoms. Merindia - $3.29 - a short-term supplement to diet and exercise in the treatment of weight loss. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From skmkr_m at graphini.com Fri Apr 27 11:29:48 2007 From: skmkr_m at graphini.com (Jittery I. Fondant) Date: Fri, 27 Apr 2007 14:29:48 -0400 Subject: [Vtigercrm-commits] Don't waste your time. Cheap pills are here. Message-ID: <1689235384.20070427142948@graphini.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://oslz.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From extrmdom at gospec.com Fri Apr 27 11:32:06 2007 From: extrmdom at gospec.com (Wielding H. Hopefulness) Date: Fri, 27 Apr 2007 14:32:06 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9111942692.20070427143206@gospec.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/de765c6c/attachment.htm From istahlecker at got2search.com Fri Apr 27 11:46:41 2007 From: istahlecker at got2search.com (Horsepower S. Diplomat) Date: Fri, 27 Apr 2007 14:46:41 -0400 Subject: [Vtigercrm-commits] Medications that you need. Message-ID: <4878609277.20070427144641@got2search.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://oslz.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From sgallery at gritechnologies.com Fri Apr 27 12:47:13 2007 From: sgallery at gritechnologies.com (Vow K. Christmas) Date: Fri, 27 Apr 2007 15:47:13 -0400 Subject: [Vtigercrm-commits] Medications that you need. Message-ID: <3732402623.20070427154713@gritechnologies.com> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://oslz.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From kathie at granitas.com Fri Apr 27 12:47:34 2007 From: kathie at granitas.com (Coruscate Q. Aphrodite) Date: Fri, 27 Apr 2007 15:47:34 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1343290190.20070427154734@granitas.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/311d7b26/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: nub.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/311d7b26/nub.gif From isthattuna at glenabbey.com Fri Apr 27 13:32:56 2007 From: isthattuna at glenabbey.com (Harrington E. Metacarpus) Date: Fri, 27 Apr 2007 16:32:56 -0400 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <4902311138.20070427163256@glenabbey.com> The most powerful medicines for you! Sonma - $1.22 - works to relax the muscles by blocking pain messages sent to the brain. Pheromone perfume for women - $35.99 - The human pheromones that attracts males has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of women, these natural pheromones are an evolutionary remnant from a time when human males relied on scent to locate female mates. Allegra - $1.32 - an antihistamine that comes in a variety of strengths and formulations to provide relief from a wide range of seasonal allergy symptoms. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istophermoore at globecite.com Fri Apr 27 14:11:18 2007 From: istophermoore at globecite.com (Aggrandizing J. Equipment) Date: Fri, 27 Apr 2007 17:11:18 -0400 Subject: [Vtigercrm-commits] To buy or not to buy? Message-ID: <2026373640.20070427171118@globecite.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://oslz.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From bolton at gilmangear.com Fri Apr 27 14:29:42 2007 From: bolton at gilmangear.com (Liquefied S. Synthetics) Date: Fri, 27 Apr 2007 17:29:42 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3637285057.20070427172942@gilmangear.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/58a24a8d/attachment-0001.html From anlai at gingco-newmedia.de Fri Apr 27 14:51:10 2007 From: anlai at gingco-newmedia.de (Cadillac J. Nolan) Date: Fri, 27 Apr 2007 17:51:10 -0400 Subject: [Vtigercrm-commits] Need some help? Message-ID: <4564747846.20070427175110@gingco-newmedia.de> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://oslz.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From istaavib at gestionib.com Fri Apr 27 15:29:52 2007 From: istaavib at gestionib.com (Rubberneck F. Ashamedly) Date: Fri, 27 Apr 2007 18:29:52 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4235666525.20070427182952@gestionib.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/aaf72c8b/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: rubbing.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/aaf72c8b/rubbing.gif From lgeja at gripin.com Fri Apr 27 15:30:33 2007 From: lgeja at gripin.com (Treat D. Pints) Date: Fri, 27 Apr 2007 18:30:33 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8473483585.20070427183033@gripin.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/c8715dbf/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: feldspar.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/c8715dbf/feldspar.gif From amp at ghdata.com Fri Apr 27 15:38:33 2007 From: amp at ghdata.com (Scylla A. Abominations) Date: Fri, 27 Apr 2007 18:38:33 -0400 Subject: [Vtigercrm-commits] All medications to cure yourself! Message-ID: <6448492568.20070427183833@ghdata.com> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://oslz.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From kodiak at gorry.us Fri Apr 27 16:12:08 2007 From: kodiak at gorry.us (Colored G. Henrietta) Date: Fri, 27 Apr 2007 19:12:08 -0400 Subject: [Vtigercrm-commits] Read it twice and tell to your friends! Message-ID: <2352758335.20070427191208@gorry.us> The most powerful medicines for you! Zinc - $35.99 - naturally produced by human organism mineral. Zinc is important for growth and for the development and health of body tissues. Proprecia - $1.03 - first and only FDA-approved pill demonstrated to treat male pattern hair loss on the vertex (top of head) and anterior mid-scalp area (middle front of head) in men only. Merindia - $3.29 - a short-term supplement to diet and exercise in the treatment of weight loss. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From lester at greatscottishwalk.com Fri Apr 27 16:59:07 2007 From: lester at greatscottishwalk.com (Lordlier U. Jehoshaphat) Date: Fri, 27 Apr 2007 19:59:07 -0400 Subject: [Vtigercrm-commits] Don't have time to visit local drug store? Message-ID: <3935584128.20070427195907@greatscottishwalk.com> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://oslz.hk Make right choice: buy medications at LegalRXMedications drug store! From a_g_guru at ghayward.com Fri Apr 27 17:12:11 2007 From: a_g_guru at ghayward.com (Syllable D. Purl) Date: Fri, 27 Apr 2007 20:12:11 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9119977259.20070427201211@ghayward.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/12420656/attachment.htm From humble at greenhouseministries.org Fri Apr 27 17:30:02 2007 From: humble at greenhouseministries.org (Sunders U. Assailable) Date: Fri, 27 Apr 2007 20:30:02 -0400 Subject: [Vtigercrm-commits] Can you imagine? Message-ID: <4853288511.20070427203002@greenhouseministries.org> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://oslz.hk Instant shipping worldwide! CONFIDENTIAL purchase! From ister at gfma.com Fri Apr 27 17:45:32 2007 From: ister at gfma.com (Exacts K. Moustache) Date: Fri, 27 Apr 2007 20:45:32 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9208362571.20070427204532@gfma.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/b1e2e732/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: unbuckles.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/b1e2e732/unbuckles.gif From davdollard at greenham.ca Fri Apr 27 17:43:30 2007 From: davdollard at greenham.ca (Stephanie Poole) Date: Sat, 28 Apr 2007 00:43:30 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <2466987686.20070428004330@greenham.ca> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/21944d15/attachment.html From stanford at gnpgraphics.org Fri Apr 27 18:16:42 2007 From: stanford at gnpgraphics.org (Liqueur V. Discoverer) Date: Fri, 27 Apr 2007 21:16:42 -0400 Subject: [Vtigercrm-commits] Looking for perfect sex? Message-ID: <4615130932.20070427211642@gnpgraphics.org> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://oslz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From dave-diane at gifts4uonline.com Fri Apr 27 18:58:23 2007 From: dave-diane at gifts4uonline.com (Distinctively J. Gonzales) Date: Fri, 27 Apr 2007 21:58:23 -0400 Subject: [Vtigercrm-commits] No doctor appointment is necessary Message-ID: <0871319591.20070427215823@gifts4uonline.com> The most powerful medicines for you! Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From issy_jamaica at gilbertassociates.ca Fri Apr 27 19:16:30 2007 From: issy_jamaica at gilbertassociates.ca (Satining S. Satyr) Date: Fri, 27 Apr 2007 22:16:30 -0400 Subject: [Vtigercrm-commits] Medications for US residents. Message-ID: <1301637694.20070427221630@gilbertassociates.ca> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://oslz.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From masters at gotrain.net Fri Apr 27 19:39:52 2007 From: masters at gotrain.net (Obverse T. Philosophers) Date: Fri, 27 Apr 2007 22:39:52 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0996866469.20070427223952@gotrain.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/497d3516/attachment.html From watson at gloogun.com Fri Apr 27 19:55:47 2007 From: watson at gloogun.com (Unfettered S. Quibble) Date: Fri, 27 Apr 2007 22:55:47 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <5899749992.20070427225547@gloogun.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://oslz.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From extremtwo at gravite.com Fri Apr 27 20:21:46 2007 From: extremtwo at gravite.com (Outpatient H. Yuri) Date: Fri, 27 Apr 2007 23:21:46 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4446816008.20070427232146@gravite.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/527988cf/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: laity.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/527988cf/laity.gif From kurt at girlscouts-rh.org Fri Apr 27 20:34:31 2007 From: kurt at girlscouts-rh.org (Sashes V. Aslant) Date: Fri, 27 Apr 2007 23:34:31 -0400 Subject: [Vtigercrm-commits] No need to visit local drug store. Message-ID: <9739369629.20070427233431@girlscouts-rh.org> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://oslz.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From marc.witman at goamp.com Fri Apr 27 20:58:01 2007 From: marc.witman at goamp.com (Prepositioned R. Knesset) Date: Fri, 27 Apr 2007 23:58:01 -0400 Subject: [Vtigercrm-commits] No doctor appointment is necessary Message-ID: <6122769617.20070427235801@goamp.com> The most powerful medicines for you! Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. Pure Natural Hoodia - $35.99 - Pure Natural Hoodia is a natural weght loss pill containing Hoodia Gordoni extract. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From shannatomlin at gfhh.com Fri Apr 27 21:03:09 2007 From: shannatomlin at gfhh.com (Vorster R. Obviously) Date: Sat, 28 Apr 2007 00:03:09 -0400 Subject: [Vtigercrm-commits] Be healthy, be wealthy! Message-ID: <7727841208.20070428000309@gfhh.com> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://oslz.hk ONLY! From sarahann.jackson at gianfagna.net Fri Apr 27 21:35:55 2007 From: sarahann.jackson at gianfagna.net (Textural G. Hashish) Date: Sat, 28 Apr 2007 00:35:55 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0881060180.20070428003555@gianfagna.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/dfa7f692/attachment.htm From jakeroo at gomanage.com Fri Apr 27 21:43:00 2007 From: jakeroo at gomanage.com (Guam A. Lyricist) Date: Sat, 28 Apr 2007 00:43:00 -0400 Subject: [Vtigercrm-commits] Want to be a hero in a bed? Message-ID: <5215386507.20070428004300@gomanage.com> Most wanted pills at LOW price! http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From istaten at gianinigroup.com Fri Apr 27 22:42:54 2007 From: istaten at gianinigroup.com (Lodes T. Exhilarate) Date: Sat, 28 Apr 2007 01:42:54 -0400 Subject: [Vtigercrm-commits] Medications that you need! Message-ID: <8306560884.20070428014254@gianinigroup.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://oslz.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From sabehenn at giclaw.com Fri Apr 27 22:51:17 2007 From: sabehenn at giclaw.com (Aerates D. Osborn) Date: Sat, 28 Apr 2007 01:51:17 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5988252321.20070428015117@giclaw.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/6f09d26b/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: honesty.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/6f09d26b/honesty-0001.gif From extruma at gingerart.com Fri Apr 27 23:21:19 2007 From: extruma at gingerart.com (Indispensables K. Motoring) Date: Sat, 28 Apr 2007 02:21:19 -0400 Subject: [Vtigercrm-commits] Make your girlfriend happy. Message-ID: <9664916407.20070428022119@gingerart.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://oslz.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From franz at gmanband.com Fri Apr 27 23:23:59 2007 From: franz at gmanband.com (Centenarians H. Drunkenly) Date: Sat, 28 Apr 2007 02:23:59 -0400 Subject: [Vtigercrm-commits] Health for everybody Message-ID: <0339797697.20070428022359@gmanband.com> The most powerful medicines for you! Suregasm - $35.99 - Achieve stronger and more powerful orgasms with this all-natural female sexual stimulant. Quick-detox - $35.99 - Rid your body of all traces of toxins in as little as two hours with this highly effective detoxification formula. Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From pollard at givemecredit.com Fri Apr 27 23:36:51 2007 From: pollard at givemecredit.com (Rematch C. Gladiolus) Date: Sat, 28 Apr 2007 02:36:51 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8553419239.20070428023651@givemecredit.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/32f61bbe/attachment.html From extsj at glenbardnorth1977.com Fri Apr 27 23:58:38 2007 From: extsj at glenbardnorth1977.com (Bandstand J. Statute) Date: Sat, 28 Apr 2007 02:58:38 -0400 Subject: [Vtigercrm-commits] Don't waste your time. Cheap pills are here. Message-ID: <6421438004.20070428025838@glenbardnorth1977.com> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://oslz.hk verified by VISA and certified by CIPA. From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 28 00:12:43 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 28 Apr 2007 07:12:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10805 - in /vtigercrm/branches/5.0.3: Smarty/templates/PopupContents.tpl Smarty/templates/RelatedListContents.tpl include/language/en_us.lang.php modules/Calendar/addEventUI.php Message-ID: <20070428071243.D3BDE7C8152@vtiger.fosslabs.com> Author: richie Date: Sat Apr 28 01:12:30 2007 New Revision: 10805 Log: patch integrated. Fixes #3213 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/PopupContents.tpl vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/PopupContents.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/PopupContents.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/PopupContents.tpl Sat Apr 28 01:12:30 2007 @@ -14,7 +14,7 @@
    Email*">">
    Note: The default password is 'admin'. You can change the password if necessary now or else you can change it later after logging-in.
    {if $SELECT eq 'enable'} - + {else} {/if} Modified: vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl Sat Apr 28 01:12:30 2007 @@ -41,23 +41,23 @@ {elseif $header eq 'PriceBooks'} {if $MODULE eq 'Products'} - + {/if} {elseif $header eq 'Products'} {if $MODULE eq 'PriceBooks'} {elseif $MODULE eq 'Leads'} - + {elseif $MODULE eq 'Accounts'} - + {elseif $MODULE eq 'Contacts'} - + {elseif $MODULE eq 'Potentials'} -   +   {elseif $MODULE eq 'Vendors'} - + {else} @@ -65,10 +65,10 @@ {elseif $header eq 'Leads'} {if $MODULE eq 'Campaigns'} {$LEADCVCOMBO} - + {/if} {if $MODULE eq 'Products'} - + {else} {/if} @@ -78,16 +78,16 @@ {/if} {elseif $header eq 'Contacts' } {if $MODULE eq 'Calendar' || $MODULE eq 'Potentials' || $MODULE eq 'Vendors'} - + {elseif $MODULE eq 'Emails'}   {elseif $MODULE eq 'Campaigns'} {$CONTCVCOMBO} - + {elseif $MODULE eq 'Products'} - + {else} {/if} @@ -103,7 +103,7 @@ {elseif $header eq 'HelpDesk'} {elseif $header eq 'Campaigns'} - + {elseif $header eq 'Attachments'}   @@ -114,16 +114,16 @@ {if $MODULE eq 'SalesOrder'} {else} - + {/if} {elseif $header eq 'Sales Order'} {if $MODULE eq 'Quotes'} {else} - + {/if} {elseif $header eq 'Purchase Order'} - + {elseif $header eq 'Emails'} Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Sat Apr 28 01:12:30 2007 @@ -102,7 +102,7 @@ 'LBL_SELECT_BUTTON_LABEL' => 'Select', 'LBL_SELECT_CONTACT_BUTTON_TITLE' => 'Select Contact [Alt+T]', 'LBL_SELECT_CONTACT_BUTTON_KEY' => 'T', -'LBL_SELECT_CONTACT_BUTTON_LABEL' => 'Select Contact', +'LBL_SELECT_CONTACT_BUTTON_LABEL' => 'Select Contacts', 'LBL_SELECT_CAMPAIGN_BUTTON_LABEL' => 'Select Campaign', 'LBL_SELECT_USER_BUTTON_TITLE' => 'Select User [Alt+U]', 'LBL_SELECT_USER_BUTTON_KEY' => 'U', @@ -307,7 +307,7 @@ 'LBL_USER_TITLE' => 'Users', 'LBL_CONTACT_TITLE' => 'Contacts', 'LBL_SHOWING' => 'Showing', -'LBL_SELECT_PRODUCT_BUTTON_LABEL' => 'Select Product', +'LBL_SELECT_PRODUCT_BUTTON_LABEL' => 'Select Products', 'LBL_VIEW' => 'Filters :', 'LBL_GROUP_VIEW' => 'Group', 'LBL_SALES_STAGE' => 'Sales Stage', @@ -846,7 +846,7 @@ // Added for display the label of Invoice no 'invoice no'=>'invoice no', //Added for title to the button Select Lead -'LBL_SELECT_LEAD_BUTTON_LABEL' => 'Select Lead', +'LBL_SELECT_LEAD_BUTTON_LABEL' => 'Select Leads', //Added for the link Read License in footer 'LNK_READ_LICENSE'=>'Read License', 'ACTIVITIES' => 'Activities', Modified: vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php Sat Apr 28 01:12:30 2007 @@ -852,7 +852,7 @@ From bit at gregswebspace.com Sat Apr 28 00:28:17 2007 From: bit at gregswebspace.com (Cochin T. Indignity) Date: Sat, 28 Apr 2007 03:28:17 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1325471332.20070428032817@gregswebspace.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/52347c85/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: woolie.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/52347c85/woolie.gif From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 28 00:47:43 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 28 Apr 2007 07:47:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10806 - /vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php Message-ID: <20070428074743.B91247D350E@vtiger.fosslabs.com> Author: richie Date: Sat Apr 28 01:47:35 2007 New Revision: 10806 Log: * Fixed the issue with Purchase Order Number display in Invoice PDF, Fixed #3683 Modified: vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php Modified: vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php (original) +++ vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php Sat Apr 28 01:47:35 2007 @@ -39,7 +39,7 @@ $so_name = getSoName($focus->column_fields["salesorder_id"]); else $so_name = ''; -$po_name = $focus->column_fields["purchaseorder"]; +$po_name = $focus->column_fields["vtiger_purchaseorder"]; $valid_till = $focus->column_fields["duedate"]; $valid_till = getDisplayDate($valid_till); From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 28 01:00:24 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 28 Apr 2007 08:00:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10807 - /vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Message-ID: <20070428080024.3DDAE7D34E2@vtiger.fosslabs.com> Author: richie Date: Sat Apr 28 02:00:19 2007 New Revision: 10807 Log: * Fixed the issue in criteria selection for fields Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Sat Apr 28 02:00:19 2007 @@ -414,7 +414,43 @@ "vtiger_contactsubdetails:birthday:birthday:Contacts_Birthdate:V"=>"vtiger_contactsubdetails:birthday:birthday:Contacts_Birthdate:T", "vtiger_faq:product_id:product_id:Faq_Product_Name:I"=>"vtiger_faq:product_id:product_id:Faq_Product_Name:V", "vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:I"=>"vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:V", - ); +"vtiger_campaign:product_id:product_id:Campaigns_Product:I"=>"vtiger_campaign:product_id:product_id:Campaigns_Product:V", +"vtiger_account:email1:email1:Accounts_Email:E"=>"vtiger_account:email1:email1:Accounts_Email:V", +"vtiger_account:email2:email2:Accounts_Other_Email:E"=>"vtiger_account:email2:email2:Accounts_Other_Email:V", +"vtiger_contactsubdetails:birthday:birthday:Contacts_Birthdate:V "=>"vtiger_contactsubdetails:birthday:birthday:Contacts_Birthdate:T", +"vtiger_contactdetails:email:email:Contacts_Email:E"=>"vtiger_contactdetails:email:email:Contacts_Email:V", +"vtiger_contactdetails:yahooid:yahooid:Contacts_Yahoo_Id:E"=>"vtiger_contactdetails:yahooid:yahooid:Contacts_Yahoo_Id:V", +"vtiger_account:accountname:accountname:Contacts_Account_Name:I"=>"vtiger_account:accountname:accountname:Contacts_Account_Name:V", +"vtiger_leaddetails:email:email:Leads_Email:E"=>"vtiger_leaddetails:email:email:Leads_Email:V", +"vtiger_leaddetails:yahooid:yahooid:Leads_Yahoo_Id:E"=>"vtiger_leaddetails:yahooid:yahooid:Leads_Yahoo_Id:V", +"vtiger_activity_reminder:reminder_time:reminder_time:Calendar_Send_Reminder:I"=>"vtiger_activity_reminder:reminder_time:reminder_time:Calendar_Send_Reminder:C", +"vtiger_cntactivityrel:contactid:contact_id:Calendar_Contact_Name:I"=>"vtiger_cntactivityrel:contactid:contact_id:Calendar_Contact_Name:V", +"vtiger_seactivityrel:crmid:parent_id:Calendar_Related_to:I"=>"vtiger_seactivityrel:crmid:parent_id:Calendar_Related_to:V", +"vtiger_activity:visibility:visibility:Calendar_Visibility:V"=>"vtiger_activity:visibility:visibility:Calendar_Visibility:C", +"vtiger_senotesrel:crmid:parent_id:Notes_Related_to:I"=>"vtiger_senotesrel:crmid:parent_id:Notes_Related_to:V", +"vtiger_potential:campaignid:campaignid:Potentials_Campaign_Source:N"=>"vtiger_potential:campaignid:campaignid:Potentials_Campaign_Source:V", +"vtiger_account:accountname:accountname:Accounts_Member_Of:I"=>"vtiger_account:accountname:accountname:Accounts_Member_Of:V", +"vtiger_quotes:potentialid:potential_id:Quotes_Potential_Name:I"=>"vtiger_quotes:potentialid:potential_id:Quotes_Potential_Name:V", +"vtiger_quotes:inventorymanager:assigned_user_id1:Quotes_Inventory_Manager:I"=>"vtiger_quotes:inventorymanager:assigned_user_id1:Quotes_Inventory_Manager:V", +"vtiger_account:accountname:accountname:Quotes_Account_Name:I"=>"vtiger_account:accountname:accountname:Quotes_Account_Name:V", +"vtiger_salesorder:potentialid:potential_id:SalesOrder_Potential_Name:I"=>"vtiger_salesorder:potentialid:potential_id:SalesOrder_Potential_Name:V", +"vtiger_salesorder:quoteid:quote_id:SalesOrder_Quote_Name:I"=>"vtiger_salesorder:quoteid:quote_id:SalesOrder_Quote_Name:V", +"vtiger_salesorder:contactid:contact_id:SalesOrder_Contact_Name:I"=>"vtiger_salesorder:contactid:contact_id:SalesOrder_Contact_Name:V", +"vtiger_account:accountname:accountname:SalesOrder_Account_Name:I"=>"vtiger_account:accountname:accountname:SalesOrder_Account_Name:V", +"vtiger_invoice:salesorderid:salesorder_id:Invoice_Sales_Order:I"=>"vtiger_invoice:salesorderid:salesorder_id:Invoice_Sales_Order:V", +"vtiger_invoice:contactid:contact_id:Invoice_Contact_Name:I"=>"vtiger_invoice:contactid:contact_id:Invoice_Contact_Name:V", +"vtiger_account:accountname:accountname:Invoice_Account_Name:I"=>"vtiger_account:accountname:accountname:Invoice_Account_Name:V", +"vtiger_products:discontinued:discontinued:Products_Product_Active:V"=>"vtiger_products:discontinued:discontinued:Products_Product_Active:C", +"vtiger_products:vendor_id:vendor_id:Products_Vendor_Name:I"=>"vtiger_products:vendor_id:vendor_id:Products_Vendor_Name:V", +"vtiger_pricebook:active:active:PriceBooks_Active:V"=>"vtiger_pricebook:active:active:PriceBooks_Active:C", +"vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:I"=>"vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:V", +"vtiger_troubletickets:product_id:product_id:HelpDesk_Product_Name:I"=>"vtiger_troubletickets:product_id:product_id:HelpDesk_Product_Name:V", +"vtiger_faq:product_id:product_id:Faq_Product_Name:I"=>"vtiger_faq:product_id:product_id:Faq_Product_Name:V", +"vtiger_vendor:email:email:Vendors_Email:E"=>"vtiger_vendor:email:email:Vendors_Email:V", +"vtiger_purchaseorder:vendorid:vendor_id:PurchaseOrder_Vendor_Name:I"=>"vtiger_purchaseorder:vendorid:vendor_id:PurchaseOrder_Vendor_Name:V", +"vtiger_purchaseorder:contactid:contact_id:PurchaseOrder_Contact_Name:I"=>"vtiger_purchaseorder:contactid:contact_id:PurchaseOrder_Contact_Name:V", + + ); if(isset($new_field_details[$field])) { From ase at goodfoodsgrocery.com Sat Apr 28 01:15:25 2007 From: ase at goodfoodsgrocery.com (Brilliance A. Chowed) Date: Sat, 28 Apr 2007 04:15:25 -0400 Subject: [Vtigercrm-commits] Unbelievable! U can be healthy! Message-ID: <6532008841.20070428041525@goodfoodsgrocery.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://oslz.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From istaexec at ghgplc.com Sat Apr 28 01:44:26 2007 From: istaexec at ghgplc.com (Unpacking E. Servitude) Date: Sat, 28 Apr 2007 04:44:26 -0400 Subject: [Vtigercrm-commits] Problems everywhere? Message-ID: <6178079377.20070428044426@ghgplc.com> The most powerful medicines for you! Suprax - $3- a medication belonging to a class of antibiotics called Cephalosporins. The active ingredient in Suprax is Cefixime. Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. Delay Ejaculation Pills - $139.48 - Premature ejaculation is a problem faced by men and couples for years. The new delay ejaculation pills is the answer you have to this small but devastating problem Premature ejaculation not only makes the man keep craving for more but has very bad consequences on the sexual psyche of a couple. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extrinsync at gmcpauls.com Sat Apr 28 01:46:53 2007 From: extrinsync at gmcpauls.com (George Noel) Date: Sat, 28 Apr 2007 08:46:53 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <7143353248.20070428084653@gmcpauls.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/236a855a/attachment.htm From istilstand at graphpak.com Sat Apr 28 02:09:37 2007 From: istilstand at graphpak.com (Angelou H. Sprats) Date: Sat, 28 Apr 2007 05:09:37 -0400 Subject: [Vtigercrm-commits] Healthy life is your dream? Message-ID: <4751598014.20070428050937@graphpak.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From alliance at gmsconsultinggroup.com Sat Apr 28 02:29:47 2007 From: alliance at gmsconsultinggroup.com (Bookkeeper D. Godthaab) Date: Sat, 28 Apr 2007 05:29:47 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3101871536.20070428052947@gmsconsultinggroup.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/2bc920a4/attachment.htm From istelyou at goodwillfarm.com Sat Apr 28 02:32:29 2007 From: istelyou at goodwillfarm.com (Haberdashers H. Parnassus) Date: Sat, 28 Apr 2007 05:32:29 -0400 Subject: [Vtigercrm-commits] Want to cure yourself? Message-ID: <5759272183.20070428053229@goodwillfarm.com> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://oslz.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From istijorgelina at gnu-india.org Sat Apr 28 02:58:27 2007 From: istijorgelina at gnu-india.org (Shanties H. Duplicated) Date: Sat, 28 Apr 2007 05:58:27 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7807144071.20070428055827@gnu-india.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/da06b5c0/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Cortez.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/da06b5c0/Cortez.gif From cshaynak at gmbdirect.com Sat Apr 28 03:13:40 2007 From: cshaynak at gmbdirect.com (Breakfasted B. Watercraft) Date: Sat, 28 Apr 2007 06:13:40 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <7418574262.20070428061340@gmbdirect.com> Make your dreams come true with licensed medications from US Drug Store! Any pills at your choice. There is no need to visit your local drug store at all. http://oslz.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 28 03:17:46 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 28 Apr 2007 10:17:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10808 - in /vtigercrm/branches/5.0.3: include/language/en_us.lang.php include/utils/DetailViewUtils.php include/utils/EditViewUtils.php modules/Quotes/Quotes.php modules/Users/DefaultDataPopulator.php Message-ID: <20070428101747.AA27C7C0699@vtiger.fosslabs.com> Author: richie Date: Sat Apr 28 04:17:32 2007 New Revision: 10808 Log: patch for Add attachments to Quotes integrated. Fixes #3087 --minnie Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Sat Apr 28 04:17:32 2007 @@ -489,6 +489,7 @@ 'LBL_SORDER_NAME' => 'Sales Order', 'COMBO_INVOICES' => 'Invoice', 'LBL_INVOICE_NAME' => 'Invoice', +'LBL_QUOTES_NAME' => 'Quote', 'LBL_HELPDESK_NAME' => 'Trouble Ticket', 'LBL_CAMPAIGN_NAME' => 'Campaign Name', 'LBL_NEW_INVOICE_BUTTON_TITLE' => 'New Invoice [Alt+I]', Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Sat Apr 28 04:17:32 2007 @@ -558,6 +558,15 @@ $invoicename= $adb->query_result($result,0,"subject"); $label_fld[] =''.$invoicename.''; + } + elseif($parent_module == "Quotes") + { + $label_fld[] = $app_strings['LBL_QUOTES_NAME']; + $sql = "select * from vtiger_quotes where quoteid=".$value; + $result = $adb->query($sql); + $quotename= $adb->query_result($result,0,"subject"); + + $label_fld[] =''.$quotename.''; } elseif($parent_module == "HelpDesk") { Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Sat Apr 28 04:17:32 2007 @@ -627,7 +627,13 @@ $result = $adb->query($sql); $parent_name= $adb->query_result($result,0,"subject"); $invoice_selected = "selected"; - + } + elseif($parent_module == "Quotes") + { + $sql = "select * from vtiger_quotes where quoteid=".$value; + $result = $adb->query($sql); + $parent_name= $adb->query_result($result,0,"subject"); + $quote_selected = "selected"; } @@ -638,7 +644,8 @@ $app_strings['COMBO_PRODUCTS'], $app_strings['COMBO_INVOICES'], $app_strings['COMBO_PORDER'], - $app_strings['COMBO_SORDER'] + $app_strings['COMBO_SORDER'], + $app_strings['COMBO_QUOTES'] ); $editview_label[] = array($lead_selected, $account_selected, @@ -646,9 +653,10 @@ $product_selected, $invoice_selected, $porder_selected, - $sorder_selected + $sorder_selected, + $quote_selected ); - $editview_label[] = array("Leads&action=Popup","Accounts&action=Popup","Potentials&action=Popup","Products&action=Popup","Invoice&action=Popup","PurchaseOrder&action=Popup","SalesOrder&action=Popup"); + $editview_label[] = array("Leads&action=Popup","Accounts&action=Popup","Potentials&action=Popup","Products&action=Popup","Invoice&action=Popup","PurchaseOrder&action=Popup","SalesOrder&action=Popup","Quotes&action=Popup"); $fieldvalue[] =$parent_name; $fieldvalue[] =$value; Modified: vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php (original) +++ vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php Sat Apr 28 04:17:32 2007 @@ -116,7 +116,7 @@ if($_REQUEST['action'] != 'QuotesAjax' && $_REQUEST['ajxaction'] != 'DETAILVIEW') { //Based on the total Number of rows we will save the product relationship with this entity - saveInventoryProductDetails(&$this, 'Quotes'); + saveInventoryProductDetails($this, 'Quotes'); } } @@ -236,6 +236,46 @@ return getHistory('Quotes',$query,$id); } + /** function used to get the attachments which are related to the invoice + * @param int $id - invoice id to which we want to retrieve the attachments and notes + * @return array - return an array which will be returned from the function getAttachmentsAndNotes + **/ + function get_attachments($id) + { + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); + + $query = "select vtiger_notes.title,'Notes ' as ActivityType, vtiger_notes.filename, + vtiger_attachments.type as FileType,crm2.modifiedtime as lastmodified, + vtiger_seattachmentsrel.attachmentsid as attachmentsid, vtiger_notes.notesid as crmid, + crm2.createdtime, vtiger_notes.notecontent as description, vtiger_users.user_name + from vtiger_notes + inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0 + left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid + left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id; + + $query .= ' union all '; + + $query .= "select vtiger_attachments.description as title ,'Attachments' as ActivityType, + vtiger_attachments.name as filename, vtiger_attachments.type as FileType, crm2.modifiedtime as lastmodified, + vtiger_attachments.attachmentsid as attachmentsid, vtiger_seattachmentsrel.attachmentsid as crmid, + crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name + from vtiger_attachments + inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id; + + $log->debug("Exiting get_attachments method ..."); + return getAttachmentsAndNotes('Quotes',$query,$id); + } + + /** Function used to get the Quote Stage history of the Quotes * @param $id - quote id Modified: vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php Sat Apr 28 04:17:32 2007 @@ -1794,9 +1794,11 @@ $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",9,'get_activities',2,'Activities',0)"); - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",9,'get_history',3,'Activity History',0)"); - - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",0,'get_quotestagehistory',4,'Quote Stage History',0)"); + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",0,'get_attachments',3,'Attachments',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",9,'get_history',4,'Activity History',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",0,'get_quotestagehistory',5,'Quote Stage History',0)"); // Inserting Purchase order Related Lists From istood at grch.com Sat Apr 28 04:00:03 2007 From: istood at grch.com (Defraying P. Predetermines) Date: Sat, 28 Apr 2007 07:00:03 -0400 Subject: [Vtigercrm-commits] Health for everybody Message-ID: <4086497119.20070428070003@grch.com> The most powerful medicines for you! Nexium - $3.02 - works by decreasing the acid produced by acid pumps. NEXIUM deactivates some of the pumps to keep acid production under control. By reducing acid production in the stomach, NEXIUM reduces the amount of acid backing up into the esophagus and causing reflux symptoms. Cipro - $3.43 - Recommended for people suffering from respiratory pathogens causing infections such as acute exacerbations of chronic bronchitis (AECB). In comparison to traditional remedies, Cipro can be taken to treat respiratory pathogens that may be resistant to standard treatment options. Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From dnikodemo at greenindependent.com Sat Apr 28 04:31:14 2007 From: dnikodemo at greenindependent.com (Bertrand G. Inaccessibility) Date: Sat, 28 Apr 2007 07:31:14 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <8998219415.20070428073114@greenindependent.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://oslz.hk Instant shipping worldwide! CONFIDENTIAL purchase! From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 28 04:27:17 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 28 Apr 2007 11:27:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10809 - in /vtigercrm/branches/5.0.3: data/ install/ modules/Accounts/ modules/Campaigns/ modules/Contacts/ modules/Emails/ modules/Faq/ modules/HelpDesk/ modules/Invoice/ modules/Notes/ modules/Potentials/ modules/PriceBooks/ modules/PurchaseOrder/ modules/Quotes/ modules/SalesOrder/ modules/Users/ modules/Vendors/ Message-ID: <20070428112717.87E747C8254@vtiger.fosslabs.com> Author: richie Date: Sat Apr 28 05:26:45 2007 New Revision: 10809 Log: patch for Call-time pass-by-reference has been deprecated integrated. Fixes #2486. --minnie Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php vtigercrm/branches/5.0.3/install/populateSeedData.php vtigercrm/branches/5.0.3/modules/Accounts/Save.php vtigercrm/branches/5.0.3/modules/Campaigns/Save.php vtigercrm/branches/5.0.3/modules/Contacts/Save.php vtigercrm/branches/5.0.3/modules/Emails/Save.php vtigercrm/branches/5.0.3/modules/Emails/mail.php vtigercrm/branches/5.0.3/modules/Faq/Save.php vtigercrm/branches/5.0.3/modules/HelpDesk/DetailViewAjax.php vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php vtigercrm/branches/5.0.3/modules/Invoice/Save.php vtigercrm/branches/5.0.3/modules/Notes/Save.php vtigercrm/branches/5.0.3/modules/Potentials/Save.php vtigercrm/branches/5.0.3/modules/PriceBooks/Save.php vtigercrm/branches/5.0.3/modules/PurchaseOrder/PurchaseOrder.php vtigercrm/branches/5.0.3/modules/PurchaseOrder/Save.php vtigercrm/branches/5.0.3/modules/Quotes/Save.php vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php vtigercrm/branches/5.0.3/modules/SalesOrder/Save.php vtigercrm/branches/5.0.3/modules/Users/Save.php vtigercrm/branches/5.0.3/modules/Users/Users.php vtigercrm/branches/5.0.3/modules/Vendors/Save.php Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/5.0.3/data/CRMEntity.php (original) +++ vtigercrm/branches/5.0.3/data/CRMEntity.php Sat Apr 28 05:26:45 2007 @@ -179,7 +179,7 @@ //only images are allowed for these modules if($module == 'Contacts' || $module == 'Products') { - $save_file = validateImageFile(&$file_details); + $save_file = validateImageFile($file_details); } if($save_file == 'true' && $upload_status == 'true') Modified: vtigercrm/branches/5.0.3/install/populateSeedData.php ============================================================================== --- vtigercrm/branches/5.0.3/install/populateSeedData.php (original) +++ vtigercrm/branches/5.0.3/install/populateSeedData.php Sat Apr 28 05:26:45 2007 @@ -477,6 +477,7 @@ $product->column_fields["productname"] = $product_name_array[$i]; $product->column_fields["productcode"] = $product_code_array[$i]; $product->column_fields["manufacturer"] = $manufacturer; + $product->column_fields["discontinued"] = 1; $product->column_fields["productcategory"] = $category; $product->column_fields["website"] = $website; @@ -640,7 +641,7 @@ //Upto this added to set the request values which will be used to save the inventory product details //Now call the saveInventoryProductDetails function - saveInventoryProductDetails(&$quote, 'Quotes'); + saveInventoryProductDetails($quote, 'Quotes'); } //Populate SalesOrder Data @@ -714,7 +715,7 @@ //Upto this added to set the request values which will be used to save the inventory product details //Now call the saveInventoryProductDetails function - saveInventoryProductDetails(&$so, 'SalesOrder'); + saveInventoryProductDetails($so, 'SalesOrder'); } @@ -790,7 +791,7 @@ //Upto this added to set the request values which will be used to save the inventory product details //Now call the saveInventoryProductDetails function - saveInventoryProductDetails(&$po, 'PurchaseOrder'); + saveInventoryProductDetails($po, 'PurchaseOrder'); } @@ -875,7 +876,7 @@ //Upto this added to set the request values which will be used to save the inventory product details //Now call the saveInventoryProductDetails function - saveInventoryProductDetails(&$invoice, 'Invoice'); + saveInventoryProductDetails($invoice, 'Invoice'); } Modified: vtigercrm/branches/5.0.3/modules/Accounts/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Accounts/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Accounts/Save.php Sat Apr 28 05:26:45 2007 @@ -126,7 +126,7 @@ //Send notification mail to the assigned to owner about the vtiger_account creation if($focus->column_fields['notify_owner'] == 1 || $focus->column_fields['notify_owner'] == 'on') - $status = sendNotificationToOwner('Accounts',&$focus); + $status = sendNotificationToOwner('Accounts',$focus); header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&viewname=$return_viewname"); Modified: vtigercrm/branches/5.0.3/modules/Campaigns/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Campaigns/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Campaigns/Save.php Sat Apr 28 05:26:45 2007 @@ -30,7 +30,7 @@ $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); $rate = $rate_symbol['rate']; -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); if(isset($_REQUEST['expectedrevenue'])) { Modified: vtigercrm/branches/5.0.3/modules/Contacts/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Contacts/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Contacts/Save.php Sat Apr 28 05:26:45 2007 @@ -30,7 +30,7 @@ global $log,$adb; $focus = new Contacts(); -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); if($_REQUEST['salutation'] == '--None--') $_REQUEST['salutation'] = ''; if (!isset($_REQUEST['email_opt_out'])) $focus->email_opt_out = 'off'; @@ -197,7 +197,7 @@ //Send notification mail to the assigned to owner about the contact creation if($focus->column_fields['notify_owner'] == 1 || $focus->column_fields['notify_owner'] == 'on') - $status = sendNotificationToOwner('Contacts',&$focus); + $status = sendNotificationToOwner('Contacts',$focus); header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&activity_mode=$activitymode&viewname=$return_viewname"); Modified: vtigercrm/branches/5.0.3/modules/Emails/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/Save.php Sat Apr 28 05:26:45 2007 @@ -60,7 +60,7 @@ $focus = new Emails(); global $current_user,$mod_strings,$app_strings; -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); //Check if the file is exist or not. //$file_name = ''; $file_name = $_FILES['filename']['name'];//preg_replace('/\s+/', '_', $_FILES['filename']['name']); Modified: vtigercrm/branches/5.0.3/modules/Emails/mail.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/mail.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/mail.php Sat Apr 28 05:26:45 2007 @@ -46,15 +46,15 @@ $mail = new PHPMailer(); - setMailerProperties(&$mail,$subject,$contents,$from_email,$from_name,$to_email,$attachment,$emailid); - setCCAddress(&$mail,'cc',$cc); - setCCAddress(&$mail,'bcc',$bcc); - - $mail_status = MailSend(&$mail); + setMailerProperties($mail,$subject,$contents,$from_email,$from_name,$to_email,$attachment,$emailid); + setCCAddress($mail,'cc',$cc); + setCCAddress($mail,'bcc',$bcc); + + $mail_status = MailSend($mail); if($mail_status != 1) { - $mail_error = getMailError(&$mail,$mail_status,$mailto); + $mail_error = getMailError($mail,$mail_status,$mailto); } else { @@ -144,7 +144,7 @@ $mail->IsSMTP(); //set mailer to use SMTP //$mail->Host = "smtp1.example.com;smtp2.example.com"; // specify main and backup server - setMailServerProperties(&$mail); + setMailServerProperties($mail); //Handle the from name and email for HelpDesk $mail->From = $from_email; @@ -174,13 +174,13 @@ //If we want to add the currently selected file only then we will use the following function if($attachment == 'current') { - addAttachment(&$mail,$_FILES['filename']['name'],$emailid); + addAttachment($mail,$_FILES['filename']['name'],$emailid); } //This will add all the vtiger_files which are related to this record or email if($attachment == 'all') { - addAllAttachments(&$mail,$emailid); + addAllAttachments($mail,$emailid); } $mail->IsHTML(true); // set email format to HTML Modified: vtigercrm/branches/5.0.3/modules/Faq/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Faq/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Faq/Save.php Sat Apr 28 05:26:45 2007 @@ -29,7 +29,7 @@ $focus = new Faq(); -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); $focus->save("Faq"); $return_id = $focus->id; Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/HelpDesk/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.3/modules/HelpDesk/DetailViewAjax.php Sat Apr 28 05:26:45 2007 @@ -41,7 +41,7 @@ $assigned_group_name = $_REQUEST['assigned_group_name']; $assigntype = $_REQUEST['assigntype']; - $fldvalue = $modObj->constructUpdateLog(&$modObj, $modObj->mode, $assigned_group_name, $assigntype); + $fldvalue = $modObj->constructUpdateLog($modObj, $modObj->mode, $assigned_group_name, $assigntype); $fldvalue = from_html($adb->formatString('vtiger_troubletickets','update_log',$fldvalue),($modObj->mode == 'edit')?true:false); $modObj->save("HelpDesk"); Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php Sat Apr 28 05:26:45 2007 @@ -27,7 +27,7 @@ $focus = new HelpDesk(); -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); global $adb,$mod_strings; //Added to update the ticket history //Before save we have to construct the update log. @@ -37,7 +37,7 @@ $usr_qry = $adb->query("select * from vtiger_crmentity where crmid='".$focus->id."'"); $old_user_id = $adb->query_result($usr_qry,0,"smownerid"); } -$fldvalue = $focus->constructUpdateLog(&$focus, $mode, $_REQUEST['assigned_group_name'], $_REQUEST['assigntype']); +$fldvalue = $focus->constructUpdateLog($focus, $mode, $_REQUEST['assigned_group_name'], $_REQUEST['assigntype']); $fldvalue = from_html($adb->formatString('vtiger_troubletickets','update_log',$fldvalue),($mode == 'edit')?true:false); $focus->save("HelpDesk"); Modified: vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php (original) +++ vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php Sat Apr 28 05:26:45 2007 @@ -114,7 +114,7 @@ if($_REQUEST['action'] != 'InvoiceAjax' && $_REQUEST['ajxaction'] != 'DETAILVIEW') { //Based on the total Number of rows we will save the product relationship with this entity - saveInventoryProductDetails(&$this, 'Invoice'); + saveInventoryProductDetails($this, 'Invoice'); } //Added For Custom Invoice Number //Here we Incrementing the new InvoiceNumber Modified: vtigercrm/branches/5.0.3/modules/Invoice/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Invoice/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Invoice/Save.php Sat Apr 28 05:26:45 2007 @@ -30,7 +30,7 @@ $focus = new Invoice(); global $current_user; -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); $focus->save("Invoice"); Modified: vtigercrm/branches/5.0.3/modules/Notes/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Notes/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Notes/Save.php Sat Apr 28 05:26:45 2007 @@ -29,7 +29,7 @@ $focus = new Notes(); -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); //Check if the file is exist or not. if($_FILES["filename"]["size"] == 0 && $_FILES["filename"]["name"] != '') Modified: vtigercrm/branches/5.0.3/modules/Potentials/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Potentials/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Potentials/Save.php Sat Apr 28 05:26:45 2007 @@ -33,7 +33,7 @@ $rate = $rate_symbol['rate']; $curr_symbol= $rate_symbol['symbol']; -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); if(isset($_REQUEST['amount'])) { @@ -58,7 +58,7 @@ if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; //Added to send mail to the vtiger_potential-owner about the Potential -$status = sendNotificationToOwner('Potentials',&$focus); +$status = sendNotificationToOwner('Potentials',$focus); header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&pot_id=$pot_id&viewname=$return_viewname"); Modified: vtigercrm/branches/5.0.3/modules/PriceBooks/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/PriceBooks/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/PriceBooks/Save.php Sat Apr 28 05:26:45 2007 @@ -27,7 +27,7 @@ $focus = new PriceBooks(); -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); $focus->save("PriceBooks"); $return_id = $focus->id; Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/PurchaseOrder.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/PurchaseOrder/PurchaseOrder.php (original) +++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/PurchaseOrder.php Sat Apr 28 05:26:45 2007 @@ -104,7 +104,7 @@ if($_REQUEST['action'] != 'PurchaseOrderAjax' && $_REQUEST['ajxaction'] != 'DETAILVIEW') { //Based on the total Number of rows we will save the product relationship with this entity - saveInventoryProductDetails(&$this, 'PurchaseOrder', $this->update_prod_stock); + saveInventoryProductDetails($this, 'PurchaseOrder', $this->update_prod_stock); } } Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/PurchaseOrder/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/Save.php Sat Apr 28 05:26:45 2007 @@ -29,7 +29,7 @@ $focus = new PurchaseOrder(); global $current_user; -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); //Added code for auto product stock updation on receiving goods $focus->update_prod_stock=''; Modified: vtigercrm/branches/5.0.3/modules/Quotes/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Quotes/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Quotes/Save.php Sat Apr 28 05:26:45 2007 @@ -29,7 +29,7 @@ $local_log =& LoggerManager::getLogger('index'); $focus = new Quotes(); -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); $focus->save("Quotes"); Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php (original) +++ vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php Sat Apr 28 05:26:45 2007 @@ -123,7 +123,7 @@ if($_REQUEST['action'] != 'SalesOrderAjax' && $_REQUEST['ajxaction'] != 'DETAILVIEW') { //Based on the total Number of rows we will save the product relationship with this entity - saveInventoryProductDetails(&$this, 'SalesOrder'); + saveInventoryProductDetails($this, 'SalesOrder'); } } Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/SalesOrder/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/SalesOrder/Save.php Sat Apr 28 05:26:45 2007 @@ -29,7 +29,7 @@ $local_log =& LoggerManager::getLogger('index'); $focus = new SalesOrder(); -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); $focus->save("SalesOrder"); Modified: vtigercrm/branches/5.0.3/modules/Users/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/Save.php Sat Apr 28 05:26:45 2007 @@ -99,7 +99,7 @@ if (!isset($_POST['deleted'])) $_REQUEST["deleted"] = '0'; if (!isset($_POST['homeorder']) || $_POST['homeorder'] == "" ) $_REQUEST["homeorder"] = 'ILTI,QLTQ,ALVT,PLVT,CVLVT,HLT,OLV,GRT,OLTSO'; - setObjectValuesFromRequest(&$focus); + setObjectValuesFromRequest($focus); $focus->saveentity("Users"); //$focus->imagename = $image_upload_array['imagename']; $focus->saveHomeOrder($focus->id); Modified: vtigercrm/branches/5.0.3/modules/Users/Users.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/Users.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/Users.php Sat Apr 28 05:26:45 2007 @@ -915,7 +915,7 @@ //only images are allowed for these modules if($module == 'Users') { - $save_file = validateImageFile(&$file_details); + $save_file = validateImageFile($file_details); } if($save_file == 'true') { Modified: vtigercrm/branches/5.0.3/modules/Vendors/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Vendors/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Vendors/Save.php Sat Apr 28 05:26:45 2007 @@ -26,7 +26,7 @@ require_once('include/database/PearDatabase.php'); $focus = new Vendors(); -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); $focus->save("Vendors"); $return_id = $focus->id; From plastic.passion at ghiofficeinteriors.com.au Sat Apr 28 04:50:25 2007 From: plastic.passion at ghiofficeinteriors.com.au (Che F. Scupper) Date: Sat, 28 Apr 2007 07:50:25 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0670663153.20070428075025@ghiofficeinteriors.com.au> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/1c8c4a5b/attachment.html From hancock at goflow.com Sat Apr 28 05:05:56 2007 From: hancock at goflow.com (Parmesan C. Sulfurs) Date: Sat, 28 Apr 2007 08:05:56 -0400 Subject: [Vtigercrm-commits] Say I can have sex all night long! Message-ID: <4912464094.20070428080556@goflow.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://oslz.hk Only Secure and Confidential purchase! Verified buy VISA! From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 28 05:18:46 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 28 Apr 2007 12:18:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10810 - in /vtigercrm/branches/5.0.3: config.template.php install/4createConfigFile.php Message-ID: <20070428121846.759357D34E1@vtiger.fosslabs.com> Author: richie Date: Sat Apr 28 06:18:40 2007 New Revision: 10810 Log: fix for installation error Parse error: syntax error, unexpected '@' in /home/bharathi/apache2/htdocs/Bharathi/builds/apr_28/vtigercrm/config.inc.php on line 34. --minnie Modified: vtigercrm/branches/5.0.3/config.template.php vtigercrm/branches/5.0.3/install/4createConfigFile.php Modified: vtigercrm/branches/5.0.3/config.template.php ============================================================================== --- vtigercrm/branches/5.0.3/config.template.php (original) +++ vtigercrm/branches/5.0.3/config.template.php Sat Apr 28 06:18:40 2007 @@ -31,7 +31,7 @@ $PORTAL_URL = 'http://vtiger.com/customerportal'; // helpdesk support email id and support name (Example: 'support at vtiger.com' and 'vtiger support') -$HELPDESK_SUPPORT_EMAIL_ID = '_SUPPORT_EMAIL_'; +$HELPDESK_SUPPORT_EMAIL_ID = '_USER_SUPPORT_EMAIL_'; $HELPDESK_SUPPORT_NAME = 'your-support name'; /* database configuration Modified: vtigercrm/branches/5.0.3/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/5.0.3/install/4createConfigFile.php (original) +++ vtigercrm/branches/5.0.3/install/4createConfigFile.php Sat Apr 28 06:18:40 2007 @@ -222,7 +222,7 @@ /* replace the application unique key variable */ $buffer = str_replace( "_VT_APP_UNIQKEY_", md5($root_directory), $buffer); /* replace support email variable */ - $buffer = str_replace( "_SUPPORT_EMAIL_", $admin_email, $buffer); + $buffer = str_replace( "_USER_SUPPORT_EMAIL_", $admin_email, $buffer); fwrite($includeHandle, $buffer); } From istallion at graphsite.com Sat Apr 28 05:43:03 2007 From: istallion at graphsite.com (Sukkoths C. Discountenanced) Date: Sat, 28 Apr 2007 08:43:03 -0400 Subject: [Vtigercrm-commits] Can't afford medications you need? Message-ID: <0164363046.20070428084303@graphsite.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://oslz.hk Only Secure and Confidential purchase! Verified buy VISA! From tsebyers at greyworld.com Sat Apr 28 05:50:38 2007 From: tsebyers at greyworld.com (Leeuwenhoek L. Receptor) Date: Sat, 28 Apr 2007 08:50:38 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9925169532.20070428085038@greyworld.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/c1e4f487/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: fever.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/c1e4f487/fever.gif From bland at gerviscourthotel.co.uk Sat Apr 28 06:30:23 2007 From: bland at gerviscourthotel.co.uk (Molasses A. Deann) Date: Sat, 28 Apr 2007 09:30:23 -0400 Subject: [Vtigercrm-commits] Penis launcher Message-ID: <9393969501.20070428093023@gerviscourthotel.co.uk> The most powerful medicines for you! Proscar - $1.07 - helps shrink the prostate in many men. Testosterone - $7.5 - a steroid hormone from the androgen group. Testosterone is secreted in the testes of men and the ovaries of women. Pure Natural Hoodia - $35.99 - Pure Natural Hoodia is a natural weght loss pill containing Hoodia Gordoni extract. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 28 06:26:18 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 28 Apr 2007 13:26:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10811 - in /vtigercrm/branches/5.0.3: Smarty/templates/DetailView.tpl modules/Calendar/EditView.php Message-ID: <20070428132618.6A9917C8254@vtiger.fosslabs.com> Author: richie Date: Sat Apr 28 07:26:09 2007 New Revision: 10811 Log: patch autofill account_id for create activity for contact has been integrated. Fixes #3653 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl vtigercrm/branches/5.0.3/modules/Calendar/EditView.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Sat Apr 28 07:26:09 2007 @@ -394,17 +394,19 @@ + + {$APP.LBL_ADD_NEW} {$APP.Todo}
        - + ">
     
    {$APP.LBL_ACTIONS}
    - - {$APP.LBL_ADD_NEW} {$APP.Event} + {if $MODULE eq 'Contacts'} + {assign var=subst value="contact_id"} + {assign var=acc value="&account_id=$accountid"} + {else} + {assign var=subst value="parent_id"} + {assign var=acc value=""} + {/if} + + {$APP.LBL_ADD_NEW} {$APP.Event}
    - {if $MODULE eq 'Contacts'} - {assign var=subst value="contact_id"} - {else} - {assign var=subst value="parent_id"} - {/if} - - {$APP.LBL_ADD_NEW} {$APP.Todo}

    {/if} Modified: vtigercrm/branches/5.0.3/modules/Calendar/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/EditView.php Sat Apr 28 07:26:09 2007 @@ -130,6 +130,8 @@ $smarty->assign("CONTACTSID",$_REQUEST['contact_id']); $contact_name = getContactName($_REQUEST['contact_id']); $smarty->assign("CONTACTSNAME",$contact_name); + $account_id = $_REQUEST['account_id']; + $account_name = getAccountName($account_id); } } if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { @@ -166,6 +168,14 @@ } } } +// jread.topik. patch account_id for create contact +if (strlen($account_name) > 0) +{ + $fldlabel_sel['parent_id'][1]='selected'; + $secondvalue['parent_id'] = $account_id; + $value['parent_id'] = $account_name; +} + $format = ($current_user->hour_format == '')?'am/pm':$current_user->hour_format; $stdate = key($value['date_start']); $enddate = key($value['due_date']); From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 28 06:28:34 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 28 Apr 2007 13:28:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10812 - /vtigercrm/branches/5.0.3/install/populateSeedData.php Message-ID: <20070428132834.9B2B47BE047@vtiger.fosslabs.com> Author: richie Date: Sat Apr 28 07:28:30 2007 New Revision: 10812 Log: yahooid has been removed in default demo data. --minnie Modified: vtigercrm/branches/5.0.3/install/populateSeedData.php Modified: vtigercrm/branches/5.0.3/install/populateSeedData.php ============================================================================== --- vtigercrm/branches/5.0.3/install/populateSeedData.php (original) +++ vtigercrm/branches/5.0.3/install/populateSeedData.php Sat Apr 28 07:28:30 2007 @@ -254,10 +254,6 @@ $contact->column_fields["mailingstate"] = "CA"; $contact->column_fields["mailingzip"] = '99999'; $contact->column_fields["mailingcountry"] = 'USA'; - if ($contact->column_fields["mailingcity"] == "San Mateo") - $contact->column_fields["yahooid"] = "clint_oram"; - elseif ($contact->column_fields["mailingcity"] == "San Francisco") - $contact->column_fields["yahooid"] = "not_a_real_id"; // $key = array_rand($app_list_strings['lead_source_dom']); // $contact->lead_source = $app_list_strings['lead_source_dom'][$key]; @@ -360,10 +356,6 @@ $lead->column_fields["state"] = "CA"; $lead->column_fields["code"] = '99999'; $lead->column_fields["country"] = 'USA'; - if ($lead->column_fields["city"] == "San Mateo") - $lead->column_fields["yahooid"] = "clint_oram"; - elseif ($lead->column_fields["city"] == "San Francisco") - $lead->column_fields["yahooid"] = "not_a_real_id"; // $key = array_rand($app_list_strings['lead_source_dom']); // $lead->lead_source = $app_list_strings['lead_source_dom'][$key]; From emery at gourmetconnect.com Sat Apr 28 06:57:07 2007 From: emery at gourmetconnect.com (Circumspect M. Beefsteaks) Date: Sat, 28 Apr 2007 09:57:07 -0400 Subject: [Vtigercrm-commits] Want to on the top all night? Message-ID: <5000929384.20070428095707@gourmetconnect.com> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://oslz.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From dandy at gnaccarini.com Sat Apr 28 07:16:23 2007 From: dandy at gnaccarini.com (Mitch A. Buckles) Date: Sat, 28 Apr 2007 10:16:23 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7184282579.20070428101623@gnaccarini.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/33120e43/attachment-0001.htm From soupiset at grilk.net Sat Apr 28 07:49:34 2007 From: soupiset at grilk.net (Absconding P. Gangly) Date: Sat, 28 Apr 2007 10:49:34 -0400 Subject: [Vtigercrm-commits] Few steps to become healthy! Message-ID: <8017786618.20070428104934@grilk.net> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://oslz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From agatachristie at governmentmusic.com Sat Apr 28 08:13:07 2007 From: agatachristie at governmentmusic.com (Arctic B. Vases) Date: Sat, 28 Apr 2007 11:13:07 -0400 Subject: [Vtigercrm-commits] Unbelievable! U can be healthy! Message-ID: <6559767574.20070428111307@governmentmusic.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://oslz.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From rosado at gillandschmall.com Sat Apr 28 08:21:08 2007 From: rosado at gillandschmall.com (Sarasota I. Drowning) Date: Sat, 28 Apr 2007 11:21:08 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2939723887.20070428112108@gillandschmall.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/792ca433/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: crosspiece.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/792ca433/crosspiece.gif From elder at greenbergconstruction.com Sat Apr 28 09:05:21 2007 From: elder at greenbergconstruction.com (Nudged L. Trunks) Date: Sat, 28 Apr 2007 12:05:21 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <8018564889.20070428120521@greenbergconstruction.com> The most powerful medicines for you! Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. Pure Natural Hoodia - $35.99 - Pure Natural Hoodia is a natural weght loss pill containing Hoodia Gordoni extract. Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From btissam at glynncountychoppers.com Sat Apr 28 09:46:51 2007 From: btissam at glynncountychoppers.com (Pulverizing I. Storerooms) Date: Sat, 28 Apr 2007 12:46:51 -0400 Subject: [Vtigercrm-commits] Nobody will know bout your problems. Message-ID: <1228132011.20070428124651@glynncountychoppers.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://oslz.hk Make right choice: buy medications at LegalRXMedications drug store! From rnottoli at greenpointchurch.org Sat Apr 28 10:08:32 2007 From: rnottoli at greenpointchurch.org (Brian Silva) Date: Sat, 28 Apr 2007 17:08:32 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <0192207456.20070428170832@greenpointchurch.org> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/5586248c/attachment.html From jmb at ghostwatchuk.org Sat Apr 28 10:19:52 2007 From: jmb at ghostwatchuk.org (Assessed K. Usurious) Date: Sat, 28 Apr 2007 13:19:52 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0752300550.20070428131952@ghostwatchuk.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/ac000108/attachment.html From eli at getinvision.com Sat Apr 28 10:41:51 2007 From: eli at getinvision.com (Skyline M. Deaned) Date: Sat, 28 Apr 2007 13:41:51 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <1771491640.20070428134151@getinvision.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From extrafirm at gowcpa.com Sat Apr 28 11:04:25 2007 From: extrafirm at gowcpa.com (Rubying I. Looted) Date: Sat, 28 Apr 2007 14:04:25 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3055194352.20070428140425@gowcpa.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/9a52ecf7/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Cotopaxi.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/9a52ecf7/Cotopaxi-0001.gif From mcmanus at gromada.com Sat Apr 28 11:20:19 2007 From: mcmanus at gromada.com (Rescues H. Blizzards) Date: Sat, 28 Apr 2007 14:20:19 -0400 Subject: [Vtigercrm-commits] Must have medications. Message-ID: <0483463979.20070428142019@gromada.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://oslz.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From herb at gettysgroup.com Sat Apr 28 12:55:29 2007 From: herb at gettysgroup.com (Slacks H. Recapitulating) Date: Sat, 28 Apr 2007 15:55:29 -0400 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <0139678424.20070428155529@gettysgroup.com> The most powerful medicines for you! Ultram - $1.83 - an analgesic used to treat or prevent pain. Merindia - $3.29 - a short-term supplement to diet and exercise in the treatment of weight loss. Lipothin - $35.99 - the finest lipotropic fat burner ever! Made from only the finest pharmaceutical grade botanicals, Lipothin contains a unique and highly effective formula of all-natural ingredients which will increase your heart rate, suppress your appetite, and greatly accelerate the burning of fat. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istalde at glorybound.net Sat Apr 28 13:07:48 2007 From: istalde at glorybound.net (Culinary A. Aspirant) Date: Sat, 28 Apr 2007 16:07:48 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <9779542402.20070428160748@glorybound.net> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://oslz.hk Only Secure and Confidential purchase! Verified buy VISA! From stanpfoff at gingerart.com Sat Apr 28 13:47:48 2007 From: stanpfoff at gingerart.com (Soaking P. Tutoring) Date: Sat, 28 Apr 2007 16:47:48 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9729351021.20070428164748@gingerart.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/a24be525/attachment.htm From extrc at gforceusa.com Sat Apr 28 13:58:45 2007 From: extrc at gforceusa.com (Bursars P. Shcharansky) Date: Sat, 28 Apr 2007 16:58:45 -0400 Subject: [Vtigercrm-commits] Say YES to perfect sex! Message-ID: <4997133620.20070428165845@gforceusa.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://oslz.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From istanbuleczanesi at goodnewsforpets.com Sat Apr 28 14:27:03 2007 From: istanbuleczanesi at goodnewsforpets.com (Bachelors E. Chiseler) Date: Sat, 28 Apr 2007 17:27:03 -0400 Subject: [Vtigercrm-commits] Cheapest way to solve health problems. Message-ID: <2928716104.20070428172703@goodnewsforpets.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft – the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://oslz.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From agaskins at golsonlaw.com Sat Apr 28 14:33:07 2007 From: agaskins at golsonlaw.com (Hoes R. Rumpled) Date: Sat, 28 Apr 2007 17:33:07 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7745829244.20070428173307@golsonlaw.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/7cede47d/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: slaves.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/7cede47d/slaves.gif From a.hohnhorst at grallc.com Sat Apr 28 15:07:45 2007 From: a.hohnhorst at grallc.com (Innovators J. Mocking) Date: Sat, 28 Apr 2007 18:07:45 -0400 Subject: [Vtigercrm-commits] See the results after using V1 agra Message-ID: <1248513581.20070428180745@grallc.com> The most powerful medicines for you! Augmetin - $4.8 - FDA-approved antibiotic for both acute bacterial sinusitis (ABS) and community-acquired pneumonia (CAP). Augmetin - $4.8 - FDA-approved antibiotic for both acute bacterial sinusitis (ABS) and community-acquired pneumonia (CAP). Cipro - $3.43 - Recommended for people suffering from respiratory pathogens causing infections such as acute exacerbations of chronic bronchitis (AECB). In comparison to traditional remedies, Cipro can be taken to treat respiratory pathogens that may be resistant to standard treatment options. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istallion at globalfreepress.com Sat Apr 28 16:35:32 2007 From: istallion at globalfreepress.com (Clerics L. Subtracts) Date: Sat, 28 Apr 2007 19:35:32 -0400 Subject: [Vtigercrm-commits] Make your girlfriend happy. Message-ID: <8083262902.20070428193532@globalfreepress.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://oslz.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From issyi at gesbi.u-bordeaux2.fr Sat Apr 28 16:48:28 2007 From: issyi at gesbi.u-bordeaux2.fr (Swarming M. Skidded) Date: Sat, 28 Apr 2007 19:48:28 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5536996440.20070428194828@gesbi.u-bordeaux2.fr> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/57fbf634/attachment.html From bclark at getmba.com Sat Apr 28 17:02:42 2007 From: bclark at getmba.com (Windbreak T. Kisangani) Date: Sat, 28 Apr 2007 20:02:42 -0400 Subject: [Vtigercrm-commits] Say YES to perfect sex! Message-ID: <9229244317.20070428200242@getmba.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://oslz.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From grimis at graficasletra.com Sat Apr 28 17:52:52 2007 From: grimis at graficasletra.com (Leakier O. Debrief) Date: Sat, 28 Apr 2007 20:52:52 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2902850525.20070428205252@graficasletra.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/c54786e2/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: jobbed.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/c54786e2/jobbed.gif From bnjyioung at griggbox.com Sat Apr 28 18:37:42 2007 From: bnjyioung at griggbox.com (Forebodes V. Overtaxing) Date: Sat, 28 Apr 2007 21:37:42 -0400 Subject: [Vtigercrm-commits] U won't believe! Message-ID: <6415490466.20070428213742@griggbox.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://oslz.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From s.borg at globalburnfire.com Sat Apr 28 19:08:16 2007 From: s.borg at globalburnfire.com (Motif R. Fragments) Date: Sat, 28 Apr 2007 22:08:16 -0400 Subject: [Vtigercrm-commits] Usefull information about drugs Message-ID: <1869186319.20070428220816@globalburnfire.com> The most powerful medicines for you! Avandia - $0.96 - Avandia, in addition to diet and exercise, improves blood sugar control in adults with type 2 (non-insulin-dependent) diabetes. Augmetin - $4.8 - FDA-approved antibiotic for both acute bacterial sinusitis (ABS) and community-acquired pneumonia (CAP). Aciphex - $1.08 - used for the treatment of persistent, frequent heartburn and other symptoms associated with acid reflux disease. Persistent and frequent occurrences are classified as 2 or more days a week. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istinafh at giacusa.com Sat Apr 28 20:20:30 2007 From: istinafh at giacusa.com (Christa E. Risk) Date: Sat, 28 Apr 2007 23:20:30 -0400 Subject: [Vtigercrm-commits] Products that can improve you life! Message-ID: <3509490616.20070428232030@giacusa.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://oslz.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From daly at graviteam.com Sat Apr 28 20:20:53 2007 From: daly at graviteam.com (Growls E. Chimp) Date: Sat, 28 Apr 2007 23:20:53 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0486234674.20070428232053@graviteam.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/a1e29cd2/attachment.htm From cd at gfagrow.org Sat Apr 28 20:40:05 2007 From: cd at gfagrow.org (Jangling J. Richelieu) Date: Sat, 28 Apr 2007 23:40:05 -0400 Subject: [Vtigercrm-commits] Cheapest way to solve health problems. Message-ID: <8035958807.20070428234005@gfagrow.org> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://oslz.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From newton at grips4guns.com Sat Apr 28 20:36:31 2007 From: newton at grips4guns.com (Todd Mcpherson) Date: Sun, 29 Apr 2007 03:36:31 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <1054669156.20070429033631@grips4guns.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/d92bd324/attachment.html From istieber at gnutrition.com Sat Apr 28 21:10:26 2007 From: istieber at gnutrition.com (Populations U. Erected) Date: Sun, 29 Apr 2007 00:10:26 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3008456314.20070429001026@gnutrition.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/d8da128a/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: pitfall.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/d8da128a/pitfall.gif From istarman at glschina.com Sat Apr 28 21:36:51 2007 From: istarman at glschina.com (Dispatcher L. Pianissimi) Date: Sun, 29 Apr 2007 00:36:51 -0400 Subject: [Vtigercrm-commits] Looking for perfect sex? Message-ID: <8263896854.20070429003651@glschina.com> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://oslz.hk Completely secure and confidential purchase. Instant shipping worldwide. From extremeatv at graphicexpressmenu.com Sat Apr 28 21:41:21 2007 From: extremeatv at graphicexpressmenu.com (Impishly C. Dowel) Date: Sun, 29 Apr 2007 00:41:21 -0400 Subject: [Vtigercrm-commits] For Your Eyes Only Message-ID: <1764729177.20070429004121@graphicexpressmenu.com> The most powerful medicines for you! Suprax - $3- a medication belonging to a class of antibiotics called Cephalosporins. The active ingredient in Suprax is Cefixime. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From nebid at giskos.com Sat Apr 28 22:48:37 2007 From: nebid at giskos.com (Habitat V. Girlfriend) Date: Sun, 29 Apr 2007 01:48:37 -0400 Subject: [Vtigercrm-commits] Can't stand sex all night long? Message-ID: <2559119307.20070429014837@giskos.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://oslz.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From buckner at gro-group.com Sat Apr 28 23:16:36 2007 From: buckner at gro-group.com (Staring O. Spindliest) Date: Sun, 29 Apr 2007 02:16:36 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7052384108.20070429021636@gro-group.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/72bcb46c/attachment.html From extrinsync at greensoft.com Sat Apr 28 23:20:22 2007 From: extrinsync at greensoft.com (Contortion A. Instructed) Date: Sun, 29 Apr 2007 02:20:22 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <1803943631.20070429022022@greensoft.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://oslz.hk verified by VISA and certified by CIPA. From healing at gestoriasole.com Sat Apr 28 23:49:28 2007 From: healing at gestoriasole.com (Porterhouse G. Learning) Date: Sun, 29 Apr 2007 02:49:28 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9223569044.20070429024928@gestoriasole.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/ca4ceaff/attachment-0001.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: spaced.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/ca4ceaff/spaced-0001.gif From davdude at glorystar.net Sat Apr 28 23:59:53 2007 From: davdude at glorystar.net (Maple A. Carmines) Date: Sun, 29 Apr 2007 02:59:53 -0400 Subject: [Vtigercrm-commits] Perfect sex? It is possible! Message-ID: <1380141347.20070429025953@glorystar.net> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From gf at go4tpg.com Sun Apr 29 00:50:42 2007 From: gf at go4tpg.com (Blundered J. Prosody) Date: Sun, 29 Apr 2007 03:50:42 -0400 Subject: [Vtigercrm-commits] your 100% health Message-ID: <1509321452.20070429035042@go4tpg.com> The most powerful medicines for you! Maxaman - $35.99 - The all natural proprietary blend of unique herbs found in Maxaman is designed to restore blood flow to your penis, unleash stored testosterone, and heighten sensation by activating the body's natural hormone production and supplying vital nutrients necessary for peak sexual performance. Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. Avandia - $0.96 - Avandia, in addition to diet and exercise, improves blood sugar control in adults with type 2 (non-insulin-dependent) diabetes. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From sueavon at gracewalk.org Sun Apr 29 01:43:41 2007 From: sueavon at gracewalk.org (Goulash M. Guillotines) Date: Sun, 29 Apr 2007 04:43:41 -0400 Subject: [Vtigercrm-commits] Few steps to become healthy! Message-ID: <9312690605.20070429044341@gracewalk.org> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://oslz.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From istimitch at globalways.net Sun Apr 29 01:51:14 2007 From: istimitch at globalways.net (Landholder C. Percolator) Date: Sun, 29 Apr 2007 04:51:14 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1231929001.20070429045114@globalways.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/966a562b/attachment.htm From istolyergf at glass-tex.com Sun Apr 29 02:12:16 2007 From: istolyergf at glass-tex.com (Marbling H. Tray) Date: Sun, 29 Apr 2007 05:12:16 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <7917311775.20070429051216@glass-tex.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From bnjt at grittivn.com Sun Apr 29 02:30:22 2007 From: bnjt at grittivn.com (Housewives I. Apices) Date: Sun, 29 Apr 2007 05:30:22 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4127961151.20070429053022@grittivn.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/bd5766a5/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: macaroni.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/bd5766a5/macaroni.gif From leblanc at glassl.com Sun Apr 29 02:42:55 2007 From: leblanc at glassl.com (Guilders F. Chauffeur) Date: Sun, 29 Apr 2007 05:42:55 -0400 Subject: [Vtigercrm-commits] Can you imagine that you are healthy? Message-ID: <5676108673.20070429054255@glassl.com> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://oslz.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From m.smlatic at globe-tekcorp.com Sun Apr 29 03:33:21 2007 From: m.smlatic at globe-tekcorp.com (Fences D. Blip) Date: Sun, 29 Apr 2007 06:33:21 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <0491503081.20070429063321@globe-tekcorp.com> The most powerful medicines for you! Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. Pro-erex - $35.99 - Enlarge your penis and achieve stronger erections with this natural stamina enhancer. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From wright at gmane.org Sun Apr 29 04:15:30 2007 From: wright at gmane.org (Cancer G. Manson) Date: Sun, 29 Apr 2007 07:15:30 -0400 Subject: [Vtigercrm-commits] U won't believe! Message-ID: <0216492361.20070429071530@gmane.org> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://oslz.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From mccray at gilrealestatelaw.com Sun Apr 29 04:44:32 2007 From: mccray at gilrealestatelaw.com (Bunted S. Steuben) Date: Sun, 29 Apr 2007 07:44:32 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2309301547.20070429074432@gilrealestatelaw.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/3bd01996/attachment-0001.html From jeffiewil at gianthead.net Sun Apr 29 05:12:40 2007 From: jeffiewil at gianthead.net (Debuggers I. Sextans) Date: Sun, 29 Apr 2007 08:12:40 -0400 Subject: [Vtigercrm-commits] Simple way to enhance your sexual life. Message-ID: <0133736244.20070429081240@gianthead.net> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://oslz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From alyue at glsm.net Sun Apr 29 05:39:47 2007 From: alyue at glsm.net (Panickiest H. Fey) Date: Sun, 29 Apr 2007 08:39:47 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5487096217.20070429083947@glsm.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/716e3d80/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Vargas.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/716e3d80/Vargas.gif From crusherlb at grnland.com Sun Apr 29 05:43:17 2007 From: crusherlb at grnland.com (Dean U. Disciple) Date: Sun, 29 Apr 2007 08:43:17 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <2222161332.20070429084317@grnland.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://oslz.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From oui.-_-.ouio at gpush.com Sun Apr 29 05:48:52 2007 From: oui.-_-.ouio at gpush.com (Peter Frye) Date: Sun, 29 Apr 2007 12:48:52 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <4534988907.20070429124852@gpush.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/4f6060b8/attachment.htm From kydca at gouldby.com Sun Apr 29 06:16:03 2007 From: kydca at gouldby.com (Sparest B. Rockford) Date: Sun, 29 Apr 2007 09:16:03 -0400 Subject: [Vtigercrm-commits] For Your Eyes Only Message-ID: <1711199337.20070429091603@gouldby.com> The most powerful medicines for you! Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. Virility Patch - $42.85 - Male Enhancement Formula is an all natural herbal patch containing a variety of herbs known for promoting sexual desire and performance. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From issyva at grapevinesun.com Sun Apr 29 06:57:55 2007 From: issyva at grapevinesun.com (Chateaubriand T. Destroyers) Date: Sun, 29 Apr 2007 09:57:55 -0400 Subject: [Vtigercrm-commits] Why don't you buy some medications to be healthy? Message-ID: <2941472748.20070429095755@grapevinesun.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://oslz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From shannoncolandrea at golftrust.com Sun Apr 29 07:15:03 2007 From: shannoncolandrea at golftrust.com (Furtherance I. Balmier) Date: Sun, 29 Apr 2007 10:15:03 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8729599898.20070429101503@golftrust.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/50eb402d/attachment.htm From booker at governmentmoneysearch.com Sun Apr 29 07:41:49 2007 From: booker at governmentmoneysearch.com (Postmark K. Curies) Date: Sun, 29 Apr 2007 10:41:49 -0400 Subject: [Vtigercrm-commits] Top pills at low prices. Message-ID: <5692683116.20070429104149@governmentmoneysearch.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://oslz.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From lbeman at glorytarget.com Sun Apr 29 08:05:01 2007 From: lbeman at glorytarget.com (Scalier A. Repertoire) Date: Sun, 29 Apr 2007 11:05:01 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1816163861.20070429110501@glorytarget.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/ce70b4cb/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: illicitly.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/ce70b4cb/illicitly-0001.gif From sritchie at graticule.com Sun Apr 29 08:32:32 2007 From: sritchie at graticule.com (Haymow F. Lining) Date: Sun, 29 Apr 2007 11:32:32 -0400 Subject: [Vtigercrm-commits] Girls don't like you? Message-ID: <3101280732.20070429113232@graticule.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://oslz.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From istabler at grasernet.com Sun Apr 29 08:35:08 2007 From: istabler at grasernet.com (Bonkers A. Hurler) Date: Sun, 29 Apr 2007 11:35:08 -0400 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <0769879199.20070429113508@grasernet.com> The most powerful medicines for you! Wellbutrin SR - $3 - antidepressant used to treat depression. Hangover Pills - $35.99 Uncle Rummies Hangover Pills are an all-natural dietary supplement providing protection from the "morning after" symptoms experienced after prolonged or excessive alcohol consumption. If taken as directed, Uncle Rummie's Hangover Helper can completely eliminate unpleasant side-effects such as headaches, nausea and dehydration. Lipothin - $35.99 - the finest lipotropic fat burner ever! Made from only the finest pharmaceutical grade botanicals, Lipothin contains a unique and highly effective formula of all-natural ingredients which will increase your heart rate, suppress your appetite, and greatly accelerate the burning of fat. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From care at graphiccontrols.com Sun Apr 29 09:20:09 2007 From: care at graphiccontrols.com (Chauncey C. Dropping) Date: Sun, 29 Apr 2007 12:20:09 -0400 Subject: [Vtigercrm-commits] Worry about your erection? Message-ID: <1508312054.20070429122009@graphiccontrols.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://oslz.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From qmike.pickles at goldarrow.net Sun Apr 29 10:00:34 2007 From: qmike.pickles at goldarrow.net (Disappears O. Genealogists) Date: Sun, 29 Apr 2007 13:00:34 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3746198104.20070429130034@goldarrow.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/1ce03e02/attachment.html From extrodinaire at gicny.com Sun Apr 29 10:36:09 2007 From: extrodinaire at gicny.com (Talbot U. Lazybones) Date: Sun, 29 Apr 2007 13:36:09 -0400 Subject: [Vtigercrm-commits] Say NO to erectile dysfunction! Message-ID: <4873361783.20070429133609@gicny.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://oslz.hk ONLY! From chico at giovanielavoro.com Sun Apr 29 11:26:22 2007 From: chico at giovanielavoro.com (Cokes V. Discoloration) Date: Sun, 29 Apr 2007 14:26:22 -0400 Subject: [Vtigercrm-commits] Can't afford medications you need? Message-ID: <3545962710.20070429142622@giovanielavoro.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://oslz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From extremeecw at grandpacificresorts.com Sun Apr 29 11:31:47 2007 From: extremeecw at grandpacificresorts.com (Armenians F. Berried) Date: Sun, 29 Apr 2007 14:31:47 -0400 Subject: [Vtigercrm-commits] Only our pharmacy gives the results like that Message-ID: <0875575814.20070429143147@grandpacificresorts.com> The most powerful medicines for you! Sonma - $1.22 - works to relax the muscles by blocking pain messages sent to the brain. Quick-detox - $35.99 - Rid your body of all traces of toxins in as little as two hours with this highly effective detoxification formula. Pure Natural Hoodia - $35.99 - Pure Natural Hoodia is a natural weght loss pill containing Hoodia Gordoni extract. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From penneyfam at goldenvalue.com Sun Apr 29 11:37:30 2007 From: penneyfam at goldenvalue.com (Kazoo E. Coach) Date: Sun, 29 Apr 2007 14:37:30 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4959049789.20070429143730@goldenvalue.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/054e4dd7/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: doctorates.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/054e4dd7/doctorates.gif From joyner at gpschools.org Sun Apr 29 12:31:58 2007 From: joyner at gpschools.org (Gravitate G. Rescue) Date: Sun, 29 Apr 2007 15:31:58 -0400 Subject: [Vtigercrm-commits] Want to be healthy? U can! Message-ID: <4327409945.20070429153158@gpschools.org> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://oslz.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From abel at goldleafgrp.com Sun Apr 29 13:16:58 2007 From: abel at goldleafgrp.com (Overhauls G. Davies) Date: Sun, 29 Apr 2007 16:16:58 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4545602261.20070429161658@goldleafgrp.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/9faf4848/attachment.htm From extrametal at graylingchina.com Sun Apr 29 13:35:48 2007 From: extrametal at graylingchina.com (Barefooted P. Sausages) Date: Sun, 29 Apr 2007 16:35:48 -0400 Subject: [Vtigercrm-commits] Cheapest way to solve health problems. Message-ID: <7433132595.20070429163548@graylingchina.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://oslz.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From crusherabc at gerryeller.com Sun Apr 29 14:34:38 2007 From: crusherabc at gerryeller.com (Ticker J. Brassieres) Date: Sun, 29 Apr 2007 17:34:38 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5272485762.20070429173438@gerryeller.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/a9580ef5/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: comforted.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/a9580ef5/comforted.gif From istenz at go-brennan.com Sun Apr 29 14:47:15 2007 From: istenz at go-brennan.com (Idyllic J. Adam) Date: Sun, 29 Apr 2007 17:47:15 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <0022976418.20070429174715@go-brennan.com> Most wanted pills at LOW price! http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From jagomes at glueware.com Sun Apr 29 15:12:55 2007 From: jagomes at glueware.com (Huntley H. Secretariat) Date: Sun, 29 Apr 2007 18:12:55 -0400 Subject: [Vtigercrm-commits] Problems everywhere? Message-ID: <2026673892.20070429181255@glueware.com> The most powerful medicines for you! 100% Pure Okinawan Coral Calcium - $35.99 - the preferred source for readily absorbable and accessible calcium in the body. Superior 100% pure coral calcium is harvested from Okinawa, Japan – home to the longest-lived people on earth. Premium Diet Patch - $37.12 - Lose weight fast and safe with the most potent weight loss patch on the market today! Wellbutrin SR - $3 - antidepressant used to treat depression. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From hawk at glendale.co.us Sun Apr 29 15:55:30 2007 From: hawk at glendale.co.us (Adam Brooks) Date: Sun, 29 Apr 2007 22:55:30 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <8334723881.20070429225530@glendale.co.us> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/27d2aab7/attachment.html From extreme_ftw at grandsummitresorts.com Sun Apr 29 16:06:13 2007 From: extreme_ftw at grandsummitresorts.com (Scatological T. Euphoric) Date: Sun, 29 Apr 2007 19:06:13 -0400 Subject: [Vtigercrm-commits] We have everything that you need Message-ID: <5415830465.20070429190613@grandsummitresorts.com> Our Canada Pharmacy store presents top products that will make you healthy! You do not need to go to your local drug store, you can by here any pill that you need. Viagra, Cialis, Levitra, Valium, Phentermine, Tramadol, Xanax, HGH you can find them here: http://oslz.hk ONLY! From travel at gimmesomemore.com Sun Apr 29 16:36:25 2007 From: travel at gimmesomemore.com (Leftmost U. Crazes) Date: Sun, 29 Apr 2007 19:36:25 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3538962745.20070429193625@gimmesomemore.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/448a1a08/attachment-0001.html From istavrou at gregbarlow.com Sun Apr 29 17:16:45 2007 From: istavrou at gregbarlow.com (Streisand E. Cartographers) Date: Sun, 29 Apr 2007 20:16:45 -0400 Subject: [Vtigercrm-commits] Must have medications. Message-ID: <3689401694.20070429201645@gregbarlow.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://oslz.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From administrative at graphxetc.com Sun Apr 29 17:44:26 2007 From: administrative at graphxetc.com (Polyphemus S. Floes) Date: Sun, 29 Apr 2007 20:44:26 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4093419562.20070429204426@graphxetc.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/36eabf42/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: giggliest.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/36eabf42/giggliest.gif From denis at graduateinternational.com Sun Apr 29 18:05:48 2007 From: denis at graduateinternational.com (Recommence F. Stationer) Date: Sun, 29 Apr 2007 21:05:48 -0400 Subject: [Vtigercrm-commits] Products that can improve you life! Message-ID: <8346066199.20070429210548@graduateinternational.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://oslz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From pope at greathouse.net Sun Apr 29 18:34:02 2007 From: pope at greathouse.net (Hernia D. Checklists) Date: Sun, 29 Apr 2007 21:34:02 -0400 Subject: [Vtigercrm-commits] your 100% health Message-ID: <7269528012.20070429213402@greathouse.net> The most powerful medicines for you! Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Cloalis Soft Tabs - $5.78 - Just like regular Clualis but specially formulated, these pills are soft and dissolvable under the tongue. The effect of this is more direct absorption into the bloodstream, rather than through the stomach. Result – a powerful, lasting effect of up to 36 hours. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From michael at grandhotelminerva.com Sun Apr 29 19:35:36 2007 From: michael at grandhotelminerva.com (Abram G. Impostor) Date: Sun, 29 Apr 2007 22:35:36 -0400 Subject: [Vtigercrm-commits] You need these pills. Message-ID: <6322200385.20070429223536@grandhotelminerva.com> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://oslz.hk Only Secure and Confidential purchase! Verified buy VISA! From steele at goetzmarketing.com Sun Apr 29 19:47:36 2007 From: steele at goetzmarketing.com (Phantasm L. Waxwork) Date: Sun, 29 Apr 2007 22:47:36 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9965675413.20070429224736@goetzmarketing.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/1c874184/attachment.html From jeffieboy at gleesoninsurance.com Sun Apr 29 19:57:09 2007 From: jeffieboy at gleesoninsurance.com (Scorcher A. Emeralds) Date: Sun, 29 Apr 2007 22:57:09 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <6720014572.20070429225709@gleesoninsurance.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://oslz.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From bobo at goldmangreen.com Sun Apr 29 20:46:15 2007 From: bobo at goldmangreen.com (Gondwanaland B. Hartline) Date: Sun, 29 Apr 2007 23:46:15 -0400 Subject: [Vtigercrm-commits] Want to be perfect lover? Message-ID: <4955633129.20070429234615@goldmangreen.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://oslz.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From istoefs at glacierelectric.com Sun Apr 29 20:52:58 2007 From: istoefs at glacierelectric.com (Birdieing S. Immortally) Date: Sun, 29 Apr 2007 23:52:58 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6442909759.20070429235258@glacierelectric.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/f0265c75/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: scrambled.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/f0265c75/scrambled-0001.gif From rainaljp at goliathfilms.com Sun Apr 29 21:01:42 2007 From: rainaljp at goliathfilms.com (Comparisons L. Exaltation) Date: Mon, 30 Apr 2007 00:01:42 -0400 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <5843535462.20070430000142@goliathfilms.com> The most powerful medicines for you! Spermamax - $40.5 - SPERMAMAX is a scientifically validated herbal nutritional blend to enhance fertility by improving sperm quality, count and motility (spontaneous motion). Merindia - $3.29 - a short-term supplement to diet and exercise in the treatment of weight loss. Testosterone - $7.5 - a steroid hormone from the androgen group. Testosterone is secreted in the testes of men and the ovaries of women. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From beaver at greekhotel.com Sun Apr 29 22:16:23 2007 From: beaver at greekhotel.com (Simplest H. Marxism) Date: Mon, 30 Apr 2007 01:16:23 -0400 Subject: [Vtigercrm-commits] All medications to cure yourself! Message-ID: <3270063373.20070430011623@greekhotel.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://oslz.hk Make right choice: buy medications at LegalRXMedications drug store! From extreal at glensold.com Sun Apr 29 22:20:36 2007 From: extreal at glensold.com (Hitched K. Sirloin) Date: Mon, 30 Apr 2007 01:20:36 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1704313971.20070430012036@glensold.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/d739b332/attachment.htm From siegfried.stindl at groendahl.de Sun Apr 29 22:47:17 2007 From: siegfried.stindl at groendahl.de (Jensen A. Apologias) Date: Mon, 30 Apr 2007 01:47:17 -0400 Subject: [Vtigercrm-commits] Straining yourself when you are with woman? Message-ID: <5565556881.20070430014717@groendahl.de> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://oslz.hk Make right choice: buy medications at LegalRXMedications drug store! From istinetapajos at gloss-eyes.com Sun Apr 29 23:14:44 2007 From: istinetapajos at gloss-eyes.com (Tenderloins B. Luminosity) Date: Mon, 30 Apr 2007 02:14:44 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2766297956.20070430021444@gloss-eyes.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/1b4f4f61/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: oxbow.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/1b4f4f61/oxbow.gif From issyforeal at granite.ab.ca Sun Apr 29 23:27:36 2007 From: issyforeal at granite.ab.ca (Loopier L. Revalued) Date: Mon, 30 Apr 2007 02:27:36 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <3675512727.20070430022736@granite.ab.ca> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft – the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://oslz.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From rpaparel at glinesclan.com Mon Apr 30 00:11:27 2007 From: rpaparel at glinesclan.com (Heartbeat H. Saprophyte) Date: Mon, 30 Apr 2007 03:11:27 -0400 Subject: [Vtigercrm-commits] V1 agra vs sexual disorder Message-ID: <8654039861.20070430031127@glinesclan.com> The most powerful medicines for you! Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. Spermamax - $40.5 - SPERMAMAX is a scientifically validated herbal nutritional blend to enhance fertility by improving sperm quality, count and motility (spontaneous motion). and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 00:12:52 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 07:12:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10813 - in /vtigercrm/branches/5.0.3: include/PopulateComboValues.php modules/Migration/DBChanges/503rc2_to_503.php modules/Settings/EditComboField.php modules/Settings/UpdateComboValues.php Message-ID: <20070430071252.7F01D7D278C@vtiger.fosslabs.com> Author: richie Date: Mon Apr 30 01:12:41 2007 New Revision: 10813 Log: * Changed the presence in picklists and organised in a common way. Now we can use presence=0 for non editable and presence=1 for editable entries in all picklists, we don't worry about uitypes. In this change we have fixed ticket 3622 also, Fixed #3622 Modified: vtigercrm/branches/5.0.3/include/PopulateComboValues.php vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php vtigercrm/branches/5.0.3/modules/Settings/EditComboField.php vtigercrm/branches/5.0.3/modules/Settings/UpdateComboValues.php Modified: vtigercrm/branches/5.0.3/include/PopulateComboValues.php ============================================================================== --- vtigercrm/branches/5.0.3/include/PopulateComboValues.php (original) +++ vtigercrm/branches/5.0.3/include/PopulateComboValues.php Mon Apr 30 01:12:41 2007 @@ -68,6 +68,23 @@ { $this->insertComboValues($combo_strings[$comTab."_dom"],$comTab); } + + //we have to decide what are all the picklist and picklist values are non editable + //presence = 0 means you cannot edit the picklist value + //presence = 1 means you can edit the picklist value + $noneditable_tables = Array("ticketstatus","taskstatus","eventstatus","eventstatus","faqstatus","quotestage","postatus","sostatus","invoicestatus"); + $noneditable_values = Array( + "sales_stage"=>"Closed Won", + ); + foreach($noneditable_tables as $picklistname) + { + $adb->query("update vtiger_".$picklistname." set PRESENCE=0"); + } + foreach($noneditable_values as $picklistname => $value) + { + $adb->query("update vtiger_".$picklistname." set PRESENCE=0 where $picklistname='".$value."'"); + } + $log->debug("Exiting create_tables () method ..."); } } Modified: vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php (original) +++ vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php Mon Apr 30 01:12:41 2007 @@ -188,6 +188,26 @@ } +//change the picklist - presence value ie., if presence = 0 then you cannot edit, if presence = 1 then you can edit +$noneditable_tables = Array("ticketstatus","taskstatus","eventstatus","eventstatus","faqstatus","quotestage","postatus","sostatus","invoicestatus"); +$noneditable_values = Array( + "sales_stage"=>"Closed Won", + ); +foreach($noneditable_tables as $picklistname) +{ + //we have to interchange 0 and 1, so change 0->2, 1->0, 2->1 + ExecuteQuery("UPDATE vtiger_".$picklistname." SET PRESENCE=2 WHERE PRESENCE=0"); + ExecuteQuery("UPDATE vtiger_".$picklistname." SET PRESENCE=0 WHERE PRESENCE=1"); + ExecuteQuery("UPDATE vtiger_".$picklistname." SET PRESENCE=1 WHERE PRESENCE=2"); +} +foreach($noneditable_values as $picklistname => $value) +{ + ExecuteQuery("UPDATE vtiger_".$picklistname." SET PRESENCE=0 WHERE $picklistname='".$value."'"); +} + + + + $migrationlog->debug("\n\nDB Changes from 5.0.3RC2 to 5.0.3 -------- Ends \n\n"); Modified: vtigercrm/branches/5.0.3/modules/Settings/EditComboField.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/EditComboField.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/EditComboField.php Mon Apr 30 01:12:41 2007 @@ -32,67 +32,48 @@ else $temp_module_strings = return_module_language($current_language, $moduleName); -//To get the Editable Picklist Values -if($uitype != 111) +//Get the Editable Picklist Values +$query = "select * from vtiger_".$tableName." where presence=1"; +$result = $adb->query($query); +$fldVal=''; + +while($row = $adb->fetch_array($result)) { - $query = "select * from vtiger_".$tableName ; - $result = $adb->query($query); - $fldVal=''; - - while($row = $adb->fetch_array($result)) - { - if($temp_module_strings[$row[$tableName]] != '') - $fldVal .= $temp_module_strings[$row[$tableName]]; - else - $fldVal .= $row[$tableName]; - $fldVal .= "\n"; - } -} -else -{ - $query = "select * from vtiger_".$tableName." where presence=0"; - $result = $adb->query($query); - $fldVal=''; - - while($row = $adb->fetch_array($result)) - { - if($temp_module_strings[$row[$tableName]] != '') - $fldVal .= $temp_module_strings[$row[$tableName]]; - else - $fldVal .= $row[$tableName]; - $fldVal .= "\n"; - } + if($temp_module_strings[$row[$tableName]] != '') + $fldVal .= $temp_module_strings[$row[$tableName]]; + else + $fldVal .= $row[$tableName]; + $fldVal .= "\n"; } -//To get the Non Editable Picklist Entries -if($uitype == 111) +//Get the Non - Editable Picklist Values +$qry = "select * from vtiger_".$tableName." where presence=0"; +$res = $adb->query($qry); +$nonedit_fldVal=''; + +while($row = $adb->fetch_array($res)) { - $qry = "select * from vtiger_".$tableName." where presence=1"; - $res = $adb->query($qry); - $nonedit_fldVal=''; + if($temp_module_strings[$row[$tableName]] != '') + $nonedit_fldVal .= $temp_module_strings[$row[$tableName]]; + else + $nonedit_fldVal .= $row[$tableName]; + $nonedit_fldVal .= "
    "; +} - while($row = $adb->fetch_array($res)) - { - if($temp_module_strings[$row[$tableName]] != '') - $nonedit_fldVal .= $temp_module_strings[$row[$tableName]]; - else - $nonedit_fldVal .= $row[$tableName]; - $nonedit_fldVal .= "
    "; - } -} + $query = 'select fieldlabel from vtiger_tab inner join vtiger_field on vtiger_tab.tabid=vtiger_field.tabid where vtiger_tab.name="'.$moduleName.'" and fieldname="'.$tableName.'"'; $fieldlabel = $adb->query_result($adb->query($query),0,'fieldlabel'); if($nonedit_fldVal == '') - $smarty->assign("EDITABLE_MODE","edit"); - else - $smarty->assign("EDITABLE_MODE","nonedit"); + $smarty->assign("EDITABLE_MODE","edit"); +else + $smarty->assign("EDITABLE_MODE","nonedit"); $smarty->assign("NON_EDITABLE_ENTRIES", $nonedit_fldVal); $smarty->assign("ENTRIES",$fldVal); $smarty->assign("MODULE",$moduleName); $smarty->assign("FIELDNAME",$tableName); //First look into app_strings and then mod_strings and if not available then original label will be displayed -$temp_label = isset($app_strings[$fieldlabel])?$app_strings[$fieldlabel]:(isset($mod_strings[$fieldlabel])?$mod_strings[$fieldlabel]:$fieldlabel); +$temp_label = getTranslatedString($fieldlabel); $smarty->assign("FIELDLABEL",$temp_label); $smarty->assign("UITYPE", $uitype); $smarty->assign("MOD", return_module_language($current_language,'Settings')); Modified: vtigercrm/branches/5.0.3/modules/Settings/UpdateComboValues.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/UpdateComboValues.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/UpdateComboValues.php Mon Apr 30 01:12:41 2007 @@ -18,17 +18,9 @@ global $adb; -//Deleting the already existing values -if($uitype == 111) -{ - $delquery="delete from vtiger_".$tableName." where presence=0"; - $adb->query($delquery); -} -else -{ - $delquery="delete from vtiger_".$tableName; - $adb->query($delquery); -} +//Delete the already existing values which are editable (presence=0 means non editable, we will not touch that values) +$delquery="delete from vtiger_".$tableName." where presence=1"; +$adb->query($delquery); $pickArray = explode("\n",$fldPickList); $count = count($pickArray); @@ -38,29 +30,15 @@ if($tabname[1]!='') $custom=true; -/*for($i = 0; $i < $count; $i++) -{ - $pickArray[$i] = trim($pickArray[$i]); - if($pickArray[$i] != '') - { - if($uitype == 111) - $query = "insert into vtiger_".$tableName." values('','".$pickArray[$i]."',".$i.",0)"; - else - $query = "insert into vtiger_".$tableName." values('','".$pickArray[$i]."',".$i.",1)"; - - $adb->query($query); - } -}*/ /* ticket2369 fixed */ $columnName = $tableName; -foreach ($pickArray as $index => $data) { +foreach ($pickArray as $index => $data) +{ $data = trim($data); - if(!empty($data)){ + if(!empty($data)) + { $data = $adb->formatString("vtiger_$tableName",$columnName,$data); - if($uitype == 111) - $query = "insert into vtiger_$tableName values('',$data,$index,0)"; - else - $query = "insert into vtiger_$tableName values('',$data,$index,1)"; + $query = "insert into vtiger_$tableName values('',$data,$index,1)"; $adb->query($query); } } From isthatuttt at greatbignoise.net Mon Apr 30 00:37:58 2007 From: isthatuttt at greatbignoise.net (Guardhouses G. Becker) Date: Mon, 30 Apr 2007 03:37:58 -0400 Subject: [Vtigercrm-commits] Be healthy, be wealthy! Message-ID: <4792500966.20070430033758@greatbignoise.net> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://oslz.hk Completely secure and confidential purchase. Instant shipping worldwide. From extremesht at glankler.com Mon Apr 30 01:03:12 2007 From: extremesht at glankler.com (Centaur P. Narcotics) Date: Mon, 30 Apr 2007 04:03:12 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0366199345.20070430040312@glankler.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/54b1919f/attachment.html From jefficus at goinfinity.com Mon Apr 30 01:19:49 2007 From: jefficus at goinfinity.com (Ulster E. Subtotal) Date: Mon, 30 Apr 2007 04:19:49 -0400 Subject: [Vtigercrm-commits] Can't stand sex all night long? Message-ID: <5475457125.20070430041949@goinfinity.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://oslz.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 01:13:59 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 08:13:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10814 - in /vtigercrm/branches/5.0.3: include/Ajax/ include/utils/ modules/Portal/ modules/Reports/ modules/Rss/ modules/Settings/ modules/Webmails/ Message-ID: <20070430081400.40B0F7D3551@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 30 02:13:46 2007 New Revision: 10814 Log: check added to find the existance of iconv function Modified: vtigercrm/branches/5.0.3/include/Ajax/TagCloud.php vtigercrm/branches/5.0.3/include/utils/SearchUtils.php vtigercrm/branches/5.0.3/modules/Portal/Save.php vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php vtigercrm/branches/5.0.3/modules/Rss/Rss.php vtigercrm/branches/5.0.3/modules/Settings/SaveNotification.php vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php Modified: vtigercrm/branches/5.0.3/include/Ajax/TagCloud.php ============================================================================== --- vtigercrm/branches/5.0.3/include/Ajax/TagCloud.php (original) +++ vtigercrm/branches/5.0.3/include/Ajax/TagCloud.php Mon Apr 30 02:13:46 2007 @@ -19,8 +19,8 @@ { require_once('include/freetag/freetag.class.php'); - $tagfields=$_REQUEST['tagfields']; - $tagfields =str_replace(array("'",'"'),'',iconv("UTF-8",$default_charset,$_REQUEST['tagfields'])); + $tagfields=function_exists(iconv) ? @iconv("UTF-8",$default_charset,$_REQUEST['tagfields']) : $_REQUEST['tagfields']; + $tagfields =str_replace(array("'",'"'),'',$tagfields); if($tagfields != "") { $freetag = new freetag(); Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Mon Apr 30 02:13:46 2007 @@ -161,7 +161,7 @@ $search_string = $_REQUEST['search_text']; - $stringConvert = iconv("UTF-8",$default_charset,$search_string); + $stringConvert = function_exists(iconv) ? @iconv("UTF-8",$default_charset,$search_string) : $search_string; $search_string=addslashes(ltrim(rtrim($stringConvert))); @@ -607,7 +607,7 @@ $tab_col = str_replace('\'','',stripslashes($_REQUEST[$table_colname])); $srch_cond = str_replace('\'','',stripslashes($_REQUEST[$search_condition])); $srch_val = $_REQUEST[$search_value]; - $srch_val = iconv("UTF-8",$default_charset,$srch_val); + $srch_val = function_exists(iconv) ? @iconv("UTF-8",$default_charset,$srch_val) : $srch_val; list($tab_name,$column_name) = split("[.]",$tab_col); $url_string .="&Fields".$i."=".$tab_col."&Condition".$i."=".$srch_cond."&Srch_value".$i."=".$srch_val; $uitype=getUItype($currentModule,$column_name); Modified: vtigercrm/branches/5.0.3/modules/Portal/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Portal/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Portal/Save.php Mon Apr 30 02:13:46 2007 @@ -12,8 +12,10 @@ require_once('modules/Portal/Portal.php'); global $default_charset; -$portlname =str_replace(array("'",'"'),'',iconv("UTF-8",$default_charset,$_REQUEST['portalname'])); -$portlurl =str_replace(array("'",'"'),'',iconv("UTF-8",$default_charset,$_REQUEST['portalurl'])); +$conv_pname = function_exists(iconv) ? @iconv("UTF-8",$default_charset, $_REQUEST['portalname']) : $_REQUEST['portalname']; +$conv_purl = function_exists(iconv) ? @iconv("UTF-8",$default_charset, $_REQUEST['portalurl']) : $_REQUEST['portalurl']; +$portlname =str_replace(array("'",'"'),'',$conv_pname); +$portlurl =str_replace(array("'",'"'),'',$conv_purl); if($portlname != '' && $portlurl != '') { Modified: vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php Mon Apr 30 02:13:46 2007 @@ -25,8 +25,8 @@ } else if($_REQUEST['check']== 'folderCheck') { - $folderName = $_REQUEST['folderName']; - $folderName =str_replace(array("'",'"'),'',iconv("UTF-8",$default_charset,$folderName)); + $folderName = function_exists(iconv) ? @iconv("UTF-8",$default_charset, $_REQUEST['folderName']) : $_REQUEST['folderName']; + $folderName =str_replace(array("'",'"'),'',$folderName); if($folderName == "" || !$folderName) { echo "999"; Modified: vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php Mon Apr 30 02:13:46 2007 @@ -20,7 +20,7 @@ $rfid = $_REQUEST['record']; $mode = $_REQUEST['savemode']; $foldername = addslashes($_REQUEST["foldername"]); -$foldername = iconv("UTF-8",$default_charset,$foldername); +$foldername = function_exists(iconv) ? @iconv("UTF-8",$default_charset, $foldername) : $foldername; $folderdesc = addslashes($_REQUEST["folderdesc"]); $foldername = str_replace('*amp*','&',$foldername); $folderdesc = str_replace('*amp*','&',$folderdesc); Modified: vtigercrm/branches/5.0.3/modules/Rss/Rss.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Rss/Rss.php (original) +++ vtigercrm/branches/5.0.3/modules/Rss/Rss.php Mon Apr 30 02:13:46 2007 @@ -75,7 +75,7 @@ $i = 0; foreach($this->rss_object as $key=>$item) { - $stringConvert = iconv("UTF-8",$default_charset,$item[title]); + $stringConvert = function_exists(iconv) ? @iconv("UTF-8",$default_charset,$item[title]) : $item[title]; $rss_title= addslashes(ltrim(rtrim($stringConvert))); $i = $i + 1; Modified: vtigercrm/branches/5.0.3/modules/Settings/SaveNotification.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/SaveNotification.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/SaveNotification.php Mon Apr 30 02:13:46 2007 @@ -12,8 +12,10 @@ require_once('include/database/PearDatabase.php'); global $default_charset; global $adb; -$notifysubject =str_replace(array("'",'"'),'',iconv("UTF-8",$default_charset,$_REQUEST['notifysubject'])); -$notifybody =str_replace(array("'",'"'),'',iconv("UTF-8",$default_charset,$_REQUEST['notifybody'])); +$conv_sub = function_exists(iconv) ? @iconv("UTF-8",$default_charset, $_REQUEST['notifysubject']) : $_REQUEST['notifysubject']; +$conv_body = function_exists(iconv) ? @iconv("UTF-8",$default_charset, $_REQUEST['notifybody']) : $_REQUEST['notifybody']; +$notifysubject =str_replace(array("'",'"'),'',$conv_sub); +$notifybody =str_replace(array("'",'"'),'',$conv_body); if($notifysubject != '' && $notifybody != '') { Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php Mon Apr 30 02:13:46 2007 @@ -632,7 +632,7 @@ if ($element_charset == 'x-unknown') $element_charset = 'ISO-8859-1'; - $element_converted = @iconv( $element_charset, $output_charset, $source[$j]->text); + $element_converted = function_exists(iconv) ? @iconv( $element_charset, $output_charset, $source[$j]->text): $source[$j]->text ; $result[$j]->text = $element_converted; $result[$j]->charset = $output_charset; } @@ -770,7 +770,7 @@ $body_charset = $_REQUEST['user_charset']; } $this->charsets = $body_charset; - $body_converted = @iconv( $body_charset, $GLOBALS['charset'], $body); + $body_converted = function_exists(iconv) ? @iconv( $body_charset, $GLOBALS['charset'], $body) : $body; $body = ($body_converted===FALSE) ? $body : $body_converted; $tmpvar['charset'] = ($body_converted===FALSE) ? $body_charset : $GLOBALS['charset']; } From extrication at globelinkservices.com Mon Apr 30 01:45:16 2007 From: extrication at globelinkservices.com (Leo C. Symposium) Date: Mon, 30 Apr 2007 04:45:16 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4430933393.20070430044516@globelinkservices.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/dd2f1ecc/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Cronkite.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/dd2f1ecc/Cronkite.gif From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 01:39:48 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 08:39:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10815 - /vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php Message-ID: <20070430083948.B60DA7D26A1@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 30 02:39:43 2007 New Revision: 10815 Log: added UTF-8 supprot in inventory notification body Modified: vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php Modified: vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php Mon Apr 30 02:39:43 2007 @@ -10,12 +10,13 @@ ********************************************************************************/ require_once('Smarty_setup.php'); +require_once('config.php'); global $mod_strings; global $app_strings; global $app_list_strings; global $adb; -global $theme; +global $theme,$default_charset; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); @@ -30,7 +31,7 @@ { $label = $mod_strings[$adb->query_result($result,0,'notificationname')]; $notification_subject = $adb->query_result($result,0,'notificationsubject'); - $notification_body = $adb->query_result($result,0,'notificationbody'); + $notification_body = iconv("UTF-8",$default_charset,$adb->query_result($result,0,'notificationbody')); $notification_id = $adb->query_result($result,0,'notificationid'); $notification = Array(); From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 01:44:03 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 08:44:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10816 - /vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php Message-ID: <20070430084403.F07BE7D3551@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 30 02:43:59 2007 New Revision: 10816 Log: added check for iconv function Modified: vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php Modified: vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php Mon Apr 30 02:43:59 2007 @@ -31,7 +31,7 @@ { $label = $mod_strings[$adb->query_result($result,0,'notificationname')]; $notification_subject = $adb->query_result($result,0,'notificationsubject'); - $notification_body = iconv("UTF-8",$default_charset,$adb->query_result($result,0,'notificationbody')); + $notification_body = function_exists(iconv) ? iconv("UTF-8",$default_charset,$adb->query_result($result,0,'notificationbody')) : $adb->query_result($result,0,'notificationbody'); $notification_id = $adb->query_result($result,0,'notificationid'); $notification = Array(); From marilynandsteve at greenwichconn.com Mon Apr 30 02:28:58 2007 From: marilynandsteve at greenwichconn.com (Thomas Terrell) Date: Mon, 30 Apr 2007 09:28:58 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <7360423143.20070430092858@greenwichconn.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/dfc60c92/attachment.htm From isthisdave at gianluca.net Mon Apr 30 02:39:08 2007 From: isthisdave at gianluca.net (Vicinity H. Independently) Date: Mon, 30 Apr 2007 05:39:08 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <0853893754.20070430053908@gianluca.net> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://oslz.hk Only Secure and Confidential purchase! Verified buy VISA! From rossi at gradebinder.com Mon Apr 30 02:46:13 2007 From: rossi at gradebinder.com (Scope V. Bursa) Date: Mon, 30 Apr 2007 05:46:13 -0400 Subject: [Vtigercrm-commits] Pharmacy for real men! Message-ID: <7980628793.20070430054613@gradebinder.com> The most powerful medicines for you! Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. Ultram - $1.83 - an analgesic used to treat or prevent pain. Testosterone - $7.5 - a steroid hormone from the androgen group. Testosterone is secreted in the testes of men and the ovaries of women. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From klouispinault at ghfs.com Mon Apr 30 03:15:21 2007 From: klouispinault at ghfs.com (Spankings D. Krishna) Date: Mon, 30 Apr 2007 06:15:21 -0400 Subject: [Vtigercrm-commits] Unbelievable prices! Message-ID: <7251592444.20070430061521@ghfs.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://oslz.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From gardening.guide at givnsav.com Mon Apr 30 03:51:46 2007 From: gardening.guide at givnsav.com (Ben G. Controverted) Date: Mon, 30 Apr 2007 06:51:46 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0045623553.20070430065146@givnsav.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/6f55de8f/attachment.htm From gillis at go-home.com Mon Apr 30 04:07:19 2007 From: gillis at go-home.com (Djibouti P. Washbowls) Date: Mon, 30 Apr 2007 07:07:19 -0400 Subject: [Vtigercrm-commits] Girls don't like you? Message-ID: <6269250971.20070430070719@go-home.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://oslz.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 04:24:46 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 11:24:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10817 - /vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Message-ID: <20070430112446.C4A747D3555@vtiger.fosslabs.com> Author: richie Date: Mon Apr 30 05:24:38 2007 New Revision: 10817 Log: fix for Activities Related to not displaying in editview --minnie Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Mon Apr 30 05:24:38 2007 @@ -664,10 +664,9 @@ elseif($uitype == 66) { if(isset($_REQUEST['parent_id']) && $_REQUEST['parent_id'] != '') - { $value = $_REQUEST['parent_id']; + if($value != '') $parent_module = getSalesEntityType($value); - } // Check for vtiger_activity type if task orders to be added in select option $act_mode = $_REQUEST['activity_mode']; From ash at goozeffseeds.com Mon Apr 30 04:52:51 2007 From: ash at goozeffseeds.com (Photosynthesized V. Exhortations) Date: Mon, 30 Apr 2007 07:52:51 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2829361011.20070430075251@goozeffseeds.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/e7ab2cbf/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: suborbital.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/e7ab2cbf/suborbital-0001.gif From markus at gologan.de Mon Apr 30 05:28:22 2007 From: markus at gologan.de (Thresh H. Maximization) Date: Mon, 30 Apr 2007 08:28:22 -0400 Subject: [Vtigercrm-commits] sexual drive Message-ID: <3579479983.20070430082822@gologan.de> The most powerful medicines for you! Nymphomax - $35.99 - Helps women to achieve multiple and more powerful orgasms with this unique female sexual stimulant. Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. Diflucan - $2.64 - a tablet taken orally to treat vaginal yeast infections caused by the yeast Candida. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extremerozchic at gpunto.com Mon Apr 30 05:28:13 2007 From: extremerozchic at gpunto.com (Delicious O. Altai) Date: Mon, 30 Apr 2007 08:28:13 -0400 Subject: [Vtigercrm-commits] Say NO to erectile dysfunction! Message-ID: <0705484477.20070430082813@gpunto.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://oslz.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 05:33:25 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 12:33:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10818 - /vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php Message-ID: <20070430123325.4AD937D356B@vtiger.fosslabs.com> Author: richie Date: Mon Apr 30 06:33:19 2007 New Revision: 10818 Log: missed file for patch integration #3653. --minnie Modified: vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php Modified: vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php (original) +++ vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php Mon Apr 30 06:33:19 2007 @@ -126,12 +126,12 @@ $smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); $smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); +$sql = $adb->query('select accountid from vtiger_contactdetails where contactid='.$focus->id); +$accountid = $adb->query_result($sql,0,'accountid'); +if($accountid == 0) $accountid=''; +$smarty->assign("accountid",$accountid); if($singlepane_view == 'true') { - $sql = $adb->query('select accountid from vtiger_contactdetails where contactid='.$focus->id); - $accountid = $adb->query_result($sql,0,'accountid'); - if($accountid == 0) $accountid=''; - $smarty->assign("accountid",$accountid); $related_array = getRelatedLists($currentModule,$focus); $smarty->assign("RELATEDLISTS", $related_array); } From dickson at gravitytank.com Mon Apr 30 05:51:16 2007 From: dickson at gravitytank.com (Filling L. Duvet) Date: Mon, 30 Apr 2007 08:51:16 -0400 Subject: [Vtigercrm-commits] Worry about your erection? Message-ID: <5001763249.20070430085116@gravitytank.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://oslz.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 05:45:14 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 12:45:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10819 - in /vtigercrm/branches/5.0.3: Smarty/templates/ include/js/ include/utils/ modules/Contacts/ modules/Emails/ modules/Leads/ Message-ID: <20070430124514.A39097D356D@vtiger.fosslabs.com> Author: richie Date: Mon Apr 30 06:44:55 2007 New Revision: 10819 Log: fix for Leads - the 'AddEmail' option in call related list view page showing the popup menu even the value is empty. Fixes #3319 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl vtigercrm/branches/5.0.3/include/js/Mail.js vtigercrm/branches/5.0.3/include/utils/CommonUtils.php vtigercrm/branches/5.0.3/modules/Contacts/CallRelatedList.php vtigercrm/branches/5.0.3/modules/Emails/Emails.php vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php vtigercrm/branches/5.0.3/modules/Leads/CallRelatedList.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl Mon Apr 30 06:44:55 2007 @@ -127,7 +127,15 @@ {elseif $header eq 'Emails'} + {if $PERMIT eq '0'} + {if $MAIL_CHECK eq 'true'}
    -{if $PERMIT eq '0'}
    @@ -44,11 +43,15 @@ {else} {/if} + {if $PERMIT eq '0'} {if $ONE_RECORD eq 'true'} - + {else} {/if} + {else} + + {/if} {/foreach}
    {$elements.0}
    {$MAILDATA[$smarty.foreach.emailids.iteration]}    		{$elements.0}
    {$MAILDATA[$smarty.foreach.emailids.index]}    		{$elements.0}{$elements.0}
    {$MAILDATA[$smarty.foreach.emailids.index]}
    @@ -64,15 +67,4 @@
    -{else} - - -
    - - -
    - {$MOD.LBL_MAILSELECT_INFO3} -
    -
    -{/if}
    Modified: vtigercrm/branches/5.0.3/include/js/Mail.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/Mail.js (original) +++ vtigercrm/branches/5.0.3/include/js/Mail.js Mon Apr 30 06:44:55 2007 @@ -122,7 +122,13 @@ method: 'post', postBody: "module=Emails&return_module="+module+"&action=EmailsAjax&file=mailSelect&idlist="+idstrings, onComplete: function(response) { - getObj('sendmail_cont').innerHTML=response.responseText; + if(response.responseText == "Mail Ids not permitted") + { + var url= 'index.php?module=Emails&action=EmailsAjax&pmodule='+module+'&file=EditView&sendmail=true'; + openPopUp('xComposeEmail',this,url,'createemailWin',820,689,'menubar=no,toolbar=no,location=no,status=no,resizable=no'); + } + else + getObj('sendmail_cont').innerHTML=response.responseText; } } ); Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/CommonUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Mon Apr 30 06:44:55 2007 @@ -2858,5 +2858,40 @@ } +function is_emailId($entity_id) +{ + global $log,$adb; + $log->debug("Entering is_EmailId(".$module.",".$entity_id.") method"); + + $module = getSalesEntityType($entity_id); + if($module == 'Contacts') + { + $sql = "select email,yahooid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where contactid = ".$entity_id; + $result = $adb->query($sql); + $email1 = $adb->query_result($result,0,"email"); + $email2 = $adb->query_result($result,0,"yahooid"); + if(($email1 != "" || $email2 != "") || ($email1 != "" && $email2 != "")) + { + $check_mailids = "true"; + } + else + $check_mailids = "false"; + } + elseif($module == 'Leads') + { + $sql = "select email,yahooid from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid where leadid = ".$entity_id; + $result = $adb->query($sql); + $email1 = $adb->query_result($result,0,"email"); + $email2 = $adb->query_result($result,0,"yahooid"); + if(($email1 != "" || $email2 != "") || ($email1 != "" && $email2 != "")) + { + $check_mailids = "true"; + } + else + $check_mailids = "false"; + } + $log->debug("Exiting is_EmailId() method ..."); + return $check_mailids; +} ?> Modified: vtigercrm/branches/5.0.3/modules/Contacts/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Contacts/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.3/modules/Contacts/CallRelatedList.php Mon Apr 30 06:44:55 2007 @@ -46,6 +46,7 @@ global $app_strings; global $theme; global $currentModule; +global $current_user; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); @@ -62,6 +63,20 @@ } $parent_email = getEmailParentsList('Contacts',$_REQUEST['record']); $smarty->assign("HIDDEN_PARENTS_LIST",$parent_email); + +if(isset($_REQUEST['record']) && $_REQUEST['record']!='') +{ + $userid = $current_user->id; + $sql = "select fieldname from vtiger_field where uitype = 13 and tabid = 4"; + $result = $adb->query($sql); + $num_fieldnames = $adb->num_rows($result); + for($i = 0; $i < $num_fieldnames; $i++) + { + $fieldname = $adb->query_result($result,$i,"fieldname"); + $permit= getFieldVisibilityPermission("Contacts",$userid,$fieldname); + } +} + $category = getparenttab(); $smarty->assign("CATEGORY",$category); $smarty->assign("ID",$focus->id); @@ -81,6 +96,8 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("MAIL_CHECK", is_emailId($RECORD)); +$smarty->assign("PERMIT",$permit); $smarty->display("RelatedLists.tpl"); } ?> Modified: vtigercrm/branches/5.0.3/modules/Emails/Emails.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/Emails.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/Emails.php Mon Apr 30 06:44:55 2007 @@ -441,45 +441,51 @@ function get_to_emailids($module) { global $adb; - $query = 'select columnname,fieldid from vtiger_field where fieldid in('.ereg_replace(':',',',$_REQUEST["field_lists"]).')'; - $result = $adb->query($query); - $columns = Array(); - $idlists = ''; - $mailids = ''; - while($row = $adb->fetch_array($result)) - { - $columns[]=$row['columnname']; - $fieldid[]=$row['fieldid']; - } - $columnlists = implode(',',$columns); - $crmids = ereg_replace(':',',',$_REQUEST["idlist"]); - switch($module) - { - case 'Leads': - $query = 'select crmid,concat(lastname," ",firstname) as entityname,'.$columnlists.' from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid left join vtiger_leadscf on vtiger_leadscf.leadid = vtiger_leaddetails.leadid where vtiger_crmentity.deleted=0 and vtiger_crmentity.crmid in ('.$crmids.')'; - break; - case 'Contacts': - $query = 'select crmid,concat(lastname," ",firstname) as entityname,'.$columnlists.' from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid left join vtiger_contactscf on vtiger_contactscf.contactid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted=0 and vtiger_crmentity.crmid in ('.$crmids.')'; - break; - case 'Accounts': - $query = 'select crmid,accountname as entityname,'.$columnlists.' from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid left join vtiger_accountscf on vtiger_accountscf.accountid = vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_crmentity.crmid in ('.$crmids.')'; - break; + if(isset($_REQUEST["field_lists"]) && $_REQUEST["field_lists"] != "") + { + $query = 'select columnname,fieldid from vtiger_field where fieldid in('.ereg_replace(':',',',$_REQUEST["field_lists"]).')'; + $result = $adb->query($query); + $columns = Array(); + $idlists = ''; + $mailids = ''; + while($row = $adb->fetch_array($result)) + { + $columns[]=$row['columnname']; + $fieldid[]=$row['fieldid']; + } + $columnlists = implode(',',$columns); + $crmids = ereg_replace(':',',',$_REQUEST["idlist"]); + switch($module) + { + case 'Leads': + $query = 'select crmid,concat(lastname," ",firstname) as entityname,'.$columnlists.' from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid left join vtiger_leadscf on vtiger_leadscf.leadid = vtiger_leaddetails.leadid where vtiger_crmentity.deleted=0 and vtiger_crmentity.crmid in ('.$crmids.')'; + break; + case 'Contacts': + $query = 'select crmid,concat(lastname," ",firstname) as entityname,'.$columnlists.' from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid left join vtiger_contactscf on vtiger_contactscf.contactid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted=0 and vtiger_crmentity.crmid in ('.$crmids.')'; + break; + case 'Accounts': + $query = 'select crmid,accountname as entityname,'.$columnlists.' from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid left join vtiger_accountscf on vtiger_accountscf.accountid = vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_crmentity.crmid in ('.$crmids.')'; + break; + } + $result = $adb->query($query); + while($row = $adb->fetch_array($result)) + { + $name = $row['entityname']; + for($i=0;$i,'; + } + } + } + + $return_data = Array('idlists'=>$idlists,'mailds'=>$mailids); + }else + { + $return_data = Array('idlists'=>"",'mailds'=>""); } - $result = $adb->query($query); - while($row = $adb->fetch_array($result)) - { - $name = $row['entityname']; - for($i=0;$i,'; - } - } - } - - $return_data = Array('idlists'=>$idlists,'mailds'=>$mailids); return $return_data; } Modified: vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php Mon Apr 30 06:44:55 2007 @@ -12,7 +12,7 @@ require_once('include/database/PearDatabase.php'); -global $app_strings,$mod_strings,$current_user,$theme; +global $app_strings,$mod_strings,$current_user,$theme,$adb; $image_path = 'themes/'.$theme.'/images/'; $idlist = $_REQUEST['idlist']; $pmodule=$_REQUEST['return_module']; @@ -25,51 +25,39 @@ $smarty = new vtigerCRM_Smarty; $userid = $current_user->id; -if($pmodule == "Contacts") +if($pmodule=='Accounts') { - $permit = getFieldVisibilityPermission("Contacts", $userid, "email"); -} -elseif($pmodule == "Accounts") -{ - $permit = getFieldVisibilityPermission("Accounts", $userid, "email1"); -} -elseif($pmodule == "Leads") -{ - $permit = getFieldVisibilityPermission("Leads", $userid, "email"); -} -if($permit == '0'); -{ - $smarty->assign("PERMIT", $permit); -} - -if ($pmodule=='Accounts') -{ - $querystr="select fieldid,fieldlabel,columnname,tablename from vtiger_field where tabid=6 and uitype=13;"; + $querystr="select fieldid,fieldname,fieldlabel,columnname,tablename from vtiger_field where tabid=6 and uitype=13"; } elseif ($pmodule=='Contacts') { - $querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=4 and uitype=13;"; + $querystr="select fieldid,fieldname,fieldlabel,columnname from vtiger_field where tabid=4 and uitype=13"; } elseif ($pmodule=='Leads') { - $querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=7 and uitype=13;"; + $querystr="select fieldid,fieldname,fieldlabel,columnname from vtiger_field where tabid=7 and uitype=13"; } -$result=$adb->query($querystr); -$numrows = $adb->num_rows($result); +$res=$adb->query($querystr); +$numrows = $adb->num_rows($res); $returnvalue = Array(); -for ($i=0;$i<$numrows;$i++) +for($i = 0; $i < $numrows; $i++) { $value = Array(); - $temp=$adb->query_result($result,$i,'columnname'); - $columnlists [] = $temp; - $fieldid=$adb->query_result($result,$i,'fieldid'); - $value[] =$adb->query_result($result,$i,'fieldlabel'); - $returnvalue [$fieldid]= $value; + $fieldname = $adb->query_result($res,$i,"fieldname"); + $permit = getFieldVisibilityPermission($pmodule, $userid, $fieldname); + if($permit == '0') + { + $temp=$adb->query_result($res,$i,'columnname'); + $columnlists [] = $temp; + $fieldid=$adb->query_result($res,$i,'fieldid'); + $value[] =$adb->query_result($res,$i,'fieldlabel'); + $returnvalue [$fieldid]= $value; + } } -if($single_record) +if($single_record && count($columnlists) > 0) { - $count = 1; + $count = 0; switch($pmodule) { case 'Accounts': @@ -101,6 +89,7 @@ break; } } +$smarty->assign('PERMIT',$permit); $smarty->assign('ENTITY_NAME',$entity_name); $smarty->assign('ONE_RECORD',$single_record); $smarty->assign('MAILDATA',$field_value); @@ -111,5 +100,8 @@ $smarty->assign("FROM_MODULE", $pmodule); $smarty->assign("IMAGE_PATH",$image_path); -$smarty->display("SelectEmail.tpl"); +if(count($columnlists) > 0) + $smarty->display("SelectEmail.tpl"); +else + echo "Mail Ids not permitted"; ?> Modified: vtigercrm/branches/5.0.3/modules/Leads/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Leads/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.3/modules/Leads/CallRelatedList.php Mon Apr 30 06:44:55 2007 @@ -39,6 +39,7 @@ global $app_strings; global $theme; global $currentModule; +global $current_user; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -58,7 +59,20 @@ { unset($_SESSION['rlvs']); } - + +if(isset($_REQUEST['record']) && $_REQUEST['record']!='') +{ + $userid = $current_user->id; + $sql = "select fieldname from vtiger_field where uitype = 13 and tabid = 7"; + $result = $adb->query($sql); + $num_fieldnames = $adb->num_rows($result); + for($i = 0; $i < $num_fieldnames; $i++) + { + $fieldname = $adb->query_result($result,$i,"fieldname"); + $permit= getFieldVisibilityPermission("Leads",$userid,$fieldname); + } +} + $category = getParentTab(); $smarty->assign("CATEGORY",$category); $parent_email = getEmailParentsList('Leads',$focus->id); @@ -80,6 +94,8 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("MAIL_CHECK", is_emailId($RECORD)); +$smarty->assign("PERMIT",$permit); $smarty->display("RelatedLists.tpl"); } ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 06:03:10 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 13:03:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10820 - in /vtigercrm/branches/5.0.3: include/language/en_us.lang.php modules/Emails/mailSelect.php Message-ID: <20070430130310.62F1A7D3570@vtiger.fosslabs.com> Author: richie Date: Mon Apr 30 07:02:57 2007 New Revision: 10820 Log: * Fixed the i18n issue and removed unwanted if conditions, Fixed #3681 Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Mon Apr 30 07:02:57 2007 @@ -876,6 +876,7 @@ 'Lead Status'=>'Lead Status', 'Lead Source'=>'Lead Source', 'Quote ID'=>'Quote Id', +'Yahoo Id'=>'Yahoo Id', ); $app_list_strings = array ( Modified: vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php Mon Apr 30 07:02:57 2007 @@ -25,18 +25,9 @@ $smarty = new vtigerCRM_Smarty; $userid = $current_user->id; -if($pmodule=='Accounts') -{ - $querystr="select fieldid,fieldname,fieldlabel,columnname,tablename from vtiger_field where tabid=6 and uitype=13"; -} -elseif ($pmodule=='Contacts') -{ - $querystr="select fieldid,fieldname,fieldlabel,columnname from vtiger_field where tabid=4 and uitype=13"; -} -elseif ($pmodule=='Leads') -{ - $querystr="select fieldid,fieldname,fieldlabel,columnname from vtiger_field where tabid=7 and uitype=13"; -} + +$querystr = "select fieldid, fieldlabel, columnname from vtiger_field where tabid=".getTabid($pmodule)." and uitype=13"; + $res=$adb->query($querystr); $numrows = $adb->num_rows($res); $returnvalue = Array(); @@ -50,7 +41,8 @@ $temp=$adb->query_result($res,$i,'columnname'); $columnlists [] = $temp; $fieldid=$adb->query_result($res,$i,'fieldid'); - $value[] =$adb->query_result($res,$i,'fieldlabel'); + $fieldlabel =$adb->query_result($res,$i,'fieldlabel'); + $value[] = getTranslatedString($fieldlabel); $returnvalue [$fieldid]= $value; } } From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 06:04:09 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 13:04:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10821 - /vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Message-ID: <20070430130410.1C9F47D357B@vtiger.fosslabs.com> Author: richie Date: Mon Apr 30 07:04:05 2007 New Revision: 10821 Log: * changed the log information Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/CommonUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Mon Apr 30 07:04:05 2007 @@ -2667,9 +2667,9 @@ function getTranslatedString($str) { global $app_strings, $mod_strings, $log; - $str = ($app_strings[$str] != '')?$app_strings[$str]:(($mod_strings[$str] != '')?$mod_strings[$str]:$str); - $log->debug("function getTranslatedString($str) - translated to ($str)"); - return $str; + $trans_str = ($app_strings[$str] != '')?$app_strings[$str]:(($mod_strings[$str] != '')?$mod_strings[$str]:$str); + $log->debug("function getTranslatedString($str) - translated to ($trans_str)"); + return $trans_str; } /** function used to get the list of importable fields From lromero at gkdruck.com Mon Apr 30 06:24:31 2007 From: lromero at gkdruck.com (Doggie F. Dandled) Date: Mon, 30 Apr 2007 09:24:31 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6322114922.20070430092431@gkdruck.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/bc2fe6bd/attachment.html From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 06:27:36 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 13:27:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10822 - /vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php Message-ID: <20070430132736.545867C80F0@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 30 07:27:28 2007 New Revision: 10822 Log: Account name sorting added in default customview Modified: vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php Modified: vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php Mon Apr 30 07:27:28 2007 @@ -219,26 +219,26 @@ Array('vtiger_contactdetails:firstname:firstname:Contacts_First_Name:V', 'vtiger_contactdetails:lastname:lastname:Contacts_Last_Name:V', 'vtiger_contactdetails:title:title:Contacts_Title:V', - 'vtiger_contactdetails:accountid:account_id:Contacts_Account_Name:V', + 'vtiger_account:accountname:accountname:Contacts_Account_Name:V', 'vtiger_contactdetails:email:email:Contacts_Email:E', 'vtiger_contactsubdetails:otherphone:otherphone:Contacts_Phone:V', 'vtiger_crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V'), Array('vtiger_potential:potentialname:potentialname:Potentials_Potential_Name:V', - 'vtiger_potential:accountid:account_id:Potentials_Account_Name:V', + 'vtiger_account:accountname:accountname:Potentials_Account_Name:V', 'vtiger_potential:sales_stage:sales_stage:Potentials_Sales_Stage:V', 'vtiger_potential:leadsource:leadsource:Potentials_Lead_Source:V', 'vtiger_potential:closingdate:closingdate:Potentials_Expected_Close_Date:D', 'vtiger_crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V'), Array('vtiger_potential:potentialname:potentialname:Potentials_Potential_Name:V', - 'vtiger_potential:accountid:account_id:Potentials_Account_Name:V', + 'vtiger_account:accountname:accountname:Potentials_Account_Name:V', 'vtiger_potential:amount:amount:Potentials_Amount:N', 'vtiger_potential:closingdate:closingdate:Potentials_Expected_Close_Date:D', 'vtiger_crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V'), Array('vtiger_potential:potentialname:potentialname:Potentials_Potential_Name:V', - 'vtiger_potential:accountid:account_id:Potentials_Account_Name:V', + 'vtiger_account:accountname:accountname:Potentials_Account_Name:V', 'vtiger_potential:amount:amount:Potentials_Amount:N', 'vtiger_potential:leadsource:leadsource:Potentials_Lead_Source:V', 'vtiger_potential:closingdate:closingdate:Potentials_Expected_Close_Date:D', From davdrub at golfspace.com Mon Apr 30 06:40:59 2007 From: davdrub at golfspace.com (Subjectives P. Knackwurst) Date: Mon, 30 Apr 2007 09:40:59 -0400 Subject: [Vtigercrm-commits] Want to be a hero in a bed? Message-ID: <3929231330.20070430094059@golfspace.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://oslz.hk ONLY! From aurora at gierredistribuzione.com Mon Apr 30 07:24:18 2007 From: aurora at gierredistribuzione.com (Rigor U. Boswell) Date: Mon, 30 Apr 2007 10:24:18 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0874762083.20070430102418@gierredistribuzione.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/f0e1e39b/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: turnstiles.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/f0e1e39b/turnstiles.gif From coffee at getcarenetwork.org Mon Apr 30 07:30:54 2007 From: coffee at getcarenetwork.org (Headaches I. Switch) Date: Mon, 30 Apr 2007 10:30:54 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <0306002562.20070430103054@getcarenetwork.org> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://oslz.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From rhodes at gimeon.com Mon Apr 30 08:46:27 2007 From: rhodes at gimeon.com (Dragon I. Corrugated) Date: Mon, 30 Apr 2007 11:46:27 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <0576838628.20070430114627@gimeon.com> The most powerful medicines for you! Valtrex - $4.95 - reduce the risk of spreading genital herpes Hangover Pills - $35.99 Uncle Rummies Hangover Pills are an all-natural dietary supplement providing protection from the "morning after" symptoms experienced after prolonged or excessive alcohol consumption. If taken as directed, Uncle Rummie's Hangover Helper can completely eliminate unpleasant side-effects such as headaches, nausea and dehydration. Proprecia - $1.03 - first and only FDA-approved pill demonstrated to treat male pattern hair loss on the vertex (top of head) and anterior mid-scalp area (middle front of head) in men only. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From beatty at glvxq.die.net Mon Apr 30 08:50:32 2007 From: beatty at glvxq.die.net (Hypnotics H. Janitor) Date: Mon, 30 Apr 2007 11:50:32 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <8667476957.20070430115032@glvxq.die.net> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft – the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://oslz.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From bartlett at goodonu.com Mon Apr 30 09:02:03 2007 From: bartlett at goodonu.com (Rubbished M. Abracadabra) Date: Mon, 30 Apr 2007 12:02:03 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9070290072.20070430120203@goodonu.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/3acecedf/attachment.htm From roddett at goodcompany.net Mon Apr 30 09:17:48 2007 From: roddett at goodcompany.net (Brewery L. Announcer) Date: Mon, 30 Apr 2007 12:17:48 -0400 Subject: [Vtigercrm-commits] Can't stand sex all night long? Message-ID: <6174317821.20070430121748@goodcompany.net> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://oslz.hk verified by VISA and certified by CIPA. From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 09:46:58 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 16:46:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10823 - /vtigercrm/tags/vtigercrm-5.0.3-rc4/ Message-ID: <20070430164658.F414B7D22CE@vtiger.fosslabs.com> Author: richie Date: Mon Apr 30 10:46:39 2007 New Revision: 10823 Log: 5.0.3-rc4 version tagged Added: vtigercrm/tags/vtigercrm-5.0.3-rc4/ - copied from r10822, vtigercrm/branches/5.0.3/ From account at gipda.com Mon Apr 30 09:58:47 2007 From: account at gipda.com (Tricycled Q. Tantalizing) Date: Mon, 30 Apr 2007 12:58:47 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <1210204352.20070430125847@gipda.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft – the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://oslz.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From steven at go4learning.org Mon Apr 30 10:01:50 2007 From: steven at go4learning.org (Mandolin I. Hose) Date: Mon, 30 Apr 2007 13:01:50 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2838192891.20070430130150@go4learning.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/32558f76/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: trapezoidal.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/32558f76/trapezoidal.gif From solomon at gillesjobin.org Mon Apr 30 10:49:50 2007 From: solomon at gillesjobin.org (James Hill) Date: Mon, 30 Apr 2007 17:49:50 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <7723068372.20070430174950@gillesjobin.org> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/e431de1e/attachment.html From lisa at grcop.org Mon Apr 30 11:41:20 2007 From: lisa at grcop.org (Backbitings R. Appertain) Date: Mon, 30 Apr 2007 14:41:20 -0400 Subject: [Vtigercrm-commits] On-line generic store Message-ID: <9097046356.20070430144120@grcop.org> The most powerful medicines for you! Lipotrexate - $35.99 - one of the safest and most powerful dietary supplements on the market. Its special proprietary blend of pharmaceutical grade botanicals provides you with consistent levels of sustained energy all day without the nervousness or jitters commonly associated with other diet pills. Prilosec - $1.33 - can be taken to decrease the amount of acid produced in the stomach. Imitrex - $9.06 - acute treatment of migraine attacks. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From boyer at gicshootingstar.com Mon Apr 30 12:01:32 2007 From: boyer at gicshootingstar.com (Adore S. Swaths) Date: Mon, 30 Apr 2007 15:01:32 -0400 Subject: [Vtigercrm-commits] Medications that you need! Message-ID: <1567842317.20070430150132@gicshootingstar.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft – the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://oslz.hk Verified by VISA and sell FDA Approved Drugs only! From extriton at goodpet.com Mon Apr 30 12:14:39 2007 From: extriton at goodpet.com (Kilometer B. Confined) Date: Mon, 30 Apr 2007 15:14:39 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8207304652.20070430151439@goodpet.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/c1ca4cb6/attachment.html From bacon at gracenotworks.com Mon Apr 30 12:22:07 2007 From: bacon at gracenotworks.com (Shorthorn V. Misruling) Date: Mon, 30 Apr 2007 15:22:07 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <2583247193.20070430152207@gracenotworks.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://oslz.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From agately at globe-invest.com Mon Apr 30 13:02:37 2007 From: agately at globe-invest.com (Backups E. Bauhaus) Date: Mon, 30 Apr 2007 16:02:37 -0400 Subject: [Vtigercrm-commits] Straining yourself when you are with woman? Message-ID: <9134717575.20070430160237@globe-invest.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://oslz.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From istackhouse at gowilco.com Mon Apr 30 13:05:36 2007 From: istackhouse at gowilco.com (Detects H. Crawford) Date: Mon, 30 Apr 2007 16:05:36 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1040930076.20070430160536@gowilco.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/ba650d8c/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Gropius.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/ba650d8c/Gropius.gif From cem at gesundheitspark.com Mon Apr 30 14:19:36 2007 From: cem at gesundheitspark.com (Prudential J. Paupers) Date: Mon, 30 Apr 2007 17:19:36 -0400 Subject: [Vtigercrm-commits] See the results after using V1 agra Message-ID: <8436637783.20070430171936@gesundheitspark.com> The most powerful medicines for you! Virility Patch - $42.85 - Male Enhancement Formula is an all natural herbal patch containing a variety of herbs known for promoting sexual desire and performance. Zero Nicotine - $47.99 - innovative stop smoking patch designed to help you give up smoking safely and naturally. With its unique blend of ingredients, Zero Nicotine offers you the best possible chance to finally kick the deadly habit for good! If you are serious about your decision to quit smoking, you’ve come to the right place. All-Natural Magnesium Oxide - $35.99 - All-Natural Magnesium Oxide is a rich source of elemental magnesium, an essential mineral. Magnesium plays a role in many vital body functions, including protein biosynthesis, as well as bone and muscle formation, and as a cofactor in hundreds of enzymatic reactions. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From letsmtb at gkgraphics.com Mon Apr 30 15:21:36 2007 From: letsmtb at gkgraphics.com (Muir P. Upturning) Date: Mon, 30 Apr 2007 18:21:36 -0400 Subject: [Vtigercrm-commits] No need to visit local drug store. Message-ID: <9990682062.20070430182136@gkgraphics.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://oslz.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From extrmfit at gnstc.com Mon Apr 30 15:48:11 2007 From: extrmfit at gnstc.com (Jared A. Author) Date: Mon, 30 Apr 2007 18:48:11 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7021794799.20070430184811@gnstc.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/dcb89842/attachment.htm From cec at greencapsule.org Mon Apr 30 16:06:35 2007 From: cec at greencapsule.org (Foreordains C. Reconstructs) Date: Mon, 30 Apr 2007 19:06:35 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <4375699408.20070430190635@greencapsule.org> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://oslz.hk Verified by VISA and sell FDA Approved Drugs only! From shellyflaherty at gradgiftlife.com Mon Apr 30 16:51:17 2007 From: shellyflaherty at gradgiftlife.com (Ind E. Blindfold) Date: Mon, 30 Apr 2007 19:51:17 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3742765778.20070430195117@gradgiftlife.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/8d2d8f36/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: screamed.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/8d2d8f36/screamed-0001.gif From agassiz_review at goldtelevision.com Mon Apr 30 17:02:04 2007 From: agassiz_review at goldtelevision.com (Lengthens G. Caracas) Date: Mon, 30 Apr 2007 20:02:04 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <3076204996.20070430200204@goldtelevision.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From extremebrutality at greatlakes.seagulf.com Mon Apr 30 17:48:49 2007 From: extremebrutality at greatlakes.seagulf.com (Reprints O. Clark) Date: Mon, 30 Apr 2007 20:48:49 -0400 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <5275084882.20070430204849@greatlakes.seagulf.com> The most powerful medicines for you! Proprecia - $1.03 - first and only FDA-approved pill demonstrated to treat male pattern hair loss on the vertex (top of head) and anterior mid-scalp area (middle front of head) in men only. Zero Nicotine - $47.99 - innovative stop smoking patch designed to help you give up smoking safely and naturally. With its unique blend of ingredients, Zero Nicotine offers you the best possible chance to finally kick the deadly habit for good! If you are serious about your decision to quit smoking, you’ve come to the right place. Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From serbag.n at glmanagement.ca Mon Apr 30 18:44:26 2007 From: serbag.n at glmanagement.ca (Asylum U. Absently) Date: Mon, 30 Apr 2007 21:44:26 -0400 Subject: [Vtigercrm-commits] Why don't you buy some medications to be healthy? Message-ID: <3012996664.20070430214426@glmanagement.ca> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://oslz.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From agassol at greenwoodsculptures.com Mon Apr 30 19:05:33 2007 From: agassol at greenwoodsculptures.com (Alleviation F. Airlifts) Date: Mon, 30 Apr 2007 22:05:33 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2333440975.20070430220533@greenwoodsculptures.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/dd332565/attachment.html From istiyono at greenvilleawning.com Mon Apr 30 19:06:58 2007 From: istiyono at greenvilleawning.com (Growth F. Excavation) Date: Mon, 30 Apr 2007 22:06:58 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <5745953661.20070430220658@greenvilleawning.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://oslz.hk Instant shipping worldwide! CONFIDENTIAL purchase! From istatchjc at gestionforeal.ca Mon Apr 30 20:06:19 2007 From: istatchjc at gestionforeal.ca (Ventilation U. Slouchier) Date: Mon, 30 Apr 2007 23:06:19 -0400 Subject: [Vtigercrm-commits] Top listed medications 4 you. Message-ID: <0029448327.20070430230619@gestionforeal.ca> Make your dreams come true with licensed medications from US Drug Store! Any pills at your choice. There is no need to visit your local drug store at all. http://oslz.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From louise.b.thompson at globalmouldings.com Mon Apr 30 20:19:16 2007 From: louise.b.thompson at globalmouldings.com (Tanner S. Flapjack) Date: Mon, 30 Apr 2007 23:19:16 -0400 Subject: [Vtigercrm-commits] Problems everywhere? Message-ID: <9361928141.20070430231916@globalmouldings.com> The most powerful medicines for you! All-Natural Magnesium Oxide - $35.99 - All-Natural Magnesium Oxide is a rich source of elemental magnesium, an essential mineral. Magnesium plays a role in many vital body functions, including protein biosynthesis, as well as bone and muscle formation, and as a cofactor in hundreds of enzymatic reactions. Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From isthe at grindal.net Mon Apr 30 20:20:45 2007 From: isthe at grindal.net (Fattiest O. Appearance) Date: Mon, 30 Apr 2007 23:20:45 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4720742569.20070430232045@grindal.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/29131d6e/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Trujillo.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/29131d6e/Trujillo.gif From istangrove at golbornemanor.co.uk Mon Apr 30 21:29:14 2007 From: istangrove at golbornemanor.co.uk (Scabies C. Aloft) Date: Tue, 01 May 2007 00:29:14 -0400 Subject: [Vtigercrm-commits] U won't believe! Message-ID: <4345073994.20070501002914@golbornemanor.co.uk> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://oslz.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From lambert at greenhillcenter.com Mon Apr 30 21:32:51 2007 From: lambert at greenhillcenter.com (Ouija L. Overplayed) Date: Tue, 01 May 2007 00:32:51 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2084117707.20070501003251@greenhillcenter.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070501/c8e861d7/attachment.htm From service at greenwayasset.com Mon Apr 30 21:51:27 2007 From: service at greenwayasset.com (Thresh E. Hickeys) Date: Tue, 01 May 2007 00:51:27 -0400 Subject: [Vtigercrm-commits] Can't afford medications you need? Message-ID: <0908028743.20070501005127@greenwayasset.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://oslz.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From crusherbu at gfdsa.org Mon Apr 30 22:07:53 2007 From: crusherbu at gfdsa.org (Remarked O. Churls) Date: Tue, 01 May 2007 01:07:53 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8628179764.20070501010753@gfdsa.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070501/fbd25e35/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Bialystok.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070501/fbd25e35/Bialystok.gif From afs at gramba.net Mon Apr 30 22:36:33 2007 From: afs at gramba.net (Jersey B. Steams) Date: Tue, 01 May 2007 01:36:33 -0400 Subject: [Vtigercrm-commits] Medications that you need. Message-ID: <2002528466.20070501013633@gramba.net> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://oslz.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From extrahyper at goautochart.com Mon Apr 30 23:03:31 2007 From: extrahyper at goautochart.com (Treacling V. Croesus) Date: Tue, 01 May 2007 02:03:31 -0400 Subject: [Vtigercrm-commits] Some useful advices for your health Message-ID: <4192957014.20070501020331@goautochart.com> The most powerful medicines for you! Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. Suregasm - $35.99 - Achieve stronger and more powerful orgasms with this all-natural female sexual stimulant. Prilosec - $1.33 - can be taken to decrease the amount of acid produced in the stomach. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From lancaster at gml-inc.com Mon Apr 30 23:11:56 2007 From: lancaster at gml-inc.com (Churn Q. Couping) Date: Tue, 01 May 2007 02:11:56 -0400 Subject: [Vtigercrm-commits] Want to cure yourself? Message-ID: <1657132137.20070501021156@gml-inc.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://oslz.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From isthar at govers-house.co.uk Sun Apr 1 03:09:23 2007 From: isthar at govers-house.co.uk (Disembodies C. Bernini) Date: Sun, 01 Apr 2007 03:09:23 -0400 Subject: [Vtigercrm-commits] Perfect sex? It is possible! Message-ID: <8190092196.20070401030923@govers-house.co.uk> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://scapeidaa.com Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From collins at gramorwa.com Sun Apr 1 05:09:50 2007 From: collins at gramorwa.com (Spiciest U. Safeguards) Date: Sun, 01 Apr 2007 05:09:50 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5443973319.20070401050950@gramorwa.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/d6b03f23/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: concocts.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/d6b03f23/attachment.gif From dave-a at glsbr.net Sun Apr 1 00:41:20 2007 From: dave-a at glsbr.net (Boyishness H. Conner) Date: Sun, 01 Apr 2007 04:41:20 +0000 Subject: [Vtigercrm-commits] Don't know where to buy pills? Message-ID: <0637235914.20070401044120@glsbr.net> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://scapeidaa.com Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From pnjca at goodnewstucson.com Sun Apr 1 01:28:47 2007 From: pnjca at goodnewstucson.com (Jennifer Chambers) Date: Sun, 01 Apr 2007 01:28:47 -0400 Subject: [Vtigercrm-commits] truda voliu Message-ID: <4504679679.20070401012847@goodnewstucson.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/8e980adf/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: woodpeckers.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/8e980adf/attachment.gif From audrey at gqitwi.qddfac.r.12hs.com Sun Apr 1 06:36:31 2007 From: audrey at gqitwi.qddfac.r.12hs.com (Anyway H. Muck) Date: Sun, 01 Apr 2007 06:36:31 -0400 Subject: [Vtigercrm-commits] Want to be healthy? U can! Message-ID: <7158214939.20070401063631@gqitwi.qddfac.r.12hs.com> Our Canada Pharmacy store presents top products that will make you healthy! You do not need to go to your local drug store, you can by here any pill that you need. Viagra, Cialis, Levitra, Valium, Phentermine, Tramadol, Xanax, HGH you can find them here: http://scapeidaa.com Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From istcp at globaltouch.com Sun Apr 1 06:37:05 2007 From: istcp at globaltouch.com (Avocado B. Prefatory) Date: Sun, 01 Apr 2007 06:37:05 -0400 Subject: [Vtigercrm-commits] Nobody will know bout your problems. Message-ID: <1917369419.20070401063705@globaltouch.com> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://scapeidaa.com Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From crushermg at glcu.org Sun Apr 1 00:06:53 2007 From: crushermg at glcu.org (Catherine Salinas) Date: Sun, 01 Apr 2007 00:06:53 -0400 Subject: [Vtigercrm-commits] sobiralsia poetomu Message-ID: <9644001359.20070401000653@glcu.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/1160456f/attachment-0001.html From eve at gpara.com Sun Apr 1 01:27:42 2007 From: eve at gpara.com (Vanessa Sandoval) Date: Sun, 01 Apr 2007 01:27:42 -0400 Subject: [Vtigercrm-commits] sobstvennye kurtki Message-ID: <8810397957.20070401012742@gpara.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/43712f57/attachment-0001.html From apt at greenleecampground.com Sun Apr 1 04:28:21 2007 From: apt at greenleecampground.com (Sublease V. Comfort) Date: Sun, 01 Apr 2007 08:28:21 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9956322772.20070401082821@greenleecampground.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/27eea470/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: taffies.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/27eea470/attachment.gif From davdoris at go-moneydoctor.com Sun Apr 1 09:57:25 2007 From: davdoris at go-moneydoctor.com (Merino E. Sexes) Date: Sun, 01 Apr 2007 09:57:25 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <5872037935.20070401095725@go-moneydoctor.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://scapeidaa.com Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From istaban_x at greensmiths.com Sun Apr 1 10:07:08 2007 From: istaban_x at greensmiths.com (Yaounde S. Warmonger) Date: Sun, 01 Apr 2007 10:07:08 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5037180724.20070401100708@greensmiths.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/c4f73625/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: formulates.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/c4f73625/attachment.gif From isteffani at gradesofa.com Sun Apr 1 04:07:08 2007 From: isteffani at gradesofa.com (Zachary Merrill) Date: Sun, 01 Apr 2007 04:07:08 -0400 Subject: [Vtigercrm-commits] slovno dlia Message-ID: <6931352896.20070401040708@gradesofa.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/b51fa41d/attachment-0001.html From samuraikrm at groceriestogo.com Sun Apr 1 07:33:31 2007 From: samuraikrm at groceriestogo.com (Aiden Weeks) Date: Sun, 01 Apr 2007 07:33:31 -0400 Subject: [Vtigercrm-commits] vziatsia nadeius Message-ID: <0857968678.20070401073331@groceriestogo.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/ed9a1448/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: coverall.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/ed9a1448/attachment.gif From palenkal at gpstourguide.com Sun Apr 1 05:35:02 2007 From: palenkal at gpstourguide.com (Alexander Atkinson) Date: Sun, 01 Apr 2007 05:35:02 -0400 Subject: [Vtigercrm-commits] byli shevelnulsia Message-ID: <9568094446.20070401053502@gpstourguide.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/03d54721/attachment-0001.html From istopheb at greatamericanrealty.com Sun Apr 1 08:50:13 2007 From: istopheb at greatamericanrealty.com (Dr. Heather Wyatt) Date: Sun, 01 Apr 2007 12:50:13 +0000 Subject: [Vtigercrm-commits] Penis loader Message-ID: <3563136826.20070401125013@greatamericanrealty.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/26c75936/attachment-0001.html From darwin at greatlakesequipment.com Sun Apr 1 13:53:50 2007 From: darwin at greatlakesequipment.com (Duffy T. Stovepipe) Date: Sun, 01 Apr 2007 13:53:50 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <8935037704.20070401135350@greatlakesequipment.com> Our Canada Pharmacy store presents top products that will make you healthy! You do not need to go to your local drug store, you can by here any pill that you need. Viagra, Cialis, Levitra, Valium, Phentermine, Tramadol, Xanax, HGH you can find them here: http://scapeidaa.com There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From koczera at greatbridalexpo.com Sun Apr 1 09:58:55 2007 From: koczera at greatbridalexpo.com (Intellects H. Chat) Date: Sun, 01 Apr 2007 13:58:55 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8167743278.20070401135855@greatbridalexpo.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/343ea3b0/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: pink.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/343ea3b0/attachment.gif From plusone at greendreamsholiday.com Sun Apr 1 07:22:23 2007 From: plusone at greendreamsholiday.com (Crystal Kerr) Date: Sun, 01 Apr 2007 07:22:23 -0400 Subject: [Vtigercrm-commits] altares zria Message-ID: <3275658016.20070401072223@greendreamsholiday.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/2997937e/attachment-0001.html From act at gpspassion.com Sun Apr 1 15:22:37 2007 From: act at gpspassion.com (Exult T. Straightjacket) Date: Sun, 01 Apr 2007 15:22:37 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0905658213.20070401152237@gpspassion.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/d7d03502/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: simulcast.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/d7d03502/attachment.gif From neal at goeframe.com Sun Apr 1 09:22:18 2007 From: neal at goeframe.com (Yesenia Reid) Date: Sun, 01 Apr 2007 09:22:18 -0400 Subject: [Vtigercrm-commits] vsiakogo etom Message-ID: <0453762231.20070401092218@goeframe.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/3f881906/attachment-0001.html From johnm at globalcon.com Sun Apr 1 11:56:59 2007 From: johnm at globalcon.com (Electra H. Linguistic) Date: Sun, 01 Apr 2007 15:56:59 +0000 Subject: [Vtigercrm-commits] Huge on-line pharmacy Message-ID: <1573130104.20070401155659@globalcon.com> The most powerful medicines for you! Pheromone cologne for men - $35.99 - The human pheromones that attracts females has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of men, these natural pheromones are an evolutionary remnant from a time when human females relied on scent to locate male mates. Cumpills - are a great concept formulated by our highly trained speclalists working in the field of natural therapy. Using the knowledge of thousands of years of cumulative research in herbals, this specially designed formula helps in achieving high levels of semen volume and quality. Spermamax - $40.5 - SPERMAMAX is a scientifically validated herbal nutritional blend to enhance fertility by improving sperm quality, count and motility (spontaneous motion). and more! our site http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From mcbride at getesa.com Sun Apr 1 17:27:51 2007 From: mcbride at getesa.com (Ballistic L. Sigurd) Date: Sun, 01 Apr 2007 17:27:51 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <5034310000.20070401172751@getesa.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://scapeidaa.com Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From rfriese at greenwayequip.com Sun Apr 1 11:15:39 2007 From: rfriese at greenwayequip.com (Thomas Fuller) Date: Sun, 01 Apr 2007 11:15:39 -0400 Subject: [Vtigercrm-commits] tysiacheletij zhat Message-ID: <5659974920.20070401111539@greenwayequip.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/f283332a/attachment-0001.html From gatesy at getipx3.uni-paderborn.de Sun Apr 1 11:16:13 2007 From: gatesy at getipx3.uni-paderborn.de (Lisa Foster) Date: Sun, 01 Apr 2007 11:16:13 -0400 Subject: [Vtigercrm-commits] davno voinov Message-ID: <0046496100.20070401111613@getipx3.uni-paderborn.de> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/357f512a/attachment-0001.html From extremeteen at gkpskldls.shankscape.com Sun Apr 1 14:17:54 2007 From: extremeteen at gkpskldls.shankscape.com (Michael Roberts) Date: Sun, 01 Apr 2007 14:17:54 -0400 Subject: [Vtigercrm-commits] teh krichat Message-ID: <9546345042.20070401141754@gkpskldls.shankscape.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/f6410ec6/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Cali.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/f6410ec6/attachment.gif From frontier at goflo.com Sun Apr 1 14:51:18 2007 From: frontier at goflo.com (Credit E. Towpath) Date: Sun, 01 Apr 2007 18:51:18 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2156198433.20070401185118@goflo.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/b18c8d30/attachment-0001.html From bauer at gocruiseasia.com Sun Apr 1 13:05:50 2007 From: bauer at gocruiseasia.com (Dustin Compton) Date: Sun, 01 Apr 2007 13:05:50 -0400 Subject: [Vtigercrm-commits] nimi svetovogo Message-ID: <1217971370.20070401130550@gocruiseasia.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/a9d97bde/attachment-0001.html From isteswar at graycomp.net Sun Apr 1 20:53:09 2007 From: isteswar at graycomp.net (Caparisoning T. Stratified) Date: Sun, 01 Apr 2007 20:53:09 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7499506096.20070401205309@graycomp.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/b7f84246/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: renovator.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/b7f84246/attachment.gif From istanbulcu at greatfurniture.com Sun Apr 1 21:51:38 2007 From: istanbulcu at greatfurniture.com (Amateurs R. Wassail) Date: Sun, 01 Apr 2007 21:51:38 -0400 Subject: [Vtigercrm-commits] Want to be healthy? U can! Message-ID: <3074427278.20070401215138@greatfurniture.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft ? the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://scapeidaa.com Instant shipping worldwide! CONFIDENTIAL purchase! From annette at gitwangak.ca Sun Apr 1 15:19:05 2007 From: annette at gitwangak.ca (Holly Mayo) Date: Sun, 01 Apr 2007 15:19:05 -0400 Subject: [Vtigercrm-commits] chem svoih Message-ID: <2461844666.20070401151905@gitwangak.ca> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/ab7d49ff/attachment-0001.html From istephens at gravesnyc.com Sun Apr 1 19:22:15 2007 From: istephens at gravesnyc.com (Charm V. Weathermen) Date: Sun, 01 Apr 2007 23:22:15 +0000 Subject: [Vtigercrm-commits] Need some help? Message-ID: <1221097161.20070401232215@gravesnyc.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://scapeidaa.com Completely secure and confidential purchase. Instant shipping worldwide. From guy at grammardoctor.com Sun Apr 1 17:35:50 2007 From: guy at grammardoctor.com (Paula Banks) Date: Sun, 01 Apr 2007 17:35:50 -0400 Subject: [Vtigercrm-commits] reziny shchekoldu Message-ID: <8404432906.20070401173550@grammardoctor.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/18fd1a78/attachment-0001.html From it-measures at chase.com Sun Apr 1 21:25:32 2007 From: it-measures at chase.com (Transvaal R. Particularize) Date: Mon, 02 Apr 2007 01:25:32 +0000 Subject: [Vtigercrm-commits] Chase Security Measures Message-ID: <8640220151.20070402012532@chase.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/048d1af5/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: bushier.gif Type: image/gif Size: 742 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/048d1af5/attachment.gif From webber at giftcert.com Mon Apr 2 04:04:11 2007 From: webber at giftcert.com (Ruddiest D. Billet) Date: Mon, 02 Apr 2007 04:04:11 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <8458541302.20070402040411@giftcert.com> Make your dreams come true with licensed medications from US Drug Store! Any pills at your choice. There is no need to visit your local drug store at all. http://kiaoq.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From penneylin at gmpmusic.com Sun Apr 1 21:10:46 2007 From: penneylin at gmpmusic.com (Jacquard U. Ripper) Date: Sun, 01 Apr 2007 21:10:46 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3497984776.20070401211046@gmpmusic.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/5ec7b43b/attachment-0001.html From ann at grandevenues.com Mon Apr 2 00:51:45 2007 From: ann at grandevenues.com (Constantinople V. Teacup) Date: Mon, 02 Apr 2007 04:51:45 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6070375689.20070402045145@grandevenues.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/514c9076/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: hunches.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/514c9076/attachment.gif From istent at greenandaway.org Sun Apr 1 22:36:52 2007 From: istent at greenandaway.org (Andean C. Akihito) Date: Sun, 01 Apr 2007 22:36:52 -0400 Subject: [Vtigercrm-commits] Need to buy medications but don't know where? Message-ID: <7548302381.20070401223652@greenandaway.org> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://kiaoq.hk Completely secure and confidential purchase. Instant shipping worldwide. From extremeliquidators at gonzatrips.com Mon Apr 2 07:12:21 2007 From: extremeliquidators at gonzatrips.com (Buckram M. Cookery) Date: Mon, 02 Apr 2007 07:12:21 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5171752923.20070402071221@gonzatrips.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/c17903cf/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: misread.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/c17903cf/attachment.gif From istorr at greenwoodinsurance.net Mon Apr 2 00:35:50 2007 From: istorr at greenwoodinsurance.net (Liberally A. Planked) Date: Mon, 02 Apr 2007 00:35:50 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9209240853.20070402003550@greenwoodinsurance.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/f444def7/attachment-0001.html From crum at grondona.com Mon Apr 2 08:17:01 2007 From: crum at grondona.com (Flickered E. Adulterer) Date: Mon, 02 Apr 2007 08:17:01 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <3877157885.20070402081701@grondona.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://kiaoq.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From extric at gothicsoftware.net Mon Apr 2 04:42:46 2007 From: extric at gothicsoftware.net (Moisturize J. Gawain) Date: Mon, 02 Apr 2007 08:42:46 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9318949184.20070402084246@gothicsoftware.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/6dd48fc5/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: lust.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/6dd48fc5/attachment.gif From lfeddy at gqf.com Mon Apr 2 05:02:18 2007 From: lfeddy at gqf.com (Dr. Amy Whitehead) Date: Mon, 02 Apr 2007 09:02:18 +0000 Subject: [Vtigercrm-commits] Penis Launcher Message-ID: <1645878596.20070402090218@gqf.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/4811fcf6/attachment-0001.html From ldsb at gormleyequipment.com Mon Apr 2 05:03:57 2007 From: ldsb at gormleyequipment.com (Dr. Fred Campbell) Date: Mon, 02 Apr 2007 09:03:57 +0000 Subject: [Vtigercrm-commits] Your dick is not only for pissing Message-ID: <8234481223.20070402090357@gormleyequipment.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/d4d22850/attachment-0001.html From mtolivo at gologurskyphoto.com Mon Apr 2 02:28:47 2007 From: mtolivo at gologurskyphoto.com (Astute A. Gurgle) Date: Mon, 02 Apr 2007 02:28:47 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <3413845854.20070402022847@gologurskyphoto.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://kiaoq.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From mrcrete at gorbi.com Mon Apr 2 04:28:53 2007 From: mrcrete at gorbi.com (Beautifiers K. Excuses) Date: Mon, 02 Apr 2007 04:28:53 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9705098017.20070402042853@gorbi.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/50142a51/attachment-0001.html From ncamper at globetrottersinn.com Mon Apr 2 12:31:00 2007 From: ncamper at globetrottersinn.com (Unholier M. Jeannette) Date: Mon, 02 Apr 2007 12:31:00 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <0042913966.20070402123100@globetrottersinn.com> Our Canada Pharmacy store presents top products that will make you healthy! You do not need to go to your local drug store, you can by here any pill that you need. Viagra, Cialis, Levitra, Valium, Phentermine, Tramadol, Xanax, HGH you can find them here: http://kiaoq.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From hitek at globalprospectors.com Mon Apr 2 12:38:15 2007 From: hitek at globalprospectors.com (Monaco L. Astarte) Date: Mon, 02 Apr 2007 12:38:15 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5425082388.20070402123815@globalprospectors.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/2f45a544/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: witticism.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/2f45a544/attachment.gif From consult at goodtimber.com Mon Apr 2 09:05:31 2007 From: consult at goodtimber.com (Ravening T. Tetrahedron) Date: Mon, 02 Apr 2007 13:05:31 +0000 Subject: [Vtigercrm-commits] sexual drive Message-ID: <4025698632.20070402130531@goodtimber.com> The most powerful medicines for you! Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Sonma - $1.22 - works to relax the muscles by blocking pain messages sent to the brain. Nymphomax - $35.99 - Helps women to achieve multiple and more powerful orgasms with this unique female sexual stimulant. and more! our site http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From stuart at goldiggers.com Mon Apr 2 10:15:17 2007 From: stuart at goldiggers.com (Dustin Gallagher) Date: Mon, 02 Apr 2007 10:15:17 -0400 Subject: [Vtigercrm-commits] bolshomu formirovat Message-ID: <6648304072.20070402101517@goldiggers.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/371c1cf5/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: formerly.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/371c1cf5/attachment.gif From extrmlyyrs at ghga.com Mon Apr 2 07:22:53 2007 From: extrmlyyrs at ghga.com (Vasquez U. Enlistees) Date: Mon, 02 Apr 2007 07:22:53 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <0509379734.20070402072253@ghga.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://kiaoq.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From extrmespet at glitchless.com Mon Apr 2 08:21:20 2007 From: extrmespet at glitchless.com (Satan F. Bandoleer) Date: Mon, 02 Apr 2007 08:21:20 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3511496567.20070402082120@glitchless.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/bc472f7d/attachment-0001.html From necranom at gerrynolan.net Mon Apr 2 16:12:32 2007 From: necranom at gerrynolan.net (Naturalized J. Hereford) Date: Mon, 02 Apr 2007 16:12:32 -0400 Subject: [Vtigercrm-commits] Can you imagine? Message-ID: <5957461174.20070402161232@gerrynolan.net> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://kiaoq.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From dailey at greenregister.org Mon Apr 2 13:26:29 2007 From: dailey at greenregister.org (Redoubling H. Craftily) Date: Mon, 02 Apr 2007 17:26:29 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1862105922.20070402172629@greenregister.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/e106f054/attachment-0001.html From istartef at getmath.com Mon Apr 2 14:39:44 2007 From: istartef at getmath.com (Enlarger R. Terrence) Date: Mon, 02 Apr 2007 18:39:44 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2989044328.20070402183944@getmath.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/92984bdb/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: stillborns.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/92984bdb/attachment.gif From casa at glfamily.com Mon Apr 2 12:35:47 2007 From: casa at glfamily.com (Tits H. Dillinger) Date: Mon, 02 Apr 2007 12:35:47 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8368068217.20070402123547@glfamily.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/5c124007/attachment-0001.html From bnjeri at getafix.india.ti.com Mon Apr 2 19:43:09 2007 From: bnjeri at getafix.india.ti.com (Lentils E. Whirs) Date: Mon, 02 Apr 2007 19:43:09 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6159002268.20070402194309@getafix.india.ti.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/68eae89a/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: diametrical.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/68eae89a/attachment.gif From bea at goaltex.com Mon Apr 2 12:12:45 2007 From: bea at goaltex.com (Gladys H. Racily) Date: Mon, 02 Apr 2007 12:12:45 -0400 Subject: [Vtigercrm-commits] Why don't you buy some medications to be healthy? Message-ID: <3224358928.20070402121245@goaltex.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://kiaoq.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From istallon at resalehost.networksolutions.com Mon Apr 2 20:29:14 2007 From: istallon at resalehost.networksolutions.com (Querying H. Abduct) Date: Mon, 02 Apr 2007 20:29:14 -0400 Subject: [Vtigercrm-commits] Disappointed with your sexual health? Message-ID: <6374111752.20070402202914@graceharbor.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://kiaoq.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From abby at ggsl.e.telefonica.net Mon Apr 2 17:28:12 2007 From: abby at ggsl.e.telefonica.net (Sedan I. Agatha) Date: Mon, 02 Apr 2007 21:28:12 +0000 Subject: [Vtigercrm-commits] Can you imagine? Message-ID: <4007447044.20070402212812@ggsl.e.telefonica.net> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://kiaoq.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From gregg at govp.com Mon Apr 2 19:02:47 2007 From: gregg at govp.com (Violet Bates) Date: Mon, 02 Apr 2007 19:02:47 -0400 Subject: [Vtigercrm-commits] sirenevuiu ostankov Message-ID: <0384098516.20070402190247@govp.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/387f7f6e/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: jades.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/387f7f6e/attachment.gif From reinald.law at gettherhythm.com Mon Apr 2 17:07:05 2007 From: reinald.law at gettherhythm.com (Olaf A. Sinfulness) Date: Mon, 02 Apr 2007 17:07:05 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6783866930.20070402170705@gettherhythm.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070402/2d2891fc/attachment-0001.html From dkc at graphikillers.com Tue Apr 3 00:58:43 2007 From: dkc at graphikillers.com (Healed F. Debora) Date: Tue, 03 Apr 2007 00:58:43 -0400 Subject: [Vtigercrm-commits] You need these pills. Message-ID: <0180391385.20070403005843@graphikillers.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://kiaoq.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From daniels at grands-moulins.com Mon Apr 2 18:08:58 2007 From: daniels at grands-moulins.com (Housebreak P. Watusi) Date: Mon, 02 Apr 2007 18:08:58 -0400 Subject: [Vtigercrm-commits] We have everything that you need Message-ID: <0780889071.20070402180858@grands-moulins.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://kiaoq.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From samuraidue at goalgroup.com Tue Apr 3 03:02:41 2007 From: samuraidue at goalgroup.com (Wayside U. Ishtar) Date: Tue, 03 Apr 2007 03:02:41 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8255722618.20070403030241@goalgroup.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/78978358/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: foxtrot.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/78978358/attachment.gif From rosewil at grinningplanet.com Mon Apr 2 23:42:33 2007 From: rosewil at grinningplanet.com (Guerrillas E. Self) Date: Tue, 03 Apr 2007 03:42:33 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8980416460.20070403034233@grinningplanet.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/c46a11e0/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: thesis.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/c46a11e0/attachment.gif From carleen at grandoakherbfarm.com Mon Apr 2 22:36:49 2007 From: carleen at grandoakherbfarm.com (Guttered I. Partook) Date: Mon, 02 Apr 2007 22:36:49 -0400 Subject: [Vtigercrm-commits] V1 agra vs sexual disorder Message-ID: <7368077498.20070402223649@grandoakherbfarm.com> The most powerful medicines for you! Lipothin - $35.99 - the finest lipotropic fat burner ever! Made from only the finest pharmaceutical grade botanicals, Lipothin contains a unique and highly effective formula of all-natural ingredients which will increase your heart rate, suppress your appetite, and greatly accelerate the burning of fat. Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. Suregasm - $35.99 - Achieve stronger and more powerful orgasms with this all-natural female sexual stimulant. and more! our site http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From administrative at grant.k12.ok.us Tue Apr 3 00:55:48 2007 From: administrative at grant.k12.ok.us (Pok C. Potpourris) Date: Tue, 03 Apr 2007 04:55:48 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6229918345.20070403045548@grant.k12.ok.us> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/464e96f0/attachment-0001.html From extragaydj at goaironly.com Tue Apr 3 01:30:28 2007 From: extragaydj at goaironly.com (Encephalitis K. Ratio) Date: Tue, 03 Apr 2007 01:30:28 -0400 Subject: [Vtigercrm-commits] Health for everybody Message-ID: <9748141024.20070403013028@goaironly.com> The most powerful medicines for you! Proscar - $1.07 - helps shrink the prostate in many men. Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. Diflucan - $2.64 - a tablet taken orally to treat vaginal yeast infections caused by the yeast Candida. and more! our site http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From res at granitbleu.com Tue Apr 3 01:46:43 2007 From: res at granitbleu.com (Forfeiture M. Castrations) Date: Tue, 03 Apr 2007 05:46:43 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9415651671.20070403054643@granitbleu.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/2a16b1e3/attachment-0001.html From grant at glasurit.com Tue Apr 3 06:50:02 2007 From: grant at glasurit.com (Archaeologist U. Neurons) Date: Tue, 03 Apr 2007 06:50:02 -0400 Subject: [Vtigercrm-commits] Unbelievable! U can be healthy! Message-ID: <1592505580.20070403065002@glasurit.com> Our Canada Pharmacy store presents top products that will make you healthy! You do not need to go to your local drug store, you can by here any pill that you need. Viagra, Cialis, Levitra, Valium, Phentermine, Tramadol, Xanax, HGH you can find them here: http://kiaoq.hk Make right choice: buy medications at LegalRXMedications drug store! From extremehostility at greenwich1892.com Tue Apr 3 00:37:02 2007 From: extremehostility at greenwich1892.com (Redcap A. Octal) Date: Tue, 03 Apr 2007 00:37:02 -0400 Subject: [Vtigercrm-commits] Unbelievable! U can be healthy! Message-ID: <0642260108.20070403003702@greenwich1892.com> Most wanted pills at LOW price! http://kiaoq.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From extremistclub at giuseffi.com Tue Apr 3 03:34:04 2007 From: extremistclub at giuseffi.com (Belles I. Nora) Date: Tue, 03 Apr 2007 07:34:04 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0423875563.20070403073404@giuseffi.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/4a47cf3a/attachment-0001.html From extrapfui at gmfloral.com Tue Apr 3 03:45:28 2007 From: extrapfui at gmfloral.com (McGee H. Outhouse) Date: Tue, 03 Apr 2007 07:45:28 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6118114223.20070403074528@gmfloral.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/e27cb428/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: bandaging.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/e27cb428/attachment.gif From cristina at gr-asesores.com Tue Apr 3 04:00:33 2007 From: cristina at gr-asesores.com (Shakily B. Manikin) Date: Tue, 03 Apr 2007 08:00:33 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0440444516.20070403080033@gr-asesores.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/a39d023a/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: longhair.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/a39d023a/attachment.gif From bnkab at grandentry.com Tue Apr 3 04:26:44 2007 From: bnkab at grandentry.com (Polecat R. Incriminatory) Date: Tue, 03 Apr 2007 08:26:44 +0000 Subject: [Vtigercrm-commits] Worry about your erection? Message-ID: <5584969358.20070403082644@grandentry.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://kiaoq.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From crushilu at gocopypro.com Tue Apr 3 09:29:24 2007 From: crushilu at gocopypro.com (Waddled C. Selfishly) Date: Tue, 03 Apr 2007 09:29:24 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7418664554.20070403092924@gocopypro.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/6ce9a3e7/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: toady.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/6ce9a3e7/attachment.gif From good at glenviewbaptist.com Tue Apr 3 04:52:40 2007 From: good at glenviewbaptist.com (Sniper T. Milliners) Date: Tue, 03 Apr 2007 08:52:40 +0000 Subject: [Vtigercrm-commits] Unbelievable! U can be healthy! Message-ID: <7644053181.20070403085240@glenviewbaptist.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://kiaoq.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From gardenisme at ges.pickens.k12.al.us Tue Apr 3 04:55:32 2007 From: gardenisme at ges.pickens.k12.al.us (Dr. Donald Hahn) Date: Tue, 03 Apr 2007 08:55:32 +0000 Subject: [Vtigercrm-commits] Don't know where to buy pills? Message-ID: <9491177857.20070403085532@ges.pickens.k12.al.us> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/75bec92b/attachment-0001.html From bj at globalrecovery.com Tue Apr 3 03:33:30 2007 From: bj at globalrecovery.com (Potholing G. Diderot) Date: Tue, 03 Apr 2007 03:33:30 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8746597550.20070403033330@globalrecovery.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/172d4e0d/attachment-0001.html From istaroz at greyard.com Tue Apr 3 07:23:50 2007 From: istaroz at greyard.com (Tiredness G. Saussure) Date: Tue, 03 Apr 2007 07:23:50 -0400 Subject: [Vtigercrm-commits] Why should you pay more? Message-ID: <4733068000.20070403072350@greyard.com> The most powerful medicines for you! Pheromone perfume for women - $35.99 - The human pheromones that attracts males has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of women, these natural pheromones are an evolutionary remnant from a time when human males relied on scent to locate female mates. Pheromone perfume for women - $35.99 - The human pheromones that attracts males has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of women, these natural pheromones are an evolutionary remnant from a time when human males relied on scent to locate female mates. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. and more! our site http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From absolute at glennboy.com Tue Apr 3 12:36:38 2007 From: absolute at glennboy.com (Ethiopians E. Colonization) Date: Tue, 03 Apr 2007 12:36:38 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <7714491577.20070403123638@glennboy.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://kiaoq.hk Make right choice: buy medications at LegalRXMedications drug store! From u_linkoa at golfhotelazohia.com Tue Apr 3 07:51:04 2007 From: u_linkoa at golfhotelazohia.com (Recuperates O. Gonzalez) Date: Tue, 03 Apr 2007 11:51:04 +0000 Subject: [Vtigercrm-commits] Worry about your erection? Message-ID: <0506900065.20070403115104@golfhotelazohia.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://kiaoq.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 3 09:24:54 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 03 Apr 2007 13:24:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10542 - /vtigercrmoutlook/trunk/resources/support_dlls/TABCTL32.OCX Message-ID: <20070403132454.397957D276E@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Apr 3 07:24:42 2007 New Revision: 10542 Log: version upgraded to 6.01.9782 Modified: vtigercrmoutlook/trunk/resources/support_dlls/TABCTL32.OCX Modified: vtigercrmoutlook/trunk/resources/support_dlls/TABCTL32.OCX ============================================================================== Binary files - no diff available. From istarnes at griffinhomes.com Tue Apr 3 10:15:53 2007 From: istarnes at griffinhomes.com (Acceptances I. Astor) Date: Tue, 03 Apr 2007 14:15:53 +0000 Subject: [Vtigercrm-commits] Pharmacy for everyone Message-ID: <8215541734.20070403141553@griffinhomes.com> The most powerful medicines for you! Allegra - $1.32 - an antihistamine that comes in a variety of strengths and formulations to provide relief from a wide range of seasonal allergy symptoms. Zero Nicotine - $47.99 - innovative stop smoking patch designed to help you give up smoking safely and naturally. With its unique blend of ingredients, Zero Nicotine offers you the best possible chance to finally kick the deadly habit for good! If you are serious about your decision to quit smoking, you?ve come to the right place. Horny Goat Weed - $35.99 - Epimedium is a genus of twenty-one related plant species. It boosts libido (sex drive), increases energy levels and enhances recovery from exercise. and more! our site http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From rosenberg at greetingcards.com Tue Apr 3 10:17:03 2007 From: rosenberg at greetingcards.com (Elderberry K. Wig) Date: Tue, 03 Apr 2007 14:17:03 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8331638402.20070403141703@greetingcards.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/d5d9809e/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: finders.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/d5d9809e/attachment.gif From extraserv at godatplay.org Tue Apr 3 07:42:36 2007 From: extraserv at godatplay.org (Inchoating F. Definite) Date: Tue, 03 Apr 2007 07:42:36 -0400 Subject: [Vtigercrm-commits] Don't know where to buy pills? Message-ID: <9219544541.20070403074236@godatplay.org> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://kiaoq.hk any pill you need! Absolutely Confidential and Secure purchase From istorm at gladbird.com Tue Apr 3 11:20:31 2007 From: istorm at gladbird.com (Putts K. Unitarian) Date: Tue, 03 Apr 2007 15:20:31 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8857999119.20070403152031@gladbird.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/351319f5/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: mower.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/351319f5/attachment.gif From samuels at giromundo.com Tue Apr 3 09:28:03 2007 From: samuels at giromundo.com (Cramps B. Saucing) Date: Tue, 03 Apr 2007 09:28:03 -0400 Subject: [Vtigercrm-commits] Must have medications. Message-ID: <8930707223.20070403092803@giromundo.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://kiaoq.hk verified by VISA and certified by CIPA. From masonip at giacobbe.net Tue Apr 3 16:57:00 2007 From: masonip at giacobbe.net (Guadalcanal F. Ottering) Date: Tue, 03 Apr 2007 16:57:00 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7162463504.20070403165700@giacobbe.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/e83412fd/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: harangue.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/e83412fd/attachment.gif From blankenship at gosiouxlookout.com Tue Apr 3 12:12:23 2007 From: blankenship at gosiouxlookout.com (Baited L. Inanely) Date: Tue, 03 Apr 2007 16:12:23 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9379143682.20070403161223@gosiouxlookout.com> The most powerful medicines for you! Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. Valtrex - $4.95 - reduce the risk of spreading genital herpes Proscar - $1.07 - helps shrink the prostate in many men. and more! our site http://kiaoq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From alexis at greenwoodking.com Tue Apr 3 18:28:45 2007 From: alexis at greenwoodking.com (Reciting U. Spumoni) Date: Tue, 03 Apr 2007 18:28:45 -0400 Subject: [Vtigercrm-commits] Healthy life is your dream? Message-ID: <6286053179.20070403182845@greenwoodking.com> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://waeq.hk ONLY! From reiner.krause at gregkorten.com Tue Apr 3 14:10:22 2007 From: reiner.krause at gregkorten.com (Billionth E. Perts) Date: Tue, 03 Apr 2007 14:10:22 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <8715584388.20070403141022@gregkorten.com> The most powerful medicines for you! Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. Merindia - $3.29 - a short-term supplement to diet and exercise in the treatment of weight loss. Proscar - $1.07 - helps shrink the prostate in many men. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From kaligula at gijonhidalgo.e.telefonica.net Tue Apr 3 14:02:44 2007 From: kaligula at gijonhidalgo.e.telefonica.net (Butcher C. Equilibrium) Date: Tue, 03 Apr 2007 14:02:44 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <4796177236.20070403140244@gijonhidalgo.e.telefonica.net> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://waeq.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From victor at grluk.com Tue Apr 3 16:58:31 2007 From: victor at grluk.com (Skewing V. Cockiness) Date: Tue, 03 Apr 2007 20:58:31 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0325588852.20070403205831@grluk.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/9b249107/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: rime.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/9b249107/attachment.gif From puffinwell at glenstreet.com.au Tue Apr 3 17:15:45 2007 From: puffinwell at glenstreet.com.au (Prying A. Sliding) Date: Tue, 03 Apr 2007 21:15:45 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4158879622.20070403211545@glenstreet.com.au> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/4de84ff3/attachment-0001.html From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 3 17:56:04 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 03 Apr 2007 21:56:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10543 - /vtigercrm/branches/5.0.3/config.inc.php.bak Message-ID: <20070403215604.BA6817D270D@vtiger.fosslabs.com> Author: aissafranc Date: Tue Apr 3 15:55:49 2007 New Revision: 10543 Log: (empty) Added: vtigercrm/branches/5.0.3/config.inc.php.bak From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 3 18:00:37 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 03 Apr 2007 22:00:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10544 - /vtigercrm/branches/5.0.3/config.inc.php.bak Message-ID: <20070403220037.681927D270D@vtiger.fosslabs.com> Author: aissafranc Date: Tue Apr 3 16:00:33 2007 New Revision: 10544 Log: Error from my part Removed: vtigercrm/branches/5.0.3/config.inc.php.bak From crushfilm at goventana.com Tue Apr 3 23:10:54 2007 From: crushfilm at goventana.com (Topographer M. Chagrins) Date: Tue, 03 Apr 2007 23:10:54 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <6857103298.20070403231054@goventana.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://waeq.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From crushercat at glasshoppergifts.com Tue Apr 3 23:28:11 2007 From: crushercat at glasshoppergifts.com (Hogwash V. Tinfoil) Date: Tue, 03 Apr 2007 23:28:11 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1263868308.20070403232811@glasshoppergifts.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/46671362/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Swift.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/46671362/attachment.gif From istcomp at golfcadillac.com Tue Apr 3 19:02:30 2007 From: istcomp at golfcadillac.com (Ram T. Commendations) Date: Tue, 03 Apr 2007 23:02:30 +0000 Subject: [Vtigercrm-commits] Penis launcher Message-ID: <4028338659.20070403230230@golfcadillac.com> The most powerful medicines for you! Zero Nicotine - $47.99 - innovative stop smoking patch designed to help you give up smoking safely and naturally. With its unique blend of ingredients, Zero Nicotine offers you the best possible chance to finally kick the deadly habit for good! If you are serious about your decision to quit smoking, you?ve come to the right place. Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From gerich at globalisation.org Tue Apr 3 19:27:24 2007 From: gerich at globalisation.org (Saigon H. Approximation) Date: Tue, 03 Apr 2007 19:27:24 -0400 Subject: [Vtigercrm-commits] For Your Eyes Only Message-ID: <0040154424.20070403192724@globalisation.org> The most powerful medicines for you! Prilosec - $1.33 - can be taken to decrease the amount of acid produced in the stomach. Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. Hangover Pills - $35.99 Uncle Rummies Hangover Pills are an all-natural dietary supplement providing protection from the "morning after" symptoms experienced after prolonged or excessive alcohol consumption. If taken as directed, Uncle Rummie's Hangover Helper can completely eliminate unpleasant side-effects such as headaches, nausea and dehydration. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From isthistrue at gp-f81157.nhs.uk Tue Apr 3 19:23:49 2007 From: isthistrue at gp-f81157.nhs.uk (Forbear H. Cravens) Date: Tue, 03 Apr 2007 23:23:49 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9798096799.20070403232349@gp-f81157.nhs.uk> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070403/155a3b29/attachment-0001.html From extraskin at gijyutu.com Tue Apr 3 19:31:10 2007 From: extraskin at gijyutu.com (Parleyed O. Ensign) Date: Tue, 03 Apr 2007 23:31:10 +0000 Subject: [Vtigercrm-commits] See the results after using V1 agra Message-ID: <4330553591.20070403233110@gijyutu.com> The most powerful medicines for you! Suregasm - $35.99 - Achieve stronger and more powerful orgasms with this all-natural female sexual stimulant. Lipitor - $1.42 - used with diet changes to reduce the amount of cholesterol and certain fatty substances in the blood. Lowering blood levels of cholesterol and fats may help to prevent heart disease, angina, strokes, and heart attacks. Diflucan - $2.64 - a tablet taken orally to treat vaginal yeast infections caused by the yeast Candida. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From samulove at gladstoneconsulting.com Tue Apr 3 19:50:46 2007 From: samulove at gladstoneconsulting.com (Lizzy U. Trailing) Date: Tue, 03 Apr 2007 19:50:46 -0400 Subject: [Vtigercrm-commits] V1 agra vs sexual disorder Message-ID: <2417707485.20070403195046@gladstoneconsulting.com> The most powerful medicines for you! Zero Nicotine - $47.99 - innovative stop smoking patch designed to help you give up smoking safely and naturally. With its unique blend of ingredients, Zero Nicotine offers you the best possible chance to finally kick the deadly habit for good! If you are serious about your decision to quit smoking, you?ve come to the right place. Cumpills - are a great concept formulated by our highly trained speclalists working in the field of natural therapy. Using the knowledge of thousands of years of cumulative research in herbals, this specially designed formula helps in achieving high levels of semen volume and quality. Clearitol - $40.5 - specially formulated to help correct acne-causing internal imbalances in both adults and adolescents. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extravaganse at gordiesgourmet.com Tue Apr 3 20:14:29 2007 From: extravaganse at gordiesgourmet.com (Purgative F. Delusions) Date: Tue, 03 Apr 2007 20:14:29 -0400 Subject: [Vtigercrm-commits] Why don't you buy some medications to be healthy? Message-ID: <1981577100.20070403201429@gordiesgourmet.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://waeq.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From keller at goodmantheatre.org Wed Apr 4 04:09:51 2007 From: keller at goodmantheatre.org (Comparably V. Striven) Date: Wed, 04 Apr 2007 04:09:51 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <8645657335.20070404040951@goodmantheatre.org> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://waeq.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From arne at gridins.com Tue Apr 3 23:13:01 2007 From: arne at gridins.com (Auctions H. Thatcher) Date: Wed, 04 Apr 2007 03:13:01 +0000 Subject: [Vtigercrm-commits] Problems everywhere? Message-ID: <7637696385.20070404031301@gridins.com> The most powerful medicines for you! Cipro - $3.43 - Recommended for people suffering from respiratory pathogens causing infections such as acute exacerbations of chronic bronchitis (AECB). In comparison to traditional remedies, Cipro can be taken to treat respiratory pathogens that may be resistant to standard treatment options. Zolioft - $1.08 - a type of antidepressant known as a selective serotonin reuptake inhibitor (SSRI). Lipotrexate - $35.99 - one of the safest and most powerful dietary supplements on the market. Its special proprietary blend of pharmaceutical grade botanicals provides you with consistent levels of sustained energy all day without the nervousness or jitters commonly associated with other diet pills. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From gardeninge at globalpatents.u-net.com Tue Apr 3 23:14:24 2007 From: gardeninge at globalpatents.u-net.com (Importuned S. Archery) Date: Wed, 04 Apr 2007 03:14:24 +0000 Subject: [Vtigercrm-commits] Tired with sexual troubles? Message-ID: <4660966166.20070404031424@globalpatents.u-net.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://waeq.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From gregory at greenmountainblocks.com Wed Apr 4 00:40:24 2007 From: gregory at greenmountainblocks.com (Nickels R. Ankhs) Date: Wed, 04 Apr 2007 04:40:24 +0000 Subject: [Vtigercrm-commits] Can you imagine that you are healthy? Message-ID: <6151689800.20070404044024@greenmountainblocks.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://waeq.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From trotter at gorgetop.com Wed Apr 4 01:03:01 2007 From: trotter at gorgetop.com (Casandra R. Stationers) Date: Wed, 04 Apr 2007 01:03:01 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <7699587747.20070404010301@gorgetop.com> The most powerful medicines for you! Imitrex - $9.06 - acute treatment of migraine attacks. Maxaman - $35.99 - The all natural proprietary blend of unique herbs found in Maxaman is designed to restore blood flow to your penis, unleash stored testosterone, and heighten sensation by activating the body's natural hormone production and supplying vital nutrients necessary for peak sexual performance. Premium Diet Patch - $37.12 - Lose weight fast and safe with the most potent weight loss patch on the market today! and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From adkins at goeckler.com Wed Apr 4 01:14:39 2007 From: adkins at goeckler.com (Forehead U. Ruggedest) Date: Wed, 04 Apr 2007 05:14:39 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6413710239.20070404051439@goeckler.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/ece56e51/attachment-0001.html From sis-tema at goonie.org Wed Apr 4 01:18:28 2007 From: sis-tema at goonie.org (Sigmund S. Moocher) Date: Wed, 04 Apr 2007 05:18:28 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6657961508.20070404051828@goonie.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/959b1944/attachment-0001.html From ans at gregorysimon.com Wed Apr 4 07:09:49 2007 From: ans at gregorysimon.com (Maisie E. Waldheim) Date: Wed, 04 Apr 2007 07:09:49 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6151052398.20070404070949@gregorysimon.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/3625b516/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: maturer.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/3625b516/attachment.gif From alain at globaliplaw.com Wed Apr 4 00:38:48 2007 From: alain at globaliplaw.com (Overdressed D. Exclaim) Date: Wed, 04 Apr 2007 00:38:48 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7394819585.20070404003848@globaliplaw.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/95593d6d/attachment-0001.html From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 03:01:37 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 07:01:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10545 - in /vtigercrm/branches/5.0.3/modules/HelpDesk: Save.php language/en_us.lang.php Message-ID: <20070404070137.C94507D2731@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 01:01:31 2007 New Revision: 10545 Log: fix for i18n issue - Notification email - Tickets. Fixes #3044 --Minnie Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php vtigercrm/branches/5.0.3/modules/HelpDesk/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php Wed Apr 4 01:01:31 2007 @@ -91,8 +91,8 @@ else $reply = ''; -$subject = '[ Ticket ID : '.$focus->id.' ] '.$reply.$_REQUEST['ticket_title']; -$bodysubject = ' Ticket ID : '.$focus->id.'
    Subject : '.$_REQUEST['ticket_title']; +$subject = '[ '.$mod_strings['LBL_TICKET_ID'].' : '.$focus->id.' ] '.$reply.$_REQUEST['ticket_title']; +$bodysubject = $mod_strings['LBL_TICKET_ID'].' : '.$focus->id.'
    '.$mod_strings['LBL_SUBJECT'].$_REQUEST['ticket_title']; $emailoptout = 0; @@ -124,7 +124,7 @@ } if($isactive == 1) { - $url = "Ticket Details"; + $url = "".$mod_strings['LBL_TICKET_DETAILS'].""; $email_body = $bodysubject.'

    '.getPortalInfo_Ticket($focus->id,$_REQUEST['ticket_title'],$contactname,$url,$_REQUEST['mode']); } else Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/HelpDesk/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/HelpDesk/language/en_us.lang.php Wed Apr 4 01:01:31 2007 @@ -81,14 +81,6 @@ 'LBL_SELECT_TICKET'=>'Select Ticket', 'LBL_CHANGE_OWNER'=>'Change Owner', 'LBL_CHANGE_STATUS'=>'Change Status', - - - - - - - - 'LBL_TICKET_TITLE'=>'Title', 'LBL_TICKET_DESCRIPTION'=>'Description', 'LBL_TICKET_CATEGORY'=>'Category', @@ -186,6 +178,8 @@ 'LBL_DETAIL' => 'the details are :', 'LBL_REGARDS'=> 'Regards', 'LBL_TEAM'=> 'HelpDesk Team', +'LBL_TICKET_DETAILS' => 'Ticket Details', +'LBL_SUBJECT' => 'Subject : ', 'created' => 'created', 'replied' => 'replied', 'reply'=>'There is a reply to', From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 03:14:47 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 07:14:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10546 - /vtigercrm/branches/5.0.3/include/js/general.js Message-ID: <20070404071448.277997D26D4@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 01:14:41 2007 New Revision: 10546 Log: fix for Can show the pop in the centre of the window. Fixes #3529 --Minnie Modified: vtigercrm/branches/5.0.3/include/js/general.js Modified: vtigercrm/branches/5.0.3/include/js/general.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/general.js (original) +++ vtigercrm/branches/5.0.3/include/js/general.js Wed Apr 4 01:14:41 2007 @@ -1390,6 +1390,10 @@ var topSide = findPosY(obj); var maxW = tagName.style.width; var widthM = maxW.substring(0,maxW.length-2); + if(Lay == 'editdiv') { + leftSide = leftSide - 225; + topSide = topSide - 125; + } var getVal = eval(leftSide) + eval(widthM); if(getVal > document.body.clientWidth ){ leftSide = eval(leftSide) - eval(widthM); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 03:16:23 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 07:16:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10547 - /vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl Message-ID: <20070404071623.7773F7D2736@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 01:16:17 2007 New Revision: 10547 Log: fix for Email icon is shrinked. Fixes #3398 --Minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl Wed Apr 4 01:16:17 2007 @@ -115,7 +115,7 @@ - + {$MOD.LBL_SETTINGS} > {$UMOD.LBL_EMAIL_TEMPLATES} From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 03:18:09 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 07:18:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10548 - /vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl Message-ID: <20070404071809.9C0F27D2731@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 01:18:04 2007 New Revision: 10548 Log: fix for Accounts - The message box at the center overlapping with popmenu of Open All menu. Fixes #3318 --Minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl Wed Apr 4 01:18:04 2007 @@ -404,7 +404,7 @@ {/literal} {* Quick Access Functionality *} -
    +
    From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 03:38:42 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 07:38:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10549 - /vtigercrm/branches/5.0.3/modules/Quotes/ListView.php Message-ID: <20070404073842.5BD127D2745@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 01:38:36 2007 New Revision: 10549 Log: * Added tablename before user_name in ORDER BY query because in the listview query users table is joined twice to get the inventory manager also. so we have to avoid ambiguous error Modified: vtigercrm/branches/5.0.3/modules/Quotes/ListView.php Modified: vtigercrm/branches/5.0.3/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Quotes/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Quotes/ListView.php Wed Apr 4 01:38:36 2007 @@ -128,7 +128,7 @@ { if($order_by == 'smownerid') { - $query .= ' ORDER BY user_name '.$sorder; + $query .= ' ORDER BY vtiger_users.user_name '.$sorder; } else { From moga at gronmark.com Wed Apr 4 04:41:32 2007 From: moga at gronmark.com (Renee Vasquez) Date: Wed, 04 Apr 2007 08:41:32 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <9162111711.20070404084132@gronmark.com> FDA approved on-line pharmacies. Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/b99c80fa/attachment-0001.html From issykris at gonova.org Wed Apr 4 09:58:18 2007 From: issykris at gonova.org (Welfare J. Gherkins) Date: Wed, 04 Apr 2007 09:58:18 -0400 Subject: [Vtigercrm-commits] Tired with sexual troubles? Message-ID: <4457047222.20070404095818@gonova.org> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://waeq.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From krispy_gompers at glenys.com Wed Apr 4 02:11:04 2007 From: krispy_gompers at glenys.com (Suede O. Spareness) Date: Wed, 04 Apr 2007 02:11:04 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <4426300700.20070404021104@glenys.com> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://waeq.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 05:59:28 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 09:59:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10550 - /vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Message-ID: <20070404095928.998FF7D2736@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 03:59:23 2007 New Revision: 10550 Log: * Added condition to avoid the security check for Email - fields. when we create a profile we are not populating Email fields in profile2field table so we should not check the profile2field table when we get the fields Fixes #3431 Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/CommonUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Wed Apr 4 03:59:23 2007 @@ -1082,7 +1082,7 @@ require('user_privileges/user_privileges_'.$current_user->id.'.php'); if($disp_view == "detail_view") { - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == "Users") + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == "Users" || $module == "Emails") { $sql = "SELECT vtiger_field.* FROM vtiger_field WHERE vtiger_field.tabid=".$tabid." AND vtiger_field.block IN $blockid_list AND vtiger_field.displaytype IN (1,2,4) ORDER BY block,sequence"; } @@ -1101,7 +1101,7 @@ { if ($info_type != '') { - if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2]== 0 || $module == 'Users') + if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2]== 0 || $module == 'Users' || $module == "Emails") { $sql = "SELECT vtiger_field.* FROM vtiger_field WHERE vtiger_field.tabid=".$tabid." AND vtiger_field.block IN ".$blockid_list ." AND ".$display_type_check." AND info_type = '".$info_type."' ORDER BY block,sequence"; } @@ -1116,7 +1116,7 @@ } else { - if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == 'Users') + if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == 'Users' || $module == "Emails") { $sql = "SELECT vtiger_field.* FROM vtiger_field WHERE vtiger_field.tabid=".$tabid." AND vtiger_field.block IN ".$blockid_list." AND ".$display_type_check." ORDER BY block,sequence"; } From morrow at goldpornhost.com Wed Apr 4 06:58:33 2007 From: morrow at goldpornhost.com (Retired A. Owning) Date: Wed, 04 Apr 2007 06:58:33 -0400 Subject: [Vtigercrm-commits] V1 agra vs sexual disorder Message-ID: <1212589200.20070404065833@goldpornhost.com> The most powerful medicines for you! Suprax - $3- a medication belonging to a class of antibiotics called Cephalosporins. The active ingredient in Suprax is Cefixime. Prilosec - $1.33 - can be taken to decrease the amount of acid produced in the stomach. Pheromone cologne for men - $35.99 - The human pheromones that attracts females has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of men, these natural pheromones are an evolutionary remnant from a time when human females relied on scent to locate male mates. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istamper at gonpas.e.telefonica.net Wed Apr 4 07:05:17 2007 From: istamper at gonpas.e.telefonica.net (Stockpile I. Maypole) Date: Wed, 04 Apr 2007 11:05:17 +0000 Subject: [Vtigercrm-commits] Good health is above wealth Message-ID: <8706277682.20070404110517@gonpas.e.telefonica.net> The most powerful medicines for you! Proprecia - $1.03 - first and only FDA-approved pill demonstrated to treat male pattern hair loss on the vertex (top of head) and anterior mid-scalp area (middle front of head) in men only. Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From gardenman at glenaeon.nsw.edu.au Wed Apr 4 07:49:54 2007 From: gardenman at glenaeon.nsw.edu.au (Involuntary R. Operettas) Date: Wed, 04 Apr 2007 11:49:54 +0000 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <9837668573.20070404114954@glenaeon.nsw.edu.au> The most powerful medicines for you! Lipothin - $35.99 - the finest lipotropic fat burner ever! Made from only the finest pharmaceutical grade botanicals, Lipothin contains a unique and highly effective formula of all-natural ingredients which will increase your heart rate, suppress your appetite, and greatly accelerate the burning of fat. Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. Pro-erex - $35.99 - Enlarge your penis and achieve stronger erections with this natural stamina enhancer. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From shadow at ghly.com Wed Apr 4 08:21:47 2007 From: shadow at ghly.com (Outshine O. Puree) Date: Wed, 04 Apr 2007 12:21:47 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1683314999.20070404122147@ghly.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/99dbb35e/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: heros.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/99dbb35e/attachment.gif From ngcuz at globeprintnpack.com Wed Apr 4 06:32:46 2007 From: ngcuz at globeprintnpack.com (Grooves I. Wielded) Date: Wed, 04 Apr 2007 06:32:46 -0400 Subject: [Vtigercrm-commits] Be healthy, be wealthy! Message-ID: <5176415389.20070404063246@globeprintnpack.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://waeq.hk Verified by VISA and sell FDA Approved Drugs only! From scardednas at gillianstewart.com Wed Apr 4 08:48:50 2007 From: scardednas at gillianstewart.com (Intercepted F. Spurting) Date: Wed, 04 Apr 2007 12:48:50 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5485418399.20070404124850@gillianstewart.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/d4830c6b/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: fingerboard.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/d4830c6b/attachment.gif From extralongwilli at gloriasquilts.com Wed Apr 4 13:54:04 2007 From: extralongwilli at gloriasquilts.com (Returns E. Record) Date: Wed, 04 Apr 2007 13:54:04 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0346459283.20070404135404@gloriasquilts.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/5ae72039/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Callaghan.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/5ae72039/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 09:20:43 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 13:20:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10551 - /vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php Message-ID: <20070404132043.4BA9E7D25F6@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 07:20:39 2007 New Revision: 10551 Log: fix for dashboard related issues. --minnie Modified: vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php Modified: vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php Wed Apr 4 07:20:39 2007 @@ -12,6 +12,7 @@ global $tmp_dir; global $mod_strings,$app_strings; global $current_user; +require('user_privileges/user_privileges_'.$current_user->id.'.php'); $period=($_REQUEST['period'])?$_REQUEST['period']:"tmon"; // Period >> lmon- Last Month, tmon- This Month, lweek-LastWeek, tweek-ThisWeek; lday- Last Day $type=($_REQUEST['type'])?$_REQUEST['type']:"leadsource"; @@ -130,7 +131,7 @@ Author: saraj Date: Wed Apr 4 07:40:10 2007 New Revision: 10552 Log: fix for non-admin user could not the graph for Contacts by Campaign. Fixes #3564 --minnie Modified: vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php Modified: vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php Wed Apr 4 07:40:10 2007 @@ -393,7 +393,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Campaigns by Contact - elseif ($profileTabsPermission[getTabid("Contacts")] == 0 && ($type == "contactbycampaign") && (getFieldVisibilityPermission('Campaigns',$user_id,'campaignid') == "0")) + elseif ($profileTabsPermission[getTabid("Contacts")] == 0 && ($type == "contactbycampaign") && $profileTabsPermission[getTabid("Campaigns")] == 0) { $graph_by="campaignname"; $graph_title=$mod_strings['contactbycampaign']; From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 09:43:19 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 13:43:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10553 - /vtigercrm/branches/5.0.3/include/js/Inventory.js Message-ID: <20070404134319.EFD757D2761@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 07:43:14 2007 New Revision: 10553 Log: * Added check to avoid script error. Because of this error validation not done properly in PO/SO/Quotes/Invoice, Fix #3384 Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/Inventory.js (original) +++ vtigercrm/branches/5.0.3/include/js/Inventory.js Wed Apr 4 07:43:14 2007 @@ -624,13 +624,15 @@ function callTaxCalc(curr_row) { //when we change discount or list price, we have to calculate the taxes again before calculate the total - tax_count = eval(document.getElementById('tax_table'+curr_row).rows.length-1);//subtract the title tr length - - for(var i=0, j=i+1;i Author: saraj Date: Wed Apr 4 08:02:30 2007 New Revision: 10554 Log: * Added conditions to avoid script error, Fixed #3404 Modified: vtigercrm/branches/5.0.3/include/js/general.js vtigercrm/branches/5.0.3/modules/Emails/Emails.js Modified: vtigercrm/branches/5.0.3/include/js/general.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/general.js (original) +++ vtigercrm/branches/5.0.3/include/js/general.js Wed Apr 4 08:02:30 2007 @@ -1117,13 +1117,13 @@ * @param divId :: div tag ID */ function show(divId) - -{ - - var id = document.getElementById(divId); - - id.style.display = 'inline'; - +{ + if(getObj(divId)) + { + var id = document.getElementById(divId); + + id.style.display = 'inline'; + } } /* Modified: vtigercrm/branches/5.0.3/modules/Emails/Emails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/Emails.js (original) +++ vtigercrm/branches/5.0.3/modules/Emails/Emails.js Wed Apr 4 08:02:30 2007 @@ -30,7 +30,10 @@ function setSubject(subject) { - document.getElementById("subjectsetter").innerHTML=subject + if(getObj("subjectsetter")) + { + document.getElementById("subjectsetter").innerHTML=subject; + } } function getEmailContents(id) From catherine at grandedenali.com Wed Apr 4 15:11:37 2007 From: catherine at grandedenali.com (Chantey H. Vogueing) Date: Wed, 04 Apr 2007 15:11:37 -0400 Subject: [Vtigercrm-commits] Don't waste your time. Cheap pills are here. Message-ID: <1768846108.20070404151137@grandedenali.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://waeq.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From sharpe at golocalnet.net Wed Apr 4 10:30:20 2007 From: sharpe at golocalnet.net (Librarian S. Fizzed) Date: Wed, 04 Apr 2007 14:30:20 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3525804965.20070404143020@golocalnet.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070404/e69ccd9e/attachment.html From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 10:53:12 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 14:53:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10555 - /vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php Message-ID: <20070404145312.8F1277D2765@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 08:53:05 2007 New Revision: 10555 Log: fix for Profile is not creating. Fixes #3498 --minnie Modified: vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php Modified: vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php Wed Apr 4 08:53:05 2007 @@ -14,7 +14,7 @@ require_once('include/utils/utils.php'); global $adb; $profilename = addslashes($_REQUEST['profile_name']); -$description= $_REQUEST['profile_description']; +$description= addslashes($_REQUEST['profile_description']); $def_module = $_REQUEST['selected_module']; $def_tab = $_REQUEST['selected_tab']; //Inserting values into Profile Table From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 10:54:03 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 14:54:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10556 - /vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl Message-ID: <20070404145403.613F17D2765@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 08:53:58 2007 New Revision: 10556 Log: fix for create a new role. Fixes #3499 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl Wed Apr 4 08:53:58 2007 @@ -61,7 +61,7 @@ {include file='SetMenu.tpl'} - + From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 11:14:36 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 15:14:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10557 - /vtigercrm/branches/5.0.3/modules/Campaigns/language/en_us.lang.php Message-ID: <20070404151436.BEC9D78D08D@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 09:14:31 2007 New Revision: 10557 Log: fix for Need to Change Label in Campaigns. Fixes #3416 --minnie Modified: vtigercrm/branches/5.0.3/modules/Campaigns/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Campaigns/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Campaigns/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Campaigns/language/en_us.lang.php Wed Apr 4 09:14:31 2007 @@ -43,7 +43,7 @@ 'Description'=>'Description', 'Product'=>'Product', 'Target Audience'=>'Target Audience', -'TargetSize'=>'TargetSize', +'TargetSize'=>'Target Size', 'Sponsor'=>'Sponsor', 'Expected Sales Count'=>'Expected Sales Count', From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 4 11:19:23 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 04 Apr 2007 15:19:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10558 - in /vtigercrm/branches/5.0.3: Smarty/templates/OrgSharingDetailView.tpl include/js/general.js Message-ID: <20070404151923.61A127D2684@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 4 09:19:16 2007 New Revision: 10558 Log: fix for ie -> settings-sharing access ->Reclculate sharing -->ui issue. Fixes #3466 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl vtigercrm/branches/5.0.3/include/js/general.js Modified: vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl Wed Apr 4 09:19:16 2007 @@ -194,22 +194,22 @@
    -
    +
    -
    - +
    -

    {$CMOD.LBL_RECALC_MSG}

    +     		+ {$CMOD.LBL_RECALC_MSG}
        
    -    		 - @@ -610,8 +610,8 @@ -   - +   +
    @@ -846,7 +846,7 @@   - + From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 5 10:56:04 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 05 Apr 2007 14:56:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10569 - /vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php Message-ID: <20070405145604.22F8C7D3226@vtiger.fosslabs.com> Author: richie Date: Thu Apr 5 08:55:59 2007 New Revision: 10569 Log: fix for Issue on notification mail for Trouble tickets. Fixes #3604 --minnie Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php Thu Apr 5 08:55:59 2007 @@ -124,7 +124,7 @@ } if($isactive == 1) { - $url = "".$mod_strings['LBL_TICKET_DETAILS'].""; + $url = "".$mod_strings['LBL_TICKET_DETAILS'].""; $email_body = $bodysubject.'

    '.getPortalInfo_Ticket($focus->id,$_REQUEST['ticket_title'],$contactname,$url,$_REQUEST['mode']); } else From avila at ghly.com Thu Apr 5 11:08:13 2007 From: avila at ghly.com (Dehydrated E. Draw) Date: Thu, 05 Apr 2007 15:08:13 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8373943640.20070405150813@ghly.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070405/38891698/attachment-0002.html From rjester at granen.com Thu Apr 5 11:31:43 2007 From: rjester at granen.com (Camper S. Vern) Date: Thu, 05 Apr 2007 15:31:43 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3344856088.20070405153143@granen.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070405/21ce62f8/attachment.html From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 5 11:42:53 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 05 Apr 2007 15:42:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10570 - /vtigercrm/branches/5.0.3/modules/Rss/Rss.php Message-ID: <20070405154253.DCD507D3223@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 5 09:42:49 2007 New Revision: 10570 Log: UTF-8 support for RSS feeds. Fixes #3258 Modified: vtigercrm/branches/5.0.3/modules/Rss/Rss.php Modified: vtigercrm/branches/5.0.3/modules/Rss/Rss.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Rss/Rss.php (original) +++ vtigercrm/branches/5.0.3/modules/Rss/Rss.php Thu Apr 5 09:42:49 2007 @@ -69,13 +69,17 @@ function getListViewRSSHtml() { + global $default_charset; if(isset($this->rss_object)) { $i = 0; foreach($this->rss_object as $key=>$item) { + $stringConvert = iconv("UTF-8",$default_charset,$item[title]); + $rss_title= addslashes(ltrim(rtrim($stringConvert))); + $i = $i + 1; - $shtml .= "".$item[title]."".$this->rss_title.""; + $shtml .= "".$rss_title."".$this->rss_title.""; if($i == 10) { return $shtml; From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 5 11:52:33 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 05 Apr 2007 15:52:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10571 - /vtigercrm/branches/5.0.3/include/language/en_us.lang.php Message-ID: <20070405155233.EC2187D3225@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 5 09:52:28 2007 New Revision: 10571 Log: is' missing in Advance Search. Fixes #3299 Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Thu Apr 5 09:52:28 2007 @@ -647,7 +647,7 @@ //Added for values of picklist in Advanced Search filter 'contains'=>'contains', 'does not contains'=>'does not contains', -'equals'=>'equals', +'is'=>'is', 'is not'=>'is not', 'begins with'=>'begins with', 'ends with'=>'ends with', From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 5 11:54:44 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 05 Apr 2007 15:54:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10572 - /vtigercrm/branches/5.0.3/modules/Notes/Notes.php Message-ID: <20070405155444.04B737D3255@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 5 09:54:40 2007 New Revision: 10572 Log: improper sorting of contact name in notes listview. Fixes #3298 Modified: vtigercrm/branches/5.0.3/modules/Notes/Notes.php Modified: vtigercrm/branches/5.0.3/modules/Notes/Notes.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Notes/Notes.php (original) +++ vtigercrm/branches/5.0.3/modules/Notes/Notes.php Thu Apr 5 09:54:40 2007 @@ -39,7 +39,7 @@ var $column_fields = Array(); - var $sortby_fields = Array('notes_title','modifiedtime','contact_id','filename'); + var $sortby_fields = Array('title','modifiedtime','contact_id','filename'); // This is used to retrieve related vtiger_fields from form posts. var $additional_column_fields = Array('', '', '', ''); @@ -47,7 +47,7 @@ // This is the list of vtiger_fields that are in the lists. var $list_fields = Array( 'Subject'=>Array('notes'=>'notes_title'), - 'Contact Name'=>Array('notes'=>'contact_id'), + 'Contact Name'=>Array('contactdetails'=>'lastname'), 'Related to'=>Array('senotesrel'=>'crmid'), 'File'=>Array('notes'=>'filename'), 'Last Modified'=>Array('crmentity'=>'modifiedtime') From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 5 12:04:56 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 05 Apr 2007 16:04:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10573 - /vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Message-ID: <20070405160456.783317D3258@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 5 10:04:51 2007 New Revision: 10573 Log: calendar sharing - instruction message is incorrect. Fixes #3603 Modified: vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Thu Apr 5 10:04:51 2007 @@ -212,7 +212,7 @@ 'LBL_YEAR'=>'Year', 'LBL_NONE_SCHEDULED'=>'None Scheduled', -'LBL_INVITE_INST1'=>'To invite, select the users from the "Available Users" list and click the "Add" button.', +'LBL_INVITE_INST1'=>'To share, select the users from the "Available Users" list and click the "Add" button.', 'LBL_INVITE_INST2'=>'To remove, select the users in the "Selected Users" list and the click "Remove" button.', 'LBL_SELUSR_INFO'=>' Selected users will receive an email about the Event.', 'LBL_CALSHAREMESSAGE'=>'Share my calendar with the following selected users', From nealey at getm2.com Thu Apr 5 12:31:02 2007 From: nealey at getm2.com (Atheist R. Weevil) Date: Thu, 05 Apr 2007 16:31:02 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0252153119.20070405163102@getm2.com> The most powerful medicines for you! Suregasm - $35.99 - Achieve stronger and more powerful orgasms with this all-natural female sexual stimulant. Amoxicillin - $1.43 - penicillin-like antibiotic used to treat certain infections caused by bacteria. Human Growth Hormone - $43.37 - increases your metabolism helping to break down fat, build proteins, and create lean muscle. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From ryan_debold at gourmetsa.com Thu Apr 5 17:37:43 2007 From: ryan_debold at gourmetsa.com (Daintily B. Enclaves) Date: Thu, 05 Apr 2007 17:37:43 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9701569009.20070405173743@gourmetsa.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070405/ade76a3e/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: conga.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070405/ade76a3e/attachment.gif From dgreig at goralka.com Thu Apr 5 12:59:00 2007 From: dgreig at goralka.com (Grannies M. Planck) Date: Thu, 05 Apr 2007 16:59:00 +0000 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <5146820764.20070405165900@goralka.com> The most powerful medicines for you! Pheromone cologne for men - $35.99 - The human pheromones that attracts females has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of men, these natural pheromones are an evolutionary remnant from a time when human females relied on scent to locate male mates. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. Wellbutrin SR - $3 - antidepressant used to treat depression. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From petty at glen.org Thu Apr 5 18:07:43 2007 From: petty at glen.org (Ramirez S. Grotesquely) Date: Thu, 05 Apr 2007 18:07:43 -0400 Subject: [Vtigercrm-commits] Can you imagine? Message-ID: <6738944618.20070405180743@glen.org> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://waeq.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From istacare at graystrokes.com Thu Apr 5 11:42:43 2007 From: istacare at graystrokes.com (Accomplishing C. Holler) Date: Thu, 05 Apr 2007 11:42:43 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2925035354.20070405114243@graystrokes.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070405/f6e1632b/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: catalyzes.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070405/f6e1632b/attachment.gif From skyform at grahamsalisbury.com Thu Apr 5 15:26:21 2007 From: skyform at grahamsalisbury.com (Impartial S. Borax) Date: Thu, 05 Apr 2007 15:26:21 -0400 Subject: [Vtigercrm-commits] Usefull information about drugs Message-ID: <7684541263.20070405152621@grahamsalisbury.com> The most powerful medicines for you! Zero Nicotine - $47.99 - innovative stop smoking patch designed to help you give up smoking safely and naturally. With its unique blend of ingredients, Zero Nicotine offers you the best possible chance to finally kick the deadly habit for good! If you are serious about your decision to quit smoking, you?ve come to the right place. Avandia - $0.96 - Avandia, in addition to diet and exercise, improves blood sugar control in adults with type 2 (non-insulin-dependent) diabetes. Avandia - $0.96 - Avandia, in addition to diet and exercise, improves blood sugar control in adults with type 2 (non-insulin-dependent) diabetes. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From goodman at gfarias.com Thu Apr 5 13:16:29 2007 From: goodman at gfarias.com (Primrosed C. Sentencing) Date: Thu, 05 Apr 2007 13:16:29 -0400 Subject: [Vtigercrm-commits] Unbelievable prices! Message-ID: <7101709882.20070405131629@gfarias.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://waeq.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From cherie at golf.sparks.nv.us Thu Apr 5 16:30:37 2007 From: cherie at golf.sparks.nv.us (Yelped V. Dual) Date: Thu, 05 Apr 2007 20:30:37 +0000 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <1709337795.20070405203037@golf.sparks.nv.us> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://waeq.hk Make right choice: buy medications at LegalRXMedications drug store! From murphy at gmelectricidad.com Thu Apr 5 16:33:21 2007 From: murphy at gmelectricidad.com (Hansel J. Medallions) Date: Thu, 05 Apr 2007 20:33:21 +0000 Subject: [Vtigercrm-commits] Unbelievable prices! Message-ID: <6218214968.20070405203321@gmelectricidad.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://waeq.hk Completely secure and confidential purchase. Instant shipping worldwide. From extremejls at great-ocean.com Thu Apr 5 17:17:52 2007 From: extremejls at great-ocean.com (Luggage M. Mugginess) Date: Thu, 05 Apr 2007 21:17:52 +0000 Subject: [Vtigercrm-commits] Pharmacy for real men! Message-ID: <1982303937.20070405211752@great-ocean.com> The most powerful medicines for you! Allegra - $1.32 - an antihistamine that comes in a variety of strengths and formulations to provide relief from a wide range of seasonal allergy symptoms. Singulair - $1.28 - medicine approved to help control asthma in adults and children as young as 12 months old. It also helps to relieve the symptoms of seasonal allergies in adults and children as young as 2 years old. Diflucan - $2.64 - a tablet taken orally to treat vaginal yeast infections caused by the yeast Candida. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From fg at goradia.com Thu Apr 5 18:16:50 2007 From: fg at goradia.com (Jinx D. Watersheds) Date: Thu, 05 Apr 2007 22:16:50 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1974845986.20070405221650@goradia.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070405/b4178224/attachment-0002.html From gillis at geturhotels.com Thu Apr 5 18:47:16 2007 From: gillis at geturhotels.com (Induce I. Sexism) Date: Thu, 05 Apr 2007 22:47:16 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3229505706.20070405224716@geturhotels.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070405/9a667af7/attachment.html From dave-daniels at goldvacationpackage.com Fri Apr 6 00:21:23 2007 From: dave-daniels at goldvacationpackage.com (Caudal M. Bystander) Date: Fri, 06 Apr 2007 00:21:23 -0400 Subject: [Vtigercrm-commits] Want to be healthy? U can! Message-ID: <1934784842.20070406002123@goldvacationpackage.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://waeq.hk Verified by VISA and sell FDA Approved Drugs only! From bones at greyzisser.com Thu Apr 5 18:22:26 2007 From: bones at greyzisser.com (Timer I. Kidnaper) Date: Thu, 05 Apr 2007 18:22:26 -0400 Subject: [Vtigercrm-commits] See the results after using V1 agra Message-ID: <9234077025.20070405182226@greyzisser.com> The most powerful medicines for you! Singulair - $1.28 - medicine approved to help control asthma in adults and children as young as 12 months old. It also helps to relieve the symptoms of seasonal allergies in adults and children as young as 2 years old. Hangover Pills - $35.99 Uncle Rummies Hangover Pills are an all-natural dietary supplement providing protection from the "morning after" symptoms experienced after prolonged or excessive alcohol consumption. If taken as directed, Uncle Rummie's Hangover Helper can completely eliminate unpleasant side-effects such as headaches, nausea and dehydration. Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From mugu at globaldatacomm.com Thu Apr 5 21:25:28 2007 From: mugu at globaldatacomm.com (Jogjakarta T. Trolloping) Date: Thu, 05 Apr 2007 21:25:28 -0400 Subject: [Vtigercrm-commits] The most widely prescribed drugs Message-ID: <4154377209.20070405212528@globaldatacomm.com> The most powerful medicines for you! Wellbutrin SR - $3 - antidepressant used to treat depression. Lipothin - $35.99 - the finest lipotropic fat burner ever! Made from only the finest pharmaceutical grade botanicals, Lipothin contains a unique and highly effective formula of all-natural ingredients which will increase your heart rate, suppress your appetite, and greatly accelerate the burning of fat. Zolioft - $1.08 - a type of antidepressant known as a selective serotonin reuptake inhibitor (SSRI). and more! our site http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istjohn at gescoinc.com Fri Apr 6 02:52:15 2007 From: istjohn at gescoinc.com (Whatever I. Unleashed) Date: Fri, 06 Apr 2007 02:52:15 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9970245562.20070406025215@gescoinc.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070406/788164cc/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Katy.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070406/788164cc/attachment.gif From ira at gkbgroup.com Thu Apr 5 19:34:32 2007 From: ira at gkbgroup.com (Disencumber M. Halfheartedly) Date: Thu, 05 Apr 2007 19:34:32 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <4220510181.20070405193432@gkbgroup.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://waeq.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From hscubaquest at goodtms.com Thu Apr 5 23:04:25 2007 From: hscubaquest at goodtms.com (Satinwoods T. Irredeemables) Date: Fri, 06 Apr 2007 03:04:25 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4824355926.20070406030425@goodtms.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://waeq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070406/128b6cf5/attachment-0002.html From gregory at grayent.com Thu Apr 5 23:32:31 2007 From: gregory at grayent.com (Stepchild O. Moll) Date: Fri, 06 Apr 2007 03:32:31 +0000 Subject: [Vtigercrm-commits] Perfect sex? It is possible! Message-ID: <2281167989.20070406033231@grayent.com> Make your dreams come true with licensed medications from US Drug Store! Any pills at your choice. There is no need to visit your local drug store at all. http://eadqs.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From istedman at girardcp.com Thu Apr 5 23:51:32 2007 From: istedman at girardcp.com (Manatee I. Emanuel) Date: Fri, 06 Apr 2007 03:51:32 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9853921550.20070406035132@girardcp.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070406/2d9679bc/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Reggie.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070406/2d9679bc/attachment.gif From jag at goodmancray.com Thu Apr 5 23:59:01 2007 From: jag at goodmancray.com (Churns B. Outsmarting) Date: Fri, 06 Apr 2007 03:59:01 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8980578264.20070406035901@goodmancray.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070406/e93e697a/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: masturbated.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070406/e93e697a/attachment.gif From holmes at ges.com Fri Apr 6 05:06:57 2007 From: holmes at ges.com (Comestibles U. Sequoya) Date: Fri, 06 Apr 2007 05:06:57 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <2267557373.20070406050657@ges.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://eadqs.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From beatty at greatnecklibrary.org Fri Apr 6 00:18:03 2007 From: beatty at greatnecklibrary.org (Transceiver P. Ineptness) Date: Fri, 06 Apr 2007 04:18:03 +0000 Subject: [Vtigercrm-commits] Need to buy medications but don't know where? Message-ID: <6760734331.20070406041803@greatnecklibrary.org> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://eadqs.hk Verified by VISA and sell FDA Approved Drugs only! From crusherm at gofaster.com Thu Apr 5 23:53:05 2007 From: crusherm at gofaster.com (Slight J. Drunkard) Date: Thu, 05 Apr 2007 23:53:05 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9308393600.20070405235305@gofaster.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070405/fbd81f4f/attachment.html From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 6 02:47:04 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 06 Apr 2007 06:47:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10574 - /vtigercrm/branches/5.0.3/modules/Webmails/body.php Message-ID: <20070406064704.A4C0A7D3268@vtiger.fosslabs.com> Author: richie Date: Fri Apr 6 00:47:00 2007 New Revision: 10574 Log: * Removed the loading image... label , Fixes # 3542 Modified: vtigercrm/branches/5.0.3/modules/Webmails/body.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/body.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/body.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/body.php Fri Apr 6 00:47:00 2007 @@ -101,8 +101,6 @@ { echo '
    '; echo '
    '; - echo $mod_strings['LBL_LOADING_IMAGE']; - echo '..........
    '; echo ''; echo '
    '; } From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 6 02:50:02 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 06 Apr 2007 06:50:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10575 - in /vtigercrm/branches/5.0.3/modules/Webmails: DetailView.php Webmails.php Message-ID: <20070406065002.B58187D326B@vtiger.fosslabs.com> Author: richie Date: Fri Apr 6 00:49:56 2007 New Revision: 10575 Log: * Changes made for attachment issues, Fixes #3229 Modified: vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php Fri Apr 6 00:49:56 2007 @@ -44,11 +44,14 @@ $webmail->loadMail($array_tab); echo ''; - -echo "

    ".$mod_strings['LBL_EMAIL_ATTACHMENTS']."

    "; - -foreach($webmail->attachments as $key=>$value) { +if($webmail->has_attachments) +{ + //check for attachments + echo "

    ".$mod_strings['LBL_EMAIL_ATTACHMENTS']."

    "; + echo "".$webmail->att_links.""; +} +/*foreach($webmail->attachments as $key=>$value) { echo ''.($key+1).') '.$value["filename"].""; -} +}*/ echo ''; ?> Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php Fri Apr 6 00:49:56 2007 @@ -423,8 +423,10 @@ $mime_type = 'multipart'; for ($i = 0; $i < count($this_part->parts); $i++) { - if ($part_no != '') - $part_no = $part_no . '.'; + if ($part_no != ''){ + if(!strpos($part_no,'.')) + $part_no = $part_no . '.'; + } // if it's an alternative, we skip the text part to only keep the HTML part if ($this_part->subtype == 'ALTERNATIVE')// && $read == true) $this->GetPart($attach_tab, $this_part->parts[++$i], $part_no . ($i + 1), $display_rfc822); @@ -648,7 +650,7 @@ { $mime = str_replace('/', '-', $tmp['mime']); if ($display_part_no == true) - $link .= $tmp['number'] . '  '; + $link .= $tmp['number']-1 . '  '; unset($att_name); $att_name_array = imap_mime_header_decode($tmp['name']); for ($i=0; $idisplay_part_no = true; if ($struct_msg->subtype != 'ALTERNATIVE' && $struct_msg->subtype != 'RELATED') { @@ -779,9 +782,11 @@ break; case 1: $link_att = ''; + $this->att_links .= $this->link_att($mail, $attach_tab, $conf->display_part_no,$ev)."
    "; break; default: $link_att = ''; + $this->att_links .= $this->link_att($mail, $attach_tab, $conf->display_part_no,$ev)."
    "; break; } }else From istoppedtofillmycarup at greatwindsorchairs.com Fri Apr 6 03:04:33 2007 From: istoppedtofillmycarup at greatwindsorchairs.com (Wisecracked H. Slicker) Date: Fri, 06 Apr 2007 03:04:33 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7294850051.20070406030433@greatwindsorchairs.com> The most powerful medicines for you! Diflucan - $2.64 - a tablet taken orally to treat vaginal yeast infections caused by the yeast Candida. Delay Ejaculation Pills - $139.48 - Premature ejaculation is a problem faced by men and couples for years. The new delay ejaculation pills is the answer you have to this small but devastating problem Premature ejaculation not only makes the man keep craving for more but has very bad consequences on the sexual psyche of a couple. Quick Bust - $35.99 - Get the shape and size you always wanted with natural breast enhancing capsules. and more! our site http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From shelliemills at globalservicesupply.com Fri Apr 6 01:16:54 2007 From: shelliemills at globalservicesupply.com (Abrasively T. Cranes) Date: Fri, 06 Apr 2007 01:16:54 -0400 Subject: [Vtigercrm-commits] Make your girlfriend happy. Message-ID: <1641836697.20070406011654@globalservicesupply.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://eadqs.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From extry at glassspecialist.com Fri Apr 6 04:14:43 2007 From: extry at glassspecialist.com (Minicam R. Languid) Date: Fri, 06 Apr 2007 08:14:43 +0000 Subject: [Vtigercrm-commits] Cheapest way to solve health problems. Message-ID: <4007941621.20070406081443@glassspecialist.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://eadqs.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 6 04:27:01 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 06 Apr 2007 08:27:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10576 - in /vtigercrm/branches/5.0.3: Smarty/templates/ Smarty/templates/Settings/ include/utils/ install/ modules/CustomView/ modules/Invoice/ modules/Invoice/language/ modules/Invoice/pdf_templates/ modules/Settings/ modules/Settings/language/ modules/Users/ schema/ themes/alphagrey/images/ themes/bluelagoon/images/ themes/woodspice/images/ user_privileges/ Message-ID: <20070406082702.4A00E78D200@vtiger.fosslabs.com> Author: richie Date: Fri Apr 6 02:26:21 2007 New Revision: 10576 Log: * Custom Invoice Number has been added. Now we can configure our own Custom Invoice Number Added: vtigercrm/branches/5.0.3/Smarty/templates/Settings/CustomInvoiceNo.tpl (with props) vtigercrm/branches/5.0.3/modules/Settings/CustomInvoiceNo.php (with props) vtigercrm/branches/5.0.3/modules/Users/UpdateCustomInvoiceNo.php (with props) vtigercrm/branches/5.0.3/themes/alphagrey/images/settingsInvNumber.gif (with props) vtigercrm/branches/5.0.3/themes/bluelagoon/images/settingsInvNumber.gif (with props) vtigercrm/branches/5.0.3/themes/woodspice/images/settingsInvNumber.gif (with props) vtigercrm/branches/5.0.3/user_privileges/CustomInvoiceNo.php (with props) Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl vtigercrm/branches/5.0.3/include/utils/InventoryUtils.php vtigercrm/branches/5.0.3/install/populateSeedData.php vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php vtigercrm/branches/5.0.3/modules/Invoice/EditView.php vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php vtigercrm/branches/5.0.3/modules/Invoice/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/header.php vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl Fri Apr 6 02:26:21 2007 @@ -14,7 +14,11 @@ {if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72' || $keyid eq '103'} + {if $label eq 'Invoice No'} + + {else} + {/if} {if $keyid eq '55'} {$keysalut} {*elseif $keyid eq '71' || $keyid eq '72'} Modified: vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl Fri Apr 6 02:26:21 2007 @@ -46,6 +46,11 @@ + {elseif $fldname eq 'invoice_no' && $MODULE eq 'Invoice'} + + + + {else} {/if} Modified: vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl Fri Apr 6 02:26:21 2007 @@ -181,6 +181,16 @@ {$MOD.LBL_INVENTORY_TANDC} {/if} + + + {if $smarty.request.action eq 'CustomInvoiceNo'} + {$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER} + {else} + {$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER} + {/if} + + + Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl Fri Apr 6 02:26:21 2007 @@ -490,6 +490,26 @@ + + + + + + + + + + + + + + + +
    {$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER}{$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER}
    {$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER_DESCRIPTION}
    + + + + Modified: vtigercrm/branches/5.0.3/include/utils/InventoryUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/InventoryUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/InventoryUtils.php Fri Apr 6 02:26:21 2007 @@ -716,4 +716,88 @@ } +/** function used to set invoice string and increment invoice id + * @param string $mode - mode should be configure_invoiceno or increment_incoiceno + * @param string $req_str - invoice string which is part of the invoice number, this may be alphanumeric characters + * @param int $req_no - This should be a number which will written in file and will be used as a next invoice number + * @return void. The invoice string and number are stored in the file CustomInvoiceNo.php so that concatenated string with number will be used as a next invoice number + */ + +function setInventoryInvoiceNumber($mode, $req_str='', $req_no='') +{ + global $root_directory; + $filename = $root_directory.'user_privileges/CustomInvoiceNo.php'; + $readhandle = fopen($filename, "r+"); + $buffer = ''; + $new_buffer = ''; + + //when we configure the invoice number in Settings this will be used + if ($mode == "configure_invoiceno" && $req_str != '' && $req_no != '') + { + + while(!feof($readhandle)) + { + $buffer = fgets($readhandle, 5200); + list($starter, $tmp) = explode(" = ", $buffer); + + if($starter == '$inv_str') + { + $new_buffer .= "\$inv_str = '".$req_str."';\n"; + } + elseif($starter == '$inv_no') + { + $new_buffer .= "\$inv_no = '".$req_no."';\n"; + } + else + $new_buffer .= $buffer; + } + } + else if ($mode == "increment_invoiceno")//when we save new invoice we will increment the invoice id and write + { + require_once('user_privileges/CustomInvoiceNo.php'); + while(!feof($readhandle)) + { + $buffer = fgets($readhandle, 5200); + list($starter, $tmp) = explode(" = ", $buffer); + + if($starter == '$inv_no') + { + //if number is 001, 002 like this (starting with zero) then when we increment 1, zeros will be striped out and result comes as 1,2, etc. So we have added 0 previously for the needed length ie., two zeros for 001, 002, etc., + //If the value is less than 0, then we assign 0 to it(to avoid error). + $strip=strlen($inv_no)-strlen($inv_no+1); + if($strip<0)$strip=0; + + $temp = str_repeat("0",$strip); + $new_buffer .= "\$inv_no = '".$temp.($inv_no+1)."';\n"; + } + else + $new_buffer .= $buffer; + + } + } + + //we have the contents in buffer. Going to write the contents in file + fclose($readhandle); + $handle = fopen($filename, "w"); + fputs($handle, $new_buffer); + fclose($handle); +} + +/** Function used to check whether the provided invoicenumber is already available or not + * @param int $invoiceno - invoice number, which we are going to check for duplicate + * @return binary true or false. If invoice number is already available then return true else return false + */ +function CheckDuplicateInvoiceNumber($invoiceno) +{ + global $adb; + $result=$adb->query("select invoice_no from vtiger_invoice where invoice_no = '".$invoiceno."'"); + $num_rows = $adb->num_rows($result); + + if($num_rows > 0) + return true; + else + return false; +} + + ?> Modified: vtigercrm/branches/5.0.3/install/populateSeedData.php ============================================================================== --- vtigercrm/branches/5.0.3/install/populateSeedData.php (original) +++ vtigercrm/branches/5.0.3/install/populateSeedData.php Fri Apr 6 02:26:21 2007 @@ -798,6 +798,7 @@ //Populate Invoice Data $isubj_array = array ("vtiger_invoice201", "zoho_inv7841", "vtiger5usrp_invoice71134", "vt100usrpk_inv113", "vendtl_inv214"); +$invoiceno_array = array ("INV2007_1","INV2007_2","INV2007_3","INV2007_4","INV2007_5"); $istatus_array = array ("Created", "Sent", "Approved" , "Credit Invoice", "Paid"); $itotal_array = array ("4842.000", "4842.000", "4842.000", "4842.000", "4842.000"); @@ -814,6 +815,7 @@ $invoice->column_fields["contactid"] = $contact_ids[$contact_key]; $rand = array_rand($num_array); $invoice->column_fields["subject"] = $isubj_array[$i]; + $invoice->column_fields["invoice_no"] = $invoiceno_array[$i]; $invoice->column_fields["invoicestatus"] = $istatus_array[$i]; $invoice->column_fields["hdnGrandTotal"] = $itotal_array[$i]; Modified: vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php Fri Apr 6 02:26:21 2007 @@ -296,7 +296,7 @@ 'vtiger_crmentity:smownerid:assigned_user_id:Emails_Sender:V', 'vtiger_activity:date_start:date_start:Emails_Date_Sent:D'), - Array('vtiger_crmentity:crmid::Invoice_Invoice_Id:I', + Array('vtiger_invoice:invoice_no:invoice_no:Invoice_invoice_no:V', 'vtiger_invoice:subject:subject:Invoice_Subject:V', 'vtiger_invoice:salesorderid:salesorder_id:Invoice_Sales_Order:I', 'vtiger_invoice:invoicestatus:invoicestatus:Invoice_Status:V', @@ -386,14 +386,16 @@ 'vtiger_purchaseorder:carrier:carrier:PurchaseOrder_Carrier:V', 'vtiger_poshipads:ship_street:ship_street:PurchaseOrder_Shipping_Address:V'), - Array( 'vtiger_invoice:subject:subject:Invoice_Subject:V', + Array( 'vtiger_invoice:invoice_no:invoice_no:Invoice_invoice_no:V', + 'vtiger_invoice:subject:subject:Invoice_Subject:V', 'vtiger_invoice:accountid:account_id:Invoice_Account_Name:I', 'vtiger_invoice:salesorderid:salesorder_id:Invoice_Sales_Order:I', 'vtiger_invoice:invoicestatus:invoicestatus:Invoice_Status:V', 'vtiger_crmentity:smownerid:assigned_user_id:Invoice_Assigned_To:V', 'vtiger_crmentity:createdtime:createdtime:Invoice_Created_Time:T'), - Array( 'vtiger_invoice:subject:subject:Invoice_Subject:V', + Array( 'vtiger_invoice:invoice_no:invoice_no:Invoice_invoice_no:V', + 'vtiger_invoice:subject:subject:Invoice_Subject:V', 'vtiger_invoice:accountid:account_id:Invoice_Account_Name:I', 'vtiger_invoice:salesorderid:salesorder_id:Invoice_Sales_Order:I', 'vtiger_invoice:invoicestatus:invoicestatus:Invoice_Status:V', Modified: vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php (original) +++ vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php Fri Apr 6 02:26:21 2007 @@ -29,7 +29,7 @@ $focus = new Invoice(); $focus->retrieve_entity_info($_REQUEST['record'],"Invoice"); $account_name = getAccountName($focus->column_fields[account_id]); - +$invoice_no = $focus->column_fields[invoice_no]; // **************** BEGIN POPULATE DATA ******************** Modified: vtigercrm/branches/5.0.3/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Invoice/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/Invoice/EditView.php Fri Apr 6 02:26:21 2007 @@ -30,6 +30,8 @@ require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); require_once('include/FormValidationUtil.php'); +//Addded for Custom Invoice Number +require_once('user_privileges/CustomInvoiceNo.php'); global $app_strings,$mod_strings,$currentModule,$log,$current_user; @@ -349,6 +351,18 @@ $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); +//Added for Custom Invoice Number +//we have check the Invoice Number for duplicate only in create view +if($focus->mode != 'edit') +{ + $invoiceno=$inv_str.$inv_no; + if(CheckDuplicateInvoiceNumber($invoiceno)) + echo '
    Duplicate Invoice Number - Click here to Configure the Invoice Number'.$num_rows; + else + $smarty->assign("inv_no",($inv_str.$inv_no)); +} + + $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); $smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); Modified: vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php (original) +++ vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php Fri Apr 6 02:26:21 2007 @@ -116,6 +116,13 @@ //Based on the total Number of rows we will save the product relationship with this entity saveInventoryProductDetails(&$this, 'Invoice'); } + //Added For Custom Invoice Number + //Here we Incrementing the new InvoiceNumber + if($this->mode != 'edit') + { + setInventoryInvoiceNumber("increment_invoiceno"); + } + } Modified: vtigercrm/branches/5.0.3/modules/Invoice/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Invoice/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Invoice/language/en_us.lang.php Fri Apr 6 02:26:21 2007 @@ -182,7 +182,8 @@ 'Sent'=>'Sent', 'Credit Invoice'=>'Credit Invoice', 'Paid'=>'Paid', - +//Added to Custom Invoice Number +'invoice_no'=>'Invoice No', ); ?> Modified: vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/header.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/header.php (original) +++ vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/header.php Fri Apr 6 02:26:21 2007 @@ -69,7 +69,7 @@ // vtiger_invoice number block $invBlock=array("145","65"); -$pdf->addRecBlock($id, "Invoice Number",$invBlock); +$pdf->addRecBlock($invoice_no, "Invoice Number",$invBlock); /* ************ End Invoice Data ************************ */ Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Fri Apr 6 02:26:21 2007 @@ -907,5 +907,14 @@ 'FILESIZE_EXCEEDS_INFO' => 'Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file', 'PROBLEMS_IN_FILEUPLOAD' => 'Problems in file upload. Please try again!', +//Added fields for Invoice Number labels +'LBL_CUSTOMIZE_INVOICE_NUMBER'=>'Customize Invoice Number', +'LBL_CUSTOMIZE_INVOICE_NUMBER_DESCRIPTION'=>'Invoice Number Customization', +'LBL_CUSTOM_INVOICE_NUMBER_VIEW'=>'Invoice Number Customization', +'LBL_CUSTOMINVOICE_STRING'=>'Custom Invoice String', +'LBL_CUSTOMINVOICE_NUMBER'=>'Custom Invoice Number', +'LBL_INVOICE_NUMBER_PREVIEW'=>'Preview', +'LBL_INVOICE_NUMBER_BUTTON'=>'Update Invoice Number', + ); ?> Modified: vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php Fri Apr 6 02:26:21 2007 @@ -866,7 +866,8 @@ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'ADV')"); //Block74 $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'terms_conditions','vtiger_invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'ADV')"); - +//Added for Custom invoice Number +$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'invoice_no','vtiger_invoice',1,'1','invoice_no','invoice_no',1,0,0,100,3,69,1,'V~M',1,null,'BAS')"); //Invoice Details -- END //users Details Starts Block 79,80,81 Modified: vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml Fri Apr 6 02:26:21 2007 @@ -3999,6 +3999,10 @@ + + + + invoiceid From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 6 04:44:31 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 06 Apr 2007 08:44:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10577 - /vtigercrm/branches/5.0.3/modules/Webmails/functions.php Message-ID: <20070406084431.AEF497D3291@vtiger.fosslabs.com> Author: richie Date: Fri Apr 6 02:44:24 2007 New Revision: 10577 Log: * Commented the line which cause wrong links when we have URL in the mail body, Fixes #3245 Modified: vtigercrm/branches/5.0.3/modules/Webmails/functions.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/functions.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/functions.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/functions.php Fri Apr 6 02:44:24 2007 @@ -236,8 +236,8 @@ "']*>'si" ); $body = preg_replace($to_removed_array, '', $body); - //line added to fix #3245 - $body=preg_replace("/(http:\/\/|ftp:\/\/)([^\s,]*)/i","$1$2 target=_blank",$body ); + //this line is not needed, commented to fix #3245 + //$body=preg_replace("/(http:\/\/|ftp:\/\/)([^\s,]*)/i","$1$2 target=_blank",$body ); $body = preg_replace("|href=\"(.*)script:|i", 'href="nocc_removed_script:', $body); $body = preg_replace("|<([^>]*)java|i", ']*)&{.*}([^>]*)>|i", "<&{;}\\3>", $body); From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 6 04:52:59 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 06 Apr 2007 08:52:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10578 - in /vtigercrm/branches/5.0.3: Smarty/templates/EmailContents.tpl Smarty/templates/Emails.tpl modules/Emails/language/en_us.lang.php Message-ID: <20070406085259.5930C7DA47B@vtiger.fosslabs.com> Author: richie Date: Fri Apr 6 02:52:46 2007 New Revision: 10578 Log: * Fixed issues related to Qualify mail and to show the sent mails based on Leads, Contactas and Accounts, Fixes #3228 #3240 Modified: vtigercrm/branches/5.0.3/Smarty/templates/EmailContents.tpl vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/EmailContents.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/EmailContents.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/EmailContents.tpl Fri Apr 6 02:52:46 2007 @@ -17,16 +17,20 @@ {$LISTHEADER.1} {$LISTHEADER.2} - {foreach key=id item=row from=$LISTENTITY} - - - - - {$row.0} - {$row.1} - {$row.2} - - {/foreach} + {if $LISTENTITY != NULL} + {foreach key=id item=row from=$LISTENTITY} + + + + + {$row.0} + {$row.1} + {$row.2} + + {/foreach} + {else} + {$MOD.LBL_NO_RECORDS} + {/if}
    Modified: vtigercrm/branches/5.0.3/include/js/general.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/general.js (original) +++ vtigercrm/branches/5.0.3/include/js/general.js Mon Apr 9 10:03:59 2007 @@ -2008,3 +2008,18 @@ document.location.href=url; } } + +function usernameCharValid(c) { + return ( ((c >= 'a') && (c <= 'z')) || + ((c >= 'A') && (c <= 'Z')) || + ((c >= '0') && (c <= '9')) || + (c == '.') ); +} + +function usernameValid(s) { + for (var i = 0; i < s.length; i++) { + if (!usernameCharValid(s.charAt(i))){ + return false;} + } + return true; +} From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 9 12:15:28 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Apr 2007 16:15:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10602 - /vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Message-ID: <20070409161528.88D5D7DA4E7@vtiger.fosslabs.com> Author: richie Date: Mon Apr 9 10:15:23 2007 New Revision: 10602 Log: * Added alert message for Final discount even the value is 0, Fixed #3505 Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Mon Apr 9 10:15:23 2007 @@ -1214,10 +1214,11 @@ { $finalDiscount = $focus->column_fields['hdnDiscountAmount']; $finalDiscount = getConvertedPriceFromDollar($finalDiscount); - $final_discount_info = $app_strings['LBL_FINAL_DISCOUNT_AMOUNT']." = $finalDiscount"; - } - if($final_discount_info != '') - $final_discount_info = 'onclick="alert(\''.$final_discount_info.'\');"'; + } + + //Alert the Final Discount amount even it is zero + $final_discount_info = $app_strings['LBL_FINAL_DISCOUNT_AMOUNT']." = $finalDiscount"; + $final_discount_info = 'onclick="alert(\''.$final_discount_info.'\');"'; $output .= ''; $output .= '(-) '.$app_strings['LBL_DISCOUNT'].''; From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 9 12:23:53 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Apr 2007 16:23:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10603 - in /vtigercrm/branches/5.0.3/modules/Accounts: Accounts.js AddressChange.php Message-ID: <20070409162354.17AFC7DA4FF@vtiger.fosslabs.com> Author: richie Date: Mon Apr 9 10:23:47 2007 New Revision: 10603 Log: * Fixed the issue with contact address update when we save account as non admin user, Fixed #3269 Modified: vtigercrm/branches/5.0.3/modules/Accounts/Accounts.js vtigercrm/branches/5.0.3/modules/Accounts/AddressChange.php Modified: vtigercrm/branches/5.0.3/modules/Accounts/Accounts.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Accounts/Accounts.js (original) +++ vtigercrm/branches/5.0.3/modules/Accounts/Accounts.js Mon Apr 9 10:23:47 2007 @@ -245,28 +245,40 @@ //When changing the Account Address Information it should also change the related contact address. function checkAddress(form,id) { - var bill_street = form.bill_street.value; - var ship_street = form.ship_street.value; - var bill_city = form.bill_city.value; - var ship_city = form.ship_city.value; - var bill_state = form.bill_state.value; - var ship_state = form.ship_state.value; - var bill_code = form.bill_code.value; - var ship_code = form.ship_code.value; - var bill_country= form.bill_country.value; - var ship_country= form.ship_country.value; - var bill_pobox = form.bill_pobox.value; - var ship_pobox = form.ship_pobox.value; - - - var url = "bill_street="+bill_street+"&ship_street="+ship_street+"&bill_city="+bill_city+"&ship_city="+ship_city+"&bill_state="+bill_state+"&ship_state="+ship_state+"&bill_code="+bill_code+"&ship_code="+ship_code+"&bill_country="+bill_country+"&ship_country="+ship_country+"&bill_pobox="+bill_pobox+"&ship_pobox="+ship_pobox+"&record="+id; + var url=''; + if(typeof(form.bill_street) != 'undefined') + url +="&bill_street="+form.bill_street.value; + if(typeof(form.ship_street) != 'undefined') + url +="&ship_street="+form.ship_street.value; + if(typeof(form.bill_city) != 'undefined') + url +="&bill_city="+form.bill_city.value; + if(typeof(form.ship_city) != 'undefined') + url +="&ship_city="+form.ship_city.value; + if(typeof(form.bill_state) != 'undefined') + url +="&bill_state="+form.bill_state.value; + if(typeof(form.ship_state) != 'undefined') + url +="&ship_state="+form.ship_state.value; + if(typeof(form.bill_code) != 'undefined') + url +="&bill_code="+ form.bill_code.value; + if(typeof(form.ship_code) != 'undefined') + url +="&ship_code="+ form.ship_code.value; + if(typeof(form.bill_country) != 'undefined') + url +="&bill_country="+form.bill_country.value; + if(typeof(form.ship_country) != 'undefined') + url +="&ship_country="+form.ship_country.value; + if(typeof(form.bill_pobox) != 'undefined') + url +="&bill_pobox="+ form.bill_pobox.value; + if(typeof(form.ship_pobox) != 'undefined') + url +="&ship_pobox="+ form.ship_pobox.value; + + url +="&record="+id; $("status").style.display="inline"; new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody:"module=Accounts&action=AccountsAjax&ajax=true&file=AddressChange&"+url, + postBody:"module=Accounts&action=AccountsAjax&ajax=true&file=AddressChange"+url, onComplete: function(response) { if(response.responseText == 'address_change') { Modified: vtigercrm/branches/5.0.3/modules/Accounts/AddressChange.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Accounts/AddressChange.php (original) +++ vtigercrm/branches/5.0.3/modules/Accounts/AddressChange.php Mon Apr 9 10:23:47 2007 @@ -23,7 +23,18 @@ $result = $adb->query($sql); $value = $adb->fetch_row($result); -if(($_REQUEST['bill_city'] != $value['billingcity']) || $_REQUEST['bill_street'] != $value['billingstreet'] || $_REQUEST['bill_country']!=$value['billingcountry'] || $_REQUEST['bill_code']!=$value['billingcode'] || $_REQUEST['bill_pobox']!=$value['billingpobox'] || $_REQUEST['bill_state']!=$value['billingstate'] || $_REQUEST['ship_country']!=$value['country'] || $_REQUEST['ship_city']!=$value['city'] || $_REQUEST['ship_state']!=$value['state'] || $_REQUEST['ship_code']!=$value['code'] || $_REQUEST['ship_street']!=$value['street'] || $_REQUEST['ship_pobox']!=$value['pobox'] ) +if(($_REQUEST['bill_city'] != $value['billingcity'] && isset($_REQUEST['bill_city'])) || + ($_REQUEST['bill_street'] != $value['billingstreet'] && isset($_REQUEST['bill_street'])) || + ($_REQUEST['bill_country']!=$value['billingcountry'] && isset($_REQUEST['bill_country']))|| + ($_REQUEST['bill_code']!=$value['billingcode'] && isset($_REQUEST['bill_code']))|| + ($_REQUEST['bill_pobox']!=$value['billingpobox'] && isset($_REQUEST['bill_pobox'])) || + ($_REQUEST['bill_state']!=$value['billingstate'] && isset($_REQUEST['bill_state']))|| + ($_REQUEST['ship_country']!=$value['country'] && isset($_REQUEST['ship_country']))|| + ($_REQUEST['ship_city']!=$value['city'] && isset($_REQUEST['ship_city']))|| + ($_REQUEST['ship_state']!=$value['state'] && isset($_REQUEST['ship_state']))|| + ($_REQUEST['ship_code']!=$value['code'] && isset($_REQUEST['ship_code']))|| + ($_REQUEST['ship_street']!=$value['street'] && isset($_REQUEST['ship_street']))|| + ($_REQUEST['ship_pobox']!=$value['pobox'] && isset($_REQUEST['ship_pobox']))) { $sql1="select contactid from vtiger_contactdetails where accountid=".$record; $result1 = $adb->query($sql1); From pumppatrol at gmbooks.com Mon Apr 9 13:21:04 2007 From: pumppatrol at gmbooks.com (Tanzania Q. Emphasized) Date: Mon, 09 Apr 2007 17:21:04 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1694475416.20070409172104@gmbooks.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070409/b72be95d/attachment-0001.html From istbm at globaltrademark.com Mon Apr 9 13:57:45 2007 From: istbm at globaltrademark.com (Frill U. Baudelaire) Date: Mon, 09 Apr 2007 17:57:45 +0000 Subject: [Vtigercrm-commits] On-line generic store Message-ID: <7749563015.20070409175745@globaltrademark.com> The most powerful medicines for you! Diflucan - $2.64 - a tablet taken orally to treat vaginal yeast infections caused by the yeast Candida. Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. and more! our site http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From qqqga at golfalot.com Mon Apr 9 19:22:06 2007 From: qqqga at golfalot.com (Daryl C. Misspelt) Date: Mon, 09 Apr 2007 19:22:06 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5280322627.20070409192206@golfalot.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070409/c417330a/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: brooking.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070409/c417330a/attachment.gif From istack at godivala.force9.net Mon Apr 9 14:42:06 2007 From: istack at godivala.force9.net (Peremptorily F. Aerier) Date: Mon, 09 Apr 2007 18:42:06 +0000 Subject: [Vtigercrm-commits] Pharmacy for real men! Message-ID: <3687328443.20070409184206@godivala.force9.net> The most powerful medicines for you! Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. Horny Goat Weed - $35.99 - Epimedium is a genus of twenty-one related plant species. It boosts libido (sex drive), increases energy levels and enhances recovery from exercise. Cumpills - are a great concept formulated by our highly trained speclalists working in the field of natural therapy. Using the knowledge of thousands of years of cumulative research in herbals, this specially designed formula helps in achieving high levels of semen volume and quality. and more! our site http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From slscc.l at ginalivingston.com Mon Apr 9 13:01:43 2007 From: slscc.l at ginalivingston.com (Linnet O. Fright) Date: Mon, 09 Apr 2007 13:01:43 -0400 Subject: [Vtigercrm-commits] All medications to cure yourself! Message-ID: <1773034251.20070409130143@ginalivingston.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://eadqs.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From istanboule at gonsal.e.telefonica.net Mon Apr 9 16:38:14 2007 From: istanboule at gonsal.e.telefonica.net (Courtney Gross) Date: Mon, 09 Apr 2007 20:38:14 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <1780652167.20070409203814@gonsal.e.telefonica.net> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070409/94e35c53/attachment-0001.html From jsa at gongyeon.com Mon Apr 9 15:05:38 2007 From: jsa at gongyeon.com (Nonpluses L. Processor) Date: Mon, 09 Apr 2007 15:05:38 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1790750638.20070409150538@gongyeon.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070409/06dca50e/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: crackling.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070409/06dca50e/attachment.gif From jasmine at gkp.co.uk Mon Apr 9 22:30:45 2007 From: jasmine at gkp.co.uk (Succulents G. Kennedy) Date: Mon, 09 Apr 2007 22:30:45 -0400 Subject: [Vtigercrm-commits] Looking for perfect sex? Message-ID: <5333099511.20070409223045@gkp.co.uk> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://eadqs.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From county at gettford.com Mon Apr 9 18:03:59 2007 From: county at gettford.com (Herminia T. Downhills) Date: Mon, 09 Apr 2007 18:03:59 -0400 Subject: [Vtigercrm-commits] No doctor appointment is necessary Message-ID: <1300783809.20070409180359@gettford.com> The most powerful medicines for you! Suregasm - $35.99 - Achieve stronger and more powerful orgasms with this all-natural female sexual stimulant. Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Nymphomax - $35.99 - Helps women to achieve multiple and more powerful orgasms with this unique female sexual stimulant. and more! our site http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From pierre at griskon.com Mon Apr 9 18:33:51 2007 From: pierre at griskon.com (Basel G. Cuff) Date: Mon, 09 Apr 2007 22:33:51 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9974637475.20070409223351@griskon.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070409/14035152/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: onset.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070409/14035152/attachment.gif From crushhhh at gibsonandassociates.net Mon Apr 9 21:02:51 2007 From: crushhhh at gibsonandassociates.net (Vocabularies J. Blastoff) Date: Tue, 10 Apr 2007 01:02:51 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8029004110.20070410010251@gibsonandassociates.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/04e683ca/attachment-0002.html From lajj at greenimagellc.com Tue Apr 10 03:04:18 2007 From: lajj at greenimagellc.com (Gift P. Lubber) Date: Tue, 10 Apr 2007 03:04:18 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8851979208.20070410030418@greenimagellc.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/56c5db9a/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Warren.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/56c5db9a/attachment.gif From extremeusa at gpventures.com Mon Apr 9 22:31:17 2007 From: extremeusa at gpventures.com (Shades U. Embarrassing) Date: Tue, 10 Apr 2007 02:31:17 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8480605760.20070410023117@gpventures.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/6e94b342/attachment.html From major at grakonet.com Mon Apr 9 20:27:02 2007 From: major at grakonet.com (Enticements I. Illustrations) Date: Mon, 09 Apr 2007 20:27:02 -0400 Subject: [Vtigercrm-commits] Worry about your erection? Message-ID: <4853555634.20070409202702@grakonet.com> Make your dreams come true with licensed medications from US Drug Store! Any pills at your choice. There is no need to visit your local drug store at all. http://eadqs.hk Verified by VISA and sell FDA Approved Drugs only! From nicholas at gideonwiseman.com Tue Apr 10 04:52:22 2007 From: nicholas at gideonwiseman.com (Covering J. Turkmenistan) Date: Tue, 10 Apr 2007 04:52:22 -0400 Subject: [Vtigercrm-commits] Disappointed with your sexual health? Message-ID: <1719945615.20070410045222@gideonwiseman.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://eadqs.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From nancy at goldensextant.com Mon Apr 9 21:48:30 2007 From: nancy at goldensextant.com (Bray I. Interlarded) Date: Mon, 09 Apr 2007 21:48:30 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <6368971473.20070409214830@goldensextant.com> The most powerful medicines for you! 100% Pure Okinawan Coral Calcium - $35.99 - the preferred source for readily absorbable and accessible calcium in the body. Superior 100% pure coral calcium is harvested from Okinawa, Japan ? home to the longest-lived people on earth. Horny Goat Weed - $35.99 - Epimedium is a genus of twenty-one related plant species. It boosts libido (sex drive), increases energy levels and enhances recovery from exercise. Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. and more! our site http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 00:54:18 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 04:54:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10604 - in /vtigercrm/branches/5.0.3: include/js/en_us.lang.js modules/Calendar/ListView.php modules/Calendar/calendarLayout.php modules/Calendar/language/en_us.lang.php modules/Calendar/script.js Message-ID: <20070410045418.C824F7C8062@vtiger.fosslabs.com> Author: richie Date: Mon Apr 9 22:54:08 2007 New Revision: 10604 Log: fix for calendar related issues. Fixes #3460 #3438 Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js vtigercrm/branches/5.0.3/modules/Calendar/ListView.php vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Calendar/script.js Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Mon Apr 9 22:54:08 2007 @@ -105,5 +105,6 @@ LESS_OR_EQUALS:'less or equal', GREATER_OR_EQUALS:'greater or equal', - NO_SPECIAL_CHARS:'Special Characters are not allowed in Invoice String' + NO_SPECIAL_CHARS:'Special Characters are not allowed in Invoice String', + SHARED_EVENT_DEL_MSG:'The User does not have permission to Delete this record.' }; Modified: vtigercrm/branches/5.0.3/modules/Calendar/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/ListView.php Mon Apr 9 22:54:08 2007 @@ -56,7 +56,7 @@ if($_REQUEST['errormsg'] != '') { $errormsg = $_REQUEST['errormsg']; - $smarty->assign("ERROR","The User does not have permission to Change/Delete ".$errormsg." ".$currentModule); + $smarty->assign("ERROR",$mod_strings["SHARED_EVENT_DEL_MSG"]); }else { $smarty->assign("ERROR",""); Modified: vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php Mon Apr 9 22:54:08 2007 @@ -1052,11 +1052,12 @@ $recurring = ' '; $height = $rowspan * 75; $javacript_str = ''; + $idShared = "normal"; if($act[$i]->shared) $idShared = "shared"; /*if($eventstatus != 'Held') {*/ if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") $javacript_str = 'onMouseOver="cal_show(\''.$arrow_img_name.'\');" onMouseOut="fnHide_Event(\''.$arrow_img_name.'\');"'; - $action_str = ''; + $action_str = ''; /*} else { @@ -1128,6 +1129,7 @@ $user = $act[$i]->owner; $priority = $act[$i]->priority; $image = $cal['IMAGE_PATH'].''.$act[$i]->image_name; + $idShared = "normal"; if($act[$i]->shared) $idShared = "shared"; if($act[$i]->recurring) $recurring = ''; else @@ -1135,7 +1137,7 @@ $color = $act[$i]->color; if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") $javacript_str = 'onMouseOver="cal_show(\''.$arrow_img_name.'\');" onMouseOut="fnHide_Event(\''.$arrow_img_name.'\');"'; - $action_str = ''; + $action_str = ''; $eventlayer .='
    @@ -1240,7 +1242,7 @@ require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); $cal_log->debug("Entering getEventList() method..."); $shared_ids = getSharedCalendarId($current_user->id); - $query = "SELECT vtiger_groups.groupname, vtiger_users.user_name, + $query = "SELECT vtiger_groups.groupname, vtiger_users.user_name,vtiger_crmentity.smownerid, vtiger_activity.* FROM vtiger_activity INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_activity.activityid @@ -1254,8 +1256,8 @@ ON vtiger_recurringevents.activityid = vtiger_activity.activityid WHERE vtiger_crmentity.deleted = 0 AND (vtiger_activity.activitytype = 'Meeting' OR vtiger_activity.activitytype = 'Call') - AND (vtiger_activity.date_start BETWEEN '".$start_date."' AND '".$end_date."' - OR vtiger_recurringevents.recurringdate BETWEEN '".$start_date."' AND '".$end_date."') "; + AND (((vtiger_activity.date_start between '".$start_date."' AND '".$end_date."') OR (vtiger_activity.due_date between '". $start_date."' AND '".$end_date."') OR (vtiger_activity.date_start<'".$start_date."' and vtiger_activity.due_date>'".$end_date."') AND (vtiger_recurringevents.recurringdate is NULL)) + OR (vtiger_recurringevents.recurringdate BETWEEN '".$start_date."' AND '".$end_date."')) "; if($info != '') { $com_q = " AND vtiger_crmentity.smownerid = ".$current_user->id." @@ -1295,22 +1297,27 @@ $value = getaddEventPopupTime($start_time,$end_time,$format); $start_hour = $value['starthour'].':'.$value['startmin'].''.$value['startfmt']; $end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt']; - if($calendar['view'] == 'day') - { - $element['starttime'] = $start_hour; - $element['endtime'] = $end_hour; - } - else - { - $date_start = $adb->query_result($result,$i,"date_start"); - $due_date = $adb->query_result($result,$i,"due_date"); - $element['starttime'] = getDisplayDate($date_start).' '.$start_hour; - $element['endtime'] = getDisplayDate($due_date).' '.$end_hour; - } + $date_start = $adb->query_result($result,$i,"date_start"); + $due_date = $adb->query_result($result,$i,"due_date"); + $element['starttime'] = getDisplayDate($date_start).' '.$start_hour; + $element['endtime'] = getDisplayDate($due_date).' '.$end_hour; $contact_id = $adb->query_result($result,$i,"contactid"); $id = $adb->query_result($result,$i,"activityid"); $subject = $adb->query_result($result,$i,"subject"); $eventstatus = $adb->query_result($result,$i,"eventstatus"); + $assignedto = $adb->query_result($result,$i,"user_name"); + $userid = $adb->query_result($result,$i,"smownerid"); + $idShared = "normal"; + if(!empty($assignedto) && $userid != $current_user->id && $adb->query_result($result,$i,"visibility") == "Public") + { + $que = "select * from vtiger_sharedcalendar where sharedid=".$current_user->id." and userid=".$userid; + $row = $adb->query($que); + $no = $adb->getRowCount($row); + if($no > 0) $idShared = "shared"; + else $idShared = "normal"; + + + } if(strlen($subject)>25) $subject = substr($subject,0,25)."..."; if($contact_id != '') @@ -1328,9 +1335,8 @@ $element['eventdetail'] = $contact_data." ".$subject." ".$more_link; $element['relatedto']= getRelatedTo('Calendar',$result,$i); if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete")=="yes") - $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"event\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; + $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->get_formatted_date()."\",\"event\",\"".$idShared."\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; $element['status'] = $mod_strings[$adb->query_result($result,$i,"eventstatus")]; - $assignedto = $adb->query_result($result,$i,"user_name"); if(!empty($assignedto)) $element['assignedto'] = $assignedto; else @@ -1439,7 +1445,7 @@ $element['task_contact'] = "".$contact_name.""; $element['status'] = $adb->query_result($result,$i,"status"); if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") - $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"todo\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; + $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->get_formatted_date()."\",\"todo\",\"normal\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; $assignedto = $adb->query_result($result,$i,"user_name"); if(!empty($assignedto)) $element['assignedto'] = $assignedto; @@ -1502,17 +1508,8 @@ $endtemp_date = (($date_format == 'dd-mm-yyyy')?(date('d-m-Y',$endtemp_ts)):(($date_format== 'mm-dd-yyyy')?(date('m-d-Y',$endtemp_ts)):(($date_format == 'yyyy-mm-dd')?(date('Y-m-d', $endtemp_ts)):('')))); } $list_view = ""; - if($cal['view'] == 'day') - { - $start_datetime = $mod_strings['LBL_START_TIME']; - $end_datetime = $mod_strings['LBL_END_TIME']; - } - else - { - $start_datetime = $app_strings['LBL_START_DATE_TIME']; - $end_datetime = $app_strings['LBL_END_DATE_TIME']; - - } + $start_datetime = $app_strings['LBL_START_DATE_TIME']; + $end_datetime = $app_strings['LBL_END_DATE_TIME']; //Events listview header labels $header = Array('0'=>'#', '1'=>$start_datetime, Modified: vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Mon Apr 9 22:54:08 2007 @@ -412,6 +412,7 @@ 'End date'=>'End date', 'LBL_SET_DATE'=>'Set date..', 'Recurrence'=>'Recurrence', +'SHARED_EVENT_DEL_MSG'=>'The User does not have permission to Delete this record.', ); Modified: vtigercrm/branches/5.0.3/modules/Calendar/script.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/script.js (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/script.js Mon Apr 9 22:54:08 2007 @@ -809,13 +809,17 @@ } } -function getcalAction(obj,Lay,id,view,hour,day,month,year,type){ +function getcalAction(obj,Lay,id,view,hour,dateVal,type,isShared){ var tagName = document.getElementById(Lay); var leftSide = findPosX(obj); var topSide = findPosY(obj); var maxW = tagName.style.width; var widthM = maxW.substring(0,maxW.length-2); var getVal = eval(leftSide) + eval(widthM); + var vtDate = dateVal.split("-"); + var day = parseInt(vtDate[2],10); + var month = parseInt(vtDate[1],10); + var year = parseInt(vtDate[0],10); if(getVal > window.innerWidth ){ leftSide = eval(leftSide) - eval(widthM); tagName.style.left = leftSide + 'px'; @@ -860,7 +864,14 @@ if(complete) complete.href="javascript:updateStatus("+id+",'"+heldstatus+"','"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; if(pending) pending.href="javascript:updateStatus("+id+",'"+notheldstatus+"','"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; if(postpone) postpone.href="index.php?module=Calendar&action=EditView&record="+id+"&activity_mode="+activity_mode; - if(actdelete) actdelete.href="javascript:delActivity("+id+",'"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; + if(isShared == "shared") + { + if(actdelete) actdelete.href="javascript:alert('"+alert_arr.SHARED_EVENT_DEL_MSG+"')"; + } + else + { + if(actdelete) actdelete.href="javascript:delActivity("+id+",'"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; + } if(changeowner) changeowner.href="javascript:dispLayer('act_changeowner');"; } From bbassett at glacierbaytravel.com Tue Apr 10 01:02:52 2007 From: bbassett at glacierbaytravel.com (Anemic I. Beebe) Date: Tue, 10 Apr 2007 01:02:52 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8995938453.20070410010252@glacierbaytravel.com> The most powerful medicines for you! Cumpills - are a great concept formulated by our highly trained speclalists working in the field of natural therapy. Using the knowledge of thousands of years of cumulative research in herbals, this specially designed formula helps in achieving high levels of semen volume and quality. Horny Goat Weed - $35.99 - Epimedium is a genus of twenty-one related plant species. It boosts libido (sex drive), increases energy levels and enhances recovery from exercise. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. and more! our site http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From gardenhome at gordon-eng.com Tue Apr 10 01:03:58 2007 From: gardenhome at gordon-eng.com (Greenhouses O. Gallop) Date: Tue, 10 Apr 2007 01:03:58 -0400 Subject: [Vtigercrm-commits] No doctor appointment is necessary Message-ID: <5864884604.20070410010358@gordon-eng.com> The most powerful medicines for you! Diflucan - $2.64 - a tablet taken orally to treat vaginal yeast infections caused by the yeast Candida. Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. Lasix - $0.53 - a loop diuretic used to treat high blood pressure, congestive heart failure, and swelling due to excess body water. and more! our site http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 01:37:37 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 05:37:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10605 - in /vtigercrm/branches/5.0.3/Smarty/templates: AuditTrailList.tpl DefModuleView.tpl Settings/Announcements.tpl Settings/BackupServerContents.tpl Settings/CompanyInfo.tpl Settings/EmailConfig.tpl Settings/ProxyServer.tpl Message-ID: <20070410053737.027047DA50A@vtiger.fosslabs.com> Author: richie Date: Mon Apr 9 23:37:25 2007 New Revision: 10605 Log: fix for Can remove the link. Fixes #3580 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/AuditTrailList.tpl vtigercrm/branches/5.0.3/Smarty/templates/DefModuleView.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings/Announcements.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings/BackupServerContents.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings/CompanyInfo.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailConfig.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/AuditTrailList.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/AuditTrailList.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/AuditTrailList.tpl Mon Apr 9 23:37:25 2007 @@ -82,11 +82,11 @@
    - + Modified: vtigercrm/branches/5.0.3/Smarty/templates/DefModuleView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DefModuleView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DefModuleView.tpl Mon Apr 9 23:37:25 2007 @@ -72,11 +72,11 @@
    - + Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/Announcements.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/Announcements.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/Announcements.tpl Mon Apr 9 23:37:25 2007 @@ -77,9 +77,9 @@
    - +
    Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/BackupServerContents.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/BackupServerContents.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/BackupServerContents.tpl Mon Apr 9 23:37:25 2007 @@ -59,8 +59,8 @@ - + Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/CompanyInfo.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/CompanyInfo.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/CompanyInfo.tpl Mon Apr 9 23:37:25 2007 @@ -96,11 +96,11 @@
    - +
    Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailConfig.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailConfig.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailConfig.tpl Mon Apr 9 23:37:25 2007 @@ -132,11 +132,11 @@ - +
    Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl Mon Apr 9 23:37:25 2007 @@ -116,11 +116,11 @@ - +
    From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 01:48:07 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 05:48:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10606 - /vtigercrm/branches/5.0.3/modules/Emails/mail.php Message-ID: <20070410054807.829FB78D2FC@vtiger.fosslabs.com> Author: richie Date: Mon Apr 9 23:47:59 2007 New Revision: 10606 Log: fix for Signature comes two time. Fixes #3623 --minnie Modified: vtigercrm/branches/5.0.3/modules/Emails/mail.php Modified: vtigercrm/branches/5.0.3/modules/Emails/mail.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/mail.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/mail.php Mon Apr 9 23:47:59 2007 @@ -41,8 +41,8 @@ //if module is HelpDesk then from_email will come based on support email id if($from_email == '')//$module != 'HelpDesk') $from_email = getUserEmailId('user_name',$from_name); - - $contents = addSignature($contents,$from_name); + if($module != "Calendar") + $contents = addSignature($contents,$from_name); $mail = new PHPMailer(); From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 01:56:48 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 05:56:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10607 - /vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php Message-ID: <20070410055648.7888F7C8062@vtiger.fosslabs.com> Author: richie Date: Mon Apr 9 23:56:40 2007 New Revision: 10607 Log: fix for Calendar: Deleted contact name has been showed in calendar list view,detail view and edit view. Fixes #3520 --minnie Modified: vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php Mon Apr 9 23:56:40 2007 @@ -63,18 +63,33 @@ case Contacts: if($return_module == 'Accounts') { - $sql = 'update vtiger_contactdetails set accountid = "" where contactid = '.$record; - $adb->query($sql); - } - if($return_module == 'Potentials' && $record != '' && $return_id != '') + $sql = 'update vtiger_contactdetails set accountid = null where contactid = '.$record; + $adb->query($sql); + } + elseif($return_module == 'Potentials' && $record != '' && $return_id != '') { $sql = 'delete from vtiger_contpotentialrel where contactid='.$record.' and potentialid='.$return_id; $adb->query($sql); } - if($return_module == "Campaigns") { + elseif($return_module == "Campaigns") { $sql = 'delete from vtiger_campaigncontrel where contactid='.$record.' and campaignid='.$return_id; $adb->query($sql); } + elseif($return_module == 'Products')//Delete Contact from Product relatedlist + { + $sql = "delete from vtiger_seproductsrel where crmid=$record and productid=$return_id"; + $adb->query($sql); + } + elseif($return_module == 'Vendors') + { + $sql = "delete from vtiger_vendorcontactrel where vendorid=$return_id and contactid=$record"; + $adb->query($sql); + } + else + { + $sql = "delete from vtiger_cntactivityrel where contactid=".$record; + $adb->query($sql); + } if($record != '' && $return_id != '') { $sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id; @@ -82,41 +97,36 @@ $sql_recentviewed ='delete from vtiger_tracker where user_id = '.$current_user->id.' and item_id = '.$record; $adb->query($sql_recentviewed); } - if($return_module == 'Products')//Delete Contact from Product relatedlist - { - $sql = "delete from vtiger_seproductsrel where crmid=$record and productid=$return_id"; - $adb->query($sql); - } - if($return_module == 'Vendors') - { - $sql = "delete from vtiger_vendorcontactrel where vendorid=$return_id and contactid=$record"; - $adb->query($sql); - } - if($return_module == 'Calendar') - { - $sql = "delete from vtiger_cntactivityrel where activityid=$return_id and contactid=$record"; - $adb->query($sql); - } break; case Potentials: - if($return_module == 'Accounts' || $return_module == 'Campaigns') + if($return_module == 'Accounts') { //we can call $focus->mark_deleted($record) $sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$record; $adb->query($sql); - } - if($return_module == 'Products')//Delete Potential from Product relatedlist + $sql ='delete from vtiger_seactivityrel where crmid = '.$record; + $adb->query($sql); + } + elseif($return_module == 'Campaigns') + { + $sql = 'update vtiger_potential set campaignid = null where potentialid = '.$record; + $adb->query($sql); + } + elseif($return_module == 'Products')//Delete Potential from Product relatedlist { $sql = "delete from vtiger_seproductsrel where crmid=$record and productid=$return_id"; $adb->query($sql); } - if($return_module == 'Contacts') + elseif($return_module == 'Contacts') { $sql = "delete from vtiger_contpotentialrel where potentialid=$record and contactid=$return_id"; $adb->query($sql); } - $sql ='delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id; - $adb->query($sql); + else + { + $sql ='delete from vtiger_seactivityrel where crmid = '.$record; + $adb->query($sql); + } break; case Calendar: if($return_module == 'Contacts') From hamilton at grandvinltd.com Tue Apr 10 02:10:34 2007 From: hamilton at grandvinltd.com (Trent E. Curtseyed) Date: Tue, 10 Apr 2007 06:10:34 +0000 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <2480708008.20070410061034@grandvinltd.com> The most powerful medicines for you! Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. Quick Bust - $35.99 - Get the shape and size you always wanted with natural breast enhancing capsules. Allegra - $1.32 - an antihistamine that comes in a variety of strengths and formulations to provide relief from a wide range of seasonal allergy symptoms. and more! our site http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 02:11:39 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 06:11:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10608 - in /vtigercrmoutlook/trunk/vtigercrmoladdin/source: frmLogin.frm modvtigerUtils.bas vtigeroladdin.vbw Message-ID: <20070410061139.04EA97DA50A@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Apr 10 00:11:22 2007 New Revision: 10608 Log: A constant VTIGER_VERSION has been added to check the version compatibility with the server Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmLogin.frm vtigercrmoutlook/trunk/vtigercrmoladdin/source/modvtigerUtils.bas vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbw Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmLogin.frm ============================================================================== Binary files - no diff available. Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/modvtigerUtils.bas ============================================================================== Binary files - no diff available. Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbw ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 02:28:01 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 06:28:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10609 - /vtigercrm/branches/5.0.3/soap/vtigerolservice.php Message-ID: <20070410062801.4B67C7DA4FF@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Apr 10 00:27:53 2007 New Revision: 10609 Log: version field has been added to the login function to check the version compatibility between vtiger and outlook plugin Modified: vtigercrm/branches/5.0.3/soap/vtigerolservice.php Modified: vtigercrm/branches/5.0.3/soap/vtigerolservice.php ============================================================================== --- vtigercrm/branches/5.0.3/soap/vtigerolservice.php (original) +++ vtigercrm/branches/5.0.3/soap/vtigerolservice.php Tue Apr 10 00:27:53 2007 @@ -360,11 +360,18 @@ } } -function LoginToVtiger($userid,$password) -{ +function LoginToVtiger($userid,$password,$version) +{ + global $log; global $adb; + $log->DEBUG("Entered into vtigerCRM with userid".$userid." and Version".$version); + require_once('vtigerversion.php'); + if($version != $vtiger_current_version) + { + $log->DEBUG("outlook plugin version is not compatible with the vtigerCRM"); + return "VERSION"; + } require_once('modules/Users/Users.php'); - $return_access = "FALSE"; $objuser = new Users(); @@ -375,16 +382,17 @@ $objuser->load_user($password); if($objuser->is_authenticated()) { - $return_access = "TRUE"; + $return_access = "TRUES"; }else { - $return_access = "FALSE"; + $return_access = "LOGIN"; } }else { //$server->setError("Invalid username and/or password"); $return_access = "FALSE"; } +$log->DEBUG("The return access to outlook was ".$return_access." from vtigerCRM"); $objuser = $objuser; return $return_access; } From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 03:13:27 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 07:13:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10610 - /vtigercrm/branches/5.0.3/modules/Users/lookupemailtemplates.php Message-ID: <20070410071327.903177DA513@vtiger.fosslabs.com> Author: richie Date: Tue Apr 10 01:13:19 2007 New Revision: 10610 Log: fix for Personal - Email template visible to all. Fixes #3463 --minnie Modified: vtigercrm/branches/5.0.3/modules/Users/lookupemailtemplates.php Modified: vtigercrm/branches/5.0.3/modules/Users/lookupemailtemplates.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/lookupemailtemplates.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/lookupemailtemplates.php Tue Apr 10 01:13:19 2007 @@ -13,9 +13,8 @@ require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -global $theme; +global $theme,$current_user; $theme_path="themes/".$theme."/"; - ?> @@ -39,16 +38,32 @@ $sql = "select * from vtiger_emailtemplates order by templateid desc"; $result = $adb->query($sql); $temprow = $adb->fetch_array($result); + $cnt=1; require_once('include/utils/UserInfoUtil.php'); +require('user_privileges/user_privileges_'.$current_user->id.'.php'); do { - printf(" "); - $templatename = $temprow["templatename"]; - echo "".$temprow["templatename"].""; - printf("%s",$temprow["description"]); - $cnt++; + $templatename = $temprow["templatename"]; + if($is_admin == false) + { + $folderName = $temprow['foldername']; + if($folderName != 'Personal') + { + printf(" "); + echo "".$temprow["templatename"].""; + printf("%s",$temprow["description"]); + } + } + else + { + printf(" "); + echo "".$temprow["templatename"].""; + printf("%s",$temprow["description"]); + } + $cnt++; + }while($temprow = $adb->fetch_array($result)); ?> From hh at greystarproductions.com Tue Apr 10 03:29:52 2007 From: hh at greystarproductions.com (Mountain E. Semitrailer) Date: Tue, 10 Apr 2007 07:29:52 +0000 Subject: [Vtigercrm-commits] U won't believe! Message-ID: <5840326738.20070410072952@greystarproductions.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://eadqs.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 03:49:53 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 07:49:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10611 - in /vtigercrm/branches/5.0.3/include: language/en_us.lang.php utils/ListViewUtils.php Message-ID: <20070410074953.9ADB17DA50D@vtiger.fosslabs.com> Author: richie Date: Tue Apr 10 01:49:43 2007 New Revision: 10611 Log: fix for i18n issues. Fixes #3285 #3645 #3569 #3283 #3281 Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Tue Apr 10 01:49:43 2007 @@ -675,7 +675,7 @@ 'Reminder' => '[Reminder:', 'Visit_Link' => 'Kindly visit the link for more details on the activity', 'Click here' => 'Click here', -'Subject' => 'Subject:', +'Subject' => 'Subject', 'Support_starting' => 'Support starting', 'Congratulations' => 'Congratulations! Your support starts from today', 'Hello_Support' => 'Hello! Support Starts for', @@ -843,6 +843,9 @@ 'LBL_SKYPE'=>'Skype', 'LBL_FIND'=>'Find', 'LBL_CLEAR'=>'Clear', + +// Added for display the label of Invoice no +'invoice no'=>'invoice no', ); $app_list_strings = array ( Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Tue Apr 10 01:49:43 2007 @@ -1005,13 +1005,14 @@ function getValue($field_result, $list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,$mode,$popuptype,$returnset='',$viewid='') { - global $log,$app_strings; + global $log,$app_strings,$current_language; $log->debug("Entering getValue(".$field_result.",". $list_result.",".$fieldname.",".$focus.",".$module.",".$entity_id.",".$list_result_count.",".$mode.",".$popuptype.",".$returnset.",".$viewid.") method ..."); global $adb,$current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); $tabname = getParentTab(); $tabid = getTabid($module); + $current_module_strings = return_module_language($current_language, $module); $uicolarr=$field_result[$fieldname]; foreach($uicolarr as $key=>$value) { @@ -1080,6 +1081,22 @@ }*/ + } + elseif($uitype == 15 || $uitype == 111 || $uitype == 16) + { + $temp_val = $adb->query_result($list_result,$list_result_count,$colname); + if($current_module_strings[$temp_val] != '') + { + $value = $current_module_strings[$temp_val]; + } + elseif($app_strings[$temp_val] != '') + { + $value = $app_strings[$temp_val]; + } + else + { + $value = $temp_val; + } } elseif($uitype == 71 || $uitype == 72) { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 04:02:36 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 08:02:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10612 - in /vtigercrm/branches/5.0.3: Smarty/templates/ImportStep1.tpl include/js/en_us.lang.js include/js/general.js modules/Users/Forms.php Message-ID: <20070410080236.B4E407DA50D@vtiger.fosslabs.com> Author: richie Date: Tue Apr 10 02:02:25 2007 New Revision: 10612 Log: * Validation has been added in file selection of Import Step1, Fixed #3366 Modified: vtigercrm/branches/5.0.3/Smarty/templates/ImportStep1.tpl vtigercrm/branches/5.0.3/include/js/en_us.lang.js vtigercrm/branches/5.0.3/include/js/general.js vtigercrm/branches/5.0.3/modules/Users/Forms.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/ImportStep1.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ImportStep1.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ImportStep1.tpl Tue Apr 10 02:02:25 2007 @@ -12,7 +12,29 @@ + {include file='Buttons_List1.tpl'} @@ -86,7 +108,7 @@   - +   Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Tue Apr 10 02:02:25 2007 @@ -106,5 +106,6 @@ GREATER_OR_EQUALS:'greater or equal', NO_SPECIAL_CHARS:'Special Characters are not allowed in Invoice String', - SHARED_EVENT_DEL_MSG:'The User does not have permission to Delete this record.' + SHARED_EVENT_DEL_MSG:'The User does not have permission to Delete this record.', + PLS_SELECT_VALID_FILE:'Please select a file with the following extension:\n' }; Modified: vtigercrm/branches/5.0.3/include/js/general.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/general.js (original) +++ vtigercrm/branches/5.0.3/include/js/general.js Tue Apr 10 02:02:25 2007 @@ -768,7 +768,7 @@ if (getObj(fieldname[i]) != null && getObj(fieldname[i]).value.replace(/^\s+/g, '').replace(/\s+$/g, '').length!=0) { if (type[1]=="M") - if (!emptyCheck(type[2],fieldlabel[i],getObj(type[2]).type)) + if (!emptyCheck(fieldname[2],fieldlabel[i],getObj(type[2]).type)) return false if(typeof(type[3])=="undefined") var currdatechk="OTH" @@ -2023,3 +2023,35 @@ } return true; } + +/** Check Upload file is in specified format(extension). + * @param fldname -- name of the file field + * @param fldLabel -- Lable of the file field + * @param filter -- List of file extensions to allow. each extension must be seperated with a | sybmol. + * Example: upload_filter("imagename","Image", "jpg|gif|bmp|png") + * @returns true -- if the extension is IN specified extension. + * @returns false -- if the extension is NOT IN specified extension. + * + * NOTE: If this field is mandatory, please call emptyCheck() function before calling this function. + */ + +function upload_filter(fldName, filter) +{ + var currObj=getObj(fldName) + if(currObj.value !="") + { + var file=currObj.value; + var type=file.split("."); + var valid_extn=filter.split("|"); + + if(valid_extn.indexOf(type[type.length-1]) == -1) + { + alert(alert_arr.PLS_SELECT_VALID_FILE+valid_extn) + currObj.focus(); + return false; + } + } + return true + +} + Modified: vtigercrm/branches/5.0.3/modules/Users/Forms.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/Forms.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/Forms.php Tue Apr 10 02:02:25 2007 @@ -41,7 +41,6 @@ $err_missing_required_fields = $app_strings['ERR_MISSING_REQUIRED_FIELDS']; $err_invalid_email_address = $app_strings['ERR_INVALID_EMAIL_ADDRESS']; $lbl_user_image=$mod_strings['User Image']; -$err_select_valid_image = $app_strings['SELECT_VALID_IMAGE']; $the_emailid = $app_strings['THE_EMAILID']; $email_field_is = $app_strings['EMAIL_FILED_IS'].$err_invalid_email_address; $other_email_field_is = $app_strings['OTHER_EMAIL_FILED_IS'].$err_invalid_email_address; @@ -116,22 +115,13 @@ exit(); } -// fix for new user upload image validation - if (trim(form.imagename.value) != "") - { - var valimg=form.imagename.value; - var aUpload=valimg.split("."); - if((aUpload[aUpload.length-1]!="jpg") && (aUpload[aUpload.length-1]!="gif") && (aUpload[aUpload.length-1]!="bmp") && (aUpload[aUpload.length-1]!="png")) - { - alert("$err_select_valid_image"); - form.imagename.focus(); exit(); - - } - - } - + if(! upload_filter("imagename", "jpg|gif|bmp|png") ) + { + form.imagename.focus(); + return false; + } if(form.mode.value != 'edit') From istetter at gologan.de Tue Apr 10 04:55:52 2007 From: istetter at gologan.de (Binning C. Freakier) Date: Tue, 10 Apr 2007 08:55:52 +0000 Subject: [Vtigercrm-commits] Don't know where to buy pills? Message-ID: <4126992108.20070410085552@gologan.de> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://eadqs.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 05:43:40 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 09:43:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10613 - in /vtigercrm/branches/5.0.3: include/RelatedListView.php modules/HelpDesk/ListView.php modules/Quotes/ListView.php Message-ID: <20070410094340.B7C7B78D54D@vtiger.fosslabs.com> Author: richie Date: Tue Apr 10 03:43:30 2007 New Revision: 10613 Log: * Fixed the sorting - assigned to, Fixed #3411 Modified: vtigercrm/branches/5.0.3/include/RelatedListView.php vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php vtigercrm/branches/5.0.3/modules/Quotes/ListView.php Modified: vtigercrm/branches/5.0.3/include/RelatedListView.php ============================================================================== --- vtigercrm/branches/5.0.3/include/RelatedListView.php (original) +++ vtigercrm/branches/5.0.3/include/RelatedListView.php Tue Apr 10 03:43:30 2007 @@ -139,7 +139,7 @@ $query_order_by = $order_by; if($order_by == 'smownerid') { - $query_order_by = 'user_name'; + $query_order_by = "case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end "; } $query .= ' ORDER BY '.$query_order_by.' '.$sorder; $url_qry .="&order_by=".$order_by; Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php Tue Apr 10 03:43:30 2007 @@ -135,7 +135,7 @@ { if( $adb->dbType == "pgsql") $list_query .= ' GROUP BY vtiger_users.user_name'; - $list_query .= ' ORDER BY vtiger_users.user_name '.$sorder; + $list_query .= " ORDER BY case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end ".$sorder; } else { Modified: vtigercrm/branches/5.0.3/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Quotes/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Quotes/ListView.php Tue Apr 10 03:43:30 2007 @@ -128,7 +128,7 @@ { if($order_by == 'smownerid') { - $query .= ' ORDER BY vtiger_users.user_name '.$sorder; + $query .= " ORDER BY case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end ".$sorder; } else { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 05:45:27 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 09:45:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10614 - /vtigercrmoutlook/trunk/vtigercrmoladdin/source/modvtigerSoap.bas Message-ID: <20070410094527.0FF1D7C7FD3@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Apr 10 03:45:16 2007 New Revision: 10614 Log: version field has been added to the login function to check the version compatibility between vtiger and outlook plugin Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/modvtigerSoap.bas Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/modvtigerSoap.bas ============================================================================== Binary files - no diff available. From extrememat at gravatar.com Tue Apr 10 06:02:54 2007 From: extrememat at gravatar.com (Kristen Cardenas) Date: Tue, 10 Apr 2007 10:02:54 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <7167348077.20070410100254@gravatar.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/9465a5f1/attachment-0002.html From isthumper at goldensafe.com Tue Apr 10 11:31:58 2007 From: isthumper at goldensafe.com (Fossil P. Vainer) Date: Tue, 10 Apr 2007 11:31:58 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8140336730.20070410113158@goldensafe.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/28024544/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Antigone.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/28024544/attachment.gif From istdjpiyujmo at giambanco.net Tue Apr 10 03:48:56 2007 From: istdjpiyujmo at giambanco.net (Taskmasters Q. Stream) Date: Tue, 10 Apr 2007 03:48:56 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <0655733396.20070410034856@giambanco.net> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://eadqs.hk any pill you need! Absolutely Confidential and Secure purchase From istherejustice at gopusa.com Tue Apr 10 11:51:22 2007 From: istherejustice at gopusa.com (Casanova D. Remembrance) Date: Tue, 10 Apr 2007 11:51:22 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <0993387445.20070410115122@gopusa.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://eadqs.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From wlenox at graye.net Tue Apr 10 09:06:15 2007 From: wlenox at graye.net (Ceremonies C. Wronging) Date: Tue, 10 Apr 2007 13:06:15 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1294852484.20070410130615@graye.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/7ce8d92e/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: centime.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/7ce8d92e/attachment.gif From nathan.diehl at graywolfcomputers.com Tue Apr 10 09:31:33 2007 From: nathan.diehl at graywolfcomputers.com (Demonstrate R. Bardeen) Date: Tue, 10 Apr 2007 13:31:33 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4733106550.20070410133133@graywolfcomputers.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://eadqs.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070410/791ab563/attachment-0001.html From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 10:51:11 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 14:51:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10615 - in /vtigercrm/branches/5.0.3: Smarty/templates/UserEditView.tpl include/js/en_us.lang.js Message-ID: <20070410145111.EC6037DA52C@vtiger.fosslabs.com> Author: richie Date: Tue Apr 10 08:51:05 2007 New Revision: 10615 Log: * Fixed the i18n issue Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl vtigercrm/branches/5.0.3/include/js/en_us.lang.js Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl Tue Apr 10 08:51:05 2007 @@ -50,7 +50,7 @@ ); {rdelim} else - alert("Please Enter Character & Numerical Values"); + alert(alert_arr.NO_SPECIAL+" in User Name ") {rdelim} Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Tue Apr 10 08:51:05 2007 @@ -107,5 +107,6 @@ NO_SPECIAL_CHARS:'Special Characters are not allowed in Invoice String', SHARED_EVENT_DEL_MSG:'The User does not have permission to Delete this record.', - PLS_SELECT_VALID_FILE:'Please select a file with the following extension:\n' + PLS_SELECT_VALID_FILE:'Please select a file with the following extension:\n', + NO_SPECIAL:'Special Characters are not allowed' }; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 10:53:28 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 14:53:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10616 - /vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Message-ID: <20070410145328.7E3767DA529@vtiger.fosslabs.com> Author: richie Date: Tue Apr 10 08:53:23 2007 New Revision: 10616 Log: * Fixed the issue in PO/SO/Quotes/Invoice editview - NAN error when we don't have values for discount, Fixed #3486 Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Tue Apr 10 08:53:23 2007 @@ -1482,6 +1482,11 @@ $discount_amount=$adb->query_result($result,$i-1,'discount_amount'); $discountTotal = '0.00'; //Based on the discount percent or amount we will show the discount details + + //To avoid NaN javascript error, here we assign 0 initially to' %of price' and 'Direct Price reduction'(for Each Product) + $product_Detail[$i]['discount_percent'.$i] = 0; + $product_Detail[$i]['discount_amount'.$i] = 0; + if($discount_percent != 'NULL' && $discount_percent != '') { $product_Detail[$i]['discount_type'.$i] = "percentage"; @@ -1567,6 +1572,10 @@ $discountPercent = ($focus->column_fields['hdnDiscountPercent'] != '')?$focus->column_fields['hdnDiscountPercent']:'0.00'; $discountAmount = ($focus->column_fields['hdnDiscountAmount'] != '')?$focus->column_fields['hdnDiscountAmount']:'0.00'; + +//To avoid NaN javascript error, here we assign 0 initially to' %of price' and 'Direct Price reduction'(For Final Discount) + $product_Detail[1]['final_details']['discount_percentage_final'] = 0; + $product_Detail[1]['final_details']['discount_amount_final'] = 0; if($focus->column_fields['hdnDiscountPercent'] != '') { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 11:00:57 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 15:00:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10617 - in /vtigercrm/branches/5.0.3/include/js: Inventory.js en_us.lang.js Message-ID: <20070410150057.F1C3F7DA552@vtiger.fosslabs.com> Author: richie Date: Tue Apr 10 09:00:49 2007 New Revision: 10617 Log: * Validation has been done for group tax and S&H tax, Fixed #3336#3536 Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js vtigercrm/branches/5.0.3/include/js/en_us.lang.js Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/Inventory.js (original) +++ vtigercrm/branches/5.0.3/include/js/Inventory.js Tue Apr 10 09:00:49 2007 @@ -290,8 +290,40 @@ alert(alert_arr.VALID_ADJUSTMENT); return false; } - - return true + + //Group - Tax Validation - not allow negative values + //We need to validate group tax only if taxtype is group. + var taxtype=document.getElementById("taxtype").value; + if(taxtype=="group") + { + var tax_count=document.getElementById("group_tax_count").value; + for(var i=1;i<=tax_count;i++) + { + + temp = /^(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("group_tax_percentage"+i).value); + if(!temp) + { + alert(alert_arr.VALID_TAX_PERCENT); + return false; + } + } + } + + //Taxes for Shippring and Handling validation - not allow negative values + var shtax_count=document.getElementById("sh_tax_count").value; + for(var i=1;i<=shtax_count;i++) + { + + temp = /^(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("sh_tax_percentage"+i).value); + if(!temp) + { + alert(alert_arr.VALID_SH_TAX); + return false; + } + } + + + return true; } function FindDuplicate() Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Tue Apr 10 09:00:49 2007 @@ -108,5 +108,7 @@ NO_SPECIAL_CHARS:'Special Characters are not allowed in Invoice String', SHARED_EVENT_DEL_MSG:'The User does not have permission to Delete this record.', PLS_SELECT_VALID_FILE:'Please select a file with the following extension:\n', - NO_SPECIAL:'Special Characters are not allowed' + NO_SPECIAL:'Special Characters are not allowed', + VALID_TAX_PERCENT:'Enter a valid Tax percentage', + VALID_SH_TAX:'Enter valid Taxes for shipping and handling ', }; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 11:02:30 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 15:02:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10618 - in /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Campaigns/ Message-ID: <20070410150231.1194F7C8017@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 10 09:02:20 2007 New Revision: 10618 Log: fix for Leads CustView - Set as Default affects in Campaigns RelatedList also. Fixes #3063 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl vtigercrm/branches/5.0.3/Smarty/templates/RelatedListNew.tpl vtigercrm/branches/5.0.3/Smarty/templates/RelatedLists.tpl vtigercrm/branches/5.0.3/modules/Campaigns/CallRelatedList.php vtigercrm/branches/5.0.3/modules/Campaigns/DetailView.php vtigercrm/branches/5.0.3/modules/Campaigns/LoadList.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl Tue Apr 10 09:02:20 2007 @@ -64,7 +64,7 @@ {/if} {elseif $header eq 'Leads'} {if $MODULE eq 'Campaigns'} - {$LEADCVCOMBO} + {$LEADCVCOMBO} {/if} {if $MODULE eq 'Products'} @@ -83,7 +83,7 @@   {elseif $MODULE eq 'Campaigns'} - {$CONTCVCOMBO} + {$CONTCVCOMBO} {elseif $MODULE eq 'Products'} Modified: vtigercrm/branches/5.0.3/Smarty/templates/RelatedListNew.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/RelatedListNew.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/RelatedListNew.tpl Tue Apr 10 09:02:20 2007 @@ -51,11 +51,22 @@ {/literal} function loadCvList(type,id) {ldelim} + $("status").style.display="inline"; if(type === 'Leads') {ldelim} if($("lead_cv_list").value != 'None') {ldelim} - $("lead_list_button").innerHTML = ''; + new Ajax.Request( + 'index.php', + {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim}, + method: 'post', + postBody: 'module=Campaigns&action=CampaignsAjax&file=LoadList&ajax=true&return_action=DetailView&return_id='+id+'&list_type='+type+'&cvid='+$("lead_cv_list").value, + onComplete: function(response) {ldelim} + $("status").style.display="none"; + $("RLContents").innerHTML= response.responseText; + {rdelim} + {rdelim} + ); {rdelim} {rdelim} @@ -63,7 +74,17 @@ {ldelim} if($("cont_cv_list").value != 'None') {ldelim} - $("contact_list_button").innerHTML = ''; + new Ajax.Request( + 'index.php', + {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim}, + method: 'post', + postBody: 'module=Campaigns&action=CampaignsAjax&file=LoadList&ajax=true&return_action=DetailView&return_id='+id+'&list_type='+type+'&cvid='+$("cont_cv_list").value, + onComplete: function(response) {ldelim} + $("status").style.display="none"; + $("RLContents").innerHTML= response.responseText; + {rdelim} + {rdelim} + ); {rdelim} {rdelim} {rdelim} Modified: vtigercrm/branches/5.0.3/Smarty/templates/RelatedLists.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/RelatedLists.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/RelatedLists.tpl Tue Apr 10 09:02:20 2007 @@ -51,21 +51,41 @@ {/literal} function loadCvList(type,id) {ldelim} - if(type === 'Leads') - {ldelim} - if($("lead_cv_list").value != 'None') - {ldelim} - $("lead_list_button").innerHTML = ''; + $("status").style.display="inline"; + if(type === 'Leads') + {ldelim} + if($("lead_cv_list").value != 'None') + {ldelim} + new Ajax.Request( + 'index.php', + {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim}, + method: 'post', + postBody: 'module=Campaigns&action=CampaignsAjax&file=LoadList&ajax=true&return_action=DetailView&return_id='+id+'&list_type='+type+'&cvid='+$("lead_cv_list").value, + onComplete: function(response) {ldelim} + $("status").style.display="none"; + $("RLContents").innerHTML= response.responseText; + {rdelim} + {rdelim} + ); + {rdelim} + {rdelim} + if(type === 'Contacts') + {ldelim} + if($("cont_cv_list").value != 'None') + {ldelim} + new Ajax.Request( + 'index.php', + {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim}, + method: 'post', + postBody: 'module=Campaigns&action=CampaignsAjax&file=LoadList&ajax=true&return_action=DetailView&return_id='+id+'&list_type='+type+'&cvid='+$("cont_cv_list").value, + onComplete: function(response) {ldelim} + $("status").style.display="none"; + $("RLContents").innerHTML= response.responseText; + {rdelim} + {rdelim} + ); {rdelim} - {rdelim} - - if(type === 'Contacts') - {ldelim} - if($("cont_cv_list").value !='None') - {ldelim} - $("contact_list_button").innerHTML = ''; - {rdelim} - {rdelim} + {rdelim} {rdelim} {include file='Buttons_List1.tpl'} Modified: vtigercrm/branches/5.0.3/modules/Campaigns/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Campaigns/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.3/modules/Campaigns/CallRelatedList.php Tue Apr 10 09:02:20 2007 @@ -12,7 +12,6 @@ require_once('Smarty_setup.php'); require_once('modules/Campaigns/Campaigns.php'); -require_once('modules/CustomView/CustomView.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -38,7 +37,7 @@ } global $mod_strings; -global $app_strings; +global $app_strings,$adb; global $theme; global $currentModule; $theme_path="themes/".$theme."/"; @@ -57,13 +56,29 @@ $related_array=getRelatedLists($currentModule,$focus); $smarty->assign("RELATEDLISTS", $related_array); -$cvObj = new CustomView("Contacts"); -$cvcombo = $cvObj->getCustomViewCombo(); -$smarty->assign("CONTCVCOMBO",""); +/* To get Contacts CustomView -START */ +$sql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype where vtiger_tab.tabid=".getTabid('Contacts'); +$result = $adb->query($sql); +$chtml = ""; +$smarty->assign("CONTCVCOMBO",$chtml); +/* To get Contacts CustomView -END */ -$cvObj = new CustomView("Leads"); -$cvcombo = $cvObj->getCustomViewCombo(); -$smarty->assign("LEADCVCOMBO",""); +/* To get Leads CustomView -START */ +$sql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype where vtiger_tab.tabid=".getTabid('Leads'); +$result = $adb->query($sql); +$lhtml = ""; +$smarty->assign("LEADCVCOMBO",$lhtml); +/* To get Leads CustomView -END */ $category = getParentTab(); $smarty->assign("CATEGORY",$category); @@ -79,6 +94,9 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); -$smarty->display("RelatedLists.tpl"); +if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '') + $smarty->display("RelatedListContents.tpl"); +else + $smarty->display("RelatedLists.tpl"); } ?> Modified: vtigercrm/branches/5.0.3/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Campaigns/DetailView.php (original) +++ vtigercrm/branches/5.0.3/modules/Campaigns/DetailView.php Tue Apr 10 09:02:20 2007 @@ -12,7 +12,6 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once('modules/Campaigns/Campaigns.php'); -require_once('modules/CustomView/CustomView.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -29,7 +28,7 @@ { $focus->id = ""; } -global $app_strings,$mod_strings,$theme,$currentModule,$default_module_view; +global $app_strings,$mod_strings,$theme,$currentModule,$default_module_view,$adb; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -76,13 +75,30 @@ { $related_array = getRelatedLists($currentModule,$focus); $smarty->assign("RELATEDLISTS", $related_array); - $cvObj = new CustomView("Contacts"); - $cvcombo = $cvObj->getCustomViewCombo(); - $smarty->assign("CONTCVCOMBO",""); + /* To get Contacts CustomView -START */ + $sql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype where vtiger_tab.tabid=".getTabid('Contacts'); + $result = $adb->query($sql); + $chtml = ""; + $smarty->assign("CONTCVCOMBO",$chtml); + /* To get Contacts CustomView -END */ + + /* To get Leads CustomView -START */ + $sql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype where vtiger_tab.tabid=".getTabid('Leads'); + $result = $adb->query($sql); + $lhtml = ""; + $smarty->assign("LEADCVCOMBO",$lhtml); + /* To get Leads CustomView -END */ - $cvObj = new CustomView("Leads"); - $cvcombo = $cvObj->getCustomViewCombo(); - $smarty->assign("LEADCVCOMBO",""); } $smarty->assign("SinglePane_View", $singlepane_view); Modified: vtigercrm/branches/5.0.3/modules/Campaigns/LoadList.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Campaigns/LoadList.php (original) +++ vtigercrm/branches/5.0.3/modules/Campaigns/LoadList.php Tue Apr 10 09:02:20 2007 @@ -28,24 +28,6 @@ $adb->query("INSERT INTO ".$reltable." VALUES('".$_REQUEST["return_id"]."','".$row["crmid"]."')"); } -if ($singlepane_view == 'true') -{ +header("Location: index.php?module=Campaigns&action=CampaignsAjax&file=CallRelatedList&ajax=true&record=".$_REQUEST['return_id']); + ?> - - - - From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 11:03:11 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 15:03:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10619 - /vtigercrm/branches/5.0.3/soap/vtigerolservice.php Message-ID: <20070410150311.E90947C8017@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 10 09:03:07 2007 New Revision: 10619 Log: version compatability fixed in outlook plugin Modified: vtigercrm/branches/5.0.3/soap/vtigerolservice.php Modified: vtigercrm/branches/5.0.3/soap/vtigerolservice.php ============================================================================== --- vtigercrm/branches/5.0.3/soap/vtigerolservice.php (original) +++ vtigercrm/branches/5.0.3/soap/vtigerolservice.php Tue Apr 10 09:03:07 2007 @@ -365,17 +365,14 @@ global $log; global $adb; $log->DEBUG("Entered into vtigerCRM with userid".$userid." and Version".$version); - require_once('vtigerversion.php'); + include('vtigerversion.php'); if($version != $vtiger_current_version) { - $log->DEBUG("outlook plugin version is not compatible with the vtigerCRM"); return "VERSION"; - } + } require_once('modules/Users/Users.php'); $return_access = "FALSE"; - $objuser = new Users(); - if($password != "") { $objuser->column_fields['user_name'] = $userid; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 10 11:08:01 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 10 Apr 2007 15:08:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10620 - /vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl Message-ID: <20070410150801.07BF67DA556@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 10 09:07:56 2007 New Revision: 10620 Log: fix for Calendar : search combo box is not carrying the header list -- non admin. Fixes #3530 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl Tue Apr 10 09:07:56 2007 @@ -140,18 +140,22 @@ -{/if} - - - - - - - - - +{**} + + + + + +
    + + + + + +
    +
    +
    + + {include file='SetMenu.tpl'} + + + + + + + + + + + {if $EMODE eq 'edit'} + + {else} + + {/if} + + + + + +
    {$MOD.LBL_MODULE_NAME}{$MOD.LBL_SETTINGS} > {$UMOD.LBL_EMAIL_TEMPLATES} > {$MOD.LBL_EDIT} "{$TEMPLATENAME}" {$MOD.LBL_SETTINGS} > {$UMOD.LBL_EMAIL_TEMPLATES} > {$MOD.LBL_CREATE_EMAIL_TEMPLATES}
    {$UMOD.LBL_EMAIL_TEMPLATE_DESC}
    + +
    + + + + +
    + + + + {if $EMODE eq 'edit'} + + {else} + + {/if} + + +
    {$UMOD.LBL_PROPERTIES} "{$TEMPLATENAME}" {$MOD.LBL_CREATE_EMAIL_TEMPLATES} +    + {if $EMODE eq 'edit'} + + {else} + + {/if} +
    + + + + + + + + + + + + + + + + + + + +
    *{$UMOD.LBL_NAME} 
    {$UMOD.LBL_DESCRIPTION} + +
    {$UMOD.LBL_FOLDER} + {if $EMODE eq 'edit'} + + {else} + + {/if} + +
    + + + + +
    + + + + + + + + + + + + +
    {$UMOD.LBL_EMAIL_TEMPLATE}
    *{$UMOD.LBL_SUBJECT} + +
    {$UMOD.LBL_MESSAGE}

    +     		+ + + + + + + + + + + + + + + +
    {$UMOD.LBL_MERGE_FIELDS}
    +     {$UMOD.LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT}
    {$UMOD.LBL_STEP} 1. {$UMOD.LBL_SELECT_FIELD_TYPE}
    {$UMOD.LBL_STEP} 2. {$UMOD.LBL_SELECT_FIELD}
    {$UMOD.LBL_STEP} 3. {$UMOD.LBL_COPY_PASTE}
    +
    + + + + +
    {$MOD.LBL_SCROLL}
    +
    + + + +
    + + + + + +
    + + + + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/CreateProfile.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/CreateProfile.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/CreateProfile.tpl Mon Apr 16 12:27:44 2007 @@ -20,8 +20,8 @@
    {include file='SetMenu.tpl'} -
    - + + @@ -32,7 +32,7 @@ - + @@ -125,7 +125,7 @@ @@ -144,7 +144,7 @@

     

    {$MOD.LBL_PROFILES} {$MOD.LBL_SETTINGS} > {$CMOD.LBL_PROFILE_PRIVILEGES} {$MOD.LBL_SETTINGS} > {$CMOD.LBL_PROFILE_PRIVILEGES}
    {$MOD.LBL_PROFILE_DESCRIPTION}
     
    -    +   
    - +
    Scroll to Top
    {$APP.LBL_SCROLL}
    @@ -173,6 +173,7 @@ - + - - - Modified: vtigercrm/branches/5.1_jens/Smarty/templates/CreateWordTemplate.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/CreateWordTemplate.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/CreateWordTemplate.tpl Mon Apr 16 12:27:44 2007 @@ -1,100 +1,100 @@ -{**} - -
    - - - - - -
    -
    -
    - - {include file='SetMenu.tpl'} - - - - - - - - - - - - - - - -
    Users{$MOD.LBL_SETTINGS} > {$UMOD.LBL_WORD_TEMPLATES} > {$UMOD.LBL_NEW_TEMPLATE}
    {$MOD.LBL_MAIL_MERGE_DESC}
    - -
    - - - - -
    - - - - - - -
    {$UMOD.LBL_NEW_TEMPLATE}
    {$ERRORFLAG}
    		 -   -   -
    - - - - - - - - - - - - - - -
    *{$UMOD.LBL_NEW} {$UMOD.LBL_TEMPLATE_FILE} - -
    {$UMOD.LBL_DESCRIPTION}
    {$UMOD.LBL_MODULENAMES} - -
    - - - - -
    [Scroll to Top]
    -
    - - - -
    - - -
    - -
    - - - - - +{**} + +
    + + + + + +
    +
    +
    + + {include file='SetMenu.tpl'} + + + + + + + + + + + + + + + +
    {$MOD.LBL_MODULE_NAME}{$MOD.LBL_SETTINGS} > {$UMOD.LBL_WORD_TEMPLATES} > {$UMOD.LBL_NEW_TEMPLATE}
    {$MOD.LBL_MAIL_MERGE_DESC}
    + +
    + + + + +
    + + + + + + +
    {$UMOD.LBL_NEW_TEMPLATE}
    {$ERRORFLAG}
    		 +   +   +
    + + + + + + + + + + + + + + +
    *{$UMOD.LBL_NEW} {$UMOD.LBL_TEMPLATE_FILE} + +
    {$UMOD.LBL_DESCRIPTION}
    {$UMOD.LBL_MODULENAMES} + +
    + + + + +
    {$APP.LBL_SCROLL}
    +
    + + + +
    + + + + +
    + + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/CurrencyDetailView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/CurrencyDetailView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/CurrencyDetailView.tpl Mon Apr 16 12:27:44 2007 @@ -27,7 +27,7 @@ - Users + {$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_CURRENCY_SETTINGS} > {$MOD.LBL_VIEWING} "{$CURRENCY_NAME}" Modified: vtigercrm/branches/5.1_jens/Smarty/templates/CurrencyEditView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/CurrencyEditView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/CurrencyEditView.tpl Mon Apr 16 12:27:44 2007 @@ -27,7 +27,7 @@ - Users + {$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_CURRENCY_SETTINGS} > {if $ID neq ''} {$MOD.LBL_EDIT} "{$CURRENCY_NAME}" @@ -131,8 +131,10 @@ if(isNaN(getObj("conversion_rate").value) || eval(getObj("conversion_rate") .value) == 0) { - alert("Enter valid Conversion Rate") + {/literal} + alert("{$APP.ENTER_VALID_CONVERSION_RATE}") return false + {literal} } return true; Modified: vtigercrm/branches/5.1_jens/Smarty/templates/CurrencyListView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/CurrencyListView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/CurrencyListView.tpl Mon Apr 16 12:27:44 2007 @@ -28,7 +28,7 @@ - Users + {$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_CURRENCY_SETTINGS} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/CustomFieldList.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/CustomFieldList.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/CustomFieldList.tpl Mon Apr 16 12:27:44 2007 @@ -29,7 +29,9 @@ {literal} function deleteCustomField(id, fld_module, colName, uitype) { - if(confirm("Are you sure?")) + {/literal} + if(confirm("{$APP.ARE_YOU_SURE}")) + {literal} { document.form.action="index.php?module=Settings&action=DeleteCustomField&fld_module="+fld_module+"&fld_id="+id+"&colName="+colName+"&uitype="+uitype document.form.submit() @@ -88,7 +90,7 @@ - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/CustomFieldMapping.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/CustomFieldMapping.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/CustomFieldMapping.tpl Mon Apr 16 12:27:44 2007 @@ -21,7 +21,7 @@
    Users{$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_CUSTOM_FIELD_SETTINGS}
    - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/CustomView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/CustomView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/CustomView.tpl Mon Apr 16 12:27:44 2007 @@ -92,7 +92,7 @@ {rdelim} if(mandatorycheck == false) {ldelim} - alert("Must have one Required field to be selected\n"+showvalues); + alert("{$APP.MUSTHAVE_ONE_REQUIREDFIELD}"+showvalues); {rdelim} return false; @@ -146,7 +146,18 @@ {foreach item=filteroption key=label from=$CHOOSECOLUMN1} {foreach item=text from=$filteroption} - + {assign var=option_values value=$text.text} + {/foreach} {/foreach} {$CHOOSECOLUMN1} @@ -156,7 +167,18 @@ {foreach item=filteroption key=label from=$CHOOSECOLUMN2} {foreach item=text from=$filteroption} - + {assign var=option_values value=$text.text} + {/foreach} {/foreach} {$CHOOSECOLUMN2} @@ -166,7 +188,18 @@ {foreach item=filteroption key=label from=$CHOOSECOLUMN3} {foreach item=text from=$filteroption} - + {assign var=option_values value=$text.text} + {/foreach} {/foreach} {$CHOOSECOLUMN3} @@ -176,7 +209,18 @@ {foreach item=filteroption key=label from=$CHOOSECOLUMN4} {foreach item=text from=$filteroption} - + {assign var=option_values value=$text.text} + {/foreach} {/foreach} {$CHOOSECOLUMN4} @@ -189,7 +233,18 @@ {foreach item=filteroption key=label from=$CHOOSECOLUMN5} {foreach item=text from=$filteroption} - + {assign var=option_values value=$text.text} + {/foreach} {/foreach} {$CHOOSECOLUMN5} @@ -199,7 +254,18 @@ {foreach item=filteroption key=label from=$CHOOSECOLUMN6} {foreach item=text from=$filteroption} - + {assign var=option_values value=$text.text} + {/foreach} {/foreach} {$CHOOSECOLUMN6} @@ -209,7 +275,18 @@ {foreach item=filteroption key=label from=$CHOOSECOLUMN7} {foreach item=text from=$filteroption} - + {assign var=option_values value=$text.text} + {/foreach} {/foreach} {$CHOOSECOLUMN7} @@ -219,7 +296,18 @@ {foreach item=filteroption key=label from=$CHOOSECOLUMN8} {foreach item=text from=$filteroption} - + {assign var=option_values value=$text.text} + {/foreach} {/foreach} {$CHOOSECOLUMN8} @@ -231,7 +319,18 @@ {foreach item=filteroption key=label from=$CHOOSECOLUMN9} {foreach item=text from=$filteroption} - + {assign var=option_values value=$text.text} + {/foreach} {/foreach} {$CHOOSECOLUMN9} @@ -469,6 +568,8 @@
    Users{$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_CUSTOM_FIELD_SETTINGS}
     
    + + {$STDFILTER_JAVASCRIPT} {$JAVASCRIPT} @@ -507,9 +608,11 @@ selected_cv_icolumnvalue = $(cvselect_array[iloop]).options[$(cvselect_array[iloop]).selectedIndex].value; if(selected_cv_columnvalue == selected_cv_icolumnvalue) { - alert('Columns cannot be duplicated'); - $(cvselect_array[iloop]).selectedIndex = 0; - return false; + {/literal} + alert('{$APP.COLUMNS_CANNOT_BE_DUPLICATED}'); + $(cvselect_array[iloop]).selectedIndex = 0; + return false; + {literal} } } Modified: vtigercrm/branches/5.1_jens/Smarty/templates/DefModuleView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/DefModuleView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/DefModuleView.tpl Mon Apr 16 12:27:44 2007 @@ -72,11 +72,11 @@ - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/DeleteRole.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/DeleteRole.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/DeleteRole.tpl Mon Apr 16 12:27:44 2007 @@ -83,8 +83,10 @@ { if(document.getElementById('role_name').value == '') { - alert('Specfiy the Role to Transfer Existing Roles Users'); - return false; + {/literal} + alert('{$APP.SPECIFY_ROLE_INFO}'); + return false; + {literal} } return true; } Modified: vtigercrm/branches/5.1_jens/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/DetailView.tpl Mon Apr 16 12:27:44 2007 @@ -11,7 +11,7 @@ ********************************************************************************/ -->*} - + @@ -27,7 +27,7 @@
    + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/EditProfile.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/EditProfile.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/EditProfile.tpl Mon Apr 16 12:27:44 2007 @@ -45,7 +45,7 @@
    - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/EditViewHidden.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/EditViewHidden.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/EditViewHidden.tpl Mon Apr 16 12:27:44 2007 @@ -58,11 +58,8 @@ -{elseif $MODULE eq 'Accounts' || $MODULE eq 'Faq' || $MODULE eq 'PriceBooks' || $MODULE eq 'Vendors' || $MODULE eq 'OrgUnit'} +{elseif $MODULE eq 'Accounts' || $MODULE eq 'Faq' || $MODULE eq 'PriceBooks' || $MODULE eq 'Vendors'} - -{elseif $MODULE eq 'Organization'} - {elseif $MODULE eq 'Notes'} @@ -79,6 +76,9 @@ +{else} + {$ERROR_MESSAGE} + {/if} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/EmailContents.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/EmailContents.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/EmailContents.tpl Mon Apr 16 12:27:44 2007 @@ -17,16 +17,20 @@ - {foreach key=id item=row from=$LISTENTITY} - - - - - - - {/foreach} + {if $LISTENTITY != NULL} + {foreach key=id item=row from=$LISTENTITY} + + + + + + + {/foreach} + {else} + + {/if}
    {$MOD.LBL_PROFILES}{$MOD.LBL_SETTINGS} > {$CMOD.LBL_PROFILE_PRIVILEGES} > {$CMOD.LBL_VIEWING} "{$PROFILE_NAME}"{$MOD.LBL_SETTINGS} > {$CMOD.LBL_PROFILE_PRIVILEGES} > {$CMOD.LBL_VIEWING} "{$PROFILE_NAME}"
    {$CMOD.LBL_PROFILE_MESG} "{$PROFILE_NAME}"
    {$LISTHEADER.1} {$LISTHEADER.2}
    - -{$row.0}{$row.1}{$row.2}
    + + {$row.0}{$row.1}{$row.2}
    {$MOD.LBL_NO_RECORDS}
    - + {foreach item=row from=$BLOCKS} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/EmailDetails.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/EmailDetails.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/EmailDetails.tpl Mon Apr 16 12:27:44 2007 @@ -1,84 +1,86 @@ -{**} -
    - - - - - -
     
    + + + + +
    {$MOD.LBL_DETAILVIEW_EMAIL}
    +
    - - - - - - -
    - - - {if $BLOCKS neq ''} - - - {else} - - {/if} - -
    -   - {if $EMAIL_FLAG neq 'WEBMAIL'} -   - {else} -   - {/if} - {foreach item=row from=$BLOCKS} - {foreach item=elements key=title from=$row} - {if $elements.fldname eq 'filename' && $elements.value != ''} - - {/if} - {/foreach} - {/foreach} -  
    -
    - {foreach item=row from=$BLOCKS} - {foreach item=elements from=$row} - {if $elements.fldname eq 'subject'} - - {if $EMAIL_FLAG neq 'WEBMAIL'} - - - - {else} - - {/if} - - -
    {$MOD.LBL_TO} {$TO_MAIL} 
    {$MOD.LBL_CC} {$CC_MAIL} 
    {$MOD.LBL_BCC} {$BCC_MAIL} 
    {$MOD.LBL_FROM} {$TO_MAIL} 
    {$MOD.LBL_SUBJECT} {$elements.value} 
     
    - {elseif $elements.fldname eq 'description'} -
    - {$elements.value} -
    - {/if} - {/foreach} - {/foreach} -
    -{foreach item=row from=$BLOCKS} - {foreach item=elements key=title from=$row} - {if $elements.fldname eq 'filename'} -
    - - {foreach item=attachments from=$elements.options} - - - - {/foreach} -
    - {$attachments} -
    -
    - {/if} - {/foreach} -{/foreach} - +{**} + + + + + + + +
    + + + {if $BLOCKS neq ''} + + + {else} + + {/if} + +
    +   + {if $EMAIL_FLAG neq 'WEBMAIL'} +   +   + {else} +   + {/if} + {foreach item=row from=$BLOCKS} + {foreach item=elements key=title from=$row} + {if $elements.fldname eq 'filename' && $elements.value != ''} + + {/if} + {/foreach} + {/foreach} +  
    +
    + {foreach item=row from=$BLOCKS} + {foreach item=elements from=$row} + {if $elements.fldname eq 'subject'} + + {if $EMAIL_FLAG neq 'WEBMAIL'} + + + + + {else} + + {/if} + + +
    {$MOD.LBL_FROM} {$FROM_MAIL} 
    {$MOD.LBL_TO} {$TO_MAIL} 
    {$MOD.LBL_CC} {$CC_MAIL} 
    {$MOD.LBL_BCC} {$BCC_MAIL} 
    {$MOD.LBL_FROM} {$TO_MAIL} 
    {$MOD.LBL_SUBJECT} {$elements.value} 
     
    + {elseif $elements.fldname eq 'description'} +
    + {$elements.value} +
    + {/if} + {/foreach} + {/foreach} +
    +{foreach item=row from=$BLOCKS} + {foreach item=elements key=title from=$row} + {if $elements.fldname eq 'filename'} +
    + + {foreach item=attachments from=$elements.options} + + + + {/foreach} +
    + {$attachments} +
    +
    + {/if} + {/foreach} +{/foreach} + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Emails.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Emails.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Emails.tpl Mon Apr 16 12:27:44 2007 @@ -16,7 +16,7 @@ gselectedrowid = 0; $("status").style.display="inline"; gFolderid = folderid; - getObj('search_text').value = ''; +// getObj('search_text').value = ''; switch(folderid) {ldelim} case 1: @@ -45,10 +45,12 @@ postBody: 'module=Emails&ajax=true&action=EmailsAjax&file=ListView&folderid='+folderid, onComplete: function(response) {ldelim} $("status").style.display="none"; - if(gFolderid != folderid) + if(gFolderid == folderid) {ldelim} gselectedrowid = 0; $("email_con").innerHTML=response.responseText; + $('EmailDetails').innerHTML = '
     
    '; + $("subjectsetter").innerHTML=''; execJS($('email_con')); {rdelim} else @@ -65,8 +67,8 @@ {rdelim} {include file='Buttons_List.tpl'} - - + + @@ -96,7 +98,7 @@
    -  {$MOD.LBL_SETTINGS} +  {$MOD.LBL_SETTINGS}
    @@ -104,7 +106,7 @@ - +
    vtiger Email Client {$MOD.LBL_VTIGER_EMAIL_CLIENT}
    @@ -115,9 +117,8 @@ - {$MOD.LBL_EMAIL_FOLDERS} -   - {$MOD.LBL_ALLMAILS} + {$MOD.LBL_EMAIL_FOLDERS} + {$MOD.LBL_ALLMAILS} @@ -126,50 +127,52 @@  {$MOD.LBL_INBOX}  {$MOD.LBL_SENT_MAILS} -   - - + - +
      - {$APP.LBL_SEARCH}   +   + {$APP.LBL_SEARCH}   +   + +
    @@ -177,7 +180,6 @@ -  
    {include file="EmailContents.tpl"} @@ -186,17 +188,6 @@ -   - - - - -   -   - - - -  
    {include file="EmailDetails.tpl"} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/FieldAccess.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/FieldAccess.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/FieldAccess.tpl Mon Apr 16 12:27:44 2007 @@ -23,7 +23,7 @@ - + {if $MODE neq 'view'} @@ -32,7 +32,7 @@ {/if} - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/GlobalListView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/GlobalListView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/GlobalListView.tpl Mon Apr 16 12:27:44 2007 @@ -20,7 +20,7 @@
    {/if} - + {if $SEARCH_MODULE eq 'All'} + @@ -32,7 +33,7 @@ - +
    Users{$MOD.LBL_MODULE_NAME} {$MOD.LBL_SETTINGS} > {$MOD.LBL_FIELDS_ACCESS}  
    @@ -58,7 +59,7 @@
    vtiger CRM
    - + @@ -93,14 +94,14 @@ {else} @@ -121,7 +122,7 @@ @@ -160,6 +161,7 @@
    + + {include file='Buttons_List1.tpl'} @@ -40,7 +62,7 @@
    {$APP.LBL_MY_PREFERENCES}{$APP.LNK_HELP}{$APP.LNK_HELP} {$APP.LNK_WEARE} {$APP.LBL_LOGOUT} ({$CURRENT_USER})
    - +
    - +
    {$MOD.LBL_MODULE_NAME} {$MODULE}{$MOD.LBL_MODULE_NAME} {$APP.$MODULE}
    @@ -86,7 +108,10 @@
     
    - + +   + +
    Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ImportStep2.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ImportStep2.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ImportStep2.tpl Mon Apr 16 12:27:44 2007 @@ -1,188 +1,223 @@ -{**} - - - - - - -{include file='Buttons_List1.tpl'} - - - - - - - -
    - - - - -
    -
    - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$MOD.LBL_MODULE_NAME} {$MODULE}
     
    - {$MOD.LBL_STEP_2_3}   - {$MODULE} {$MOD.LBL_LIST_MAPPING} -
    - {$MOD.LBL_STEP_2_MSG} {$MODULE} {$MOD.LBL_STEP_2_MSG1} - {$MOD.LBL_STEP_2_TXT} {$MODULE}. -
     
    -    - {$MOD.LBL_USE_SAVED_MAPPING}   {$SAVED_MAP_LISTS} -
    - - - - {if $HASHEADER eq 1} - - - - {else} - - - - {/if} - -
    {$MOD.LBL_MAPPING}{$MOD.LBL_HEADERS}{$MOD.LBL_ROW} 1{$MOD.LBL_ROW} 2{$MOD.LBL_ROW} 1{$MOD.LBL_ROW} 2{$MOD.LBL_ROW} 3
    - {assign var="Firstrow" value=$FIRSTROW} - {assign var="Secondrow" value=$SECONDROW} - {assign var="Thirdrow" value=$THIRDROW} - - - - - -
    -
    - {include file="ImportMap.tpl"} -
    -     		- - {foreach name=iter item=row1 from=$Firstrow} - {assign var="counter" value=$smarty.foreach.iter.iteration} - {math assign="num" equation="x - y" x=$counter y=1} - - {if $HASHEADER eq 1} - - - - {else} - - - - {/if} - - {/foreach} -
     {$row1} {$Secondrow[$num]} {$Thirdrow[$num]} {$row1} {$Secondrow[$num]} {$Thirdrow[$num]}
    -
    -
    -    - {$MOD.LBL_SAVE_AS_CUSTOM}     - -
    - -    - -
    -
    - -
    -
    - +{**} + + + + + + +{include file='Buttons_List1.tpl'} + + + + + + + +
    + + + + +
    +
    + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {$MOD.LBL_MODULE_NAME} {$APP.$MODULE}
     
    + {$MOD.LBL_STEP_2_3}   + {$APP.$MODULE} {$MOD.LBL_LIST_MAPPING} +
    + {$MOD.LBL_STEP_2_MSG} {$APP.$MODULE} {$MOD.LBL_STEP_2_MSG1} + {$MOD.LBL_STEP_2_TXT} {$APP.$MODULE}. +
     
    +    + {$MOD.LBL_USE_SAVED_MAPPING}   {$SAVED_MAP_LISTS} +
    + + + + {if $HASHEADER eq 1} + + + + {else} + + + + {/if} + +
    {$MOD.LBL_MAPPING}{$MOD.LBL_HEADERS}{$MOD.LBL_ROW} 1{$MOD.LBL_ROW} 2{$MOD.LBL_ROW} 1{$MOD.LBL_ROW} 2{$MOD.LBL_ROW} 3
    + {assign var="Firstrow" value=$FIRSTROW} + {assign var="Secondrow" value=$SECONDROW} + {assign var="Thirdrow" value=$THIRDROW} + + + + + +
    +
    + {include file="ImportMap.tpl"} +
    +     		+ + {foreach name=iter item=row1 from=$Firstrow} + {assign var="counter" value=$smarty.foreach.iter.iteration} + {math assign="num" equation="x - y" x=$counter y=1} + + {if $HASHEADER eq 1} + + + + {else} + + + + {/if} + + {/foreach} +
     {$row1} {$Secondrow[$num]} {$Thirdrow[$num]} {$row1} {$Secondrow[$num]} {$Thirdrow[$num]}
    +
    +
    +    + {$MOD.LBL_SAVE_AS_CUSTOM}     + +
    + +    + +
    +
    + +
    +
    + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryActions.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryActions.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryActions.tpl Mon Apr 16 12:27:44 2007 @@ -34,27 +34,28 @@ {if $MODULE eq 'Products'} - - - + + + + {$APP.LBL_CREATE_BUTTON_LABEL} {$APP.Quote} - - + + {$APP.LBL_CREATE_BUTTON_LABEL} {$APP.Invoice} - - + + {$APP.LBL_CREATE_BUTTON_LABEL} {$APP.SalesOrder} - - + + {$APP.LBL_CREATE_BUTTON_LABEL} {$APP.PurchaseOrder} @@ -90,7 +91,7 @@ - + {$APP.LBL_CREATE_BUTTON_LABEL} {$APP.PurchaseOrder} @@ -120,7 +121,7 @@ - + {$APP.LBL_CREATE_BUTTON_LABEL} {$APP.Invoice} @@ -144,13 +145,14 @@ - - {$APP.LBL_GENERATE} {$APP.Invoice} - - + + {$APP.LBL_GENERATE} {$APP.Invoice} + + + - + {$APP.LBL_GENERATE} {$APP.SalesOrder} @@ -198,7 +200,8 @@ - + {$APP.LBL_EXPORT_TO_PDF} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryCreateView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryCreateView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryCreateView.tpl Mon Apr 16 12:27:44 2007 @@ -1,205 +1,216 @@ -{**} - -{**} - - - - - - - - - - -{include file='Buttons_List1.tpl'} - -{**} - - - - - - - -
    - - - {**} - {include file='EditViewHidden.tpl'} -
    - - {if $OP_MODE eq 'edit_view'} - [ {$ID} ] {$NAME} - {$APP.LBL_EDITING} {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION}
    - {$UPDATEINFO} - {/if} - {if $OP_MODE eq 'create_view'} - {$APP.LBL_CREATING} {$APP.LBL_NEW} {$MOD[$SINGLE_MOD]}
    - {/if} - -
    -
    - - - - {**} - - - - - - - -
    - - - - - {if $BLOCKS_COUNT eq 2} - - - - {else} - - - {/if} - -
     {$APP.LBL_BASIC} {$APP.LBL_INFORMATION}{$APP.LBL_MORE} {$APP.LBL_INFORMATION}  {$APP.LBL_BASIC} {$APP.LBL_INFORMATION} 
    -
    - - {foreach item=blockInfo key=divName from=$BLOCKS} - -
    - - - - - - -
    - - - - - - - - - -
    - - - - - - - {foreach key=header item=data from=$blockInfo} - - {if $header== $MOD.LBL_ADDRESS_INFORMATION && ($MODULE == 'Accounts' || $MODULE == 'Contacts' || $MODULE == 'Quotes' || $MODULE == 'PurchaseOrder' || $MODULE == 'SalesOrder'|| $MODULE == 'Invoice')} - - - - {else} - - - - - {include file="DisplayFields.tpl"} - - - {/foreach} - - - {if $divName eq 'basicTab'} - {if $MODULE eq 'PurchaseOrder' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Invoice'} - - - {if $AVAILABLE_PRODUCTS eq true} - {include file="Inventory/ProductDetailsEditView.tpl"} - {else} - {include file="Inventory/ProductDetails.tpl"} - {/if} - - {/if} - {/if} - - - - -
    -
    - - -
    -
    - {$header} - {$APP.LBL_RCPY_ADDRESS} - {$APP.LBL_LCPY_ADDRESS} - {$header} - {/if} -
     
    -
    - - -
    -
    - -
    -
    - -
    - {/foreach} -
    -
    -
    - - - - - - +{**} + +{**} + + + + + + + + + + +{include file='Buttons_List1.tpl'} + +{**} + + + + + + + +
    + + + {**} + {include file='EditViewHidden.tpl'} +
    + + {if $OP_MODE eq 'edit_view'} + [ {$ID} ] {$NAME} - {$APP.LBL_EDITING} {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION}
    + {$UPDATEINFO} + {/if} + {if $OP_MODE eq 'create_view'} + {if $DUPLICATE neq 'true'} + {$APP.LBL_CREATING} {$APP.LBL_NEW} {$MOD[$SINGLE_MOD]}
    + {else} + {$APP.LBL_DUPLICATING} "{$NAME}"
    + {/if} + {/if} + +
    +
    + + + + {**} + + + + + + + +
    + + + + + {if $BLOCKS_COUNT eq 2} + + + + {else} + + + {/if} + +
     {$APP.LBL_BASIC} {$APP.LBL_INFORMATION}{$APP.LBL_MORE} {$APP.LBL_INFORMATION}  {$APP.LBL_BASIC} {$APP.LBL_INFORMATION} 
    +
    + + {foreach item=blockInfo key=divName from=$BLOCKS} + +
    + + + + + + +
    + + + + + + + + + +
    + + + + + + + {foreach key=header item=data from=$blockInfo} + + {if $header== $MOD.LBL_ADDRESS_INFORMATION && ($MODULE == 'Accounts' || $MODULE == 'Contacts' || $MODULE == 'Quotes' || $MODULE == 'PurchaseOrder' || $MODULE == 'SalesOrder'|| $MODULE == 'Invoice')} + + + + {else} + + + + + {include file="DisplayFields.tpl"} + + + {/foreach} + + + {if $divName eq 'basicTab'} + {if $MODULE eq 'PurchaseOrder' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Invoice'} + + + {if $AVAILABLE_PRODUCTS eq true} + {include file="Inventory/ProductDetailsEditView.tpl"} + {else} + {include file="Inventory/ProductDetails.tpl"} + {/if} + + {/if} + {/if} + + + + +
    +
    + + +
    +
    + {$header} + {$APP.LBL_RCPY_ADDRESS} + {$APP.LBL_LCPY_ADDRESS} + {$header} + {/if} +
     
    +
    + + +
    +
    + +
    +
    + +
    + {/foreach} +
    +
    +
    + + + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryDetailView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryDetailView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryDetailView.tpl Mon Apr 16 12:27:44 2007 @@ -1,339 +1,340 @@ -{**} - - - -
    - - - - - - - -
    - {include file='Buttons_List1.tpl'} - - - - - - - - -
    - -
    - - - - - - - - - -
    - [ {$ID} ] {$NAME} - {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION}   -  
    {$UPDATEINFO}
    - -
    - - - - - - - - - -
    - - - - - - {if $SinglePane_View eq 'false'} - - {/if} - - -
     {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION} {$APP.LBL_MORE} {$APP.LBL_INFORMATION} 
    -
    - - - - - -
    - - - - - - -
    - - - - -
    - {include file='DetailViewHidden.tpl'} - - {strip} - - - - {/strip} -
    - - - - - -
    - {if $EDIT_DUPLICATE eq 'permitted'} -   - {/if} - - {if $EDIT_DUPLICATE eq 'permitted'} -   - {/if} - {if $DELETE eq 'permitted'} -   - {/if} -
    - -
    - - - -{foreach key=header item=detail from=$BLOCKS} - - - - - - - - - {strip} - - {/strip} - - - {foreach item=detail from=$detail} - - {foreach key=label item=data from=$detail} - {assign var=keyid value=$data.ui} - {assign var=keyval value=$data.value} - {assign var=keytblname value=$data.tablename} - {assign var=keyfldname value=$data.fldname} - {assign var=keyoptions value=$data.options} - {assign var=keysecid value=$data.secid} - {assign var=keyseclink value=$data.link} - {assign var=keycursymb value=$data.cursymb} - {assign var=keysalut value=$data.salut} - {assign var=keycntimage value=$data.cntimage} - {assign var=keyadmin value=$data.isadmin} - - - {if $label ne ''} - {if $keycntimage ne ''} - - {elseif $label neq 'Tax Class'} - {if $keyid eq '71' || $keyid eq '72'} - - {else} - - {/if} - {/if} - {if $EDIT_PERMISSION eq 'yes'} - {include file="DetailViewUI.tpl"} - {else} - {include file="DetailViewFields.tpl"} - {/if} - {else} - - - {/if} - {/foreach} - - {/foreach} -
        -
    - - {$header} - -
    {$keycntimage}{$label} ({$keycursymb}){$label}  
    -{/foreach} -{*-- End of Blocks--*} - - -
    - - - {$ASSOCIATED_PRODUCTS} - -
    - -
    - {if $SinglePane_View eq 'false'} - - {strip} - - - - {/strip} -
    - - - - - -
    - {if $EDIT_DUPLICATE eq 'permitted'} -   - {/if} - - {if $EDIT_DUPLICATE eq 'permitted'} -   - {/if} - {if $DELETE eq 'permitted'} -   - {/if} -
    - - -
    -{/if} - - - -
    - {if $SinglePane_View eq 'true'} - {include file= 'RelatedListNew.tpl'} - {/if} -
    -
    - - -     		- - {include file="Inventory/InventoryActions.tpl"} - -
    - -
    - {include file="TagCloudDisplay.tpl"} -
    -
    -
    - -
    		- -
    - -
    - - - - - - - - - +{**} + + + +
    + + + + + + + +
    + {include file='Buttons_List1.tpl'} + + + + + + + + +
    + +
    + + + + + + + + + +
    + [ {$ID} ] {$NAME} - {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION}   +  
    {$UPDATEINFO}
    + +
    + + + + + + + + + +
    + + + + + + {if $MODULE eq 'Products'} + + + {/if} + {if $SinglePane_View eq 'false'} + + {/if} + + +
     {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION} {$APP.LBL_DEPLIST} {$APP.LBL_INFORMATION} {$APP.LBL_MORE} {$APP.LBL_INFORMATION} 
    +
    + + + + + +
    + + + + + + +
    + + + + +
    + {include file='DetailViewHidden.tpl'} + + {strip} + + + + {/strip} +
    + + + + + +
    + {if $EDIT_DUPLICATE eq 'permitted'} +   + {/if} + + {if $EDIT_DUPLICATE eq 'permitted'} +   + {/if} + {if $DELETE eq 'permitted'} +   + {/if} +
    + +
    + + + +{foreach key=header item=detail from=$BLOCKS} + + + + + + + + + {strip} + + {/strip} + + + {foreach item=detail from=$detail} + + {foreach key=label item=data from=$detail} + {assign var=keyid value=$data.ui} + {assign var=keyval value=$data.value} + {assign var=keytblname value=$data.tablename} + {assign var=keyfldname value=$data.fldname} + {assign var=keyoptions value=$data.options} + {assign var=keysecid value=$data.secid} + {assign var=keyseclink value=$data.link} + {assign var=keycursymb value=$data.cursymb} + {assign var=keysalut value=$data.salut} + {assign var=keycntimage value=$data.cntimage} + {assign var=keyadmin value=$data.isadmin} + + + {if $label ne ''} + {if $keycntimage ne ''} + + {elseif $label neq 'Tax Class'} + {if $keyid eq '71' || $keyid eq '72'} + + {else} + + {/if} + {/if} + {if $EDIT_PERMISSION eq 'yes'} + {include file="DetailViewUI.tpl"} + {else} + {include file="DetailViewFields.tpl"} + {/if} + {/if} + {/foreach} + + {/foreach} +
        +
    + + {$header} + +
    {$keycntimage}{$label} ({$keycursymb}){$label}
    +{/foreach} +{*-- End of Blocks--*} + + +
    + + + {$ASSOCIATED_PRODUCTS} + +
    + +
    + {if $SinglePane_View eq 'false'} + + {strip} + + + + {/strip} +
    + + + + + +
    + {if $EDIT_DUPLICATE eq 'permitted'} +   + {/if} + + {if $EDIT_DUPLICATE eq 'permitted'} +   + {/if} + {if $DELETE eq 'permitted'} +   + {/if} +
    + + +
    +{/if} + + + +
    + {if $SinglePane_View eq 'true'} + {include file= 'RelatedListNew.tpl'} + {/if} +
    +
    + + +     		+ + {include file="Inventory/InventoryActions.tpl"} + +
    + +
    + {include file="TagCloudDisplay.tpl"} +
    +
    +
    + +
    		+ +
    + +
    + + + + + + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryEditView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryEditView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/InventoryEditView.tpl Mon Apr 16 12:27:44 2007 @@ -1,197 +1,201 @@ -{**} - -{**} - - - - - - - - - - {include file='Buttons_List1.tpl'} - -{**} - - - - - - -
    - {**} -
    - - {if $OP_MODE eq 'edit_view'} - [ {$ID} ] {$NAME} - {$APP.LBL_EDITING} {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION}
    - {$UPDATEINFO} - {/if} - {if $OP_MODE eq 'create_view'} - {$APP.LBL_CREATING} {$MOD[$SINGLE_MOD]}
    - {/if} - -
    -
    - - {include file='EditViewHidden.tpl'} - - {**} - - - - - - - -
    - - - - - - - -
     {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION}  
    -
    - - - - - - - -
    - {**} - - - - - - - - -
    - - - - - - - - {foreach key=header item=data from=$BLOCKS} - - {if $header== $MOD.LBL_ADDRESS_INFORMATION && ($MODULE == 'Accounts' || $MODULE == 'Contacts' || $MODULE == 'Quotes' || $MODULE == 'PurchaseOrder' || $MODULE == 'SalesOrder'|| $MODULE == 'Invoice')} - - - - {else} - - - - - {include file="DisplayFields.tpl"} - - - - {/foreach} - - - - {if $MODULE eq 'PurchaseOrder' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Invoice'} - - - - {/if} - - - - -
    -
    - - -
    -
    - {$header} - {$APP.LBL_RCPY_ADDRESS} - {$APP.LBL_LCPY_ADDRESS} - {$header} - {/if} -
     
    - {include file="Inventory/ProductDetailsEditView.tpl"} -
    -
    - - -
    -
    -
    -     		- - {include file="Inventory/InventoryActions.tpl"} -
    -
    -
    -
    - - - - - - +{**} + +{**} + + + + + + + + + + {include file='Buttons_List1.tpl'} + +{**} + + + + + + +
    + {**} +
    + + {if $OP_MODE eq 'edit_view'} + [ {$ID} ] {$NAME} - {$APP.LBL_EDITING} {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION}
    + {$UPDATEINFO} + {/if} + {if $OP_MODE eq 'create_view'} + {$APP.LBL_CREATING} {$MOD[$SINGLE_MOD]}
    + {/if} + +
    +
    + + {include file='EditViewHidden.tpl'} + + {**} + + + + + + + +
    + + + + + + + +
     {$MOD[$SINGLE_MOD]} {$APP.LBL_INFORMATION}  
    +
    + + + + + + +
    + {**} + + + + + + + + +
    + + + + + + + + {foreach key=header item=data from=$BLOCKS} + + {if $header== $MOD.LBL_ADDRESS_INFORMATION && ($MODULE == 'Accounts' || $MODULE == 'Contacts' || $MODULE == 'Quotes' || $MODULE == 'PurchaseOrder' || $MODULE == 'SalesOrder'|| $MODULE == 'Invoice')} + + + + {else} + + + + + {include file="DisplayFields.tpl"} + + + + {/foreach} + + + + {if $MODULE eq 'PurchaseOrder' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Invoice'} + + + + {/if} + + + + +
    +
    + + +
    +
    + {$header} + {$APP.LBL_RCPY_ADDRESS} + {$APP.LBL_LCPY_ADDRESS} + {$header} + {/if} +
     
    + {include file="Inventory/ProductDetailsEditView.tpl"} +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + + + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/ProductDetails.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/ProductDetails.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/ProductDetails.tpl Mon Apr 16 12:27:44 2007 @@ -28,7 +28,7 @@ var curr_productid = document.getElementById("hdnProductId"+curr_row).value; if(curr_productid == '') {ldelim} - alert("Please select a Product"); + alert("{$APP.PLEASE_SELECT_PRODUCT}"); return false; {rdelim} {rdelim} @@ -36,24 +36,24 @@ //Set the Header value for Discount if(mode == 'discount') {ldelim} - document.getElementById("discount_div_title"+curr_row).innerHTML = 'Set Discount for : '+document.getElementById("productTotal"+curr_row).innerHTML+''; + document.getElementById("discount_div_title"+curr_row).innerHTML = '{$APP.LABEL_SET_DISCOUNT_FOR_COLON} '+document.getElementById("productTotal"+curr_row).innerHTML+''; {rdelim} else if(mode == 'tax') {ldelim} - document.getElementById("tax_div_title"+curr_row).innerHTML = "Set Tax for "+document.getElementById("totalAfterDiscount"+curr_row).innerHTML+''; + document.getElementById("tax_div_title"+curr_row).innerHTML = "{$APP.LABEL_SET_TAX_FOR} "+document.getElementById("totalAfterDiscount"+curr_row).innerHTML+''; {rdelim} else if(mode == 'discount_final') {ldelim} - document.getElementById("discount_div_title_final").innerHTML = 'Set Discount for : '+document.getElementById("netTotal").innerHTML+''; + document.getElementById("discount_div_title_final").innerHTML = '{$APP.LABEL_SET_DISCOUNT_FOR} '+document.getElementById("netTotal").innerHTML+''; {rdelim} else if(mode == 'sh_tax_div_title') {ldelim} - document.getElementById("sh_tax_div_title").innerHTML = 'Set S&H Tax for : '+document.getElementById("shipping_handling_charge").value+''; + document.getElementById("sh_tax_div_title").innerHTML = '{$APP.LABEL_SET_SH_TAX_FOR_COLON} '+document.getElementById("shipping_handling_charge").value+''; {rdelim} else if(mode == 'group_tax_div_title') {ldelim} var net_total_after_discount = eval(document.getElementById("netTotal").innerHTML)-eval(document.getElementById("discountTotal_final").innerHTML); - document.getElementById("group_tax_div_title").innerHTML = 'Set Group Tax for : '+net_total_after_discount+''; + document.getElementById("group_tax_div_title").innerHTML = '{$APP.LABEL_SET_GROUP_TAX_FOR_COLON} '+net_total_after_discount+''; {rdelim} fnvshobj(currObj,'tax_container'); @@ -170,7 +170,7 @@ - + @@ -180,7 +180,7 @@ @@ -199,7 +199,7 @@ - + @@ -299,7 +299,7 @@ - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/ProductDetailsEditView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/ProductDetailsEditView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Inventory/ProductDetailsEditView.tpl Mon Apr 16 12:27:44 2007 @@ -29,7 +29,7 @@ var curr_productid = document.getElementById("hdnProductId"+curr_row).value; if(curr_productid == '') {ldelim} - alert("Please select a Product"); + alert("{$APP.PLEASE_SELECT_PRODUCT}"); return false; {rdelim} {rdelim} @@ -37,24 +37,24 @@ //Set the Header value for Discount if(mode == 'discount') {ldelim} - document.getElementById("discount_div_title"+curr_row).innerHTML = 'Set Discount for : '+document.getElementById("productTotal"+curr_row).innerHTML+''; + document.getElementById("discount_div_title"+curr_row).innerHTML = '{$APP.LABEL_SET_DISCOUNT_FOR_X_COLON} '+document.getElementById("productTotal"+curr_row).innerHTML+''; {rdelim} else if(mode == 'tax') {ldelim} - document.getElementById("tax_div_title"+curr_row).innerHTML = "Set Tax for "+document.getElementById("totalAfterDiscount"+curr_row).innerHTML+''; + document.getElementById("tax_div_title"+curr_row).innerHTML = "{$APP.LABEL_SET_TAX_FOR} "+document.getElementById("totalAfterDiscount"+curr_row).innerHTML+''; {rdelim} else if(mode == 'discount_final') {ldelim} - document.getElementById("discount_div_title_final").innerHTML = 'Set Discount for : '+document.getElementById("netTotal").innerHTML+''; + document.getElementById("discount_div_title_final").innerHTML = '{$APP.LABEL_SET_DISCOUNT_FOR_COLON} '+document.getElementById("netTotal").innerHTML+''; {rdelim} else if(mode == 'sh_tax_div_title') {ldelim} - document.getElementById("sh_tax_div_title").innerHTML = 'Set S&H Tax for : '+document.getElementById("shipping_handling_charge").value+''; + document.getElementById("sh_tax_div_title").innerHTML = '{$APP.LABEL_SET_SH_TAX_FOR_COLON} '+document.getElementById("shipping_handling_charge").value+''; {rdelim} else if(mode == 'group_tax_div_title') {ldelim} var net_total_after_discount = eval(document.getElementById("netTotal").innerHTML)-eval(document.getElementById("discountTotal_final").innerHTML); - document.getElementById("group_tax_div_title").innerHTML = 'Set Group Tax for : '+net_total_after_discount+''; + document.getElementById("group_tax_div_title").innerHTML = '{$APP.LABEL_SET_GROUP_TAX_FOR_COLON} '+net_total_after_discount+''; {rdelim} fnvshobj(currObj,'tax_container'); @@ -132,6 +132,7 @@ {assign var="hdnProductId" value="hdnProductId"|cat:$row_no} {assign var="productName" value="productName"|cat:$row_no} {assign var="comment" value="comment"|cat:$row_no} + {assign var="productDescription" value="productDescription"|cat:$row_no} {assign var="qtyInStock" value="qtyInStock"|cat:$row_no} {assign var="qty" value="qty"|cat:$row_no} {assign var="listPrice" value="listPrice"|cat:$row_no} @@ -169,6 +170,7 @@ @@ -192,7 +194,7 @@ @@ -201,7 +203,7 @@
    -   +  
      % {$APP.LBL_OF_PRICE} % %
     {$APP.LBL_DIRECT_PRICE_REDUCTION}
      % {$APP.LBL_OF_PRICE} % %
     {$APP.LBL_DIRECT_PRICE_REDUCTION} +
    - +
    @@ -220,7 +222,7 @@ - + @@ -350,7 +352,7 @@ - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ListEmailTemplates.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ListEmailTemplates.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ListEmailTemplates.tpl Mon Apr 16 12:27:44 2007 @@ -1,192 +1,191 @@ -{**} - - - -
    -
    -   +  
      % {$APP.LBL_OF_PRICE} % %
     {$APP.LBL_DIRECT_PRICE_REDUCTION}
      % {$APP.LBL_OF_PRICE} % %
     {$APP.LBL_DIRECT_PRICE_REDUCTION}
    - - - - -
    -
    -
    - - {include file='SetMenu.tpl'} - - - - - - - - - - - - - - -
    {$MOD.LBL_SETTINGS} > {$UMOD.LBL_EMAIL_TEMPLATES}
    {$UMOD.LBL_EMAIL_TEMPLATE_DESC}
    - -
    - - - - -
    - - - - - - -
    {$UMOD.LBL_EMAIL_TEMPLATES}  -
    - - - - - - -
    - - - - - - - - - {foreach name=emailtemplate item=template from=$TEMPLATES} - - - - - - - - {/foreach} -
    #{$UMOD.LBL_LIST_SELECT}{$UMOD.LBL_EMAIL_TEMPLATE}{$UMOD.LBL_DESCRIPTION}{$UMOD.LBL_TEMPLATE_TOOLS}
    {$smarty.foreach.emailtemplate.iteration} - {$template.templatename} - {$template.description}  - {$UMOD.LNK_SAMPLE_EMAIL} -
    - - - - -
    {$MOD.LBL_SCROLL}
    -
    - - - -
    - - - - - -
    - - - - - +{**} + + + +
    + + + + + +
    +
    +
    + + {include file='SetMenu.tpl'} + + + + + + + + + + + + + + +
    {$MOD.LBL_SETTINGS} > {$UMOD.LBL_EMAIL_TEMPLATES}
    {$UMOD.LBL_EMAIL_TEMPLATE_DESC}
    + +
    + + + + +
    + + + + + + +
    {$UMOD.LBL_EMAIL_TEMPLATES}  +
    + + + + + + +
    + + + + + + + + + {foreach name=emailtemplate item=template from=$TEMPLATES} + + + + + + + + {/foreach} +
    #{$UMOD.LBL_LIST_SELECT}{$UMOD.LBL_EMAIL_TEMPLATE}{$UMOD.LBL_DESCRIPTION}
    {$smarty.foreach.emailtemplate.iteration} + {$template.templatename} + {$template.description} 
    + + + + +
    {$MOD.LBL_SCROLL}
    +
    + + + +
    + + + + + +
    + + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ListGroup.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ListGroup.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ListGroup.tpl Mon Apr 16 12:27:44 2007 @@ -23,7 +23,7 @@ - + @@ -67,11 +67,11 @@ Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ListLeadCustomFieldMapping.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ListLeadCustomFieldMapping.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ListLeadCustomFieldMapping.tpl Mon Apr 16 12:27:44 2007 @@ -83,7 +83,7 @@ + - - - - - - - - - -
    {$smarty.foreach.grouplist.iteration} - {$APP.LNK_EDIT} | + {$APP.LNK_EDIT} | {$LNK_DELETE} - {$groupvalues.groupname} + {$groupvalues.groupname} {$groupvalues.description}
    - - - - - - - - -

    - {$MOD.LBL_SETTINGS} > {$MOD.LBL_UPGRADE_VTIGER} - -               - {if $502_PATCH eq 'apply'} - Click here to apply the 5.0.2 Database changes from 5.0.0/5.0.1 - {/if} - -
    -     		 
    - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {if $GET_MYSQL_PATH eq 1} - - - - - {/if} - - - -
    - {$MOD.LBL_UPGRADE_VTIGER}
    - ({$MOD.LBL_UPGRADE_FROM_VTIGER_423}) -
    - {$MOD.LBL_STEP} 1 : - {$MOD.LBL_SELECT_SOURCE}
    - {$MOD.LBL_STEP1_DESC}

    -
    - - - {$MOD.LBL_RADIO_BUTTON1_TEXT}

    - {$MOD.LBL_NOTE_TITLE} {$MOD.LBL_RADIO_BUTTON1_DESC} -
    - - - {$MOD.LBL_RADIO_BUTTON2_TEXT}

    - {$MOD.LBL_NOTE_TITLE} {$MOD.LBL_RADIO_BUTTON2_DESC} -
    - - - {$MOD.LBL_RADIO_BUTTON3_TEXT}

    {$MOD.LBL_NOTE_TITLE} {$MOD.LBL_RADIO_BUTTON3_DESC} -
    - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    - {$MOD.LBL_STEP} 2 : - {$MOD.LBL_HOST_DB_ACCESS_DETAILS}

    -
    {$MOD.LBL_SOURCE_HOST_NAME}
    {$MOD.LBL_SOURCE_MYSQL_PORT_NO}
    {$MOD.LBL_SOURCE_MYSQL_USER_NAME}
    {$MOD.LBL_SOURCE_MYSQL_PASSWORD}
    {$MOD.LBL_SOURCE_DB_NAME}
    -
    - - -
    - - - - - - - - - - - - - -
    - {$MOD.LBL_STEP} 2 : - {$MOD.LBL_LOCATE_DB_DUMP_FILE}

    -
      - {$MOD.LBL_DUMP_FILE_LOCATION} - -
    {$MOD.LBL_NOTE_TITLE}{$MOD.LBL_NOTES_DUMP_PROCESS}
    -
    - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - {$MOD.LBL_STEP} 2 : - {$MOD.LBL_HOST_DB_ACCESS_DETAILS}

    -
     {$MOD.LBL_MYSQL_HOST_NAME_IP}
     {$MOD.LBL_MYSQL_PORT}
     {$MOD.LBL_MYSQL_USER_NAME}
     {$MOD.LBL_MYSQL_PASSWORD}
     {$MOD.LBL_DB_NAME}
    {$MOD.LBL_NOTE_TITLE} - - {$MOD.LBL_RADIO_BUTTON3_PROCESS} -
    -
    - - -
    - -
    - - - - - - - - -
    - {$MOD.LBL_STEP} 3 : - {$MOD.LBL_ENTER_MYSQL_SERVER_PATH}
    {$MOD.LBL_SERVER_PATH_DESC}

    -
    {$MOD.LBL_MYSQL_SERVER_PATH} - -
    -
    - - -
    - -   -
    -
    -
    -     		 
    - - - - - +{**} + + + + + +
    + + + + + + + + + + + + + + + +

    + {$MOD.LBL_SETTINGS} > {$MOD.LBL_UPGRADE_VTIGER} +
    +     		 
    + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {if $GET_MYSQL_PATH eq 1} + + + + + {/if} + + + +
    + {$MOD.LBL_UPGRADE_VTIGER}
    + ({$MOD.LBL_UPGRADE_FROM_VTIGER_423}) +
    + {$MOD.LBL_STEP} 1 : + {$MOD.LBL_SELECT_SOURCE}
    + {$MOD.LBL_STEP1_DESC}

    +
    + + + {$MOD.LBL_RADIO_BUTTON1_TEXT}

    + {$MOD.LBL_NOTE_TITLE} {$MOD.LBL_RADIO_BUTTON1_DESC} +
    + + + {$MOD.LBL_RADIO_BUTTON2_TEXT}

    + {$MOD.LBL_NOTE_TITLE} {$MOD.LBL_RADIO_BUTTON2_DESC} +
    + + + {$MOD.LBL_RADIO_BUTTON3_TEXT}

    {$MOD.LBL_NOTE_TITLE} {$MOD.LBL_RADIO_BUTTON3_DESC} +
    + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    + {$MOD.LBL_STEP} 2 : + {$MOD.LBL_HOST_DB_ACCESS_DETAILS}

    +
    {$MOD.LBL_SOURCE_HOST_NAME}
    {$MOD.LBL_SOURCE_MYSQL_PORT_NO}
    {$MOD.LBL_SOURCE_MYSQL_USER_NAME}
    {$MOD.LBL_SOURCE_MYSQL_PASSWORD}
    {$MOD.LBL_SOURCE_DB_NAME}
    +
    + + +
    + + + + + + + + + + + + + +
    + {$MOD.LBL_STEP} 2 : + {$MOD.LBL_LOCATE_DB_DUMP_FILE}

    +
      + {$MOD.LBL_DUMP_FILE_LOCATION} + +
    {$MOD.LBL_NOTE_TITLE}{$MOD.LBL_NOTES_DUMP_PROCESS}
    +
    + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + {$MOD.LBL_STEP} 2 : + {$MOD.LBL_HOST_DB_ACCESS_DETAILS}

    +
     {$MOD.LBL_MYSQL_HOST_NAME_IP}
     {$MOD.LBL_MYSQL_PORT}
     {$MOD.LBL_MYSQL_USER_NAME}
     {$MOD.LBL_MYSQL_PASSWORD}
     {$MOD.LBL_DB_NAME}
    {$MOD.LBL_NOTE_TITLE} + + {$MOD.LBL_RADIO_BUTTON3_PROCESS} +
    +
    + + +
    + +
    + + + + + + + + +
    + {$MOD.LBL_STEP} 3 : + {$MOD.LBL_ENTER_MYSQL_SERVER_PATH}
    {$MOD.LBL_SERVER_PATH_DESC}

    +
    {$MOD.LBL_MYSQL_SERVER_PATH} + +
    +
    + + +
    + +   +
    +
    +
    +     		 
    + +
    + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/OrgSharingDetailView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/OrgSharingDetailView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/OrgSharingDetailView.tpl Mon Apr 16 12:27:44 2007 @@ -45,7 +45,7 @@ - + @@ -194,22 +194,22 @@
    -
    Users{$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_SHARING_ACCESS}  
    +
    -
    - +
    -

    {$CMOD.LBL_RECALC_MSG}

    +     		+ {$CMOD.LBL_RECALC_MSG}
        
    - - - - - - - - - +{**} +{literal} + +{/literal} + + + +{/literal} + +
    + + + + + +
    +
    +
    + {include file='SetMenu.tpl'} + +
    + + + + + + + + + + + + + + + + +
    {$MOD.LBL_PROFILES}{$MOD.LBL_SETTINGS} > {$CMOD.LBL_PROFILE_PRIVILEGES} > {$CMOD.LBL_VIEWING} "{$PROFILE_NAME}"
    {$CMOD.LBL_PROFILE_MESG} "{$PROFILE_NAME}"
    + + + + + + +
    + + + + +
    + + + + + +
    + + + + + +
    + + + + + + + + +
    + + + + +
    + + + + + + + +
    {$CMOD.LBL_DEFINE_PRIV_FOR} <{$PROFILE_NAME}>
    + {$CMOD.LBL_USE_OPTION_TO_SET_PRIV}
    		   +
    + + + + + + + + + + +
    + + + + +
    + + + + + + +
    {$CMOD.LBL_SUPER_USER_PRIV}
    + + + + + +
      + + + + + + + + + + + + + + + + + + + + + +
    {$GLOBAL_PRIV.0}{$CMOD.LBL_VIEW_ALL}
    {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}
     
    {$GLOBAL_PRIV.1}{$CMOD.LBL_EDIT_ALL}
    {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_EDIT}
    +
    +
    + + + + + +
    {$CMOD.LBL_SET_PRIV_FOR_EACH_MODULE}
    + + + + + + +
      + + + + + + + + + + + + + + + {foreach key=tabid item=elements from=$TAB_PRIV} + + {assign var=modulename value=$TAB_PRIV[$tabid][0]} + + + + + + + + + + + {/foreach} + +
    {$CMOD.LBL_TAB_MESG_OPTION}
    {$CMOD.LBL_EDIT_PERMISSIONS}
    		{$CMOD.LBL_FIELDS_AND_TOOLS_SETTINGS}
    {$CMOD.LBL_CREATE_EDIT} +
    {$CMOD.LBL_VIEW}
    {$CMOD.LBL_DELETE}
    + {$TAB_PRIV[$tabid][1]} +

    {$APP[$modulename]}

    		 
    + {$STANDARD_PRIV[$tabid][1]} +
    		 
    + {$STANDARD_PRIV[$tabid][3]} +
    		 
    + {$STANDARD_PRIV[$tabid][2]} +
    		 
    + {if $FIELD_PRIVILEGES[$tabid] neq NULL || $modulename eq 'Emails'} + {$APP.LBL_EXPAND_COLLAPSE} + {/if} +
    + + + {if $FIELD_PRIVILEGES[$tabid] neq ''} + + {if $modulename eq 'Calendar'} + + {else} + + {/if} + + {/if} + {foreach item=row_values from=$FIELD_PRIVILEGES[$tabid]} + + {foreach item=element from=$row_values} + + + {/foreach} + + {/foreach} + {if $modulename eq 'Calendar'} + + + + {foreach item=row_values from=$FIELD_PRIVILEGES[16]} + + {foreach item=element from=$row_values} + + + {/foreach} + + {/foreach} + {/if} + {if $UTILITIES_PRIV[$tabid] neq ''} + + + + {/if} + {foreach item=util_value from=$UTILITIES_PRIV[$tabid]} + + {foreach item=util_elements from=$util_value} + + + {/foreach} + + {/foreach} + +
    {$CMOD.LBL_FIELDS_SELECT_DESELECT} ({$APP.Tasks}){$CMOD.LBL_FIELDS_SELECT_DESELECT}
    {$element.1}{$element.0}
    {$CMOD.LBL_FIELDS_SELECT_DESELECT} ({$APP.Events})
    {$element.1}{$element.0}
    {$CMOD.LBL_TOOLS_TO_BE_SHOWN}
    {$util_elements.1}{$APP[$util_elements.0]}
    +
    +
    +
    + + + + + + +
    *{$CMOD.LBL_MANDATORY_MSG}
    *{$CMOD.LBL_DISABLE_FIELD_MSG}
    +
    + + + + + + + + + +
     
    +
    +
    +
    + + + + + + + +
    +

     

    + + +
    {$MOD.LBL_SCROLL}
    + +
    + + + + + + + + + + + + + + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/QuickCreate.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/QuickCreate.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/QuickCreate.tpl Mon Apr 16 12:27:44 2007 @@ -17,7 +17,7 @@ - +
    {$APP.LBL_CREATE_BUTTON_LABEL} {$APP.$QCMODULE}Quick Create
    {$APP.LBL_QUICK_CREATE}
    @@ -66,10 +66,19 @@ {$fldlabel} - + {elseif $uitype eq 50} - + {elseif $uitype eq 73} - + {elseif $uitype eq 75 || $uitype eq 81} - +   {/if} {elseif $uitype eq 57} - + {elseif $uitype eq 80} - + {elseif $uitype eq 78} - + {elseif $uitype eq 76} - + {elseif $uitype eq 17} @@ -228,10 +237,22 @@ {assign var=date_val value="$date_value"} {assign var=time_val value="$time_value"} {/foreach} - + {foreach key=date_fmt item=date_str from=$secondvalue} + {assign var=dateFormat value="$date_fmt"} + {assign var=dateStr value="$date_str"} + {/foreach} + {if $uitype eq 6 && $QCMODULE eq 'Event'} + {assign var=datejsfn value="onChange='dochange(\"jscal_field_date_start\",\"jscal_field_due_date\");'"} + {assign var=timejsfn value="onChange='calQCduedatetime();'"} + + {else} + {assign var=datejsfn value=""} + {assign var=timejsfn value=""} + {/if} + {if $uitype eq 6} - + {/if} {if $uitype eq 23 && $QCMODULE eq 'Event'} @@ -239,10 +260,6 @@ getCalendarPopup('jscal_trigger_{$fldname}','jscal_field_{$fldname}','{$dateFormat}'); {/if} - {foreach key=date_format item=date_str from=$secondvalue} - {assign var=dateFormat value="$date_format"} - {assign var=dateStr value="$date_str"} - {/foreach} {if $uitype eq 5 || $uitype eq 23}
    ({$dateStr}) {else} @@ -275,7 +292,7 @@ +  {$APP.LBL_SELECT}  {elseif $uitype eq 357} @@ -287,7 +304,7 @@ {/foreach} -  Select  +  {$APP.LBL_SELECT}  {elseif $uitype eq 55} @@ -322,7 +339,7 @@ Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ReportRun.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ReportRun.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ReportRun.tpl Mon Apr 16 12:27:44 2007 @@ -12,7 +12,7 @@ -->*}
    - + @@ -64,13 +64,13 @@ {if $report_in_fld_id neq $REPORTID} {else} - + {/if} {else} {if $report_in_fld_id neq $REPORTID} {else} - + {/if} {/if} {/foreach} @@ -205,7 +205,9 @@ var reportinfr = 'Reporting "'+stdDateFilterFieldvalue+'" ( till '+enddatevalue+')'; }else if(startdatevalue == '' && enddatevalue =='') { - var reportinfr = 'No filter Selected'; + {/literal} + var reportinfr = "{$MOD.NO_FILTER_SELECTED}"; + {literal} }else if(startdatevalue != '' && enddatevalue !='') { var reportinfr = 'Reporting "'+stdDateFilterFieldvalue+'" of "'+stdDateFiltervalue+'" ( '+startdatevalue+' to '+enddatevalue+' )'; Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Reports.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Reports.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Reports.tpl Mon Apr 16 12:27:44 2007 @@ -13,7 +13,7 @@ -->*} {**} - +
    - {foreach item=arr from=$fldvalue} {foreach key=sel_value item=value from=$arr} + {if $MOD.$sel_value neq ''} + {else} + + {/if} {/foreach} {/foreach} @@ -150,14 +159,14 @@ {assign var='popuptype' value = 'specific_contact_account_address'} {/if} {$fldlabel} Select  {$APP.LBL_SELECT} *{$fldlabel} Select {$APP.LBL_SELECT}*{$fldlabel} Select {$APP.LBL_SELECT} @@ -168,25 +177,25 @@ {/if} {$fldlabel}  Select +  {$APP.LBL_SELECT} {if $uitype eq 75} -  {$fldlabel} Select  {$APP.LBL_SELECT} {$fldlabel} Select  {$APP.LBL_SELECT} {$fldlabel} Select  {$APP.LBL_SELECT} {$fldlabel} Select  {$APP.LBL_SELECT} {$fldlabel} -  Select To: 
    CC:  @@ -302,7 +319,7 @@ {$fldlabel} -  Select  +  {$APP.LBL_SELECT}  {if $MODULE eq 'Products'} -
    Files Maximum 6 +
    {$APP.Files_Maximum_6}
    - + + {literal} - + + {literal} {include file='Buttons_List1.tpl'} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ReportColumns.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ReportColumns.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ReportColumns.tpl Mon Apr 16 12:27:44 2007 @@ -35,7 +35,7 @@
    		- {$BLOCK2}
    @@ -28,13 +28,13 @@ @@ -82,15 +82,15 @@
    - + - + - + - +
    Create {$MODULE}...{$MOD.LBL_CREATE_REPORT}...  Create New Folder...{$MOD.Create_New_Folder}...  Move Reports...{$MOD.Move_Reports}...  Delete Report...{$MOD.LBL_DELETE_FOLDER}...
    - - +
    {$MOD.LBL_REP_FOLDER_NAME} + - +
    {$MOD.LBL_REP_FOLDER_DESC}
    @@ -135,7 +135,9 @@ { var title = 'folder'+id; var fldr_name = getObj(title).innerHTML; - if(confirm("Are you sure you want to delete the folder '"+fldr_name +"' ?")) + {/literal} + if(confirm("{$APP.DELETE_FOLDER_CONFIRMATION}"+fldr_name +"' ?")) + {literal} { new Ajax.Request( 'index.php', @@ -159,42 +161,74 @@ { if(getObj('folder_name').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert('The Folder name cannot be empty'); - return false; + {/literal} + alert('{$APP.FOLDERNAME_CANNOT_BE_EMPTY}'); + return false; + {literal} } else { - fninvsh('orgLay'); - var foldername = getObj('folder_name').value; - var folderdesc = getObj('folder_desc').value; - getObj('folder_name').value = ''; - getObj('folder_desc').value = ''; - foldername = foldername.replace(/&/gi,'*amp*') - folderdesc = folderdesc.replace(/&/gi,'*amp*') - var mode = getObj('fldrsave_mode').value; - if(mode == 'save') - { - url ='&savemode=Save&foldername='+foldername+'&folderdesc='+folderdesc; - } - else - { - var folderid = getObj('folder_id').value; - url ='&savemode=Edit&foldername='+foldername+'&folderdesc='+folderdesc+'&record='+folderid; - } - getObj('fldrsave_mode').value = 'save'; new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody: 'action=ReportsAjax&mode=ajax&file=SaveReportFolder&module=Reports'+url, + postBody: 'action=ReportsAjax&mode=ajax&file=CheckReport&module=Reports&check=folderCheck&folderName='+getObj('folder_name').value, onComplete: function(response) { - var item = response.responseText; - getObj('customizedrep').innerHTML = item; - } - } - ); - } -} + if((response.responseText==1) && (mode == 'Edit')) + { + {/literal} + alert("{$APP.FOLDER_NAME_ALREADY_EXISTS}"); + return false; + {literal} + } + else if((response.responseText !=0) && (mode == 'Edit')) + { + {/literal}; + alert("{$APP.FOLDER_NAME_ALREADY_EXISTS}"); + return false; + {literal} + } + else + { + fninvsh('orgLay'); + var foldername = getObj('folder_name').value; + var folderdesc = getObj('folder_desc').value; + getObj('folder_name').value = ''; + getObj('folder_desc').value = ''; + foldername = foldername.replace(/&/gi,'*amp*') + folderdesc = folderdesc.replace(/&/gi,'*amp*') + var mode = getObj('fldrsave_mode').value; + if(mode == 'save') + { + url ='&savemode=Save&foldername='+foldername+'&folderdesc='+folderdesc; + } + else + { + var folderid = getObj('folder_id').value; + url ='&savemode=Edit&foldername='+foldername+'&folderdesc='+folderdesc+'&record='+folderid; + } + getObj('fldrsave_mode').value = 'save'; + new Ajax.Request( + 'index.php', + {queue: {position: 'end', scope: 'command'}, + method: 'post', + postBody: 'action=ReportsAjax&mode=ajax&file=SaveReportFolder&module=Reports'+url, + onComplete: function(response) { + var item = response.responseText; + getObj('customizedrep').innerHTML = item; + } + } + + ); + } + } + } + ); + + } +} + + function EditFolder(id,name,desc) { {/literal} @@ -241,8 +275,9 @@ } } if(idstring != '') - { - if(confirm("Are you sure you want to delete the selected "+count+" reports ?")) + { {/literal} + if(confirm("{$APP.DELETE_CONFIRMATION}"+count+"{$APP.RECORDS}")) + {literal} { new Ajax.Request( 'index.php', @@ -262,13 +297,17 @@ }else { - alert('Please select at least one Report'); - return false; + {/literal} + alert('{$APP.SELECT_ATLEAST_ONE_REPORT}'); + return false; + {literal} } } function DeleteReport(id) { - if(confirm("Are you sure you want to delete this report ?")) + {/literal} + if(confirm("{$APP.DELETE_REPORT_CONFIRMATION}")) + {literal} { new Ajax.Request( 'index.php', @@ -323,7 +362,9 @@ } if(idstring != '') { - if(confirm("Are you sure you want to move this report to "+foldername+" folder ?")) + {/literal} + if(confirm("{$APP.MOVE_REPORT_CONFIRMATION}"+foldername+"{$APP.FOLDER}")) + {literal} { new Ajax.Request( 'index.php', @@ -342,8 +383,10 @@ }else { - alert('Please select at least one Report'); - return false; + {/literal} + alert('{$APP.SELECT_ATLEAST_ONE_REPORT}'); + return false; + {literal} } } Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ReportsCustomize.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ReportsCustomize.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ReportsCustomize.tpl Mon Apr 16 12:27:44 2007 @@ -23,7 +23,7 @@ - - -
    -   +   Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ReportsStep0.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ReportsStep0.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ReportsStep0.tpl Mon Apr 16 12:27:44 2007 @@ -11,11 +11,13 @@ -->*} - - vtiger CRM - Create Report + + {$MOD.TITLE_VTIGERCRM_CREATE_REPORT} - + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ReportsStep1.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ReportsStep1.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ReportsStep1.tpl Mon Apr 16 12:27:44 2007 @@ -11,11 +11,12 @@ -->*} - - vtiger CRM - Create Report + + {$MOD.TITLE_VTIGERCRM_CREATE_REPORT} - + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/RoleDetailView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/RoleDetailView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/RoleDetailView.tpl Mon Apr 16 12:27:44 2007 @@ -1,125 +1,125 @@ -{**} - - -
    -
    - - - - -
    -
    - -
    - {include file='SetMenu.tpl'} - - - - - - - - - - - - - - - - -
    {$MOD.LBL_SETTINGS} > {$CMOD.LBL_ROLES} > {$CMOD.LBL_VIEWING} "{$ROLE_NAME}"
    {$CMOD.LBL_VIEWING} {$CMOD.LBL_PROPERTIES} "{$ROLE_NAME}" {$MOD.LBL_LIST_CONTACT_ROLE}
    - -
    - - - - -
    - - - - - - -
    {$CMOD.LBL_PROPERTIES} "{$ROLE_NAME}"
    - -
    - - - - - - - - - - - - - -
    {$CMOD.LBL_ROLE_NAME}{$ROLE_NAME}
    {$CMOD.LBL_REPORTS_TO}{$PARENTNAME}
    {$CMOD.LBL_MEMBER} - - - - - {foreach item=elements from=$ROLEINFO.profileinfo} - - - - - - {/foreach} - - - - {if $ROLEINFO.userinfo.0 neq ''} - {foreach item=elements from=$ROLEINFO.userinfo} - - - - - - {/foreach} - {/if} -
    -
    {$CMOD.LBL_ASSOCIATED_PROFILES}
    -
    		- {$elements.1}
    -
    -
    {$CMOD.LBL_ASSOCIATED_USERS}
    -
    		- {$elements.1}
    -
    -
    - - -
    {$MOD.LBL_SCROLL}
    - - -
    - - - -
    -
    - - - - - - - +{**} + + +
    + + + + + +
    +
    + +
    + {include file='SetMenu.tpl'} + + + + + + + + + + + + + + + + +
    {$MOD.LBL_SETTINGS} > {$CMOD.LBL_ROLES} > {$CMOD.LBL_VIEWING} "{$ROLE_NAME}"
    {$CMOD.LBL_VIEWING} {$CMOD.LBL_PROPERTIES} "{$ROLE_NAME}" {$MOD.LBL_LIST_CONTACT_ROLE}
    + +
    + + + + +
    + + + + + + +
    {$CMOD.LBL_PROPERTIES} "{$ROLE_NAME}"
    + +
    + + + + + + + + + + + + + +
    {$CMOD.LBL_ROLE_NAME}{$ROLE_NAME}
    {$CMOD.LBL_REPORTS_TO}{$PARENTNAME}
    {$CMOD.LBL_MEMBER} + + + + + {foreach item=elements from=$ROLEINFO.profileinfo} + + + + + + {/foreach} + + + + {if $ROLEINFO.userinfo.0 neq ''} + {foreach item=elements from=$ROLEINFO.userinfo} + + + + + + {/foreach} + {/if} +
    +
    {$CMOD.LBL_ASSOCIATED_PROFILES}
    +
    		+ {$elements.1}
    +
    +
    {$CMOD.LBL_ASSOCIATED_USERS}
    +
    		+ {$elements.1}
    +
    +
    + + +
    {$MOD.LBL_SCROLL}
    + + +
    + + + +
    + + + + + + + + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/RoleEditView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/RoleEditView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/RoleEditView.tpl Mon Apr 16 12:27:44 2007 @@ -24,7 +24,7 @@ 'index.php', {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim}, method: 'post', - postBody: 'module=Users&action=UsersAjax&file=SaveRole&ajax=true&dup_check=true'+urlstring, + postBody: 'module=Settings&action=SettingsAjax&file=SaveRole&ajax=true&dup_check=true'+urlstring, onComplete: function(response) {ldelim} if(response.responseText == 'SUCESS') document.newRoleForm.submit(); @@ -38,16 +38,16 @@ function validate() {ldelim} formSelectColumnString(); - if( !emptyCheck( "roleName", "Role Name" ) ) + if( !emptyCheck("roleName", "Role Name", "text" ) ) return false; if(document.newRoleForm.selectedColumnsString.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) {ldelim} - alert('Role should have atlease one profile'); + alert('{$APP.ROLE_SHOULDHAVE_INFO}'); return false; {rdelim} - dup_validation(); + dup_validation();return false {rdelim}
    @@ -61,8 +61,8 @@ {include file='SetMenu.tpl'} - - + + @@ -70,11 +70,11 @@ - + {if $MODE eq 'edit'} - + {else} - + {/if} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Rss.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Rss.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Rss.tpl Mon Apr 16 12:27:44 2007 @@ -34,8 +34,10 @@ function DeleteRssFeeds(id) { if(id != '') - { - if(confirm('Are you sure to delete the rss feed?')) + { + {/literal} + if(confirm('{$APP.DELETE_RSSFEED_CONFIRMATION}')) + {literal} { show('status'); var feed = 'feed_'+id; @@ -103,7 +105,7 @@
    Roles{$CMOD.LBL_ROLES}{$MOD.LBL_SETTINGS} > {$CMOD.LBL_ROLES} > {$MOD.LBL_EDIT} "{$ROLENAME}" {$MOD.LBL_SETTINGS} > {$CMOD.LBL_ROLES} > {$MOD.LBL_EDIT} "{$ROLENAME}" {$MOD.LBL_SETTINGS} > {$CMOD.LBL_ROLES} > {$CMOD.LBL_CREATE_NEW_ROLE}{$MOD.LBL_SETTINGS} > {$CMOD.LBL_ROLES} > {$CMOD.LBL_CREATE_NEW_ROLE}
    - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/SelectEmail.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/SelectEmail.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/SelectEmail.tpl Mon Apr 16 12:27:44 2007 @@ -11,59 +11,68 @@ -->*}
    -
    {$MOD.LBL_ADD_RSS_FEED}vtiger RSS Reader{$MOD.LBL_VTIGER_RSS_READER}
    @@ -112,7 +114,7 @@ - +
    Feed Sources
    {$MOD.LBL_FEED_SOURCES}
    {$RSSFEEDS}
    - - - - -
    {$MOD.SELECT_EMAIL} - {if $ONE_RECORD neq 'true'} - ({$MOD.LBL_MULTIPLE} {$APP[$FROM_MODULE]}) - {/if} -   - {$APP.LBL_CLOSE}
    - - - + + + +
    - - - - -
    - {if $ONE_RECORD eq 'true'} - {$ENTITY_NAME} {$MOD.LBL_MAILSELECT_INFO}.

    - {else} - {$MOD.LBL_MAILSELECT_INFO1} {$APP[$FROM_MODULE]}.{$MOD.LBL_MAILSELECT_INFO2}

    - {/if} -
    - - {foreach name=emailids key=fieldid item=elements from=$MAILINFO} - - {if $smarty.foreach.emailids.iteration eq 1} - - {else} - +
    + + - {else} - - {/if} - - {/foreach} +   + + + +
    {$MOD.SELECT_EMAIL} + {if $ONE_RECORD neq 'true'} + ({$MOD.LBL_MULTIPLE} {$APP[$FROM_MODULE]}) {/if} - {if $ONE_RECORD eq 'true'} - {$elements.0}
    {$MAILDATA[$smarty.foreach.emailids.iteration]}    		{$elements.0}
    + {$APP.LBL_CLOSE} +
    +{if $PERMIT eq '0'} + + - +
    + + + +
    + {if $ONE_RECORD eq 'true'} + {$ENTITY_NAME} {$MOD.LBL_MAILSELECT_INFO}.

    + {else} + {$MOD.LBL_MAILSELECT_INFO1} {$APP[$FROM_MODULE]}.{$MOD.LBL_MAILSELECT_INFO2}

    + {/if} +
    + + {foreach name=emailids key=fieldid item=elements from=$MAILINFO} + + {if $smarty.foreach.emailids.iteration eq 1} + + {else} + + {/if} + {if $ONE_RECORD eq 'true'} + + {else} + + {/if} + + {/foreach} +
    {$elements.0}
    {$MAILDATA[$smarty.foreach.emailids.iteration]}    		{$elements.0}
    +
    +
    - -
    -
    - - - - -
    -    - -
    - - + + +
    +    + +
    +{else} + + +
    + + +
    + {$MOD.LBL_MAILSELECT_INFO3} +
    +
    +{/if} + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/SetMenu.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/SetMenu.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/SetMenu.tpl Mon Apr 16 12:27:44 2007 @@ -1,192 +1,202 @@ -{**} - - - + +
    - - - - - - - -
    - - - - - - - {if $smarty.request.action eq 'index' || $smarty.request.action eq 'DetailView' || $smarty.request.action eq 'EditView' || $smarty.request.action eq 'ListView' } - - {else} - - {/if} - - {if $smarty.request.action eq 'listroles' || $smarty.request.action eq 'RoleDetailView' || $smarty.request.action eq 'saverole' || $smarty.request.action eq 'createrole' || $smarty.request.action eq 'RoleDeleteStep1'} - - {else} - - {/if} - - {if $smarty.request.action eq 'ListProfiles' || $smarty.request.action eq 'profilePrivileges' || $smarty.request.action eq 'CreateProfile' || $smarty.request.action eq 'SaveProfile' || $smarty.request.action eq 'UpdateProfileChanges' } - - {else} - - {/if} - - {if $smarty.request.action eq 'listgroups' || $smarty.request.action eq 'GroupDetailView' || $smarty.request.action eq 'createnewgroup' || $smarty.request.action eq 'SaveGroup'} - - {else} - - {/if} - - {if $smarty.request.action eq 'OrgSharingEditView' || $smarty.request.action eq 'OrgSharingDetailView' || $smarty.request.action eq 'SaveOrgSharing'} - - {else} - - {/if} - - {if $smarty.request.action eq 'DefaultFieldPermissions' || $smarty.request.action eq 'UpdateDefaultFieldLevelAccess' || $smarty.request.action eq 'EditDefOrgFieldLevelAccess' } - - {else} - - {/if} - - {if $smarty.request.action eq 'AuditTrailList'} - - {else} - - {/if} - - {if $smarty.request.action eq 'ListLoginHistory'} - - {else} - - {/if} - - - - {if $smarty.request.action eq 'CustomFieldList' || $smarty.request.action eq 'LeadCustomFieldMapping'} - - {else} - - {/if} - - {if $smarty.request.action eq 'PickList' || $smarty.request.action eq 'SettingsAjax'} - {else} - - {/if} - - - - {if $smarty.request.action eq 'listemailtemplates' || $smarty.request.action eq 'detailviewemailtemplate' || $smarty.request.action eq 'editemailtemplate' || $smarty.request.action eq 'saveemailtemplate' || $smarty.request.action eq 'deleteemailtemplate' || $smarty.request.action eq 'createemailtemplate'} - - {else} - - {/if} - - {if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'add2db' || $smarty.request.action eq 'deletewordtemplate' || $smarty.request.action eq 'upload'} - - {else} - - {/if} - - {if $smarty.request.action eq 'listnotificationschedulers' || $smarty.request.action eq 'UsersAjax'} - - {else} - - {/if} - - {if $smarty.request.action eq 'listinventorynotifications' || $smarty.request.action eq 'UsersAjax'} - - {else} - - {/if} - - - - - {if $smarty.request.action eq 'OrganizationConfig' || $smarty.request.action eq 'EditCompanyDetails' || $smarty.request.action eq 'add2db'} - - {else} - - {/if} - - {if $smarty.request.action eq 'EmailConfig' || $smarty.request.action eq 'Save' } - - {else} - - {/if} - - {if $smarty.request.action eq 'BackupServerConfig' || $smarty.request.action eq 'Save'} - - {else} - - {/if} - - {if $smarty.request.action eq 'ListModuleOwners' || $smarty.request.action eq 'SettingsAjax'} - - {else} - - {/if} - - {if $smarty.request.action eq 'CurrencyListView' || $smarty.request.action eq 'CurrencyEditView' || $smarty.request.action eq 'SaveCurrencyInfo'} - - {else} - - {/if} - - {if $smarty.request.action eq 'TaxConfig'} - - {else} - - {/if} - - {if $smarty.request.action eq 'listsysconfig'} - - {else} - - {/if} - - {if $smarty.request.action eq 'ProxyServerConfig'} - - {else} - - {/if} - - {if $smarty.request.action eq 'Announcements' || $smarty.request.action eq 'UsersAjax' } - - {else} - - {/if} - - {if $smarty.request.action eq 'DefModuleView'} - - {else} - - {/if} - - - - {if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'} - - {else} - - {/if} - -
    {$MOD.LBL_USER_MANAGEMENT}
    {$MOD.LBL_USERS}
    {$MOD.LBL_USERS}
    {$MOD.LBL_ROLES}
    {$MOD.LBL_ROLES}
    {$MOD.LBL_PROFILES}
    {$MOD.LBL_PROFILES}
    {$MOD.USERGROUPLIST}
    {$MOD.USERGROUPLIST}
    {$MOD.LBL_SHARING_ACCESS}
    {$MOD.LBL_SHARING_ACCESS}
    {$MOD.LBL_FIELDS_ACCESS}
    {$MOD.LBL_FIELDS_ACCESS}
    {$MOD.LBL_AUDIT_TRAIL}
    {$MOD.LBL_AUDIT_TRAIL}
    {$MOD.LBL_LOGIN_HISTORY_DETAILS}
    {$MOD.LBL_LOGIN_HISTORY_DETAILS}
    {$MOD.LBL_STUDIO}
    {$MOD.LBL_CUSTOM_FIELDS}
    {$MOD.LBL_CUSTOM_FIELDS}
    {$MOD.LBL_PICKLIST_EDITOR}
    {$MOD.LBL_PICKLIST_EDITOR}
    {$MOD.LBL_COMMUNICATION_TEMPLATES}
    {$MOD.EMAILTEMPLATES}
    {$MOD.EMAILTEMPLATES}
    {$MOD.WORDINTEGRATION}
    {$MOD.WORDINTEGRATION}
    {$MOD.NOTIFICATIONSCHEDULERS}
    {$MOD.NOTIFICATIONSCHEDULERS}
    {$MOD.INVENTORYNOTIFICATION}
    {$MOD.INVENTORYNOTIFICATION}
    {$MOD.LBL_OTHER_SETTINGS}
    {$MOD.LBL_COMPANY_DETAILS}
    {$MOD.LBL_COMPANY_DETAILS}
    {$MOD.LBL_MAIL_SERVER_SETTINGS}
    {$MOD.LBL_MAIL_SERVER_SETTINGS}
    {$MOD.LBL_BACKUP_SERVER_SETTINGS}
    {$MOD.LBL_BACKUP_SERVER_SETTINGS}
    {$MOD.LBL_MODULE_OWNERS}
    {$MOD.LBL_MODULE_OWNERS}
    {$MOD.LBL_CURRENCY_SETTINGS}
    {$MOD.LBL_CURRENCY_SETTINGS}
    {$MOD.LBL_TAX_SETTINGS}
    {$MOD.LBL_TAX_SETTINGS}
    {$MOD.LBL_SYSTEM_INFO}
    {$MOD.LBL_SYSTEM_INFO}
    {$MOD.LBL_PROXY_SETTINGS}
    {$MOD.LBL_PROXY_SETTINGS}
    {$MOD.LBL_ANNOUNCEMENT}
    {$MOD.LBL_ANNOUNCEMENT}
    {$MOD.LBL_DEFAULT_MODULE_VIEW}
    {$MOD.LBL_DEFAULT_MODULE_VIEW}
    {$MOD.LBL_MIGRATION}
    {$MOD.LBL_INVENTORY_TANDC}
    {$MOD.LBL_INVENTORY_TANDC}
    - - -     		- - - - +{**} + + + - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/BackupServerContents.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/BackupServerContents.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/BackupServerContents.tpl Mon Apr 16 12:27:44 2007 @@ -59,8 +59,8 @@
    + + + +
    + + + + + + + {if $smarty.request.action eq 'index' || $smarty.request.action eq 'DetailView' || $smarty.request.action eq 'EditView' || $smarty.request.action eq 'ListView' } + + {else} + + {/if} + + {if $smarty.request.action eq 'listroles' || $smarty.request.action eq 'RoleDetailView' || $smarty.request.action eq 'saverole' || $smarty.request.action eq 'createrole' || $smarty.request.action eq 'RoleDeleteStep1'} + + {else} + + {/if} + + {if $smarty.request.action eq 'ListProfiles' || $smarty.request.action eq 'profilePrivileges' || $smarty.request.action eq 'CreateProfile' || $smarty.request.action eq 'SaveProfile' || $smarty.request.action eq 'UpdateProfileChanges' } + + {else} + + {/if} + + {if $smarty.request.action eq 'listgroups' || $smarty.request.action eq 'GroupDetailView' || $smarty.request.action eq 'createnewgroup' || $smarty.request.action eq 'SaveGroup'} + + {else} + + {/if} + + {if $smarty.request.action eq 'OrgSharingEditView' || $smarty.request.action eq 'OrgSharingDetailView' || $smarty.request.action eq 'SaveOrgSharing'} + + {else} + + {/if} + + {if $smarty.request.action eq 'DefaultFieldPermissions' || $smarty.request.action eq 'UpdateDefaultFieldLevelAccess' || $smarty.request.action eq 'EditDefOrgFieldLevelAccess' } + + {else} + + {/if} + + {if $smarty.request.action eq 'AuditTrailList'} + + {else} + + {/if} + + {if $smarty.request.action eq 'ListLoginHistory'} + + {else} + + {/if} + + + + {if $smarty.request.action eq 'CustomFieldList' || $smarty.request.action eq 'LeadCustomFieldMapping'} + + {else} + + {/if} + + {if $smarty.request.action eq 'PickList' || $smarty.request.action eq 'SettingsAjax'} + {else} + + {/if} + + + + {if $smarty.request.action eq 'listemailtemplates' || $smarty.request.action eq 'detailviewemailtemplate' || $smarty.request.action eq 'editemailtemplate' || $smarty.request.action eq 'saveemailtemplate' || $smarty.request.action eq 'deleteemailtemplate' || $smarty.request.action eq 'createemailtemplate'} + + {else} + + {/if} + + {if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'savewordtemplate' || $smarty.request.action eq 'deletewordtemplate' || $smarty.request.action eq 'upload'} + + {else} + + {/if} + + {if $smarty.request.action eq 'listnotificationschedulers' || $smarty.request.action eq 'SettingsAjax'} + + {else} + + {/if} + + {if $smarty.request.action eq 'listinventorynotifications' || $smarty.request.action eq 'SettingsAjax'} + + {else} + + {/if} + + + + + {if $smarty.request.action eq 'OrganizationConfig' || $smarty.request.action eq 'EditCompanyDetails' || $smarty.request.action eq 'add2db'} + + {else} + + {/if} + + {if $smarty.request.action eq 'EmailConfig' || $smarty.request.action eq 'Save' } + + {else} + + {/if} + + {if $smarty.request.action eq 'BackupServerConfig' || $smarty.request.action eq 'Save'} + + {else} + + {/if} + + {if $smarty.request.action eq 'ListModuleOwners' || $smarty.request.action eq 'SettingsAjax'} + + {else} + + {/if} + + {if $smarty.request.action eq 'CurrencyListView' || $smarty.request.action eq 'CurrencyEditView' || $smarty.request.action eq 'SaveCurrencyInfo'} + + {else} + + {/if} + + {if $smarty.request.action eq 'TaxConfig'} + + {else} + + {/if} + + {if $smarty.request.action eq 'listsysconfig'} + + {else} + + {/if} + + {if $smarty.request.action eq 'ProxyServerConfig'} + + {else} + + {/if} + + {if $smarty.request.action eq 'Announcements' || $smarty.request.action eq 'SettingsAjax' } + + {else} + + {/if} + + {if $smarty.request.action eq 'DefModuleView'} + + {else} + + {/if} + + + + {if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'} + + {else} + + {/if} + + + + {if $smarty.request.action eq 'CustomInvoiceNo'} + + {else} + + {/if} + + + +
    {$MOD.LBL_USER_MANAGEMENT}
    {$MOD.LBL_USERS}
    {$MOD.LBL_USERS}
    {$MOD.LBL_ROLES}
    {$MOD.LBL_ROLES}
    {$MOD.LBL_PROFILES}
    {$MOD.LBL_PROFILES}
    {$MOD.USERGROUPLIST}
    {$MOD.USERGROUPLIST}
    {$MOD.LBL_SHARING_ACCESS}
    {$MOD.LBL_SHARING_ACCESS}
    {$MOD.LBL_FIELDS_ACCESS}
    {$MOD.LBL_FIELDS_ACCESS}
    {$MOD.LBL_AUDIT_TRAIL}
    {$MOD.LBL_AUDIT_TRAIL}
    {$MOD.LBL_LOGIN_HISTORY_DETAILS}
    {$MOD.LBL_LOGIN_HISTORY_DETAILS}
    {$MOD.LBL_STUDIO}
    {$MOD.LBL_CUSTOM_FIELDS}
    {$MOD.LBL_CUSTOM_FIELDS}
    {$MOD.LBL_PICKLIST_EDITOR}
    {$MOD.LBL_PICKLIST_EDITOR}
    {$MOD.LBL_COMMUNICATION_TEMPLATES}
    {$MOD.EMAILTEMPLATES}
    {$MOD.EMAILTEMPLATES}
    {$MOD.WORDINTEGRATION}
    {$MOD.WORDINTEGRATION}
    {$MOD.NOTIFICATIONSCHEDULERS}
    {$MOD.NOTIFICATIONSCHEDULERS}
    {$MOD.INVENTORYNOTIFICATION}
    {$MOD.INVENTORYNOTIFICATION}
    {$MOD.LBL_OTHER_SETTINGS}
    {$MOD.LBL_COMPANY_DETAILS}
    {$MOD.LBL_COMPANY_DETAILS}
    {$MOD.LBL_MAIL_SERVER_SETTINGS}
    {$MOD.LBL_MAIL_SERVER_SETTINGS}
    {$MOD.LBL_BACKUP_SERVER_SETTINGS}
    {$MOD.LBL_BACKUP_SERVER_SETTINGS}
    {$MOD.LBL_MODULE_OWNERS}
    {$MOD.LBL_MODULE_OWNERS}
    {$MOD.LBL_CURRENCY_SETTINGS}
    {$MOD.LBL_CURRENCY_SETTINGS}
    {$MOD.LBL_TAX_SETTINGS}
    {$MOD.LBL_TAX_SETTINGS}
    {$MOD.LBL_SYSTEM_INFO}
    {$MOD.LBL_SYSTEM_INFO}
    {$MOD.LBL_PROXY_SETTINGS}
    {$MOD.LBL_PROXY_SETTINGS}
    {$MOD.LBL_ANNOUNCEMENT}
    {$MOD.LBL_ANNOUNCEMENT}
    {$MOD.LBL_DEFAULT_MODULE_VIEW}
    {$MOD.LBL_DEFAULT_MODULE_VIEW}
    {$MOD.LBL_MIGRATION}
    {$MOD.LBL_INVENTORY_TANDC}
    {$MOD.LBL_INVENTORY_TANDC}
    {$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER}
    {$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER}
    + + +     		+ + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings.tpl Mon Apr 16 12:27:44 2007 @@ -1,507 +1,527 @@ -{**} - - {include file="Buttons_List1.tpl"} - - - - - - - -
    -
    -
    - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - {$MOD.LBL_USER_MANAGEMENT} -
    - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - -
    {$MOD.LBL_USERS}{$MOD.LBL_USERS}
    {$MOD.LBL_USER_DESCRIPTION}
    -     		- - - - - - - - - - -
    {$MOD.LBL_ROLES}{$MOD.LBL_ROLES}
    {$MOD.LBL_ROLE_DESCRIPTION}
    - -     		- - - - - - - - - - -
    {$MOD.LBL_PROFILES}{$MOD.LBL_PROFILES}
    {$MOD.LBL_PROFILE_DESCRIPTION}
    -     		- - - - - - - - - - -
    {$MOD.USERGROUPLIST}{$MOD.USERGROUPLIST}
    {$MOD.LBL_GROUP_DESCRIPTION}
    - -
    - - - - - - - - - - -
    {$MOD.LBL_SHARING_ACCESS}{$MOD.LBL_SHARING_ACCESS}
    {$MOD.LBL_SHARING_ACCESS_DESCRIPTION}
    -     		- - - - - - - - - - - -
    Fields to be shown{$MOD.LBL_FIELDS_ACCESS}
    {$MOD.LBL_SHARING_FIELDS_DESCRIPTION}
    -     		- - - - - - - - - - -
    {$MOD.LBL_AUDIT_TRAIL}{$MOD.LBL_AUDIT_TRAIL}
    {$MOD.LBL_AUDIT_DESCRIPTION}
    - - -     		- - - - - - - - - - -
    {$MOD.LBL_LOGIN_HISTORY_DETAILS}{$MOD.LBL_LOGIN_HISTORY_DETAILS}
    {$MOD.LBL_LOGIN_HISTORY_DESCRIPTION}
    -
    - - -
    - - - {$MOD.LBL_STUDIO} -
    - - - - - - - - - - - -
    - - - - - - - - - - -
    {$MOD.LBL_CUSTOM_FIELDS}{$MOD.LBL_CUSTOM_FIELDS}
    {$MOD.LBL_CUSTOM_FIELDS_DESCRIPTION}
    -     		- - - - - - - - - - -
    {$MOD.LBL_PICKLIST_EDITOR}{$MOD.LBL_PICKLIST_EDITOR}
    {$MOD.LBL_PICKLIST_DESCRIPTION}
    -     		- - - - - - - - - - -
      
     
    -     		- - - - - - - - - - -
      
     
    -
    - - -
    - - {$MOD.LBL_COMMUNICATION_TEMPLATES} -
    - - - - - - - - - - -
    - - - - - - - - - - -
    {$MOD.EMAILTEMPLATES}{$MOD.EMAILTEMPLATES}
    {$MOD.LBL_EMAIL_TEMPLATE_DESCRIPTION}
    -     		- - - - - - - - - - - -
    {$MOD.LBL_MAIL_MERGE}{$MOD.WORDINTEGRATION}
    {$MOD.LBL_MAIL_MERGE_DESCRIPTION}
    -     		- - - - - - - - - - -
    {$MOD.NOTIFICATIONSCHEDULERS}{$MOD.NOTIFICATIONSCHEDULERS}
    {$MOD.LBL_NOTIF_SCHED_DESCRIPTION}
    -     		- - - - - - - - - - - -
    {$MOD.INVENTORYNOTIFICATION}{$MOD.INVENTORYNOTIFICATION}
    {$MOD.LBL_INV_NOTIF_DESCRIPTION}
    -
    - - -
    - - {$MOD.LBL_OTHER_SETTINGS} -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - -
    {$MOD.LBL_COMPANY_DETAILS}{$MOD.LBL_COMPANY_DETAILS}
    {$MOD.LBL_COMPANY_DESCRIPTION}
    - -     		- - - - - - - - - - -
    {$MOD.LBL_MAIL_SERVER_SETTINGS}{$MOD.LBL_MAIL_SERVER_SETTINGS}
    {$MOD.LBL_MAIL_SERVER_DESCRIPTION}
    -     		- - - - - - - - - - -
    {$MOD.LBL_BACKUP_SERVER_SETTINGS}{$MOD.LBL_BACKUP_SERVER_SETTINGS}
    {$MOD.LBL_BACKUP_SERVER_DESCRIPTION}
    - -     		- - - - - - - - - - -
    {$MOD.LBL_ASSIGN_MODULE_OWNERS}{$MOD.LBL_MODULE_OWNERS}
    {$MOD.LBL_MODULE_OWNERS_DESCRIPTION}
    -
    - - - - - - - - - - -
    {$MOD.LBL_CURRENCY_SETTINGS}{$MOD.LBL_CURRENCY_SETTINGS}
    {$MOD.LBL_CURRENCY_DESCRIPTION}
    -     		- - - - - - - - - - -
    {$MOD.LBL_TAX_SETTINGS}{$MOD.LBL_TAX_SETTINGS}
    {$MOD.LBL_TAX_DESCRIPTION}
    -     		- - - - - - - - - - -
    {$MOD.LBL_SYSTEM_INFO}{$MOD.LBL_SYSTEM_INFO}
    {$MOD.LBL_SYSTEM_DESCRIPTION}
    -     		- - - - - - - - - - - -
    {$MOD.LBL_PROXY_SETTINGS}{$MOD.LBL_PROXY_SETTINGS}
    {$MOD.LBL_PROXY_DESCRIPTION}
    -
    - - - - - - - - - - -
    {$MOD.LBL_ANNOUNCEMENT}{$MOD.LBL_ANNOUNCEMENT}
    {$MOD.LBL_ANNOUNCEMENT_DESCRIPTION}
    -     		- - - - - - - - - - -
    {$MOD.LBL_DEFAULT_MODULE_VIEW}{$MOD.LBL_DEFAULT_MODULE_VIEW}
    {$MOD.LBL_DEFAULT_MODULE_VIEW_DESC}
    -     		- - - - - - - -
    {$MOD.LBL_MIGRATION}{$MOD.LBL_MIGRATION}
    {$MOD.LBL_MIGRATION_INFO}
    		 - - - - - - - - - - -
    {$MOD.INVENTORYTERMSANDCONDITIONS}{$MOD.LBL_INVENTORY_TANDC}
    {$MOD.LBL_INV_TANDC_DESCRIPTION}
    - -
    - -
    -
    -
    - -
    - - - +{**} + + {include file="Buttons_List1.tpl"} + + + + + + + +
    +
    +
    + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + {$MOD.LBL_USER_MANAGEMENT} +
    + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + +
    {$MOD.LBL_USERS}{$MOD.LBL_USERS}
    {$MOD.LBL_USER_DESCRIPTION}
    +     		+ + + + + + + + + + +
    {$MOD.LBL_ROLES}{$MOD.LBL_ROLES}
    {$MOD.LBL_ROLE_DESCRIPTION}
    + +     		+ + + + + + + + + + +
    {$MOD.LBL_PROFILES}{$MOD.LBL_PROFILES}
    {$MOD.LBL_PROFILE_DESCRIPTION}
    +     		+ + + + + + + + + + +
    {$MOD.USERGROUPLIST}{$MOD.USERGROUPLIST}
    {$MOD.LBL_GROUP_DESCRIPTION}
    + +
    + + + + + + + + + + +
    {$MOD.LBL_SHARING_ACCESS}{$MOD.LBL_SHARING_ACCESS}
    {$MOD.LBL_SHARING_ACCESS_DESCRIPTION}
    +     		+ + + + + + + + + + + +
    {$MOD.LBL_FIELDS_TO_BE_SHOWN}{$MOD.LBL_FIELDS_ACCESS}
    {$MOD.LBL_SHARING_FIELDS_DESCRIPTION}
    +     		+ + + + + + + + + + +
    {$MOD.LBL_AUDIT_TRAIL}{$MOD.LBL_AUDIT_TRAIL}
    {$MOD.LBL_AUDIT_DESCRIPTION}
    + + +     		+ + + + + + + + + + +
    {$MOD.LBL_LOGIN_HISTORY_DETAILS}{$MOD.LBL_LOGIN_HISTORY_DETAILS}
    {$MOD.LBL_LOGIN_HISTORY_DESCRIPTION}
    +
    + + +
    + + + {$MOD.LBL_STUDIO} +
    + + + + + + + + + + + +
    + + + + + + + + + + +
    {$MOD.LBL_CUSTOM_FIELDS}{$MOD.LBL_CUSTOM_FIELDS}
    {$MOD.LBL_CUSTOM_FIELDS_DESCRIPTION}
    +     		+ + + + + + + + + + +
    {$MOD.LBL_PICKLIST_EDITOR}{$MOD.LBL_PICKLIST_EDITOR}
    {$MOD.LBL_PICKLIST_DESCRIPTION}
    +     		+ + + + + + + + + + +
      
     
    +     		+ + + + + + + + + + +
      
     
    +
    + + +
    + + {$MOD.LBL_COMMUNICATION_TEMPLATES} +
    + + + + + + + + + + +
    + + + + + + + + + + +
    {$MOD.EMAILTEMPLATES}{$MOD.EMAILTEMPLATES}
    {$MOD.LBL_EMAIL_TEMPLATE_DESCRIPTION}
    +     		+ + + + + + + + + + + +
    {$MOD.LBL_MAIL_MERGE}{$MOD.WORDINTEGRATION}
    {$MOD.LBL_MAIL_MERGE_DESCRIPTION}
    +     		+ + + + + + + + + + +
    {$MOD.NOTIFICATIONSCHEDULERS}{$MOD.NOTIFICATIONSCHEDULERS}
    {$MOD.LBL_NOTIF_SCHED_DESCRIPTION}
    +     		+ + + + + + + + + + + +
    {$MOD.INVENTORYNOTIFICATION}{$MOD.INVENTORYNOTIFICATION}
    {$MOD.LBL_INV_NOTIF_DESCRIPTION}
    +
    + + +
    + + {$MOD.LBL_OTHER_SETTINGS} +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + +
    {$MOD.LBL_COMPANY_DETAILS}{$MOD.LBL_COMPANY_DETAILS}
    {$MOD.LBL_COMPANY_DESCRIPTION}
    + +     		+ + + + + + + + + + +
    {$MOD.LBL_MAIL_SERVER_SETTINGS}{$MOD.LBL_MAIL_SERVER_SETTINGS}
    {$MOD.LBL_MAIL_SERVER_DESCRIPTION}
    +     		+ + + + + + + + + + +
    {$MOD.LBL_BACKUP_SERVER_SETTINGS}{$MOD.LBL_BACKUP_SERVER_SETTINGS}
    {$MOD.LBL_BACKUP_SERVER_DESCRIPTION}
    + +     		+ + + + + + + + + + +
    {$MOD.LBL_ASSIGN_MODULE_OWNERS}{$MOD.LBL_MODULE_OWNERS}
    {$MOD.LBL_MODULE_OWNERS_DESCRIPTION}
    +
    + + + + + + + + + + +
    {$MOD.LBL_CURRENCY_SETTINGS}{$MOD.LBL_CURRENCY_SETTINGS}
    {$MOD.LBL_CURRENCY_DESCRIPTION}
    +     		+ + + + + + + + + + +
    {$MOD.LBL_TAX_SETTINGS}{$MOD.LBL_TAX_SETTINGS}
    {$MOD.LBL_TAX_DESCRIPTION}
    +     		+ + + + + + + + + + +
    {$MOD.LBL_SYSTEM_INFO}{$MOD.LBL_SYSTEM_INFO}
    {$MOD.LBL_SYSTEM_DESCRIPTION}
    +     		+ + + + + + + + + + + +
    {$MOD.LBL_PROXY_SETTINGS}{$MOD.LBL_PROXY_SETTINGS}
    {$MOD.LBL_PROXY_DESCRIPTION}
    +
    + + + + + + + + + + +
    {$MOD.LBL_ANNOUNCEMENT}{$MOD.LBL_ANNOUNCEMENT}
    {$MOD.LBL_ANNOUNCEMENT_DESCRIPTION}
    +     		+ + + + + + + + + + +
    {$MOD.LBL_DEFAULT_MODULE_VIEW}{$MOD.LBL_DEFAULT_MODULE_VIEW}
    {$MOD.LBL_DEFAULT_MODULE_VIEW_DESC}
    +     		+ + + + + + + +
    {$MOD.LBL_MIGRATION}{$MOD.LBL_MIGRATION}
    {$MOD.LBL_MIGRATION_INFO}
    		 + + + + + + + + + + +
    {$MOD.INVENTORYTERMSANDCONDITIONS}{$MOD.LBL_INVENTORY_TANDC}
    {$MOD.LBL_INV_TANDC_DESCRIPTION}
    + +
    + + + + + + + + + + + +
    {$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER}{$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER}
    {$MOD.LBL_CUSTOMIZE_INVOICE_NUMBER_DESCRIPTION}
    +
    + +
    +
    +
    + +
    + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/Announcements.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/Announcements.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/Announcements.tpl Mon Apr 16 12:27:44 2007 @@ -18,11 +18,15 @@ { $("an_busy").style.display="inline"; var announcement=$("announcement").value; + + //Replace & with ##$## and do vice versa in modules/Settings/SettingsAjax.php. if we pass as it is, request of announcement will be skipped after & + announcement = announcement.replace(/&/g,"##$##");//replace('&','##$##'); + new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody: 'module=Users&action=UsersAjax&announcement='+announcement+'&announce_save=yes', + postBody: 'module=Settings&action=SettingsAjax&announcement='+announcement+'&announce_save=yes', onComplete: function(response) { $("announcement").innerHTML=response.responseText; $("an_busy").style.display="none"; @@ -73,9 +77,9 @@
    - +
    Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/BackupServer.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/BackupServer.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/BackupServer.tpl Mon Apr 16 12:27:44 2007 @@ -28,7 +28,7 @@
    Users{$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_BACKUP_SERVER_SETTINGS}
    - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/EmailConfig.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/EmailConfig.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/EmailConfig.tpl Mon Apr 16 12:27:44 2007 @@ -36,7 +36,7 @@
    - + @@ -132,11 +132,11 @@
    Users{$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_MAIL_SERVER_SETTINGS}
    - +
    @@ -164,8 +164,10 @@ { if(form.server.value =='') { - alert("Server Name cannot be empty") - return false; + {/literal} + alert("{$APP.SERVERNAME_CANNOT_BE_EMPTY}") + return false; + {literal} } return true; } Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/EmailNotification.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/EmailNotification.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/EmailNotification.tpl Mon Apr 16 12:27:44 2007 @@ -47,7 +47,7 @@ - + @@ -110,7 +110,7 @@ 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody: 'action=UsersAjax&module=Users&file=SaveNotification&active='+active+'¬ifysubject='+subject+'¬ifybody='+body+'&record='+id, + postBody: 'action=SettingsAjax&module=Settings&file=SaveNotification&active='+active+'¬ifysubject='+subject+'¬ifybody='+body+'&record='+id, onComplete: function(response) { $("status").style.display="none"; $("notifycontents").innerHTML=response.responseText; @@ -126,7 +126,7 @@ 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody:'action=UsersAjax&module=Users&file=EditNotification&record='+id, + postBody:'action=SettingsAjax&module=Settings&file=EditNotification&record='+id, onComplete: function(response) { $("status").style.display="none"; $("editdiv").innerHTML=response.responseText; Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/InventoryNotify.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/InventoryNotify.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/InventoryNotify.tpl Mon Apr 16 12:27:44 2007 @@ -47,7 +47,7 @@
    Users{$MOD.LBL_MODULE_NAME} {$MOD.LBL_SETTINGS} > {$MOD.NOTIFICATIONSCHEDULERS}  
    - + @@ -104,7 +104,7 @@ 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody: 'action=UsersAjax&module=Users&file=SaveInventoryNotification¬ifysubject='+subject+'¬ifybody='+body+'&record='+id, + postBody: 'action=SettingsAjax&module=Settings&file=SaveInventoryNotification¬ifysubject='+subject+'¬ifybody='+body+'&record='+id, onComplete: function(response) { $("status").style.display="none"; } @@ -119,7 +119,7 @@ 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody: 'action=UsersAjax&module=Users&file=EditInventoryNotification&record='+id, + postBody: 'action=SettingsAjax&module=Settings&file=EditInventoryNotification&record='+id, onComplete: function(response) { $("status").style.display="none"; $("editdiv").innerHTML=response.responseText; Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/InventoryTerms.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/InventoryTerms.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/InventoryTerms.tpl Mon Apr 16 12:27:44 2007 @@ -18,7 +18,7 @@ - -
    Users{$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.INVENTORYNOTIFICATION}  

    - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/ModuleOwners.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/ModuleOwners.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/ModuleOwners.tpl Mon Apr 16 12:27:44 2007 @@ -24,7 +24,7 @@ - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/PickList.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/PickList.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/PickList.tpl Mon Apr 16 12:27:44 2007 @@ -1,259 +1,267 @@ -{**} - - - - - -
    -
    Users{$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_MODULE_OWNERS}
    - - - - -
    -
    -
    - - {include file='SetMenu.tpl'} - - - - - - - - - -
    {$MOD.LBL_SETTINGS} > {$MOD.LBL_PICKLIST_EDITOR}
    {$MOD.LBL_PICKLIST_DESCRIPTION}
    - - - - - - -
    - - - - - - -
    1. {$MOD.LBL_SELECT_MODULE} 
    - - - - - -
    {$MOD.LBL_SELECT_CRM_MODULE} - -
    -
    - - - - - -
    -
    - {include file='Settings/PickListContents.tpl'} -
    -
    - - -
    {$MOD.LBL_SCROLL}
    - -
    - - - -
    -
    - - - -
    -
    -{literal} - -{/literal} +{**} + + + + + +
    + + + + + +
    +
    +
    + + {include file='SetMenu.tpl'} + + + + + + + + + +
    {$MOD.LBL_SETTINGS} > {$MOD.LBL_PICKLIST_EDITOR}
    {$MOD.LBL_PICKLIST_DESCRIPTION}
    + + + + + + +
    + + + + + + +
    1. {$MOD.LBL_SELECT_MODULE} 
    + + + + + +
    {$MOD.LBL_SELECT_CRM_MODULE} + +
    +
    + + + + + +
    +
    + {include file='Settings/PickListContents.tpl'} +
    +
    + + +
    {$MOD.LBL_SCROLL}
    + +
    + + + +
    +
    + + + +
    +
    +{literal} + +{/literal} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/ProxyServer.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/ProxyServer.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/ProxyServer.tpl Mon Apr 16 12:27:44 2007 @@ -27,7 +27,7 @@ - proxy + {$MOD.LBL_PROXY} {$MOD.LBL_SETTINGS} > {$MOD.LBL_PROXY_SERVER_SETTINGS} @@ -63,20 +63,20 @@ *{$MOD.LBL_SERVER_ADDRESS} - + *{$MOD.LBL_PROXY_PORT} - + *{$MOD.LBL_USERNAME} - + @@ -116,11 +116,11 @@ - +
    Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Settings/TaxConfig.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Settings/TaxConfig.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Settings/TaxConfig.tpl Mon Apr 16 12:27:44 2007 @@ -1,262 +1,268 @@ -{**} - - - - - -{literal} - -{/literal} -
    - - - - - - -
    -
    -
    - - {include file='SetMenu.tpl'} - -{if $EDIT_MODE eq 'true'} - {assign var=formname value='EditTax'} - {assign var=shformname value='SHEditTax'} -{else} - {assign var=formname value='ListTax'} - {assign var=shformname value='SHListTax'} -{/if} - - - - - - - - - - - -
    Users{$MOD.LBL_SETTINGS} > - {if $EDIT_MODE eq 'true'} - {$MOD.LBL_EDIT} {$MOD.LBL_TAX_SETTINGS} - {else} - {$MOD.LBL_TAX_SETTINGS} - {/if} - -
    {$MOD.LBL_TAX_DESC}
    - -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    {$MOD.LBL_PRODUCT_TAX_SETTINGS}
      - {if $EDIT_MODE neq 'true'} - - {/if} - - {if $EDIT_MODE eq 'true'} -   - - {elseif $TAX_COUNT > 0} - - {/if} -
    - - - - - {if $TAX_COUNT eq 0} - - {else} - {foreach item=tax key=count from=$TAX_VALUES} - - - {if $tax.deleted eq 0} - - {else} - - {/if} - - - {assign var=tax_label value="taxlabel_"|cat:$tax.taxname} - - - - - - {/foreach} - {if $EDIT_MODE eq 'true'} - - {/if} - {/if} -
    No taxes available. Please Add Tax.
    - {if $EDIT_MODE eq 'true'} - - {else} - {$tax.taxlabel} - {/if} - - {if $EDIT_MODE eq 'true'} -  % - {else} - {$tax.percentage} % - {/if} - - {if $tax.deleted eq 0} - Enable me - {else} - Enable me - {/if} -
    - - -     		-
    - - - - - - - - - - - - - - - - - -
    {$MOD.LBL_SHIPPING_HANDLING_TAX_SETTINGS}
      - {if $SH_EDIT_MODE neq 'true'} - - {/if} - - {if $SH_EDIT_MODE eq 'true'} - -   - - {elseif $SH_TAX_COUNT > 0} - - {/if} -
    - - - - - {if $SH_TAX_COUNT eq 0} - - {else} - {foreach item=tax key=count from=$SH_TAX_VALUES} - - - {if $tax.deleted eq 0} - - {else} - - {/if} - - {assign var=tax_label value="taxlabel_"|cat:$tax.taxname} - - - - - {/foreach} - {if $SH_EDIT_MODE eq 'true'} - - {/if} - {/if} -
    No taxes available. Please Add Tax.
    - {if $SH_EDIT_MODE eq 'true'} - - - {else} - {$tax.taxlabel} - {/if} - - {if $SH_EDIT_MODE eq 'true'} - -  % - {else} - {$tax.percentage} % - {/if} - - {if $tax.deleted eq 0} - Enable me - {else} - Enable me - {/if} -
    - -
    -
    - - - - - -
    {$MOD.LBL_SCROLL}
    - - - - -
    - - - - - - - - - - +{**} + + + + + +{literal} + +{/literal} +
    + + + + + + +
    +
    +
    + + {include file='SetMenu.tpl'} + +{if $EDIT_MODE eq 'true'} + {assign var=formname value='EditTax'} + {assign var=shformname value='SHEditTax'} +{else} + {assign var=formname value='ListTax'} + {assign var=shformname value='SHListTax'} +{/if} + + + + + + + + + + + +
    {$MOD.LBL_USERS}{$MOD.LBL_SETTINGS} > + {if $EDIT_MODE eq 'true'} + {$MOD.LBL_EDIT} {$MOD.LBL_TAX_SETTINGS} + {else} + {$MOD.LBL_TAX_SETTINGS} + {/if} + +
    {$MOD.LBL_TAX_DESC}
    + +
    + + + + + + + + +
    + +
    + + + + + + + + + + + + + + + + + +
    {$MOD.LBL_PRODUCT_TAX_SETTINGS}
      + {if $EDIT_MODE neq 'true'} + + {/if} + + {if $EDIT_MODE eq 'true'} +   + + {elseif $TAX_COUNT > 0} + + {/if} +
    + + + + + {if $TAX_COUNT eq 0} + + {else} + {foreach item=tax key=count from=$TAX_VALUES} + + + {if $tax.deleted eq 0} + + {else} + + {/if} + + + {assign var=tax_label value="taxlabel_"|cat:$tax.taxname} + + + + + + {/foreach} + {if $EDIT_MODE eq 'true'} + + {/if} + {/if} +
    {$MOD.LBL_NO_TAXES_AVAILABLE}. {$MOD.LBL_PLEASE} {$MOD.LBL_ADD_TAX_BUTTON}.
    + {if $EDIT_MODE eq 'true'} + + {else} + {$tax.taxlabel} + {/if} + + {if $EDIT_MODE eq 'true'} +  % + {else} + {$tax.percentage} % + {/if} + + {if $tax.deleted eq 0} + {$MOD.LBL_ENABLE} + {else} + {$MOD.LBL_ENABLE} + {/if} +
    + +
    +     		+
    + + + + + + + + + + + + + + + + + +
    {$MOD.LBL_SHIPPING_HANDLING_TAX_SETTINGS}
      + {if $SH_EDIT_MODE neq 'true'} + + {/if} + + {if $SH_EDIT_MODE eq 'true'} + +   + + {elseif $SH_TAX_COUNT > 0} + + {/if} +
    + + + + + {if $SH_TAX_COUNT eq 0} + + {else} + {foreach item=tax key=count from=$SH_TAX_VALUES} + + + {if $tax.deleted eq 0} + + {else} + + {/if} + + {assign var=tax_label value="taxlabel_"|cat:$tax.taxname} + + + + + {/foreach} + {if $SH_EDIT_MODE eq 'true'} + + {/if} + {/if} +
    {$MOD.LBL_NO_TAXES_AVAILABLE}. {$MOD.LBL_PLEASE} {$MOD.LBL_ADD_TAX_BUTTON}.
    + {if $SH_EDIT_MODE eq 'true'} + + + {else} + {$tax.taxlabel} + {/if} + + {if $SH_EDIT_MODE eq 'true'} + +  % + {else} + {$tax.percentage} % + {/if} + + {if $tax.deleted eq 0} + {$MOD.LBL_ENABLE} + {else} + {$MOD.LBL_DISABLE} + {/if} +
    + +
    +
    + + + + + +
    {$MOD.LBL_SCROLL}
    + + + + +
    + + + + + + + + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/ShowAuditTrail.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/ShowAuditTrail.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/ShowAuditTrail.tpl Mon Apr 16 12:27:44 2007 @@ -14,7 +14,7 @@
    - + @@ -50,7 +50,7 @@ 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody: 'module=Users&action=UsersAjax&file=ShowAuditTrail&ajax=true&'+url+'&userid='+userid, + postBody: 'module=Settings&action=SettingsAjax&file=ShowAuditTrail&ajax=true&'+url+'&userid='+userid, onComplete: function(response) { $("AuditTrailContents").innerHTML= response.responseText; } Modified: vtigercrm/branches/5.1_jens/Smarty/templates/SysInformation.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/SysInformation.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/SysInformation.tpl Mon Apr 16 12:27:44 2007 @@ -21,7 +21,7 @@
    - + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/UserDetailView.tpl Mon Apr 16 12:27:44 2007 @@ -1,359 +1,360 @@ -{**} - - - - - - - - -
    - -
    Users{$MOD.LBL_USERS} {$MOD.LBL_SETTINGS} > {$MOD.LBL_SYSTEM_INFO}
    - - - - - -
    -
    -
    - {if $CATEGORY eq 'Settings'} - {include file='SetMenu.tpl'} - {/if} - - - - -
    - - - - - - - {if $CATEGORY neq 'Settings'} - - {/if} - - - - - - - {if $CATEGORY eq 'Settings'} - - {/if} - - - - - - - - - - - - - - -
    - - - - - - - - - - -
    - {if $CATEGORY eq 'Settings'} - - {$MOD.LBL_SETTINGS} > {$MOD.LBL_USERS} >"{$USERNAME}" - {else} - - {$APP.LBL_MY_PREFERENCES} - - {/if} - -
    {$UMOD.LBL_USERDETAIL_INFO} "{$USERNAME}"
    -
     
    - {if $IS_ADMIN eq 'true'} - - {/if} - {if $CATEGORY eq 'Settings'} - {$DUPLICATE_BUTTON} - {/if} - {$EDIT_BUTTON} - {if $CATEGORY eq 'Settings' && $ID neq 1 && $ID neq 2 & $ID neq $CURRENT_USERID} - - {/if} -
    - - - - - -
    - {foreach key=header name=blockforeach item=detail from=$BLOCKS} -
    - - - {strip} - - - {/strip} - -
    - {$smarty.foreach.blockforeach.iteration}. {$header} -  
    - - - {foreach item=detail from=$detail} - - {foreach key=label item=data from=$detail} - {assign var=keyid value=$data.ui} - {assign var=keyval value=$data.value} - {assign var=keytblname value=$data.tablename} - {assign var=keyfldname value=$data.fldname} - {assign var=keyoptions value=$data.options} - {assign var=keysecid value=$data.secid} - {assign var=keyseclink value=$data.link} - {assign var=keycursymb value=$data.cursymb} - {assign var=keysalut value=$data.salut} - {assign var=keycntimage value=$data.cntimage} - {assign var=keyadmin value=$data.isadmin} - - {if $label ne ''} - - {include file="DetailViewUI.tpl"} - {else} - - - {/if} - {/foreach} - - {/foreach} -
    {$label}  
    - {/foreach} - - {include file="UserDetailOrg.tpl"} - -
    - - - - - - -
    - 6. {$UMOD.LBL_HOME_PAGE_COMP} - {$APP.LBL_EXPAND_COLLAPSE}
    - - - -
    - - - - - - -
    - 7. {$UMOD.LBL_MY_GROUPS} - - {if $GROUP_COUNT > 0} - {$APP.LBL_EXPAND_COLLAPSE} - {else} -   - {/if} -
    - - - -
    -
    - - {if $IS_ADMIN eq 'true'} - - - - - -
    - 8. {$UMOD.LBL_LOGIN_HISTORY} - {$APP.LBL_EXPAND_COLLAPSE}
    - - - -
    -
    - {/if} -
    - - -
    - - - -
    - - -
    -
    - - - - - - - - - - - - - -
    -{$JAVASCRIPT} -
    - - - - +{**} + + + + + + + + +
    + + + + + + + +
    +
    +
    + {if $CATEGORY eq 'Settings'} + {include file='SetMenu.tpl'} + {/if} + + + + +
    +
    + + + + + + {if $CATEGORY neq 'Settings'} + + {/if} + + + + + + + {if $CATEGORY eq 'Settings'} + + {/if} + + + + + + + + + + + + + + +
    + + + + + + + + + + +
    + {if $CATEGORY eq 'Settings'} + + {$MOD.LBL_SETTINGS} > {$MOD.LBL_USERS} >"{$USERNAME}" + {else} + + {$APP.LBL_MY_PREFERENCES} + + {/if} + +
    {$UMOD.LBL_USERDETAIL_INFO} "{$USERNAME}"
    +
     
    + {if $IS_ADMIN eq 'true'} + + {/if} + {if $CATEGORY eq 'Settings'} + {$DUPLICATE_BUTTON} + {/if} + {$EDIT_BUTTON} + {if $CATEGORY eq 'Settings' && $ID neq 1 && $ID neq 2 & $ID neq $CURRENT_USERID} + + {/if} +
    + + + + + +
    + {foreach key=header name=blockforeach item=detail from=$BLOCKS} +
    + + + {strip} + + + {/strip} + +
    + {$smarty.foreach.blockforeach.iteration}. {$header} +  
    + + + {foreach item=detail from=$detail} + + {foreach key=label item=data from=$detail} + {assign var=keyid value=$data.ui} + {assign var=keyval value=$data.value} + {assign var=keytblname value=$data.tablename} + {assign var=keyfldname value=$data.fldname} + {assign var=keyoptions value=$data.options} + {assign var=keysecid value=$data.secid} + {assign var=keyseclink value=$data.link} + {assign var=keycursymb value=$data.cursymb} + {assign var=keysalut value=$data.salut} + {assign var=keycntimage value=$data.cntimage} + {assign var=keyadmin value=$data.isadmin} + + {if $label ne ''} + + {include file="DetailViewUI.tpl"} + {else} + + + {/if} + {/foreach} + + {/foreach} +
    {$label}  
    + {/foreach} + + {include file="UserDetailOrg.tpl"} + +
    + + + + + + +
    + 6. {$UMOD.LBL_HOME_PAGE_COMP} + {$APP.LBL_EXPAND_COLLAPSE}
    + + + +
    + + + + + + +
    + 7. {$UMOD.LBL_MY_GROUPS} + + {if $GROUP_COUNT > 0} + {$APP.LBL_EXPAND_COLLAPSE} + {else} +   + {/if} +
    + + + +
    +
    + + {if $IS_ADMIN eq 'true'} + + + + + +
    + 8. {$UMOD.LBL_LOGIN_HISTORY} + {$APP.LBL_EXPAND_COLLAPSE}
    + + + +
    +
    + {/if} +
    + + +
    + +
    + +
    + + +
    +
    + + + + + + + + + + + + + +
    +{$JAVASCRIPT} +
    + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/UserEditView.tpl Mon Apr 16 12:27:44 2007 @@ -1,206 +1,217 @@ -{**} - - - - - - - - - - - - - - -
    -
    - -
    - {if $PARENTTAB eq 'Settings'} - {include file='SetMenu.tpl'} - {/if} - -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - {if $MODE eq 'edit'} - - -
    - - {if $PARENTTAB neq ''} - {$MOD.LBL_SETTINGS} > {$MOD.LBL_USERS} > - {if $MODE eq 'edit'} - {$UMOD.LBL_EDITING} "{$USERNAME}" - {else} - {$UMOD.LBL_CREATE_NEW_USER} - {/if} - - {else} - - {$APP.LBL_MY_PREFERENCES} - - {/if} -   -
    {$UMOD.LBL_EDIT_VIEW} "{$USERNAME}" - {else} - {$UMOD.LBL_CREATE_NEW_USER} - {/if} -
    -
     
    - - - -
    - - - -
    - - - -
    - - - - - - -
    - {foreach key=header name=blockforeach item=data from=$BLOCKS} -
    - - - {strip} - - - {/strip} - -
    - {$smarty.foreach.blockforeach.iteration}. {$header} -  
    - - - {include file="DisplayFields.tpl"} -
    - {/foreach} - - {include file="UserEditOrg.tpl"} - -
    - - - - - -
    - 6. {$UMOD.LBL_HOME_PAGE_COMP} -  
    - - {foreach item=homeitems key=values from=$HOMEORDER} - - {if $homeitems neq ''} - - - {else} - - - {/if} - - {/foreach} -
    {$UMOD.$values} - {$UMOD.LBL_SHOW} - {$UMOD.LBL_HIDE} - {$UMOD.LBL_SHOW} - {$UMOD.LBL_HIDE}
    -
    -
     
    - - -
    -
    -
    -
    -
    -
    - - - - - -
    -{$JAVASCRIPT} +{**} + + + + + + + + +
    + + + + + +
    +
    + +
    + {if $PARENTTAB eq 'Settings'} + {include file='SetMenu.tpl'} + {/if} + +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + {if $MODE eq 'edit'} + + +
    + + {if $PARENTTAB neq ''} + {$MOD.LBL_SETTINGS} > {$MOD.LBL_USERS} > + {if $MODE eq 'edit'} + {$UMOD.LBL_EDITING} "{$USERNAME}" + {else} + {if $DUPLICATE neq 'true'} + {$UMOD.LBL_CREATE_NEW_USER} + {else} + {$APP.LBL_DUPLICATING} "{$USERNAME}" + {/if} + {/if} + + {else} + + {$APP.LBL_MY_PREFERENCES} + + {/if} +   +
    {$UMOD.LBL_EDIT_VIEW} "{$USERNAME}" + {else} + {if $DUPLICATE neq 'true'} + {$UMOD.LBL_CREATE_NEW_USER} + {/if} + {/if} +
    +
     
    + + + +
    + + + +
    + + + +
    + + + + + + +
    + {foreach key=header name=blockforeach item=data from=$BLOCKS} +
    + + + {strip} + + + {/strip} + +
    + {$smarty.foreach.blockforeach.iteration}. {$header} +  
    + + + {include file="DisplayFields.tpl"} +
    + {/foreach} + + {include file="UserEditOrg.tpl"} + +
    + + + + + +
    + 6. {$UMOD.LBL_HOME_PAGE_COMP} +  
    + + {foreach item=homeitems key=values from=$HOMEORDER} + + {if $homeitems neq ''} + + + {else} + + + {/if} + + {/foreach} +
    {$UMOD.$values} + {$UMOD.LBL_SHOW} + {$UMOD.LBL_HIDE} + {$UMOD.LBL_SHOW} + {$UMOD.LBL_HIDE}
    +
    +
     
    + + +
    +
    +
    +
    +
    +
    + + + + + +
    +{$JAVASCRIPT} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/UserGroups.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/UserGroups.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/UserGroups.tpl Mon Apr 16 12:27:44 2007 @@ -19,7 +19,7 @@ {$smarty.foreach.groupiter.iteration} {if $IS_ADMIN} -{$groupname.1} +{$groupname.1} {else} {$groupname.1} {/if} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/UserProfileList.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/UserProfileList.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/UserProfileList.tpl Mon Apr 16 12:27:44 2007 @@ -69,7 +69,7 @@ {$smarty.foreach.profilelist.iteration} - Edit + {$APP.LBL_EDIT} {if $listvalues.del_permission eq 'yes'}  |  @@ -77,7 +77,7 @@ {/if} - {$listvalues.profilename} + {$listvalues.profilename} {$listvalues.description} {/foreach} Modified: vtigercrm/branches/5.1_jens/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/Webmails.tpl Mon Apr 16 12:27:44 2007 @@ -12,178 +12,209 @@ {include file='Buttons_List1.tpl'} - - - - - - + + + + + + + + + +
      -  
    - +
    +
    + + + + + - - + + + + + + + +
      + + + + + + + + + + + + - - - - - - - -
    + + + + + + + + +
    + +  {$MOD.LBL_CHK_MAIL} + + +  {$MOD.LBL_COMPOSE} + + +  {$MOD.LBL_SETTINGS} + + +  {$MOD.LBL_EXPUNGE_MAILBOX} +  
    +
    {$MOD.LBL_EMAIL_FOLDERS}{$ACCOUNT} > {$MAILBOX} {$NAVIGATION}
    +  {$MOD.LBL_MY_MAILS}   + +
      + + {foreach item=row from=$BOXLIST} + {foreach item=row_values from=$row} + {$row_values} + {/foreach} + {/foreach} +

    + +  {$MOD.LBL_SENT_MAILS} +
    +  {$MOD.LBL_TRASH} + + +     		+ + - - - - - - - - + + + + + + + + - - - - + + + - -
    - - - - - - - - - - - - - - - - + + {if $DEGRADED_SERVICE eq 'false'} + - - - - - - - - - - - + {/if} + +
    - - - - - - - - - -
    - -  {$MOD.LBL_CHK_MAIL} - - -  {$MOD.LBL_COMPOSE} - - -  {$MOD.LBL_SETTINGS} - - -  {$MOD.LBL_SHOW_HIDDEN} - - -  {$MOD.LBL_EXPUNGE_MAILBOX} -
    -
    {$MOD.LBL_EMAIL_FOLDERS}  {$ACCOUNT} > {$MAILBOX} {$NAVIGATION}
    -  {$MOD.LBL_MY_MAILS}   - -
      - - {foreach item=row from=$BOXLIST} - {foreach item=row_values from=$row} - {$row_values} - {/foreach} - {/foreach} -

    - -  {$MOD.LBL_SENT_MAILS} -
    -  {$MOD.LBL_TRASH} - - -     		  - - - {if $DEGRADED_SERVICE eq 'false'} - - {/if} - -
    - - {$FOLDER_SELECT} - - {$APP.LBL_SEARCH}   -   - -
      -
    - - - - {foreach item=element from=$LISTHEADER} - {$element} - {/foreach} - - {foreach item=row from=$LISTENTITY} - {foreach item=row_values from=$row} - {$row_values} - {/foreach} - {/foreach} -
    -
    +
    + + {$FOLDER_SELECT} + + {$APP.LBL_SEARCH}  +   + {$SEARCH_HTML} 
     
    + + +
    +
    + + +
    + + + + {foreach item=element from=$LISTHEADER} + {$element} + {/foreach} + + {foreach item=row from=$LISTENTITY} + {foreach item=row_values from=$row} + {$row_values} + {/foreach} + {/foreach} +
    +
    + + +
    +
    -

    -     		 
    +
    +
    + + + + Modified: vtigercrm/branches/5.1_jens/Smarty/templates/pendingActivities.tpl ============================================================================== --- vtigercrm/branches/5.1_jens/Smarty/templates/pendingActivities.tpl (original) +++ vtigercrm/branches/5.1_jens/Smarty/templates/pendingActivities.tpl Mon Apr 16 12:27:44 2007 @@ -9,19 +9,36 @@ * ********************************************************************************/ -->*} -{if $ACTIVITIES.1.noofactivities > 0} -{assign var=label value=$ACTIVITIES.1.Title.0} +{if $ACTIVITIES.2.noofactivities > 0 || $ACTIVITIES.3.noofactivities > 0} + + +
    +{assign var=label value=$ACTIVITIES.2.Title.0} @@ -31,9 +48,49 @@
    - {$APP.$label} {$APP.LBL_PENDING_EVENTS} ({$ACTIVITIES.1.noofactivities})
    + {$APP.$label} {$APP.LBL_PENDING_EVENTS} ({$ACTIVITIES.2.noofactivities})
    {$APP.LBL_SHOW} - {if $ACTIVITIES.1.Title.0 eq 'today'} - {$APP.LBL_TODAY}  |  {$APP.LBL_ALL} - {else} - {$APP.LBL_TODAY}  |  {$APP.LBL_ALL} - {/if} + {$APP.LBL_TODAY}  |  {$APP.LBL_ALL}
    - + - {foreach item=entries name=entryloop from=$ACTIVITIES.1.Entries} + {if $ACTIVITIES.2.noofactivities != 0} + {foreach item=entries name=entryloop from=$ACTIVITIES.2.Entries} + + + + + + {/foreach} + {else} + + + + {/if} +
      
    {math equation="x+1" x=$smarty.foreach.entryloop.index}{$entries.IMAGE}{$entries.0}{*
    {$entries.ACCOUNT_NAME*}
    {$APP.LBL_NONE_SCHEDULED}
    +
    + + + +
    + + + + + +
    + + - -
    - - - - + + id,'eventstatus') == '0') { ?> + - + - + - - - - + - + - + - +
    @@ -676,7 +704,7 @@ - + id,'description') == '0') { ?> @@ -735,9 +763,9 @@ "; $minical .= ""; //To display days in week - $minical .= ''; + $minical .= ''; for ($i = 0; $i < 7; $i ++) { $weekdays_row = $cal['calendar']->month_array[$cal['calendar']->slices[$i]]; @@ -263,8 +263,8 @@ global $current_user,$app_strings; $date_format = $current_user->date_format; $format = $cal_arr['calendar']->hour_format; - $hour_startat = convertTime2UserSelectedFmt($format,$cal_arr['calendar']->day_start_hour,false); - $hour_endat = convertTime2UserSelectedFmt($format,($cal_arr['calendar']->day_start_hour+1),false); + $hour_startat = timeString(array('hour'=>date('H:i'),'minute'=>0),'24'); + $hour_endat = timeString(array('hour'=>date('H:i',(time() + (60 * 60))),'minute'=>0),'24'); $time_arr = getaddEventPopupTime($hour_startat,$hour_endat,$format); $temp_ts = $cal_arr['calendar']->date_time->ts; //To get date in user selected format @@ -288,15 +288,15 @@ { $headerdata .=""; } - $headerdata .=" + $headerdata .= "
    *
    - + @@ -892,12 +925,28 @@
    hour_format,'start'); ?>
    hour_format,'start','','','',true); ?>
    - Set date.. + Set date.. @@ -870,9 +898,14 @@ : -   +
    + + +
     
    - - - - + + id,'taskstatus') == '0') { ?> + - + - + + - - + - + +
    Modified: vtigercrm/branches/5.1_jens/modules/Calendar/calendarLayout.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Calendar/calendarLayout.php (original) +++ vtigercrm/branches/5.1_jens/modules/Calendar/calendarLayout.php Mon Apr 16 12:27:44 2007 @@ -113,7 +113,7 @@ */ function get_mini_calendar(& $cal) { - global $current_user,$adb,$cal_log; + global $current_user,$adb,$cal_log,$mod_strings; $category = getParentTab(); $cal_log->debug('Entering get_mini_calendar() method...'); $count = 0; @@ -133,7 +133,7 @@
    Week'.$mod_strings['LBL_WEEK'].'
     "; + $headerdata .=""; $headerdata .= getEventTodoInfo($cal_arr,'listcnt'); - $headerdata .= "
    ".$mod_strings['LBL_VIEW']." : "; $view_options = getEventViewOption($cal_arr,$viewBox); - $headerdata .=$view_options."
    + $headerdata .=$view_options."
    - "; + "; echo $headerdata; $cal_log->debug("Exiting get_cal_header_data() method..."); } @@ -357,8 +357,7 @@ } else die("view is not defined"); - $view .=" - "; + $view .=""; $cal_log->debug("Exiting getEventViewOption() method..."); return $view; } @@ -657,7 +656,6 @@ */ function getDayViewLayout(& $cal) { - //echo '
    ';print_r($cal);echo '
    '; global $current_user,$app_strings,$cal_log,$adb; $no_of_rows = 1; $cal_log->debug("Entering getDayViewLayout() method..."); @@ -686,39 +684,11 @@ } for($i=$day_start_hour;$i<=$day_end_hour;$i++) { - - if($cal['calendar']->hour_format == 'am/pm') - { - if($i == 12) - { - $hour = $i; - $sub_str = 'pm'; - } - elseif($i>12) - { - $hour = $i - 12; - $sub_str = 'pm'; - } - else - { - if($i == 0) - $hour = 12; - else - $hour = $i; - $sub_str = 'am'; - } - - } - else - { - $hour = $i; - if($hour <= 9 && strlen(trim($hour)) < 2) - $hour = "0".$hour; - $sub_str = ':00'; - } + $time = array('hour'=>$i,'minute'=>0); + $sub_str = timeString($time,$format); $y = $i+1; - $hour_startat = convertTime2UserSelectedFmt($format,$i,false); - $hour_endat = convertTime2UserSelectedFmt($format,$y,false); + $hour_startat = timeString(array('hour'=>$i,'minute'=>0),'24'); + $hour_endat = timeString(array('hour'=>$y,'minute'=>0),'24'); $time_arr = getaddEventPopupTime($hour_startat,$hour_endat,$format); $temp_ts = $cal['calendar']->date_time->ts; $sttemp_date = (($date_format == 'dd-mm-yyyy')?(date('d-m-Y',$temp_ts)):(($date_format== 'mm-dd-yyyy')?(date('m-d-Y',$temp_ts)):(($date_format == 'yyyy-mm-dd')?(date('Y-m-d', $temp_ts)):('')))); @@ -736,7 +706,7 @@ if(isPermitted("Calendar","EditView") == "yes") $js_string = 'onClick="fnvshobj(this,\'addEvent\'); gshow(\'addEvent\',\'call\',\''.$sttemp_date.'\',\''.$endtemp_date.'\',\''.$time_arr['starthour'].'\',\''.$time_arr['startmin'].'\',\''.$time_arr['startfmt'].'\',\''.$time_arr['endhour'].'\',\''.$time_arr['endmin'].'\',\''.$time_arr['endfmt'].'\',\'hourview\',\'event\')"'; $dayview_layout .= ' - '.$hour.''.$sub_str.''; + '.$sub_str.''; //To display events in Dayview $dayview_layout .= getdayEventLayer($cal,$cal['calendar']->slices[$i],$no_of_rows); $dayview_layout .= ''; @@ -789,44 +759,17 @@ for($i=$day_start_hour;$i<=$day_end_hour;$i++) { $count = $i; - $hour_startat = convertTime2UserSelectedFmt($format,$i,false); - $hour_endat = convertTime2UserSelectedFmt($format,($i+1),false); + $hour_startat = timeString(array('hour'=>$i,'minute'=>0),'24'); + $hour_endat = timeString(array('hour'=>($i+1),'minute'=>0),'24'); $time_arr = getaddEventPopupTime($hour_startat,$hour_endat,$format); $weekview_layout .= ''; for ($column=1;$column<=1;$column++) { - if($cal['calendar']->hour_format == 'am/pm') - { - if($i == 12) - { - $hour = $i; - $sub_str = 'pm'; - } - elseif($i>12) - { - $hour = $i - 12; - $sub_str = 'pm'; - } - else - { - if($i == 0) - $hour = 12; - else - $hour = $i; - $sub_str = 'am'; - } - - } - else - { - $hour = $i; - if($hour <= 9 && strlen(trim($hour)) < 2) - $hour = "0".$hour; - $sub_str = ':00'; - } - + $time = array('hour'=>$i,'minute'=>0); + $sub_str = timeString($time,$format); + $weekview_layout .= ''; - $weekview_layout .=$hour.''.$sub_str; + $weekview_layout .=$sub_str; $weekview_layout .= ''; } for ($column=0;$column<=6;$column++) @@ -879,8 +822,8 @@ $rows = 6; } $format = $cal['calendar']->hour_format; - $hour_startat = convertTime2UserSelectedFmt($format,$cal['calendar']->day_start_hour,false); - $hour_endat = convertTime2UserSelectedFmt($format,($cal['calendar']->day_start_hour+1),false); + $hour_startat = timeString(array('hour'=>date('H:i'),'minute'=>0),'24'); + $hour_endat = timeString(array('hour'=>date('H:i',(time() + (60 * 60))),'minute'=>0),'24'); $time_arr = getaddEventPopupTime($hour_startat,$hour_endat,$format); $monthview_layout = ''; $monthview_layout .= ''; @@ -1084,8 +1027,6 @@ $id = $act[$i]->record; if(strlen($subject)>25) $subject = substr($subject,0,25)."..."; - $start_time = $act[$i]->start_time->hour.':'.$act[$i]->start_time->minute; - $end_time = $act[$i]->end_time->hour.':'.$act[$i]->end_time->minute; $format = $cal['calendar']->hour_format; $duration_hour = $act[$i]->duration_hour; $duration_min =$act[$i]->duration_minute; @@ -1098,24 +1039,24 @@ $rowspan = $duration_hour; } $row_cnt = $rowspan; - //$st_end_time = convertStEdTime2UserSelectedFmt($format,$start_time,$duration_hour,$duration_min); - //$start_hour = $st_end_time['starttime']; - //$end_hour = $st_end_time['endtime']; - $value = getaddEventPopupTime($start_time,$end_time,$format); - $start_hour = $value['starthour'].':'.$value['startmin'].''.$value['startfmt']; - $end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt']; + $start_hour = timeString($act[$i]->start_time,$format); + $end_hour = timeString($act[$i]->end_time,$format); $account_name = $act[$i]->accountname; $eventstatus = $act[$i]->eventstatus; - $shared = $act[$i]->shared; $color = $act[$i]->color; $image = $cal['IMAGE_PATH'].''.$act[$i]->image_name; + if($act[$i]->recurring) + $recurring = ''; + else + $recurring = ' '; $height = $rowspan * 75; $javacript_str = ''; + $idShared = "normal"; if($act[$i]->shared) $idShared = "shared"; /*if($eventstatus != 'Held') {*/ - if(isPermitted("Calendar","EditView") == "yes") + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") $javacript_str = 'onMouseOver="cal_show(\''.$arrow_img_name.'\');" onMouseOut="fnHide_Event(\''.$arrow_img_name.'\');"'; - $action_str = ''; + $action_str = ''; /*} else { @@ -1126,18 +1067,18 @@ $eventlayer .= '
    - - - '; - $eventlayer .= ' + '; + $eventlayer .= ' + + + - - - + $eventlayer .= '
    '.$start_hour.' - '.$end_hour.'
    '; - if($shared) + '.$start_hour.' - '.$end_hour.'
    '.$recurring; + $eventlayer .= ''.$subject.'
    '; + if($act[$i]->shared) $eventlayer .= ''; else $eventlayer .= ' '; - $eventlayer .= ''.$subject.'
    '.$action_str.'('.$user.' | '.$mod_strings[$eventstatus].' | '.$mod_strings[$priority].')('.$user.' | '.$mod_strings[$eventstatus].' | '.$mod_strings[$priority].')
    '.$action_str.' 
    '; @@ -1180,46 +1121,45 @@ if(strlen($subject)>25) $subject = substr($subject,0,25)."..."; $format = $cal['calendar']->hour_format; - $duration_hour = $act[$i]->duration_hour; - $duration_min = $act[$i]->duration_minute; - $start_time = $act[$i]->start_time->hour.':'.$act[$i]->start_time->minute; - $end_time = $act[$i]->end_time->hour.':'.$act[$i]->end_time->minute; - //$st_end_time = convertStEdTime2UserSelectedFmt($format,$start_time,$duration_hour,$duration_min); - //$start_hour = $st_end_time['starttime']; - //$end_hour = $st_end_time['endtime']; - $value = getaddEventPopupTime($start_time,$end_time,$format); - $start_hour = $value['starthour'].':'.$value['startmin'].''.$value['startfmt']; - $end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt']; + $start_hour = timeString($act[$i]->start_time,$format); + $end_hour = timeString($act[$i]->end_time,$format); $account_name = $act[$i]->accountname; $eventstatus = $act[$i]->eventstatus; - $shared = $act[$i]->shared; $user = $act[$i]->owner; $priority = $act[$i]->priority; $image = $cal['IMAGE_PATH'].''.$act[$i]->image_name; + $idShared = "normal"; if($act[$i]->shared) $idShared = "shared"; + if($act[$i]->recurring) + $recurring = ''; + else + $recurring = ' '; $color = $act[$i]->color; - if(isPermitted("Calendar","EditView") == "yes") + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") $javacript_str = 'onMouseOver="cal_show(\''.$arrow_img_name.'\');" onMouseOut="fnHide_Event(\''.$arrow_img_name.'\');"'; - $action_str = ''; + $action_str = ''; $eventlayer .='
    - - + + - + + + - - - + $eventlayer .= ' + +
    '.$start_hour.' - '.$end_hour.''.$start_hour.' - '.$end_hour.'
    '; - if($shared) + '.$recurring; + + $eventlayer .= ''.$subject.'
    '; + if($act[$i]->shared) $eventlayer .= ''; else $eventlayer .= ' '; - $eventlayer .= ' - '.$subject.'
    '.$action_str.'('.$user.' | '.$eventstatus.' | '.$priority.')('.$user.' | '.$eventstatus.' | '.$priority.')
    '.$action_str.' 
    -

    '; +
    '; } $cal_log->debug("Exiting getweekEventLayer() method..."); return $eventlayer; @@ -1261,27 +1201,14 @@ $subject = $act[$i]->subject; if(strlen($subject)>10) $subject = substr($subject,0,10)."..."; - $start_time = $act[$i]->start_time->hour.':'.$act[$i]->start_time->minute; - $end_time = $act[$i]->end_time->hour.':'.$act[$i]->end_time->minute; $format = $cal['calendar']->hour_format; - $duration_hour = $act[$i]->duration_hour; - $duration_min = $act[$i]->duration_minute; - //$st_end_time = convertStEdTime2UserSelectedFmt($format,$start_time,$duration_hour,$duration_min); - //$start_hour = $st_end_time['starttime']; - //$end_hour = $st_end_time['endtime']; - $value = getaddEventPopupTime($start_time,$end_time,$format); - $start_hour = $value['starthour'].':'.$value['startmin'].''.$value['startfmt']; - $end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt']; + $start_hour = timeString($act[$i]->start_time,$format); + $end_hour = timeString($act[$i]->end_time,$format); $account_name = $act[$i]->accountname; $image = $cal['IMAGE_PATH'].''.$act[$i]->image_name; $color = $act[$i]->color; $eventlayer .='
    '; } if($remin_list != null) @@ -1314,7 +1241,7 @@ require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); $cal_log->debug("Entering getEventList() method..."); $shared_ids = getSharedCalendarId($current_user->id); - $query = "SELECT vtiger_groups.groupname, vtiger_users.user_name, + $query = "SELECT vtiger_groups.groupname, vtiger_users.user_name,vtiger_crmentity.smownerid, vtiger_activity.* FROM vtiger_activity INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_activity.activityid @@ -1328,11 +1255,13 @@ ON vtiger_recurringevents.activityid = vtiger_activity.activityid WHERE vtiger_crmentity.deleted = 0 AND (vtiger_activity.activitytype = 'Meeting' OR vtiger_activity.activitytype = 'Call') - AND (vtiger_activity.date_start BETWEEN '".$start_date."' AND '".$end_date."' - OR vtiger_recurringevents.recurringdate BETWEEN '".$start_date."' AND '".$end_date."') "; + AND (((vtiger_activity.date_start between '".$start_date."' AND '".$end_date."') OR (vtiger_activity.due_date between '". $start_date."' AND '".$end_date."') OR (vtiger_activity.date_start<'".$start_date."' and vtiger_activity.due_date>'".$end_date."') AND (vtiger_recurringevents.recurringdate is NULL)) + OR (vtiger_recurringevents.recurringdate BETWEEN '".$start_date."' AND '".$end_date."')) "; if($info != '') { - $com_q = " AND vtiger_crmentity.smownerid = ".$current_user->id." + $groupids = fetchUserGroupids($current_user->id); + $com_q = " AND (vtiger_crmentity.smownerid = ".$current_user->id." + OR vtiger_groups.groupid in (".$groupids.")) GROUP BY vtiger_activity.activityid"; $pending_query = $query." AND (vtiger_activity.eventstatus = 'Planned')".$com_q; $total_q = $query."".$com_q; @@ -1370,31 +1299,33 @@ $image_tag = ""; $contact_data = ""; $more_link = ""; - $duration_hour = $adb->query_result($result,$i,"duration_hours"); - $duration_min = $adb->query_result($result,$i,"duration_minutes"); $start_time = $adb->query_result($result,$i,"time_start"); $end_time = $adb->query_result($result,$i,"time_end"); $format = $calendar['calendar']->hour_format; - //$st_end_time = convertStEdTime2UserSelectedFmt($format,$start_time,$duration_hour,$duration_min); $value = getaddEventPopupTime($start_time,$end_time,$format); $start_hour = $value['starthour'].':'.$value['startmin'].''.$value['startfmt']; $end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt']; - if($calendar['view'] == 'day') - { - $element['starttime'] = $start_hour; - $element['endtime'] = $end_hour; - } - else - { - $date_start = $adb->query_result($result,$i,"date_start"); - $due_date = $adb->query_result($result,$i,"due_date"); - $element['starttime'] = getDisplayDate($date_start); - $element['endtime'] = getDisplayDate($due_date); - } + $date_start = $adb->query_result($result,$i,"date_start"); + $due_date = $adb->query_result($result,$i,"due_date"); + $element['starttime'] = getDisplayDate($date_start).' '.$start_hour; + $element['endtime'] = getDisplayDate($due_date).' '.$end_hour; $contact_id = $adb->query_result($result,$i,"contactid"); $id = $adb->query_result($result,$i,"activityid"); $subject = $adb->query_result($result,$i,"subject"); $eventstatus = $adb->query_result($result,$i,"eventstatus"); + $assignedto = $adb->query_result($result,$i,"user_name"); + $userid = $adb->query_result($result,$i,"smownerid"); + $idShared = "normal"; + if(!empty($assignedto) && $userid != $current_user->id && $adb->query_result($result,$i,"visibility") == "Public") + { + $que = "select * from vtiger_sharedcalendar where sharedid=".$current_user->id." and userid=".$userid; + $row = $adb->query($que); + $no = $adb->getRowCount($row); + if($no > 0) $idShared = "shared"; + else $idShared = "normal"; + + + } if(strlen($subject)>25) $subject = substr($subject,0,25)."..."; if($contact_id != '') @@ -1410,17 +1341,16 @@ $image_tag = " ".$app_strings['Meeting']; $element['eventtype'] = $image_tag; $element['eventdetail'] = $contact_data." ".$subject." ".$more_link; - if(isPermitted("Calendar","EditView") == "yes") - $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"event\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; - else - $element['action'] =" "; + $element['relatedto']= getRelatedTo('Calendar',$result,$i); + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete")=="yes") + $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->get_formatted_date()."\",\"event\",\"".$idShared."\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; $element['status'] = $mod_strings[$adb->query_result($result,$i,"eventstatus")]; - $assignedto = $adb->query_result($result,$i,"user_name"); if(!empty($assignedto)) $element['assignedto'] = $assignedto; else $element['assignedto'] = $adb->query_result($result,$i,"groupname"); $Entries[] = $element; + } $cal_log->debug("Exiting getEventList() method..."); return $Entries; @@ -1464,7 +1394,7 @@ $com_q = " AND vtiger_crmentity.smownerid = ".$current_user->id; $pending_query = $query." AND (vtiger_activity.status != 'Completed')".$com_q; $total_q = $query."".$com_q; - if( $adb->dbType == "pgsql") + if( $adb->dbType == "pgsql") { $pending_query = fixPostgresQuery( $pending_query, $log, 0); $total_q = fixPostgresQuery( $total_q, $log, 0); @@ -1493,12 +1423,13 @@ $rows = $adb->num_rows($result); for($i=0;$i<$rows;$i++) { + $element = Array(); + $contact_name = ''; $element['no'] = $i+1; $more_link = ""; $start_time = $adb->query_result($result,$i,"time_start"); $format = $calendar['calendar']->hour_format; - //$st_end_time = convertStEdTime2UserSelectedFmt($format,$start_time); $value = getaddEventPopupTime($start_time,$start_time,$format); $element['starttime'] = $value['starthour'].':'.$value['startmin'].''.$value['startfmt']; $date_start = $adb->query_result($result,$i,"date_start"); @@ -1509,14 +1440,20 @@ $id = $adb->query_result($result,$i,"activityid"); $subject = $adb->query_result($result,$i,"subject"); + $contact_id = $adb->query_result($result,$i,"contactid"); + if($contact_id!='') + { + $contact_name = getContactName($contact_id); + } + $status = $adb->query_result($result,$i,"status"); $more_link = "    ".$subject.""; $element['tododetail'] = $more_link; + $element['task_relatedto'] = getRelatedTo('Calendar',$result,$i); + $element['task_contact'] = "".$contact_name.""; $element['status'] = $adb->query_result($result,$i,"status"); - if(isPermitted("Calendar","EditView") == "yes") - $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\",\"todo\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; - else - $element['action'] =" "; + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->get_formatted_date()."\",\"todo\",\"normal\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; $assignedto = $adb->query_result($result,$i,"user_name"); if(!empty($assignedto)) $element['assignedto'] = $assignedto; @@ -1565,8 +1502,8 @@ $cal_log->debug("Entering constructEventListView() method..."); $format = $cal['calendar']->hour_format; $date_format = $current_user->date_format; - $hour_startat = convertTime2UserSelectedFmt($format,$cal['calendar']->day_start_hour,false); - $hour_endat = convertTime2UserSelectedFmt($format,($cal['calendar']->day_start_hour+1),false); + $hour_startat = timeString(array('hour'=>date('H:i'),'minute'=>0),'24'); + $hour_endat = timeString(array('hour'=>date('H:i',(time() + (60 * 60))),'minute'=>0),'24'); $time_arr = getaddEventPopupTime($hour_startat,$hour_endat,$format); $temp_ts = $cal['calendar']->date_time->ts; //to get date in user selected date format @@ -1579,36 +1516,37 @@ $endtemp_date = (($date_format == 'dd-mm-yyyy')?(date('d-m-Y',$endtemp_ts)):(($date_format== 'mm-dd-yyyy')?(date('m-d-Y',$endtemp_ts)):(($date_format == 'yyyy-mm-dd')?(date('Y-m-d', $endtemp_ts)):('')))); } $list_view = ""; - if($cal['view'] == 'day') - { - $start_datetime = $mod_strings['LBL_APP_START_TIME']; - $end_datetime = $mod_strings['LBL_APP_END_TIME']; - } - else - { - $start_datetime = $mod_strings['LBL_APP_START_DATE']; - $end_datetime = $mod_strings['LBL_APP_END_DATE']; - - } + $start_datetime = $app_strings['LBL_START_DATE_TIME']; + $end_datetime = $app_strings['LBL_END_DATE_TIME']; //Events listview header labels $header = Array('0'=>'#', '1'=>$start_datetime, '2'=>$end_datetime, '3'=>$mod_strings['LBL_EVENTTYPE'], - '4'=>$mod_strings['LBL_EVTDTL'], - '5'=>$mod_strings['LBL_ACTION'], - '6'=>$mod_strings['LBL_STATUS'], - '7'=>$mod_strings['LBL_ASSINGEDTO'], + '4'=>$mod_strings['LBL_EVENTDETAILS'], + '5'=>$mod_strings['LBL_RELATEDTO'], ); + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + { + array_push($header,$mod_strings['LBL_ACTION']); + } + + array_push($header,$mod_strings['LBL_STATUS'],$mod_strings['LBL_ASSINGEDTO']); $header_width = Array('0'=>'5%', '1'=>'10%', '2'=>'10%', '3'=>'10%', '4'=>'28%', - '5'=>'10%', - '6'=>'10%', - '7'=>'15%' + '5'=>'15%', ); + + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + { + + array_push($header_width,'10%'); + } + array_push($header_width,'10%','15%'); + $list_view .=""; $header_rows = count($header); @@ -1632,7 +1570,7 @@ } else { - $list_view .=" - - - - - - - - - - - -
    + $list_view .="
    "; $list_view .="
    @@ -1677,8 +1615,8 @@ global $current_user,$app_strings; $date_format = $current_user->date_format; $format = $cal['calendar']->hour_format; - $hour_startat = convertTime2UserSelectedFmt($format,$cal['calendar']->day_start_hour,false); - $hour_endat = convertTime2UserSelectedFmt($format,($cal['calendar']->day_start_hour+1),false); + $hour_startat = timeString(array('hour'=>date('H:i'),'minute'=>0),'24'); + $hour_endat = timeString(array('hour'=>date('H:i',(time() + (60 * 60))),'minute'=>0),'24'); $time_arr = getaddEventPopupTime($hour_startat,$hour_endat,$format); $temp_ts = $cal['calendar']->date_time->ts; //to get date in user selected date format @@ -1694,37 +1632,58 @@ //labels of listview header if($cal['view'] == 'day') { - $colspan = 7; + $colspan = 9; $header = Array('0'=>'#','1'=>$mod_strings['LBL_TIME'],'2'=>$mod_strings['LBL_LIST_DUE_DATE'], - '3'=>$mod_strings['LBL_TODO'],'4'=>$mod_strings['LBL_STATUS'],'5'=>$mod_strings['LBL_ACTION'],'6'=>$mod_strings['LBL_ASSINGEDTO'],); - $header_width = Array('0'=>'5%','1'=>'10%','2'=>'10%','3'=>'38%','4'=>'10%','5'=>'10%', '6'=>'15%', ); + '3'=>$mod_strings['LBL_TODO'],'4'=>$mod_strings['LBL_RELATEDTO'],'5'=>$mod_strings['LBL_CONTACT_NAME'],'6'=>$mod_strings['LBL_STATUS']); + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + { + array_push($header,$mod_strings['LBL_ACTION']); + } + array_push($header,$mod_strings['LBL_ASSINGEDTO']); + $header_width = Array('0'=>'5%','1'=>'10%','2'=>'10%','3'=>'38%','4'=>'15%','5'=>'15%','6'=>'10%',); + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + { + array_push($header_width,'10%'); + } + array_push($header_width,'15%'); } else { - $colspan = 8; + $colspan = 10; $header = Array('0'=>'#', '1'=>$mod_strings['LBL_TIME'], - '2'=>$mod_strings['LBL_APP_START_DATE'], - '3'=>$mod_strings['LBL_LIST_DUE_DATE'], + '2'=>$mod_strings['LBL_START_DATE'], + '3'=>$mod_strings['LBL_DUE_DATE'], '4'=>$mod_strings['LBL_TODO'], - '5'=>$mod_strings['LBL_STATUS'], - '6'=>$mod_strings['LBL_ACTION'], - '7'=>$mod_strings['LBL_ASSINGEDTO'], - ); + '5'=>$mod_strings['LBL_RELATEDTO'], + '6'=>$mod_strings['LBL_CONTACT_NAME'], + '7'=>$mod_strings['LBL_STATUS'], + ); + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + { + array_push($header,$mod_strings['LBL_ACTION']); + } + array_push($header,$mod_strings['LBL_ASSINGEDTO']); $header_width = Array('0'=>'5%', '1'=>'10%', '2'=>'10%', '3'=>'10%', '4'=>'28%', - '5'=>'10%', - '6'=>'10%', - '7'=>'15%', - ); + '5'=>'15%', + '6'=>'15%', + '7'=>'10%', + ); + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + { + array_push($header_width,'10%'); + } + array_push($header_width,'15%'); + } $list_view .="
    "; //checking permission for Create/Edit Operation - if(isPermitted("Calendar","EditView") == "yes") + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") { $list_view .=""; } - $list_view .=" + $list_view .="
     
    @@ -1735,7 +1694,7 @@ { $list_view .="
      ".getEventTodoInfo($cal,'listcnt')."   
    @@ -1794,175 +1753,4 @@ return $list_view; } -/** - * Function to convert time to user selected format - * @param string $format - hour format. either 'am/pm' or '24' - * @param string $time - time - * @param boolean $format_check - true/false - * return string $hour - time string - */ -function convertTime2UserSelectedFmt($format,$time,$format_check) -{ - global $cal_log; - $cal_log->debug("Entering convertTime2UserSelectedFmt() method..."); - if($format == 'am/pm' && $format_check) - { - if($time>='12') - { - if($time == '12') - $hour = $time; - else - $hour = $time - 12; - $hour = $hour.":00pm"; - } - else - { - $hour = $time; - $hour = $hour.":00am"; - } - $cal_log->debug("Exiting convertTime2UserSelectedFmt() method..."); - return $hour; - } - else - { - $hour = $time; - if($hour <= 9 && strlen(trim($hour)) < 2) - $hour = "0".$hour; - $hour = $hour.":00"; - $cal_log->debug("Exiting convertTime2UserSelectedFmt() method..."); - return $hour; - } -} - -/** - * Function to convert events/todos start and endtime to user selected format - * @param string $format - hour format. either 'am/pm' or '24' - * @param string $start_time - time - * @param string $duration_hr - duration in hours or empty string - * @param string $duration_min - duration in minutes or empty string - * return array $return_data - start and end time in array format - */ -function convertStEdTime2UserSelectedFmt($format,$start_time,$duration_hr='',$duration_min='') -{ - global $cal_log; - $cal_log->debug("Entering convertStEdTime2UserSelectedFmt() method..."); - list($hour,$min) = explode(":",$start_time); - if($format == 'am/pm') - { - if($hour>'12') - { - $hour = $hour - 12; - $start_hour = $hour; - $start_time = $start_hour.":".$min."pm"; - $end_min = $min+$duration_min; - $end_hour = $hour+$duration_hr; - if($end_min>=60) - { - $end_min = $end_min%60; - $end_hour++; - } - if($end_hour <= 9 && strlen(trim($end_hour)) < 2) - $end_hour = "0".$end_hour; - if($end_min <= 9 && strlen(trim($end_min)) < 2) - $end_min = "0".$end_min; - $end_time = $end_hour.":".$end_min."pm"; - } - elseif($hour == '12') - { - $start_hour = $hour; - $start_time = $start_hour.":".$min."pm"; - $end_min = $min+$duration_min; - $end_hour = $hour+$duration_hr; - if($end_min>=60) - { - $end_min = $end_min%60; - $end_hour++; - } - if($end_hour>'12') - { - $end_hour = $end_hour - 12; - if($end_hour <= 9 && strlen(trim($end_hour)) < 2) - $end_hour = "0".$end_hour; - if($end_min <= 9 && strlen(trim($end_min)) < 2) - $end_min = "0".$end_min; - $end_time = $end_hour.":".$end_min."pm"; - } - else - { - if($end_hour <= 9 && strlen(trim($end_hour)) < 2) - $end_hour = "0".$end_hour; - if($end_min <= 9 && strlen(trim($end_min)) < 2) - $end_min = "0".$end_min; - $end_time = $end_hour.":".$end_min."am"; - } - } - else - { - $start_hour = $hour; - $start_time = $start_hour.":".$min."am"; - $end_min = $min+$duration_min; - $end_hour = $hour+$duration_hr; - if($end_min>=60) - { - $end_min = $end_min%60; - $end_hour++; - } - if($end_hour>='12') - { - if($end_hour == '12' && $end_hour > '00') - $end_hour = $end_hour; - else - $end_hour = $end_hour - 12; - if($end_hour <= 9 && strlen(trim($end_hour)) < 2) - $end_hour = "0".$end_hour; - if($end_min <= 9 && strlen(trim($end_min)) < 2) - $end_min = "0".$end_min; - $end_time = $end_hour.":".$end_min."pm"; - } - else - { - if($end_hour <= 9 && strlen(trim($end_hour)) < 2) - $end_hour = "0".$end_hour; - if($end_min <= 9 && strlen(trim($end_min)) < 2) - $end_min = "0".$end_min; - $end_time = $end_hour.":".$end_min."am"; - } - - } - $return_data = Array( - 'starttime'=>$start_time, - 'endtime' =>$end_time - ); - } - else - { - $hour = $hour; - $min = $min; - $end_min = $min+$duration_min; - $end_hour = $hour+$duration_hr; - if($end_min>=60) - { - $end_min = $end_min%60; - $end_hour++; - } - if($end_hour <= 9 && strlen(trim($end_hour)) < 2) - $end_hour = "0".$end_hour; - if($end_min <= 9 && strlen(trim($end_min)) < 2) - $end_min = "0".$end_min; - $end_time = $end_hour.":".$end_min; - if($hour <= 9 && strlen(trim($hour)) < 2) - $hour = "0".$hour; - $start_time = $hour.":".$min; - $return_data = Array( - 'starttime'=>$start_time, - 'endtime' =>$end_time - ); - } - $cal_log->debug("Exiting convertStEdTime2UserSelectedFmt() method..."); - return $return_data; - - -} - - ?> Modified: vtigercrm/branches/5.1_jens/modules/Calendar/calendar_share.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Calendar/calendar_share.php (original) +++ vtigercrm/branches/5.1_jens/modules/Calendar/calendar_share.php Mon Apr 16 12:27:44 2007 @@ -1,128 +1,171 @@ -id,true); - $shareduser_ids = getSharedUserId($current_user->id); -?> - - - - - -
    - -
    -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - -
    -
    - start_hour != ''){?> checked onClick="enableCalstarttime();">  -
    - hour_format == '24'){?> checked value="24">  -
    -
    -

    -
    - - '; - foreach($userDetails as $id=>$name) - { - if(in_array($id,$shareduser_ids)) - $checkbox = "checked"; - else - $checkbox = ""; - echo ''; - if($cnt%2 == 0) - echo ''; - $cnt++; - } - ?> -
     '.$name.'
    -
    -
    -
    - - - - -
    -    - -
    -
    - +id); + $shareduser_ids = getSharedUserId($current_user->id); +?> + + + + + +
    + +
    +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + +
    +
    + start_hour != ''){?> checked onClick="enableCalstarttime();">  +
    + hour_format == '24'){?> checked value="24">  +
    +
    +

    + +
    + + + + +
    + + + + + + + + + + + + + +
    +
      +
    • +
    • +
    +
     
    + + + +
    + +     		+ + + + + +
    + + +
    + +
    +
    +
    + + + + +
    +    + +
    +
    + Modified: vtigercrm/branches/5.1_jens/modules/Calendar/header.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Calendar/header.php (original) +++ vtigercrm/branches/5.1_jens/modules/Calendar/header.php Mon Apr 16 12:27:44 2007 @@ -1,109 +1,118 @@ - - -
    '.$app_strings[$category].' > '.$app_strings["Calendar"].' - - - - - -
    - - - - - -
    -
    -     		  - - - - - - - - - - -
    '.$app_strings['LBL_CALENDAR_ALT'].''.$app_strings['LBL_CLOCK_ALT'].''.$app_strings['LBL_CALCULATOR_ALT'].''.$app_strings['LBL_CHAT_ALT'].''.$app_strings['LBL_LAST_VIEWED'].'
    -     		  - - - - - - -
    -     		  - - - - -
    '.$app_strings['LBL_ALL_MENU_ALT'].'
    -
    - - - - - - - -
    - - -
    - - - - - - {elseif $uitype eq 85} Modified: vtigercrm/branches/5.0.3/include/js/general.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/general.js (original) +++ vtigercrm/branches/5.0.3/include/js/general.js Mon Apr 16 22:57:29 2007 @@ -2076,3 +2076,23 @@ } +function validateUrl(name) +{ + var Url = getObj(name); + var wProtocol; + + var oRegex = new Object(); + oRegex.UriProtocol = new RegExp(''); + oRegex.UriProtocol.compile( '^(((http|https|ftp|news):\/\/)|mailto:)', 'gi' ); + oRegex.UrlOnChangeProtocol = new RegExp('') ; + oRegex.UrlOnChangeProtocol.compile( '^(http|https|ftp|news)://(?=.)', 'gi' ); + + wUrl = Url.value; + wProtocol=oRegex.UrlOnChangeProtocol.exec( wUrl ) ; + if ( wProtocol ) + { + wUrl = wUrl.substr( wProtocol[0].length ); + Url.value = wUrl; + } +} + From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 01:02:13 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 05:02:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10699 - /vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Message-ID: <20070417050213.576087DA63A@vtiger.fosslabs.com> Author: richie Date: Mon Apr 16 23:02:08 2007 New Revision: 10699 Log: fix for The field Add Comment doesn't need to display in Advance Search. Fixes #3392 --minnie Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Mon Apr 16 23:02:08 2007 @@ -392,6 +392,10 @@ $sql = "select * from vtiger_field "; $sql.= " where vtiger_field.tabid=".$tabid." and"; $sql.= " vtiger_field.displaytype in (1,2)"; + if($tabid == 13 || $tabid == 15) + { + $sql.= " and vtiger_field.fieldlabel != 'Add Comment'"; + } $sql.= " order by block,sequence"; } else @@ -400,7 +404,13 @@ $sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid "; $sql.= " where vtiger_field.tabid=".$tabid." and"; $sql.= " vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0"; - $sql.= " and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." order by block,sequence"; + $sql.= " and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; + if($tabid == 13 || $tabid == 15) + { + $sql.= " and vtiger_field.fieldlabel != 'Add Comment'"; + } + $sql .= " order by block,sequence"; + } From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 02:08:15 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 06:08:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10700 - /vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php Message-ID: <20070417060815.5EABE7DA6AB@vtiger.fosslabs.com> Author: richie Date: Tue Apr 17 00:08:10 2007 New Revision: 10700 Log: * Fixed the issues in task status intimation, Fixed #3622 Modified: vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php Modified: vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php ============================================================================== --- vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php (original) +++ vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php Tue Apr 17 00:08:10 2007 @@ -4,7 +4,8 @@ require('send_mail.php'); require_once('config.php'); require_once('include/utils/utils.php'); - +require_once('include/language/en_us.lang.php'); +global $app_strings; // Email Setup $emailresult = $adb->query("SELECT email1 from vtiger_users"); $emailid = $adb->fetch_array($emailresult); @@ -32,7 +33,6 @@ $today = date("Ymd"); $result = $adb->query("select (vtiger_activity.date_start +1) from vtiger_activity where vtiger_activity.status <> 'Completed' and ".$today." > (vtiger_activity.date_start+1)",$db); -" > (vtiger_activity.date_start+1)"; while ($myrow = $adb->fetch_array($result)) { $status=$myrow[0]; @@ -57,8 +57,7 @@ $stage = $myrow[0]; if($stage == 'Closed Won' && $amount > 10000) { - - sendmail($emailaddress,$emailaddress,$app_srings['Big_Deal_Closed_Successfully'],$app_strings['Dear_Team_Time_to_Party'],$mailserver,$mailuname,$mailpwd,""); + sendmail($emailaddress,$emailaddress,$app_strings['Big_Deal_Closed_Successfully'],$app_strings['Dear_Team_Time_to_Party'],$mailserver,$mailuname,$mailpwd,""); } } @@ -136,4 +135,5 @@ } } + ?> From istintegra at greyspacestudio.com Tue Apr 17 00:17:51 2007 From: istintegra at greyspacestudio.com (Optimistic D. Gunshots) Date: Tue, 17 Apr 2007 00:17:51 -0400 Subject: [Vtigercrm-commits] Looking for medications? Message-ID: <3838378311.20070417001751@greyspacestudio.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://mmera.hk verified by VISA and certified by CIPA. From kaiser at goyak.com Tue Apr 17 03:09:59 2007 From: kaiser at goyak.com (Hatfield E. Aberdeen) Date: Tue, 17 Apr 2007 07:09:59 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0396709361.20070417070959@goyak.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/b651b25e/attachment-0001.html From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 03:35:02 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 07:35:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10701 - /vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Message-ID: <20070417073502.0B77E78D64E@vtiger.fosslabs.com> Author: richie Date: Tue Apr 17 01:34:56 2007 New Revision: 10701 Log: fix for Buttons Edit,Duplicate,Delete is not at bottom in Detailview of Faq. Fixes #3533 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Tue Apr 17 01:34:56 2007 @@ -311,7 +311,7 @@ {$ASSOCIATED_PRODUCTS} - {if $SinglePane_View eq 'false' || $MODULE eq 'Notes' } + {if $SinglePane_View eq 'false' || $MODULE eq 'Notes' || $MODULE eq 'Faq'} '; else { @@ -379,12 +381,12 @@ /* if($tmpval != "INBOX") $boxes .= '
    - - - - - - - - -
     '.$app_strings["Calendar"].' '.$mod_strings["LBL_ALL_EVENTS_TODOS"].' 
    -
    - - - + + +
    - - - - + + + + + + + + + + + +
    - '; - echo $html_string; -?> + + +
    '.$app_strings[$category].' > '.$app_strings["Calendar"].' + + + + + +
    + + + + + +
    +
    +     		  + + + + '; + + + if($CALENDAR_DISPLAY == 'true') + $html_string .= ' '; + if($WORLD_CLOCK_DISPLAY == 'true') + $html_string .= ' '; + if($CALCULATOR_DISPLAY == 'true') + $html_string .= ' '; + if($CHAT_DISPLAY == 'true') + $html_string .= ' '; + + $html_string .= ' + + +
    '.$app_strings['LBL_CALENDAR_ALT'].''.$app_strings['LBL_CLOCK_ALT'].''.$app_strings['LBL_CALCULATOR_ALT'].''.$app_strings['LBL_CHAT_ALT'].''.$app_strings['LBL_LAST_VIEWED'].'
    +     		  + + + + + + +
    +     		  + + + + +
    '.$app_strings['LBL_ALL_MENU_ALT'].'
    +
    + + + + +
    + + +
    + + + + + + "; + if(in_array($this->getLstringforReportHeaders($fld->name), $arrayHeaders)) + { + $headerLabel = str_replace("_"," ",$fld->name); + $arrayHeaders[] = $headerLabel; + } + else + { + $headerLabel = str_replace($modules," ",$this->getLstringforReportHeaders($fld->name)); + $arrayHeaders[] = $headerLabel; + } + $header .= ""; } $noofrows = $adb->num_rows($result); @@ -1464,6 +1599,14 @@ { $fieldvalue = "-"; } + else if(stristr($fieldvalue,"|##|")) + { + $fieldvalue = str_ireplace(' |##| ',', ',$fieldvalue); + } + else if(stristr($fld->name, "_Date") || stristr($fld->name, "_Created_Time") || stristr($fld->name, "_Modified_Time")){ + $fieldvalue = getDisplayDate($fieldvalue); + } + if(($lastvalue == $fieldvalue) && $this->reporttype == "summary") { if($this->reporttype == "summary") @@ -1530,10 +1673,10 @@ $sSQL = $this->sGetSQLforReport($this->reportid,$filterlist); $result = $adb->query($sSQL); - $y=$adb->num_fields($result); if($result) { + $y=$adb->num_fields($result); $noofrows = $adb->num_rows($result); $custom_field_values = $adb->fetch_array($result); @@ -1552,7 +1695,17 @@ { $fieldvalue = "-"; } - $arraylists[str_replace($modules," ",$this->getLstringforReportHeaders($fld->name))] = $fieldvalue; + else if(stristr($fieldvalue,"|##|")) + { + $fieldvalue = str_ireplace(' |##| ',', ',$fieldvalue); + } + else if(stristr($fld->name, "_Date") || stristr($fld->name, "_Created_Time") || stristr($fld->name, "_Modified_Time")){ + $fieldvalue = getDisplayDate($fieldvalue); + } + if(array_key_exists($this->getLstringforReportHeaders($fld->name), $arraylists)) + $arraylists[str_replace("_"," ",$fld->name)] = $fieldvalue; + else + $arraylists[str_replace($modules," ",$this->getLstringforReportHeaders($fld->name))] = $fieldvalue; } $arr_val[] = $arraylists; }while($custom_field_values = $adb->fetch_array($result)); @@ -1636,16 +1789,26 @@ { $sSQL = $this->sGetSQLforReport($this->reportid,$filterlist); $result = $adb->query($sSQL); - $y=$adb->num_fields($result); if($result) { + $y=$adb->num_fields($result); + $arrayHeaders = Array(); for ($x=0; $x<$y; $x++) { $fld = $adb->field_name($result, $x); - $header .= ""; - } - + if(in_array($this->getLstringforReportHeaders($fld->name), $arrayHeaders)) + { + $headerLabel = str_replace("_"," ",$fld->name); + $arrayHeaders[] = $headerLabel; + } + else + { + $headerLabel = str_replace($modules," ",$this->getLstringforReportHeaders($fld->name)); + $arrayHeaders[] = $headerLabel; + } + $header .= ""; + } $noofrows = $adb->num_rows($result); $custom_field_values = $adb->fetch_array($result); $groupslist = $this->getGroupingList($this->reportid); @@ -1686,6 +1849,13 @@ if($fieldvalue == "" ) { $fieldvalue = "-"; + } + else if(stristr($fieldvalue,"|##|")) + { + $fieldvalue = str_ireplace(' |##| ',', ',$fieldvalue); + } + else if(stristr($fld->name, "_Date") || stristr($fld->name, "_Created_Time") || stristr($fld->name, "_Modified_Time")){ + $fieldvalue = getDisplayDate($fieldvalue); } if(($lastvalue == $fieldvalue) && $this->reporttype == "summary") { Modified: vtigercrm/branches/5.1_jens/modules/Reports/Reports.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Reports/Reports.php (original) +++ vtigercrm/branches/5.1_jens/modules/Reports/Reports.php Mon Apr 16 12:27:44 2007 @@ -41,14 +41,14 @@ 'Accounts'=>Array('Potentials','Contacts','Products','Quotes','Invoice'), 'Contacts'=>Array('Accounts','Potentials','Quotes','PurchaseOrder'), 'Potentials'=>Array('Accounts','Contacts','Quotes'), - 'Calendar'=>Array('Contacts'), + 'Calendar'=>Array('Leads','Accounts','Contacts','Potentials'), 'Products'=>Array('Accounts','Contacts'), 'HelpDesk'=>Array('Products'), 'Quotes'=>Array('Accounts','Contacts','Potentials'), 'PurchaseOrder'=>Array('Contacts'), 'SalesOrder'=>Array(), 'Invoice'=>Array('Accounts'), - 'Campaigns'=>Array('Products','Contacts') + 'Campaigns'=>Array('Products') ); foreach($report_modules as $values) @@ -107,7 +107,7 @@ var $module_list = Array( "Leads"=>Array("Information"=>13,"Address"=>15,"Description"=>16,"Custom Information"=>14), - "Contacts"=>Array("Information"=>4,"- Portal Information"=>6,"Address"=>7,"Description"=>8,"Custom Information"=>5), + "Contacts"=>Array("Information"=>4,"Portal Information"=>6,"Address"=>7,"Description"=>8,"Custom Information"=>5), "Accounts"=>Array("Information"=>9,"Address"=>11,"Description"=>12,"Custom Information"=>10), "Potentials"=>Array("Information"=>1,"Description"=>3,"Custom Information"=>2), "Calendar"=>Array("Information"=>19,"Description"=>20), @@ -159,8 +159,7 @@ function sgetRptFldr($mode='') { - global $adb; - global $log; + global $adb,$log,$mod_strings; $returndata = Array(); $sql = "select * from vtiger_reportfolder order by folderid"; $result = $adb->query($sql); @@ -174,7 +173,7 @@ $details = Array(); $details['state'] = $reportfldrow["state"]; $details['id'] = $reportfldrow["folderid"]; - $details['name'] = $reportfldrow["foldername"]; + $details['name'] = ($mod_strings[$reportfldrow["foldername"]] == '' ) ? $reportfldrow["foldername"]:$mod_strings[$reportfldrow["foldername"]]; $details['description'] = $reportfldrow["description"]; $details['details'] = $this->sgetRptsforFldr($reportfldrow["folderid"]); $returndata[] = $details; @@ -187,7 +186,7 @@ $details = Array(); $details['state'] = $reportfldrow["state"]; $details['id'] = $reportfldrow["folderid"]; - $details['name'] = $reportfldrow["foldername"]; + $details['name'] = ($mod_strings[$reportfldrow["foldername"]] == '' ) ? $reportfldrow["foldername"]:$mod_strings[$reportfldrow["foldername"]]; $details['description'] = $reportfldrow["description"]; $returndata[] = $details; }while($reportfldrow = $adb->fetch_array($result)); @@ -230,7 +229,8 @@ $report_details ['description'] = $report["description"]; $report_details ['reportname'] = $report["reportname"]; - $returndata []=$report_details; + if(isPermitted($report["primarymodule"],'index') == "yes") + $returndata []=$report_details; }while($report = $adb->fetch_array($result)); } @@ -312,14 +312,26 @@ //Security Check if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0) { - $sql = "select * from vtiger_field where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2,3) order by sequence"; + $sql = "select * from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2,3) order by sequence"; } else { $profileList = getCurrentUserProfileList(); - $sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2,3) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by sequence"; - } + $sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2,3) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by sequence"; + } + //Added to include vtiger_activity type for Reports Module + if($module == 'Calendar' && $block == 19) + { + $module_columnlist['vtiger_activity:activitytype:Calendar_Activity_Type:activitytype:C'] = 'Activity Type'; + } + + if($module == 'HelpDesk' && $block == 25) + { + $module_columnlist['vtiger_crmentity:crmid:HelpDesk_Ticket_ID:ticketid:I'] = 'Ticket ID'; + } + + $result = $adb->query($sql); $noofrows = $adb->num_rows($result); for($i=0; $i<$noofrows; $i++) @@ -328,8 +340,13 @@ $fieldcolname = $adb->query_result($result,$i,"columnname"); $fieldname = $adb->query_result($result,$i,"fieldname"); $fieldtype = $adb->query_result($result,$i,"typeofdata"); + $uitype = $adb->query_result($result,$i,"uitype"); $fieldtype = explode("~",$fieldtype); $fieldtypeofdata = $fieldtype[0]; + if($uitype == 68 || $uitype == 59) + { + $fieldtypeofdata = 'V'; + } if($fieldtablename == "vtiger_crmentity") { $fieldtablename = $fieldtablename.$module; @@ -556,6 +573,42 @@ $nextFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01", date("Y")+1)); $nextFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")+1)); + if(date("m") <= 3) + { + $cFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "03","31",date("Y"))); + $nFq = date("Y-m-d",mktime(0, 0, 0, "04","01",date("Y"))); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "06","30",date("Y"))); + $pFq = date("Y-m-d",mktime(0, 0, 0, "10","01",date("Y")-1)); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y")-1)); + }else if(date("m") > 3 and date("m") <= 6) + { + $pFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y"))); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "03","31",date("Y"))); + $cFq = date("Y-m-d",mktime(0, 0, 0, "04","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "06","30",date("Y"))); + $nFq = date("Y-m-d",mktime(0, 0, 0, "07","01",date("Y"))); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "09","30",date("Y"))); + + }else if(date("m") > 6 and date("m") <= 9) + { + $nFq = date("Y-m-d",mktime(0, 0, 0, "10","01",date("Y"))); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y"))); + $pFq = date("Y-m-d",mktime(0, 0, 0, "04","01",date("Y"))); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "06","30",date("Y"))); + $cFq = date("Y-m-d",mktime(0, 0, 0, "07","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "09","30",date("Y"))); + } + else if(date("m") > 9 and date("m") <= 12) + { + $nFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y")+1)); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "03","31",date("Y")+1)); + $pFq = date("Y-m-d",mktime(0, 0, 0, "07","01",date("Y"))); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "09","30",date("Y"))); + $cFq = date("Y-m-d",mktime(0, 0, 0, "10","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y"))); + + } $sjsStr = ' - - - - - -
    + + + + + + + + +
     '.$app_strings["Calendar"].' '.$mod_strings["LBL_ALL_EVENTS_TODOS"].' 
    +
    + + + '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id; - - - // First, get the list of IDs. - $query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and ((vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus !='' && vtiger_activity.eventstatus != 'Held'))"; - $log->debug("Exiting get_activities method ..."); - return GetRelatedList('Leads','Calendar',$focus,$query,$button,$returnset); -} - -/** Returns a list of the associated Campaigns - * @param $id -- campaign id :: Type Integer - * @returns list of campaigns in array format - */ -function get_campaigns($id) -{ - global $log, $singlepane_view; - $log->debug("Entering get_campaigns(".$id.") method ..."); - global $mod_strings; - $focus = new Campaigns(); - $button = ''; - - if($singlepane_view == 'true') - $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id; - - $log->info("Campaign Related List for Lead Displayed"); - $query = "SELECT vtiger_users.user_name, vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaignleadrel on vtiger_campaignleadrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaignleadrel.leadid=".$id." and vtiger_crmentity.deleted=0"; - - $log->debug("Exiting get_campaigns method ..."); - return GetRelatedList('Leads','Campaigns',$focus,$query,$button,$returnset); - -} - - - /** Returns a list of the associated emails - * @param integer $id - leadid - * returns related emails record in array format - */ -function get_emails($id) -{ - global $log, $singlepane_view; - $log->debug("Entering get_emails(".$id.") method ..."); - global $mod_strings; - require_once('include/RelatedListView.php'); - - $focus = new Emails(); - - $button = ''; - - if(isPermitted("Emails",1,"") == 'yes') - { - - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id; - - $query ="select vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.semodule, vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.status, vtiger_activity.priority, vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted=0 and vtiger_seactivityrel.crmid=".$id; - $log->debug("Exiting get_emails method ..."); - return GetRelatedList('Leads','Emails',$focus,$query,$button,$returnset); -} - -/** - * Function to get Lead related Task & Event which have activity type Held, Completed or Deferred. - * @param integer $id - leadid - * returns related Task or Event record in array format - */ -function get_history($id) -{ - global $log; - $log->debug("Entering get_history(".$id.") method ..."); - $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, - vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_crmentity.modifiedtime, - vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name,vtiger_activitygrouprelation.groupname - from vtiger_activity - inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid - left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid - left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname - left join vtiger_users on vtiger_crmentity.smownerid= vtiger_users.id - where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') - and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != '')) - and vtiger_seactivityrel.crmid=".$id; - //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php - - $log->debug("Exiting get_history method ..."); - return getHistory('Leads',$query,$id); -} - -/** - * Function to get Lead related Attachments - * @param integer $id - leadid - * returns related Attachment record in array format - */ -function get_attachments($id) -{ - global $log; - $log->debug("Entering get_attachments(".$id.") method ..."); - // Armando L?scher 18.10.2005 -> ?visibleDescription - // Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name - // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - $query = "select vtiger_notes.title,'Notes ' ActivityType, vtiger_notes.filename, - vtiger_attachments.type FileType,crm2.modifiedtime lastmodified, - vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid, - crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name - from vtiger_notes - inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid - inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid - inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0 - left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid - left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid - inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - where vtiger_crmentity.crmid=".$id; - $query .= ' union all '; - // Armando L?scher 18.10.2005 -> ?visibleDescription - // Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name - // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - // Inserted order by createdtime desc - $query .= "select vtiger_attachments.description title ,'Attachments' ActivityType, - vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified, - vtiger_attachments.attachmentsid attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid, - crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name - from vtiger_attachments - inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid - inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid - inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid - inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - where vtiger_crmentity.crmid=".$id." - order by createdtime desc"; - - $log->debug("Exiting get_attachments method ..."); - return getAttachmentsAndNotes('Leads',$query,$id); -} - -/** -* Function to get lead related Products -* @param integer $id - leadid -* returns related Products record in array format -*/ -function get_products($id) -{ - global $log, $singlepane_view; - $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Products.php'); - global $mod_strings; - global $app_strings; - - $focus = new Products(); - - $button = ''; - - if(isPermitted("Products",1,"") == 'yes') - { - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id; - - $query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_products inner join vtiger_seproductsrel on vtiger_products.productid = vtiger_seproductsrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_leaddetails on vtiger_leaddetails.leadid = vtiger_seproductsrel.crmid where vtiger_leaddetails.leadid = '.$id.' and vtiger_crmentity.deleted = 0'; - $log->debug("Exiting get_products method ..."); - return GetRelatedList('Leads','Products',$focus,$query,$button,$returnset); -} - - /** Function to get the Combo List Values of Leads Field - * @param string $list_option - * Returns Combo List Options - */ - function get_lead_field_options($list_option) - { - global $log; - $log->debug("Entering get_lead_field_options(".$list_option.") method ..."); - $comboFieldArray = getComboArray($this->combofieldNames); - $log->debug("Exiting get_lead_field_options method ..."); - return $comboFieldArray[$list_option]; - } - -/** Function to get the Columnnames of the Leads Record -* Used By vtigerCRM Word Plugin -* Returns the Merge Fields for Word Plugin -*/ -function getColumnNames_Lead() -{ - global $log,$current_user; - $log->debug("Entering getColumnNames_Lead() method ..."); - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) - { - $sql1 = "select fieldlabel from vtiger_field where tabid=7"; - }else - { - $profileList = getCurrentUserProfileList(); - $sql1 = "select fieldlabel from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=7 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; - } - $result = $this->db->query($sql1); - $numRows = $this->db->num_rows($result); - for($i=0; $i < $numRows;$i++) - { - $custom_fields[$i] = $this->db->query_result($result,$i,"fieldlabel"); - $custom_fields[$i] = ereg_replace(" ","",$custom_fields[$i]); - $custom_fields[$i] = strtoupper($custom_fields[$i]); - } - $mergeflds = $custom_fields; - $log->debug("Exiting getColumnNames_Lead method ..."); - return $mergeflds; -} -//End - -} - -?> +'crmid','vtiger_leaddetails'=>'leadid','vtiger_leadsubdetails'=>'leadsubscriptionid','vtiger_leadaddress'=>'leadaddressid','vtiger_leadscf'=>'leadid','vtiger_entity2org'=>'crmid'); + + var $entity_table = "vtiger_crmentity"; + + //construct this from database; + var $column_fields = Array(); + var $sortby_fields = Array('lastname','firstname','email','phone','company','smownerid','website'); + + // This is used to retrieve related vtiger_fields from form posts. + var $additional_column_fields = Array('smcreatorid', 'smownerid', 'contactid','potentialid' ,'crmid'); + + // This is the list of vtiger_fields that are in the lists. + var $list_fields = Array( + 'Last Name'=>Array('leaddetails'=>'lastname'), + 'First Name'=>Array('leaddetails'=>'firstname'), + 'Company'=>Array('leaddetails'=>'company'), + 'Phone'=>Array('leadaddress'=>'phone'), + 'Website'=>Array('leadsubdetails'=>'website'), + 'Email'=>Array('leaddetails'=>'email'), + 'Assigned To'=>Array('crmentity'=>'smownerid') + ); + var $list_fields_name = Array( + 'Last Name'=>'lastname', + 'First Name'=>'firstname', + 'Company'=>'company', + 'Phone'=>'phone', + 'Website'=>'website', + 'Email'=>'email', + 'Assigned To'=>'assigned_user_id' + ); + var $list_link_field= 'lastname'; + + var $search_fields = Array( + 'Name'=>Array('leaddetails'=>'lastname'), + 'Company'=>Array('leaddetails'=>'company') + ); + var $search_fields_name = Array( + 'Name'=>'lastname', + 'Company'=>'company' + ); + + var $required_fields = array("lastname"=>1, 'company'=>1); + + //Added these variables which are used as default order by and sortorder in ListView + var $default_order_by = 'lastname'; + var $default_sort_order = 'ASC'; + + var $groupTable = Array('vtiger_leadgrouprelation','leadid'); + + function Leads() { + $this->log = LoggerManager::getLogger('lead'); + $this->log->debug("Entering Leads() method ..."); + $this->db = new PearDatabase(); + $this->column_fields = getColumnFields('Leads'); + $this->log->debug("Exiting Lead method ..."); + } + + /** Function to handle module specific operations when saving a entity + */ + function save_module($module) + { + } + + // Mike Crowe Mod --------------------------------------------------------Default ordering for us + /** + * Function to get sort order + * return string $sorder - sortorder string either 'ASC' or 'DESC' + */ + function getSortOrder() + { + global $log; + $log->debug("Entering getSortOrder() method ..."); + if(isset($_REQUEST['sorder'])) + $sorder = $_REQUEST['sorder']; + else + $sorder = (($_SESSION['LEADS_SORT_ORDER'] != '')?($_SESSION['LEADS_SORT_ORDER']):($this->default_sort_order)); + + $log->debug("Exiting getSortOrder method ..."); + return $sorder; + } + + /** + * Function to get order by + * return string $order_by - fieldname(eg: 'leadname') + */ + function getOrderBy() + { + global $log; + $log->debug("Entering getOrderBy() method ..."); + if (isset($_REQUEST['order_by'])) + $order_by = $_REQUEST['order_by']; + else + $order_by = (($_SESSION['LEADS_ORDER_BY'] != '')?($_SESSION['LEADS_ORDER_BY']):($this->default_order_by)); + + $log->debug("Exiting getOrderBy method ..."); + return $order_by; + } + // Mike Crowe Mod -------------------------------------------------------- + + + + /** Function to export the lead records in CSV Format + * @param reference variable - order by is passed when the query is executed + * @param reference variable - where condition is passed when the query is executed + * Returns Export Leads Query. + */ + function create_export_query(&$order_by, &$where) + { + global $log; + global $current_user; + $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Leads", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list, vtiger_leadgrouprelation.groupname as 'Assigned To Group' + FROM ".$this->entity_table." + INNER JOIN vtiger_leaddetails + ON vtiger_crmentity.crmid=vtiger_leaddetails.leadid + LEFT JOIN vtiger_leadsubdetails + ON vtiger_leaddetails.leadid = vtiger_leadsubdetails.leadsubscriptionid + LEFT JOIN vtiger_leadaddress + ON vtiger_leaddetails.leadid=vtiger_leadaddress.leadaddressid + LEFT JOIN vtiger_leadscf + ON vtiger_leadscf.leadid=vtiger_leaddetails.leadid + LEFT JOIN vtiger_leadgrouprelation + ON vtiger_leadscf.leadid = vtiger_leadgrouprelation.leadid + LEFT JOIN vtiger_groups + ON vtiger_groups.groupname = vtiger_leadgrouprelation.groupname + LEFT JOIN vtiger_users + ON vtiger_crmentity.smownerid = vtiger_users.id and vtiger_users.status='Active' + "; + + + $where_auto = " vtiger_crmentity.deleted=0 AND vtiger_leaddetails.converted =0"; + + if($where != "") + $query .= "where ($where) AND ".$where_auto; + else + $query .= "where ".$where_auto; + + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + //we should add security check when the user has Private Access + if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[7] == 3) + { + //Added security check to get the permitted records only + $query = $query." ".getListViewSecurityParameter("Leads"); + } + + if(!empty($order_by)) + $query .= " ORDER BY $order_by"; + + $log->debug("Exiting create_export_query method ..."); + return $query; + } + + + + /** Returns a list of the associated tasks + * @param integer $id - leadid + * returns related Task or Event record in array format + */ +function get_activities($id) +{ + global $log, $singlepane_view; + $log->debug("Entering get_activities(".$id.") method ..."); + global $app_strings; + + $focus = new Activity(); + $button = ''; + + if(isPermitted("Calendar",1,"") == 'yes') + { + $button .= ' '; + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id; + + + // First, get the list of IDs. + $query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime,case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and ((vtiger_activity.activitytype='Task' and vtiger_activity.status not in ('Completed','Deferred')) or (vtiger_activity.activitytype in ('Meeting','Call') and vtiger_activity.eventstatus not in ('','Held')))"; + $log->debug("Exiting get_activities method ..."); + return GetRelatedList('Leads','Calendar',$focus,$query,$button,$returnset); +} + +/** Returns a list of the associated Campaigns + * @param $id -- campaign id :: Type Integer + * @returns list of campaigns in array format + */ +function get_campaigns($id) +{ + global $log, $singlepane_view; + $log->debug("Entering get_campaigns(".$id.") method ..."); + global $mod_strings; + $focus = new Campaigns(); + $button = ''; + + if($singlepane_view == 'true') + $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id; + + $log->info("Campaign Related List for Lead Displayed"); + $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name ,vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaignleadrel on vtiger_campaignleadrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaignleadrel.leadid=".$id." and vtiger_crmentity.deleted=0"; + + $log->debug("Exiting get_campaigns method ..."); + return GetRelatedList('Leads','Campaigns',$focus,$query,$button,$returnset); + +} + + + /** Returns a list of the associated emails + * @param integer $id - leadid + * returns related emails record in array format + */ +function get_emails($id) +{ + global $log, $singlepane_view; + $log->debug("Entering get_emails(".$id.") method ..."); + global $mod_strings; + require_once('include/RelatedListView.php'); + + $focus = new Emails(); + + $button = ''; + + if(isPermitted("Emails",1,"") == 'yes') + { + + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id; + + $query ="select vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.semodule, vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.status, vtiger_activity.priority, vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted=0 and vtiger_seactivityrel.crmid=".$id; + $log->debug("Exiting get_emails method ..."); + return GetRelatedList('Leads','Emails',$focus,$query,$button,$returnset); +} + +/** + * Function to get Lead related Task & Event which have activity type Held, Completed or Deferred. + * @param integer $id - leadid + * returns related Task or Event record in array format + */ +function get_history($id) +{ + global $log; + $log->debug("Entering get_history(".$id.") method ..."); + $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, + vtiger_activity.eventstatus, vtiger_activity.activitytype,vtiger_activity.date_start, + vtiger_activity.due_date,vtiger_activity.time_start,vtiger_activity.time_end, + vtiger_crmentity.modifiedtime,vtiger_crmentity.createdtime, + vtiger_crmentity.description, vtiger_users.user_name,vtiger_activitygrouprelation.groupname + from vtiger_activity + inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid + left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid + left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname + left join vtiger_users on vtiger_crmentity.smownerid= vtiger_users.id + where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') + and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != '')) + and vtiger_seactivityrel.crmid=".$id; + //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + + $log->debug("Exiting get_history method ..."); + return getHistory('Leads',$query,$id); +} + +/** + * Function to get Lead related Attachments + * @param integer $id - leadid + * returns related Attachment record in array format + */ +function get_attachments($id) +{ + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); + // Armando L?scher 18.10.2005 -> ?visibleDescription + // Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name + // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + $query = "select vtiger_notes.title,'Notes ' ActivityType, vtiger_notes.filename, + vtiger_attachments.type FileType,crm2.modifiedtime lastmodified, + vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid, + crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name + from vtiger_notes + inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0 + left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid + left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id; + $query .= ' union all '; + // Armando L?scher 18.10.2005 -> ?visibleDescription + // Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name + // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + // Inserted order by createdtime desc + $query .= "select vtiger_attachments.description title ,'Attachments' ActivityType, + vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified, + vtiger_attachments.attachmentsid attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid, + crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name + from vtiger_attachments + inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id." + order by createdtime desc"; + + $log->debug("Exiting get_attachments method ..."); + return getAttachmentsAndNotes('Leads',$query,$id); +} + +/** +* Function to get lead related Products +* @param integer $id - leadid +* returns related Products record in array format +*/ +function get_products($id) +{ + global $log, $singlepane_view; + $log->debug("Entering get_products(".$id.") method ..."); + require_once('modules/Products/Products.php'); + global $mod_strings; + global $app_strings; + + $focus = new Products(); + + $button = ''; + + if(isPermitted("Products",1,"") == 'yes') + { + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, + vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, + vtiger_crmentity.crmid, vtiger_crmentity.smownerid + FROM vtiger_products + INNER JOIN vtiger_seproductsrel ON vtiger_products.productid = vtiger_seproductsrel.productid and vtiger_seproductsrel.setype = 'Leads' + INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_products.productid + INNER JOIN vtiger_leaddetails ON vtiger_leaddetails.leadid = vtiger_seproductsrel.crmid + WHERE vtiger_crmentity.deleted = 0 AND vtiger_leaddetails.leadid = $id"; + + $log->debug("Exiting get_products method ..."); + return GetRelatedList('Leads','Products',$focus,$query,$button,$returnset); +} + + /** Function to get the Combo List Values of Leads Field + * @param string $list_option + * Returns Combo List Options + */ + function get_lead_field_options($list_option) + { + global $log; + $log->debug("Entering get_lead_field_options(".$list_option.") method ..."); + $comboFieldArray = getComboArray($this->combofieldNames); + $log->debug("Exiting get_lead_field_options method ..."); + return $comboFieldArray[$list_option]; + } + +/** Function to get the Columnnames of the Leads Record +* Used By vtigerCRM Word Plugin +* Returns the Merge Fields for Word Plugin +*/ +function getColumnNames_Lead() +{ + global $log,$current_user; + $log->debug("Entering getColumnNames_Lead() method ..."); + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) + { + $sql1 = "select fieldlabel from vtiger_field where tabid=7"; + }else + { + $profileList = getCurrentUserProfileList(); + $sql1 = "select fieldlabel from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=7 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; + } + $result = $this->db->query($sql1); + $numRows = $this->db->num_rows($result); + for($i=0; $i < $numRows;$i++) + { + $custom_fields[$i] = $this->db->query_result($result,$i,"fieldlabel"); + $custom_fields[$i] = ereg_replace(" ","",$custom_fields[$i]); + $custom_fields[$i] = strtoupper($custom_fields[$i]); + } + $mergeflds = $custom_fields; + $log->debug("Exiting getColumnNames_Lead method ..."); + return $mergeflds; +} +//End + +} + +?> Modified: vtigercrm/branches/5.1_jens/modules/Leads/ListView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/ListView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/ListView.php Mon Apr 16 12:27:44 2007 @@ -166,7 +166,7 @@ $query .= ' and '.$where; } - +/* if(isset($order_by) && $order_by != '') { $tablename = getTableNameForField('Leads',$order_by); @@ -177,7 +177,24 @@ $query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder; } - +*/ +if(isset($order_by) && $order_by != '') +{ + if($order_by == 'smownerid') + { + $query .= ' ORDER BY user_name '.$sorder; + } + else + { + $tablename = getTableNameForField('Leads',$order_by); + $tablename = (($tablename != '')?($tablename."."):''); + if( $adb->dbType == "pgsql") + $query .= ' GROUP BY '.$tablename.$order_by; + + + $query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder; + } +} //Retreiving the no of rows $count_result = $adb->query( mkCountQuery( $query)); $noofrows = $adb->query_result($count_result,0,"count"); @@ -221,7 +238,6 @@ } if(isPermitted("Leads","Merge") == 'yes') { - $smarty->assign("MERGEBUTTON",""); $wordTemplateResult = fetchWordTemplateList("Leads"); $tempCount = $adb->num_rows($wordTemplateResult); $tempVal = $adb->fetch_array($wordTemplateResult); @@ -230,7 +246,23 @@ $optionString .=""; $tempVal = $adb->fetch_array($wordTemplateResult); } - $smarty->assign("WORDTEMPLATEOPTIONS",""); + if($tempCount > 0) + { + $smarty->assign("WORDTEMPLATEOPTIONS",""); + + $smarty->assign("MERGEBUTTON",""); + } + else + { + global $current_user; + require("user_privileges/user_privileges_".$current_user->id.".php"); + if($is_admin == true) + { + $smarty->assign("MERGEBUTTON",''); + } + } + + } //mass merge for word templates Modified: vtigercrm/branches/5.1_jens/modules/Leads/ListViewTop.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/ListViewTop.php (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/ListViewTop.php Mon Apr 16 12:27:44 2007 @@ -68,7 +68,7 @@ $start_date = date("Y-m-d", strtotime("-1 week")); } - $list_query = 'select vtiger_leaddetails.*,vtiger_crmentity.createdtime,vtiger_crmentity.description from vtiger_leaddetails inner join vtiger_crmentity on vtiger_leaddetails.leadid = vtiger_crmentity.crmid where vtiger_crmentity.deleted =0 AND vtiger_leaddetails.converted =0 AND vtiger_crmentity.createdtime >='.$start_date.' AND vtiger_crmentity.smownerid = '.$current_user->id; + $list_query = 'select vtiger_leaddetails.*,vtiger_crmentity.createdtime,vtiger_crmentity.description from vtiger_leaddetails inner join vtiger_crmentity on vtiger_leaddetails.leadid = vtiger_crmentity.crmid where vtiger_crmentity.deleted =0 AND vtiger_leaddetails.converted =0 AND vtiger_leaddetails.leadstatus not in (\'Lost Lead\', \'Junk Lead\',\''.$current_module_strings['Lost Lead'].'\',\''.$current_module_strings['Junk Lead'].'\') AND vtiger_crmentity.createdtime >='.$start_date.' AND vtiger_crmentity.smownerid = '.$current_user->id; $list_result = $adb->query($list_query); $noofrows = $adb->num_rows($list_result); @@ -114,7 +114,7 @@ 'LEAD_ID' => $lead['id'], ); - $value[]= ''.$lead_fields['LEAD_NAME'].''; + $value[]= ''.substr($lead_fields['LEAD_NAME'],0,20).'...'.''; $value[]=$lead_fields['COMPANY']; $value[]=$lead_fields['ANNUAL_REVENUE']; $value[]=$lead_fields['LEAD_STATUS']; Modified: vtigercrm/branches/5.1_jens/modules/Leads/Merge.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/Merge.php (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/Merge.php Mon Apr 16 12:27:44 2007 @@ -24,6 +24,7 @@ } else if(document.all) { + document.write("

    Click here to return to the previous page"); document.write(""); } Modified: vtigercrm/branches/5.1_jens/modules/Leads/updateRelations.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/updateRelations.php (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/updateRelations.php Mon Apr 16 12:27:44 2007 @@ -13,8 +13,11 @@ require_once('user_privileges/default_module_view.php'); global $adb, $singlepane_view; $idlist = $_REQUEST['idlist']; -$update_mod = $_REQUEST['destination_module']; -$rel_table = 'vtiger_campaignleadrel'; +$dest_mod = $_REQUEST['destination_module']; + +if($singlepane_view == 'true') $action = "DetailView"; +else $action = "CallRelatedList"; + if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '') { //split the string and store in an array @@ -23,24 +26,25 @@ { if($id != '') { - $sql = "insert into ".$rel_table." values(".$id.",".$_REQUEST["parentid"].")"; - $adb->query($sql); + if($dest_mod == 'Products') + $adb->query("insert into vtiger_seproductsrel values (".$_REQUEST["parentid"].",".$id.",'Leads')"); + elseif($dest_mod == 'Campaigns') + $adb->query("insert into vtiger_campaignleadrel values(".$id.",".$_REQUEST["parentid"].")"); } } - if($singlepane_view == 'true') - header("Location: index.php?action=DetailView&module=Leads&record=".$_REQUEST["parentid"]); - else - header("Location: index.php?action=CallRelatedList&module=Leads&record=".$_REQUEST["parentid"]); + $record = $_REQUEST["parentid"]; } elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '') -{ - $sql = "insert into ".$rel_table." values(".$_REQUEST["entityid"].",".$_REQUEST["parid"].")"; - $adb->query($sql); - - if($singlepane_view == 'true') - header("Location: index.php?action=DetailView&module=Leads&record=".$_REQUEST["parid"]); - else - header("Location: index.php?action=CallRelatedList&module=Leads&record=".$_REQUEST["parid"]); +{ + if($dest_mod == 'Products') + $adb->query("insert into vtiger_seproductsrel values (".$_REQUEST["parid"].",".$_REQUEST["entityid"].",'Leads')"); + elseif($dest_mod == 'Campaigns') + $adb->query("insert into vtiger_campaignleadrel values(".$_REQUEST["entityid"].",".$_REQUEST["parid"].")"); + $record = $_REQUEST["parid"]; } +header("Location: index.php?action=$action&module=Leads&record=".$record); + + + ?> Modified: vtigercrm/branches/5.1_jens/modules/Migration/Migration.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Migration/Migration.php (original) +++ vtigercrm/branches/5.1_jens/modules/Migration/Migration.php Mon Apr 16 12:27:44 2007 @@ -299,8 +299,8 @@ //To handle the file includes for each and every version //Here we have to decide which files should be included, where the files will be added newly for every public release - //Handle Here -- Mickie - include("modules/Migration/ModifyDatabase/MigrationInfo.php"); + //In this included file we have included modules/Migration/DBChanges/42P2_to_50.php which will apply the db changes upto 5.0. + include("modules/Migration/MigrationInfo.php"); $migrationlog->debug("Mickie ---- Ends\n\n\n"); } Modified: vtigercrm/branches/5.1_jens/modules/Migration/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Migration/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Migration/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -75,7 +75,20 @@ 'LBL_MYSQL_SERVER_PATH'=>'MySQL Server Path : ', 'LBL_MIGRATE_BUTTON'=>'Migrate', 'LBL_CANCEL_BUTTON'=>'Cancel', - +'LBL_UPGRADE_FROM_VTIGER_5X'=>'Upgrade database from vtiger CRM 5.x to next version', +'LBL_PATCH_OR_MIGRATION'=>'you must specify the source database version (Patch update or Migration)', +//Added for java script alerts +'ENTER_SOURCE_HOST' => 'Please enter the Source Host Name', +'ENTER_SOURCE_MYSQL_PORT' => 'Please enter the Source MySql Port Number', +'ENTER_SOURCE_MYSQL_USER' => 'Please enter the Source MySql User Name', +'ENTER_SOURCE_DATABASE' => 'Please enter the Source Database Name', +'ENTER_SOURCE_MYSQL_DUMP' => 'Please enter the Valid MySQL Dump File', +'ENTER_HOST' => 'Please enter the Host Name', +'ENTER_MYSQL_PORT' => 'Please enter the MySql Port Number', +'ENTER_MYSQL_USER' => 'Please enter the MySql User Name', +'ENTER_DATABASE' => 'Please enter the Database Name', +'SELECT_ANYONE_OPTION' => 'Please select any one option', +'ENTER_CORRECT_MYSQL_PATH' => 'Please enter the Correct MySQL Path', ); Modified: vtigercrm/branches/5.1_jens/modules/Notes/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Notes/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Notes/DetailView.php Mon Apr 16 12:27:44 2007 @@ -1,119 +1,122 @@ -retrieve_entity_info($_REQUEST['record'],"Notes"); - $focus->id = $_REQUEST['record']; - $focus->name=$focus->column_fields['notes_title']; -} -if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { - $focus->id = ""; -} - -//needed when creating a new note with default values passed in -if (isset($_REQUEST['contact_name']) && is_null($focus->contact_name)) { - $focus->contact_name = $_REQUEST['contact_name']; -} -if (isset($_REQUEST['contact_id']) && is_null($focus->contact_id)) { - $focus->contact_id = $_REQUEST['contact_id']; -} -if (isset($_REQUEST['opportunity_name']) && is_null($focus->parent_name)) { - $focus->parent_name = $_REQUEST['opportunity_name']; -} -if (isset($_REQUEST['opportunity_id']) && is_null($focus->parent_id)) { - $focus->parent_id = $_REQUEST['opportunity_id']; -} -if (isset($_REQUEST['account_name']) && is_null($focus->parent_name)) { - $focus->parent_name = $_REQUEST['account_name']; -} -if (isset($_REQUEST['account_id']) && is_null($focus->parent_id)) { - $focus->parent_id = $_REQUEST['account_id']; -} - -global $theme; -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; -require_once($theme_path.'layout_utils.php'); - -$log->info("Note detail view"); - -$smarty = new vtigerCRM_Smarty; -$smarty->assign("MOD", $mod_strings); -$smarty->assign("APP", $app_strings); -$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields)); -$smarty->assign("UPDATEINFO",updateInfo($focus->id)); - - -if (isset($focus->name)) $smarty->assign("NAME", $focus->name); -else $smarty->assign("NAME", ""); - -if (isset($_REQUEST['return_module'])) $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); -if (isset($_REQUEST['return_action'])) $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); -if (isset($_REQUEST['return_id'])) $smarty->assign("RETURN_ID", $_REQUEST['return_id']); - -$smarty->assign("THEME", $theme); -$smarty->assign("IMAGE_PATH", $image_path); -$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); -$smarty->assign("ID", $focus->id); -$category = getParentTab(); -$smarty->assign("CATEGORY",$category); - -if ( isset($focus->filename) && $focus->filename != '') -{ - $fileurl = "filename,$focus->id)."\" target=\"_blank\">". $focus->filename .""; - $smarty->assign("FILELINK", $fileurl); -} - -$smarty->assign("SINGLE_MOD", 'Note'); - -if(isPermitted("Notes","EditView",$_REQUEST['record']) == 'yes') - $smarty->assign("EDIT_DUPLICATE","permitted"); - -if(isPermitted("Notes","Delete",$_REQUEST['record']) == 'yes') - $smarty->assign("DELETE","permitted"); - -$check_button = Button_Check($module); -$smarty->assign("CHECK", $check_button); -$tabid = getTabid("Notes"); - $validationData = getDBValidationData($focus->tab_name,$tabid); - $data = split_validationdataArray($validationData); - - $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); - $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); - $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); - -$smarty->assign("MODULE",$currentModule); -$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); -$smarty->display("DetailView.tpl"); - -?> +retrieve_entity_info($_REQUEST['record'],"Notes"); + $focus->id = $_REQUEST['record']; + $focus->name=$focus->column_fields['notes_title']; +} +if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { + $focus->id = ""; +} + +//needed when creating a new note with default values passed in +if (isset($_REQUEST['contact_name']) && is_null($focus->contact_name)) { + $focus->contact_name = $_REQUEST['contact_name']; +} +if (isset($_REQUEST['contact_id']) && is_null($focus->contact_id)) { + $focus->contact_id = $_REQUEST['contact_id']; +} +if (isset($_REQUEST['opportunity_name']) && is_null($focus->parent_name)) { + $focus->parent_name = $_REQUEST['opportunity_name']; +} +if (isset($_REQUEST['opportunity_id']) && is_null($focus->parent_id)) { + $focus->parent_id = $_REQUEST['opportunity_id']; +} +if (isset($_REQUEST['account_name']) && is_null($focus->parent_name)) { + $focus->parent_name = $_REQUEST['account_name']; +} +if (isset($_REQUEST['account_id']) && is_null($focus->parent_id)) { + $focus->parent_id = $_REQUEST['account_id']; +} + +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); + +$log->info("Note detail view"); + +$smarty = new vtigerCRM_Smarty; +$smarty->assign("MOD", $mod_strings); +$smarty->assign("APP", $app_strings); +$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields)); +$smarty->assign("UPDATEINFO",updateInfo($focus->id)); + + +if (isset($focus->name)) $smarty->assign("NAME", $focus->name); +else $smarty->assign("NAME", ""); + +if (isset($_REQUEST['return_module'])) $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); +if (isset($_REQUEST['return_action'])) $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); +if (isset($_REQUEST['return_id'])) $smarty->assign("RETURN_ID", $_REQUEST['return_id']); + +$smarty->assign("THEME", $theme); +$smarty->assign("IMAGE_PATH", $image_path); +$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); +$smarty->assign("ID", $focus->id); +$category = getParentTab(); +$smarty->assign("CATEGORY",$category); + +if ( isset($focus->filename) && $focus->filename != '') +{ + $fileurl = "filename,$focus->id)."\" target=\"_blank\">". $focus->filename .""; + $smarty->assign("FILELINK", $fileurl); +} + +$smarty->assign("SINGLE_MOD", 'Note'); + +if(isPermitted("Notes","EditView",$_REQUEST['record']) == 'yes') + $smarty->assign("EDIT_DUPLICATE","permitted"); + +if(isPermitted("Notes","Delete",$_REQUEST['record']) == 'yes') + $smarty->assign("DELETE","permitted"); + +$check_button = Button_Check($module); +$smarty->assign("CHECK", $check_button); + +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); + +$tabid = getTabid("Notes"); + $validationData = getDBValidationData($focus->tab_name,$tabid); + $data = split_validationdataArray($validationData); + + $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); + $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); + $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); + +$smarty->assign("MODULE",$currentModule); +$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); +$smarty->display("DetailView.tpl"); + +?> Modified: vtigercrm/branches/5.1_jens/modules/Notes/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Notes/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Notes/EditView.php Mon Apr 16 12:27:44 2007 @@ -1,191 +1,191 @@ - The selected file has no data or a invalid file.
    '; -} - -if(isset($_REQUEST['record']) && $_REQUEST['record'] !='') -{ - $focus->id = $_REQUEST['record']; - $focus->mode = 'edit'; - $focus->retrieve_entity_info($_REQUEST['record'],"Notes"); - $focus->name=$focus->column_fields['notes_title']; -} -if(isset($_REQUEST['parent_id'])) -{ - $focus->column_fields['parent_id'] = $_REQUEST['parent_id']; -} -//$old_id = ''; -if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') -{ - $old_id = $_REQUEST['record']; - if (! empty($focus->filename) ) - { - $old_id = $focus->id; - } - $focus->id = ""; - $focus->mode = ''; -} - - - -//setting default flag value so due date and time not required -if (!isset($focus->id)) $focus->date_due_flag = 'on'; - -//needed when creating a new case with default values passed in -if (isset($_REQUEST['contact_name']) && is_null($focus->contact_name)) { - $focus->contact_name = $_REQUEST['contact_name']; -} -if (isset($_REQUEST['contact_id']) && is_null($focus->contact_id)) { - $focus->contact_id = $_REQUEST['contact_id']; -} -if (isset($_REQUEST['parent_name']) && is_null($focus->parent_name)) { - $focus->parent_name = $_REQUEST['parent_name']; -} -if (isset($_REQUEST['parent_id']) && is_null($focus->parent_id)) { - $focus->parent_id = $_REQUEST['parent_id']; -} -if (isset($_REQUEST['parent_type'])) { - $focus->parent_type = $_REQUEST['parent_type']; -} -elseif (!isset($focus->parent_type)) { - $focus->parent_type = $app_list_strings['record_type_default_key']; -} - -if (isset($_REQUEST['filename']) && $_REQUEST['isDuplicate'] != 'true') { - $focus->filename = $_REQUEST['filename']; -} - - - -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; -require_once($theme_path.'layout_utils.php'); - -$disp_view = getView($focus->mode); -if($disp_view == 'edit_view') - $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields)); -else -{ - $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS')); -} -$smarty->assign("OP_MODE",$disp_view); -$category = getParentTab(); -$smarty->assign("CATEGORY",$category); - - -$log->info("Note detail view"); - -$smarty->assign("MOD", $mod_strings); -$smarty->assign("APP", $app_strings); -$smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",'Note'); -//Display the FCKEditor or not? -- configure $FCKEDITOR_DISPLAY in config.php -$smarty->assign("FCKEDITOR_DISPLAY",$FCKEDITOR_DISPLAY); - -if (isset($focus->name)) -$smarty->assign("NAME", $focus->name); -else -$smarty->assign("NAME", ""); - -if($focus->mode == 'edit') -{ - $smarty->assign("UPDATEINFO",updateInfo($focus->id)); - $smarty->assign("MODE", $focus->mode); -} - -if (isset($_REQUEST['return_module'])) -$smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); -else -$smarty->assign("RETURN_MODULE","Notes"); -if (isset($_REQUEST['return_action'])) -$smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); -else -$smarty->assign("RETURN_ACTION","index"); -if (isset($_REQUEST['return_id'])) -$smarty->assign("RETURN_ID", $_REQUEST['return_id']); -if (isset($_REQUEST['email_id'])) -$smarty->assign("EMAILID", $_REQUEST['email_id']); -if (isset($_REQUEST['ticket_id'])) $smarty->assign("TICKETID", $_REQUEST['ticket_id']); -if (isset($_REQUEST['fileid'])) -$smarty->assign("FILEID", $_REQUEST['fileid']); -if (isset($_REQUEST['record'])) -{ - $smarty->assign("CANCELACTION", "DetailView"); -} -else -{ - $smarty->assign("CANCELACTION", "index"); -} -if (isset($_REQUEST['return_viewname'])) -$smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); -$smarty->assign("THEME", $theme); -$smarty->assign("IMAGE_PATH", $image_path); -$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); -$smarty->assign("ID", $focus->id); -$smarty->assign("OLD_ID", $old_id ); - -if ( empty($focus->filename)) -{ - $smarty->assign("FILENAME_TEXT", ""); - $smarty->assign("FILENAME", ""); -} -else -{ - $smarty->assign("FILENAME_TEXT", "(".$focus->filename.")"); - $smarty->assign("FILENAME", $focus->filename); -} - -if (isset($focus->parent_type) && $focus->parent_type != "") { - $change_parent_button = ""; - $smarty->assign("CHANGE_PARENT_BUTTON", $change_parent_button); -} -if ($focus->parent_type == "Account") $smarty->assign("DEFAULT_SEARCH", "&query=true&account_id=$focus->parent_id&account_name=".urlencode($focus->parent_name)); - -$check_button = Button_Check($module); -$smarty->assign("CHECK", $check_button); -$tabid = getTabid("Notes"); - $validationData = getDBValidationData($focus->tab_name,$tabid); - $data = split_validationdataArray($validationData); - - $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); - $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); - $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); - -if($focus->mode == 'edit') - $smarty->display("salesEditView.tpl"); -else - $smarty->display("CreateView.tpl"); - -?> + The selected file has no data or a invalid file.
    '; +} + +if(isset($_REQUEST['record']) && $_REQUEST['record'] !='') +{ + $focus->id = $_REQUEST['record']; + $focus->mode = 'edit'; + $focus->retrieve_entity_info($_REQUEST['record'],"Notes"); + $focus->name=$focus->column_fields['notes_title']; +} +if(isset($_REQUEST['parent_id'])) +{ + $focus->column_fields['parent_id'] = $_REQUEST['parent_id']; +} +//$old_id = ''; +if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') +{ + $old_id = $_REQUEST['record']; + if (! empty($focus->filename) ) + { + $old_id = $focus->id; + } + $focus->id = ""; + $focus->mode = ''; +} + + + +//setting default flag value so due date and time not required +if (!isset($focus->id)) $focus->date_due_flag = 'on'; + +//needed when creating a new case with default values passed in +if (isset($_REQUEST['contact_name']) && is_null($focus->contact_name)) { + $focus->contact_name = $_REQUEST['contact_name']; +} +if (isset($_REQUEST['contact_id']) && is_null($focus->contact_id)) { + $focus->contact_id = $_REQUEST['contact_id']; +} +if (isset($_REQUEST['parent_name']) && is_null($focus->parent_name)) { + $focus->parent_name = $_REQUEST['parent_name']; +} +if (isset($_REQUEST['parent_id']) && is_null($focus->parent_id)) { + $focus->parent_id = $_REQUEST['parent_id']; +} +if (isset($_REQUEST['parent_type'])) { + $focus->parent_type = $_REQUEST['parent_type']; +} +elseif (!isset($focus->parent_type)) { + $focus->parent_type = $app_list_strings['record_type_default_key']; +} + +if (isset($_REQUEST['filename']) && $_REQUEST['isDuplicate'] != 'true') { + $focus->filename = $_REQUEST['filename']; +} + + + +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); + +$disp_view = getView($focus->mode); +if($disp_view == 'edit_view') + $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields)); +else +{ + $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS')); +} +$smarty->assign("OP_MODE",$disp_view); +$category = getParentTab(); +$smarty->assign("CATEGORY",$category); + + +$log->info("Note detail view"); + +$smarty->assign("MOD", $mod_strings); +$smarty->assign("APP", $app_strings); +$smarty->assign("MODULE",$currentModule); +$smarty->assign("SINGLE_MOD",'Note'); +//Display the FCKEditor or not? -- configure $FCKEDITOR_DISPLAY in config.php +$smarty->assign("FCKEDITOR_DISPLAY",$FCKEDITOR_DISPLAY); + +if (isset($focus->name)) +$smarty->assign("NAME", $focus->name); +else +$smarty->assign("NAME", ""); + +if($focus->mode == 'edit') +{ + $smarty->assign("UPDATEINFO",updateInfo($focus->id)); + $smarty->assign("MODE", $focus->mode); +} + +if (isset($_REQUEST['return_module'])) +$smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); +else +$smarty->assign("RETURN_MODULE","Notes"); +if (isset($_REQUEST['return_action'])) +$smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); +else +$smarty->assign("RETURN_ACTION","index"); +if (isset($_REQUEST['return_id'])) +$smarty->assign("RETURN_ID", $_REQUEST['return_id']); +if (isset($_REQUEST['email_id'])) +$smarty->assign("EMAILID", $_REQUEST['email_id']); +if (isset($_REQUEST['ticket_id'])) $smarty->assign("TICKETID", $_REQUEST['ticket_id']); +if (isset($_REQUEST['fileid'])) +$smarty->assign("FILEID", $_REQUEST['fileid']); +if (isset($_REQUEST['record'])) +{ + $smarty->assign("CANCELACTION", "DetailView"); +} +else +{ + $smarty->assign("CANCELACTION", "index"); +} +if (isset($_REQUEST['return_viewname'])) +$smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); +$smarty->assign("THEME", $theme); +$smarty->assign("IMAGE_PATH", $image_path); +$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); +$smarty->assign("ID", $focus->id); +$smarty->assign("OLD_ID", $old_id ); + +if ( empty($focus->filename)) +{ + $smarty->assign("FILENAME_TEXT", ""); + $smarty->assign("FILENAME", ""); +} +else +{ + $smarty->assign("FILENAME_TEXT", "(".$focus->filename.")"); + $smarty->assign("FILENAME", $focus->filename); +} + +if (isset($focus->parent_type) && $focus->parent_type != "") { + $change_parent_button = ""; + $smarty->assign("CHANGE_PARENT_BUTTON", $change_parent_button); +} +if ($focus->parent_type == "Account") $smarty->assign("DEFAULT_SEARCH", "&query=true&account_id=$focus->parent_id&account_name=".urlencode($focus->parent_name)); + +$check_button = Button_Check($module); +$smarty->assign("CHECK", $check_button); +$tabid = getTabid("Notes"); + $validationData = getDBValidationData($focus->tab_name,$tabid); + $data = split_validationdataArray($validationData); + + $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); + $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); + $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); + $smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); +if($focus->mode == 'edit') + $smarty->display("salesEditView.tpl"); +else + $smarty->display("CreateView.tpl"); + +?> Modified: vtigercrm/branches/5.1_jens/modules/Notes/Notes.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Notes/Notes.php (original) +++ vtigercrm/branches/5.1_jens/modules/Notes/Notes.php Mon Apr 16 12:27:44 2007 @@ -29,17 +29,18 @@ // Note is used to store customer information. class Notes extends CRMEntity { + var $log; var $db; var $default_note_name_dom = array('Meeting vtiger_notes', 'Reminder'); - var $tab_name = Array('vtiger_crmentity','vtiger_notes'); + var $tab_name = Array('vtiger_crmentity','vtiger_notes','vtiger_attachments'); var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_notes'=>'notesid','vtiger_senotesrel'=>'notesid','vtiger_attachments'=>'attachmentsid'); var $column_fields = Array(); - var $sortby_fields = Array('notes_title','modifiedtime','contact_id','filename'); + var $sortby_fields = Array('title','modifiedtime','contact_id','filename'); // This is used to retrieve related vtiger_fields from form posts. var $additional_column_fields = Array('', '', '', ''); @@ -47,7 +48,7 @@ // This is the list of vtiger_fields that are in the lists. var $list_fields = Array( 'Subject'=>Array('notes'=>'notes_title'), - 'Contact Name'=>Array('notes'=>'contact_id'), + 'Contact Name'=>Array('contactdetails'=>'lastname'), 'Related to'=>Array('senotesrel'=>'crmid'), 'File'=>Array('notes'=>'filename'), 'Last Modified'=>Array('crmentity'=>'modifiedtime') @@ -64,7 +65,6 @@ //Added these variables which are used as default order by and sortorder in ListView var $default_order_by = 'modifiedtime'; var $default_sort_order = 'ASC'; - function Notes() { $this->log = LoggerManager::getLogger('notes'); $this->log->debug("Entering Notes() method ..."); @@ -75,7 +75,8 @@ function save_module($module) { - + + $insertion_mode = $this->mode; //inserting into vtiger_senotesrel if(isset($this->column_fields['parent_id']) && $this->column_fields['parent_id'] != '') { Modified: vtigercrm/branches/5.1_jens/modules/Notes/Save.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Notes/Save.php (original) +++ vtigercrm/branches/5.1_jens/modules/Notes/Save.php Mon Apr 16 12:27:44 2007 @@ -1,139 +1,139 @@ -date_due_flag = 'off'; - -//Save the Note -$focus->save("Notes"); - -//Added to retrieve the existing attachment of the notes and save it for the new duplicated note -if($_FILES['filename']['name'] == '' && $_REQUEST['mode'] != 'edit' && $_REQUEST['old_id'] != '') -{ - $sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid=vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid= ".$_REQUEST['old_id']; - $result = $adb->query($sql); - if($adb->num_rows($result) != 0) - { - $attachmentid = $adb->query_result($result,0,'attachmentsid'); - $filename = $adb->query_result($result,0,'name'); - $filetype = $adb->query_result($result,0,'type'); - $filepath = $adb->query_result($result,0,'path'); - - $new_attachmentid = $adb->getUniqueID("vtiger_crmentity"); - $date_var = $adb->formatDate(date('YmdHis')); - - $upload_filepath = decideFilePath(); - - //Read the old file contents and write it as a new file with new attachment id - $handle = @fopen($upload_filepath.$new_attachmentid."_".$filename,'w'); - fputs($handle, file_get_contents($filepath.$attachmentid."_".$filename)); - fclose($handle); - - $adb->query("update vtiger_notes set filename=\"$filename\" where notesid=$focus->id"); - $adb->query("insert into vtiger_crmentity (crmid,setype,createdtime) values('".$new_attachmentid."','Notes Attachment','".$date_var."')"); - - $adb->query("insert into vtiger_attachments values(".$new_attachmentid.",'".$filename."','','".$filetype."','".$upload_filepath."')"); - - $adb->query("insert into vtiger_seattachmentsrel values('".$focus->id."','".$new_attachmentid."')"); - } -} - - -$return_id = $focus->id; -$note_id = $return_id; - -if(isset($_REQUEST['parenttab']) && $_REQUEST['parenttab'] != "") $parenttab = $_REQUEST['parenttab']; -if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; -else $return_module = "Notes"; -if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; -else $return_action = "DetailView"; -if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id']; - -// Notes added to Contacts should also update Accounts -// Added by DG 16 Nov 2005 -if($_REQUEST['mode'] != 'edit' && ($_REQUEST['return_module']=='Contacts')) -{ - $crmid = $_REQUEST['return_id']; - $noteid = $focus->id; - $query = 'select accountid from vtiger_contactdetails where contactid='.$crmid; - $result = $adb->query($query); - if($adb->num_rows($result) != 0) - { - $associated_account = $adb->query_result($result,0,"accountid"); - } - else - { - $associated_account = ''; - } - if ($associated_account) - { - $sql1 = "insert into vtiger_senotesrel (notesid, crmid) values('"; - $sql1 .= $noteid."','".$associated_account."')"; - $result = $adb->query($sql1); - } -} - -if($_REQUEST['mode'] != 'edit' && (($_REQUEST['return_module']=='Emails') ||($_REQUEST['return_module']=='HelpDesk') )) -{ - if($_REQUEST['email_id'] != '') - $crmid = $_REQUEST['email_id']; - if($_REQUEST['ticket_id'] != '') - $crmid = $_REQUEST['ticket_id']; - if($crmid != $_REQUEST['parent_id']) - { - $sql = "insert into vtiger_senotesrel (notesid, crmid) values('".$focus->id."','".$crmid."')"; - $adb->query($sql); - } -} - -$local_log->debug("Saved record with id of ".$return_id); - -//Redirect to EditView if the given file is not valid. -if($file_upload_error) -{ - $return_module = 'Notes'; - $return_action = 'EditView'; - $return_id = $note_id.'&upload_error=true&return_module='.$_REQUEST['return_module'].'&return_action='.$_REQUEST['return_action'].'&return_id='.$_REQUEST['return_id']; -} - -//code added for returning back to the current view after edit from list view -if($_REQUEST['return_viewname'] == '') $return_viewname='0'; -if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; -header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&viewname=$return_viewname"); -?> +date_due_flag = 'off'; + +//Save the Note +$focus->save("Notes"); + +//Added to retrieve the existing attachment of the notes and save it for the new duplicated note +if($_FILES['filename']['name'] == '' && $_REQUEST['mode'] != 'edit' && $_REQUEST['old_id'] != '') +{ + $sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid=vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid= ".$_REQUEST['old_id']; + $result = $adb->query($sql); + if($adb->num_rows($result) != 0) + { + $attachmentid = $adb->query_result($result,0,'attachmentsid'); + $filename = $adb->query_result($result,0,'name'); + $filetype = $adb->query_result($result,0,'type'); + $filepath = $adb->query_result($result,0,'path'); + + $new_attachmentid = $adb->getUniqueID("vtiger_crmentity"); + $date_var = $adb->formatDate(date('YmdHis')); + + $upload_filepath = decideFilePath(); + + //Read the old file contents and write it as a new file with new attachment id + $handle = @fopen($upload_filepath.$new_attachmentid."_".$filename,'w'); + fputs($handle, file_get_contents($filepath.$attachmentid."_".$filename)); + fclose($handle); + + $adb->query("update vtiger_notes set filename=\"$filename\" where notesid=$focus->id"); + $adb->query("insert into vtiger_crmentity (crmid,setype,createdtime) values('".$new_attachmentid."','Notes Attachment',".$date_var.")"); + + $adb->query("insert into vtiger_attachments values(".$new_attachmentid.",'".$filename."','','".$filetype."','".$upload_filepath."')"); + + $adb->query("insert into vtiger_seattachmentsrel values('".$focus->id."','".$new_attachmentid."')"); + } +} + + +$return_id = $focus->id; +$note_id = $return_id; + +if(isset($_REQUEST['parenttab']) && $_REQUEST['parenttab'] != "") $parenttab = $_REQUEST['parenttab']; +if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; +else $return_module = "Notes"; +if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; +else $return_action = "DetailView"; +if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id']; + +// Notes added to Contacts should also update Accounts +// Added by DG 16 Nov 2005 +if($_REQUEST['mode'] != 'edit' && ($_REQUEST['return_module']=='Contacts')) +{ + $crmid = $_REQUEST['return_id']; + $noteid = $focus->id; + $query = 'select accountid from vtiger_contactdetails where contactid='.$crmid; + $result = $adb->query($query); + if($adb->num_rows($result) != 0) + { + $associated_account = $adb->query_result($result,0,"accountid"); + } + else + { + $associated_account = ''; + } + if ($associated_account) + { + $sql1 = "insert into vtiger_senotesrel (notesid, crmid) values('"; + $sql1 .= $noteid."','".$associated_account."')"; + $result = $adb->query($sql1); + } +} + +if($_REQUEST['mode'] != 'edit' && (($_REQUEST['return_module']=='Emails') ||($_REQUEST['return_module']=='HelpDesk') )) +{ + if($_REQUEST['email_id'] != '') + $crmid = $_REQUEST['email_id']; + if($_REQUEST['ticket_id'] != '') + $crmid = $_REQUEST['ticket_id']; + if($crmid != $_REQUEST['parent_id']) + { + $sql = "insert into vtiger_senotesrel (notesid, crmid) values('".$focus->id."','".$crmid."')"; + $adb->query($sql); + } +} + +$local_log->debug("Saved record with id of ".$return_id); + +//Redirect to EditView if the given file is not valid. +if($file_upload_error) +{ + $return_module = 'Notes'; + $return_action = 'EditView'; + $return_id = $note_id.'&upload_error=true&return_module='.$_REQUEST['return_module'].'&return_action='.$_REQUEST['return_action'].'&return_id='.$_REQUEST['return_id']; +} + +//code added for returning back to the current view after edit from list view +if($_REQUEST['return_viewname'] == '') $return_viewname='0'; +if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; +header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&viewname=$return_viewname"); +?> Modified: vtigercrm/branches/5.1_jens/modules/Portal/Portal.js ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Portal/Portal.js (original) +++ vtigercrm/branches/5.1_jens/modules/Portal/Portal.js Mon Apr 16 12:27:44 2007 @@ -1,115 +1,115 @@ -/********************************************************************************* -** The contents of this file are subject to the vtiger CRM Public License Version 1.0 - * ("License"); You may not use this file except in compliance with the License - * The Original Code is: vtiger CRM Open Source - * The Initial Developer of the Original Code is vtiger. - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. -* - ********************************************************************************/ - - -function fetchAddSite(id) -{ - $("status").style.display="inline"; - new Ajax.Request( - 'index.php', - {queue: {position: 'end', scope: 'command'}, - method: 'post', - postBody:'module=Portal&action=PortalAjax&file=Popup&record='+id, - onComplete: function(response) { - $("status").style.display="none"; - $('editportal_cont').innerHTML = response.responseText; - } - } - ); -} - -function fetchContents(mode) -{ - $("status").style.display="inline"; - new Ajax.Request( - 'index.php', - {queue: {position: 'end', scope: 'command'}, - method: 'post', - postBody:'action=PortalAjax&mode=ajax&module=Portal&file=ListView&datamode='+mode, - onComplete: function(response) { - $("status").style.display="none"; - $('portalcont').innerHTML = response.responseText; - } - } - ); -} -function DeleteSite(id) -{ - if(confirm("Are you sure you want to delete ?")) - { - $("status").style.display="inline"; - new Ajax.Request( - 'index.php', - {queue: {position: 'end', scope: 'command'}, - method: 'post', - postBody:'action=PortalAjax&mode=ajax&file=Delete&module=Portal&record='+id, - onComplete: function(response) { - $("status").style.display="none"; - $('portalcont').innerHTML = response.responseText; - } - } - ); - } -} -function SaveSite(id) -{ - if ($('portalurl').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert('Site Url cannot be empty') - return false; - } - if ($('portalname').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert('Site Name cannot be empty') - return false; - } - Effect.Puff('orgLay'); - $("status").style.display="inline"; - var portalurl = document.getElementById('portalurl').value; - var portalurl = portalurl.replace(/&/g, "#$#$#"); - var portalname = document.getElementById('portalname').value; - new Ajax.Request( - 'index.php', - {queue: {position: 'end', scope: 'command'}, - method: 'post', - postBody:'action=PortalAjax&mode=ajax&file=Save&module=Portal&portalname='+portalname+'&portalurl='+portalurl+'&record='+id, - onComplete: function(response) { - $("status").style.display="none"; - $('portalcont').innerHTML = response.responseText; - } - } - ); -} -function setSite(oUrllist) -{ - var url = oUrllist.options[oUrllist.options.selectedIndex].value; - document.getElementById('locatesite').src = url; -} - -var oRegex = new Object() ; -oRegex.UriProtocol = new RegExp('') ; -oRegex.UriProtocol.compile( '^(((http|https|ftp|news):\/\/)|mailto:)', 'gi' ) ; - -oRegex.UrlOnChangeProtocol = new RegExp('') ; -oRegex.UrlOnChangeProtocol.compile( '^(http|https|ftp|news)://(?=.)', 'gi' ) ; - -function OnUrlChange() -{ - var sUrl; - var sProtocol; - - sUrl=document.getElementById("portalurl").value ; - sProtocol=oRegex.UrlOnChangeProtocol.exec( sUrl ) ; - if ( sProtocol ) - { - sUrl = sUrl.substr( sProtocol[0].length ) ; - document.getElementById("portalurl").value = sUrl ; - } - - -} +/********************************************************************************* +** The contents of this file are subject to the vtiger CRM Public License Version 1.0 + * ("License"); You may not use this file except in compliance with the License + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. +* + ********************************************************************************/ + + +function fetchAddSite(id) +{ + $("status").style.display="inline"; + new Ajax.Request( + 'index.php', + {queue: {position: 'end', scope: 'command'}, + method: 'post', + postBody:'module=Portal&action=PortalAjax&file=Popup&record='+id, + onComplete: function(response) { + $("status").style.display="none"; + $('editportal_cont').innerHTML = response.responseText; + } + } + ); +} + +function fetchContents(mode) +{ + $("status").style.display="inline"; + new Ajax.Request( + 'index.php', + {queue: {position: 'end', scope: 'command'}, + method: 'post', + postBody:'action=PortalAjax&mode=ajax&module=Portal&file=ListView&datamode='+mode, + onComplete: function(response) { + $("status").style.display="none"; + $('portalcont').innerHTML = response.responseText; + } + } + ); +} +function DeleteSite(id) +{ + if(confirm(alert_arr.SURE_TO_DELETE)) + { + $("status").style.display="inline"; + new Ajax.Request( + 'index.php', + {queue: {position: 'end', scope: 'command'}, + method: 'post', + postBody:'action=PortalAjax&mode=ajax&file=Delete&module=Portal&record='+id, + onComplete: function(response) { + $("status").style.display="none"; + $('portalcont').innerHTML = response.responseText; + } + } + ); + } +} +function SaveSite(id) +{ + if ($('portalurl').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { + alert(alert_arr.SITEURL_CANNOT_BE_EMPTY) + return false; + } + if ($('portalname').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { + alert(alert_arr.SITENAME_CANNOT_BE_EMPTY) + return false; + } + Effect.Puff('orgLay'); + $("status").style.display="inline"; + var portalurl = document.getElementById('portalurl').value; + var portalurl = portalurl.replace(/&/g, "#$#$#"); + var portalname = document.getElementById('portalname').value; + new Ajax.Request( + 'index.php', + {queue: {position: 'end', scope: 'command'}, + method: 'post', + postBody:'action=PortalAjax&mode=ajax&file=Save&module=Portal&portalname='+portalname+'&portalurl='+portalurl+'&record='+id, + onComplete: function(response) { + $("status").style.display="none"; + $('portalcont').innerHTML = response.responseText; + } + } + ); +} +function setSite(oUrllist) +{ + var url = oUrllist.options[oUrllist.options.selectedIndex].value; + document.getElementById('locatesite').src = url; +} + +var oRegex = new Object() ; +oRegex.UriProtocol = new RegExp('') ; +oRegex.UriProtocol.compile( '^(((http|https|ftp|news):\/\/)|mailto:)', 'gi' ) ; + +oRegex.UrlOnChangeProtocol = new RegExp('') ; +oRegex.UrlOnChangeProtocol.compile( '^(http|https|ftp|news)://(?=.)', 'gi' ) ; + +function OnUrlChange() +{ + var sUrl; + var sProtocol; + + sUrl=document.getElementById("portalurl").value ; + sProtocol=oRegex.UrlOnChangeProtocol.exec( sUrl ) ; + if ( sProtocol ) + { + sUrl = sUrl.substr( sProtocol[0].length ) ; + document.getElementById("portalurl").value = sUrl ; + } + + +} Modified: vtigercrm/branches/5.1_jens/modules/Portal/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Portal/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Portal/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -25,6 +25,6 @@ 'LBL_BOOKMARK_NAME_URL'=>'Bookmark Name & URL', 'LBL_TOOLS'=>'Tools', 'LBL_MANAGE_SITES'=>'Manage Sites', -'LBL_MY_SITES'=>'My Sites', +'LBL_MY_SITES'=>'Sites', ); ?> Modified: vtigercrm/branches/5.1_jens/modules/Potentials/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/CallRelatedList.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/CallRelatedList.php Mon Apr 16 12:27:44 2007 @@ -52,6 +52,7 @@ if (isset($focus->name)) $smarty->assign("NAME", $focus->name); $related_array = getRelatedLists($currentModule,$focus); $smarty->assign("RELATEDLISTS", $related_array); +$smarty->assign("BASE_ACCOUNT",getAccountName($focus->column_fields[account_id])); $category = getParentTab(); $smarty->assign("CATEGORY",$category); $smarty->assign("UPDATEINFO",updateInfo($focus->id)); Modified: vtigercrm/branches/5.1_jens/modules/Potentials/Charts.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/Charts.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/Charts.php Mon Apr 16 12:27:44 2007 @@ -1,1280 +1,1280 @@ -debug("Entering outcome_by_month(".$date_start.",". $date_end.",". $user_id.") method ..."); - global $app_strings,$lang_crm, $app_list_strings, $current_module_strings,$current_user, $log, $charset, $tmp_dir; - global $theme; - include_once ('Image/Graph.php'); - include_once ('Image/Canvas.php'); - - $log =& LoggerManager::getLogger('outcome_by_month chart'); - // Set the basic parameters of the graph - $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); - $imagemap = $canvas->getImageMap(); - $graph =& Image_Graph::factory('graph', $canvas); - $log->debug("graph object created"); - - // add a TrueType font - $font =& $graph->addNew('font', calculate_font_name($lang_crm)); - // set the font size to 11 pixels - $font->setSize(8); - - $graph->setFont($font); - // create the plotarea layout - $title =& Image_Graph::factory('title', array('Title',10)); - $plotarea =& Image_Graph::factory('plotarea',array( - 'axis', - 'axis' - )); - $footer =& Image_Graph::factory('title', array('Footer',8)); - $graph->add( - Image_Graph::vertical($title, - Image_Graph::vertical( - $plotarea, - $footer, - 90 - ), - 5 - ) - ); - - //$graph->SetScale("textlin"); - - if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) { - //$font = calculate_font_family($lang_crm); - - $log->debug("date_start is: $date_start"); - $log->debug("date_end is: $date_end"); - $log->debug("user_id is: "); - $log->debug($user_id); - $log->debug("cache_file_name is: $cache_file_name"); - - //build the where clause for the query that matches $user - $where = "("; - $first = true; - $current = 0; - foreach ($user_id as $the_id) { - if (!$first) $where .= "OR "; - $first = false; - $where .= "vtiger_crmentity.smcreatorid='$the_id' "; - } - $where .= ") "; - - //build the where clause for the query that matches $date_start and $date_end - $where .= "AND closingdate >= '$date_start' AND closingdate <= '$date_end'"; - $subtitle = $current_module_strings['LBL_DATE_RANGE']." ".getDisplayDate($date_start)." ".$current_module_strings['LBL_DATE_RANGE_TO']." ".getDisplayDate($date_end)."\n"; - - //Now do the db queries - //query for opportunity data that matches $datay and $user - $opp = new Potentials(); - $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); - - //build pipeline by sales stage data - $total = 0; - $count = array(); - $sum = array(); - $months = array(); - $other = $current_module_strings['LBL_LEAD_SOURCE_OTHER']; - if (isset($opp_list)) { - foreach ($opp_list as $record) { - $month = substr_replace($record->column_fields['closingdate'],'',-3); - if (!in_array($month, $months)) { array_push($months, $month); } - if ($record->column_fields['sales_stage'] == 'Closed Won' || $record->column_fields['sales_stage'] == 'Closed Lost') { - $sales_stage=$record->column_fields['sales_stage']; - } - else { - $sales_stage=$other; - } - - if (!isset($sum[$month][$sales_stage])) { - $sum[$month][$sales_stage] = 0; - } - if (isset($record->column_fields['amount'])) { - // Strip all non numbers from this string. - $amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate); - $sum[$month][$sales_stage] = $sum[$month][$sales_stage] + $amount; - if (isset($count[$month][$sales_stage])) { - $count[$month][$sales_stage]++; - } - else { - $count[$month][$sales_stage] = 1; - } - $total = $total + ($amount/1000); - } - } - } - - $legend = array(); - $datax = array(); - $aTargets = array(); - $aAlts = array(); - $stages = array($other, 'Closed Lost', 'Closed Won'); - //sort the months or push a bogus month on the array so that an empty chart is drawn - if (empty($months)) { - array_push($months, date('Y-m',time())); - } - else{ - sort($months); - } - foreach($months as $month) { - foreach($stages as $stage) { - $log->debug("stage is $stage"); - if (!isset($datax[$stage])) { - $datax[$stage] = array(); - } - if (!isset($aAlts[$stage])) { - $aAlts[$stage] = array(); - } - if (!isset($aTargets[$stage])) { - $aTargets[$stage] = array(); - } - - if (isset($sum[$month][$stage])) { - array_push($datax[$stage], $sum[$month][$stage]/1000); - array_push($aAlts[$stage], $count[$month][$stage]." ".$current_module_strings['LBL_OPPS_OUTCOME']." $stage"); - } - else { - array_push($datax[$stage], 0); - array_push($aAlts[$stage], ""); - } - array_push($aTargets[$stage], "index.php?module=Potentials&action=ListView&date_closed=$month&sales_stage=".urlencode($stage)."&query=true&type=dbrd"); - } - array_push($legend,$month); - } - - $log->debug("datax is:"); - $log->debug($datax); - $log->debug("aAlts is:"); - $log->debug($aAlts); - $log->debug("aTargets is:"); - $log->debug($aTargets); - $log->debug("sum is:"); - $log->debug($sum); - $log->debug("count is:"); - $log->debug($count); - - //now build the bar plots for each user across the sales stages - $color = array('Closed Lost'=>'#FF9900','Closed Won'=>'#009933', $other=>'#0066CC'); - $index = 0; - $datasets = array(); - $xlabels = array(); - $fills =& Image_Graph::factory('Image_Graph_Fill_Array'); - foreach($stages as $stage) { - // Now create a bar plot - $datasets[$index] = & Image_Graph::factory('dataset'); - foreach($datax[$stage] as $i => $y) { - $x = 1+2*$i; - $datasets[$index]->addPoint( - $x, - $y, - array( - 'url' => $aTargets[$stage][$i], - 'alt' => $aAlts[$stage][$i] - ) - ); - } - - // Set fill colors for bars - $fills->addColor($color[$stage]); - - $index++; - } - for($i=0;$i$m) { - $monthSum = 0; - foreach($stages as $stage) $monthSum += $datax[$stage][$num]; - if($monthSum > $maximum) $maximum = $monthSum; - $log->debug('maximum = '.$maximum.' month = '.$m.' sum = '.$monthSum); - } - - if($theme == "blue") - { - $font_color = "#212473"; - } - else - { - $font_color = "#000000"; - } - $font->setColor($font_color); - - // Create the grouped bar plot - $gbplot = & $plotarea->addNew('bar', array($datasets, 'stacked')); - $gbplot->setFillStyle($fills); - - //You can change the width of the bars if you like - $gbplot->setBarWidth(50/count($months),"%"); - - // set margin - $plotarea->setPadding(array('top'=>0,'bottom'=>0,'left'=>10,'right'=>20)); - - // Set white margin color - $graph->setBackgroundColor('#F5F5F5'); - - // Use a box around the plot area - $gbplot->setBorderColor('black'); - - // Use a gradient to fill the plot area - $gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_VERTICAL, 'white', '#E5E5E5'))); - - // Setup title - $titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL']; - //$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total; - - $title->setText($titlestr); - - // Create the xaxis labels - $array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', - array($xlabels) - ); - - // Setup X-axis - $xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X); - $xaxis->setDataPreprocessor($array_data); - $xaxis->forceMinimum(0); - $xaxis->forceMaximum(2*count($months)); - $xaxis->setLabelInterval(1); - $xaxis->setTickOptions(0,0); - $xaxis->setLabelInterval(2,2); - $xaxis->setTickOptions(5,0,2); - - // set grid - $gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y); - $gridY->setLineColor('#E5E5E5 at 0.5'); - - - // Add some grace to y-axis so the bars doesn't go - // all the way to the end of the plot area - $yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y); - $yaxis->forceMaximum($maximum * 1.1); - $ticks = get_tickspacing($maximum); - - // Setup the Y-axis to be displayed in the bottom of the - // graph. We also finetune the exact layout of the title, - // ticks and labels to make them look nice. - $yaxis->setAxisIntersection('max'); - - // Then fix the tick marks - $valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d"); - $yaxis->setFontSize(8); - $yaxis->setDataPreprocessor($valueproc); - // Arrange Y-Axis tick marks inside - $yaxis->setLabelInterval($ticks[0]); - $yaxis->setTickOptions(-5,0); - $yaxis->setLabelInterval($ticks[1],2); - $yaxis->setTickOptions(-2,0,2); - $yaxis->setLabelOption('position','inside'); - - // Finally setup the title - $yaxis->setLabelOption('position','inside'); - - // eliminate zero values - $gbplot->setDataSelector(Image_Graph::factory('Image_Graph_DataSelector_NoZeros')); - - // set markers - $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); - $marker->setDataPreprocessor($valueproc); - $marker->setFillColor('000000 at 0.0'); - $marker->setBorderColor('000000 at 0.0'); - $marker->setFontColor('white'); - $marker->setFontSize(8); - $gbplot->setMarker($marker); - - $subtitle .= $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; - $footer->setText($subtitle); - $footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT); - - // .. and stroke the graph - $imgMap = $graph->done( - array( - 'tohtml' => true, - 'border' => 0, - 'filename' => $cache_file_name, - 'filepath' => './', - 'urlpath' => '' - )); - //$imgMap = htmlspecialchars($output); - save_image_map($cache_file_name.'.map', $imgMap); - } - else { - $imgMap_fp = fopen($cache_file_name.'.map', "rb"); - $imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map')); - fclose($imgMap_fp); - } - $fileModTime = filemtime($cache_file_name.'.map'); - $return = "\n$imgMap"; - $log->debug("Exiting outcome_by_month method ..."); - return $return; - } - - /** - * Creates lead_source_by_outcome pipeline image as a horizontal accumlated bar graph for multiple vtiger_users. - * param $datay- the lead source data to display in the x-axis - * param $date_start- the begin date of opps to find - * param $date_end- the end date of opps to find - * param $ids - list of assigned vtiger_users of opps to find - * param $cache_file_name - file name to write image to - * param $refresh - boolean whether to rebuild image if exists - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function lead_source_by_outcome($datay=array('foo','bar'), $user_id=array('1'), $cache_file_name='a_file', $refresh=false,$width=900,$height=500){ - global $log,$current_user; - $log->debug("Entering lead_source_by_outcome(".$datay.",".$user_id.",".$cache_file_name.",".$refresh.") method ..."); - global $app_strings,$lang_crm, $current_module_strings,$charset, $tmp_dir; - global $theme; - - include_once ('Image/Graph.php'); - include_once ('Image/Canvas.php'); - - $log =& LoggerManager::getLogger('lead_source_by_outcome chart'); - // Set the basic parameters of the graph - $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); - $imagemap = $canvas->getImageMap(); - $graph =& Image_Graph::factory('graph', $canvas); - $log->debug("graph object created"); - // add a TrueType font - $font =& $graph->addNew('font', calculate_font_name($lang_crm)); - // set the font size to 11 pixels - $font->setSize(8); - - $graph->setFont($font); - // create the plotarea layout - $title =& Image_Graph::factory('title', array('Test',10)); - $plotarea =& Image_Graph::factory('plotarea',array( - 'axis', - 'axis', - 'horizontal' - )); - $footer =& Image_Graph::factory('title', array('Footer',8)); - $graph->add( - Image_Graph::vertical($title, - Image_Graph::vertical( - $plotarea, - $footer, - 90 - ), - 5 - ) - ); - - if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) { - - $log->debug("datay is:"); - $log->debug($datay); - $log->debug("user_id is: "); - $log->debug($user_id); - $log->debug("cache_file_name is: $cache_file_name"); - - $where=""; - //build the where clause for the query that matches $user - $count = count($user_id); - if ($count>0) { - $where = "("; - $first = true; - $current = 0; - foreach ($user_id as $the_id) { - if (!$first) $where .= "OR "; - $first = false; - $where .= "vtiger_crmentity.smcreatorid='$the_id' "; - } - $where .= ") "; - } - - //build the where clause for the query that matches $datay - $count = count($datay); - if ($count>0) { - $where .= "AND ( "; - unset($first); - $first = true; - foreach ($datay as $key=>$value) { - if (!$first) $where .= "OR "; - $first = false; - $where .= "leadsource ='$key' "; - } - $where .= ")"; - } - - //Now do the db queries - //query for opportunity data that matches $datay and $user - $opp = new Potentials(); - $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); - - //build pipeline by sales stage data - $total = 0; - $count = array(); - $sum = array(); - $other = $current_module_strings['LBL_LEAD_SOURCE_OTHER']; - if (isset($opp_list)) { - foreach ($opp_list as $record) { - //if lead source is blank, set it to the language's "none" value - if (isset($record->column_fields['leadsource']) && $record->column_fields['leadsource'] != '') { - $lead_source = $record->column_fields['leadsource']; - } - else { - $lead_source = $current_module_strings['NTC_NO_LEGENDS']; - } - - if ($record->column_fields['sales_stage'] == 'Closed Won' || $record->column_fields['sales_stage'] == 'Closed Lost') { - $sales_stage=$record->column_fields['sales_stage']; - } - else { - $sales_stage=$other; - } - - if (!isset($sum[$lead_source][$sales_stage])) { - $sum[$lead_source][$sales_stage] = 0; - } - if (isset($record->column_fields['amount'])) { - // Strip all non numbers from this string. - $amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate); - $sum[$lead_source][$sales_stage] = $sum[$lead_source][$sales_stage] + $amount; - if (isset($count[$lead_source][$sales_stage])) { - $count[$lead_source][$sales_stage]++; - } - else { - $count[$lead_source][$sales_stage] = 1; - } - $total = $total + ($amount/1000); - } - } - } - - $legend = array(); - $datax = array(); - $aTargets = array(); - $aAlts = array(); - $stages = array($other,'Closed Lost', 'Closed Won'); - foreach($datay as $lead=>$translation) { - if ($lead == '') { - $lead = $current_module_strings['NTC_NO_LEGENDS']; - $translation = $current_module_strings['NTC_NO_LEGENDS']; - } - foreach($stages as $stage) { - $log->debug("stage_key is $stage"); - if (!isset($datax[$stage])) { - $datax[$stage] = array(); - } - if (!isset($aAlts[$stage])) { - $aAlts[$stage] = array(); - } - if (!isset($aTargets[$stage])) { - $aTargets[$stage] = array(); - } - - if (isset($sum[$lead][$stage])) { - array_push($datax[$stage], $sum[$lead][$stage]/1000); - array_push($aAlts[$stage], $count[$lead][$stage]." ".$current_module_strings['LBL_OPPS_OUTCOME']." $stage"); - } - else { - array_push($datax[$stage], 0); - array_push($aAlts[$stage], ""); - } - array_push($aTargets[$stage], "index.php?module=Potentials&action=ListView&leadsource=".urlencode($lead)."&sales_stage=".urlencode($stage)."&query=true&type=dbrd"); - } - array_push($legend,$translation); - } - - $log->debug("datax is:"); - $log->debug($datax); - $log->debug("aAlts is:"); - $log->debug($aAlts); - $log->debug("aTargets is:"); - $log->debug($aTargets); - $log->debug("sum is:"); - $log->debug($sum); - $log->debug("count is:"); - $log->debug($count); - - //now build the bar plots for each user across the sales stages - $color = array('Closed Lost'=>'FF9900','Closed Won'=>'009933', $other=>'0066CC'); - $index = 0; - $xlabels = array(); - $datasets = array(); - $fills =& Image_Graph::factory('Image_Graph_Fill_Array'); - foreach($stages as $stage) { - // Now create a bar pot - $datasets[$index] = & Image_Graph::factory('dataset'); - foreach($datax[$stage] as $i => $y) { - $x = 1+2*$i; - $datasets[$index]->addPoint( - //$datay[$legend[$x]], - $x, - $y, - array( - 'url' => $aTargets[$stage][$i], - 'alt' => $aAlts[$stage][$i], - 'target' => '' - ) - ); - } - for($i=0;$iaddColor("#".$color[$stage]); - - $log->debug("datax[$stage] is: "); - $log->debug($datax[$stage]); - $index++; - } - - // compute maximum value because of grace jpGraph parameter not supported - $maximum = 0; - foreach($legend as $legendidx=>$legend_text) { - $dataxSum = 0; - foreach($stages as $stage) $dataxSum += $datax[$stage][$legendidx]; - if($dataxSum > $maximum) $maximum = $dataxSum; - } - - if($theme == "blue") - { - $font_color = "#212473"; - } - else - { - $font_color = "#000000"; - } - $font->setColor($font_color); - - // Create the grouped bar plot - $gbplot = & $plotarea->addNew('bar', array($datasets, 'stacked')); - $gbplot->setFillStyle($fills); - - //You can change the width of the bars if you like - $gbplot->setBarWidth(50/count($legend),"%"); - - // Set white margin color - $graph->setBackgroundColor('#F5F5F5'); - - // Use a box around the plot area - $gbplot->setBorderColor('black'); - - // Use a gradient to fill the plot area - $gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_HORIZONTAL, 'white', '#E5E5E5'))); - - // Setup title - $titlestr = $current_module_strings['LBL_ALL_OPPORTUNITIES'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL']; - //$titlestr = $current_module_strings['LBL_ALL_OPPORTUNITIES'].$current_user->currency_symbol.$total; - $title->setText($titlestr); - - // Create the xaxis labels - $array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', - array($xlabels) - ); - - // Setup X-axis - $xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X); - $xaxis->setDataPreprocessor($array_data); - $xaxis->forceMinimum(0); - $xaxis->forceMaximum(2*count($legend)); - $xaxis->setLabelInterval(1); - $xaxis->setTickOptions(0,0); - $xaxis->setLabelInterval(2,2); - $xaxis->setTickOptions(5,0,2); - $xaxis->setInverted(true); - - // set grid - $gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y); - $gridY->setLineColor('#E5E5E5 at 0.5'); - - // Add some grace to y-axis so the bars doesn't go - // all the way to the end of the plot area - $yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y); - $yaxis->forceMaximum($maximum * 1.1); - $ticks = get_tickspacing($maximum); - - // Then fix the tick marks - $yaxis->setFontSize(8); - $yaxis->setAxisIntersection('max'); - $valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d"); - $yaxis->setDataPreprocessor($valueproc); - $yaxis->setLabelInterval($ticks[0]); - $yaxis->setTickOptions(-5,0); - $yaxis->setLabelInterval($ticks[1],2); - $yaxis->setTickOptions(-2,0,2); - - // eliminate zero values - $gbplot->setDataSelector(Image_Graph::factory('Image_Graph_DataSelector_NoZeros')); - - // set markers - $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); - $marker->setDataPreprocessor($valueproc); - $marker->setFillColor('#000000 at 0.0'); - $marker->setBorderColor('#000000 at 0.0'); - $marker->setFontColor('white'); - $marker->setFontSize(8); - $gbplot->setMarker($marker); - - // Finally setup the title - $subtitle = $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; - $footer->setText($subtitle); - $footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT); - - // .. and stroke the graph - $imgMap = $graph->done( - array( - 'tohtml' => true, - 'border' => 0, - 'filename' => $cache_file_name, - 'filepath' => './', - 'urlpath' => '' - )); - //$imgMap = htmlspecialchars($output); - save_image_map($cache_file_name.'.map', $imgMap); - } - else { - $imgMap_fp = fopen($cache_file_name.'.map', "rb"); - $imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map')); - fclose($imgMap_fp); - } - $fileModTime = filemtime($cache_file_name.'.map'); - $return = "\n$imgMap"; - $log->debug("Exiting lead_source_by_outcome method ..."); - return $return; - } - - /** - * Creates opportunity pipeline image as a horizontal accumlated bar graph for multiple vtiger_users. - * param $datax- the sales stage data to display in the x-axis - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function pipeline_by_sales_stage($datax=array('foo','bar'), $date_start='2071-10-15', $date_end='2071-10-15', $user_id=array('1'), $cache_file_name='a_file', $refresh=false,$width=900,$height=500){ - global $log,$current_user; - $log->debug("Entering pipeline_by_sales_stage(".$datax.",".$date_start.",".$date_end.",".$user_id.",".$cache_file_name.",".$refresh.") method ..."); - global $app_strings,$lang_crm, $current_module_strings, $charset, $tmp_dir; - global $theme; - include_once ('Image/Graph.php'); - include_once ('Image/Canvas.php'); - - $log =& LoggerManager::getLogger('opportunity charts'); - // Set the basic parameters of the graph - - - $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); - $imagemap = $canvas->getImageMap(); - $graph =& Image_Graph::factory('graph', $canvas); - //$log->debug("graph object created"); - // add a TrueType font - //$font =& $graph->addNew('font', calculate_font_name($lang_crm)); - $font =& $graph->addNew('font', calculate_font_name($lang_crm)); - // set the font size to 11 pixels - $font->setSize(8); - - $graph->setFont($font); - $title =& Image_Graph::factory('title', array('Test',10)); - $plotarea =& Image_Graph::factory('plotarea',array( - 'axis', - 'axis', - 'horizontal' - )); - $footer =& Image_Graph::factory('title', array('Footer',8)); - $graph->add( - Image_Graph::vertical($title, - Image_Graph::vertical( - $plotarea, - $footer, - 90 - ), - 5 - ) - ); - $log->debug("graph object created"); - - - if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) { - - $log->debug("starting pipeline chart"); - $log->debug("datax is:"); - $log->debug($datax); - $log->debug("user_id is: "); - $log->debug($user_id); - $log->debug("cache_file_name is: $cache_file_name"); - - $where=""; - //build the where clause for the query that matches $user - $count = count($user_id); - if ($count>0) { - $where = "("; - $first = true; - $current = 0; - foreach ($user_id as $the_id) { - if (!$first) $where .= "OR "; - $first = false; - //reference post - //if I change the owner of a opportunity, the graph shown on Home does not update correctly, this is because the graph is looking for the creatorid and not for the ownerid - //fix incorporated based on /sak's feedback - $where .= "vtiger_crmentity.smownerid='$the_id' "; - } - $where .= ") "; - } - - //build the where clause for the query that matches $datax - $count = count($datax); - if ($count>0) { - $where .= "AND ( "; - unset($first); - $first = true; - foreach ($datax as $key=>$value) { - if (!$first) $where .= "OR "; - $first = false; - $where .= "sales_stage ='$key' "; - } - $where .= ")"; - } - - //build the where clause for the query that matches $date_start and $date_end - $where .= "AND closingdate >= '$date_start' AND closingdate <= '$date_end'"; - $subtitle = $current_module_strings['LBL_DATE_RANGE']." ".getDisplayDate($date_start)." ".$current_module_strings['LBL_DATE_RANGE_TO']." ".getDisplayDate($date_end)."\n"; - - //Now do the db queries - //query for opportunity data that matches $datax and $user - $opp = new Potentials(); - $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); - - //build pipeline by sales stage data - $total = 0; - $count = array(); - $sum = array(); - if (isset($opp_list)) { - foreach ($opp_list as $record) { - if (!isset($sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']])) { - $sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] = 0; - } - if (isset($record->column_fields['amount'])) { - // Strip all non numbers from this string. - $amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate); - $sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] = $sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] + $amount; - if (isset($count[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']])) { - $count[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']]++; - } - else { - $count[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] = 1; - } - $total = $total + ($amount/1000); - } - } - } - - $legend = array(); - $datay = array(); - $aTargets = array(); - $aAlts = array(); - foreach ($datax as $stage_key=>$stage_translation) { - foreach ($user_id as $the_id) { - $the_user = get_assigned_user_name($the_id); - if (!isset($datay[$the_id])) { - $datay[$the_id] = array(); - } - if (!isset($aAlts[$the_id])) { - $aAlts[$the_id] = array(); - } - if (!isset($aTargets[$the_id])) { - $aTargets[$the_id] = array(); - } - - if (isset($sum[$stage_key][$the_id])) { - array_push($datay[$the_id], $sum[$stage_key][$the_id]/1000); - array_push($aAlts[$the_id], $the_user.' - '.$count[$stage_key][$the_id]." ".$current_module_strings['LBL_OPPS_IN_STAGE']." $stage_translation"); - } - else { - array_push($datay[$the_id], 0); - array_push($aAlts[$the_id], ""); - } - array_push($aTargets[$the_id], "index.php?module=Potentials&action=ListView&assigned_user_id=$the_id&sales_stage=".urlencode($stage_key)."&closingdate_start=".urlencode($date_start)."&closingdate_end=".urlencode($date_end)."&query=true&type=dbrd"); - } - array_push($legend,$stage_translation); - } - - $log->debug("datay is:"); - $log->debug($datay); - $log->debug("aAlts is:"); - $log->debug($aAlts); - $log->debug("aTargets is:"); - $log->debug($aTargets); - $log->debug("sum is:"); - $log->debug($sum); - $log->debug("count is:"); - $log->debug($count); - - //now build the bar plots for each user across the sales stages - $colors = color_generator(count($user_id),'#D50100','#002222'); - $index = 0; - $datasets = array(); - $xlabels = array(); - $fills =& Image_Graph::factory('Image_Graph_Fill_Array'); - foreach($user_id as $the_id) { - // Now create a bar pot - $datasets[$index] = & Image_Graph::factory('dataset'); - foreach($datay[$the_id] as $i => $y) { - $x = 1+2*$i; - $datasets[$index]->addPoint( - $x, - $y, - array( - 'url' => $aTargets[$the_id][$i], - 'alt' => $aAlts[$the_id][$i] - ) - ); - } - - // Set fill colors for bars - $fills->addColor($colors[$index]); - - $index++; - } - for($i=0;$i$legend_text) { - $legendsum = 0; - foreach($user_id as $the_id) $legendsum += $datay[$the_id][$legendidx]; - if($legendsum > $maximum) $maximum = $legendsum; - } - // Create the grouped bar plot - $gbplot = & $plotarea->addNew('bar', array($datasets, 'stacked')); - $gbplot->setFillStyle($fills); - - //You can change the width of the bars if you like - $gbplot->setBarWidth(50/count($legend),"%"); - - - // Set white margin color - $graph->setBackgroundColor('#F5F5F5'); - - // Use a box around the plot area - $gbplot->setBorderColor('black'); - - // Use a gradient to fill the plot area - $gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_HORIZONTAL, 'white', '#E5E5E5'))); - - if($theme == "blue") - { - $font_color = "#212473"; - } - else - { - $font_color = "#000000"; - } - $font->setColor($font_color); - - // Setup title - $titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL']; - //$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total; - $title->setText($titlestr); - - // Create the xaxis labels - $array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', - array($xlabels) - ); - - - // Setup X-axis - $xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X); - $xaxis->setDataPreprocessor($array_data); - $xaxis->forceMinimum(0); - $xaxis->forceMaximum(2*count($legend)); - $xaxis->setLabelInterval(1); - $xaxis->setTickOptions(0,0); - $xaxis->setLabelInterval(2,2); - $xaxis->setTickOptions(5,0,2); - $xaxis->setInverted(true); - - // Setup Y-axis - $yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y); - $yaxis->setFontSize(8); - $yaxis->setAxisIntersection('max'); - - // Add some grace to y-axis so the bars doesn't go - // all the way to the end of the plot area - $yaxis->forceMaximum($maximum * 1.1); - $ticks = get_tickspacing($maximum); - - // set grid - $gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y); - $gridY->setLineColor('#E5E5E5 at 0.5'); - - // First make the labels look right - $valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d"); - $yaxis->setDataPreprocessor($valueproc); - $yaxis->setLabelInterval($ticks[0]); - $yaxis->setTickOptions(-5,0); - $yaxis->setLabelInterval($ticks[1],2); - $yaxis->setTickOptions(-2,0,2); - - // eliminate zero values - $gbplot->setDataSelector(Image_Graph::factory('Image_Graph_DataSelector_NoZeros')); - - // set markers - $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); - $marker->setDataPreprocessor($valueproc); - $marker->setFillColor('000000 at 0.0'); - $marker->setBorderColor('000000 at 0.0'); - $marker->setFontColor('white'); - $marker->setFontSize(8); - $gbplot->setMarker($marker); - - // Finally setup the title - - $subtitle .= $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; - $footer->setText($subtitle); - $footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT); - - // .. and stroke the graph - $imgMap = $graph->done( - array( - 'tohtml' => true, - 'border' => 0, - 'filename' => $cache_file_name, - 'filepath' => './', - 'urlpath' => '' - )); - //$imgMap = $graph->GetHTMLImageMap('pipeline'); - save_image_map($cache_file_name.'.map', $imgMap); - } - else { - $imgMap_fp = fopen($cache_file_name.'.map', "rb"); - $imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map')); - fclose($imgMap_fp); - } - $fileModTime = filemtime($cache_file_name.'.map'); - $return = "\n$imgMap"; - $log->debug("Exiting pipeline_by_sales_stage method ..."); - return $return; - } - - /** - * Creates pie chart image of opportunities by lead_source. - * param $datax- the sales stage data to display in the x-axis - * param $datay- the sum of opportunity amounts for each opportunity in each sales stage - * to display in the y-axis - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function pipeline_by_lead_source($legends=array('foo','bar'), $user_id=array('1'), $cache_file_name='a_file', $refresh=true,$width=900,$height=500){ - global $log,$current_user; - $log->debug("Entering pipeline_by_lead_source(".$legends.") method ..."); - global $app_strings,$lang_crm, $current_module_strings, $log, $charset, $tmp_dir; - global $theme; - - include_once ('Image/Graph.php'); - include_once ('Image/Canvas.php'); - - $font = calculate_font_name($lang_crm); - - if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) { - $log =& LoggerManager::getLogger('opportunity charts'); - $log->debug("starting pipeline chart"); - $log->debug("legends is:"); - $log->debug($legends); - $log->debug("user_id is: "); - $log->debug($user_id); - $log->debug("cache_file_name is: $cache_file_name"); - - //Now do the db queries - //query for opportunity data that matches $legends and $user - $where=""; - //build the where clause for the query that matches $user - $count = count($user_id); - if ($count>0) { - $where = "("; - $first = true; - foreach ($user_id as $the_id) { - if (!$first) $where .= "OR "; - $first = false; - $where .= "vtiger_crmentity.smcreatorid='$the_id' "; - } - $where .= ") "; - } - - //build the where clause for the query that matches $datax - $count = count($legends); - if ($count>0) { - $where .= "AND ( "; - $first = true; - foreach ($legends as $key=>$value) { - if (!$first) $where .= "OR "; - $first = false; - $where .= "leadsource ='$key' "; - } - $where .= ")"; - } - - $opp = new Potentials(); - $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); - - //build pipeline by lead source data - $total = 0; - $count = array(); - $sum = array(); - if (isset($opp_list)) { - foreach ($opp_list as $record) { - if (!isset($sum[$record->column_fields['leadsource']])) $sum[$record->column_fields['leadsource']] = 0; - if (isset($record->column_fields['amount']) && isset($record->column_fields['leadsource'])) { - // Strip all non numbers from this string. - $amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate); - $sum[$record->column_fields['leadsource']] = $sum[$record->column_fields['leadsource']] + ($amount/1000); - if (isset($count[$record->column_fields['leadsource']])) $count[$record->column_fields['leadsource']]++; - else $count[$record->column_fields['leadsource']] = 1; - $total = $total + ($amount/1000); - } - } - } - - $visible_legends = array(); - $data= array(); - $aTargets = array(); - $aAlts = array(); - foreach ($legends as $lead_source_key=>$lead_source_translation) { - if (isset($sum[$lead_source_key])) - { - array_push($data, $sum[$lead_source_key]); - if($lead_source_key != '') - { - array_push($visible_legends, $lead_source_translation); - } - else - { - // put none in if the vtiger_field is blank. - array_push($visible_legends, $current_module_strings['NTC_NO_LEGENDS']); - } - array_push($aTargets, "index.php?module=Potentials&action=ListView&leadsource=".urlencode($lead_source_key)."&query=true&type=dbrd"); - array_push($aAlts, $count[$lead_source_key]." ".$current_module_strings['LBL_OPPS_IN_LEAD_SOURCE']." $lead_source_translation "); - } - } - - $log->debug("sum is:"); - $log->debug($sum); - $log->debug("count is:"); - $log->debug($count); - $log->debug("total is: $total"); - if ($total == 0) { -$log->debug("Exiting pipeline_by_lead_source method ..."); - return ($current_module_strings['ERR_NO_OPPS']); - } - - if($theme == "blue") - { - $font_color = "#212473"; - } - else - { - $font_color = "#000000"; - } - - - $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); - $imagemap = $canvas->getImageMap(); - $graph =& Image_Graph::factory('graph', $canvas); - - $font =& $graph->addNew('font', calculate_font_name($lang_crm)); - // set the font size to 11 pixels - $font->setSize(8); - $font->setColor($font_color); - - $graph->setFont($font); - // create the plotarea layout - $title =& Image_Graph::factory('title', array('Test',10)); - $plotarea =& Image_Graph::factory('plotarea',array( - 'category', - 'axis' - )); - $footer =& Image_Graph::factory('title', array('Footer',8)); - $graph->add( - Image_Graph::vertical($title, - Image_Graph::vertical( - $plotarea, - $footer, - 90 - ), - 5 - ) - ); - - // Generate colours - $colors = color_generator(count($visible_legends),'#33CCFF','#3322FF'); - $index = 0; - $dataset = & Image_Graph::factory('dataset'); - $fills =& Image_Graph::factory('Image_Graph_Fill_Array'); - foreach($visible_legends as $legend) { - $dataset->addPoint( - $legend, - $data[$index], - array( - 'url' => $aTargets[$index], - 'alt' => $aAlts[$index] - ) - ); - $fills->addColor($colors[$index]); - $log->debug('point ='.$legend.','.$data[$index]); - - $index++; - } - - // create the pie chart and associate the filling colours - $gbplot = & $plotarea->addNew('pie', $dataset); - $plotarea->hideAxis(); - $gbplot->setFillStyle($fills); - - // Setup title - $titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL']; - //$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total; - - $title->setText($titlestr); - - // format the data values - $valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d"); - - // set markers - $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); - $marker->setDataPreprocessor($valueproc); - $marker->setFillColor('#FFFFFF'); - $marker->setBorderColor($font_color); - $marker->setFontColor($font_color); - $marker->setFontSize(8); - $pointingMarker =& $graph->addNew('Image_Graph_Marker_Pointing_Angular', array(20, &$marker)); - $gbplot->setMarker($pointingMarker); - - // set legend - $legend_box =& $plotarea->addNew('legend'); - $legend_box->setPadding(array('top'=>20,'bottom'=>0,'left'=>0,'right'=>0)); - $legend_box->setFillColor('#F5F5F5'); - $legend_box->showShadow(); - - $subtitle = $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; - $footer->setText($subtitle); - $footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_LEFT); - - $imgMap = $graph->done( - array( - 'tohtml' => true, - 'border' => 0, - 'filename' => $cache_file_name, - 'filepath' => './', - 'urlpath' => '' - )); - //$imgMap = htmlspecialchars($output); - save_image_map($cache_file_name.'.map', $imgMap); - } - else { - $imgMap_fp = fopen($cache_file_name.'.map', "rb"); - $imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map')); - fclose($imgMap_fp); - } - $fileModTime = filemtime($cache_file_name.'.map'); - $return = "\n$imgMap"; - $log->debug("Exiting pipeline_by_lead_source method ..."); - return $return; - - } - -} - - -/** - * Creates a file with the image map - * param $filename - file name to save to - * param $image_map - image map string to save - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ -function save_image_map($filename,$image_map) -{ - global $log; - $log->debug("Entering save_image_map(".$filename.",".$image_map.") method ..."); - // save the image map to file - $log =& LoggerManager::getLogger('save_image_file'); - - if (!$handle = fopen($filename, 'w')) { - $log->debug("Cannot open file ($filename)"); - $log->debug("Exiting save_image_map method ..."); - return; - } - - // Write $somecontent to our opened file. - if (fwrite($handle, $image_map) === FALSE) { - $log->debug("Cannot write to file ($filename)"); - $log->debug("Exiting save_image_map method ..."); - return false; - } - - $log->debug("Success, wrote ($image_map) to file ($filename)"); - - fclose($handle); - $log->debug("Exiting save_image_map method ..."); - return true; - -} - -// retrieve the translated strings. -$app_strings = return_application_language($current_language); - -if(isset($app_strings['LBL_CHARSET'])) -{ - $charset = $app_strings['LBL_CHARSET']; -} -else -{ - $charset = $default_charset; -} - - -?> +debug("Entering outcome_by_month(".$date_start.",". $date_end.",". $user_id.") method ..."); + global $app_strings,$lang_crm, $app_list_strings, $current_module_strings,$current_user, $log, $charset, $tmp_dir; + global $theme; + include_once ('Image/Graph.php'); + include_once ('Image/Canvas.php'); + + $log =& LoggerManager::getLogger('outcome_by_month chart'); + // Set the basic parameters of the graph + $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); + $imagemap = $canvas->getImageMap(); + $graph =& Image_Graph::factory('graph', $canvas); + $log->debug("graph object created"); + + // add a TrueType font + $font =& $graph->addNew('font', calculate_font_name($lang_crm)); + // set the font size to 11 pixels + $font->setSize(8); + + $graph->setFont($font); + // create the plotarea layout + $title =& Image_Graph::factory('title', array('Title',10)); + $plotarea =& Image_Graph::factory('plotarea',array( + 'axis', + 'axis' + )); + $footer =& Image_Graph::factory('title', array('Footer',8)); + $graph->add( + Image_Graph::vertical($title, + Image_Graph::vertical( + $plotarea, + $footer, + 90 + ), + 5 + ) + ); + + //$graph->SetScale("textlin"); + + if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) { + //$font = calculate_font_family($lang_crm); + + $log->debug("date_start is: $date_start"); + $log->debug("date_end is: $date_end"); + $log->debug("user_id is: "); + $log->debug($user_id); + $log->debug("cache_file_name is: $cache_file_name"); + + //build the where clause for the query that matches $user + $where = ""; + $first = true; + $current = 0; + /*foreach ($user_id as $the_id) { + if (!$first) $where .= "OR "; + $first = false; + $where .= "vtiger_crmentity.smcreatorid='$the_id' "; + } + $where .= ") ";*/ + + //build the where clause for the query that matches $date_start and $date_end + $where .= " closingdate >= '$date_start' AND closingdate <= '$date_end'"; + $subtitle = $current_module_strings['LBL_DATE_RANGE']." ".getDisplayDate($date_start)." ".$current_module_strings['LBL_DATE_RANGE_TO']." ".getDisplayDate($date_end)."\n"; + + //Now do the db queries + //query for opportunity data that matches $datay and $user + $opp = new Potentials(); + $opp_list = $opp->get_full_list("vtiger_potential.amount DESC, vtiger_potential.closingdate DESC", $where); + + //build pipeline by sales stage data + $total = 0; + $count = array(); + $sum = array(); + $months = array(); + $other = $current_module_strings['LBL_LEAD_SOURCE_OTHER']; + if (isset($opp_list)) { + foreach ($opp_list as $record) { + $month = substr_replace($record->column_fields['closingdate'],'',-3); + if (!in_array($month, $months)) { array_push($months, $month); } + if ($record->column_fields['sales_stage'] == 'Closed Won' || $record->column_fields['sales_stage'] == 'Closed Lost') { + $sales_stage=$record->column_fields['sales_stage']; + } + else { + $sales_stage=$other; + } + + if (!isset($sum[$month][$sales_stage])) { + $sum[$month][$sales_stage] = 0; + } + if (isset($record->column_fields['amount'])) { + // Strip all non numbers from this string. + $amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate); + $sum[$month][$sales_stage] = $sum[$month][$sales_stage] + $amount; + if (isset($count[$month][$sales_stage])) { + $count[$month][$sales_stage]++; + } + else { + $count[$month][$sales_stage] = 1; + } + $total = $total + ($amount/1000); + } + } + } + + $legend = array(); + $datax = array(); + $aTargets = array(); + $aAlts = array(); + $stages = array($other, 'Closed Lost', 'Closed Won'); + //sort the months or push a bogus month on the array so that an empty chart is drawn + if (empty($months)) { + array_push($months, date('Y-m',time())); + } + else{ + sort($months); + } + foreach($months as $month) { + foreach($stages as $stage) { + $log->debug("stage is $stage"); + if (!isset($datax[$stage])) { + $datax[$stage] = array(); + } + if (!isset($aAlts[$stage])) { + $aAlts[$stage] = array(); + } + if (!isset($aTargets[$stage])) { + $aTargets[$stage] = array(); + } + + if (isset($sum[$month][$stage])) { + array_push($datax[$stage], $sum[$month][$stage]/1000); + array_push($aAlts[$stage], $count[$month][$stage]." ".$current_module_strings['LBL_OPPS_OUTCOME']." $stage"); + } + else { + array_push($datax[$stage], 0); + array_push($aAlts[$stage], ""); + } + array_push($aTargets[$stage], "index.php?module=Potentials&action=ListView&date_closed=$month&sales_stage=".urlencode($stage)."&query=true&type=dbrd"); + } + array_push($legend,$month); + } + + $log->debug("datax is:"); + $log->debug($datax); + $log->debug("aAlts is:"); + $log->debug($aAlts); + $log->debug("aTargets is:"); + $log->debug($aTargets); + $log->debug("sum is:"); + $log->debug($sum); + $log->debug("count is:"); + $log->debug($count); + + //now build the bar plots for each user across the sales stages + $color = array('Closed Lost'=>'#FF9900','Closed Won'=>'#009933', $other=>'#0066CC'); + $index = 0; + $datasets = array(); + $xlabels = array(); + $fills =& Image_Graph::factory('Image_Graph_Fill_Array'); + foreach($stages as $stage) { + // Now create a bar plot + $datasets[$index] = & Image_Graph::factory('dataset'); + foreach($datax[$stage] as $i => $y) { + $x = 1+2*$i; + $datasets[$index]->addPoint( + $x, + $y, + array( + 'url' => $aTargets[$stage][$i], + 'alt' => $aAlts[$stage][$i] + ) + ); + } + + // Set fill colors for bars + $fills->addColor($color[$stage]); + + $index++; + } + for($i=0;$i$m) { + $monthSum = 0; + foreach($stages as $stage) $monthSum += $datax[$stage][$num]; + if($monthSum > $maximum) $maximum = $monthSum; + $log->debug('maximum = '.$maximum.' month = '.$m.' sum = '.$monthSum); + } + + if($theme == "blue") + { + $font_color = "#212473"; + } + else + { + $font_color = "#000000"; + } + $font->setColor($font_color); + + // Create the grouped bar plot + $gbplot = & $plotarea->addNew('bar', array($datasets, 'stacked')); + $gbplot->setFillStyle($fills); + + //You can change the width of the bars if you like + $gbplot->setBarWidth(50/count($months),"%"); + + // set margin + $plotarea->setPadding(array('top'=>0,'bottom'=>0,'left'=>10,'right'=>20)); + + // Set white margin color + $graph->setBackgroundColor('#F5F5F5'); + + // Use a box around the plot area + $gbplot->setBorderColor('black'); + + // Use a gradient to fill the plot area + $gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_VERTICAL, 'white', '#E5E5E5'))); + + // Setup title + $titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL']; + //$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total; + + $title->setText($titlestr); + + // Create the xaxis labels + $array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', + array($xlabels) + ); + + // Setup X-axis + $xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X); + $xaxis->setDataPreprocessor($array_data); + $xaxis->forceMinimum(0); + $xaxis->forceMaximum(2*count($months)); + $xaxis->setLabelInterval(1); + $xaxis->setTickOptions(0,0); + $xaxis->setLabelInterval(2,2); + $xaxis->setTickOptions(5,0,2); + + // set grid + $gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y); + $gridY->setLineColor('#E5E5E5 at 0.5'); + + + // Add some grace to y-axis so the bars doesn't go + // all the way to the end of the plot area + $yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y); + $yaxis->forceMaximum($maximum * 1.1); + $ticks = get_tickspacing($maximum); + + // Setup the Y-axis to be displayed in the bottom of the + // graph. We also finetune the exact layout of the title, + // ticks and labels to make them look nice. + $yaxis->setAxisIntersection('max'); + + // Then fix the tick marks + $valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d"); + $yaxis->setFontSize(8); + $yaxis->setDataPreprocessor($valueproc); + // Arrange Y-Axis tick marks inside + $yaxis->setLabelInterval($ticks[0]); + $yaxis->setTickOptions(-5,0); + $yaxis->setLabelInterval($ticks[1],2); + $yaxis->setTickOptions(-2,0,2); + $yaxis->setLabelOption('position','inside'); + + // Finally setup the title + $yaxis->setLabelOption('position','inside'); + + // eliminate zero values + $gbplot->setDataSelector(Image_Graph::factory('Image_Graph_DataSelector_NoZeros')); + + // set markers + $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); + $marker->setDataPreprocessor($valueproc); + $marker->setFillColor('000000 at 0.0'); + $marker->setBorderColor('000000 at 0.0'); + $marker->setFontColor('white'); + $marker->setFontSize(8); + $gbplot->setMarker($marker); + + $subtitle .= $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; + $footer->setText($subtitle); + $footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT); + + // .. and stroke the graph + $imgMap = $graph->done( + array( + 'tohtml' => true, + 'border' => 0, + 'filename' => $cache_file_name, + 'filepath' => './', + 'urlpath' => '' + )); + //$imgMap = htmlspecialchars($output); + save_image_map($cache_file_name.'.map', $imgMap); + } + else { + $imgMap_fp = fopen($cache_file_name.'.map', "rb"); + $imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map')); + fclose($imgMap_fp); + } + $fileModTime = filemtime($cache_file_name.'.map'); + $return = "\n$imgMap"; + $log->debug("Exiting outcome_by_month method ..."); + return $return; + } + + /** + * Creates lead_source_by_outcome pipeline image as a horizontal accumlated bar graph for multiple vtiger_users. + * param $datay- the lead source data to display in the x-axis + * param $date_start- the begin date of opps to find + * param $date_end- the end date of opps to find + * param $ids - list of assigned vtiger_users of opps to find + * param $cache_file_name - file name to write image to + * param $refresh - boolean whether to rebuild image if exists + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function lead_source_by_outcome($datay=array('foo','bar'), $user_id=array('1'), $cache_file_name='a_file', $refresh=false,$width=900,$height=500){ + global $log,$current_user; + $log->debug("Entering lead_source_by_outcome(".$datay.",".$user_id.",".$cache_file_name.",".$refresh.") method ..."); + global $app_strings,$lang_crm, $current_module_strings,$charset, $tmp_dir; + global $theme; + + include_once ('Image/Graph.php'); + include_once ('Image/Canvas.php'); + + $log =& LoggerManager::getLogger('lead_source_by_outcome chart'); + // Set the basic parameters of the graph + $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); + $imagemap = $canvas->getImageMap(); + $graph =& Image_Graph::factory('graph', $canvas); + $log->debug("graph object created"); + // add a TrueType font + $font =& $graph->addNew('font', calculate_font_name($lang_crm)); + // set the font size to 11 pixels + $font->setSize(8); + + $graph->setFont($font); + // create the plotarea layout + $title =& Image_Graph::factory('title', array('Test',10)); + $plotarea =& Image_Graph::factory('plotarea',array( + 'axis', + 'axis', + 'horizontal' + )); + $footer =& Image_Graph::factory('title', array('Footer',8)); + $graph->add( + Image_Graph::vertical($title, + Image_Graph::vertical( + $plotarea, + $footer, + 90 + ), + 5 + ) + ); + + if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) { + + $log->debug("datay is:"); + $log->debug($datay); + $log->debug("user_id is: "); + $log->debug($user_id); + $log->debug("cache_file_name is: $cache_file_name"); + + $where=""; + //build the where clause for the query that matches $user + /*$count = count($user_id); + if ($count>0) { + $where = "("; + $first = true; + $current = 0; + foreach ($user_id as $the_id) { + if (!$first) $where .= "OR "; + $first = false; + $where .= "vtiger_crmentity.smcreatorid='$the_id' "; + } + $where .= ") "; + }*/ + + //build the where clause for the query that matches $datay + $count = count($datay); + if ($count>0) { + $where .= " ( "; + unset($first); + $first = true; + foreach ($datay as $key=>$value) { + if (!$first) $where .= "OR "; + $first = false; + $where .= "leadsource ='$key' "; + } + $where .= ")"; + } + + //Now do the db queries + //query for opportunity data that matches $datay and $user + $opp = new Potentials(); + $opp_list = $opp->get_full_list("vtiger_potential.amount DESC, vtiger_potential.closingdate DESC", $where); + + //build pipeline by sales stage data + $total = 0; + $count = array(); + $sum = array(); + $other = $current_module_strings['LBL_LEAD_SOURCE_OTHER']; + if (isset($opp_list)) { + foreach ($opp_list as $record) { + //if lead source is blank, set it to the language's "none" value + if (isset($record->column_fields['leadsource']) && $record->column_fields['leadsource'] != '') { + $lead_source = $record->column_fields['leadsource']; + } + else { + $lead_source = $current_module_strings['NTC_NO_LEGENDS']; + } + + if ($record->column_fields['sales_stage'] == 'Closed Won' || $record->column_fields['sales_stage'] == 'Closed Lost') { + $sales_stage=$record->column_fields['sales_stage']; + } + else { + $sales_stage=$other; + } + + if (!isset($sum[$lead_source][$sales_stage])) { + $sum[$lead_source][$sales_stage] = 0; + } + if (isset($record->column_fields['amount'])) { + // Strip all non numbers from this string. + $amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate); + $sum[$lead_source][$sales_stage] = $sum[$lead_source][$sales_stage] + $amount; + if (isset($count[$lead_source][$sales_stage])) { + $count[$lead_source][$sales_stage]++; + } + else { + $count[$lead_source][$sales_stage] = 1; + } + $total = $total + ($amount/1000); + } + } + } + + $legend = array(); + $datax = array(); + $aTargets = array(); + $aAlts = array(); + $stages = array($other,'Closed Lost', 'Closed Won'); + foreach($datay as $lead=>$translation) { + if ($lead == '') { + $lead = $current_module_strings['NTC_NO_LEGENDS']; + $translation = $current_module_strings['NTC_NO_LEGENDS']; + } + foreach($stages as $stage) { + $log->debug("stage_key is $stage"); + if (!isset($datax[$stage])) { + $datax[$stage] = array(); + } + if (!isset($aAlts[$stage])) { + $aAlts[$stage] = array(); + } + if (!isset($aTargets[$stage])) { + $aTargets[$stage] = array(); + } + + if (isset($sum[$lead][$stage])) { + array_push($datax[$stage], $sum[$lead][$stage]/1000); + array_push($aAlts[$stage], $count[$lead][$stage]." ".$current_module_strings['LBL_OPPS_OUTCOME']." $stage"); + } + else { + array_push($datax[$stage], 0); + array_push($aAlts[$stage], ""); + } + array_push($aTargets[$stage], "index.php?module=Potentials&action=ListView&leadsource=".urlencode($lead)."&sales_stage=".urlencode($stage)."&query=true&type=dbrd"); + } + array_push($legend,$translation); + } + + $log->debug("datax is:"); + $log->debug($datax); + $log->debug("aAlts is:"); + $log->debug($aAlts); + $log->debug("aTargets is:"); + $log->debug($aTargets); + $log->debug("sum is:"); + $log->debug($sum); + $log->debug("count is:"); + $log->debug($count); + + //now build the bar plots for each user across the sales stages + $color = array('Closed Lost'=>'FF9900','Closed Won'=>'009933', $other=>'0066CC'); + $index = 0; + $xlabels = array(); + $datasets = array(); + $fills =& Image_Graph::factory('Image_Graph_Fill_Array'); + foreach($stages as $stage) { + // Now create a bar pot + $datasets[$index] = & Image_Graph::factory('dataset'); + foreach($datax[$stage] as $i => $y) { + $x = 1+2*$i; + $datasets[$index]->addPoint( + //$datay[$legend[$x]], + $x, + $y, + array( + 'url' => $aTargets[$stage][$i], + 'alt' => $aAlts[$stage][$i], + 'target' => '' + ) + ); + } + for($i=0;$iaddColor("#".$color[$stage]); + + $log->debug("datax[$stage] is: "); + $log->debug($datax[$stage]); + $index++; + } + + // compute maximum value because of grace jpGraph parameter not supported + $maximum = 0; + foreach($legend as $legendidx=>$legend_text) { + $dataxSum = 0; + foreach($stages as $stage) $dataxSum += $datax[$stage][$legendidx]; + if($dataxSum > $maximum) $maximum = $dataxSum; + } + + if($theme == "blue") + { + $font_color = "#212473"; + } + else + { + $font_color = "#000000"; + } + $font->setColor($font_color); + + // Create the grouped bar plot + $gbplot = & $plotarea->addNew('bar', array($datasets, 'stacked')); + $gbplot->setFillStyle($fills); + + //You can change the width of the bars if you like + $gbplot->setBarWidth(50/count($legend),"%"); + + // Set white margin color + $graph->setBackgroundColor('#F5F5F5'); + + // Use a box around the plot area + $gbplot->setBorderColor('black'); + + // Use a gradient to fill the plot area + $gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_HORIZONTAL, 'white', '#E5E5E5'))); + + // Setup title + $titlestr = $current_module_strings['LBL_ALL_OPPORTUNITIES'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL']; + //$titlestr = $current_module_strings['LBL_ALL_OPPORTUNITIES'].$current_user->currency_symbol.$total; + $title->setText($titlestr); + + // Create the xaxis labels + $array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', + array($xlabels) + ); + + // Setup X-axis + $xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X); + $xaxis->setDataPreprocessor($array_data); + $xaxis->forceMinimum(0); + $xaxis->forceMaximum(2*count($legend)); + $xaxis->setLabelInterval(1); + $xaxis->setTickOptions(0,0); + $xaxis->setLabelInterval(2,2); + $xaxis->setTickOptions(5,0,2); + $xaxis->setInverted(true); + + // set grid + $gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y); + $gridY->setLineColor('#E5E5E5 at 0.5'); + + // Add some grace to y-axis so the bars doesn't go + // all the way to the end of the plot area + $yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y); + $yaxis->forceMaximum($maximum * 1.1); + $ticks = get_tickspacing($maximum); + + // Then fix the tick marks + $yaxis->setFontSize(8); + $yaxis->setAxisIntersection('max'); + $valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d"); + $yaxis->setDataPreprocessor($valueproc); + $yaxis->setLabelInterval($ticks[0]); + $yaxis->setTickOptions(-5,0); + $yaxis->setLabelInterval($ticks[1],2); + $yaxis->setTickOptions(-2,0,2); + + // eliminate zero values + $gbplot->setDataSelector(Image_Graph::factory('Image_Graph_DataSelector_NoZeros')); + + // set markers + $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); + $marker->setDataPreprocessor($valueproc); + $marker->setFillColor('#000000 at 0.0'); + $marker->setBorderColor('#000000 at 0.0'); + $marker->setFontColor('white'); + $marker->setFontSize(8); + $gbplot->setMarker($marker); + + // Finally setup the title + $subtitle = $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; + $footer->setText($subtitle); + $footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT); + + // .. and stroke the graph + $imgMap = $graph->done( + array( + 'tohtml' => true, + 'border' => 0, + 'filename' => $cache_file_name, + 'filepath' => './', + 'urlpath' => '' + )); + //$imgMap = htmlspecialchars($output); + save_image_map($cache_file_name.'.map', $imgMap); + } + else { + $imgMap_fp = fopen($cache_file_name.'.map', "rb"); + $imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map')); + fclose($imgMap_fp); + } + $fileModTime = filemtime($cache_file_name.'.map'); + $return = "\n$imgMap"; + $log->debug("Exiting lead_source_by_outcome method ..."); + return $return; + } + + /** + * Creates opportunity pipeline image as a horizontal accumlated bar graph for multiple vtiger_users. + * param $datax- the sales stage data to display in the x-axis + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function pipeline_by_sales_stage($datax=array('foo','bar'), $date_start='2071-10-15', $date_end='2071-10-15', $user_id=array('1'), $cache_file_name='a_file', $refresh=false,$width=900,$height=500){ + global $log,$current_user; + $log->debug("Entering pipeline_by_sales_stage(".$datax.",".$date_start.",".$date_end.",".$user_id.",".$cache_file_name.",".$refresh.") method ..."); + global $app_strings,$lang_crm, $current_module_strings, $charset, $tmp_dir; + global $theme; + include_once ('Image/Graph.php'); + include_once ('Image/Canvas.php'); + + $log =& LoggerManager::getLogger('opportunity charts'); + // Set the basic parameters of the graph + + + $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); + $imagemap = $canvas->getImageMap(); + $graph =& Image_Graph::factory('graph', $canvas); + //$log->debug("graph object created"); + // add a TrueType font + //$font =& $graph->addNew('font', calculate_font_name($lang_crm)); + $font =& $graph->addNew('font', calculate_font_name($lang_crm)); + // set the font size to 11 pixels + $font->setSize(8); + + $graph->setFont($font); + $title =& Image_Graph::factory('title', array('Test',10)); + $plotarea =& Image_Graph::factory('plotarea',array( + 'axis', + 'axis', + 'horizontal' + )); + $footer =& Image_Graph::factory('title', array('Footer',8)); + $graph->add( + Image_Graph::vertical($title, + Image_Graph::vertical( + $plotarea, + $footer, + 90 + ), + 5 + ) + ); + $log->debug("graph object created"); + + + if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) { + + $log->debug("starting pipeline chart"); + $log->debug("datax is:"); + $log->debug($datax); + $log->debug("user_id is: "); + $log->debug($user_id); + $log->debug("cache_file_name is: $cache_file_name"); + + $where=""; + //build the where clause for the query that matches $user + /*$count = count($user_id); + if ($count>0) { + $where = "("; + $first = true; + $current = 0; + foreach ($user_id as $the_id) { + if (!$first) $where .= "OR "; + $first = false; + //reference post + //if I change the owner of a opportunity, the graph shown on Home does not update correctly, this is because the graph is looking for the creatorid and not for the ownerid + //fix incorporated based on /sak's feedback + $where .= "vtiger_crmentity.smownerid='$the_id' "; + } + $where .= ") "; + }*/ + + //build the where clause for the query that matches $datax + $count = count($datax); + if ($count>0) { + $where .= " ( "; + unset($first); + $first = true; + foreach ($datax as $key=>$value) { + if (!$first) $where .= "OR "; + $first = false; + $where .= "sales_stage ='$key' "; + } + $where .= ")"; + } + + //build the where clause for the query that matches $date_start and $date_end + $where .= "AND closingdate >= '$date_start' AND closingdate <= '$date_end'"; + $subtitle = $current_module_strings['LBL_DATE_RANGE']." ".getDisplayDate($date_start)." ".$current_module_strings['LBL_DATE_RANGE_TO']." ".getDisplayDate($date_end)."\n"; + + //Now do the db queries + //query for opportunity data that matches $datax and $user + $opp = new Potentials(); + $opp_list = $opp->get_full_list("vtiger_potential.amount DESC, vtiger_potential.closingdate DESC", $where); + + //build pipeline by sales stage data + $total = 0; + $count = array(); + $sum = array(); + if (isset($opp_list)) { + foreach ($opp_list as $record) { + if (!isset($sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']])) { + $sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] = 0; + } + if (isset($record->column_fields['amount'])) { + // Strip all non numbers from this string. + $amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate); + $sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] = $sum[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] + $amount; + if (isset($count[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']])) { + $count[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']]++; + } + else { + $count[$record->column_fields['sales_stage']][$record->column_fields['assigned_user_id']] = 1; + } + $total = $total + ($amount/1000); + } + } + } + + $legend = array(); + $datay = array(); + $aTargets = array(); + $aAlts = array(); + foreach ($datax as $stage_key=>$stage_translation) { + foreach ($user_id as $the_id) { + $the_user = get_assigned_user_name($the_id); + if (!isset($datay[$the_id])) { + $datay[$the_id] = array(); + } + if (!isset($aAlts[$the_id])) { + $aAlts[$the_id] = array(); + } + if (!isset($aTargets[$the_id])) { + $aTargets[$the_id] = array(); + } + + if (isset($sum[$stage_key][$the_id])) { + array_push($datay[$the_id], $sum[$stage_key][$the_id]/1000); + array_push($aAlts[$the_id], $the_user.' - '.$count[$stage_key][$the_id]." ".$current_module_strings['LBL_OPPS_IN_STAGE']." $stage_translation"); + } + else { + array_push($datay[$the_id], 0); + array_push($aAlts[$the_id], ""); + } + array_push($aTargets[$the_id], "index.php?module=Potentials&action=ListView&sales_stage=".urlencode($stage_key)."&closingdate_start=".urlencode($date_start)."&closingdate_end=".urlencode($date_end)."&query=true&type=dbrd"); + } + array_push($legend,$stage_translation); + } + + $log->debug("datay is:"); + $log->debug($datay); + $log->debug("aAlts is:"); + $log->debug($aAlts); + $log->debug("aTargets is:"); + $log->debug($aTargets); + $log->debug("sum is:"); + $log->debug($sum); + $log->debug("count is:"); + $log->debug($count); + + //now build the bar plots for each user across the sales stages + $colors = color_generator(count($user_id),'#D50100','#002222'); + $index = 0; + $datasets = array(); + $xlabels = array(); + $fills =& Image_Graph::factory('Image_Graph_Fill_Array'); + foreach($user_id as $the_id) { + // Now create a bar pot + $datasets[$index] = & Image_Graph::factory('dataset'); + foreach($datay[$the_id] as $i => $y) { + $x = 1+2*$i; + $datasets[$index]->addPoint( + $x, + $y, + array( + 'url' => $aTargets[$the_id][$i], + 'alt' => $aAlts[$the_id][$i] + ) + ); + } + + // Set fill colors for bars + $fills->addColor($colors[$index]); + + $index++; + } + for($i=0;$i$legend_text) { + $legendsum = 0; + foreach($user_id as $the_id) $legendsum += $datay[$the_id][$legendidx]; + if($legendsum > $maximum) $maximum = $legendsum; + } + // Create the grouped bar plot + $gbplot = & $plotarea->addNew('bar', array($datasets, 'stacked')); + $gbplot->setFillStyle($fills); + + //You can change the width of the bars if you like + $gbplot->setBarWidth(50/count($legend),"%"); + + + // Set white margin color + $graph->setBackgroundColor('#F5F5F5'); + + // Use a box around the plot area + $gbplot->setBorderColor('black'); + + // Use a gradient to fill the plot area + $gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_HORIZONTAL, 'white', '#E5E5E5'))); + + if($theme == "blue") + { + $font_color = "#212473"; + } + else + { + $font_color = "#000000"; + } + $font->setColor($font_color); + + // Setup title + $titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL']; + //$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total; + $title->setText($titlestr); + + // Create the xaxis labels + $array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', + array($xlabels) + ); + + + // Setup X-axis + $xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X); + $xaxis->setDataPreprocessor($array_data); + $xaxis->forceMinimum(0); + $xaxis->forceMaximum(2*count($legend)); + $xaxis->setLabelInterval(1); + $xaxis->setTickOptions(0,0); + $xaxis->setLabelInterval(2,2); + $xaxis->setTickOptions(5,0,2); + $xaxis->setInverted(true); + + // Setup Y-axis + $yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y); + $yaxis->setFontSize(8); + $yaxis->setAxisIntersection('max'); + + // Add some grace to y-axis so the bars doesn't go + // all the way to the end of the plot area + $yaxis->forceMaximum($maximum * 1.1); + $ticks = get_tickspacing($maximum); + + // set grid + $gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y); + $gridY->setLineColor('#E5E5E5 at 0.5'); + + // First make the labels look right + $valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d"); + $yaxis->setDataPreprocessor($valueproc); + $yaxis->setLabelInterval($ticks[0]); + $yaxis->setTickOptions(-5,0); + $yaxis->setLabelInterval($ticks[1],2); + $yaxis->setTickOptions(-2,0,2); + + // eliminate zero values + $gbplot->setDataSelector(Image_Graph::factory('Image_Graph_DataSelector_NoZeros')); + + // set markers + $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); + $marker->setDataPreprocessor($valueproc); + $marker->setFillColor('000000 at 0.0'); + $marker->setBorderColor('000000 at 0.0'); + $marker->setFontColor('white'); + $marker->setFontSize(8); + $gbplot->setMarker($marker); + + // Finally setup the title + + $subtitle .= $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; + $footer->setText($subtitle); + $footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT); + + // .. and stroke the graph + $imgMap = $graph->done( + array( + 'tohtml' => true, + 'border' => 0, + 'filename' => $cache_file_name, + 'filepath' => './', + 'urlpath' => '' + )); + //$imgMap = $graph->GetHTMLImageMap('pipeline'); + save_image_map($cache_file_name.'.map', $imgMap); + } + else { + $imgMap_fp = fopen($cache_file_name.'.map', "rb"); + $imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map')); + fclose($imgMap_fp); + } + $fileModTime = filemtime($cache_file_name.'.map'); + $return = "\n$imgMap"; + $log->debug("Exiting pipeline_by_sales_stage method ..."); + return $return; + } + + /** + * Creates pie chart image of opportunities by lead_source. + * param $datax- the sales stage data to display in the x-axis + * param $datay- the sum of opportunity amounts for each opportunity in each sales stage + * to display in the y-axis + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function pipeline_by_lead_source($legends=array('foo','bar'), $user_id=array('1'), $cache_file_name='a_file', $refresh=true,$width=900,$height=500){ + global $log,$current_user; + $log->debug("Entering pipeline_by_lead_source(".$legends.") method ..."); + global $app_strings,$lang_crm, $current_module_strings, $log, $charset, $tmp_dir; + global $theme; + + include_once ('Image/Graph.php'); + include_once ('Image/Canvas.php'); + + $font = calculate_font_name($lang_crm); + + if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) { + $log =& LoggerManager::getLogger('opportunity charts'); + $log->debug("starting pipeline chart"); + $log->debug("legends is:"); + $log->debug($legends); + $log->debug("user_id is: "); + $log->debug($user_id); + $log->debug("cache_file_name is: $cache_file_name"); + + //Now do the db queries + //query for opportunity data that matches $legends and $user + $where=""; + //build the where clause for the query that matches $user + /*$count = count($user_id); + if ($count>0) { + $where = "("; + $first = true; + foreach ($user_id as $the_id) { + if (!$first) $where .= "OR "; + $first = false; + $where .= "vtiger_crmentity.smcreatorid='$the_id' "; + } + $where .= ") "; + }*/ + + //build the where clause for the query that matches $datax + $count = count($legends); + if ($count>0) { + $where .= " ( "; + $first = true; + foreach ($legends as $key=>$value) { + if (!$first) $where .= "OR "; + $first = false; + $where .= "leadsource ='$key' "; + } + $where .= ")"; + } + + $opp = new Potentials(); + $opp_list = $opp->get_full_list("vtiger_potential.amount DESC, vtiger_potential.closingdate DESC", $where); + + //build pipeline by lead source data + $total = 0; + $count = array(); + $sum = array(); + if (isset($opp_list)) { + foreach ($opp_list as $record) { + if (!isset($sum[$record->column_fields['leadsource']])) $sum[$record->column_fields['leadsource']] = 0; + if (isset($record->column_fields['amount']) && isset($record->column_fields['leadsource'])) { + // Strip all non numbers from this string. + $amount = convertFromMasterCurrency(ereg_replace('[^0-9]', '', floor($record->column_fields['amount'])),$current_user->conv_rate); + $sum[$record->column_fields['leadsource']] = $sum[$record->column_fields['leadsource']] + ($amount/1000); + if (isset($count[$record->column_fields['leadsource']])) $count[$record->column_fields['leadsource']]++; + else $count[$record->column_fields['leadsource']] = 1; + $total = $total + ($amount/1000); + } + } + } + + $visible_legends = array(); + $data= array(); + $aTargets = array(); + $aAlts = array(); + foreach ($legends as $lead_source_key=>$lead_source_translation) { + if (isset($sum[$lead_source_key])) + { + array_push($data, $sum[$lead_source_key]); + if($lead_source_key != '') + { + array_push($visible_legends, $lead_source_translation); + } + else + { + // put none in if the vtiger_field is blank. + array_push($visible_legends, $current_module_strings['NTC_NO_LEGENDS']); + } + array_push($aTargets, "index.php?module=Potentials&action=ListView&leadsource=".urlencode($lead_source_key)."&query=true&type=dbrd"); + array_push($aAlts, $count[$lead_source_key]." ".$current_module_strings['LBL_OPPS_IN_LEAD_SOURCE']." $lead_source_translation "); + } + } + + $log->debug("sum is:"); + $log->debug($sum); + $log->debug("count is:"); + $log->debug($count); + $log->debug("total is: $total"); + if ($total == 0) { +$log->debug("Exiting pipeline_by_lead_source method ..."); + return ($current_module_strings['ERR_NO_OPPS']); + } + + if($theme == "blue") + { + $font_color = "#212473"; + } + else + { + $font_color = "#000000"; + } + + + $canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true)); + $imagemap = $canvas->getImageMap(); + $graph =& Image_Graph::factory('graph', $canvas); + + $font =& $graph->addNew('font', calculate_font_name($lang_crm)); + // set the font size to 11 pixels + $font->setSize(8); + $font->setColor($font_color); + + $graph->setFont($font); + // create the plotarea layout + $title =& Image_Graph::factory('title', array('Test',10)); + $plotarea =& Image_Graph::factory('plotarea',array( + 'category', + 'axis' + )); + $footer =& Image_Graph::factory('title', array('Footer',8)); + $graph->add( + Image_Graph::vertical($title, + Image_Graph::vertical( + $plotarea, + $footer, + 90 + ), + 5 + ) + ); + + // Generate colours + $colors = color_generator(count($visible_legends),'#33CCFF','#3322FF'); + $index = 0; + $dataset = & Image_Graph::factory('dataset'); + $fills =& Image_Graph::factory('Image_Graph_Fill_Array'); + foreach($visible_legends as $legend) { + $dataset->addPoint( + $legend, + $data[$index], + array( + 'url' => $aTargets[$index], + 'alt' => $aAlts[$index] + ) + ); + $fills->addColor($colors[$index]); + $log->debug('point ='.$legend.','.$data[$index]); + + $index++; + } + + // create the pie chart and associate the filling colours + $gbplot = & $plotarea->addNew('pie', $dataset); + $plotarea->hideAxis(); + $gbplot->setFillStyle($fills); + + // Setup title + $titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL']; + //$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$current_user->currency_symbol.$total; + + $title->setText($titlestr); + + // format the data values + $valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $current_user->currency_symbol."%d"); + + // set markers + $marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y); + $marker->setDataPreprocessor($valueproc); + $marker->setFillColor('#FFFFFF'); + $marker->setBorderColor($font_color); + $marker->setFontColor($font_color); + $marker->setFontSize(8); + $pointingMarker =& $graph->addNew('Image_Graph_Marker_Pointing_Angular', array(20, &$marker)); + $gbplot->setMarker($pointingMarker); + + // set legend + $legend_box =& $plotarea->addNew('legend'); + $legend_box->setPadding(array('top'=>20,'bottom'=>0,'left'=>0,'right'=>0)); + $legend_box->setFillColor('#F5F5F5'); + $legend_box->showShadow(); + + $subtitle = $current_module_strings['LBL_OPP_SIZE'].$current_user->currency_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; + $footer->setText($subtitle); + $footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_LEFT); + + $imgMap = $graph->done( + array( + 'tohtml' => true, + 'border' => 0, + 'filename' => $cache_file_name, + 'filepath' => './', + 'urlpath' => '' + )); + //$imgMap = htmlspecialchars($output); + save_image_map($cache_file_name.'.map', $imgMap); + } + else { + $imgMap_fp = fopen($cache_file_name.'.map', "rb"); + $imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map')); + fclose($imgMap_fp); + } + $fileModTime = filemtime($cache_file_name.'.map'); + $return = "\n$imgMap"; + $log->debug("Exiting pipeline_by_lead_source method ..."); + return $return; + + } + +} + + +/** + * Creates a file with the image map + * param $filename - file name to save to + * param $image_map - image map string to save + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. + * All Rights Reserved. + * Contributor(s): ______________________________________.. + */ +function save_image_map($filename,$image_map) +{ + global $log; + $log->debug("Entering save_image_map(".$filename.",".$image_map.") method ..."); + // save the image map to file + $log =& LoggerManager::getLogger('save_image_file'); + + if (!$handle = fopen($filename, 'w')) { + $log->debug("Cannot open file ($filename)"); + $log->debug("Exiting save_image_map method ..."); + return; + } + + // Write $somecontent to our opened file. + if (fwrite($handle, $image_map) === FALSE) { + $log->debug("Cannot write to file ($filename)"); + $log->debug("Exiting save_image_map method ..."); + return false; + } + + $log->debug("Success, wrote ($image_map) to file ($filename)"); + + fclose($handle); + $log->debug("Exiting save_image_map method ..."); + return true; + +} + +// retrieve the translated strings. +$app_strings = return_application_language($current_language); + +if(isset($app_strings['LBL_CHARSET'])) +{ + $charset = $app_strings['LBL_CHARSET']; +} +else +{ + $charset = $default_charset; +} + + +?> Modified: vtigercrm/branches/5.1_jens/modules/Potentials/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/DetailView.php Mon Apr 16 12:27:44 2007 @@ -1,112 +1,115 @@ -retrieve_entity_info($_REQUEST['record'],"Potentials"); - $focus->id = $_REQUEST['record']; - $focus->name=$focus->column_fields['potentialname']; -} -if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { - $focus->id = ""; -} - -global $theme; -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; -require_once($theme_path.'layout_utils.php'); - -$log->info("Potential detail view"); - -$smarty->assign("MOD", $mod_strings); -$smarty->assign("APP", $app_strings); - -$smarty->assign("THEME", $theme); -$smarty->assign("IMAGE_PATH", $image_path); -$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); -$smarty->assign("ID", $focus->id); -$smarty->assign("UPDATEINFO",updateInfo($focus->id)); - -$smarty->assign("ACCOUNTID",$focus->column_fields['account_id']); - -if (isset($focus->name)) $smarty->assign("NAME", $focus->name); -else $smarty->assign("NAME", ""); - -$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields)); - -$smarty->assign("CUSTOMFIELD", $cust_fld); -$smarty->assign("SINGLE_MOD", 'Opportunity'); -$category = getParentTab(); -$smarty->assign("CATEGORY",$category); - - -if(isPermitted("Potentials","EditView",$_REQUEST['record']) == 'yes') - $smarty->assign("EDIT_DUPLICATE","permitted"); -if(isPermitted("Invoice","EditView",$_REQUEST['record']) == 'yes') - $smarty->assign("CONVERTINVOICE","permitted"); -if(isPermitted("Potentials","Delete",$_REQUEST['record']) == 'yes') - $smarty->assign("DELETE","permitted"); - -$tabid = getTabid("Potentials"); -$validationData = getDBValidationData($focus->tab_name,$tabid); -$data = split_validationdataArray($validationData); - -$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); - -$check_button = Button_Check($module); -$smarty->assign("CHECK", $check_button); - -$smarty->assign("CONVERTMODE",'potentoinvoice'); -$smarty->assign("MODULE","Potentials"); -$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); - -if($singlepane_view == 'true') -{ - $related_array = getRelatedLists($currentModule,$focus); - $smarty->assign("RELATEDLISTS", $related_array); -} - -$smarty->assign("SinglePane_View", $singlepane_view); - + +$focus = new Potentials(); +$smarty = new vtigerCRM_Smarty; + +if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { + $focus->retrieve_entity_info($_REQUEST['record'],"Potentials"); + $focus->id = $_REQUEST['record']; + $focus->name=$focus->column_fields['potentialname']; +} +if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { + $focus->id = ""; +} + +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); + +$log->info("Potential detail view"); + +$smarty->assign("MOD", $mod_strings); +$smarty->assign("APP", $app_strings); + +$smarty->assign("THEME", $theme); +$smarty->assign("IMAGE_PATH", $image_path); +$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); +$smarty->assign("ID", $focus->id); +$smarty->assign("UPDATEINFO",updateInfo($focus->id)); + +$smarty->assign("ACCOUNTID",$focus->column_fields['account_id']); + +if (isset($focus->name)) $smarty->assign("NAME", $focus->name); +else $smarty->assign("NAME", ""); + +$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields)); + +$smarty->assign("CUSTOMFIELD", $cust_fld); +$smarty->assign("SINGLE_MOD", 'Opportunity'); +$category = getParentTab(); +$smarty->assign("CATEGORY",$category); + + +if(isPermitted("Potentials","EditView",$_REQUEST['record']) == 'yes') + $smarty->assign("EDIT_DUPLICATE","permitted"); +if(isPermitted("Invoice","EditView",$_REQUEST['record']) == 'yes') + $smarty->assign("CONVERTINVOICE","permitted"); +if(isPermitted("Potentials","Delete",$_REQUEST['record']) == 'yes') + $smarty->assign("DELETE","permitted"); + +$tabid = getTabid("Potentials"); +$validationData = getDBValidationData($focus->tab_name,$tabid); +$data = split_validationdataArray($validationData); + +$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); +$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); +$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); + +$check_button = Button_Check($module); +$smarty->assign("CHECK", $check_button); + +$smarty->assign("CONVERTMODE",'potentoinvoice'); +$smarty->assign("MODULE","Potentials"); +$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); + +if($singlepane_view == 'true') +{ + $related_array = getRelatedLists($currentModule,$focus); + $smarty->assign("RELATEDLISTS", $related_array); + $smarty->assign("BASE_ACCOUNT",getAccountName($focus->column_fields[account_id])); +} + +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); + +$smarty->assign("SinglePane_View", $singlepane_view); + $organization = new Organization; $organization->id = $current_organization; -$smarty->assign("ASSIGN_ORGUNIT_LIST", getOrgUnits($organization)); - -$smarty->display("DetailView.tpl"); -?> +$smarty->assign("ASSIGN_ORGUNIT_LIST", getOrgUnits($organization)); + +$smarty->display("DetailView.tpl"); +?> Modified: vtigercrm/branches/5.1_jens/modules/Potentials/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/DetailViewAjax.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/DetailViewAjax.php Mon Apr 16 12:27:44 2007 @@ -1,51 +1,52 @@ -retrieve_entity_info($crmid,"Potentials"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $_REQUEST[$fieldname] = $fieldvalue; - if($fieldname == 'amount')//amount converted to dollar value while saving - { - $modObj->column_fields[$fieldname] = getConvertedPrice($fieldvalue); - } - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Potentials"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -?> +retrieve_entity_info($crmid,"Potentials"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $_REQUEST[$fieldname] = $fieldvalue; + if($fieldname == 'amount')//amount converted to dollar value while saving + { + $modObj->column_fields[$fieldname] = getConvertedPrice($fieldvalue); + } + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Potentials"); + sendNotificationToOwner('Potentials',&$modObj); + if($modObj->id != "") + { + echo ":#:SUCCESS"; + }else + { + echo ":#:FAILURE"; + } + }else + { + echo ":#:FAILURE"; + } +} +?> Modified: vtigercrm/branches/5.1_jens/modules/Potentials/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/EditView.php Mon Apr 16 12:27:44 2007 @@ -1,148 +1,151 @@ -id = $_REQUEST['record']; - $focus->mode = 'edit'; - $focus->retrieve_entity_info($_REQUEST['record'],"Potentials"); - $focus->name=$focus->column_fields['potentialname']; -} -if(isset($_REQUEST['account_id'])) -{ - $focus->column_fields['account_id'] = $_REQUEST['account_id']; -} -if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { - $focus->id = ""; - $focus->mode = ''; -} - -$disp_view = getView($focus->mode); -if($disp_view == 'edit_view') - $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields)); -else -{ - $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS')); -} -$smarty->assign("OP_MODE",$disp_view); -$category = getParentTab(); -$smarty->assign("CATEGORY",$category); - -//needed when creating a new opportunity with a default vtiger_account value passed in -if (isset($_REQUEST['accountname']) && is_null($focus->accountname)) { - $focus->accountname = $_REQUEST['accountname']; - -} -if (isset($_REQUEST['accountid']) && is_null($focus->accountid)) { - $focus->accountid = $_REQUEST['accountid']; -} -if (isset($_REQUEST['contactid']) && is_null($focus->contactid)) { - $focus->contactid = $_REQUEST['contactid']; -} - -global $theme; -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; -//retreiving the combo values array -$comboFieldNames = Array('leadsource'=>'leadsource_dom' - ,'opportunity_type'=>'opportunity_type_dom' - ,'sales_stage'=>'sales_stage_dom'); -$comboFieldArray = getComboArray($comboFieldNames); -require_once($theme_path.'layout_utils.php'); - -$log->info("Potential detail view"); -$smarty->assign("MOD", $mod_strings); -$smarty->assign("APP", $app_strings); - -if (isset($focus->name)) -$smarty->assign("NAME", $focus->name); -else -$smarty->assign("NAME", ""); - -if(isset($cust_fld)) -{ - $smarty->assign("CUSTOMFIELD", $cust_fld); -} -if($focus->mode == 'edit') -{ - $smarty->assign("UPDATEINFO",updateInfo($focus->id)); - $smarty->assign("MODE", $focus->mode); -} - - - -// Unimplemented until jscalendar language vtiger_files are fixed -$smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']); -$smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT'])); - -if (isset($_REQUEST['return_module'])) -$smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); -if (isset($_REQUEST['return_action'])) -$smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); -if (isset($_REQUEST['return_id'])) -$smarty->assign("RETURN_ID", $_REQUEST['return_id']); -if (isset($_REQUEST['return_viewname'])) -$smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); -$smarty->assign("THEME", $theme); -$smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); -$smarty->assign("ID", $focus->id); -$smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",'Potential'); - - - $tabid = getTabid("Potentials"); - $validationData = getDBValidationData($focus->tab_name,$tabid); - $data = split_validationdataArray($validationData); - - $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); - $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); - $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); - -$check_button = Button_Check($module); -$smarty->assign("CHECK", $check_button); - +$focus = new Potentials(); +$smarty = new vtigerCRM_Smarty(); + +if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') +{ + $focus->id = $_REQUEST['record']; + $focus->mode = 'edit'; + $focus->retrieve_entity_info($_REQUEST['record'],"Potentials"); + $focus->name=$focus->column_fields['potentialname']; +} +if(isset($_REQUEST['account_id'])) +{ + $focus->column_fields['account_id'] = $_REQUEST['account_id']; +} +if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { + $focus->id = ""; + $focus->mode = ''; +} + +$disp_view = getView($focus->mode); +if($disp_view == 'edit_view') + $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields)); +else +{ + $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS')); +} +$smarty->assign("OP_MODE",$disp_view); +$category = getParentTab(); +$smarty->assign("CATEGORY",$category); + +//needed when creating a new opportunity with a default vtiger_account value passed in +if (isset($_REQUEST['accountname']) && is_null($focus->accountname)) { + $focus->accountname = $_REQUEST['accountname']; + +} +if (isset($_REQUEST['accountid']) && is_null($focus->accountid)) { + $focus->accountid = $_REQUEST['accountid']; +} +if (isset($_REQUEST['contactid']) && is_null($focus->contactid)) { + $focus->contactid = $_REQUEST['contactid']; +} + +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +//retreiving the combo values array +$comboFieldNames = Array('leadsource'=>'leadsource_dom' + ,'opportunity_type'=>'opportunity_type_dom' + ,'sales_stage'=>'sales_stage_dom'); +$comboFieldArray = getComboArray($comboFieldNames); +require_once($theme_path.'layout_utils.php'); + +$log->info("Potential detail view"); +$smarty->assign("MOD", $mod_strings); +$smarty->assign("APP", $app_strings); + +if (isset($focus->name)) +$smarty->assign("NAME", $focus->name); +else +$smarty->assign("NAME", ""); + +if(isset($cust_fld)) +{ + $smarty->assign("CUSTOMFIELD", $cust_fld); +} +if($focus->mode == 'edit') +{ + $smarty->assign("UPDATEINFO",updateInfo($focus->id)); + $smarty->assign("MODE", $focus->mode); +} + + + +// Unimplemented until jscalendar language vtiger_files are fixed +$smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']); +$smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT'])); + +if (isset($_REQUEST['return_module'])) +$smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); +if (isset($_REQUEST['return_action'])) +$smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); +if (isset($_REQUEST['return_id'])) +$smarty->assign("RETURN_ID", $_REQUEST['return_id']); +if (isset($_REQUEST['return_viewname'])) +$smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); +$smarty->assign("THEME", $theme); +$smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); +$smarty->assign("ID", $focus->id); +$smarty->assign("MODULE",$currentModule); +$smarty->assign("SINGLE_MOD",'Potential'); + + + $tabid = getTabid("Potentials"); + $validationData = getDBValidationData($focus->tab_name,$tabid); + $data = split_validationdataArray($validationData); + + $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); + $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); + $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); + +//fix for potential duplicate header +$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); + +$check_button = Button_Check($module); +$smarty->assign("CHECK", $check_button); + $organization = new Organization; $organization->id = $current_organization; -$smarty->assign("ASSIGN_ORGUNIT_LIST", getOrgUnits($organization)); - -if($focus->mode == 'edit') -$smarty->display("salesEditView.tpl"); -else -$smarty->display("CreateView.tpl"); - -?> +$smarty->assign("ASSIGN_ORGUNIT_LIST", getOrgUnits($organization)); + +if($focus->mode == 'edit') +$smarty->display("salesEditView.tpl"); +else +$smarty->display("CreateView.tpl"); + +?> Modified: vtigercrm/branches/5.1_jens/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/ListView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/ListView.php Mon Apr 16 12:27:44 2007 @@ -26,7 +26,7 @@ require_once('include/DatabaseUtil.php'); -global $app_strings,$list_max_entries_per_page; +global $app_strings,$list_max_entries_per_page,$mod_strings; $log = LoggerManager::getLogger('potential_list'); @@ -134,11 +134,12 @@ $list_query = getListQuery("Potentials"); } //<<<<<<<>>>>>>>> - if(isset($where) && $where != '') { if(isset($_REQUEST['from_dashboard']) && $_REQUEST['from_dashboard'] == 'true') - $list_query .= " AND vtiger_potential.sales_stage = 'Closed Won' AND ".$where; + $list_query .= " AND vtiger_potential.sales_stage = '".$mod_strings['Closed Won']."' AND ".$where; + elseif(isset($_REQUEST['from_homepagedb']) && $_REQUEST['from_homepagedb'] == 'true') + $list_query .= " AND vtiger_potential.sales_stage not in( '".$mod_strings['Closed Won']."' , '".$mod_strings['Closed Lost']."' )AND ".$where; else $list_query .= " AND ".$where; } Modified: vtigercrm/branches/5.1_jens/modules/Potentials/ListViewTop.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/ListViewTop.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/ListViewTop.php Mon Apr 16 12:27:44 2007 @@ -42,7 +42,7 @@ $title[]='myTopOpenPotentials.gif'; $title[]=$current_module_strings['LBL_TOP_OPPORTUNITIES']; $title[]='home_mypot'; - $where = "AND vtiger_potential.sales_stage <> 'Closed Won' AND vtiger_potential.sales_stage <> 'Closed Lost' AND vtiger_crmentity.smownerid='".$current_user->id."'"; + $where = "AND vtiger_potential.sales_stage not in ('Closed Won','Closed Lost','".$current_module_strings['Closed Won']."','".$current_module_strings['Closed Lost']."') AND vtiger_crmentity.smownerid='".$current_user->id."'"; $header=array(); $header[]=$current_module_strings['LBL_LIST_OPPORTUNITY_NAME']; $header[]=$current_module_strings['LBL_LIST_ACCOUNT_NAME']; @@ -70,7 +70,7 @@ ); $potentialid=$adb->query_result($list_result,$i,'potentialid'); $value=array(); - $value[]=''.$adb->query_result($list_result,$i,"potentialname").''; + $value[]=''.substr($adb->query_result($list_result,$i,"potentialname"),0,20).'...'.''; $value[]=''.$adb->query_result($list_result,$i,"accountname").''; $value[]=convertFromDollar($adb->query_result($list_result,$i,'amount'),$rate); $value[]=getDisplayDate($adb->query_result($list_result,$i,'closingdate')); Modified: vtigercrm/branches/5.1_jens/modules/Potentials/Opportunity.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/Opportunity.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/Opportunity.php Mon Apr 16 12:27:44 2007 @@ -1,510 +1,510 @@ -'crmid','vtiger_potential'=>'potentialid','vtiger_potentialscf'=>'potentialid'); - - var $column_fields = Array(); - - var $sortby_fields = Array('potentialname','amount','closingdate','smownerid'); - - - // This is the list of vtiger_fields that are in the lists. - var $list_fields = Array( - 'Potential'=>Array('potential'=>'potentialname'), - 'Account Name'=>Array('account'=>'accountname'), - 'Sales Stage'=>Array('potential'=>'sales_stage'), - 'Amount'=>Array('potential'=>'amount'), - 'Expected Close'=>Array('potential'=>'closingdate'), - 'Assigned To'=>Array('crmentity','smownerid') - ); - - var $list_fields_name = Array( - 'Potential'=>'potentialname', - 'Account Name'=>'accountid', - 'Sales Stage'=>'sales_stage', - 'Amount'=>'amount', - 'Expected Close'=>'closingdate', - 'Assigned To'=>'assigned_user_id'); - - var $list_link_field= 'potentialname'; - - var $search_fields = Array( - 'Potential'=>Array('potential'=>'potentialname'), - 'Account Name'=>Array('potential'=>'accountid'), - 'Expected Close'=>Array('potential'=>'closedate') - ); - - var $search_fields_name = Array( - 'Potential'=>'potentialname', - 'Account Name'=>'account_id', - 'Expected Close'=>'closingdate' - ); - - var $required_fields = array( - "potentialname"=>1, - "account_id"=>1, - "closingdate"=>1, - "sales_stage"=>1, - "amount"=>1 - ); - - //Added these variables which are used as default order by and sortorder in ListView - var $default_order_by = 'potentialname'; - var $default_sort_order = 'ASC'; - - function Potential() { - $this->log = LoggerManager::getLogger('potential'); - $this->db = new PearDatabase(); - $this->column_fields = getColumnFields('Potentials'); - } - - var $new_schema = true; - - /** - * Function to get sort order - * return string $sorder - sortorder string either 'ASC' or 'DESC' - */ - function getSortOrder() - { - global $log; - $log->debug("Entering getSortOrder() method ..."); - if(isset($_REQUEST['sorder'])) - $sorder = $_REQUEST['sorder']; - else - $sorder = (($_SESSION['POTENTIALS_SORT_ORDER'] != '')?($_SESSION['POTENTIALS_SORT_ORDER']):($this->default_sort_order)); - $log->debug("Exiting getSortOrder() method ..."); - return $sorder; - } - - /** - * Function to get order by - * return string $order_by - fieldname(eg: 'Potentialname') - */ - function getOrderBy() - { - global $log; - $log->debug("Entering getOrderBy() method ..."); - if (isset($_REQUEST['order_by'])) - $order_by = $_REQUEST['order_by']; - else - $order_by = (($_SESSION['POTENTIALS_ORDER_BY'] != '')?($_SESSION['POTENTIALS_ORDER_BY']):($this->default_order_by)); - $log->debug("Exiting getOrderBy method ..."); - return $order_by; - } - - /** Function to create list query - * @param reference variable - order by is passed when the query is executed - * @param reference variable - where condition is passed when the query is executed - * Returns Query. - */ - function create_list_query($order_by, $where) - { - global $log; - $log->debug("Entering create_list_query(".$order_by.",". $where.") method ..."); - // Determine if the vtiger_account name is present in the where clause. - $account_required = ereg("accounts\.name", $where); - - if($account_required) - { - $query = "SELECT vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.dateclosed FROM vtiger_potential, vtiger_account "; - $where_auto = "account.accountid = vtiger_potential.accountid AND vtiger_crmentity.deleted=0 "; - } - else - { - $query = 'SELECT potentialid, potentialname, smcreatorid, closingdate FROM vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid '; - $where_auto = 'AND vtiger_crmentity.deleted=0'; - } - - if($where != "") - $query .= "where $where ".$where_auto; - else - $query .= "where ".$where_auto; - - if($order_by != "") - $query .= " ORDER BY vtiger_potential.$order_by"; - else - $query .= " ORDER BY vtiger_potential.potentialname"; - - - - $log->debug("Exiting create_list_query method ..."); - return $query; - } - - /** Function to export the Opportunities records in CSV Format - * @param reference variable - order by is passed when the query is executed - * @param reference variable - where condition is passed when the query is executed - * Returns Export Potentials Query. - */ - function create_export_query($order_by, $where) - { - global $log; - global $current_user; - $log->debug("Entering create_export_query(".$order_by.",". $where.") method ..."); - - include("include/utils/ExportUtils.php"); - - //To get the Permitted fields query and the permitted fields list - $sql = getPermittedFieldsQuery("Potentials", "detail_view"); - $fields_list = getFieldsListFromQuery($sql); - - $query = "SELECT $fields_list FROM vtiger_potential - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid - LEFT JOIN vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id - LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid - LEFT JOIN vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid - LEFT JOIN vtiger_potentialgrouprelation - ON vtiger_potentialscf.potentialid = vtiger_potentialgrouprelation.potentialid - LEFT JOIN vtiger_groups - ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname - LEFT JOIN vtiger_campaign - ON vtiger_campaign.campaignid = vtiger_potential.campaignid - - where vtiger_crmentity.deleted=0 "; - - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - //we should add security check when the user has Private Access - if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[2] == 3) - { - //Added security check to get the permitted records only - $query = $query." ".getListViewSecurityParameter("Potentials"); - } - - $log->debug("Exiting create_export_query method ..."); - return $query; - - } - - - - /** Returns a list of the associated contacts - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function get_contacts($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_contacts(".$id.") method ..."); - global $app_strings; - - $focus = new Contact(); - - $button = ''; - - if(isPermitted("Contacts",3,"") == 'yes') - { - - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - $query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_potential inner join vtiger_contpotentialrel on vtiger_contpotentialrel.potentialid = vtiger_potential.potentialid inner join vtiger_contactdetails on vtiger_contpotentialrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted=0'; - - $log->debug("Exiting get_contacts method ..."); - return GetRelatedList('Potentials','Contacts',$focus,$query,$button,$returnset); - } - - /** Returns a list of the associated calls - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function get_activities($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_activities(".$id.") method ..."); - global $mod_strings; - - $focus = new Activity(); - - $button = ''; - - if(isPermitted("Calendar",1,"") == 'yes') - { - - $button .= ' '; - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - $query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name, vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and ((vtiger_activity.status is not NULL AND vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL AND vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' AND vtiger_activity.eventstatus != 'Held'))"; - $log->debug("Exiting get_activities method ..."); - return GetRelatedList('Potentials','Calendar',$focus,$query,$button,$returnset); - - } - - /** - * Function to get Contact related Products - * @param integer $id - contactid - * returns related Products record in array format - */ - function get_products($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Product.php'); - global $app_strings; - - $focus = new Product(); - - $button = ''; - - if(isPermitted("Products",1,"") == 'yes') - { - - - $button .= ' '; - } - if(isPermitted("Products",3,"") == 'yes') - { - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - $query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_products inner join vtiger_seproductsrel on vtiger_products.productid = vtiger_seproductsrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_potential on vtiger_potential.potentialid = vtiger_seproductsrel.crmid where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted = 0'; - $log->debug("Exiting get_products method ..."); - return GetRelatedList('Potentials','Products',$focus,$query,$button,$returnset); - } - - /** Function used to get the Sales Stage history of the Potential - * @param $id - potentialid - * return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are array which contains all the column values of an row - */ - function get_stage_history($id) - { - global $log; - $log->debug("Entering get_stage_history(".$id.") method ..."); - - global $adb; - global $mod_strings; - global $app_strings; - - $query = 'select vtiger_potstagehistory.*, vtiger_potential.potentialname from vtiger_potstagehistory inner join vtiger_potential on vtiger_potential.potentialid = vtiger_potstagehistory.potentialid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid where vtiger_crmentity.deleted = 0 and vtiger_potential.potentialid = '.$id; - $result=$adb->query($query); - $noofrows = $adb->num_rows($result); - - $header[] = $app_strings['LBL_AMOUNT']; - $header[] = $app_strings['LBL_SALES_STAGE']; - $header[] = $app_strings['LBL_PROBABILITY']; - $header[] = $app_strings['LBL_CLOSE_DATE']; - $header[] = $app_strings['LBL_LAST_MODIFIED']; - - while($row = $adb->fetch_array($result)) - { - $entries = Array(); - - $entries[] = $row['amount']; - $entries[] = $row['stage']; - $entries[] = $row['probability']; - $entries[] = getDisplayDate($row['closedate']); - $entries[] = getDisplayDate($row['lastmodified']); - - $entries_list[] = $entries; - } - - $return_data = Array('header'=>$header,'entries'=>$entries_list); - - $log->debug("Exiting get_stage_history method ..."); - - return $return_data; - } - - /** - * Function to get Potential related Task & Event which have activity type Held, Completed or Deferred. - * @param integer $id - * returns related Task or Event record in array format - */ - function get_history($id) - { - global $log; - $log->debug("Entering get_history(".$id.") method ..."); - $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, - vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_crmentity.modifiedtime, - vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name - from vtiger_activity - inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid - left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid - left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname - inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id - where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') - and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != '')) - and vtiger_seactivityrel.crmid=".$id; - //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php - - $log->debug("Exiting get_history method ..."); - return getHistory('Potentials',$query,$id); - } - - /** - * Function to get Potential related Attachments - * @param integer $id - * returns related Attachment record in array format - */ - function get_attachments($id) - { - global $log; - $log->debug("Entering get_attachments(".$id.") method ..."); - // Armando L?scher 18.10.2005 -> ?visibleDescription - // Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name - // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - $query = "select vtiger_notes.title,'Notes ' ActivityType, vtiger_notes.filename, - vtiger_attachments.type FileType, crm2.modifiedtime lastmodified, - vtiger_seattachmentsrel.attachmentsid, vtiger_notes.notesid crmid, - crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name - from vtiger_notes - inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid - inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid - inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0 - left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid - left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid - inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - where vtiger_crmentity.crmid=".$id; - $query .= ' union all '; - // Armando L?scher 18.10.2005 -> ?visibleDescription - // Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name - // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - // Inserted order by createdtime desc - $query .= "select vtiger_attachments.description title ,'Attachments' ActivityType, - vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified, - vtiger_attachments.attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid, - crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name - from vtiger_attachments - inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid - inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid - inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid - inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - where vtiger_crmentity.crmid=".$id." - order by createdtime desc"; - - $log->debug("Exiting get_attachments method ..."); - return getAttachmentsAndNotes('Potentials',$query,$id); - } - - /** - * Function to get Potential related Quotes - * @param integer $id - potentialid - * returns related Quotes record in array format - */ - function get_quotes($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_quotes(".$id.") method ..."); - global $app_strings; - require_once('modules/Quotes/Quote.php'); - - if($this->column_fields['account_id']!='') - $focus = new Quote(); - - $button = ''; - if(isPermitted("Quotes",1,"") == 'yes') - { - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - - $query = "select vtiger_crmentity.*, vtiger_quotes.*, vtiger_potential.potentialname, vtiger_users.user_name from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid=".$id; - $log->debug("Exiting get_quotes method ..."); - return GetRelatedList('Potentials','Quotes',$focus,$query,$button,$returnset); - } - - /** - * Function to get Potential related SalesOrder - * @param integer $id - potentialid - * returns related SalesOrder record in array format - */ - function get_salesorder($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_salesorder(".$id.") method ..."); - require_once('modules/SalesOrder/SalesOrder.php'); - global $mod_strings; - global $app_strings; - - $focus = new SalesOrder(); - - $button = ''; - if(isPermitted("SalesOrder",1,"") == 'yes') - { - $button .= ' '; - } - - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - - $query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_potential.potentialname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_salesorder.potentialid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid = ".$id; - $log->debug("Exiting get_salesorder method ..."); - return GetRelatedList('Potentials','SalesOrder',$focus,$query,$button,$returnset); - - } - - - - -} - - - -?> +'crmid','vtiger_potential'=>'potentialid','vtiger_potentialscf'=>'potentialid'); + + var $column_fields = Array(); + + var $sortby_fields = Array('potentialname','amount','closingdate','smownerid'); + + + // This is the list of vtiger_fields that are in the lists. + var $list_fields = Array( + 'Potential'=>Array('potential'=>'potentialname'), + 'Account Name'=>Array('account'=>'accountname'), + 'Sales Stage'=>Array('potential'=>'sales_stage'), + 'Amount'=>Array('potential'=>'amount'), + 'Expected Close'=>Array('potential'=>'closingdate'), + 'Assigned To'=>Array('crmentity','smownerid') + ); + + var $list_fields_name = Array( + 'Potential'=>'potentialname', + 'Account Name'=>'accountid', + 'Sales Stage'=>'sales_stage', + 'Amount'=>'amount', + 'Expected Close'=>'closingdate', + 'Assigned To'=>'assigned_user_id'); + + var $list_link_field= 'potentialname'; + + var $search_fields = Array( + 'Potential'=>Array('potential'=>'potentialname'), + 'Account Name'=>Array('potential'=>'accountid'), + 'Expected Close'=>Array('potential'=>'closedate') + ); + + var $search_fields_name = Array( + 'Potential'=>'potentialname', + 'Account Name'=>'account_id', + 'Expected Close'=>'closingdate' + ); + + var $required_fields = array( + "potentialname"=>1, + "account_id"=>1, + "closingdate"=>1, + "sales_stage"=>1, + "amount"=>1 + ); + + //Added these variables which are used as default order by and sortorder in ListView + var $default_order_by = 'potentialname'; + var $default_sort_order = 'ASC'; + + function Potential() { + $this->log = LoggerManager::getLogger('potential'); + $this->db = new PearDatabase(); + $this->column_fields = getColumnFields('Potentials'); + } + + var $new_schema = true; + + /** + * Function to get sort order + * return string $sorder - sortorder string either 'ASC' or 'DESC' + */ + function getSortOrder() + { + global $log; + $log->debug("Entering getSortOrder() method ..."); + if(isset($_REQUEST['sorder'])) + $sorder = $_REQUEST['sorder']; + else + $sorder = (($_SESSION['POTENTIALS_SORT_ORDER'] != '')?($_SESSION['POTENTIALS_SORT_ORDER']):($this->default_sort_order)); + $log->debug("Exiting getSortOrder() method ..."); + return $sorder; + } + + /** + * Function to get order by + * return string $order_by - fieldname(eg: 'Potentialname') + */ + function getOrderBy() + { + global $log; + $log->debug("Entering getOrderBy() method ..."); + if (isset($_REQUEST['order_by'])) + $order_by = $_REQUEST['order_by']; + else + $order_by = (($_SESSION['POTENTIALS_ORDER_BY'] != '')?($_SESSION['POTENTIALS_ORDER_BY']):($this->default_order_by)); + $log->debug("Exiting getOrderBy method ..."); + return $order_by; + } + + /** Function to create list query + * @param reference variable - order by is passed when the query is executed + * @param reference variable - where condition is passed when the query is executed + * Returns Query. + */ + function create_list_query($order_by, $where) + { + global $log; + $log->debug("Entering create_list_query(".$order_by.",". $where.") method ..."); + // Determine if the vtiger_account name is present in the where clause. + $account_required = ereg("accounts\.name", $where); + + if($account_required) + { + $query = "SELECT vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.dateclosed FROM vtiger_potential, vtiger_account "; + $where_auto = "account.accountid = vtiger_potential.accountid AND vtiger_crmentity.deleted=0 "; + } + else + { + $query = 'SELECT potentialid, potentialname, smcreatorid, closingdate FROM vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid '; + $where_auto = 'AND vtiger_crmentity.deleted=0'; + } + + if($where != "") + $query .= "where $where ".$where_auto; + else + $query .= "where ".$where_auto; + + if($order_by != "") + $query .= " ORDER BY vtiger_potential.$order_by"; + else + $query .= " ORDER BY vtiger_potential.potentialname"; + + + + $log->debug("Exiting create_list_query method ..."); + return $query; + } + + /** Function to export the Opportunities records in CSV Format + * @param reference variable - order by is passed when the query is executed + * @param reference variable - where condition is passed when the query is executed + * Returns Export Potentials Query. + */ + function create_export_query($order_by, $where) + { + global $log; + global $current_user; + $log->debug("Entering create_export_query(".$order_by.",". $where.") method ..."); + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Potentials", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list FROM vtiger_potential + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid + LEFT JOIN vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id + LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid + LEFT JOIN vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid + LEFT JOIN vtiger_potentialgrouprelation + ON vtiger_potentialscf.potentialid = vtiger_potentialgrouprelation.potentialid + LEFT JOIN vtiger_groups + ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname + LEFT JOIN vtiger_campaign + ON vtiger_campaign.campaignid = vtiger_potential.campaignid + + where vtiger_crmentity.deleted=0 "; + + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + //we should add security check when the user has Private Access + if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[2] == 3) + { + //Added security check to get the permitted records only + $query = $query." ".getListViewSecurityParameter("Potentials"); + } + + $log->debug("Exiting create_export_query method ..."); + return $query; + + } + + + + /** Returns a list of the associated contacts + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function get_contacts($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_contacts(".$id.") method ..."); + global $app_strings; + + $focus = new Contact(); + + $button = ''; + + if(isPermitted("Contacts",3,"") == 'yes') + { + + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + $query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_potential inner join vtiger_contpotentialrel on vtiger_contpotentialrel.potentialid = vtiger_potential.potentialid inner join vtiger_contactdetails on vtiger_contpotentialrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted=0'; + + $log->debug("Exiting get_contacts method ..."); + return GetRelatedList('Potentials','Contacts',$focus,$query,$button,$returnset); + } + + /** Returns a list of the associated calls + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function get_activities($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_activities(".$id.") method ..."); + global $mod_strings; + + $focus = new Activity(); + + $button = ''; + + if(isPermitted("Calendar",1,"") == 'yes') + { + + $button .= ' '; + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name, vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and ((vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' && vtiger_activity.eventstatus != 'Held'))"; + $log->debug("Exiting get_activities method ..."); + return GetRelatedList('Potentials','Calendar',$focus,$query,$button,$returnset); + + } + + /** + * Function to get Contact related Products + * @param integer $id - contactid + * returns related Products record in array format + */ + function get_products($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_products(".$id.") method ..."); + require_once('modules/Products/Product.php'); + global $app_strings; + + $focus = new Product(); + + $button = ''; + + if(isPermitted("Products",1,"") == 'yes') + { + + + $button .= ' '; + } + if(isPermitted("Products",3,"") == 'yes') + { + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + $query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_products inner join vtiger_seproductsrel on vtiger_products.productid = vtiger_seproductsrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_potential on vtiger_potential.potentialid = vtiger_seproductsrel.crmid where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted = 0'; + $log->debug("Exiting get_products method ..."); + return GetRelatedList('Potentials','Products',$focus,$query,$button,$returnset); + } + + /** Function used to get the Sales Stage history of the Potential + * @param $id - potentialid + * return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are array which contains all the column values of an row + */ + function get_stage_history($id) + { + global $log; + $log->debug("Entering get_stage_history(".$id.") method ..."); + + global $adb; + global $mod_strings; + global $app_strings; + + $query = 'select vtiger_potstagehistory.*, vtiger_potential.potentialname from vtiger_potstagehistory inner join vtiger_potential on vtiger_potential.potentialid = vtiger_potstagehistory.potentialid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid where vtiger_crmentity.deleted = 0 and vtiger_potential.potentialid = '.$id; + $result=$adb->query($query); + $noofrows = $adb->num_rows($result); + + $header[] = $app_strings['LBL_AMOUNT']; + $header[] = $app_strings['LBL_SALES_STAGE']; + $header[] = $app_strings['LBL_PROBABILITY']; + $header[] = $app_strings['LBL_CLOSE_DATE']; + $header[] = $app_strings['LBL_LAST_MODIFIED']; + + while($row = $adb->fetch_array($result)) + { + $entries = Array(); + + $entries[] = $row['amount']; + $entries[] = $row['stage']; + $entries[] = $row['probability']; + $entries[] = getDisplayDate($row['closedate']); + $entries[] = getDisplayDate($row['lastmodified']); + + $entries_list[] = $entries; + } + + $return_data = Array('header'=>$header,'entries'=>$entries_list); + + $log->debug("Exiting get_stage_history method ..."); + + return $return_data; + } + + /** + * Function to get Potential related Task & Event which have activity type Held, Completed or Deferred. + * @param integer $id + * returns related Task or Event record in array format + */ + function get_history($id) + { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); + $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, + vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_crmentity.modifiedtime, + vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name + from vtiger_activity + inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid + left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid + left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname + inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id + where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') + and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != '')) + and vtiger_seactivityrel.crmid=".$id; + //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + + $log->debug("Exiting get_history method ..."); + return getHistory('Potentials',$query,$id); + } + + /** + * Function to get Potential related Attachments + * @param integer $id + * returns related Attachment record in array format + */ + function get_attachments($id) + { + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); + // Armando L?scher 18.10.2005 -> ?visibleDescription + // Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name + // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + $query = "select vtiger_notes.title,'Notes ' ActivityType, vtiger_notes.filename, + vtiger_attachments.type FileType, crm2.modifiedtime lastmodified, + vtiger_seattachmentsrel.attachmentsid, vtiger_notes.notesid crmid, + crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name + from vtiger_notes + inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0 + left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid + left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id; + $query .= ' union all '; + // Armando L?scher 18.10.2005 -> ?visibleDescription + // Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name + // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + // Inserted order by createdtime desc + $query .= "select vtiger_attachments.description title ,'Attachments' ActivityType, + vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified, + vtiger_attachments.attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid, + crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name + from vtiger_attachments + inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id." + order by createdtime desc"; + + $log->debug("Exiting get_attachments method ..."); + return getAttachmentsAndNotes('Potentials',$query,$id); + } + + /** + * Function to get Potential related Quotes + * @param integer $id - potentialid + * returns related Quotes record in array format + */ + function get_quotes($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_quotes(".$id.") method ..."); + global $app_strings; + require_once('modules/Quotes/Quote.php'); + + if($this->column_fields['account_id']!='') + $focus = new Quote(); + + $button = ''; + if(isPermitted("Quotes",1,"") == 'yes') + { + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + + $query = "select vtiger_crmentity.*, vtiger_quotes.*, vtiger_potential.potentialname, vtiger_users.user_name from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid=".$id; + $log->debug("Exiting get_quotes method ..."); + return GetRelatedList('Potentials','Quotes',$focus,$query,$button,$returnset); + } + + /** + * Function to get Potential related SalesOrder + * @param integer $id - potentialid + * returns related SalesOrder record in array format + */ + function get_salesorder($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_salesorder(".$id.") method ..."); + require_once('modules/SalesOrder/SalesOrder.php'); + global $mod_strings; + global $app_strings; + + $focus = new SalesOrder(); + + $button = ''; + if(isPermitted("SalesOrder",1,"") == 'yes') + { + $button .= ' '; + } + + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + + $query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_potential.potentialname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_salesorder.potentialid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid = ".$id; + $log->debug("Exiting get_salesorder method ..."); + return GetRelatedList('Potentials','SalesOrder',$focus,$query,$button,$returnset); + + } + + + + +} + + + +?> Modified: vtigercrm/branches/5.1_jens/modules/Potentials/Potentials.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/Potentials.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/Potentials.php Mon Apr 16 12:27:44 2007 @@ -1,506 +1,538 @@ -'crmid','vtiger_potential'=>'potentialid','vtiger_potentialscf'=>'potentialid'); - - var $column_fields = Array(); - - var $sortby_fields = Array('potentialname','amount','closingdate','smownerid'); - - - // This is the list of vtiger_fields that are in the lists. - var $list_fields = Array( - 'Potential'=>Array('potential'=>'potentialname'), - 'Account Name'=>Array('account'=>'accountname'), - 'Sales Stage'=>Array('potential'=>'sales_stage'), - 'Amount'=>Array('potential'=>'amount'), - 'Expected Close'=>Array('potential'=>'closingdate'), - 'Assigned To'=>Array('crmentity','smownerid') - ); - - var $list_fields_name = Array( - 'Potential'=>'potentialname', - 'Account Name'=>'accountid', - 'Sales Stage'=>'sales_stage', - 'Amount'=>'amount', - 'Expected Close'=>'closingdate', - 'Assigned To'=>'assigned_user_id'); - - var $list_link_field= 'potentialname'; - - var $search_fields = Array( - 'Potential'=>Array('potential'=>'potentialname'), - 'Account Name'=>Array('potential'=>'accountid'), - 'Expected Close'=>Array('potential'=>'closedate') - ); - - var $search_fields_name = Array( - 'Potential'=>'potentialname', - 'Account Name'=>'account_id', - 'Expected Close'=>'closingdate' - ); - - var $required_fields = array( - "potentialname"=>1, - "account_id"=>1, - "closingdate"=>1, - "sales_stage"=>1, - "amount"=>1 - ); - - //Added these variables which are used as default order by and sortorder in ListView - var $default_order_by = 'potentialname'; - var $default_sort_order = 'ASC'; - - function Potentials() { - $this->log = LoggerManager::getLogger('potential'); - $this->db = new PearDatabase(); - $this->column_fields = getColumnFields('Potentials'); - } - - function save_module($module) - { - } - - /** - * Function to get sort order - * return string $sorder - sortorder string either 'ASC' or 'DESC' - */ - function getSortOrder() - { - global $log; - $log->debug("Entering getSortOrder() method ..."); - if(isset($_REQUEST['sorder'])) - $sorder = $_REQUEST['sorder']; - else - $sorder = (($_SESSION['POTENTIALS_SORT_ORDER'] != '')?($_SESSION['POTENTIALS_SORT_ORDER']):($this->default_sort_order)); - $log->debug("Exiting getSortOrder() method ..."); - return $sorder; - } - - /** - * Function to get order by - * return string $order_by - fieldname(eg: 'Potentialname') - */ - function getOrderBy() - { - global $log; - $log->debug("Entering getOrderBy() method ..."); - if (isset($_REQUEST['order_by'])) - $order_by = $_REQUEST['order_by']; - else - $order_by = (($_SESSION['POTENTIALS_ORDER_BY'] != '')?($_SESSION['POTENTIALS_ORDER_BY']):($this->default_order_by)); - $log->debug("Exiting getOrderBy method ..."); - return $order_by; - } - - /** Function to create list query - * @param reference variable - order by is passed when the query is executed - * @param reference variable - where condition is passed when the query is executed - * Returns Query. - */ - function create_list_query($order_by, $where) - { - global $log; - $log->debug("Entering create_list_query(".$order_by.",". $where.") method ..."); - // Determine if the vtiger_account name is present in the where clause. - $account_required = ereg("accounts\.name", $where); - - if($account_required) - { - $query = "SELECT vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.dateclosed FROM vtiger_potential, vtiger_account "; - $where_auto = "account.accountid = vtiger_potential.accountid AND vtiger_crmentity.deleted=0 "; - } - else - { - $query = 'SELECT potentialid, potentialname, smcreatorid, closingdate FROM vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid '; - $where_auto = 'AND vtiger_crmentity.deleted=0'; - } - - if($where != "") - $query .= "where $where ".$where_auto; - else - $query .= "where ".$where_auto; - - if($order_by != "") - $query .= " ORDER BY vtiger_potential.$order_by"; - else - $query .= " ORDER BY vtiger_potential.potentialname"; - - - - $log->debug("Exiting create_list_query method ..."); - return $query; - } - - /** Function to export the Opportunities records in CSV Format - * @param reference variable - order by is passed when the query is executed - * @param reference variable - where condition is passed when the query is executed - * Returns Export Potentials Query. - */ - function create_export_query($order_by, $where) - { - global $log; - global $current_user; - $log->debug("Entering create_export_query(".$order_by.",". $where.") method ..."); - - include("include/utils/ExportUtils.php"); - - //To get the Permitted fields query and the permitted fields list - $sql = getPermittedFieldsQuery("Potentials", "detail_view"); - $fields_list = getFieldsListFromQuery($sql); - - $query = "SELECT $fields_list FROM vtiger_potential - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid - LEFT JOIN vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id - LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid - LEFT JOIN vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid - LEFT JOIN vtiger_potentialgrouprelation - ON vtiger_potentialscf.potentialid = vtiger_potentialgrouprelation.potentialid - LEFT JOIN vtiger_groups - ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname - LEFT JOIN vtiger_campaign - ON vtiger_campaign.campaignid = vtiger_potential.campaignid - - where vtiger_crmentity.deleted=0 "; - - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - //we should add security check when the user has Private Access - if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[2] == 3) - { - //Added security check to get the permitted records only - $query = $query." ".getListViewSecurityParameter("Potentials"); - } - - $log->debug("Exiting create_export_query method ..."); - return $query; - - } - - - - /** Returns a list of the associated contacts - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function get_contacts($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_contacts(".$id.") method ..."); - global $app_strings; - - $focus = new Contacts(); - - $button = ''; - - if(isPermitted("Contacts",3,"") == 'yes') - { - - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - $query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_potential inner join vtiger_contpotentialrel on vtiger_contpotentialrel.potentialid = vtiger_potential.potentialid inner join vtiger_contactdetails on vtiger_contpotentialrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted=0'; - - $log->debug("Exiting get_contacts method ..."); - return GetRelatedList('Potentials','Contacts',$focus,$query,$button,$returnset); - } - - /** Returns a list of the associated calls - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function get_activities($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_activities(".$id.") method ..."); - global $mod_strings; - - $focus = new Activity(); - - $button = ''; - - if(isPermitted("Calendar",1,"") == 'yes') - { - - $button .= ' '; - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - $query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name, vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and ((vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' && vtiger_activity.eventstatus != 'Held'))"; - $log->debug("Exiting get_activities method ..."); - return GetRelatedList('Potentials','Calendar',$focus,$query,$button,$returnset); - - } - - /** - * Function to get Contact related Products - * @param integer $id - contactid - * returns related Products record in array format - */ - function get_products($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Products.php'); - global $app_strings; - - $focus = new Products(); - - $button = ''; - - if(isPermitted("Products",1,"") == 'yes') - { - - - $button .= ' '; - } - if(isPermitted("Products",3,"") == 'yes') - { - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - $query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_products inner join vtiger_seproductsrel on vtiger_products.productid = vtiger_seproductsrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_potential on vtiger_potential.potentialid = vtiger_seproductsrel.crmid where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted = 0'; - $log->debug("Exiting get_products method ..."); - return GetRelatedList('Potentials','Products',$focus,$query,$button,$returnset); - } - - /** Function used to get the Sales Stage history of the Potential - * @param $id - potentialid - * return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are array which contains all the column values of an row - */ - function get_stage_history($id) - { - global $log; - $log->debug("Entering get_stage_history(".$id.") method ..."); - - global $adb; - global $mod_strings; - global $app_strings; - - $query = 'select vtiger_potstagehistory.*, vtiger_potential.potentialname from vtiger_potstagehistory inner join vtiger_potential on vtiger_potential.potentialid = vtiger_potstagehistory.potentialid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid where vtiger_crmentity.deleted = 0 and vtiger_potential.potentialid = '.$id; - $result=$adb->query($query); - $noofrows = $adb->num_rows($result); - - $header[] = $app_strings['LBL_AMOUNT']; - $header[] = $app_strings['LBL_SALES_STAGE']; - $header[] = $app_strings['LBL_PROBABILITY']; - $header[] = $app_strings['LBL_CLOSE_DATE']; - $header[] = $app_strings['LBL_LAST_MODIFIED']; - - while($row = $adb->fetch_array($result)) - { - $entries = Array(); - - $entries[] = $row['amount']; - $entries[] = $row['stage']; - $entries[] = $row['probability']; - $entries[] = getDisplayDate($row['closedate']); - $entries[] = getDisplayDate($row['lastmodified']); - - $entries_list[] = $entries; - } - - $return_data = Array('header'=>$header,'entries'=>$entries_list); - - $log->debug("Exiting get_stage_history method ..."); - - return $return_data; - } - - /** - * Function to get Potential related Task & Event which have activity type Held, Completed or Deferred. - * @param integer $id - * returns related Task or Event record in array format - */ - function get_history($id) - { - global $log; - $log->debug("Entering get_history(".$id.") method ..."); - $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, - vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_crmentity.modifiedtime, - vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name - from vtiger_activity - inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid - left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid - left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname - inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id - where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') - and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != '')) - and vtiger_seactivityrel.crmid=".$id; - //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php - - $log->debug("Exiting get_history method ..."); - return getHistory('Potentials',$query,$id); - } - - /** - * Function to get Potential related Attachments - * @param integer $id - * returns related Attachment record in array format - */ - function get_attachments($id) - { - global $log; - $log->debug("Entering get_attachments(".$id.") method ..."); - // Armando L?scher 18.10.2005 -> ?visibleDescription - // Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name - // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - $query = "select vtiger_notes.title,'Notes ' ActivityType, vtiger_notes.filename, - vtiger_attachments.type FileType, crm2.modifiedtime lastmodified, - vtiger_seattachmentsrel.attachmentsid, vtiger_notes.notesid crmid, - crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name - from vtiger_notes - inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid - inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid - inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0 - left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid - left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid - inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - where vtiger_crmentity.crmid=".$id; - $query .= ' union all '; - // Armando L?scher 18.10.2005 -> ?visibleDescription - // Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name - // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - // Inserted order by createdtime desc - $query .= "select vtiger_attachments.description title ,'Attachments' ActivityType, - vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified, - vtiger_attachments.attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid, - crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name - from vtiger_attachments - inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid - inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid - inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid - inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - where vtiger_crmentity.crmid=".$id." - order by createdtime desc"; - - $log->debug("Exiting get_attachments method ..."); - return getAttachmentsAndNotes('Potentials',$query,$id); - } - - /** - * Function to get Potential related Quotes - * @param integer $id - potentialid - * returns related Quotes record in array format - */ - function get_quotes($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_quotes(".$id.") method ..."); - global $app_strings; - require_once('modules/Quotes/Quotes.php'); - - if($this->column_fields['account_id']!='') - $focus = new Quotes(); - - $button = ''; - if(isPermitted("Quotes",1,"") == 'yes') - { - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - - $query = "select vtiger_crmentity.*, vtiger_quotes.*, vtiger_potential.potentialname, vtiger_users.user_name from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid=".$id; - $log->debug("Exiting get_quotes method ..."); - return GetRelatedList('Potentials','Quotes',$focus,$query,$button,$returnset); - } - - /** - * Function to get Potential related SalesOrder - * @param integer $id - potentialid - * returns related SalesOrder record in array format - */ - function get_salesorder($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_salesorder(".$id.") method ..."); - require_once('modules/SalesOrder/SalesOrder.php'); - global $mod_strings; - global $app_strings; - - $focus = new SalesOrder(); - - $button = ''; - if(isPermitted("SalesOrder",1,"") == 'yes') - { - $button .= ' '; - } - - if($singlepane_view == 'true') - $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; - - - $query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_potential.potentialname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_salesorder.potentialid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid = ".$id; - $log->debug("Exiting get_salesorder method ..."); - return GetRelatedList('Potentials','SalesOrder',$focus,$query,$button,$returnset); - - } - - - - -} - - - -?> +'crmid','vtiger_potential'=>'potentialid','vtiger_potentialscf'=>'potentialid'); + + var $column_fields = Array(); + + var $sortby_fields = Array('potentialname','amount','closingdate','smownerid'); + + + // This is the list of vtiger_fields that are in the lists. + var $list_fields = Array( + 'Potential'=>Array('potential'=>'potentialname'), + 'Account Name'=>Array('account'=>'accountname'), + 'Sales Stage'=>Array('potential'=>'sales_stage'), + 'Amount'=>Array('potential'=>'amount'), + 'Expected Close Date'=>Array('potential'=>'closingdate'), + 'Assigned To'=>Array('crmentity','smownerid') + ); + + var $list_fields_name = Array( + 'Potential'=>'potentialname', + 'Account Name'=>'accountid', + 'Sales Stage'=>'sales_stage', + 'Amount'=>'amount', + 'Expected Close Date'=>'closingdate', + 'Assigned To'=>'assigned_user_id'); + + var $list_link_field= 'potentialname'; + + var $search_fields = Array( + 'Potential'=>Array('potential'=>'potentialname'), + 'Account Name'=>Array('potential'=>'accountid'), + 'Expected Close Date'=>Array('potential'=>'closedate') + ); + + var $search_fields_name = Array( + 'Potential'=>'potentialname', + 'Account Name'=>'account_id', + 'Expected Close Date'=>'closingdate' + ); + + var $required_fields = array( + "potentialname"=>1, + "account_id"=>1, + "closingdate"=>1, + "sales_stage"=>1, + "amount"=>1 + ); + + //Added these variables which are used as default order by and sortorder in ListView + var $default_order_by = 'potentialname'; + var $default_sort_order = 'ASC'; + + var $groupTable = Array('vtiger_potentialgrouprelation','potentialid'); + function Potentials() { + $this->log = LoggerManager::getLogger('potential'); + $this->db = new PearDatabase(); + $this->column_fields = getColumnFields('Potentials'); + } + + function save_module($module) + { + } + + /** + * Function to get sort order + * return string $sorder - sortorder string either 'ASC' or 'DESC' + */ + function getSortOrder() + { + global $log; + $log->debug("Entering getSortOrder() method ..."); + if(isset($_REQUEST['sorder'])) + $sorder = $_REQUEST['sorder']; + else + $sorder = (($_SESSION['POTENTIALS_SORT_ORDER'] != '')?($_SESSION['POTENTIALS_SORT_ORDER']):($this->default_sort_order)); + $log->debug("Exiting getSortOrder() method ..."); + return $sorder; + } + + /** + * Function to get order by + * return string $order_by - fieldname(eg: 'Potentialname') + */ + function getOrderBy() + { + global $log; + $log->debug("Entering getOrderBy() method ..."); + if (isset($_REQUEST['order_by'])) + $order_by = $_REQUEST['order_by']; + else + $order_by = (($_SESSION['POTENTIALS_ORDER_BY'] != '')?($_SESSION['POTENTIALS_ORDER_BY']):($this->default_order_by)); + $log->debug("Exiting getOrderBy method ..."); + return $order_by; + } + + /** Function to create list query + * @param reference variable - order by is passed when the query is executed + * @param reference variable - where condition is passed when the query is executed + * Returns Query. + */ + function create_list_query($order_by, $where) + { + global $log,$current_user; + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + $tab_id = getTabid("Potentials"); + $log->debug("Entering create_list_query(".$order_by.",". $where.") method ..."); + // Determine if the vtiger_account name is present in the where clause. + $account_required = ereg("accounts\.name", $where); + + if($account_required) + { + $query = "SELECT vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.dateclosed FROM vtiger_potential, vtiger_account "; + $where_auto = "account.accountid = vtiger_potential.accountid AND vtiger_crmentity.deleted=0 "; + } + else + { + $query = 'SELECT vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_crmentity.smcreatorid, vtiger_potential.closingdate FROM vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid LEFT JOIN vtiger_potentialgrouprelation on vtiger_potential.potentialid = vtiger_potentialgrouprelation.potentialid LEFT JOIN vtiger_groups on vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid '; + $where_auto = 'AND vtiger_crmentity.deleted=0 '; + } + + if($where != "") + $query .= "where $where ".$where_auto; + else + $query .= "where ".$where_auto; + if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) + { + $sec_parameter=getListViewSecurityParameter("Potentials"); + $query .= $sec_parameter; + + } + + if($order_by != "") + $query .= " ORDER BY $order_by"; + else + $query .= " ORDER BY vtiger_potential.potentialname "; + + + + $log->debug("Exiting create_list_query method ..."); + return $query; + } + + /** Function to export the Opportunities records in CSV Format + * @param reference variable - order by is passed when the query is executed + * @param reference variable - where condition is passed when the query is executed + * Returns Export Potentials Query. + */ + function create_export_query($order_by, $where) + { + global $log; + global $current_user; + $log->debug("Entering create_export_query(".$order_by.",". $where.") method ..."); + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Potentials", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list, vtiger_potentialgrouprelation.groupname as 'Assigned To Group' + FROM vtiger_potential + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid + LEFT JOIN vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id + LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid + LEFT JOIN vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid + LEFT JOIN vtiger_potentialgrouprelation + ON vtiger_potentialscf.potentialid = vtiger_potentialgrouprelation.potentialid + LEFT JOIN vtiger_groups + ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname + LEFT JOIN vtiger_campaign + ON vtiger_campaign.campaignid = vtiger_potential.campaignid + + where vtiger_crmentity.deleted=0 "; + + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + //we should add security check when the user has Private Access + if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[2] == 3) + { + //Added security check to get the permitted records only + $query = $query." ".getListViewSecurityParameter("Potentials"); + } + + $log->debug("Exiting create_export_query method ..."); + return $query; + + } + + + + /** Returns a list of the associated contacts + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function get_contacts($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_contacts(".$id.") method ..."); + global $app_strings; + + $focus = new Contacts(); + + $button = ''; + + if(isPermitted("Contacts",3,"") == 'yes') + { + + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + $query = 'select case when (vtiger_users.user_name not like \'\') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_contactdetails.accountid,vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_potential inner join vtiger_contpotentialrel on vtiger_contpotentialrel.potentialid = vtiger_potential.potentialid inner join vtiger_contactdetails on vtiger_contpotentialrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted=0'; + + $log->debug("Exiting get_contacts method ..."); + return GetRelatedList('Potentials','Contacts',$focus,$query,$button,$returnset); + } + + /** Returns a list of the associated calls + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function get_activities($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_activities(".$id.") method ..."); + global $mod_strings; + + $focus = new Activity(); + + $button = ''; + + if(isPermitted("Calendar",1,"") == 'yes') + { + + $button .= ' '; + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid where vtiger_seactivityrel.crmid=".$id." and vtiger_crmentity.deleted=0 and ((vtiger_activity.activitytype='Task' and vtiger_activity.status not in ('Completed','Deferred')) or (vtiger_activity.activitytype in ('Meeting','Call') and vtiger_activity.eventstatus not in ('','Held')))"; + $log->debug("Exiting get_activities method ..."); + return GetRelatedList('Potentials','Calendar',$focus,$query,$button,$returnset); + + } + + /** + * Function to get Contact related Products + * @param integer $id - contactid + * returns related Products record in array format + */ + function get_products($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_products(".$id.") method ..."); + require_once('modules/Products/Products.php'); + global $app_strings; + + $focus = new Products(); + + $button = ''; + + if(isPermitted("Products",1,"") == 'yes') + { + + + $button .= ' '; + } + if(isPermitted("Products",3,"") == 'yes') + { + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, + vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, + vtiger_crmentity.crmid, vtiger_crmentity.smownerid + FROM vtiger_products + INNER JOIN vtiger_seproductsrel ON vtiger_products.productid = vtiger_seproductsrel.productid and vtiger_seproductsrel.setype = 'Potentials' + INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_products.productid + INNER JOIN vtiger_potential ON vtiger_potential.potentialid = vtiger_seproductsrel.crmid + WHERE vtiger_crmentity.deleted = 0 AND vtiger_potential.potentialid = $id"; + + $log->debug("Exiting get_products method ..."); + return GetRelatedList('Potentials','Products',$focus,$query,$button,$returnset); + } + + /** Function used to get the Sales Stage history of the Potential + * @param $id - potentialid + * return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are array which contains all the column values of an row + */ + function get_stage_history($id) + { + global $log; + $log->debug("Entering get_stage_history(".$id.") method ..."); + + global $adb; + global $mod_strings; + global $app_strings; + + $query = 'select vtiger_potstagehistory.*, vtiger_potential.potentialname from vtiger_potstagehistory inner join vtiger_potential on vtiger_potential.potentialid = vtiger_potstagehistory.potentialid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid where vtiger_crmentity.deleted = 0 and vtiger_potential.potentialid = '.$id; + $result=$adb->query($query); + $noofrows = $adb->num_rows($result); + + $header[] = $app_strings['LBL_AMOUNT']; + $header[] = $app_strings['LBL_SALES_STAGE']; + $header[] = $app_strings['LBL_PROBABILITY']; + $header[] = $app_strings['LBL_CLOSE_DATE']; + $header[] = $app_strings['LBL_LAST_MODIFIED']; + + while($row = $adb->fetch_array($result)) + { + $entries = Array(); + + $entries[] = $row['amount']; + $entries[] = $row['stage']; + $entries[] = $row['probability']; + $entries[] = getDisplayDate($row['closedate']); + $entries[] = getDisplayDate($row['lastmodified']); + + $entries_list[] = $entries; + } + + $return_data = Array('header'=>$header,'entries'=>$entries_list); + + $log->debug("Exiting get_stage_history method ..."); + + return $return_data; + } + + /** + * Function to get Potential related Task & Event which have activity type Held, Completed or Deferred. + * @param integer $id + * returns related Task or Event record in array format + */ + function get_history($id) + { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); + $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, + vtiger_activity.eventstatus, vtiger_activity.activitytype,vtiger_activity.date_start, + vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.time_end, + vtiger_crmentity.modifiedtime, vtiger_crmentity.createdtime, + vtiger_crmentity.description,case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name + from vtiger_activity + inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid + left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid + left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname + left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid + where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') + and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != '')) + and vtiger_seactivityrel.crmid=".$id; + //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + + $log->debug("Exiting get_history method ..."); + return getHistory('Potentials',$query,$id); + } + + /** + * Function to get Potential related Attachments + * @param integer $id + * returns related Attachment record in array format + */ + function get_attachments($id) + { + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); + // Armando L?scher 18.10.2005 -> ?visibleDescription + // Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name + // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + $query = "select vtiger_notes.title,'Notes ' ActivityType, vtiger_notes.filename, + vtiger_attachments.type FileType, crm2.modifiedtime lastmodified, + vtiger_seattachmentsrel.attachmentsid, vtiger_notes.notesid crmid, + crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name + from vtiger_notes + inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0 + left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid + left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id; + $query .= ' union all '; + // Armando L?scher 18.10.2005 -> ?visibleDescription + // Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name + // Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + // Inserted order by createdtime desc + $query .= "select vtiger_attachments.description title ,'Attachments' ActivityType, + vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified, + vtiger_attachments.attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid, + crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name + from vtiger_attachments + inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id." + order by createdtime desc"; + + $log->debug("Exiting get_attachments method ..."); + return getAttachmentsAndNotes('Potentials',$query,$id); + } + + /** + * Function to get Potential related Quotes + * @param integer $id - potentialid + * returns related Quotes record in array format + */ + function get_quotes($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_quotes(".$id.") method ..."); + global $app_strings; + require_once('modules/Quotes/Quotes.php'); + + if($this->column_fields['account_id']!='') + $focus = new Quotes(); + + $button = ''; + if(isPermitted("Quotes",1,"") == 'yes') + { + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + + $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_crmentity.*, vtiger_quotes.*, vtiger_potential.potentialname from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid=".$id; + $log->debug("Exiting get_quotes method ..."); + return GetRelatedList('Potentials','Quotes',$focus,$query,$button,$returnset); + } + + /** + * Function to get Potential related SalesOrder + * @param integer $id - potentialid + * returns related SalesOrder record in array format + */ + function get_salesorder($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_salesorder(".$id.") method ..."); + require_once('modules/SalesOrder/SalesOrder.php'); + global $mod_strings; + global $app_strings; + + $focus = new SalesOrder(); + + $button = ''; + if(isPermitted("SalesOrder",1,"") == 'yes') + { + $button .= ' '; + } + + if($singlepane_view == 'true') + $returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id; + + + $query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_potential.potentialname,case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name + from vtiger_salesorder + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid + left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid + left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid + left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_salesorder.potentialid + left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid + left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname + left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid + where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid = ".$id; + $log->debug("Exiting get_salesorder method ..."); + return GetRelatedList('Potentials','SalesOrder',$focus,$query,$button,$returnset); + + } + + + + +} + + + +?> Modified: vtigercrm/branches/5.1_jens/modules/Potentials/Save.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/Save.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/Save.php Mon Apr 16 12:27:44 2007 @@ -1,65 +1,65 @@ -id); -$rate_symbol = getCurrencySymbolandCRate($currencyid); -$rate = $rate_symbol['rate']; -$curr_symbol= $rate_symbol['symbol']; - -setObjectValuesFromRequest(&$focus); - -if(isset($_REQUEST['amount'])) -{ - $value = convertToDollar($_REQUEST['amount'],$rate); - $focus->column_fields['amount'] = $value; -} - -$focus->save("Potentials"); -$return_id = $focus->id; - -if(isset($_REQUEST['parenttab']) && $_REQUEST['parenttab'] != "") $parenttab = $_REQUEST['parenttab']; -if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; -else $return_module = "Potentials"; -if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; -else $return_action = "DetailView"; -if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id']; - -$local_log->debug("Saved record with id of ".$return_id); - -//code added for returning back to the current view after edit from list view -if($_REQUEST['return_viewname'] == '') $return_viewname='0'; -if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; - -//Added to send mail to the vtiger_potential-owner about the Potential -$status = sendNotificationToOwner('Potentials',&$focus); - -header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&viewname=$return_viewname"); - -?> +id); +$rate_symbol = getCurrencySymbolandCRate($currencyid); +$rate = $rate_symbol['rate']; +$curr_symbol= $rate_symbol['symbol']; + +setObjectValuesFromRequest(&$focus); + +if(isset($_REQUEST['amount'])) +{ + $value = convertToDollar($_REQUEST['amount'],$rate); + $focus->column_fields['amount'] = $value; +} + +$focus->save("Potentials"); +$pot_id = $return_id = $focus->id; + +if(isset($_REQUEST['parenttab']) && $_REQUEST['parenttab'] != "") $parenttab = $_REQUEST['parenttab']; +if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; +else $return_module = "Potentials"; +if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; +else $return_action = "DetailView"; +if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id']; + +$local_log->debug("Saved record with id of ".$return_id); + +//code added for returning back to the current view after edit from list view +if($_REQUEST['return_viewname'] == '') $return_viewname='0'; +if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; + +//Added to send mail to the vtiger_potential-owner about the Potential +$status = sendNotificationToOwner('Potentials',&$focus); + +header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&pot_id=$pot_id&viewname=$return_viewname"); + +?> Modified: vtigercrm/branches/5.1_jens/modules/Potentials/updateRelations.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Potentials/updateRelations.php (original) +++ vtigercrm/branches/5.1_jens/modules/Potentials/updateRelations.php Mon Apr 16 12:27:44 2007 @@ -13,7 +13,13 @@ require_once('user_privileges/default_module_view.php'); global $adb, $singlepane_view; $idlist = $_REQUEST['idlist']; -$returnmodule = $_REQUEST['return_module']; +$dest_mod = $_REQUEST['destination_module']; + +if($singlepane_view == 'true') + $action = "DetailView"; +else + $action = "CallRelatedList"; + if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '') { //split the string and store in an array @@ -22,27 +28,23 @@ { if($id != '') { - $sql = "insert into vtiger_contpotentialrel values (".$id.",".$_REQUEST["parentid"] .")"; - $adb->query($sql); - $sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parentid"] .",".$id.")"; - $adb->query($sql); + $sql = "insert into vtiger_contpotentialrel values (".$id.",".$_REQUEST["parentid"] .")"; + $adb->query($sql); + $sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parentid"] .",".$id.",'Potentials')"; + $adb->query($sql); } } - if($singlepane_view == 'true') - header("Location: index.php?action=DetailView&module=Potentials&record=".$_REQUEST["parentid"]); - else - header("Location: index.php?action=CallRelatedList&module=Potentials&record=".$_REQUEST["parentid"]); + + header("Location: index.php?action=$action&module=Potentials&record=".$_REQUEST["parentid"]); } elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '') { - $sql = "insert into vtiger_contpotentialrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")"; - $adb->query($sql); - $sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parid"] .",".$_REQUEST["entityid"] .")"; - $adb->query($sql); - if($singlepane_view == 'true') - header("Location: index.php?action=DetailView&module=Potentials&record=".$_REQUEST["parid"]); - else - header("Location: index.php?action=CallRelatedList&module=Potentials&record=".$_REQUEST["parid"]); + $sql = "insert into vtiger_contpotentialrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")"; + $adb->query($sql); + $sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parid"] .",".$_REQUEST["entityid"] .",'Potentials')"; + $adb->query($sql); + + header("Location: index.php?action=$action&module=Potentials&record=".$_REQUEST["parid"]); } ?> Modified: vtigercrm/branches/5.1_jens/modules/PriceBooks/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/PriceBooks/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/PriceBooks/DetailView.php Mon Apr 16 12:27:44 2007 @@ -83,6 +83,7 @@ $related_array = getRelatedLists($currentModule,$focus); $smarty->assign("RELATEDLISTS", $related_array); } +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); $smarty->assign("SinglePane_View", $singlepane_view); Modified: vtigercrm/branches/5.1_jens/modules/PriceBooks/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/PriceBooks/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/PriceBooks/EditView.php Mon Apr 16 12:27:44 2007 @@ -94,6 +94,7 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); // Assigned organizations $smarty->assign("CURRENT_ORGANIZATION",$current_organization); @@ -106,7 +107,7 @@ $smarty->assign("USER_ORGANIZATIONS",$org_array); if($focus->mode == 'edit') - $smarty->display('Inventory/InventoryEditView.tpl'); + $smarty->display('Inventory/InventoryEditView.tpl'); else - $smarty->display('Inventory/InventoryCreateView.tpl'); + $smarty->display('Inventory/InventoryCreateView.tpl'); ?> Modified: vtigercrm/branches/5.1_jens/modules/Products/AddProductToPriceBooks.html ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/AddProductToPriceBooks.html (original) +++ vtigercrm/branches/5.1_jens/modules/Products/AddProductToPriceBooks.html Mon Apr 16 12:27:44 2007 @@ -116,7 +116,7 @@ } - +
    + + + + '; - if($singlepane_view == 'true') - $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; - - $query = "select vtiger_users.user_name,vtiger_crmentity.crmid, vtiger_troubletickets.title, vtiger_contactdetails.contactid, vtiger_troubletickets.parent_id, vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_troubletickets.status, vtiger_troubletickets.priority, vtiger_crmentity.smownerid from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_troubletickets.parent_id left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid=vtiger_ticketgrouprelation.ticketid left join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_contactdetails.contactid=".$id; - $log->info("Ticket Related List for Contact Displayed"); - $log->debug("Exiting get_tickets method ..."); - return GetRelatedList('Contacts','HelpDesk',$focus,$query,$button,$returnset); - } - /** - * Function to get Contact related Attachments - * @param integer $id - contactid - * returns related Attachment record in array format - */ - function get_attachments($id) - { - global $log; - $log->debug("Entering get_attachments(".$id.") method ..."); - $query = "select vtiger_notes.title,'Notes ' AS ActivityType, - vtiger_notes.filename, vtiger_attachments.type AS FileType,crm2.modifiedtime AS lastmodified, - vtiger_seattachmentsrel.attachmentsid AS attachmentsid, vtiger_notes.notesid AS crmid, - crm2.createdtime, vtiger_notes.notecontent AS description, vtiger_users.user_name - from vtiger_notes - inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_notes.contact_id - inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0 - left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid - left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid - inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - where vtiger_crmentity.crmid=".$id; - $query .= " union all "; - $query .= "select vtiger_attachments.description AS title,'Attachments' AS ActivityType, - vtiger_attachments.name AS filename, vtiger_attachments.type AS FileType,crm2.modifiedtime AS lastmodified, - vtiger_attachments.attachmentsid AS attachmentsid, vtiger_seattachmentsrel.attachmentsid AS crmid, - crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name - from vtiger_attachments - inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid - inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid - inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid - inner join vtiger_users on crm2.smcreatorid= vtiger_users.id - where vtiger_crmentity.crmid=".$id." - order by createdtime desc"; - $log->info("Notes&Attachmenmts for Contact Displayed"); - $log->debug("Exiting get_attachments method ..."); - return getAttachmentsAndNotes('Contacts',$query,$id); - } - /** - * Function to get Contact related Quotes - * @param integer $id - contactid - * returns related Quotes record in array format - */ - function get_quotes($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_quotes(".$id.") method ..."); - global $app_strings; - require_once('modules/Quotes/Quotes.php'); - $focus = new Quotes(); - - $button = ''; - if(isPermitted("Quotes",1,"") == 'yes') - { - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; - $query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_quotes.*,vtiger_potential.potentialname,vtiger_contactdetails.lastname from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_quotes.contactid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_contactdetails.contactid=".$id; - $log->debug("Exiting get_quotes method ..."); - return GetRelatedList('Contacts','Quotes',$focus,$query,$button,$returnset); - } - /** - * Function to get Contact related SalesOrder - * @param integer $id - contactid - * returns related SalesOrder record in array format - */ - function get_salesorder($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_salesorder(".$id.") method ..."); - require_once('modules/SalesOrder/SalesOrder.php'); - global $app_strings; - $focus = new SalesOrder(); - $button = ''; - - if(isPermitted("SalesOrder",1,"") == 'yes') - { - - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; - - $query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_contactdetails.lastname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_salesorder.contactid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.contactid = ".$id; - $log->debug("Exiting get_salesorder method ..."); - return GetRelatedList('Contacts','SalesOrder',$focus,$query,$button,$returnset); - } - /** - * Function to get Contact related Products - * @param integer $id - contactid - * returns related Products record in array format - */ - function get_products($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_products(".$id.") method ..."); - global $app_strings; - require_once('modules/Products/Products.php'); - $focus = new Products(); - $button = ''; - - if(isPermitted("Products",1,"") == 'yes') - { - - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; - - $query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_contactdetails.lastname from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_products.contactid where vtiger_contactdetails.contactid = '.$id.' and vtiger_crmentity.deleted = 0'; - $log->debug("Exiting get_products method ..."); - return GetRelatedList('Contacts','Products',$focus,$query,$button,$returnset); - } - - /** - * Function to get Contact related PurchaseOrder - * @param integer $id - contactid - * returns related PurchaseOrder record in array format - */ - function get_purchase_orders($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_purchase_orders(".$id.") method ..."); - global $app_strings; - require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new PurchaseOrder(); - - $button = ''; - - if(isPermitted("PurchaseOrder",1,"") == 'yes') - { - - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; - - $query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname,vtiger_contactdetails.lastname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_purchaseorder.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.contactid=".$id; - $log->debug("Exiting get_purchase_orders method ..."); - return GetRelatedList('Contacts','PurchaseOrder',$focus,$query,$button,$returnset); - } - - /** Returns a list of the associated emails - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function get_emails($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_emails(".$id.") method ..."); - global $mod_strings; - - $focus = new Emails(); - - $button = ''; - - if(isPermitted("Emails",1,"") == 'yes') - { - $button .= ''; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; - - $log->info("Email Related List for Contact Displayed"); - - $query = "select vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_users.user_name, vtiger_crmentity.modifiedtime, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_activity.date_start from vtiger_activity, vtiger_seactivityrel, vtiger_contactdetails, vtiger_users, vtiger_crmentity left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.activityid = vtiger_activity.activityid and vtiger_contactdetails.contactid = vtiger_seactivityrel.crmid and vtiger_users.id=vtiger_crmentity.smownerid and vtiger_crmentity.crmid = vtiger_activity.activityid and vtiger_contactdetails.contactid = ".$id." and vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted = 0"; - $log->debug("Exiting get_emails method ..."); - return GetRelatedList('Contacts','Emails',$focus,$query,$button,$returnset); - } - - /** Returns a list of the associated Campaigns - * @param $id -- campaign id :: Type Integer - * @returns list of campaigns in array format - */ - - function get_campaigns($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_campaigns(".$id.") method ..."); - global $mod_strings; - - $focus = new Campaigns(); - if($singlepane_view == 'true') - $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; - $button = ''; - - $log->info("Campaign Related List for Contact Displayed"); - $query = "SELECT vtiger_users.user_name, vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaigncontrel.contactid=".$id." and vtiger_crmentity.deleted=0"; - - $log->debug("Exiting get_campaigns method ..."); - return GetRelatedList('Contacts','Campaigns',$focus,$query,$button,$returnset); - - } - /** Function to export the contact records in CSV Format - * @param reference variable - order by is passed when the query is executed - * @param reference variable - where condition is passed when the query is executed - * Returns Export Contacts Query. - */ - function create_export_query(&$order_by, &$where) - { - global $log; - global $current_user; - $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - - include("include/utils/ExportUtils.php"); - - //To get the Permitted fields query and the permitted fields list - $sql = getPermittedFieldsQuery("Contacts", "detail_view"); - $fields_list = getFieldsListFromQuery($sql); - - $query = "SELECT $fields_list - FROM vtiger_contactdetails - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid - LEFT JOIN vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id - LEFT JOIN vtiger_account on vtiger_contactdetails.accountid=vtiger_account.accountid - left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid - left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid=vtiger_contactdetails.contactid - left join vtiger_contactscf on vtiger_contactscf.contactid=vtiger_contactdetails.contactid - left join vtiger_customerdetails on vtiger_customerdetails.customerid=vtiger_contactdetails.contactid - LEFT JOIN vtiger_contactgrouprelation - ON vtiger_contactscf.contactid = vtiger_contactgrouprelation.contactid - LEFT JOIN vtiger_groups - ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname - LEFT JOIN vtiger_contactdetails vtiger_contactdetails2 - ON vtiger_contactdetails2.contactid = vtiger_contactdetails.reportsto - where vtiger_crmentity.deleted=0 and vtiger_users.status='Active' "; - //vtiger_contactdetails2 is added to get the Reports To of Contact - - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - //we should add security check when the user has Private Access - if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[4] == 3) - { - //Added security check to get the permitted records only - $query = $query." ".getListViewSecurityParameter("Contacts"); - } - - $log->info("Export Query Constructed Successfully"); - $log->debug("Exiting create_export_query method ..."); - return $query; - } - - -/** Function to get the Columnnames of the Contacts -* Used By vtigerCRM Word Plugin -* Returns the Merge Fields for Word Plugin -*/ -function getColumnNames() -{ - global $log, $current_user; - $log->debug("Entering getColumnNames() method ..."); - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) - { - $sql1 = "select fieldlabel from vtiger_field where tabid=4 and block <> 75"; - }else - { - $profileList = getCurrentUserProfileList(); - $sql1 = "select fieldlabel from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=4 and vtiger_field.block <> 6 and vtiger_field.block <> 75 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; - } - $result = $this->db->query($sql1); - $numRows = $this->db->num_rows($result); - for($i=0; $i < $numRows;$i++) - { - $custom_fields[$i] = $this->db->query_result($result,$i,"fieldlabel"); - $custom_fields[$i] = ereg_replace(" ","",$custom_fields[$i]); - $custom_fields[$i] = strtoupper($custom_fields[$i]); - } - $mergeflds = $custom_fields; - $log->debug("Exiting getColumnNames method ..."); - return $mergeflds; -} -//End -/** Function to get the Contacts assigned to a user with a valid email address. -* @param varchar $username - User Name -* @param varchar $emailaddress - Email Addr for each contact. -* Used By vtigerCRM Outlook Plugin -* Returns the Query -*/ -function get_searchbyemailid($username,$emailaddress) -{ - global $log; - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - $log->debug("Entering get_searchbyemailid(".$username.",".$emailaddress.") method ..."); - $query = "select vtiger_contactdetails.lastname,vtiger_contactdetails.firstname, - vtiger_contactdetails.contactid, vtiger_contactdetails.salutation, - vtiger_contactdetails.email,vtiger_contactdetails.title, - vtiger_contactdetails.mobile,vtiger_account.accountname, - vtiger_account.accountid as accountid from vtiger_contactdetails - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid - inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid - left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid - left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid - LEFT JOIN vtiger_contactgrouprelation ON vtiger_contactdetails.contactid = vtiger_contactgrouprelation.contactid - LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname - where vtiger_crmentity.deleted=0 and vtiger_contactdetails.email like '%".$emailaddress."%'"; - $tab_id = getTabid("Contacts"); - if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) - { - $sec_parameter=getListViewSecurityParameter("Contacts"); - $query .= $sec_parameter; - - } - $log->debug("Exiting get_searchbyemailid method ..."); - return $this->plugin_process_list_query($query); -} - -/** Function to get the Contacts associated with the particular User Name. -* @param varchar $user_name - User Name -* Returns query -*/ - -function get_contactsforol($user_name) -{ - global $log,$adb; - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($user_name); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) - { - $sql1 = "select tablename,columnname from vtiger_field where tabid=4 and block <> 75 and block <> 6 and vtiger_field.block <> 5"; - }else - { - $profileList = getCurrentUserProfileList(); - $sql1 = "select tablename,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=4 and vtiger_field.block <> 75 and vtiger_field.block <> 6 and vtiger_field.block <> 5 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; - } - $result1 = $adb->query($sql1); - for($i=0;$i < $adb->num_rows($result1);$i++) - { - $permitted_lists[] = $adb->query_result($result1,$i,'tablename'); - $permitted_lists[] = $adb->query_result($result1,$i,'columnname'); - if($adb->query_result($result1,$i,'columnname') == "accountid") - { - $permitted_lists[] = 'vtiger_account'; - $permitted_lists[] = 'accountname'; - } - } - $permitted_lists = array_chunk($permitted_lists,2); - $column_table_lists = array(); - for($i=0;$i < count($permitted_lists);$i++) - { - $column_table_lists[] = implode(".",$permitted_lists[$i]); - } - - $log->debug("Entering get_contactsforol(".$user_name.") method ..."); - $query = "select vtiger_contactdetails.contactid as id, ".implode(',',$column_table_lists)." from vtiger_contactdetails - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid - inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid - left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid - left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid - left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid = vtiger_contactdetails.contactid - LEFT JOIN vtiger_contactgrouprelation ON vtiger_contactdetails.contactid = vtiger_contactgrouprelation.contactid - LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname - where vtiger_crmentity.deleted=0 and vtiger_users.user_name='".$user_name."'"; - $log->debug("Exiting get_contactsforol method ..."); - return $query; -} - - - /** Function to handle module specific operations when saving a entity - */ - function save_module($module) - { - $this->insertIntoAttachment($this->id,$module); - } - - /** - * This function is used to add the vtiger_attachments. This will call the function uploadAndSaveFile which will upload the attachment into the server and save that attachment information in the database. - * @param int $id - entity id to which the vtiger_files to be uploaded - * @param string $module - the current module name - */ - function insertIntoAttachment($id,$module) - { - global $log, $adb; - $log->debug("Entering into insertIntoAttachment($id,$module) method."); - - $file_saved = false; - - //This is to added to store the existing attachment id of the contact where we should delete this when we give new image - $old_attachmentid = $adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid=$id"),0,'attachmentsid'); - - foreach($_FILES as $fileindex => $files) - { - if($files['name'] != '' && $files['size'] > 0) - { - $file_saved = $this->uploadAndSaveFile($id,$module,$files); - } - } - - //This is to handle the delete image for contacts - if($module == 'Contacts' && $file_saved) - { - $del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$old_attachmentid"); - $del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$old_attachmentid"); - } - - $log->debug("Exiting from insertIntoAttachment($id,$module) method."); - } - - -//End - -} - -?> +'crmid','vtiger_contactdetails'=>'contactid','vtiger_contactaddress'=>'contactaddressid','vtiger_contactsubdetails'=>'contactsubscriptionid','vtiger_contactscf'=>'contactid','vtiger_customerdetails'=>'customerid','vtiger_attachments'=>'attachmentsid','vtiger_entity2org'=>'crmid'); + + + + var $column_fields = Array(); + + var $sortby_fields = Array('lastname','firstname','title','email','phone','smownerid','accountid'); + + var $list_link_field= 'lastname'; + + // This is the list of vtiger_fields that are in the lists. + var $list_fields = Array( + 'Last Name' => Array('contactdetails'=>'lastname'), + 'First Name' => Array('contactdetails'=>'firstname'), + 'Title' => Array('contactdetails'=>'title'), + 'Account Name' => Array('account'=>'accountid'), + 'Email' => Array('contactdetails'=>'email'), + 'Phone' => Array('contactdetails'=>'phone'), + 'Assigned To' => Array('crmentity'=>'smownerid') + ); + + var $range_fields = Array( + 'first_name', + 'last_name', + 'primary_address_city', + 'account_name', + 'account_id', + 'id', + 'email1', + 'salutation', + 'title', + 'phone_mobile', + 'reports_to_name', + 'primary_address_street', + 'primary_address_city', + 'primary_address_state', + 'primary_address_postalcode', + 'primary_address_country', + 'alt_address_city', + 'alt_address_street', + 'alt_address_city', + 'alt_address_state', + 'alt_address_postalcode', + 'alt_address_country', + 'office_phone', + 'home_phone', + 'other_phone', + 'fax', + 'department', + 'birthdate', + 'assistant_name', + 'assistant_phone'); + + + var $list_fields_name = Array( + 'Last Name' => 'lastname', + 'First Name' => 'firstname', + 'Title' => 'title', + 'Account Name' => 'accountid', + 'Email' => 'email', + 'Phone' => 'phone', + 'Assigned To' => 'assigned_user_id' + ); + + var $search_fields = Array( + 'Name' => Array('contactdetails'=>'lastname'), + 'Title' => Array('contactdetails'=>'title'), + 'Account Name'=>Array('contactdetails'=>'account_id'), + ); + + var $search_fields_name = Array( + 'Name' => 'lastname', + 'Title' => 'title', + 'Account Name'=>'account_id', + ); + + // This is the list of vtiger_fields that are required + var $required_fields = array("lastname"=>1); + + //Added these variables which are used as default order by and sortorder in ListView + var $default_order_by = 'lastname'; + var $default_sort_order = 'ASC'; + + var $groupTable = Array('vtiger_contactgrouprelation','contactid'); + + function Contacts() { + $this->log = LoggerManager::getLogger('contact'); + $this->db = new PearDatabase(); + $this->column_fields = getColumnFields('Contacts'); + } + + // Mike Crowe Mod --------------------------------------------------------Default ordering for us + /** + * Function to get sort order + * return string $sorder - sortorder string either 'ASC' or 'DESC' + */ + function getSortOrder() + { + global $log; + $log->debug("Entering getSortOrder() method ..."); + if(isset($_REQUEST['sorder'])) + $sorder = $_REQUEST['sorder']; + else + $sorder = (($_SESSION['CONTACTS_SORT_ORDER'] != '')?($_SESSION['CONTACTS_SORT_ORDER']):($this->default_sort_order)); + $log->debug("Exiting getSortOrder method ..."); + return $sorder; + } + /** + * Function to get order by + * return string $order_by - fieldname(eg: 'Contactname') + */ + function getOrderBy() + { + global $log; + $log->debug("Entering getOrderBy() method ..."); + if (isset($_REQUEST['order_by'])) + $order_by = $_REQUEST['order_by']; + else + $order_by = (($_SESSION['CONTACTS_ORDER_BY'] != '')?($_SESSION['CONTACTS_ORDER_BY']):($this->default_order_by)); + $log->debug("Exiting getOrderBy method ..."); + return $order_by; + } + // Mike Crowe Mod -------------------------------------------------------- + /** Function to get the number of Contacts assigned to a particular User. + * @param varchar $user name - Assigned to User + * Returns the count of contacts assigned to user. + */ + function getCount($user_name) + { + global $log; + $log->debug("Entering getCount(".$user_name.") method ..."); + $query = "select count(*) from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0"; + + $result = $this->db->query($query,true,"Error retrieving contacts count"); + $rows_found = $this->db->getRowCount($result); + $row = $this->db->fetchByAssoc($result, 0); + + + $log->debug("Exiting getCount method ..."); + return $row["count(*)"]; + } + /** Function to get the Contact Details assigned to a given User ID which has a valid Email Address. + * @param varchar $user_name - User Name (eg. Admin) + * @param varchar $email_address - Email Addr of each contact record. + * Returns the query. + */ + function get_contacts1($user_name,$email_address) + { + global $log; + $log->debug("Entering get_contacts1(".$user_name.",".$email_address.") method ..."); + $query = "select vtiger_users.user_name, vtiger_contactdetails.lastname last_name,vtiger_contactdetails.firstname first_name,vtiger_contactdetails.contactid as id, vtiger_contactdetails.salutation as salutation, vtiger_contactdetails.email as email1,vtiger_contactdetails.title as title,vtiger_contactdetails.mobile as phone_mobile,vtiger_account.accountname as account_name,vtiger_account.accountid as account_id from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 and vtiger_contactdetails.email like '%" .$email_address ."%' limit 50"; + + $log->debug("Exiting get_contacts1 method ..."); + return $this->process_list_query1($query); + } + /** Function to get the Contact Details assigned to a particular User based on the starting count and the number of subsequent records. + * @param varchar $user_name - Assigned User + * @param integer $from_index - Initial record number to be displayed + * @param integer $offset - Count of the subsequent records to be displayed. + * Returns Query. + */ + function get_contacts($user_name,$from_index,$offset) + { + global $log; + $log->debug("Entering get_contacts(".$user_name.",".$from_index.",".$offset.") method ..."); + $query = "select vtiger_users.user_name,vtiger_groups.groupname,vtiger_contactdetails.department department, vtiger_contactdetails.phone office_phone, vtiger_contactdetails.fax fax, vtiger_contactsubdetails.assistant assistant_name, vtiger_contactsubdetails.otherphone other_phone, vtiger_contactsubdetails.homephone home_phone,vtiger_contactsubdetails.birthday birthdate, vtiger_contactdetails.lastname last_name,vtiger_contactdetails.firstname first_name,vtiger_contactdetails.contactid as id, vtiger_contactdetails.salutation as salutation, vtiger_contactdetails.email as email1,vtiger_contactdetails.title as title,vtiger_contactdetails.mobile as phone_mobile,vtiger_account.accountname as account_name,vtiger_account.accountid as account_id, vtiger_contactaddress.mailingcity as primary_address_city,vtiger_contactaddress.mailingstreet as primary_address_street, vtiger_contactaddress.mailingcountry as primary_address_country,vtiger_contactaddress.mailingstate as primary_address_state, vtiger_contactaddress.mailingzip as primary_address_postalcode, vtiger_contactaddress.othercity as alt_address_city,vtiger_contactaddress.otherstreet as alt_address_street, vtiger_contactaddress.othercountry as alt_address_country,vtiger_contactaddress.otherstate as alt_address_state, vtiger_contactaddress.otherzip as alt_address_postalcode from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 limit " .$from_index ."," .$offset; + + $log->debug("Exiting get_contacts method ..."); + return $this->process_list_query1($query); + } + + + /** Function to process list query for a given query + * @param $query + * Returns the results of query in array format + */ + function process_list_query1($query) + { + global $log; + $log->debug("Entering process_list_query1(".$query.") method ..."); + + $result =& $this->db->query($query,true,"Error retrieving $this->object_name list: "); + $list = Array(); + $rows_found = $this->db->getRowCount($result); + if($rows_found != 0) + { + $contact = Array(); + for($index = 0 , $row = $this->db->fetchByAssoc($result, $index); $row && $index <$rows_found;$index++, $row = $this->db->fetchByAssoc($result, $index)) + + { + foreach($this->range_fields as $columnName) + { + if (isset($row[$columnName])) { + + $contact[$columnName] = $row[$columnName]; + } + else + { + $contact[$columnName] = ""; + } + } +// TODO OPTIMIZE THE QUERY ACCOUNT NAME AND ID are set separetly for every vtiger_contactdetails and hence +// vtiger_account query goes for ecery single vtiger_account row + + $list[] = $contact; + } + } + + $response = Array(); + $response['list'] = $list; + $response['row_count'] = $rows_found; + $response['next_offset'] = $next_offset; + $response['previous_offset'] = $previous_offset; + + + $log->debug("Exiting process_list_query1 method ..."); + return $response; + } + + + /** Function to process list query for Plugin with Security Parameters for a given query + * @param $query + * Returns the results of query in array format + */ + function plugin_process_list_query($query) + { + global $log,$adb,$current_user; + $log->debug("Entering process_list_query1(".$query.") method ..."); + $permitted_field_lists = Array(); + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) + { + $sql1 = "select columnname from vtiger_field where tabid=4 and block <> 75"; + }else + { + $profileList = getCurrentUserProfileList(); + $sql1 = "select columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=4 and vtiger_field.block <> 6 and vtiger_field.block <> 75 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; + } + $result1 = $this->db->query($sql1); + for($i=0;$i < $adb->num_rows($result1);$i++) + { + $permitted_field_lists[] = $adb->query_result($result1,$i,'columnname'); + } + + $result =& $this->db->query($query,true,"Error retrieving $this->object_name list: "); + $list = Array(); + $rows_found = $this->db->getRowCount($result); + if($rows_found != 0) + { + for($index = 0 , $row = $this->db->fetchByAssoc($result, $index); $row && $index <$rows_found;$index++, $row = $this->db->fetchByAssoc($result, $index)) + { + $contact = Array(); + foreach($permitted_field_lists as $columnName) + { + if ($columnName == "lastname" || $columnName == "firstname" || $columnName == "email") + { + $contact[$columnName] = $row[$columnName]; + } + else + { + $contact[$columnName] = ""; + } + } + if(in_array("accountid",$permitted_field_lists)) + { + $contact[accountname] = $row[accountname]; + $contact[account_id] = $row[accountid]; + } + $contact[contactid] = $row[contactid]; + $list[] = $contact; + } + } + + $response = Array(); + $response['list'] = $list; + $response['row_count'] = $rows_found; + $response['next_offset'] = $next_offset; + $response['previous_offset'] = $previous_offset; + $log->debug("Exiting process_list_query1 method ..."); + return $response; + } + + + /** Returns a list of the associated opportunities + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function get_opportunities($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_opportunities(".$id.") method ..."); + global $mod_strings; + + $focus = new Potentials(); + $button = ''; + + if(isPermitted("Potentials",1,"") == 'yes') + { + + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; + + $log->info("Potential Related List for Contact Displayed"); + + // First, get the list of IDs. + $query ='select case when (vtiger_users.user_name not like \'\') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_contactdetails.accountid, vtiger_contactdetails.contactid , vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_contpotentialrel on vtiger_contpotentialrel.contactid=vtiger_contactdetails.contactid left join vtiger_potential on vtiger_potential.potentialid = vtiger_contpotentialrel.potentialid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_contactdetails.contactid ='.$id.' and vtiger_contactdetails.accountid = vtiger_potential.accountid and vtiger_crmentity.deleted=0'; + + if($this->column_fields['account_id'] != 0) + $log->debug("Exiting get_opportunities method ..."); + return GetRelatedList('Contacts','Potentials',$focus,$query,$button,$returnset); + } + + + /** Returns a list of the associated tasks + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function get_activities($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_activities(".$id.") method ..."); + global $mod_strings; + + $focus = new Activity(); + + $button = ''; + + if(isPermitted("Calendar",1,"") == 'yes') + { + $button .= ' '; + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; + + $log->info("Activity Related List for Contact Displayed"); + + $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.activityid , vtiger_activity.subject, vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.due_date,vtiger_activity.time_start,vtiger_activity.time_end, vtiger_cntactivityrel.contactid, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_recurringevents.recurringtype from vtiger_contactdetails inner join vtiger_cntactivityrel on vtiger_cntactivityrel.contactid = vtiger_contactdetails.contactid inner join vtiger_activity on vtiger_cntactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_cntactivityrel.activityid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_contactdetails.contactid=".$id." and vtiger_crmentity.deleted = 0 and ((vtiger_activity.activitytype='Task' and vtiger_activity.status not in ('Completed','Deferred')) or (vtiger_activity.activitytype in ('Meeting','Call') and vtiger_activity.eventstatus not in ('','Held')))"; //recurring type is added in Query -Jaguar + $log->debug("Exiting get_activities method ..."); + return GetRelatedList('Contacts','Calendar',$focus,$query,$button,$returnset); + + } + /** + * Function to get Contact related Task & Event which have activity type Held, Completed or Deferred. + * @param integer $id - contactid + * returns related Task or Event record in array format + */ + function get_history($id) + { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); + $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus,vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.due_date,vtiger_activity.time_start,vtiger_activity.time_end,vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime,vtiger_crmentity.createdtime, vtiger_crmentity.description, case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name + from vtiger_activity + inner join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid + inner join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid + left join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid + left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid + left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname + left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid + where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') + and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != '')) + and vtiger_cntactivityrel.contactid=".$id; + //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + $log->debug("Entering get_history method ..."); + return getHistory('Contacts',$query,$id); + } + /** + * Function to get Contact related Tickets. + * @param integer $id - contactid + * returns related Ticket records in array format + */ + function get_tickets($id) + { + global $log, $singlepane_view; + global $app_strings; + $log->debug("Entering get_tickets(".$id.") method ..."); + $focus = new HelpDesk(); + + $button = ''; + if($singlepane_view == 'true') + $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; + + $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_crmentity.crmid, vtiger_troubletickets.title, vtiger_contactdetails.contactid, vtiger_troubletickets.parent_id, vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_troubletickets.status, vtiger_troubletickets.priority, vtiger_crmentity.smownerid from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_troubletickets.parent_id left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid=vtiger_ticketgrouprelation.ticketid left join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_contactdetails.contactid=".$id; + $log->info("Ticket Related List for Contact Displayed"); + $log->debug("Exiting get_tickets method ..."); + return GetRelatedList('Contacts','HelpDesk',$focus,$query,$button,$returnset); + } + /** + * Function to get Contact related Attachments + * @param integer $id - contactid + * returns related Attachment record in array format + */ + function get_attachments($id) + { + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); + $query = "select vtiger_notes.title,'Notes ' AS ActivityType, + vtiger_notes.filename, vtiger_attachments.type AS FileType,crm2.modifiedtime AS lastmodified, + vtiger_seattachmentsrel.attachmentsid AS attachmentsid, vtiger_notes.notesid AS crmid, + crm2.createdtime, vtiger_notes.notecontent AS description, vtiger_users.user_name + from vtiger_notes + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_notes.contact_id + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0 + left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid + left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id; + $query .= " union all "; + $query .= "select vtiger_attachments.description AS title,'Attachments' AS ActivityType, + vtiger_attachments.name AS filename, vtiger_attachments.type AS FileType,crm2.modifiedtime AS lastmodified, + vtiger_attachments.attachmentsid AS attachmentsid, vtiger_seattachmentsrel.attachmentsid AS crmid, + crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name + from vtiger_attachments + inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id." + order by createdtime desc"; + $log->info("Notes&Attachmenmts for Contact Displayed"); + $log->debug("Exiting get_attachments method ..."); + return getAttachmentsAndNotes('Contacts',$query,$id); + } + /** + * Function to get Contact related Quotes + * @param integer $id - contactid + * returns related Quotes record in array format + */ + function get_quotes($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_quotes(".$id.") method ..."); + global $app_strings; + require_once('modules/Quotes/Quotes.php'); + $focus = new Quotes(); + + $button = ''; + if(isPermitted("Quotes",1,"") == 'yes') + { + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; + $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_crmentity.*, vtiger_quotes.*,vtiger_potential.potentialname,vtiger_contactdetails.lastname from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_quotes.contactid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_contactdetails.contactid=".$id; + $log->debug("Exiting get_quotes method ..."); + return GetRelatedList('Contacts','Quotes',$focus,$query,$button,$returnset); + } + /** + * Function to get Contact related SalesOrder + * @param integer $id - contactid + * returns related SalesOrder record in array format + */ + function get_salesorder($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_salesorder(".$id.") method ..."); + require_once('modules/SalesOrder/SalesOrder.php'); + global $app_strings; + $focus = new SalesOrder(); + $button = ''; + + if(isPermitted("SalesOrder",1,"") == 'yes') + { + + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; + + $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_contactdetails.lastname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_salesorder.contactid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.contactid = ".$id; + $log->debug("Exiting get_salesorder method ..."); + return GetRelatedList('Contacts','SalesOrder',$focus,$query,$button,$returnset); + } + /** + * Function to get Contact related Products + * @param integer $id - contactid + * returns related Products record in array format + */ + function get_products($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_products(".$id.") method ..."); + global $app_strings; + require_once('modules/Products/Products.php'); + $focus = new Products(); + $button = ''; + + if(isPermitted("Products",1,"") == 'yes') + { + + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; + + $query = 'SELECT vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, + vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, + vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_contactdetails.lastname + FROM vtiger_products + INNER JOIN vtiger_seproductsrel + ON vtiger_seproductsrel.productid=vtiger_products.productid and vtiger_seproductsrel.setype=\'Contacts\' + INNER JOIN vtiger_crmentity + ON vtiger_crmentity.crmid = vtiger_products.productid + INNER JOIN vtiger_contactdetails + ON vtiger_contactdetails.contactid = vtiger_seproductsrel.crmid + WHERE vtiger_contactdetails.contactid = '.$id.' and vtiger_crmentity.deleted = 0'; + + $log->debug("Exiting get_products method ..."); + return GetRelatedList('Contacts','Products',$focus,$query,$button,$returnset); + } + + /** + * Function to get Contact related PurchaseOrder + * @param integer $id - contactid + * returns related PurchaseOrder record in array format + */ + function get_purchase_orders($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_purchase_orders(".$id.") method ..."); + global $app_strings; + require_once('modules/PurchaseOrder/PurchaseOrder.php'); + $focus = new PurchaseOrder(); + + $button = ''; + + if(isPermitted("PurchaseOrder",1,"") == 'yes') + { + + $button .= ' '; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; + + $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname,vtiger_contactdetails.lastname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_purchaseorder.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.contactid=".$id; + $log->debug("Exiting get_purchase_orders method ..."); + return GetRelatedList('Contacts','PurchaseOrder',$focus,$query,$button,$returnset); + } + + /** Returns a list of the associated emails + * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. + * All Rights Reserved.. + * Contributor(s): ______________________________________.. + */ + function get_emails($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_emails(".$id.") method ..."); + global $mod_strings; + + $focus = new Emails(); + + $button = ''; + + if(isPermitted("Emails",1,"") == 'yes') + { + $button .= ''; + } + if($singlepane_view == 'true') + $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; + + $log->info("Email Related List for Contact Displayed"); + + $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_crmentity.modifiedtime, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_activity.date_start from vtiger_activity, vtiger_seactivityrel, vtiger_contactdetails, vtiger_users, vtiger_crmentity left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.activityid = vtiger_activity.activityid and vtiger_contactdetails.contactid = vtiger_seactivityrel.crmid and vtiger_users.id=vtiger_crmentity.smownerid and vtiger_crmentity.crmid = vtiger_activity.activityid and vtiger_contactdetails.contactid = ".$id." and vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted = 0"; + $log->debug("Exiting get_emails method ..."); + return GetRelatedList('Contacts','Emails',$focus,$query,$button,$returnset); + } + + /** Returns a list of the associated Campaigns + * @param $id -- campaign id :: Type Integer + * @returns list of campaigns in array format + */ + + function get_campaigns($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_campaigns(".$id.") method ..."); + global $mod_strings; + + $focus = new Campaigns(); + if($singlepane_view == 'true') + $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; + $button = ''; + + $log->info("Campaign Related List for Contact Displayed"); + $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaigncontrel.contactid=".$id." and vtiger_crmentity.deleted=0"; + + $log->debug("Exiting get_campaigns method ..."); + return GetRelatedList('Contacts','Campaigns',$focus,$query,$button,$returnset); + + } + /** Function to export the contact records in CSV Format + * @param reference variable - order by is passed when the query is executed + * @param reference variable - where condition is passed when the query is executed + * Returns Export Contacts Query. + */ + function create_export_query(&$order_by, &$where) + { + global $log; + global $current_user; + $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Contacts", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT vtiger_contactdetails.salutation as 'Salutation',$fields_list, vtiger_contactgrouprelation.groupname as 'Assigned To Group' + FROM vtiger_contactdetails + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid + LEFT JOIN vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id and vtiger_users.status='Active' + LEFT JOIN vtiger_account on vtiger_contactdetails.accountid=vtiger_account.accountid + left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid + left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid=vtiger_contactdetails.contactid + left join vtiger_contactscf on vtiger_contactscf.contactid=vtiger_contactdetails.contactid + left join vtiger_customerdetails on vtiger_customerdetails.customerid=vtiger_contactdetails.contactid + LEFT JOIN vtiger_contactgrouprelation + ON vtiger_contactscf.contactid = vtiger_contactgrouprelation.contactid + LEFT JOIN vtiger_groups + ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname + LEFT JOIN vtiger_contactdetails vtiger_contactdetails2 + ON vtiger_contactdetails2.contactid = vtiger_contactdetails.reportsto + where vtiger_crmentity.deleted=0"; + //vtiger_contactdetails2 is added to get the Reports To of Contact + + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + //we should add security check when the user has Private Access + if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[4] == 3) + { + //Added security check to get the permitted records only + $query = $query." ".getListViewSecurityParameter("Contacts"); + } + + $log->info("Export Query Constructed Successfully"); + $log->debug("Exiting create_export_query method ..."); + return $query; + } + + +/** Function to get the Columnnames of the Contacts +* Used By vtigerCRM Word Plugin +* Returns the Merge Fields for Word Plugin +*/ +function getColumnNames() +{ + global $log, $current_user; + $log->debug("Entering getColumnNames() method ..."); + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) + { + $sql1 = "select fieldlabel from vtiger_field where tabid=4 and block <> 75"; + }else + { + $profileList = getCurrentUserProfileList(); + $sql1 = "select fieldlabel from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=4 and vtiger_field.block <> 6 and vtiger_field.block <> 75 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; + } + $result = $this->db->query($sql1); + $numRows = $this->db->num_rows($result); + for($i=0; $i < $numRows;$i++) + { + $custom_fields[$i] = $this->db->query_result($result,$i,"fieldlabel"); + $custom_fields[$i] = ereg_replace(" ","",$custom_fields[$i]); + $custom_fields[$i] = strtoupper($custom_fields[$i]); + } + $mergeflds = $custom_fields; + $log->debug("Exiting getColumnNames method ..."); + return $mergeflds; +} +//End +/** Function to get the Contacts assigned to a user with a valid email address. +* @param varchar $username - User Name +* @param varchar $emailaddress - Email Addr for each contact. +* Used By vtigerCRM Outlook Plugin +* Returns the Query +*/ +function get_searchbyemailid($username,$emailaddress) +{ + global $log; + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + $log->debug("Entering get_searchbyemailid(".$username.",".$emailaddress.") method ..."); + $query = "select vtiger_contactdetails.lastname,vtiger_contactdetails.firstname, + vtiger_contactdetails.contactid, vtiger_contactdetails.salutation, + vtiger_contactdetails.email,vtiger_contactdetails.title, + vtiger_contactdetails.mobile,vtiger_account.accountname, + vtiger_account.accountid as accountid from vtiger_contactdetails + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid + inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid + left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid + left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid + LEFT JOIN vtiger_contactgrouprelation ON vtiger_contactdetails.contactid = vtiger_contactgrouprelation.contactid + LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname + where vtiger_crmentity.deleted=0 and vtiger_contactdetails.email like '%".$emailaddress."%' and vtiger_contactdetails.email != ''"; + $tab_id = getTabid("Contacts"); + if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) + { + $sec_parameter=getListViewSecurityParameter("Contacts"); + $query .= $sec_parameter; + + } + $log->debug("Exiting get_searchbyemailid method ..."); + return $this->plugin_process_list_query($query); +} + +/** Function to get the Contacts associated with the particular User Name. +* @param varchar $user_name - User Name +* Returns query +*/ + +function get_contactsforol($user_name) +{ + global $log,$adb; + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($user_name); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) + { + $sql1 = "select tablename,columnname from vtiger_field where tabid=4 and block <> 75 and block <> 6 and vtiger_field.block <> 5"; + }else + { + $profileList = getCurrentUserProfileList(); + $sql1 = "select tablename,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=4 and vtiger_field.block <> 75 and vtiger_field.block <> 6 and vtiger_field.block <> 5 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; + } + $result1 = $adb->query($sql1); + for($i=0;$i < $adb->num_rows($result1);$i++) + { + $permitted_lists[] = $adb->query_result($result1,$i,'tablename'); + $permitted_lists[] = $adb->query_result($result1,$i,'columnname'); + if($adb->query_result($result1,$i,'columnname') == "accountid") + { + $permitted_lists[] = 'vtiger_account'; + $permitted_lists[] = 'accountname'; + } + } + $permitted_lists = array_chunk($permitted_lists,2); + $column_table_lists = array(); + for($i=0;$i < count($permitted_lists);$i++) + { + $column_table_lists[] = implode(".",$permitted_lists[$i]); + } + + $log->debug("Entering get_contactsforol(".$user_name.") method ..."); + $query = "select vtiger_contactdetails.contactid as id, ".implode(',',$column_table_lists)." from vtiger_contactdetails + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid + inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid + left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid + left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid + left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid = vtiger_contactdetails.contactid + LEFT JOIN vtiger_contactgrouprelation ON vtiger_contactdetails.contactid = vtiger_contactgrouprelation.contactid + LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname + where vtiger_crmentity.deleted=0 and vtiger_users.user_name='".$user_name."'"; + $log->debug("Exiting get_contactsforol method ..."); + return $query; +} + + + /** Function to handle module specific operations when saving a entity + */ + function save_module($module) + { + $this->insertIntoAttachment($this->id,$module); + } + + /** + * This function is used to add the vtiger_attachments. This will call the function uploadAndSaveFile which will upload the attachment into the server and save that attachment information in the database. + * @param int $id - entity id to which the vtiger_files to be uploaded + * @param string $module - the current module name + */ + function insertIntoAttachment($id,$module) + { + global $log, $adb; + $log->debug("Entering into insertIntoAttachment($id,$module) method."); + + $file_saved = false; + + //This is to added to store the existing attachment id of the contact where we should delete this when we give new image + $old_attachmentid = $adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid=$id"),0,'attachmentsid'); + + foreach($_FILES as $fileindex => $files) + { + if($files['name'] != '' && $files['size'] > 0) + { + $file_saved = $this->uploadAndSaveFile($id,$module,$files); + } + } + + //This is to handle the delete image for contacts + if($module == 'Contacts' && $file_saved) + { + $del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$old_attachmentid"); + $del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$old_attachmentid"); + } + + $log->debug("Exiting from insertIntoAttachment($id,$module) method."); + } + + +//End + +} + +?> Modified: vtigercrm/branches/5.1_jens/modules/Contacts/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/DetailView.php Mon Apr 16 12:27:44 2007 @@ -1,138 +1,146 @@ -id=$_REQUEST['record']; - $focus->retrieve_entity_info($_REQUEST['record'],'Contacts'); - $log->info("Entity info successfully retrieved for Contact DetailView."); - $focus->firstname=$focus->column_fields['firstname']; - $focus->lastname=$focus->column_fields['lastname']; -} -if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { - $focus->id = ""; -} - -global $theme; -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; -require_once($theme_path.'layout_utils.php'); - -$log->info("Contact detail view"); - -$smarty = new vtigerCRM_Smarty; -$smarty->assign("MOD", $mod_strings); -$smarty->assign("APP", $app_strings); - -$smarty->assign("THEME", $theme); -$smarty->assign("IMAGE_PATH", $image_path); -$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); -$smarty->assign("UPDATEINFO",updateInfo($focus->id)); - -if(useInternalMailer() == 1) - $smarty->assign("INT_MAILER","true"); - -$smarty->assign("NAME",$focus->lastname.' '.$focus->firstname); - -$log->info("Detail Block Informations successfully retrieved."); -$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields)); -$smarty->assign("CUSTOMFIELD", $cust_fld); -$smarty->assign("SINGLE_MOD", 'Contact'); -$smarty->assign("REDIR_MOD","contacts"); - -$smarty->assign("ID", $_REQUEST['record']); -if(isPermitted("Contacts","EditView",$_REQUEST['record']) == 'yes') - $smarty->assign("EDIT_DUPLICATE","permitted"); - -if(isPermitted("Contacts","Delete",$_REQUEST['record']) == 'yes') - $smarty->assign("DELETE","permitted"); -if(isPermitted("Emails","EditView",'') == 'yes') -{ - //Added to pass the parents list as hidden for Emails -- 09-11-2005 - $parent_email = getEmailParentsList('Contacts',$_REQUEST['record']); - $smarty->assign("HIDDEN_PARENTS_LIST",$parent_email); - $smarty->assign("SENDMAILBUTTON","permitted"); -} - -if(isPermitted("Contacts","Merge",'') == 'yes') -{ - $smarty->assign("MERGEBUTTON","permitted"); - require_once('include/utils/UserInfoUtil.php'); - $wordTemplateResult = fetchWordTemplateList("Contacts"); - $tempCount = $adb->num_rows($wordTemplateResult); - $tempVal = $adb->fetch_array($wordTemplateResult); - for($templateCount=0;$templateCount<$tempCount;$templateCount++) - { - $optionString[$tempVal["templateid"]]=$tempVal["filename"]; - $tempVal = $adb->fetch_array($wordTemplateResult); - } - $smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']); - $smarty->assign("TOPTIONS",$optionString); -} - -//Security check for related list -$category = getParentTab(); -$smarty->assign("CATEGORY",$category); - -$check_button = Button_Check($module); -$smarty->assign("CHECK", $check_button); - -$tabid = getTabid("Contacts"); -$validationData = getDBValidationData($focus->tab_name,$tabid); -$data = split_validationdataArray($validationData); - -$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); - -$smarty->assign("MODULE",$currentModule); -$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); - -if($singlepane_view == 'true') -{ - $related_array = getRelatedLists($currentModule,$focus); - $smarty->assign("RELATEDLISTS", $related_array); -} - -$smarty->assign("SinglePane_View", $singlepane_view); - + +$focus = new Contacts(); + +if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { + + $focus->id=$_REQUEST['record']; + $focus->retrieve_entity_info($_REQUEST['record'],'Contacts'); + $log->info("Entity info successfully retrieved for Contact DetailView."); + $focus->firstname=$focus->column_fields['firstname']; + $focus->lastname=$focus->column_fields['lastname']; +} +if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { + $focus->id = ""; +} + +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); + +$log->info("Contact detail view"); + +$smarty = new vtigerCRM_Smarty; +$smarty->assign("MOD", $mod_strings); +$smarty->assign("APP", $app_strings); + +$smarty->assign("THEME", $theme); +$smarty->assign("IMAGE_PATH", $image_path); +$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); +$smarty->assign("UPDATEINFO",updateInfo($focus->id)); + +if(useInternalMailer() == 1) + $smarty->assign("INT_MAILER","true"); + +$smarty->assign("NAME",$focus->lastname.' '.$focus->firstname); + +$log->info("Detail Block Informations successfully retrieved."); +$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields)); +$smarty->assign("CUSTOMFIELD", $cust_fld); +$smarty->assign("SINGLE_MOD", 'Contact'); + +$smarty->assign("ID", $_REQUEST['record']); +if(isPermitted("Contacts","EditView",$_REQUEST['record']) == 'yes') + $smarty->assign("EDIT_DUPLICATE","permitted"); + +if(isPermitted("Contacts","Delete",$_REQUEST['record']) == 'yes') + $smarty->assign("DELETE","permitted"); +if(isPermitted("Emails","EditView",'') == 'yes') +{ + //Added to pass the parents list as hidden for Emails -- 09-11-2005 + $parent_email = getEmailParentsList('Contacts',$_REQUEST['record']); + $smarty->assign("HIDDEN_PARENTS_LIST",$parent_email); + $smarty->assign("SENDMAILBUTTON","permitted"); + $smarty->assign("EMAIL1",$focus->column_fields['email']); + $smarty->assign("EMAIL2",$focus->column_fields['yahooid']); + +} + +if(isPermitted("Contacts","Merge",'') == 'yes') +{ + $smarty->assign("MERGEBUTTON","permitted"); + require_once('include/utils/UserInfoUtil.php'); + $wordTemplateResult = fetchWordTemplateList("Contacts"); + $tempCount = $adb->num_rows($wordTemplateResult); + $tempVal = $adb->fetch_array($wordTemplateResult); + for($templateCount=0;$templateCount<$tempCount;$templateCount++) + { + $optionString[$tempVal["templateid"]]=$tempVal["filename"]; + $tempVal = $adb->fetch_array($wordTemplateResult); + } + $smarty->assign("TEMPLATECOUNT",$tempCount); + $smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']); + $smarty->assign("TOPTIONS",$optionString); +} + +//Security check for related list +$category = getParentTab(); +$smarty->assign("CATEGORY",$category); + +$check_button = Button_Check($module); +$smarty->assign("CHECK", $check_button); + +$tabid = getTabid("Contacts"); +$validationData = getDBValidationData($focus->tab_name,$tabid); +$data = split_validationdataArray($validationData); + +$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); +$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); +$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); + +$smarty->assign("MODULE",$currentModule); +$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); + +if($singlepane_view == 'true') +{ + $sql = $adb->query('select accountid from vtiger_contactdetails where contactid='.$focus->id); + $accountid = $adb->query_result($sql,0,'accountid'); + if($accountid == 0) $accountid=''; + $smarty->assign("accountid",$accountid); + $related_array = getRelatedLists($currentModule,$focus); + $smarty->assign("RELATEDLISTS", $related_array); +} + +$smarty->assign("SinglePane_View", $singlepane_view); + // Assigned organizations $smarty->assign("CURRENT_ORGANIZATION",$current_organization); $org_array=array(); @@ -143,6 +151,6 @@ } $smarty->assign("USER_ORGANIZATIONS",$org_array); -$smarty->display("DetailView.tpl"); -?> - +$smarty->display("DetailView.tpl"); +?> + Modified: vtigercrm/branches/5.1_jens/modules/Contacts/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/DetailViewAjax.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/DetailViewAjax.php Mon Apr 16 12:27:44 2007 @@ -31,11 +31,67 @@ $cntObj->id = $crmid; $cntObj->mode = "edit"; $cntObj->save("Contacts"); + + $email_res = $adb->query("select email from vtiger_contactdetails where contactid=".$cntObj->id); + $email = $adb->query_result($email_res,0,'email'); + + $check_available = $adb->query("select * from vtiger_portalinfo where id=".$cntObj->id); + $update = ''; if($fieldname =='email') { - $sql = "update vtiger_portalinfo set user_name='".$fieldvalue."' where id=".$crmid; - $adb->query($sql); + $active = $adb->query_result($check_available,0,'isactive'); + $update = false; + if($active != '' && $active == 1) + { + $sql = "update vtiger_portalinfo set user_name='".$fieldvalue."',isactive='".$active."' where id=".$crmid; + $adb->query($sql); + $email = $fieldvalue; + $result = $adb->query("select user_password from vtiger_portalinfo where id=".$cntObj->id); + $password = $adb->query_result($result,0,'user_password'); + $update = true; + } } + + if($fieldname == "portal") + { + if($email != '') + { + $confirm = $adb->query_result($check_available,0,'isactive'); + if($confirm == '' && $fieldvalue == 1) + { + $password = makeRandomPassword(); + $sql = "insert into vtiger_portalinfo (id,user_name,user_password,type,isactive) values(".$cntObj->id.",'".$email."','".$password."','C',1)"; + $adb->query($sql); + $insert = true; + + } + elseif($confirm == 0 && $fieldvalue == 1) + { + $sql = "update vtiger_portalinfo set user_name='".$email."', isactive=1 where id=".$cntObj->id; + $adb->query($sql); + $result = $adb->query("select user_password from vtiger_portalinfo where id=".$cntObj->id); + $password = $adb->query_result($result,0,'user_password'); + $update = true; + + } + elseif($confirm == 1 && $fieldvalue == 0) + { + $sql = "update vtiger_portalinfo set isactive=0 where id=".$cntObj->id; + $adb->query($sql); + } + } + } + require_once("modules/Emails/mail.php"); + global $current_user; + $data_array = Array(); + $data_array['first_name'] = $cntObj->column_fields['firstname']; + $data_array['last_name'] = $cntObj->column_fields['lastname']; + $data_array['email'] = $email; + $data_array['portal_url'] = "".$mod_strings['Please Login Here'].""; + $contents = getmail_contents_portalUser($data_array,$password); + if($insert == true || $update == true) + send_mail('Contacts',$cntObj->column_fields['email'],$current_user->user_name,'',$mod_strings['Customer Portal Login Details'],$contents); + if($cntObj->id != "") { echo ":#:SUCCESS"; Modified: vtigercrm/branches/5.1_jens/modules/Contacts/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/EditView.php Mon Apr 16 12:27:44 2007 @@ -1,228 +1,231 @@ -id = $_REQUEST['record']; - $focus->mode = 'edit'; - $focus->retrieve_entity_info($_REQUEST['record'],"Contacts"); - $log->info("Entity info successfully retrieved for EditView."); - $focus->firstname=$focus->column_fields['firstname']; - $focus->lastname=$focus->column_fields['lastname']; + +//added for contact image +$encode_val=$_REQUEST['encode_val']; +$decode_val=base64_decode($encode_val); + + $saveimage=isset($_REQUEST['saveimage'])?$_REQUEST['saveimage']:"false"; + $errormessage=isset($_REQUEST['error_msg'])?$_REQUEST['error_msg']:"false"; + $image_error=isset($_REQUEST['image_error'])?$_REQUEST['image_error']:"false"; +//end + +$focus = new Contacts(); +$smarty = new vtigerCRM_Smarty; + +if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) +{ + $focus->id = $_REQUEST['record']; + $focus->mode = 'edit'; + $focus->retrieve_entity_info($_REQUEST['record'],"Contacts"); + $log->info("Entity info successfully retrieved for EditView."); + $focus->firstname=$focus->column_fields['firstname']; + $focus->lastname=$focus->column_fields['lastname']; } else { $focus->column_fields["otherorgs"][$current_organization]=1; -} - -if($image_error=="true") -{ - $explode_decode_val=explode("&",$decode_val); - for($i=1;$icolumn_fields[$field_name_val]=$field_value; - } -} - -if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']=='') -{ - require_once('modules/Accounts/Accounts.php'); - $focus->column_fields['account_id'] = $_REQUEST['account_id']; - $acct_focus = new Accounts(); - $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); - $focus->column_fields['fax']=$acct_focus->column_fields['fax']; - $focus->column_fields['otherphone']=$acct_focus->column_fields['phone']; - $focus->column_fields['mailingcity']=$acct_focus->column_fields['bill_city']; - $focus->column_fields['othercity']=$acct_focus->column_fields['ship_city']; - $focus->column_fields['mailingstreet']=$acct_focus->column_fields['bill_street']; - $focus->column_fields['otherstreet']=$acct_focus->column_fields['ship_street']; - $focus->column_fields['mailingstate']=$acct_focus->column_fields['bill_state']; - $focus->column_fields['otherstate']=$acct_focus->column_fields['ship_state']; - $focus->column_fields['mailingzip']=$acct_focus->column_fields['bill_code']; - $focus->column_fields['otherzip']=$acct_focus->column_fields['ship_code']; - $focus->column_fields['mailingcountry']=$acct_focus->column_fields['bill_country']; - $focus->column_fields['othercountry']=$acct_focus->column_fields['ship_country']; - $log->debug("Accountid Id from the request is ".$_REQUEST['account_id']); - -} -if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') -{ - $focus->id = ""; - $focus->mode = ""; -} - -$disp_view = getView($focus->mode); -if($disp_view == 'edit_view') - $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields)); -else -{ - $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS')); - $smarty->assign("ADVBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV')); -} - -$smarty->assign("OP_MODE",$disp_view); - -//needed when creating a new contact with a default vtiger_account value passed in -if (isset($_REQUEST['account_name']) && is_null($focus->account_name)) { - $focus->account_name = $_REQUEST['account_name']; - - -} -if (isset($_REQUEST['account_id']) && is_null($focus->account_id)) { - $focus->account_id = $_REQUEST['account_id']; -} - -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; -//retreiving the combo values array -$comboFieldNames = Array('leadsource'=>'lead_source_dom' - ,'salutationtype'=>'salutation_dom'); -$comboFieldArray = getComboArray($comboFieldNames); - -require_once($theme_path.'layout_utils.php'); - -$log->info("Contact detail view"); - -$smarty->assign("MOD", $mod_strings); -$smarty->assign("APP", $app_strings); -$smarty->assign("NAME",$focus->lastname." ".$focus->firstname); -if(isset($cust_fld)) -{ - $smarty->assign("CUSTOMFIELD", $cust_fld); -} -$smarty->assign("ID", $focus->id); -$smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",'Contact'); - -if($focus->mode == 'edit') -{ - $smarty->assign("UPDATEINFO",updateInfo($focus->id)); - $smarty->assign("MODE", $focus->mode); -} - -if(isset($_REQUEST['activity_mode']) && $_REQUEST['activity_mode'] !='') - $smarty->assign("ACTIVITYMODE",$_REQUEST['activity_mode']); - -// Unimplemented until jscalendar language vtiger_files are fixed -$smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']); -$smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT'])); - -if(isset($_REQUEST['campaignid'])) -$smarty->assign("campaignid",$_REQUEST['campaignid']); -if (isset($_REQUEST['return_module'])) -$smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); -if (isset($_REQUEST['return_action'])) -$smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); -if (isset($_REQUEST['return_id'])) -$smarty->assign("RETURN_ID", $_REQUEST['return_id']); -if (isset($_REQUEST['return_viewname'])) -$smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); -$smarty->assign("THEME", $theme); -$smarty->assign("IMAGE_PATH", $image_path); -$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); - - $tabid = getTabid("Contacts"); - $validationData = getDBValidationData($focus->tab_name,$tabid); - $data = split_validationdataArray($validationData); - - $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); - $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); - $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); -$category = getParentTab(); -$smarty->assign("CATEGORY",$category); - -if($errormessage==2) -{ - $msg =$mod_strings['LBL_MAXIMUM_LIMIT_ERROR']; - $errormessage ="".$msg."

    "; -} -else if($errormessage==3) -{ - $msg = $mod_strings['LBL_UPLOAD_ERROR']; - $errormessage ="".$msg."

    "; - -} -else if($errormessage=="image") -{ - $msg = $mod_strings['LBL_IMAGE_ERROR']; - $errormessage ="".$msg."

    "; -} -else if($errormessage =="invalid") -{ - $msg = $mod_strings['LBL_INVALID_IMAGE']; - $errormessage ="".$msg."

    "; -} -else -{ - $errormessage=""; -} -if($errormessage!="") -{ - $smarty->assign("ERROR_MESSAGE",$errormessage); -} - -$check_button = Button_Check($module); -$smarty->assign("CHECK", $check_button); - -// Assigned organizations -$smarty->assign("CURRENT_ORGANIZATION",$current_organization); -$org_array=array(); -$org=strtok( $user_organizations, "|"); -while( $org !== false) { - $org_array[$org] = 1; - $org=strtok( "|"); -} -$smarty->assign("USER_ORGANIZATIONS",$org_array); - -if($focus->mode == 'edit') -$smarty->display("salesEditView.tpl"); -else -$smarty->display('CreateView.tpl'); - - -?> +} + +if($image_error=="true") +{ + $explode_decode_val=explode("&",$decode_val); + for($i=1;$icolumn_fields[$field_name_val]=$field_value; + } +} + +if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']=='') +{ + require_once('modules/Accounts/Accounts.php'); + $focus->column_fields['account_id'] = $_REQUEST['account_id']; + $acct_focus = new Accounts(); + $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); + $focus->column_fields['fax']=$acct_focus->column_fields['fax']; + $focus->column_fields['otherphone']=$acct_focus->column_fields['phone']; + $focus->column_fields['mailingcity']=$acct_focus->column_fields['bill_city']; + $focus->column_fields['othercity']=$acct_focus->column_fields['ship_city']; + $focus->column_fields['mailingstreet']=$acct_focus->column_fields['bill_street']; + $focus->column_fields['otherstreet']=$acct_focus->column_fields['ship_street']; + $focus->column_fields['mailingstate']=$acct_focus->column_fields['bill_state']; + $focus->column_fields['otherstate']=$acct_focus->column_fields['ship_state']; + $focus->column_fields['mailingzip']=$acct_focus->column_fields['bill_code']; + $focus->column_fields['otherzip']=$acct_focus->column_fields['ship_code']; + $focus->column_fields['mailingcountry']=$acct_focus->column_fields['bill_country']; + $focus->column_fields['othercountry']=$acct_focus->column_fields['ship_country']; + $focus->column_fields['mailingpobox']=$acct_focus->column_fields['bill_pobox']; + $focus->column_fields['otherpobox']=$acct_focus->column_fields['ship_pobox']; + + $log->debug("Accountid Id from the request is ".$_REQUEST['account_id']); + +} +if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') +{ + $focus->id = ""; + $focus->mode = ""; +} + +$disp_view = getView($focus->mode); +if($disp_view == 'edit_view') + $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields)); +else +{ + $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS')); + $smarty->assign("ADVBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV')); +} +$smarty->assign("OP_MODE",$disp_view); + +//needed when creating a new contact with a default vtiger_account value passed in +if (isset($_REQUEST['account_name']) && is_null($focus->account_name)) { + $focus->account_name = $_REQUEST['account_name']; + + +} +if (isset($_REQUEST['account_id']) && is_null($focus->account_id)) { + $focus->account_id = $_REQUEST['account_id']; +} + +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +//retreiving the combo values array +$comboFieldNames = Array('leadsource'=>'lead_source_dom' + ,'salutationtype'=>'salutation_dom'); +$comboFieldArray = getComboArray($comboFieldNames); + +require_once($theme_path.'layout_utils.php'); + +$log->info("Contact detail view"); + +$smarty->assign("MOD", $mod_strings); +$smarty->assign("APP", $app_strings); +$smarty->assign("NAME",$focus->lastname." ".$focus->firstname); +if(isset($cust_fld)) +{ + $smarty->assign("CUSTOMFIELD", $cust_fld); +} +$smarty->assign("ID", $focus->id); +$smarty->assign("MODULE",$currentModule); +$smarty->assign("SINGLE_MOD",'Contact'); + +if($focus->mode == 'edit') +{ + $smarty->assign("UPDATEINFO",updateInfo($focus->id)); + $smarty->assign("MODE", $focus->mode); +} + +if(isset($_REQUEST['activity_mode']) && $_REQUEST['activity_mode'] !='') + $smarty->assign("ACTIVITYMODE",$_REQUEST['activity_mode']); + +// Unimplemented until jscalendar language vtiger_files are fixed +$smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']); +$smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT'])); + +if(isset($_REQUEST['campaignid'])) +$smarty->assign("campaignid",$_REQUEST['campaignid']); +if (isset($_REQUEST['return_module'])) +$smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); +if (isset($_REQUEST['return_action'])) +$smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); +if (isset($_REQUEST['return_id'])) +$smarty->assign("RETURN_ID", $_REQUEST['return_id']); +if (isset($_REQUEST['return_viewname'])) +$smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); +$smarty->assign("THEME", $theme); +$smarty->assign("IMAGE_PATH", $image_path); +$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); + + $tabid = getTabid("Contacts"); + $validationData = getDBValidationData($focus->tab_name,$tabid); + $data = split_validationdataArray($validationData); + + $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); + $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); + $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); +$category = getParentTab(); +$smarty->assign("CATEGORY",$category); + +if($errormessage==2) +{ + $msg =$mod_strings['LBL_MAXIMUM_LIMIT_ERROR']; + $errormessage ="".$msg."

    "; +} +else if($errormessage==3) +{ + $msg = $mod_strings['LBL_UPLOAD_ERROR']; + $errormessage ="".$msg."

    "; + +} +else if($errormessage=="image") +{ + $msg = $mod_strings['LBL_IMAGE_ERROR']; + $errormessage ="".$msg."

    "; +} +else if($errormessage =="invalid") +{ + $msg = $mod_strings['LBL_INVALID_IMAGE']; + $errormessage ="".$msg."

    "; +} +else +{ + $errormessage=""; +} +if($errormessage!="") +{ + $smarty->assign("ERROR_MESSAGE",$errormessage); +} + +$check_button = Button_Check($module); +$smarty->assign("CHECK", $check_button); +$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); + +// Assigned organizations +$smarty->assign("CURRENT_ORGANIZATION",$current_organization); +$org_array=array(); +$org=strtok( $user_organizations, "|"); +while( $org !== false) { + $org_array[$org] = 1; + $org=strtok( "|"); +} +$smarty->assign("USER_ORGANIZATIONS",$org_array); + +if($focus->mode == 'edit') +$smarty->display("salesEditView.tpl"); +else +$smarty->display('CreateView.tpl'); + + +?> Modified: vtigercrm/branches/5.1_jens/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/ListView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/ListView.php Mon Apr 16 12:27:44 2007 @@ -234,7 +234,6 @@ } if(isPermitted("Contacts","Merge") == 'yes') { - $smarty->assign("MERGEBUTTON","    "); $wordTemplateResult = fetchWordTemplateList("Contacts"); $tempCount = $adb->num_rows($wordTemplateResult); $tempVal = $adb->fetch_array($wordTemplateResult); @@ -243,7 +242,21 @@ $optionString .=""; $tempVal = $adb->fetch_array($wordTemplateResult); } - $smarty->assign("WORDTEMPLATEOPTIONS",""); + if($tempCount > 0) + { + $smarty->assign("WORDTEMPLATEOPTIONS",""); + + $smarty->assign("MERGEBUTTON",""); + } + else + { + global $current_user; + require("user_privileges/user_privileges_".$current_user->id.".php"); + if($is_admin == true) + { + $smarty->assign("MERGEBUTTON",""); + } + } } //mass merge for word templates Modified: vtigercrm/branches/5.1_jens/modules/Contacts/Merge.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/Merge.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/Merge.php Mon Apr 16 12:27:44 2007 @@ -24,6 +24,7 @@ } else if(document.all) { + document.write("

    Click here to return to the previous page"); document.write(""); } Modified: vtigercrm/branches/5.1_jens/modules/Contacts/Save.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/Save.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/Save.php Mon Apr 16 12:27:44 2007 @@ -25,29 +25,6 @@ require_once('include/database/PearDatabase.php'); require_once("modules/Emails/mail.php"); - -/** - * This function is used to get a random password. - * @return a random password with alpha numeric chanreters of length 8 - */ -function makeRandomPassword() -{ - global $log; - $log->debug("Entering makeRandomPassword() method ..."); - $salt = "abcdefghijklmnopqrstuvwxyz0123456789"; - srand((double)microtime()*1000000); - $i = 0; - while ($i <= 7) - { - $num = rand() % 33; - $tmp = substr($salt, $num, 1); - $pass = $pass . $tmp; - $i++; - } -$log->debug("Exiting makeRandomPassword method ..."); - return $pass; -} - $local_log =& LoggerManager::getLogger('index'); global $log,$adb; @@ -193,20 +170,18 @@ $adb->query($sql); } - $subject = "Customer Portal Login Details"; - $contents = "Dear ".$_REQUEST['firstname'].' '.$_REQUEST['lastname'].',

    '; - $contents .= 'Your Customer Portal Login details are given below:'; - $contents .= "

    User Id : ".$_REQUEST['email']; - $contents .= '
    Password : '.$password; - $contents .= "

    Please Login Here"; - - $contents .= '

    Note : We suggest you to change your password after logging in first time.'; - $contents .= '

    Support Team'; + //changes made to send mail to portal user when we use ajax edit + $data_array = Array(); + $data_array['first_name'] = $_REQUEST['firstname']; + $data_array['last_name'] = $_REQUEST['lastname']; + $data_array['email'] = $_REQUEST['email']; + $data_array['portal_url'] = "".$mod_strings['Please Login Here'].""; + $contents = getmail_contents_portalUser($data_array,$password); $log->info("Customer Portal Information Updated in database and details are going to send => '".$_REQUEST['email']."'"); if($insert == 'true' || $update == 'true') { - $mail_status = send_mail('Contacts',$_REQUEST['email'],$current_user->user_name,'',$subject,$contents); + $mail_status = send_mail('Contacts',$_REQUEST['email'],$current_user->user_name,'',$mod_strings['Customer Portal Login Details'],$contents); } $log->info("After return from the SendMailToCustomer function. Now control will go to the header."); } Modified: vtigercrm/branches/5.1_jens/modules/Contacts/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -1,237 +1,248 @@ -'General Information', -'LBL_MODULE_NAME'=>'Contacts', -'LBL_INVITEE'=>'Direct Reports', -'LBL_MODULE_TITLE'=>'Contacts: Home', -'LBL_SEARCH_FORM_TITLE'=>'Contact Search', -'LBL_LIST_FORM_TITLE'=>'Contact List', -'LBL_NEW_FORM_TITLE'=>'New Contact', -'LBL_CONTACT_OPP_FORM_TITLE'=>'Contact-Opportunity:', -'LBL_CONTACT'=>'Contact:', - -'LBL_LIST_NAME'=>'Name', -'LBL_LIST_LAST_NAME'=>'Last Name', -'LBL_LIST_FIRST_NAME'=>'First Name', -'LBL_LIST_CONTACT_NAME'=>'Contact Name', -'LBL_LIST_TITLE'=>'Title', -'LBL_LIST_ACCOUNT_NAME'=>'Account Name', -'LBL_LIST_EMAIL_ADDRESS'=>'Email', -'LBL_LIST_PHONE'=>'Phone', -'LBL_LIST_CONTACT_ROLE'=>'Role', - -//DON'T CONVERT THESE THEY ARE MAPPINGS -'db_last_name' => 'LBL_LIST_LAST_NAME', -'db_first_name' => 'LBL_LIST_FIRST_NAME', -'db_title' => 'LBL_LIST_TITLE', -'db_email1' => 'LBL_LIST_EMAIL_ADDRESS', -'db_email2' => 'LBL_LIST_EMAIL_ADDRESS', -//END DON'T CONVERT - -'LBL_EXISTING_CONTACT' => 'Used an existing contact', -'LBL_CREATED_CONTACT' => 'Created a new contact', -'LBL_EXISTING_ACCOUNT' => 'Used an existing vtiger_account', -'LBL_CREATED_ACCOUNT' => 'Created a new vtiger_account', -'LBL_CREATED_CALL' => 'Created a new call', -'LBL_CREATED_MEETING' => 'Created a new meeting', -'LBL_ADDMORE_BUSINESSCARD' =>'Add another business card', -'LBL_ADD_BUSINESSCARD' => 'Add Business Card', - -'LBL_BUSINESSCARD' => 'Business Card', - -'LBL_NAME'=>'Name:', -'LBL_CONTACT_NAME'=>'Contact Name:', -'LBL_CONTACT_INFORMATION'=>'Contact Information', -'LBL_CUSTOM_INFORMATION'=>'Custom Information', -'LBL_FIRST_NAME'=>'First Name:', -'LBL_OFFICE_PHONE'=>'Office Phone:', -'LBL_ACCOUNT_NAME'=>'Account Name:', -'LBL_ANY_PHONE'=>'Any Phone:', -'LBL_PHONE'=>'Phone:', -'LBL_LAST_NAME'=>'Last Name:', -'LBL_MOBILE_PHONE'=>'Mobile:', -'LBL_HOME_PHONE'=>'Home:', -'LBL_LEAD_SOURCE'=>'Lead Source:', -'LBL_OTHER_PHONE'=>'Other Phone:', -'LBL_FAX_PHONE'=>'Fax:', -'LBL_TITLE'=>'Title:', -'LBL_DEPARTMENT'=>'Department:', -'LBL_BIRTHDATE'=>'Birthdate:', -'LBL_EMAIL_ADDRESS'=>'Email:', -'LBL_OTHER_EMAIL_ADDRESS'=>'Other Email:', -'LBL_ANY_EMAIL'=>'Any Email:', -'LBL_REPORTS_TO'=>'Reports To:', -'LBL_ASSISTANT'=>'Assistant:', -'LBL_YAHOO_ID'=>'Yahoo! ID:', -'LBL_ASSISTANT_PHONE'=>'Assistant Phone:', -'LBL_DO_NOT_CALL'=>'Do Not Call:', -'LBL_EMAIL_OPT_OUT'=>'Email Opt Out:', -'LBL_PRIMARY_ADDRESS'=>'Primary Address:', -'LBL_ALTERNATE_ADDRESS'=>'Other Address:', -'LBL_ANY_ADDRESS'=>'Any Address:', -'LBL_CITY'=>'City:', -'LBL_STATE'=>'State:', -'LBL_POSTAL_CODE'=>'Postal Code:', -'LBL_COUNTRY'=>'Country:', -'LBL_DESCRIPTION_INFORMATION'=>'Description Information', -'LBL_IMAGE_INFORMATION'=>'Contact Image Information:', -'LBL_ADDRESS_INFORMATION'=>'Address Information', -'LBL_DESCRIPTION'=>'Description:', -'LBL_CONTACT_ROLE'=>'Role:', -'LBL_OPP_NAME'=>'Opportunity Name:', -'LBL_DUPLICATE'=>'Potential Duplicate Contacts', -'MSG_DUPLICATE' => 'Creating this contact may vtiger_potentialy create a duplicate contact. You may either select a contact from the list below or you may click on Create New Contact to continue creating a new contact with the previously entered data.', - -'LNK_NEW_APPOINTMENT' => 'New Appointment', -'LBL_ADD_BUSINESSCARD' => 'Add Business Card', -'NTC_DELETE_CONFIRMATION'=>'Are you sure you want to delete this record?', -'NTC_REMOVE_CONFIRMATION'=>'Are you sure you want to remove this contact from this case?', -'NTC_REMOVE_DIRECT_REPORT_CONFIRMATION'=>'Are you sure you want to remove this record as a direct vtiger_report?', -'ERR_DELETE_RECORD'=>"en_us A record number must be specified to delete the contact.", -'NTC_COPY_PRIMARY_ADDRESS'=>'Copy primary address to alternate address', -'NTC_COPY_ALTERNATE_ADDRESS'=>'Copy alternate address to primary address', - -'LBL_SELECT_CONTACT'=>'Select Contact', -//Added for search heading -'LBL_GENERAL_INFORMATION'=>'General Information', - - - -//for v4 release added -'LBL_NEW_POTENTIAL'=>'New Potential', -'LBL_POTENTIAL_TITLE'=>'Potentials', - -'LBL_NEW_TASK'=>'New Task', -'LBL_TASK_TITLE'=>'Tasks', -'LBL_NEW_CALL'=>'New Call', -'LBL_CALL_TITLE'=>'Calls', -'LBL_NEW_MEETING'=>'New Meeting', -'LBL_MEETING_TITLE'=>'Meetings', -'LBL_NEW_EMAIL'=>'New Email', -'LBL_EMAIL_TITLE'=>'Emails', -'LBL_NEW_NOTE'=>'New Note', -'LBL_NOTE_TITLE'=>'Notes', - -// Added for 4GA -'LBL_TOOL_FORM_TITLE'=>'Contact Tools', - -'Salutation'=>'Salutation', -'First Name'=>'First Name', -'Office Phone'=>'Office Phone', -'Last Name'=>'Last Name', -'Mobile'=>'Mobile', -'Account Name'=>'Account Name', -'Home Phone'=>'Home Phone', -'Lead Source'=>'Lead Source', -'Phone'=>'Phone', -'Title'=>'Title', -'Fax'=>'Fax', -'Department'=>'Department', -'Birthdate'=>'Birthdate', -'Email'=>'Email', -'Reports To'=>'Reports To', -'Assistant'=>'Assistant', -'Yahoo Id'=>'Yahoo Id', -'Assistant Phone'=>'Assistant Phone', -'Do Not Call'=>'Do Not Call', -'Email Opt Out'=>'Email Opt Out', -'Assigned To'=>'Assigned To', -'Campaign Source'=>'Campaign Source', -'Reference' =>'Reference', -'Created Time'=>'Created Time', -'Modified Time'=>'Modified Time', -'Mailing Street'=>'Mailing Street', -'Other Street'=>'Other Street', -'Mailing City'=>'Mailing City', -'Mailing State'=>'Mailing State', -'Mailing Zip'=>'Mailing Postal Code', -'Mailing Country'=>'Mailing Country', -'Mailing Po Box'=>'Mailing PO Box', -'Other Po Box'=>'Other PO Box', -'Other City'=>'Other City', -'Other State'=>'Other State', -'Other Zip'=>'Other Postal Code', -'Other Country'=>'Other Country', -'Contact Image'=>'Contact Image', -'Description'=>'Description', - -// Added vtiger_fields for Add Business Card -'LBL_NEW_CONTACT'=>'New Contact', -'LBL_NEW_ACCOUNT'=>'New Account', -'LBL_NOTE_SUBJECT'=>'Note Subject:', -'LBL_NOTE'=>'Note:', -'LBL_WEBSITE'=>'Website:', -'LBL_NEW_APPOINTMENT'=>'New Appointment', -'LBL_SUBJECT'=>'Subject:', -'LBL_START_DATE'=>'Start Date:', -'LBL_START_TIME'=>'Start Time:', - -//Added vtiger_field after 4_0_1 -'Portal User'=>'Portal User', -'LBL_CUSTOMER_PORTAL_INFORMATION'=>'Customer Portal Information', -'Support Start Date'=>'Support Start Date', -'Support End Date'=>'Support End Date', -//Added for 4.2 Release -- CustomView -'Name'=>'Name', -'LBL_ALL'=>'All', -'LBL_MAXIMUM_LIMIT_ERROR'=>'Sorry, the uploaded file exceeds the maximum vtiger_filesize limit. Please try a file smaller than 800000 bytes', -'LBL_UPLOAD_ERROR'=>'Problems in file upload. Please try again!', -'LBL_IMAGE_ERROR'=>'The given file is not of type image(.gif/.jpg/.png)', -'LBL_INVALID_IMAGE'=>'Invalid file OR File has no data', - -//Added after 5Alpha5 -'Notify Owner'=>'Notify Owner', - -//Added for Picklist Values -'--None--'=>'--None--', - -'Mr.'=>'Mr.', -'Ms.'=>'Ms.', -'Mrs.'=>'Mrs.', -'Dr.'=>'Dr.', -'Prof.'=>'Prof.', - -'Cold Call'=>'Cold Call', -'Existing Customer'=>'Existing Customer', -'Self Generated'=>'Self Generated', -'Employee'=>'Employee', -'Partner'=>'Partner', -'Public Relations'=>'Public Relations', -'Direct Mail'=>'Direct Mail', -'Conference'=>'Conference', -'Trade Show'=>'Trade Show', -'Web Site'=>'Web Site', -'Word of mouth'=>'Word of mouth', -'Other'=>'Other', -'User List'=>'User List', - -// Added for multi organization support TRAC #2035 -'LBL_COMPANY_ASSIGNMENT'=>'Organization Assignment', -'Organization Assignment'=>'Assigned to', - - -); - -?> +'Contacts', +'LBL_INVITEE'=>'Direct Reports', +'LBL_MODULE_TITLE'=>'Contacts: Home', +'LBL_SEARCH_FORM_TITLE'=>'Contact Search', +'LBL_LIST_FORM_TITLE'=>'Contact List', +'LBL_NEW_FORM_TITLE'=>'New Contact', +'LBL_CONTACT_OPP_FORM_TITLE'=>'Contact-Opportunity:', +'LBL_CONTACT'=>'Contact:', + +'LBL_LIST_NAME'=>'Name', +'LBL_LIST_LAST_NAME'=>'Last Name', +'LBL_LIST_FIRST_NAME'=>'First Name', +'LBL_LIST_CONTACT_NAME'=>'Contact Name', +'LBL_LIST_TITLE'=>'Title', +'LBL_LIST_ACCOUNT_NAME'=>'Account Name', +'LBL_LIST_EMAIL_ADDRESS'=>'Email', +'LBL_LIST_PHONE'=>'Phone', +'LBL_LIST_CONTACT_ROLE'=>'Role', + +//DON'T CONVERT THESE THEY ARE MAPPINGS +'db_last_name' => 'LBL_LIST_LAST_NAME', +'db_first_name' => 'LBL_LIST_FIRST_NAME', +'db_title' => 'LBL_LIST_TITLE', +'db_email1' => 'LBL_LIST_EMAIL_ADDRESS', +'db_email2' => 'LBL_LIST_EMAIL_ADDRESS', +//END DON'T CONVERT + +'LBL_EXISTING_CONTACT' => 'Used an existing contact', +'LBL_CREATED_CONTACT' => 'Created a new contact', +'LBL_EXISTING_ACCOUNT' => 'Used an existing vtiger_account', +'LBL_CREATED_ACCOUNT' => 'Created a new vtiger_account', +'LBL_CREATED_CALL' => 'Created a new call', +'LBL_CREATED_MEETING' => 'Created a new meeting', +'LBL_ADDMORE_BUSINESSCARD' =>'Add another business card', + +'LBL_BUSINESSCARD' => 'Business Card', + +'LBL_NAME'=>'Name:', +'LBL_CONTACT_NAME'=>'Contact Name:', +'LBL_CONTACT_INFORMATION'=>'Contact Information', +'LBL_CUSTOM_INFORMATION'=>'Custom Information', +'LBL_FIRST_NAME'=>'First Name:', +'LBL_OFFICE_PHONE'=>'Office Phone:', +'LBL_ACCOUNT_NAME'=>'Account Name:', +'LBL_ANY_PHONE'=>'Any Phone:', +'LBL_PHONE'=>'Phone:', +'LBL_LAST_NAME'=>'Last Name:', +'LBL_MOBILE_PHONE'=>'Mobile:', +'LBL_HOME_PHONE'=>'Home:', +'LBL_LEAD_SOURCE'=>'Lead Source:', +'LBL_OTHER_PHONE'=>'Other Phone:', +'LBL_FAX_PHONE'=>'Fax:', +'LBL_TITLE'=>'Title:', +'LBL_DEPARTMENT'=>'Department:', +'LBL_BIRTHDATE'=>'Birthdate:', +'LBL_EMAIL_ADDRESS'=>'Email:', +'LBL_OTHER_EMAIL_ADDRESS'=>'Other Email:', +'LBL_ANY_EMAIL'=>'Any Email:', +'LBL_REPORTS_TO'=>'Reports To:', +'LBL_ASSISTANT'=>'Assistant:', +'LBL_YAHOO_ID'=>'Yahoo! ID:', +'LBL_ASSISTANT_PHONE'=>'Assistant Phone:', +'LBL_DO_NOT_CALL'=>'Do Not Call:', +'LBL_EMAIL_OPT_OUT'=>'Email Opt Out:', +'LBL_PRIMARY_ADDRESS'=>'Primary Address:', +'LBL_ALTERNATE_ADDRESS'=>'Other Address:', +'LBL_ANY_ADDRESS'=>'Any Address:', +'LBL_CITY'=>'City:', +'LBL_STATE'=>'State:', +'LBL_POSTAL_CODE'=>'Postal Code:', +'LBL_COUNTRY'=>'Country:', +'LBL_DESCRIPTION_INFORMATION'=>'Description Information', +'LBL_IMAGE_INFORMATION'=>'Contact Image Information:', +'LBL_ADDRESS_INFORMATION'=>'Address Information', +'LBL_DESCRIPTION'=>'Description:', +'LBL_CONTACT_ROLE'=>'Role:', +'LBL_OPP_NAME'=>'Opportunity Name:', +'LBL_DUPLICATE'=>'Potential Duplicate Contacts', +'MSG_DUPLICATE' => 'Creating this contact may vtiger_potentialy create a duplicate contact. You may either select a contact from the list below or you may click on Create New Contact to continue creating a new contact with the previously entered data.', + +'LNK_NEW_APPOINTMENT' => 'New Appointment', +'LBL_ADD_BUSINESSCARD' => 'Add Business Card', +'NTC_DELETE_CONFIRMATION'=>'Are you sure you want to delete this record?', +'NTC_REMOVE_CONFIRMATION'=>'Are you sure you want to remove this contact from this case?', +'NTC_REMOVE_DIRECT_REPORT_CONFIRMATION'=>'Are you sure you want to remove this record as a direct vtiger_report?', +'ERR_DELETE_RECORD'=>"en_us A record number must be specified to delete the contact.", +'NTC_COPY_PRIMARY_ADDRESS'=>'Copy primary address to alternate address', +'NTC_COPY_ALTERNATE_ADDRESS'=>'Copy alternate address to primary address', + +'LBL_SELECT_CONTACT'=>'Select Contact', +//Added for search heading +'LBL_GENERAL_INFORMATION'=>'General Information', + + + +//for v4 release added +'LBL_NEW_POTENTIAL'=>'New Potential', +'LBL_POTENTIAL_TITLE'=>'Potentials', + +'LBL_NEW_TASK'=>'New Task', +'LBL_TASK_TITLE'=>'Tasks', +'LBL_NEW_CALL'=>'New Call', +'LBL_CALL_TITLE'=>'Calls', +'LBL_NEW_MEETING'=>'New Meeting', +'LBL_MEETING_TITLE'=>'Meetings', +'LBL_NEW_EMAIL'=>'New Email', +'LBL_EMAIL_TITLE'=>'Emails', +'LBL_NEW_NOTE'=>'New Note', +'LBL_NOTE_TITLE'=>'Notes', + +// Added for 4GA +'LBL_TOOL_FORM_TITLE'=>'Contact Tools', + +'Salutation'=>'Salutation', +'First Name'=>'First Name', +'Office Phone'=>'Office Phone', +'Last Name'=>'Last Name', +'Mobile'=>'Mobile', +'Account Name'=>'Account Name', +'Home Phone'=>'Home Phone', +'Lead Source'=>'Lead Source', +'Phone'=>'Phone', +'Title'=>'Title', +'Fax'=>'Fax', +'Department'=>'Department', +'Birthdate'=>'Birthdate', +'Email'=>'Email', +'Reports To'=>'Reports To', +'Assistant'=>'Assistant', +'Yahoo Id'=>'Yahoo Id', +'Assistant Phone'=>'Assistant Phone', +'Do Not Call'=>'Do Not Call', +'Email Opt Out'=>'Email Opt Out', +'Assigned To'=>'Assigned To', +'Campaign Source'=>'Campaign Source', +'Reference' =>'Reference', +'Created Time'=>'Created Time', +'Modified Time'=>'Modified Time', +'Mailing Street'=>'Mailing Street', +'Other Street'=>'Other Street', +'Mailing City'=>'Mailing City', +'Mailing State'=>'Mailing State', +'Mailing Zip'=>'Mailing Postal Code', +'Mailing Country'=>'Mailing Country', +'Mailing Po Box'=>'Mailing PO Box', +'Other Po Box'=>'Other PO Box', +'Other City'=>'Other City', +'Other State'=>'Other State', +'Other Zip'=>'Other Postal Code', +'Other Country'=>'Other Country', +'Contact Image'=>'Contact Image', +'Description'=>'Description', + +// Added vtiger_fields for Add Business Card +'LBL_NEW_CONTACT'=>'New Contact', +'LBL_NEW_ACCOUNT'=>'New Account', +'LBL_NOTE_SUBJECT'=>'Note Subject:', +'LBL_NOTE'=>'Note:', +'LBL_WEBSITE'=>'Website:', +'LBL_NEW_APPOINTMENT'=>'New Appointment', +'LBL_SUBJECT'=>'Subject:', +'LBL_START_DATE'=>'Start Date:', +'LBL_START_TIME'=>'Start Time:', + +//Added vtiger_field after 4_0_1 +'Portal User'=>'Portal User', +'LBL_CUSTOMER_PORTAL_INFORMATION'=>'Customer Portal Information', +'Support Start Date'=>'Support Start Date', +'Support End Date'=>'Support End Date', +//Added for 4.2 Release -- CustomView +'Name'=>'Name', +'LBL_ALL'=>'All', +'LBL_MAXIMUM_LIMIT_ERROR'=>'Sorry, the uploaded file exceeds the maximum vtiger_filesize limit. Please try a file smaller than 800000 bytes', +'LBL_UPLOAD_ERROR'=>'Problems in file upload. Please try again!', +'LBL_IMAGE_ERROR'=>'The given file is not of type image(.gif/.jpg/.png)', +'LBL_INVALID_IMAGE'=>'Invalid file OR File has no data', + +//Added after 5Alpha5 +'Notify Owner'=>'Notify Owner', + +//Added for Picklist Values +'--None--'=>'--None--', + +'Mr.'=>'Mr.', +'Ms.'=>'Ms.', +'Mrs.'=>'Mrs.', +'Dr.'=>'Dr.', +'Prof.'=>'Prof.', + +'Cold Call'=>'Cold Call', +'Existing Customer'=>'Existing Customer', +'Self Generated'=>'Self Generated', +'Employee'=>'Employee', +'Partner'=>'Partner', +'Public Relations'=>'Public Relations', +'Direct Mail'=>'Direct Mail', +'Conference'=>'Conference', +'Trade Show'=>'Trade Show', +'Web Site'=>'Web Site', +'Word of mouth'=>'Word of mouth', +'Other'=>'Other', +'User List'=>'User List', + +// Added for multi organization support TRAC #2035 +'LBL_COMPANY_ASSIGNMENT'=>'Organization Assignment', +'Organization Assignment'=>'Assigned to', + + +//Added for 5.0.3 +'Customer Portal Login Details'=>'Customer Portal Login Details', +'Dear'=>'Dear', +'Your Customer Portal Login details are given below:'=>'Your Customer Portal Login details are given below:', +'User Id :'=>'User Id :', +'Password :'=>'Password :', +'Please Login Here'=>'Please Login Here', +'Note :'=>'Note :', +'We suggest you to change your password after logging in first time'=>'We suggest you to change your password after logging in first time.', +'Support Team'=>'Support Team', + + +'TITLE_AJAX_CSS_POPUP_CHAT'=>'Ajax Css-Popup chat', +); + +?> Modified: vtigercrm/branches/5.1_jens/modules/Contacts/updateRelations.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/updateRelations.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/updateRelations.php Mon Apr 16 12:27:44 2007 @@ -8,13 +8,16 @@ * All Rights Reserved. * ********************************************************************************/ - require_once('include/database/PearDatabase.php'); require_once('user_privileges/default_module_view.php'); global $adb, $singlepane_view; $idlist = $_REQUEST['idlist']; -$update_mod = $_REQUEST['destination_module']; -$rel_table = 'vtiger_campaigncontrel'; +$dest_mod = $_REQUEST['destination_module']; +$record = $_REQUEST['record']; + +if($singlepane_view == 'true') $action = "DetailView"; +else $action = "CallRelatedList"; + if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '') { //split the string and store in an array @@ -23,23 +26,28 @@ { if($id != '') { - $sql = "insert into ".$rel_table." values(".$id.",".$_REQUEST["parentid"].")"; - $adb->query($sql); + if($dest_mod == 'Products') + $adb->query("insert into vtiger_seproductsrel values (".$_REQUEST["parentid"].",".$id.",'Contacts')"); + elseif($dest_mod == 'Campaigns') + $adb->query("insert into vtiger_campaigncontrel values(".$id.",".$_REQUEST["parentid"].")"); } } - if($singlepane_view == 'true') - header("Location: index.php?action=DetailView&module=Contacts&record=".$_REQUEST["parentid"]); - else - header("Location: index.php?action=CallRelatedList&module=Contacts&record=".$_REQUEST["parentid"]); + $record = $_REQUEST["parentid"]; } elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '') +{ + if($dest_mod == 'Products') + $adb->query("insert into vtiger_seproductsrel values (".$_REQUEST["parid"].",".$_REQUEST["entityid"].",'Contacts')"); + elseif($dest_mod == 'Campaigns') + $adb->query("insert into vtiger_campaigncontrel values(".$_REQUEST["entityid"].",".$_REQUEST["parid"].")"); + $record = $_REQUEST["parid"]; +} +elseif(isset($_REQUEST['pot_id']) && $_REQUEST['pot_id'] != '') { - $sql = "insert into ".$rel_table." values(".$_REQUEST["entityid"].",".$_REQUEST["parid"].")"; - $adb->query($sql); - if($singlepane_view == 'true') - header("Location: index.php?action=DetailView&module=Contacts&record=".$_REQUEST["parid"]); - else - header("Location: index.php?action=CallRelatedList&module=Contacts&record=".$_REQUEST["parid"]); + $sql = "insert into vtiger_contpotentialrel values(".$record.",".$_REQUEST["pot_id"].")"; + $adb->query($sql); } +header("Location: index.php?action=$action&module=Contacts&record=".$record); + ?> Modified: vtigercrm/branches/5.1_jens/modules/Contacts/vtchat.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/vtchat.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/vtchat.php Mon Apr 16 12:27:44 2007 @@ -1,107 +1,110 @@ - - - - - - - - - - -Ajax Css-Popup chat - - - - - - - - - - - - - - - - - - - - - - - - -
    + '; + echo $html_string; +?> Modified: vtigercrm/branches/5.1_jens/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Calendar/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -25,7 +25,6 @@ 'LBL_MODULE_TITLE'=>'Calendar: Home', 'LBL_MODULE_APPOINTMENT'=>'Calendar: Appointment', 'LBL_MODULE_APPOINTMENT_DETAIL'=>'Calendar: Appointment Detail', -'LBL_CONTACT'=>'Contact:', 'LBL_SAVE'=>'Save', 'LBL_RESET'=>'Cancel', 'LBL_LIST_USER_NAME'=>'User Name', @@ -39,8 +38,7 @@ 'LBL_USE24'=>'Use 24 hours format', 'LBL_CALSTART'=>'Start my calendar time at', 'LBL_TIMESETTINGS'=>'Time Settings', -'LBL_OPENCAL'=>'Open Calendar', - +'LBL_HOLDFOLLOWUP'=>'Hold followup on', 'LBL_CALL' => 'Call', 'LBL_MEET' => 'Meeting', 'LBL_APPNT' => 'Appointment', @@ -82,10 +80,6 @@ 'LBL_APPCREATED_BY' => 'Created by', -'LBL_APP_START_DATE' => 'Start Date', -'LBL_APP_START_TIME' => 'Start Time', -'LBL_APP_END_DATE' => 'End Date', -'LBL_APP_END_TIME' => 'End Time', 'LBL_AT_DATE_TIME' => 'at', 'LBL_MON' => 'Month', @@ -94,7 +88,6 @@ 'LBL_PREV_MON' => 'Previous Month', 'LBL_NEXT_MON' => 'Next Month', -'LBL_YEAR'=>'Year', 'LBL_YEAR_BUTTON_KEY'=>'Y', 'LBL_MON_BUTTON_TITLE'=>'Year [Alt+Y]', 'LBL_PREV_YEAR'=>'Previous Year', @@ -173,53 +166,53 @@ "Dec", ), +'LBL_TIME'=>'Time', +'LBL_START_TIME' => 'Start Time', +'LBL_END_TIME' => 'End Time', +'LBL_START_DATE'=>'Start Date', +'LBL_DUE_DATE'=>'Due Date', +'LBL_START_DATE_TIME'=>'Start Date & Time', +'LBL_END_DATE_TIME'=>'End Date & Time', +'LBL_TODO'=>'To Do', +'LBL_TODOS'=>'To Dos', 'LBL_EVENTS'=>'Events', -'LBL_TODOS'=>'To Dos', -'LBL_TIME'=>'Time', +'LBL_TOTALEVENTS'=>'My Total Events :', +'LBL_TOTALTODOS'=>'My Total To Dos :', +'LBL_VIEW'=>'View', +'LBL_LISTVIEW'=>'List View', +'LBL_HRVIEW'=>'Hour View', +'LBL_WEEKVIEW'=>'Weekly Calendar View', +'LBL_MONTHVIEW'=>'Monthly Calendar View', +'LBL_YEARVIEW'=>'Yearly Calendar View', +'LBL_STATUS'=>'Status', +'LBL_ACTION'=>'Actions', +'LBL_ADD'=>'Add', +'LBL_OPENCAL'=>'Open Calendar', + + 'LBL_ADD_EVENT'=>'Add Event', -'LBL_ADD'=>'Add', 'LBL_ADDCALL'=>'Call', 'LBL_ADDMEETING'=>'Meeting', 'LBL_ADDTODO'=>'To Do', -'LBL_INVITE'=>'Invite', -'LBL_REMINDER'=>'Reminder', -'LBL_SENDREMINDER'=>'Send Reminder', 'LBL_BEFOREEVENT'=>'before the event starts', 'LBL_BEFORETASK'=>'before the task starts', -'LBL_REPEAT'=>'Repeat', -'LBL_EVENTTYPE'=>'Event Type', -'LBL_EVENTNAME'=>'Event Name', -'LBL_EVENTSTAT'=>'Event starts at', -'LBL_EVENTEDAT'=>'Event ends on', -'LBL_HRVIEW'=>'Hour View', -'LBL_LISTVIEW'=>'List View', -'LBL_WEEKVIEW'=>'Weekly Calendar View', -'LBL_MONTHVIEW'=>'Monthly Calendar View', -'LBL_YEARVIEW'=>'Yearly Calendar View', -'LBL_TOTALEVENTS'=>'Total Events :', -'LBL_TOTALTODOS'=>'Total To Dos :', -'LBL_EVTDTL'=>'Event Details', -'LBL_ACTION'=>'Actions', +'LBL_EVENTDETAILS'=>'Event Details', 'LBL_CURSTATUS'=>'Current Status', 'LBL_ASSINGEDTO'=>'Assigned To', 'LBL_RELATEDTO'=>'Related To', -'LBL_STATUS'=>'Status', 'LBL_PENDING'=>'Pending', 'LBL_PUBLIC'=>'Mark Public', 'LBL_MORE'=>'More', -'LBL_VIEW'=>'View', 'LBL_EDIT'=>'Edit', 'LBL_EVERYDAY'=>'Every Day', 'LBL_EVERYWEEK'=>'Every Week', 'LBL_EVERYMON'=>'Every Month', -'LBL_REPEATEVENT'=>'Repeat once in every', -'LBL_DAYS'=>'Day(s)', 'LBL_WEEKS'=>'Week(s)', 'LBL_MONTHS'=>'Month(s)', 'LBL_YEAR'=>'Year', 'LBL_NONE_SCHEDULED'=>'None Scheduled', -'LBL_INVITE_INST1'=>'To invite, select the users from the "Available Users" list and click the "Add" button.', +'LBL_INVITE_INST1'=>'To share, select the users from the "Available Users" list and click the "Add" button.', 'LBL_INVITE_INST2'=>'To remove, select the users in the "Selected Users" list and the click "Remove" button.', 'LBL_SELUSR_INFO'=>' Selected users will receive an email about the Event.', 'LBL_CALSHAREMESSAGE'=>'Share my calendar with the following selected users', @@ -229,7 +222,6 @@ 'LBL_ADD_BUTTON'=>'Add', 'LBL_USERS'=>'Users', 'LBL_RMV_BUTTON'=>'Remove', -'LBL_RMD_ON'=>'Remind on', 'LBL_SDRMD'=>'Send Reminder to', 'LBL_ENABLE_REPEAT'=>'Enable Repeat', 'LBL_REPEAT_ONCE'=>'Repeat once in every', @@ -241,12 +233,13 @@ -//DON'T CONVERT THESE THEY ARE MAPPINGS +//DON'T CONVERT THESE THEY ARE MAPPINGS - STARTS 'db_last_name' => 'LBL_LIST_LAST_NAME', 'db_first_name' => 'LBL_LIST_FIRST_NAME', 'db_title' => 'LBL_LIST_TITLE', 'db_email1' => 'LBL_LIST_EMAIL_ADDRESS', 'db_email2' => 'LBL_LIST_EMAIL_ADDRESS', +//DON'T CONVERT THESE THEY ARE MAPPINGS -ENDS 'LBL_COMPLETED'=>'Mark Completed', 'LBL_DEFERRED'=>'Mark Deferred', 'LBL_HELD'=>'Mark Held', @@ -254,7 +247,6 @@ 'LBL_POSTPONE'=>'Postpone', 'LBL_CHANGEOWNER'=>'Change Owner', 'LBL_DEL'=>'Delete', -//END DON'T CONVERT //Added for actvity merge with calendar 'LBL_SEARCH_FORM_TITLE'=>'Activity Search', @@ -262,8 +254,13 @@ 'LBL_NEW_FORM_TITLE'=>'New Activity', 'LBL_TASK_INFORMATION'=>'Task Information', 'LBL_EVENT_INFORMATION'=>'Event Information', +'LBL_CALENDAR_INFORMATION'=>'Calendar Information', 'LBL_NAME'=>'Subject:', +'LBL_ACTIVITY_NOTIFICATION'=>'This is a notification that an activity is assigned to you that has been', +'LBL_ACTIVITY_INVITATION'=>'You have been invited for an activity that has been ', +'LBL_DETAILS_STRING'=>'The details are', +'LBL_REGARDS_STRING'=>'Thanks & Regards', 'LBL_CONTACT_NAME'=>'Contact Name', 'LBL_OPEN_ACTIVITIES'=>'Open Activities', 'LBL_ACTIVITY'=>'Activity:', @@ -362,14 +359,14 @@ 'LBL_INVITE'=>'Invite', 'LBL_REPEAT'=>'Repeat', 'LBL_REMINDER'=>'Reminder', -'LBL_ENABLE_REPEAT'=>'Enable Repeat', 'LBL_SENDREMINDER'=>'Send Reminder', 'LBL_NOTIFICATION'=>'Notification', 'LBL_SENDNOTIFICATION'=>'Send Notification', 'LBL_RMD_ON'=>'Remind on', 'LBL_REPEATEVENT'=>'Repeat once in every', 'LBL_TIMEDATE'=>'Time & Date', -'LBL_TODO'=>'To Do', +'LBL_HR'=>'Hr', +'LBL_MIN'=>'min', 'LBL_EVENT'=>'Event', 'Daily'=>'Day(s)', 'Weekly'=>'Week(s)', @@ -389,6 +386,8 @@ 'Last'=>'Last', 'on'=>'on', 'day of the month'=>'day of the month', +'Private'=>'Private', +'Public'=>'Public', //Added for existing Picklist entries @@ -405,6 +404,17 @@ 'Call'=>'Call', 'Meeting'=>'Meeting', +//added to send dates and time in calendar notification/invitation mail. + +'Start date and time'=>'Start Date & Time', +'End date and time'=>'End Date & Time', +//this is for task +'End date'=>'End date', +'LBL_SET_DATE'=>'Set date..', +'Recurrence'=>'Recurrence', +'SHARED_EVENT_DEL_MSG'=>'The User does not have permission to Delete this record.', + + ); ?> Modified: vtigercrm/branches/5.1_jens/modules/Calendar/script.js ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Calendar/script.js (original) +++ vtigercrm/branches/5.1_jens/modules/Calendar/script.js Mon Apr 16 12:27:44 2007 @@ -23,7 +23,7 @@ } else { - alert("Please select at least one user"); + alert(alert_arr.SELECT_ATLEAST_ONE_USER); return false; } } @@ -43,11 +43,11 @@ } else { - alert("Please select at least one user"); + alert(alert_arr.SELECT_ATLEAST_ONE_USER); return false; } } - if(confirm("Are you sure you want to disable sharing for selected "+xx+" user(s) ?")) + if(confirm(alert_arr.DISABLE_SHARING_CONFIRMATION+xx+alert_arr.USERS)) { document.SharedList.action="index.php?module=Calendar&action=disable_sharing&return_module=Calendar&return_action=calendar_share"; } @@ -92,6 +92,8 @@ function gshow(argg1,type,startdate,enddate,starthr,startmin,startfmt,endhr,endmin,endfmt,viewOption,subtab) { + smin = parseInt(startmin,10); + smin = smin - (smin%5); var y=document.getElementById(argg1).style; if(type == 'call' || type == 'meeting') @@ -100,24 +102,22 @@ document.EditView.activitytype[0].checked = true; if(type == 'meeting') document.EditView.activitytype[1].checked = true; - + smin = _2digit(smin); document.EditView.date_start.value = startdate; - document.EditView.due_date.value = enddate; document.EditView.starthr.value = starthr; - document.EditView.startmin.value = startmin; + document.EditView.startmin.value = smin; document.EditView.startfmt.value = startfmt; - document.EditView.endhr.value = endhr; - document.EditView.endmin.value = endmin; - document.EditView.endfmt.value = endfmt; document.EditView.viewOption.value = viewOption; document.EditView.subtab.value = subtab; + calDuedatetime(type); } if(type == 'todo') { + smin = _2digit(smin); document.createTodo.task_date_start.value = startdate; document.createTodo.task_due_date.value = enddate; document.createTodo.starthr.value = starthr; - document.createTodo.startmin.value = startmin; + document.createTodo.startmin.value = smin; document.createTodo.startfmt.value = startfmt; document.createTodo.viewOption.value = viewOption; document.createTodo.subtab.value = subtab; @@ -190,57 +190,58 @@ } function maincheck_form() { - formSelectColumnString('inviteesid'); - starthour = document.EditView.starthr.value; - startmin = document.EditView.startmin.value; + formSelectColumnString('inviteesid','selectedusers'); + starthour = parseInt(document.EditView.starthr.value,10); + startmin = parseInt(document.EditView.startmin.value,10); startformat = document.EditView.startfmt.value; - endhour = document.EditView.endhr.value; - endmin = document.EditView.endmin.value; - endformat = document.EditView.endfmt.value; + endhour = parseInt(document.EditView.endhr.value,10); + endmin = parseInt(document.EditView.endmin.value,10); + endformat = document.EditView.endfmt.value; + followupformat = document.EditView.followup_startfmt.value; + followuphour = parseInt(document.EditView.followup_starthr.value,10); + followupmin = parseInt(document.EditView.followup_startmin.value,10); if(formValidate()) { if(startformat != '') { if(startformat == 'pm') { - if(starthour == '12') + if(starthour == 12) starthour = 12; else - starthour = eval(starthour) + 12; - startmin = startmin; + starthour = starthour + 12; } else { - if(starthour == '12') + if(starthour == 12) starthour = 0; else starthour = starthour; - startmin = startmin; } } if(endformat != '') { if(endformat == 'pm') { - if(endhour == '12') + if(endhour == 12) endhour = 12; else - endhour = eval(endhour) + 12; - endmin = endmin; + endhour = endhour + 12; } else { - if(endhour == '12') + if(endhour == 12) endhour = 0; else endhour = endhour; - endmin = endmin; } } var dateval1=getObj('date_start').value.replace(/^\s+/g, '').replace(/\s+$/g, ''); var dateval2=getObj('due_date').value.replace(/^\s+/g, '').replace(/\s+$/g, ''); - var dateelements1=splitDateVal(dateval1) - var dateelements2=splitDateVal(dateval2) + var dateval3=getObj('followup_date').value.replace(/^\s+/g, '').replace(/\s+$/g, ''); + var dateelements1=splitDateVal(dateval1); + var dateelements2=splitDateVal(dateval2); + var dateelements3=splitDateVal(dateval3); dd1=dateelements1[0] mm1=dateelements1[1] @@ -249,8 +250,14 @@ dd2=dateelements2[0] mm2=dateelements2[1] yyyy2=dateelements2[2] + + dd3=dateelements3[0] + mm3=dateelements3[1] + yyyy3=dateelements3[2] + var date1=new Date() var date2=new Date() + var date3=new Date() date1.setYear(yyyy1) date1.setMonth(mm1-1) @@ -259,17 +266,22 @@ date2.setYear(yyyy2) date2.setMonth(mm2-1) date2.setDate(dd2) + + date3.setYear(yyyy3) + date3.setMonth(mm3-1) + date3.setDate(dd3) + if (date2<=date1) { - if((eval(endhour)*60+eval(endmin)) <= (eval(starthour)*60+eval(startmin))) - { - alert("End Time should be greater than Start Time "); + if((endhour*60+endmin) <= (starthour*60+startmin)) + { + alert(alert_arr.ENDTIME_GREATER_THAN_STARTTIME); document.EditView.endhr.focus(); return false; } else { - durationinmin = (eval(endhour)*60+eval(endmin)) - (eval(starthour)*60+eval(startmin)); + durationinmin = (endhour*60+endmin) - (starthour*60+startmin); if(durationinmin >= 60) { hour = durationinmin/60; @@ -284,8 +296,67 @@ document.EditView.duration_minutes.value = minute; } } - document.EditView.time_start.value = starthour+':'+startmin; - document.EditView.time_end.value = endhour+':'+endmin; + event_starthour = _2digit(starthour); + event_startmin = _2digit(startmin); + event_endhour = _2digit(endhour); + event_endmin = _2digit(endmin); + document.EditView.time_start.value = event_starthour+':'+event_startmin; + document.EditView.time_end.value = event_endhour+':'+event_endmin; + // Added for Aydin Kurt-Elli requirement START -by Minnie + if (document.EditView.followup.checked == true && document.getElementById('date_table_thirdtd').style.display == 'block' ) + { + if(!dateValidate('followup_date','Followup Date','OTH')) + { + return false; + } + if(followupformat != '') + { + if(followupformat == 'pm') + { + if(followuphour == 12) + followuphour = 12; + else + followuphour = followuphour + 12; + } + else + { + if(followuphour == 12) + followuphour = 0; + else + followuphour = followuphour; + } + } + + if ( compareDates(date3,'Followup Date',date2,'End Date','GE')) + { + if (date3 <= date2) + { + if((followuphour*60+followupmin) <= (endhour*60+endmin)) + { + alert(alert_arr.FOLLOWUPTIME_GREATER_THAN_STARTTIME); + document.EditView.followup_starthr.focus(); + return false; + } + } + } + else + return false; + + followupendhour = followuphour; + followupendmin = followupmin + 5; + if(followupendmin == 60) + { + followupendmin = 0; + followupendhour = followupendhour + 1; + } + followuphour = _2digit(followuphour); + followupmin = _2digit(followupmin); + followupendhour = _2digit(followupendhour); + followupendmin = _2digit(followupendmin); + document.EditView.followup_time_start.value = followuphour+':'+followupmin; + document.EditView.followup_time_end.value = followupendhour+':'+followupendmin; + } + // Added for Aydin Kurt-Elli requirement END -by Minnie return true; } else return false; @@ -294,10 +365,10 @@ } function check_form() { - formSelectColumnString('inviteesid'); + formSelectColumnString('inviteesid','selectedusers'); if(trim(document.EditView.subject.value) == "") { - alert("Missing Event Name"); + alert(alert_arr.MISSING_EVENT_NAME); document.EditView.subject.focus() return false; } @@ -311,48 +382,47 @@ { document.EditView.mode.value = 'create'; } - starthour = document.EditView.starthr.value; - startmin = document.EditView.startmin.value; - startformat = document.EditView.startfmt.value; - endhour = document.EditView.endhr.value; - endmin = document.EditView.endmin.value; + starthour = parseInt(document.EditView.starthr.value,10); + startmin = parseInt(document.EditView.startmin.value,10); + startformat = document.EditView.startfmt.value; + endhour = parseInt(document.EditView.endhr.value,10); + endmin = parseInt(document.EditView.endmin.value,10); endformat = document.EditView.endfmt.value; + followupformat = document.EditView.followup_startfmt.value; + followuphour = parseInt(document.EditView.followup_starthr.value,10); + followupmin = parseInt(document.EditView.followup_startmin.value,10); if(startformat != '') { if(startformat == 'pm') { - if(starthour == '12') + if(starthour == 12) starthour = 12; else - starthour = eval(starthour) + 12; - startmin = startmin; + starthour = starthour + 12; } else { - if(starthour == '12') + if(starthour == 12) starthour = 0; else starthour = starthour; - startmin = startmin; } } if(endformat != '') { if(endformat == 'pm') { - if(endhour == '12') + if(endhour == 12) endhour = 12; else - endhour = eval(endhour) + 12; - endmin = endmin; + endhour = endhour + 12; } else { - if(endhour == '12') + if(endhour == 12) endhour == 0; else endhour = endhour; - endmin = endmin; } } if(!dateValidate('date_start','Start date','OTH')) @@ -367,8 +437,11 @@ { var dateval1=getObj('date_start').value.replace(/^\s+/g, '').replace(/\s+$/g, ''); var dateval2=getObj('due_date').value.replace(/^\s+/g, '').replace(/\s+$/g, ''); + var dateval3=getObj('followup_date').value.replace(/^\s+/g, '').replace(/\s+$/g, ''); + var dateelements1=splitDateVal(dateval1) var dateelements2=splitDateVal(dateval2) + var dateelements3=splitDateVal(dateval3) dd1=dateelements1[0] mm1=dateelements1[1] @@ -377,8 +450,14 @@ dd2=dateelements2[0] mm2=dateelements2[1] yyyy2=dateelements2[2] + + dd3=dateelements3[0] + mm3=dateelements3[1] + yyyy3=dateelements3[2] + var date1=new Date() var date2=new Date() + var date3=new Date() date1.setYear(yyyy1) date1.setMonth(mm1-1) @@ -387,15 +466,19 @@ date2.setYear(yyyy2) date2.setMonth(mm2-1) date2.setDate(dd2) + + date3.setYear(yyyy3) + date3.setMonth(mm3-1) + date3.setDate(dd3) if (date2<=date1) { - if((eval(endhour)*60+eval(endmin)) <= (eval(starthour)*60+eval(startmin))) + if((endhour*60+endmin) <= (starthour*60+startmin)) { - alert("End Time should be greater than Start Time "); + alert(alert_arr.ENDTIME_GREATER_THAN_STARTTIME); document.EditView.endhr.focus(); return false; } - durationinmin = (eval(endhour)*60+eval(endmin)) - (eval(starthour)*60+eval(startmin)); + durationinmin = (endhour*60+endmin) - (starthour*60+startmin); if(durationinmin >= 60) { hour = durationinmin/60; @@ -410,11 +493,70 @@ document.EditView.duration_minutes.value = minute; } + + event_starthour = _2digit(starthour); + event_startmin = _2digit(startmin); + event_endhour = _2digit(endhour); + event_endmin = _2digit(endmin); + document.EditView.time_start.value = event_starthour+':'+event_startmin; + document.EditView.time_end.value = event_endhour+':'+event_endmin; + // Added for Aydin Kurt-Elli requirement START -by Minnie + if (document.EditView.followup.checked == true && document.getElementById('date_table_thirdtd').style.display == 'block') + { + if(!dateValidate('followup_date','Followup Date','OTH')) + { + return false; + } + if(followupformat != '') + { + if(followupformat == 'pm') + { + if(followuphour == 12) + followuphour = 12; + else + followuphour = followuphour + 12; + } + else + { + if(followuphour == 12) + followuphour = 0; + else + followuphour = followuphour; + } + } + + if ( compareDates(date3,'Followup Date',date2,'End Date','GE')) + { + if (date3 <= date2) + { + if((followuphour*60+followupmin) <= (endhour*60+endmin)) + { + alert(alert_arr.FOLLOWUPTIME_GREATER_THAN_STARTTIME); + document.EditView.followup_starthr.focus(); + return false; + } + } + } + else return false; + + followupendhour = followuphour; + followupendmin = followupmin + 5; + if(followupendmin == 60) + { + followupendmin = 0; + followupendhour = followupendhour + 1; + } + followuphour = _2digit(followuphour); + followupmin = _2digit(followupmin); + followupendhour = _2digit(followupendhour); + followupendmin = _2digit(followupendmin); + document.EditView.followup_time_start.value = followuphour+':'+followupmin; + document.EditView.followup_time_end.value = followupendhour+':'+followupendmin; + } + // Added for Aydin Kurt-Elli requirement END -by Minnie --> } else return false; - document.EditView.time_start.value = starthour+':'+startmin; - document.EditView.time_end.value = endhour+':'+endmin; if(document.EditView.recurringcheck.checked == false) { document.EditView.recurringtype.value = '--None--'; @@ -425,30 +567,30 @@ function task_check_form() { - starthour = document.createTodo.starthr.value; - startmin = document.createTodo.startmin.value; + starthour = parseInt(document.createTodo.starthr.value,10); + startmin = parseInt(document.createTodo.startmin.value,10); startformat = document.createTodo.startfmt.value; if(startformat != '') { if(startformat == 'pm') { - if(starthour == '12') + if(starthour == 12) starthour = 12; else - starthour = eval(starthour) + 12; - - startmin = startmin; + starthour = starthour + 12; + } else { - if(starthour == '12') + if(starthour == 12) starthour = 0; else starthour = starthour; - startmin = startmin; - } - } - document.createTodo.task_time_start.value = starthour+':'+startmin; + } + } + starthour = _2digit(starthour); + startmin = _2digit(startmin); + document.createTodo.task_time_start.value = starthour+':'+startmin; if(document.createTodo.record.value != '') { document.createTodo.mode.value = 'edit'; @@ -463,131 +605,100 @@ function maintask_check_form() { - starthour = document.EditView.starthr.value; - startmin = document.EditView.startmin.value; + starthour = parseInt(document.EditView.starthr.value,10); + startmin = parseInt(document.EditView.startmin.value,10); startformat = document.EditView.startfmt.value; if(startformat != '') { if(startformat == 'pm') { - if(starthour == '12') + if(starthour == 12) starthour = 12; else - starthour = eval(starthour) + 12; - startmin = startmin; + starthour = starthour + 12; } else { - if(starthour == '12') + if(starthour == 12) starthour = 0; else starthour = starthour; - startmin = startmin; - } - } + } + } + starthour = _2digit(starthour); + startmin = _2digit(startmin); document.EditView.time_start.value = starthour+':'+startmin; } var moveupLinkObj,moveupDisabledObj,movedownLinkObj,movedownDisabledObj; -function setObjects() -{ - availListObj=getObj("availableusers") - selectedColumnsObj=getObj("selectedusers") - -} - - - -function addColumn() -{ + +function userEventSharing(selectedusrid,selcolid) +{ + formSelectColumnString(selectedusrid,selcolid); +} + + +function incUser(avail_users,sel_users) +{ + availListObj=getObj(avail_users) + selectedColumnsObj=getObj(sel_users) var selectlength=selectedColumnsObj.length var availlength=availListObj.length - var s=0 - for (i=0;i= 0) + selectedColumnsObj.remove(selectedColumnsObj.options.selectedIndex) + } + +} + + +function formSelectColumnString(usr,col) +{ + + var selectedColumnsObj=getObj(col) usr_id = document.getElementById(usr); var selectedColStr = ""; for (i=0;i window.innerWidth ){ leftSide = eval(leftSide) - eval(widthM); tagName.style.left = leftSide + 'px'; @@ -746,11 +871,19 @@ document.change_owner.month.value = month; document.change_owner.year.value = year; document.change_owner.subtab.value = type; - complete.href="javascript:updateStatus("+id+",'"+heldstatus+"','"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; - pending.href="javascript:updateStatus("+id+",'"+notheldstatus+"','"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; - postpone.href="index.php?module=Calendar&action=EditView&record="+id+"&activity_mode="+activity_mode; - actdelete.href="javascript:delActivity("+id+",'"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; - changeowner.href="javascript:dispLayer('act_changeowner');"; + if(complete) complete.href="javascript:updateStatus("+id+",'"+heldstatus+"','"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; + if(pending) pending.href="javascript:updateStatus("+id+",'"+notheldstatus+"','"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; + + if(postpone) postpone.href="index.php?module=Calendar&action=EditView&record="+id+"&return_action=index&activity_mode="+activity_mode+"&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&viewOption="+OptionData+"&subtab="+type+"&maintab=Calendar"; + if(isShared == "shared") + { + if(actdelete) actdelete.href="javascript:alert('"+alert_arr.SHARED_EVENT_DEL_MSG+"')"; + } + else + { + if(actdelete) actdelete.href="javascript:delActivity("+id+",'"+view+"',"+hour+","+day+","+month+","+year+",'"+type+"')"; + } + if(changeowner) changeowner.href="javascript:dispLayer('act_changeowner');"; } @@ -760,43 +893,83 @@ tagName.style.visibility = 'visible'; tagName.style.display = 'block'; } +//check whether user form selected or group form selected +function checkgroup() +{ + if(document.change_owner.user_lead_owner[1].checked) + { + document.change_owner.lead_group_owner.style.display = "block"; + document.change_owner.lead_owner.style.display = "none"; + } + else + { + document.change_owner.lead_group_owner.style.display = "none"; + document.change_owner.lead_owner.style.display = "block"; + } +} function calendarChangeOwner() { - var user_id = document.getElementById('activity_owner').options[document.getElementById('activity_owner').options.selectedIndex].value; var idlist = document.change_owner.idlist.value; var view = document.change_owner.view.value; var day = document.change_owner.day.value; var month = document.change_owner.month.value; var year = document.change_owner.year.value; var hour = document.change_owner.hour.value; - var subtab = document.change_owner.subtab.value; + var subtab = document.change_owner.subtab.value; + + var checked = document.change_owner.user_lead_owner[0].checked; + if(checked==true) + { + var user_id = document.getElementById('lead_owner').options[document.getElementById('lead_owner').options.selectedIndex].value; + var url = 'module=Users&action=updateLeadDBStatus&return_module=Calendar&return_action=ActivityAjax&user_id='+user_id+'&idlist='+idlist+'&view='+view+'&hour='+hour+'&day='+day+'&month='+month+'&year='+year+'&type=change_owner'; + } + else + { + var group_id = document.getElementById('lead_group_owner').options[document.getElementById('lead_group_owner').options.selectedIndex].value; + var url = 'module=Users&action=updateLeadDBStatus&return_module=Calendar&return_action=ActivityAjax&group_id='+group_id+'&idlist='+idlist+'&view='+view+'&hour='+hour+'&day='+day+'&month='+month+'&year='+year+'&type=change_owner'; + } + if(subtab == 'event') { var OptionData = $('view_Option').options[$('view_Option').selectedIndex].value; + var eventurl = url+'&viewOption='+OptionData+'&subtab=event&ajax=true'; + new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody: 'module=Users&action=updateLeadDBStatus&return_module=Calendar&return_action=ActivityAjax&user_id='+user_id+'&idlist='+idlist+'&view='+view+'&hour='+hour+'&day='+day+'&month='+month+'&year='+year+'&type=change_owner&viewOption='+OptionData+'&subtab=event&ajax=true', + postBody: eventurl, onComplete: function(response) { if(OptionData == 'listview') - $("listView").innerHTML=response.responseText; + { + result = response.responseText.split('####'); + $("total_activities").innerHTML = result[1]; + $("listView").innerHTML=result[0]; + } if(OptionData == 'hourview') - $("hrView").innerHTML=response.responseText; + { + result = response.responseText.split('####'); + $("total_activities").innerHTML = result[1]; + $("hrView").innerHTML=result[0]; + } } } ); } if(subtab == 'todo') { + + var todourl = url+'&subtab=todo&ajax=true'; new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'command'}, method: 'post', - postBody: 'module=Users&action=updateLeadDBStatus&return_module=Calendar&return_action=ActivityAjax&user_id='+user_id+'&idlist='+idlist+'&view='+view+'&hour='+hour+'&day='+day+'&month='+month+'&year='+year+'&type=change_owner&subtab=todo&ajax=true', + postBody: todourl, onComplete: function(response) { - $("mnuTab2").innerHTML=response.responseText; + result = response.responseText.split('####'); + $("total_activities").innerHTML = result[1]; + $("mnuTab2").innerHTML=result[0]; } } ); @@ -816,9 +989,18 @@ postBody: 'module=Users&action=massdelete&return_module=Calendar&return_action=ActivityAjax&idlist='+id+'&view='+view+'&hour='+hour+'&day='+day+'&month='+month+'&year='+year+'&type=activity_delete&viewOption='+OptionData+'&subtab=event&ajax=true', onComplete: function(response) { if(OptionData == 'listview') - $("listView").innerHTML=response.responseText; + { + result = response.responseText.split('####'); + $("total_activities").innerHTML = result[1]; + $("listView").innerHTML=result[0]; + } if(OptionData == 'hourview') - $("hrView").innerHTML=response.responseText; + { + + result = response.responseText.split('####'); + $("total_activities").innerHTML = result[1]; + $("hrView").innerHTML=result[0]; + } } } ); @@ -831,7 +1013,9 @@ method: 'post', postBody: 'module=Users&action=massdelete&return_module=Calendar&return_action=ActivityAjax&idlist='+id+'&view='+view+'&hour='+hour+'&day='+day+'&month='+month+'&year='+year+'&type=activity_delete&subtab=todo&ajax=true', onComplete: function(response) { - $("mnuTab2").innerHTML=response.responseText; + result = response.responseText.split('####'); + $("total_activities").innerHTML = result[1]; + $("mnuTab2").innerHTML=result[0]; } } ); @@ -1013,3 +1197,226 @@ } } +function dochange(start,end) +{ + var startdate = document.getElementById(start); + document.getElementById(end).value = startdate.value; +} + +function getSelectedStatus() +{ + var chosen = document.EditView.eventstatus.value; + if(chosen == "Held") + { + document.getElementById('date_table_firsttd').style.width = "33%"; + document.getElementById('date_table_secondtd').style.width = "33%"; + document.getElementById('date_table_thirdtd').style.display = 'block'; + } + else + { + document.getElementById('date_table_firsttd').style.width = "50%"; + document.getElementById('date_table_secondtd').style.width = "50%"; + document.getElementById('date_table_thirdtd').style.display = 'none'; + } + +} + +function changeEndtime_StartTime() +{ + var select_call = document.EditView.activitytype[0].checked; + var select_meeting = document.EditView.activitytype[1].checked; + if(select_call) + calDuedatetime('call'); + else if(select_meeting) + calDuedatetime('meeting'); + else + alert(alert_arr.EVENT_TYPE_NOT_SELECTED); +} + +function calDuedatetime(type) +{ + var datefmt = document.EditView.dateformat.value; + var dateval1=getObj('date_start').value.replace(/^\s+/g, '').replace(/\s+$/g, ''); + var dateelements1=splitDateVal(dateval1); + dd1=parseInt(dateelements1[0],10); + mm1=dateelements1[1]; + yyyy1=dateelements1[2]; + var date1=new Date(); + //date1.setDate(dd1+1); + date1.setYear(yyyy1); + date1.setMonth(mm1-1,dd1+1); + var yy = date1.getFullYear(); + var mm = parseInt(date1.getMonth(),10) + 1; + var dd = date1.getDate(); + var date = document.EditView.date_start.value; + var hour = parseInt(document.EditView.starthr.value,10); + var min = parseInt(document.EditView.startmin.value,10); + var fmt = document.EditView.startfmt.value; + dd = _2digit(dd); + mm = _2digit(mm); + if(datefmt == '%d-%m-%Y') + { + var tempdate = dd+'-'+mm+'-'+yy; + }else if(datefmt == '%m-%d-%Y') + { + var tempdate = mm+'-'+dd+'-'+yy; + }else + { + var tempdate = yy+'-'+mm+'-'+dd; + } + if(type == 'meeting') + { + if(fmt == 'pm') + { + if(hour == 11) + { + date = tempdate; + hour = 12; + min = min; + fmt = 'am'; + + }else if(hour == 12) + { + hour = 1; + min = min; + fmt = 'pm'; + } + else hour = hour + 1; + hour = _2digit(hour); + min = _2digit(min); + document.EditView.due_date.value = date; + document.EditView.endhr.value = hour; + document.EditView.endmin.value = min; + document.EditView.endfmt.value = fmt; + document.EditView.followup_date.value = date; + document.EditView.followup_starthr.value = hour; + document.EditView.followup_startmin.value = min; + document.EditView.followup_startfmt.value = fmt; + }else if(fmt == 'am') + { + if(hour == 11) + { + hour = 12; min = min; fmt = 'pm'; + }else if(hour == 12) + { + hour = 1; min = min; fmt = 'am'; + } + else hour = hour + 1; + hour = _2digit(hour); + min = _2digit(min); + document.EditView.due_date.value = date; + document.EditView.endhr.value = hour; + document.EditView.endmin.value = min; + document.EditView.endfmt.value = fmt; + document.EditView.followup_date.value = date; + document.EditView.followup_starthr.value = hour; + document.EditView.followup_startmin.value = min; + document.EditView.followup_startfmt.value = fmt; + }else + { + hour = hour + 1; + if(hour == 24) + { + hour = 0; + date = tempdate; + } + hour = _2digit(hour); + min = _2digit(min); + document.EditView.due_date.value = date; + document.EditView.endhr.value = hour; + document.EditView.endmin.value = min; + document.EditView.followup_date.value = date; + document.EditView.followup_starthr.value = hour; + document.EditView.followup_startmin.value = min; + } + } + if(type == 'call') + { + if(fmt == 'pm') + { + if(hour == 11 && min == 55) + { + hour = 12; min = 0; fmt = 'am'; + date = tempdate; + } + else if(hour == 12 && min == 55) + { + hour = 1; min = 0; fmt = 'pm'; + } + else + { + if(min == 55) + { + min = 0; + hour = hour + 1; + } + else min = min + 5; + } + hour = _2digit(hour); + min = _2digit(min); + document.EditView.due_date.value = date; + document.EditView.endhr.value = hour; + document.EditView.endmin.value = min; + document.EditView.endfmt.value = fmt; + document.EditView.followup_date.value = date; + document.EditView.followup_starthr.value = hour; + document.EditView.followup_startmin.value = min; + document.EditView.followup_startfmt.value = fmt; + }else if(fmt == 'am') + { + if(hour == 11 && min == 55) + { + hour = 12; + min = 0; + fmt = 'pm'; + } + else if(hour == 12 && min == 55) + { + hour = 1; + min = 0; + fmt = 'am'; + } + else + { + if(min == 55) + { + min = 0; + hour = hour + 1; + } + else min = min + 5; + } + hour = _2digit(hour); + min = _2digit(min); + document.EditView.due_date.value = date; + document.EditView.endhr.value = hour; + document.EditView.endmin.value = min; + document.EditView.endfmt.value = fmt; + document.EditView.followup_date.value = date; + document.EditView.followup_starthr.value = hour; + document.EditView.followup_startmin.value = min; + document.EditView.followup_startfmt.value = fmt; + } + else + { + if(min == 55) + { + min = 0; + hour = hour + 1; + }else min = min + 5; + if(hour == 24) + { + hour = 0; + date = tempdate; + } + hour = _2digit(hour); + min = _2digit(min); + document.EditView.due_date.value = date; + document.EditView.endhr.value = hour; + document.EditView.endmin.value = min; + document.EditView.followup_date.value = date; + document.EditView.followup_starthr.value = hour; + document.EditView.followup_startmin.value = min; + } + } +} + Modified: vtigercrm/branches/5.1_jens/modules/Calendar/updateCalendarSharing.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Calendar/updateCalendarSharing.php (original) +++ vtigercrm/branches/5.1_jens/modules/Calendar/updateCalendarSharing.php Mon Apr 16 12:27:44 2007 @@ -17,7 +17,8 @@ $hour_format = 'am/pm'; $delquery = "delete from vtiger_sharedcalendar where userid=".$_REQUEST["current_userid"]; $adb->query($delquery); -$sharedid = $_REQUEST['user']; +$selectedid = $_REQUEST['shar_userid']; +$sharedid = explode (";",$selectedid); if(isset($sharedid) && $sharedid != null) { foreach($sharedid as $sid) Modified: vtigercrm/branches/5.1_jens/modules/Campaigns/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Campaigns/CallRelatedList.php (original) +++ vtigercrm/branches/5.1_jens/modules/Campaigns/CallRelatedList.php Mon Apr 16 12:27:44 2007 @@ -12,7 +12,6 @@ require_once('Smarty_setup.php'); require_once('modules/Campaigns/Campaigns.php'); -require_once('modules/CustomView/CustomView.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -38,7 +37,7 @@ } global $mod_strings; -global $app_strings; +global $app_strings,$adb; global $theme; global $currentModule; $theme_path="themes/".$theme."/"; @@ -57,13 +56,29 @@ $related_array=getRelatedLists($currentModule,$focus); $smarty->assign("RELATEDLISTS", $related_array); -$cvObj = new CustomView("Contacts"); -$cvcombo = $cvObj->getCustomViewCombo(); -$smarty->assign("CONTCVCOMBO",""); +/* To get Contacts CustomView -START */ +$sql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype where vtiger_tab.tabid=".getTabid('Contacts'); +$result = $adb->query($sql); +$chtml = ""; +$smarty->assign("CONTCVCOMBO",$chtml); +/* To get Contacts CustomView -END */ -$cvObj = new CustomView("Leads"); -$cvcombo = $cvObj->getCustomViewCombo(); -$smarty->assign("LEADCVCOMBO",""); +/* To get Leads CustomView -START */ +$sql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype where vtiger_tab.tabid=".getTabid('Leads'); +$result = $adb->query($sql); +$lhtml = ""; +$smarty->assign("LEADCVCOMBO",$lhtml); +/* To get Leads CustomView -END */ $category = getParentTab(); $smarty->assign("CATEGORY",$category); @@ -79,6 +94,9 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); -$smarty->display("RelatedLists.tpl"); +if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '') + $smarty->display("RelatedListContents.tpl"); +else + $smarty->display("RelatedLists.tpl"); } ?> Modified: vtigercrm/branches/5.1_jens/modules/Campaigns/Campaigns.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Campaigns/Campaigns.php (original) +++ vtigercrm/branches/5.1_jens/modules/Campaigns/Campaigns.php Mon Apr 16 12:27:44 2007 @@ -1,252 +1,255 @@ -'crmid','vtiger_campaign'=>'campaignid','vtiger_campaignscf'=>'campaignid'); - var $column_fields = Array(); - - var $sortby_fields = Array('campaignname','smownerid','campaigntype','product_id','expectedrevenue','closingdate','campaignstatus','expectedresponse','targetaudience','expectedcost'); - - var $list_fields = Array( - 'Campaign Name'=>Array('campaign'=>'campaignname'), - 'Campaign Type'=>Array('campaign'=>'campaigntype'), - 'Campaign Status'=>Array('campaign'=>'campaignstatus'), - 'Expected Revenue'=>Array('campaign'=>'expectedrevenue'), - 'Expected Close Date'=>Array('campaign'=>'closingdate'), - 'Assigned To' => Array('crmentity'=>'smownerid') - ); - - var $list_fields_name = Array( - 'Campaign Name'=>'campaignname', - 'Campaign Type'=>'campaigntype', - 'Campaign Status'=>'campaignstatus', - 'Expected Revenue'=>'expectedrevenue', - 'Expected Close Date'=>'closingdate', - 'Assigned To'=>'assigned_user_id' - ); - - var $list_link_field= 'campaignname'; - //Added these variables which are used as default order by and sortorder in ListView - var $default_order_by = 'crmid'; - var $default_sort_order = 'DESC'; - - var $search_fields = Array( - 'Campaign Name'=>Array('vtiger_campaign'=>'campaignname'), - 'Campaign Type'=>Array('vtiger_campaign'=>'campaigntype'), - ); - - var $search_fields_name = Array( - 'Campaign Name'=>'campaignname', - 'Campaign Type'=>'campaigntype', - ); - - function Campaigns() - { - $this->log =LoggerManager::getLogger('campaign'); - $this->db = new PearDatabase(); - $this->column_fields = getColumnFields('Campaigns'); - } - - - /** Function to handle module specific operations when saving a entity - */ - function save_module($module) - { - } - - - // Mike Crowe Mod --------------------------------------------------------Default ordering for us - /** - * Function to get sort order - * return string $sorder - sortorder string either 'ASC' or 'DESC' - */ - function getSortOrder() - { - global $log; - $log->debug("Entering getSortOrder() method ..."); - if(isset($_REQUEST['sorder'])) - $sorder = $_REQUEST['sorder']; - else - $sorder = (($_SESSION['CAMPAIGN_SORT_ORDER'] != '')?($_SESSION['CAMPAIGN_SORT_ORDER']):($this->default_sort_order)); - - $log->debug("Exiting getSortOrder method ..."); - return $sorder; - } - - /** - * Function to get order by - * return string $order_by - fieldname(eg: 'campaignname') - */ - function getOrderBy() - { - global $log; - $log->debug("Entering getOrderBy() method ..."); - if (isset($_REQUEST['order_by'])) - $order_by = $_REQUEST['order_by']; - else - $order_by = (($_SESSION['CAMPAIGN_ORDER_BY'] != '')?($_SESSION['CAMPAIGN_ORDER_BY']):($this->default_order_by)); - - $log->debug("Exiting getOrderBy method ..."); - return $order_by; - } - // Mike Crowe Mod -------------------------------------------------------- - - /** - * Function to get Campaign related Contacts - * @param integer $id - campaignid - * returns related Contacts record in array format - */ - function get_contacts($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_contacts(".$id.") method ..."); - global $mod_strings; - - $focus = new Contacts(); - $button = ''; - - if($singlepane_view == 'true') - $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; - - $query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_campaigncontrel on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_campaigncontrel.campaignid = '.$id.' and vtiger_crmentity.deleted=0'; - - $log->debug("Exiting get_contacts method ..."); - return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset); - } - - /** - * Function to get Campaign related Leads - * @param integer $id - campaignid - * returns related Leads record in array format - */ - function get_leads($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_leads(".$id.") method ..."); - global $mod_strings; - - $focus = new Leads(); - - $button = ''; - if($singlepane_view == 'true') - $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; - - $query = 'SELECT vtiger_leaddetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_leaddetails inner join vtiger_campaignleadrel on vtiger_campaignleadrel.leadid=vtiger_leaddetails.leadid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid left join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_campaignleadrel.campaignid = '.$id; - $log->debug("Exiting get_leads method ..."); - return GetRelatedList('Campaigns','Leads',$focus,$query,$button,$returnset); - } - - /** - * Function to get Campaign related Potentials - * @param integer $id - campaignid - * returns related potentials record in array format - */ - function get_opportunities($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_opportunities(".$id.") method ..."); - global $mod_strings; - - $focus = new Potentials(); - - $button = ''; - if($singlepane_view == 'true') - $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; - - $query = 'select vtiger_users.user_name,vtiger_groups.groupname, vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_campaign inner join vtiger_potential on vtiger_campaign.campaignid = vtiger_potential.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0'; - if($this->column_fields['account_id'] != 0) - $log->debug("Exiting get_opportunities method ..."); - return GetRelatedList('Campaigns','Potentials',$focus,$query,$button,$returnset); - - } - - /** - * Function to get Campaign related Activities - * @param integer $id - campaignid - * returns related activities record in array format - */ - function get_activities($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_activities(".$id.") method ..."); - global $app_strings; - - require_once('modules/Calendar/Activity.php'); - - $focus = new Activity(); - - $button = ''; - - if($singlepane_view == 'true') - $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; - - $query = "SELECT vtiger_contactdetails.lastname, - vtiger_contactdetails.firstname, - vtiger_contactdetails.contactid, - vtiger_activity.*, - vtiger_seactivityrel.*, - vtiger_crmentity.crmid, vtiger_crmentity.smownerid, - vtiger_crmentity.modifiedtime, - vtiger_users.user_name, - vtiger_recurringevents.recurringtype - FROM vtiger_activity - INNER JOIN vtiger_seactivityrel - ON vtiger_seactivityrel.activityid = vtiger_activity.activityid - INNER JOIN vtiger_crmentity - ON vtiger_crmentity.crmid=vtiger_activity.activityid - LEFT JOIN vtiger_cntactivityrel - ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid - LEFT JOIN vtiger_contactdetails - ON vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid - LEFT JOIN vtiger_users - ON vtiger_users.id = vtiger_crmentity.smownerid - LEFT OUTER JOIN vtiger_recurringevents - ON vtiger_recurringevents.activityid = vtiger_activity.activityid - LEFT JOIN vtiger_activitygrouprelation - ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid - LEFT JOIN vtiger_groups - ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname - WHERE vtiger_seactivityrel.crmid=".$id." - AND (activitytype = 'Task' - OR activitytype = 'Call' - OR activitytype = 'Meeting')"; - $log->debug("Exiting get_activities method ..."); - return GetRelatedList('Campaigns','Calendar',$focus,$query,$button,$returnset); - } - -} -?> +'crmid','vtiger_campaign'=>'campaignid','vtiger_campaignscf'=>'campaignid'); + var $column_fields = Array(); + + var $sortby_fields = Array('campaignname','smownerid','campaigntype','product_id','expectedrevenue','closingdate','campaignstatus','expectedresponse','targetaudience','expectedcost'); + + var $list_fields = Array( + 'Campaign Name'=>Array('campaign'=>'campaignname'), + 'Campaign Type'=>Array('campaign'=>'campaigntype'), + 'Campaign Status'=>Array('campaign'=>'campaignstatus'), + 'Expected Revenue'=>Array('campaign'=>'expectedrevenue'), + 'Expected Close Date'=>Array('campaign'=>'closingdate'), + 'Assigned To' => Array('crmentity'=>'smownerid') + ); + + var $list_fields_name = Array( + 'Campaign Name'=>'campaignname', + 'Campaign Type'=>'campaigntype', + 'Campaign Status'=>'campaignstatus', + 'Expected Revenue'=>'expectedrevenue', + 'Expected Close Date'=>'closingdate', + 'Assigned To'=>'assigned_user_id' + ); + + var $list_link_field= 'campaignname'; + //Added these variables which are used as default order by and sortorder in ListView + var $default_order_by = 'crmid'; + var $default_sort_order = 'DESC'; + + var $groupTable = Array('vtiger_campaigngrouprelation','campaignid'); + + var $search_fields = Array( + 'Campaign Name'=>Array('vtiger_campaign'=>'campaignname'), + 'Campaign Type'=>Array('vtiger_campaign'=>'campaigntype'), + ); + + var $search_fields_name = Array( + 'Campaign Name'=>'campaignname', + 'Campaign Type'=>'campaigntype', + ); + + function Campaigns() + { + $this->log =LoggerManager::getLogger('campaign'); + $this->db = new PearDatabase(); + $this->column_fields = getColumnFields('Campaigns'); + } + + + /** Function to handle module specific operations when saving a entity + */ + function save_module($module) + { + } + + + // Mike Crowe Mod --------------------------------------------------------Default ordering for us + /** + * Function to get sort order + * return string $sorder - sortorder string either 'ASC' or 'DESC' + */ + function getSortOrder() + { + global $log; + $log->debug("Entering getSortOrder() method ..."); + if(isset($_REQUEST['sorder'])) + $sorder = $_REQUEST['sorder']; + else + $sorder = (($_SESSION['CAMPAIGN_SORT_ORDER'] != '')?($_SESSION['CAMPAIGN_SORT_ORDER']):($this->default_sort_order)); + + $log->debug("Exiting getSortOrder method ..."); + return $sorder; + } + + /** + * Function to get order by + * return string $order_by - fieldname(eg: 'campaignname') + */ + function getOrderBy() + { + global $log; + $log->debug("Entering getOrderBy() method ..."); + if (isset($_REQUEST['order_by'])) + $order_by = $_REQUEST['order_by']; + else + $order_by = (($_SESSION['CAMPAIGN_ORDER_BY'] != '')?($_SESSION['CAMPAIGN_ORDER_BY']):($this->default_order_by)); + + $log->debug("Exiting getOrderBy method ..."); + return $order_by; + } + // Mike Crowe Mod -------------------------------------------------------- + + /** + * Function to get Campaign related Contacts + * @param integer $id - campaignid + * returns related Contacts record in array format + */ + function get_contacts($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_contacts(".$id.") method ..."); + global $mod_strings; + + $focus = new Contacts(); + $button = ''; + + if($singlepane_view == 'true') + $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; + + $query = 'select vtiger_contactdetails.accountid, case when (vtiger_users.user_name not like \'\') then vtiger_users.user_name else vtiger_groups.groupname end as user_name , vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_campaigncontrel on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_campaigncontrel.campaignid = '.$id.' and vtiger_crmentity.deleted=0'; + + $log->debug("Exiting get_contacts method ..."); + return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset); + } + + /** + * Function to get Campaign related Leads + * @param integer $id - campaignid + * returns related Leads record in array format + */ + function get_leads($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_leads(".$id.") method ..."); + global $mod_strings; + + $focus = new Leads(); + + $button = ''; + if($singlepane_view == 'true') + $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; + + $query = 'SELECT vtiger_leaddetails.*, vtiger_crmentity.crmid,vtiger_leadaddress.phone,vtiger_leadsubdetails.website, case when (vtiger_users.user_name not like \'\') then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_crmentity.smownerid from vtiger_leaddetails inner join vtiger_campaignleadrel on vtiger_campaignleadrel.leadid=vtiger_leaddetails.leadid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid inner join vtiger_leadsubdetails on vtiger_leadsubdetails.leadsubscriptionid = vtiger_leaddetails.leadid inner join vtiger_leadaddress on vtiger_leadaddress.leadaddressid = vtiger_leadsubdetails.leadsubscriptionid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid left join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_campaignleadrel.campaignid = '.$id; + $log->debug("Exiting get_leads method ..."); + return GetRelatedList('Campaigns','Leads',$focus,$query,$button,$returnset); + } + + /** + * Function to get Campaign related Potentials + * @param integer $id - campaignid + * returns related potentials record in array format + */ + function get_opportunities($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_opportunities(".$id.") method ..."); + global $mod_strings; + + $focus = new Potentials(); + + $button = ''; + if($singlepane_view == 'true') + $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; + + $query = 'select case when (vtiger_users.user_name not like \'\') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_potential.accountid, vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_campaign inner join vtiger_potential on vtiger_campaign.campaignid = vtiger_potential.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0'; + if($this->column_fields['account_id'] != 0) + $log->debug("Exiting get_opportunities method ..."); + return GetRelatedList('Campaigns','Potentials',$focus,$query,$button,$returnset); + + } + + /** + * Function to get Campaign related Activities + * @param integer $id - campaignid + * returns related activities record in array format + */ + function get_activities($id) + { + global $log, $singlepane_view; + $log->debug("Entering get_activities(".$id.") method ..."); + global $app_strings; + + require_once('modules/Calendar/Activity.php'); + + $focus = new Activity(); + + $button = ''; + + if($singlepane_view == 'true') + $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT vtiger_contactdetails.lastname, + vtiger_contactdetails.firstname, + vtiger_contactdetails.contactid, + vtiger_activity.*, + vtiger_seactivityrel.*, + vtiger_crmentity.crmid, vtiger_crmentity.smownerid, + vtiger_crmentity.modifiedtime, + case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name, + vtiger_recurringevents.recurringtype + FROM vtiger_activity + INNER JOIN vtiger_seactivityrel + ON vtiger_seactivityrel.activityid = vtiger_activity.activityid + INNER JOIN vtiger_crmentity + ON vtiger_crmentity.crmid=vtiger_activity.activityid + LEFT JOIN vtiger_cntactivityrel + ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid + LEFT JOIN vtiger_contactdetails + ON vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid + LEFT JOIN vtiger_users + ON vtiger_users.id = vtiger_crmentity.smownerid + LEFT OUTER JOIN vtiger_recurringevents + ON vtiger_recurringevents.activityid = vtiger_activity.activityid + LEFT JOIN vtiger_activitygrouprelation + ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid + LEFT JOIN vtiger_groups + ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname + WHERE vtiger_seactivityrel.crmid=".$id." + AND (activitytype = 'Task' + OR activitytype = 'Call' + OR activitytype = 'Meeting')"; + $log->debug("Exiting get_activities method ..."); + return GetRelatedList('Campaigns','Calendar',$focus,$query,$button,$returnset); + + } + +} +?> Modified: vtigercrm/branches/5.1_jens/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Campaigns/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Campaigns/DetailView.php Mon Apr 16 12:27:44 2007 @@ -12,7 +12,6 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once('modules/Campaigns/Campaigns.php'); -require_once('modules/CustomView/CustomView.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -29,7 +28,7 @@ { $focus->id = ""; } -global $app_strings,$mod_strings,$theme,$currentModule,$default_module_view; +global $app_strings,$mod_strings,$theme,$currentModule,$default_module_view,$adb; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -70,18 +69,36 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); if($singlepane_view == 'true') { $related_array = getRelatedLists($currentModule,$focus); $smarty->assign("RELATEDLISTS", $related_array); - $cvObj = new CustomView("Contacts"); - $cvcombo = $cvObj->getCustomViewCombo(); - $smarty->assign("CONTCVCOMBO",""); + /* To get Contacts CustomView -START */ + $sql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype where vtiger_tab.tabid=".getTabid('Contacts'); + $result = $adb->query($sql); + $chtml = ""; + $smarty->assign("CONTCVCOMBO",$chtml); + /* To get Contacts CustomView -END */ + + /* To get Leads CustomView -START */ + $sql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype where vtiger_tab.tabid=".getTabid('Leads'); + $result = $adb->query($sql); + $lhtml = ""; + $smarty->assign("LEADCVCOMBO",$lhtml); + /* To get Leads CustomView -END */ - $cvObj = new CustomView("Leads"); - $cvcombo = $cvObj->getCustomViewCombo(); - $smarty->assign("LEADCVCOMBO",""); } $smarty->assign("SinglePane_View", $singlepane_view); Modified: vtigercrm/branches/5.1_jens/modules/Campaigns/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Campaigns/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Campaigns/EditView.php Mon Apr 16 12:27:44 2007 @@ -99,7 +99,7 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); - +$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); if($focus->mode == 'edit') $smarty->display("salesEditView.tpl"); else Modified: vtigercrm/branches/5.1_jens/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Campaigns/ListView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Campaigns/ListView.php Mon Apr 16 12:27:44 2007 @@ -133,8 +133,8 @@ if($order_by == 'smownerid') { if( $adb->dbType == "pgsql") - $list_query .= ' GROUP BY vtiger_users.user_name'; - $list_query .= ' ORDER BY vtiger_users.user_name '.$sorder; + $list_query .= ' GROUP BY user_name'; + $list_query .= ' ORDER BY user_name '.$sorder; } else { Modified: vtigercrm/branches/5.1_jens/modules/Campaigns/LoadList.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Campaigns/LoadList.php (original) +++ vtigercrm/branches/5.1_jens/modules/Campaigns/LoadList.php Mon Apr 16 12:27:44 2007 @@ -28,24 +28,6 @@ $adb->query("INSERT INTO ".$reltable." VALUES('".$_REQUEST["return_id"]."','".$row["crmid"]."')"); } -if ($singlepane_view == 'true') -{ +header("Location: index.php?module=Campaigns&action=CampaignsAjax&file=CallRelatedList&ajax=true&record=".$_REQUEST['return_id']); + ?> - - - - Modified: vtigercrm/branches/5.1_jens/modules/Campaigns/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Campaigns/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Campaigns/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -43,7 +43,7 @@ 'Description'=>'Description', 'Product'=>'Product', 'Target Audience'=>'Target Audience', -'TargetSize'=>'TargetSize', +'TargetSize'=>'Target Size', 'Sponsor'=>'Sponsor', 'Expected Sales Count'=>'Expected Sales Count', Modified: vtigercrm/branches/5.1_jens/modules/Contacts/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/CallRelatedList.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/CallRelatedList.php Mon Apr 16 12:27:44 2007 @@ -64,9 +64,11 @@ $smarty->assign("HIDDEN_PARENTS_LIST",$parent_email); $category = getparenttab(); $smarty->assign("CATEGORY",$category); - $smarty->assign("ID",$focus->id); $smarty->assign("NAME",$focus->name); +$smarty->assign("EMAIL",$focus->column_fields['email']); +$smarty->assign("YAHOO",$focus->column_fields['yahooid']); + $related_array = getRelatedLists($currentModule,$focus); $smarty->assign("RELATEDLISTS", $related_array); $smarty->assign("MODULE",$currentmodule); Modified: vtigercrm/branches/5.1_jens/modules/Contacts/Contacts.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Contacts/Contacts.php (original) +++ vtigercrm/branches/5.1_jens/modules/Contacts/Contacts.php Mon Apr 16 12:27:44 2007 @@ -1,869 +1,882 @@ -'crmid','vtiger_contactdetails'=>'contactid','vtiger_contactaddress'=>'contactaddressid','vtiger_contactsubdetails'=>'contactsubscriptionid','vtiger_contactscf'=>'contactid','vtiger_customerdetails'=>'customerid','vtiger_attachments'=>'attachmentsid','vtiger_entity2org'=>'crmid'); - - - - var $column_fields = Array(); - - var $sortby_fields = Array('lastname','firstname','title','email','phone','smownerid','accountid'); - - var $list_link_field= 'lastname'; - - // This is the list of vtiger_fields that are in the lists. - var $list_fields = Array( - 'Last Name' => Array('contactdetails'=>'lastname'), - 'First Name' => Array('contactdetails'=>'firstname'), - 'Title' => Array('contactdetails'=>'title'), - 'Account Name' => Array('account'=>'accountname'), - 'Email' => Array('contactdetails'=>'email'), - 'Phone' => Array('contactdetails'=>'phone'), - 'Assigned To' => Array('crmentity'=>'smownerid') - ); - - var $range_fields = Array( - 'first_name', - 'last_name', - 'primary_address_city', - 'account_name', - 'account_id', - 'id', - 'email1', - 'salutation', - 'title', - 'phone_mobile', - 'reports_to_name', - 'primary_address_street', - 'primary_address_city', - 'primary_address_state', - 'primary_address_postalcode', - 'primary_address_country', - 'alt_address_city', - 'alt_address_street', - 'alt_address_city', - 'alt_address_state', - 'alt_address_postalcode', - 'alt_address_country', - 'office_phone', - 'home_phone', - 'other_phone', - 'fax', - 'department', - 'birthdate', - 'assistant_name', - 'assistant_phone'); - - - var $list_fields_name = Array( - 'Last Name' => 'lastname', - 'First Name' => 'firstname', - 'Title' => 'title', - 'Account Name' => 'accountid', - 'Email' => 'email', - 'Phone' => 'phone', - 'Assigned To' => 'assigned_user_id' - ); - - var $search_fields = Array( - 'Name' => Array('contactdetails'=>'lastname'), - 'Title' => Array('contactdetails'=>'title') - ); - - var $search_fields_name = Array( - 'Name' => 'lastname', - 'Title' => 'title' - ); - - // This is the list of vtiger_fields that are required - var $required_fields = array("lastname"=>1); - - //Added these variables which are used as default order by and sortorder in ListView - var $default_order_by = 'lastname'; - var $default_sort_order = 'ASC'; - - function Contacts() { - $this->log = LoggerManager::getLogger('contact'); - $this->db = new PearDatabase(); - $this->column_fields = getColumnFields('Contacts'); - } - - // Mike Crowe Mod --------------------------------------------------------Default ordering for us - /** - * Function to get sort order - * return string $sorder - sortorder string either 'ASC' or 'DESC' - */ - function getSortOrder() - { - global $log; - $log->debug("Entering getSortOrder() method ..."); - if(isset($_REQUEST['sorder'])) - $sorder = $_REQUEST['sorder']; - else - $sorder = (($_SESSION['CONTACTS_SORT_ORDER'] != '')?($_SESSION['CONTACTS_SORT_ORDER']):($this->default_sort_order)); - $log->debug("Exiting getSortOrder method ..."); - return $sorder; - } - /** - * Function to get order by - * return string $order_by - fieldname(eg: 'Contactname') - */ - function getOrderBy() - { - global $log; - $log->debug("Entering getOrderBy() method ..."); - if (isset($_REQUEST['order_by'])) - $order_by = $_REQUEST['order_by']; - else - $order_by = (($_SESSION['CONTACTS_ORDER_BY'] != '')?($_SESSION['CONTACTS_ORDER_BY']):($this->default_order_by)); - $log->debug("Exiting getOrderBy method ..."); - return $order_by; - } - // Mike Crowe Mod -------------------------------------------------------- - /** Function to get the number of Contacts assigned to a particular User. - * @param varchar $user name - Assigned to User - * Returns the count of contacts assigned to user. - */ - function getCount($user_name) - { - global $log; - $log->debug("Entering getCount(".$user_name.") method ..."); - $query = "select count(*) from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0"; - - $result = $this->db->query($query,true,"Error retrieving contacts count"); - $rows_found = $this->db->getRowCount($result); - $row = $this->db->fetchByAssoc($result, 0); - - - $log->debug("Exiting getCount method ..."); - return $row["count(*)"]; - } - /** Function to get the Contact Details assigned to a given User ID which has a valid Email Address. - * @param varchar $user_name - User Name (eg. Admin) - * @param varchar $email_address - Email Addr of each contact record. - * Returns the query. - */ - function get_contacts1($user_name,$email_address) - { - global $log; - $log->debug("Entering get_contacts1(".$user_name.",".$email_address.") method ..."); - $query = "select vtiger_users.user_name, vtiger_contactdetails.lastname last_name,vtiger_contactdetails.firstname first_name,vtiger_contactdetails.contactid as id, vtiger_contactdetails.salutation as salutation, vtiger_contactdetails.email as email1,vtiger_contactdetails.title as title,vtiger_contactdetails.mobile as phone_mobile,vtiger_account.accountname as account_name,vtiger_account.accountid as account_id from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 and vtiger_contactdetails.email like '%" .$email_address ."%' limit 50"; - - $log->debug("Exiting get_contacts1 method ..."); - return $this->process_list_query1($query); - } - /** Function to get the Contact Details assigned to a particular User based on the starting count and the number of subsequent records. - * @param varchar $user_name - Assigned User - * @param integer $from_index - Initial record number to be displayed - * @param integer $offset - Count of the subsequent records to be displayed. - * Returns Query. - */ - function get_contacts($user_name,$from_index,$offset) - { - global $log; - $log->debug("Entering get_contacts(".$user_name.",".$from_index.",".$offset.") method ..."); - $query = "select vtiger_users.user_name,vtiger_groups.groupname,vtiger_contactdetails.department department, vtiger_contactdetails.phone office_phone, vtiger_contactdetails.fax fax, vtiger_contactsubdetails.assistant assistant_name, vtiger_contactsubdetails.otherphone other_phone, vtiger_contactsubdetails.homephone home_phone,vtiger_contactsubdetails.birthday birthdate, vtiger_contactdetails.lastname last_name,vtiger_contactdetails.firstname first_name,vtiger_contactdetails.contactid as id, vtiger_contactdetails.salutation as salutation, vtiger_contactdetails.email as email1,vtiger_contactdetails.title as title,vtiger_contactdetails.mobile as phone_mobile,vtiger_account.accountname as account_name,vtiger_account.accountid as account_id, vtiger_contactaddress.mailingcity as primary_address_city,vtiger_contactaddress.mailingstreet as primary_address_street, vtiger_contactaddress.mailingcountry as primary_address_country,vtiger_contactaddress.mailingstate as primary_address_state, vtiger_contactaddress.mailingzip as primary_address_postalcode, vtiger_contactaddress.othercity as alt_address_city,vtiger_contactaddress.otherstreet as alt_address_street, vtiger_contactaddress.othercountry as alt_address_country,vtiger_contactaddress.otherstate as alt_address_state, vtiger_contactaddress.otherzip as alt_address_postalcode from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 limit " .$from_index ."," .$offset; - - $log->debug("Exiting get_contacts method ..."); - return $this->process_list_query1($query); - } - - - /** Function to process list query for a given query - * @param $query - * Returns the results of query in array format - */ - function process_list_query1($query) - { - global $log; - $log->debug("Entering process_list_query1(".$query.") method ..."); - - $result =& $this->db->query($query,true,"Error retrieving $this->object_name list: "); - $list = Array(); - $rows_found = $this->db->getRowCount($result); - if($rows_found != 0) - { - $contact = Array(); - for($index = 0 , $row = $this->db->fetchByAssoc($result, $index); $row && $index <$rows_found;$index++, $row = $this->db->fetchByAssoc($result, $index)) - - { - foreach($this->range_fields as $columnName) - { - if (isset($row[$columnName])) { - - $contact[$columnName] = $row[$columnName]; - } - else - { - $contact[$columnName] = ""; - } - } -// TODO OPTIMIZE THE QUERY ACCOUNT NAME AND ID are set separetly for every vtiger_contactdetails and hence -// vtiger_account query goes for ecery single vtiger_account row - - $list[] = $contact; - } - } - - $response = Array(); - $response['list'] = $list; - $response['row_count'] = $rows_found; - $response['next_offset'] = $next_offset; - $response['previous_offset'] = $previous_offset; - - - $log->debug("Exiting process_list_query1 method ..."); - return $response; - } - - - /** Function to process list query for Plugin with Security Parameters for a given query - * @param $query - * Returns the results of query in array format - */ - function plugin_process_list_query($query) - { - global $log,$adb,$current_user; - $log->debug("Entering process_list_query1(".$query.") method ..."); - $permitted_field_lists = Array(); - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) - { - $sql1 = "select columnname from vtiger_field where tabid=4 and block <> 75"; - }else - { - $profileList = getCurrentUserProfileList(); - $sql1 = "select columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=4 and vtiger_field.block <> 6 and vtiger_field.block <> 75 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; - } - $result1 = $this->db->query($sql1); - for($i=0;$i < $adb->num_rows($result1);$i++) - { - $permitted_field_lists[] = $adb->query_result($result1,$i,'columnname'); - } - - $result =& $this->db->query($query,true,"Error retrieving $this->object_name list: "); - $list = Array(); - $rows_found = $this->db->getRowCount($result); - if($rows_found != 0) - { - for($index = 0 , $row = $this->db->fetchByAssoc($result, $index); $row && $index <$rows_found;$index++, $row = $this->db->fetchByAssoc($result, $index)) - { - $contact = Array(); - foreach($permitted_field_lists as $columnName) - { - if ($columnName == "lastname" || $columnName == "firstname" || $columnName == "email") - { - $contact[$columnName] = $row[$columnName]; - } - else - { - $contact[$columnName] = ""; - } - } - if(in_array("accountid",$permitted_field_lists)) - { - $contact[accountname] = $row[accountname]; - $contact[account_id] = $row[accountid]; - } - $contact[contactid] = $row[contactid]; - $list[] = $contact; - } - } - - $response = Array(); - $response['list'] = $list; - $response['row_count'] = $rows_found; - $response['next_offset'] = $next_offset; - $response['previous_offset'] = $previous_offset; - $log->debug("Exiting process_list_query1 method ..."); - return $response; - } - - - /** Returns a list of the associated opportunities - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function get_opportunities($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_opportunities(".$id.") method ..."); - global $mod_strings; - - $focus = new Potentials(); - $button = ''; - - if(isPermitted("Potentials",1,"") == 'yes') - { - - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; - - $log->info("Potential Related List for Contact Displayed"); - - // First, get the list of IDs. - $query = 'select vtiger_users.user_name,vtiger_groups.groupname,vtiger_contactdetails.accountid, vtiger_contactdetails.contactid , vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_potential on vtiger_contactdetails.accountid = vtiger_potential.accountid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_contactdetails.contactid = '.$id.' and vtiger_crmentity.deleted=0'; - if($this->column_fields['account_id'] != 0) - $log->debug("Exiting get_opportunities method ..."); - return GetRelatedList('Contacts','Potentials',$focus,$query,$button,$returnset); - } - - - /** Returns a list of the associated tasks - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.. - * All Rights Reserved.. - * Contributor(s): ______________________________________.. - */ - function get_activities($id) - { - global $log, $singlepane_view; - $log->debug("Entering get_activities(".$id.") method ..."); - global $mod_strings; - - $focus = new Activity(); - - $button = ''; - - if(isPermitted("Calendar",1,"") == 'yes') - { - $button .= ' '; - $button .= ' '; - } - if($singlepane_view == 'true') - $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id; - - $log->info("Activity Related List for Contact Displayed"); - - $query = "SELECT vtiger_users.user_name,vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.activityid , vtiger_activity.subject, vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.due_date, vtiger_cntactivityrel.contactid, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_recurringevents.recurringtype from vtiger_contactdetails inner join vtiger_cntactivityrel on vtiger_cntactivityrel.contactid = vtiger_contactdetails.contactid inner join vtiger_activity on vtiger_cntactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_cntactivityrel.activityid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_contactdetails.contactid=".$id." and vtiger_crmentity.deleted = 0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') "; //recurring type is added in Query -Jaguar - $log->debug("Exiting get_activities method ..."); - return GetRelatedList('Contacts','Calendar',$focus,$query,$button,$returnset); - - } - /** - * Function to get Contact related Task & Event which have activity type Held, Completed or Deferred. - * @param integer $id - contactid - * returns related Task or Event record in array format - */ - function get_history($id) - { - global $log; - $log->debug("Entering get_history(".$id.") method ..."); - $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus, - vtiger_activity.activitytype, vtiger_contactdetails.contactid, vtiger_contactdetails.firstname, - vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime, - vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name - from vtiger_activity - inner join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid - inner join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid - left join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid - left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid - left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname - inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id - where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') - and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != '')) - and vtiger_cntactivityrel.contactid=".$id; - //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php - $log->debug("Entering get_history method ..."); - return getHistory('Contacts',$query,$id); - } - /** - * Function to get Contact related Tickets. - * @param integer $id - contactid - * returns related Ticket records in array format - */ - function get_tickets($id) - { - global $log, $singlepane_view; - global $app_strings; - $log->debug("Entering get_tickets(".$id.") method ..."); - $focus = new HelpDesk(); - - $button = '  ".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."". $app_strings['LBL_CREATE_MERGE_TEMPLATE']."
    - - - - -
    - - - - - - - - - - - - - - - - -
    -
    - -
    -
    -     		-
    -
    - - - -
    - - - + + + + + + + + + + +<?php echo $mod_strings['TITLE_AJAX_CSS_POPUP_CHAT'];?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + +
    +
    + +
    +
    +     		+
    +
    + + + +
    + + + Modified: vtigercrm/branches/5.1_jens/modules/CustomView/CustomView.js ============================================================================== --- vtigercrm/branches/5.1_jens/modules/CustomView/CustomView.js (original) +++ vtigercrm/branches/5.1_jens/modules/CustomView/CustomView.js Mon Apr 16 12:27:44 2007 @@ -74,7 +74,7 @@ } // Here we decide whether to submit the form. if (isError == true) { - alert("Missing required fields:" + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } //return true; @@ -102,7 +102,7 @@ // Here we decide whether to submit the form. if (isError == true) { - alert("Missing required fields: " + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } return true; Modified: vtigercrm/branches/5.1_jens/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/CustomView/CustomView.php (original) +++ vtigercrm/branches/5.1_jens/modules/CustomView/CustomView.php Mon Apr 16 12:27:44 2007 @@ -22,14 +22,14 @@ global $adv_filter_options; $adv_filter_options = array("e"=>"".$mod_strings['equals']."", - "n"=>"".$mod_strings['not_equal_to']."", - "s"=>"".$mod_strings['starts_with']."", + "n"=>"".$mod_strings['not equal to']."", + "s"=>"".$mod_strings['starts with']."", "c"=>"".$mod_strings['contains']."", - "k"=>"".$mod_strings['does_not_contain']."", - "l"=>"".$mod_strings['less_than']."", - "g"=>"".$mod_strings['greater_than']."", - "m"=>"".$mod_strings['less_or_equal']."", - "h"=>"".$mod_strings['greater_or_equal']."", + "k"=>"".$mod_strings['does not contain']."", + "l"=>"".$mod_strings['less than']."", + "g"=>"".$mod_strings['greater than']."", + "m"=>"".$mod_strings['less or equal']."", + "h"=>"".$mod_strings['greater or equal']."", ); class CustomView extends CRMEntity{ @@ -184,27 +184,31 @@ { global $adb; $tabid = getTabid($module); + if($tabid == 9) + $tabid ="9,16"; global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); + $display_type = " vtiger_field.displaytype in (1,2,3)"; + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) { $sql = "select * from vtiger_field "; - $sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block.") and"; - $sql.= " vtiger_field.displaytype in (1,2)"; + $sql.= " where vtiger_field.tabid in (".$tabid.") and vtiger_field.block in (".$block.") and"; + $sql.= $display_type; $sql.= " order by sequence"; } else { + $profileList = getCurrentUserProfileList(); $sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid "; - $sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block.") and"; - $sql.= " vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0"; - $sql.= " and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." order by sequence"; + $sql.= " where vtiger_field.tabid in (".$tabid.") and vtiger_field.block in (".$block.") and"; + $sql.= "$display_type and vtiger_profile2field.visible=0"; + $sql.= " and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by columnname order by sequence"; } - - - + if($tabid == '9,16') + $tabid ="9"; $result = $adb->query($sql); $noofrows = $adb->num_rows($result); //Added on 14-10-2005 -- added ticket id in list @@ -279,6 +283,7 @@ foreach($this->module_list[$module] as $key=>$value) { $columnlist = $this->getColumnsListbyBlock($module,$value); + if(isset($columnlist)) { $ret_module_list[$module][$key] = $columnlist; @@ -338,18 +343,17 @@ { $sql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid "; $sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$blockids.") - and (vtiger_field.uitype =5 or vtiger_field.displaytype=2) "; + and (vtiger_field.uitype in (5,6,23) or vtiger_field.displaytype=2) "; $sql.= " order by vtiger_field.sequence"; } else { $profileList = getCurrentUserProfileList(); $sql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid "; - $sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$blockids.") and (vtiger_field.uitype =5 or vtiger_field.displaytype=2)"; + $sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$blockids.") and (vtiger_field.uitype in (5,6,23) or vtiger_field.displaytype=2)"; $sql.= " and vtiger_profile2field.visible=0"; $sql.= " and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." order by vtiger_field.sequence"; } - $result = $adb->query($sql); @@ -476,33 +480,43 @@ $nextFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01", date("Y")+1)); $nextFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")+1)); - if(date("m") <= 4) + if(date("m") <= 3) { $cFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y"))); - $cFq1 = date("Y-m-d",mktime(0, 0, 0, "04","30",date("Y"))); - $nFq = date("Y-m-d",mktime(0, 0, 0, "05","01",date("Y"))); - $nFq1 = date("Y-m-d",mktime(0, 0, 0, "08","31",date("Y"))); - $pFq = date("Y-m-d",mktime(0, 0, 0, "09","01",date("Y")-1)); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "03","31",date("Y"))); + $nFq = date("Y-m-d",mktime(0, 0, 0, "04","01",date("Y"))); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "06","30",date("Y"))); + $pFq = date("Y-m-d",mktime(0, 0, 0, "10","01",date("Y")-1)); $pFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y")-1)); - }else if(date("m") > 4 and date("m") <= 8) - { + }else if(date("m") > 3 and date("m") <= 6) + { $pFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y"))); - $pFq1 = date("Y-m-d",mktime(0, 0, 0, "04","30",date("Y"))); - $cFq = date("Y-m-d",mktime(0, 0, 0, "05","01",date("Y"))); - $cFq1 = date("Y-m-d",mktime(0, 0, 0, "08","31",date("Y"))); - $nFq = date("Y-m-d",mktime(0, 0, 0, "09","01",date("Y"))); - $nFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y"))); - - }else - { - $nFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y")+1)); - $nFq1 = date("Y-m-d",mktime(0, 0, 0, "04","30",date("Y")+1)); - $pFq = date("Y-m-d",mktime(0, 0, 0, "05","01",date("Y"))); - $pFq1 = date("Y-m-d",mktime(0, 0, 0, "08","31",date("Y"))); - $cFq = date("Y-m-d",mktime(0, 0, 0, "09","01",date("Y"))); - $cFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y"))); - } - + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "03","31",date("Y"))); + $cFq = date("Y-m-d",mktime(0, 0, 0, "04","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "06","30",date("Y"))); + $nFq = date("Y-m-d",mktime(0, 0, 0, "07","01",date("Y"))); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "09","30",date("Y"))); + + }else if(date("m") > 6 and date("m") <= 9) + { + $nFq = date("Y-m-d",mktime(0, 0, 0, "10","01",date("Y"))); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y"))); + $pFq = date("Y-m-d",mktime(0, 0, 0, "04","01",date("Y"))); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "06","30",date("Y"))); + $cFq = date("Y-m-d",mktime(0, 0, 0, "07","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "09","30",date("Y"))); + } + else if(date("m") > 9 and date("m") <= 12) + { + $nFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y")+1)); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "03","31",date("Y")+1)); + $pFq = date("Y-m-d",mktime(0, 0, 0, "07","01",date("Y"))); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "09","30",date("Y"))); + $cFq = date("Y-m-d",mktime(0, 0, 0, "10","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y"))); + + } + $sjsStr = ' Modified: vtigercrm/branches/5.1_jens/modules/HelpDesk/Save.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/HelpDesk/Save.php (original) +++ vtigercrm/branches/5.1_jens/modules/HelpDesk/Save.php Mon Apr 16 12:27:44 2007 @@ -1,227 +1,215 @@ -constructUpdateLog(&$focus, $mode, $_REQUEST['assigned_group_name'], $_REQUEST['assigntype']); -$fldvalue = from_html($adb->formatString('vtiger_troubletickets','update_log',$fldvalue),($mode == 'edit')?true:false); - -$focus->save("HelpDesk"); - -//After save the record, we should update the log -$adb->query("update vtiger_troubletickets set update_log=$fldvalue where ticketid=".$focus->id); - -//Added to retrieve the existing attachment of the ticket and save it for the new duplicated ticket -if($_FILES['filename']['name'] == '' && $_REQUEST['mode'] != 'edit' && $_REQUEST['old_id'] != '') -{ - $sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid=vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid= ".$_REQUEST['old_id']; - $result = $adb->query($sql); - if($adb->num_rows($result) != 0) - { - $attachmentid = $adb->query_result($result,0,'attachmentsid'); - $filename = $adb->query_result($result,0,'name'); - $filetype = $adb->query_result($result,0,'type'); - $filepath = $adb->query_result($result,0,'path'); - - $new_attachmentid = $adb->getUniqueID("vtiger_crmentity"); +query("select * from vtiger_crmentity where crmid='".$focus->id."'"); + $old_user_id = $adb->query_result($usr_qry,0,"smownerid"); +} +$fldvalue = $focus->constructUpdateLog(&$focus, $mode, $_REQUEST['assigned_group_name'], $_REQUEST['assigntype']); +$fldvalue = from_html($adb->formatString('vtiger_troubletickets','update_log',$fldvalue),($mode == 'edit')?true:false); + +$focus->save("HelpDesk"); + +//After save the record, we should update the log +$adb->query("update vtiger_troubletickets set update_log=$fldvalue where ticketid=".$focus->id); + +//Added to retrieve the existing attachment of the ticket and save it for the new duplicated ticket +if($_FILES['filename']['name'] == '' && $_REQUEST['mode'] != 'edit' && $_REQUEST['old_id'] != '') +{ + $sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid=vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid= ".$_REQUEST['old_id']; + $result = $adb->query($sql); + if($adb->num_rows($result) != 0) + { + $attachmentid = $adb->query_result($result,0,'attachmentsid'); + $filename = $adb->query_result($result,0,'name'); + $filetype = $adb->query_result($result,0,'type'); + $filepath = $adb->query_result($result,0,'path'); + + $new_attachmentid = $adb->getUniqueID("vtiger_crmentity"); $date_var = $adb->formatDate(date('YmdHis')); - - $upload_filepath = decideFilePath(); - - //Read the old file contents and write it as a new file with new attachment id - $handle = @fopen($upload_filepath.$new_attachmentid."_".$filename,'w'); - fputs($handle, file_get_contents($filepath.$attachmentid."_".$filename)); - fclose($handle); - - $adb->query("update vtiger_troubletickets set filename=\"$filename\" where ticketid=$focus->id"); - $adb->query("insert into vtiger_crmentity (crmid,setype,createdtime) values('".$new_attachmentid."','HelpDesk Attachment',".$date_var.")"); - - $adb->query("insert into vtiger_attachments values(".$new_attachmentid.",'".$filename."','','".$filetype."','".$upload_filepath."')"); - - $adb->query("insert into vtiger_seattachmentsrel values('".$focus->id."','".$new_attachmentid."')"); - } -} - - -$return_id = $focus->id; - -if(isset($_REQUEST['parenttab']) && $_REQUEST['parenttab'] != "") $parenttab = $_REQUEST['parenttab']; -if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; -else $return_module = "HelpDesk"; -if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; -else $return_action = "DetailView"; -if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id']; - -if($_REQUEST['mode'] == 'edit') - $reply = 'Re : '; -else - $reply = ''; - -$subject = '[ Ticket ID : '.$focus->id.' ] '.$reply.$_REQUEST['ticket_title']; -$bodysubject = ' Ticket ID : '.$focus->id.'
    Subject : '.$_REQUEST['ticket_title']; - -$emailoptout = 0; - -//To get the emailoptout vtiger_field value and then decide whether send mail about the tickets or not -if($focus->column_fields['parent_id'] != '') -{ - $parent_module = getSalesEntityType($focus->column_fields['parent_id']); - if($parent_module == 'Contacts') - { - $result = $adb->query("select * from vtiger_contactdetails where contactid=".$focus->column_fields['parent_id']); - $emailoptout = $adb->query_result($result,0,'emailoptout'); - $contactname = $adb->query_result($result,0,'firstname').' '.$adb->query_result($result,0,'lastname'); - $parentname = $contactname; - $contact_mailid = $adb->query_result($result,0,'email'); - } - if($parent_module == 'Accounts') - { - $result = $adb->query("select * from vtiger_account where accountid=".$focus->column_fields['parent_id']); - $emailoptout = $adb->query_result($result,0,'emailoptout'); - $parentname = $adb->query_result($result,0,'accountname'); - } -} - -//Get the status of the vtiger_portal user. if the customer is active then send the vtiger_portal link in the mail -if($contact_mailid != '') -{ - $sql = "select * from vtiger_portalinfo where user_name='".$contact_mailid."'"; - $isactive = $adb->query_result($adb->query($sql),0,'isactive'); -} -if($isactive == 1) -{ - $bodydetails = "Dear ".$contactname.",

    "; - $bodydetails .= 'There is a reply to '.$_REQUEST['ticket_title'].' in the "Customer Portal" at VTiger.'; - $bodydetails .= "You can use the following link to view the replies made:
    "; - - $bodydetails .= "Ticket Details"; - $bodydetails .= "

    Thanks,

    Vtiger Support Team "; - - $email_body = $bodysubject.'

    '.$bodydetails; -} -else -{ - $desc = 'Ticket ID : '.$focus->id.'
    Ticket Title : '.$reply.$_REQUEST['ticket_title']; - $desc .= "

    Dear ".$parentname.",

    The Ticket is replied and the details are :
    "; - $desc .= "
    Status : ".$focus->column_fields['ticketstatus']; - $desc .= "
    Category : ".$focus->column_fields['ticketcategories']; - $desc .= "
    Severity : ".$focus->column_fields['ticketseverities']; - $desc .= "
    Priority : ".$focus->column_fields['ticketpriorities']; - $desc .= '

    Description :
    '.$focus->column_fields['description']; - $desc .= '

    Solution :
    '.$focus->column_fields['solution']; - $desc .= getTicketComments($focus->id); - - $desc .= '


    '; - $desc .= '


    '; - $desc .= '


    '; - $desc .= '
    Regards, HelpDesk Team
    '; - $email_body = $desc; -} -$_REQUEST['return_id'] = $return_id; - -if($_REQUEST['product_id'] != '' && $focus->id != '' && $_REQUEST['mode'] != 'edit') -{ - $sql = 'insert into vtiger_seticketsrel values('.$_REQUEST['product_id'].' , '.$focus->id.')'; - $adb->query($sql); - - if($_REQUEST['return_module'] == 'Products') - $return_id = $_REQUEST['product_id']; -} - -//send mail to the assigned to user and the parent to whom this ticket is assigned -require_once('modules/Emails/mail.php'); -$user_emailid = getUserEmailId('id',$focus->column_fields['assigned_user_id']); -if($user_emailid != '') -{ - $mail_status = send_mail('HelpDesk',$user_emailid,$HELPDESK_SUPPORT_NAME,$HELPDESK_SUPPORT_EMAIL_ID,$subject,$email_body); - $mail_status_str = $user_emailid."=".$mail_status."&&&"; -} -else -{ - $mail_status_str = "'".$to_email."'=0&&&"; -} -//added condition to check the emailoptout(this is for contacts and vtiger_accounts.) -if($emailoptout == 0) -{ - //send mail to parent - if($_REQUEST['parent_id'] != '' && $_REQUEST['parent_type'] != '') - { - $parentmodule = $_REQUEST['parent_type']; - $parentid = $_REQUEST['parent_id']; - - $parent_email = getParentMailId($parentmodule,$parentid); - $mail_status = send_mail('HelpDesk',$parent_email,$HELPDESK_SUPPORT_NAME,$HELPDESK_SUPPORT_EMAIL_ID,$subject,$email_body); - $mail_status_str .= $parent_email."=".$mail_status."&&&"; - } -} -else -{ - $adb->println("'".$parentname."' is not want to get the email about the ticket details as emailoptout is selected"); -} - -$mail_error_status = getMailErrorString($mail_status_str); - -//code added for returning back to the current view after edit from list view -if($_REQUEST['return_viewname'] == '') $return_viewname='0'; -if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; -header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&$mail_error_status&viewname=$return_viewname"); - -/** Function to get all the comments for a troubleticket - * @param int $ticketid -- troubleticket id - * return all the comments as a sequencial string which are related to this ticket -**/ -function getTicketComments($ticketid) -{ - global $log; - $log->debug("Entering getTicketComments(".$ticketid.") method ..."); - global $adb; - - $commentlist = ''; - $sql = "select * from vtiger_ticketcomments where ticketid=".$ticketid; - $result = $adb->query($sql); - for($i=0;$i<$adb->num_rows($result);$i++) - { - $comment = $adb->query_result($result,$i,'comments'); - if($comment != '') - { - $commentlist .= '

    '.$comment; - } - } - if($commentlist != '') - $commentlist = '

    The comments are : '.$commentlist; - - $log->debug("Exiting getTicketComments method ..."); - return $commentlist; -} - -?> + + $upload_filepath = decideFilePath(); + + //Read the old file contents and write it as a new file with new attachment id + $handle = @fopen($upload_filepath.$new_attachmentid."_".$filename,'w'); + fputs($handle, file_get_contents($filepath.$attachmentid."_".$filename)); + fclose($handle); + + $adb->query("update vtiger_troubletickets set filename=\"$filename\" where ticketid=$focus->id"); + $adb->query("insert into vtiger_crmentity (crmid,setype,createdtime) values('".$new_attachmentid."','HelpDesk Attachment',".$date_var.")"); + + $adb->query("insert into vtiger_attachments values(".$new_attachmentid.",'".$filename."','','".$filetype."','".$upload_filepath."')"); + + $adb->query("insert into vtiger_seattachmentsrel values('".$focus->id."','".$new_attachmentid."')"); + } +} + + +$return_id = $focus->id; + +if(isset($_REQUEST['parenttab']) && $_REQUEST['parenttab'] != "") $parenttab = $_REQUEST['parenttab']; +if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; +else $return_module = "HelpDesk"; +if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; +else $return_action = "DetailView"; +if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id']; + +if($_REQUEST['mode'] == 'edit') + $reply = 'Re : '; +else + $reply = ''; + +$subject = '[ '.$mod_strings['LBL_TICKET_ID'].' : '.$focus->id.' ] '.$reply.$_REQUEST['ticket_title']; +$bodysubject = $mod_strings['LBL_TICKET_ID'].' : '.$focus->id.'
    '.$mod_strings['LBL_SUBJECT'].$_REQUEST['ticket_title']; + +$emailoptout = 0; + +//To get the emailoptout vtiger_field value and then decide whether send mail about the tickets or not +if($focus->column_fields['parent_id'] != '') +{ + $parent_module = getSalesEntityType($focus->column_fields['parent_id']); + if($parent_module == 'Contacts') + { + $result = $adb->query("select * from vtiger_contactdetails where contactid=".$focus->column_fields['parent_id']); + $emailoptout = $adb->query_result($result,0,'emailoptout'); + $contactname = $adb->query_result($result,0,'firstname').' '.$adb->query_result($result,0,'lastname'); + $parentname = $contactname; + $contact_mailid = $adb->query_result($result,0,'email'); + } + if($parent_module == 'Accounts') + { + $result = $adb->query("select * from vtiger_account where accountid=".$focus->column_fields['parent_id']); + $emailoptout = $adb->query_result($result,0,'emailoptout'); + $parentname = $adb->query_result($result,0,'accountname'); + } +} + +//Get the status of the vtiger_portal user. if the customer is active then send the vtiger_portal link in the mail +if($contact_mailid != '') +{ + $sql = "select * from vtiger_portalinfo where user_name='".$contact_mailid."'"; + $isactive = $adb->query_result($adb->query($sql),0,'isactive'); +} +if($isactive == 1) +{ + $url = "".$mod_strings['LBL_TICKET_DETAILS'].""; + $email_body = $bodysubject.'

    '.getPortalInfo_Ticket($focus->id,$_REQUEST['ticket_title'],$contactname,$url,$_REQUEST['mode']); +} +else +{ + $data['sub']=$_REQUEST['ticket_title']; + $data['parent_name']=$parentname; + $data['status']=$focus->column_fields['ticketstatus']; + $data['category']=$focus->column_fields['ticketcategories']; + $data['severity'] = $focus->column_fields['ticketseverities']; + $data['priority']=$focus->column_fields['ticketpriorities']; + $data['description']=$focus->column_fields['description']; + $data['solution'] = $focus->column_fields['solution']; + $data['mode']= $_REQUEST['mode']; + $email_body = getTicketDetails($focus->id,$data); +} +$_REQUEST['return_id'] = $return_id; + +if($_REQUEST['product_id'] != '' && $focus->id != '' && $_REQUEST['mode'] != 'edit') +{ + $sql = 'insert into vtiger_seticketsrel values('.$_REQUEST['product_id'].' , '.$focus->id.')'; + $adb->query($sql); + + if($_REQUEST['return_module'] == 'Products') + $return_id = $_REQUEST['product_id']; +} + +//send mail to the assigned to user and the parent to whom this ticket is assigned +require_once('modules/Emails/mail.php'); +$user_emailid = getUserEmailId('id',$focus->column_fields['assigned_user_id']); + +if($user_emailid != '') +{ + if($_REQUEST['mode'] != 'edit') + { + $mail_status = send_mail('HelpDesk',$user_emailid,$HELPDESK_SUPPORT_NAME,$HELPDESK_SUPPORT_EMAIL_ID,$subject,$email_body); + } + else + { + if(($focus->column_fields['ticketstatus'] == $mod_strings["Closed"]) || ($focus->column_fields['comments'] != '') || ($_REQUEST['helpdesk_solution'] != $_REQUEST['solution']) || ($focus->column_fields['assigned_user_id'] != $old_user_id)) + { + $mail_status = send_mail('HelpDesk',$user_emailid,$HELPDESK_SUPPORT_NAME,$HELPDESK_SUPPORT_EMAIL_ID,$subject,$email_body); + } + + } + + $mail_status_str = $user_emailid."=".$mail_status."&&&"; +} +else +{ + $mail_status_str = "'".$to_email."'=0&&&"; +} +//added condition to check the emailoptout(this is for contacts and vtiger_accounts.) +if($emailoptout == 0) +{ + //send mail to parent + if($_REQUEST['parent_id'] != '' && $_REQUEST['parent_type'] != '') + { + $parentmodule = $_REQUEST['parent_type']; + $parentid = $_REQUEST['parent_id']; + + $parent_email = getParentMailId($parentmodule,$parentid); + if($_REQUEST['mode'] != 'edit') + { + $mail_status = send_mail('HelpDesk',$parent_email,$HELPDESK_SUPPORT_NAME,$HELPDESK_SUPPORT_EMAIL_ID,$subject,$email_body); + } + else + { + if(( $focus->column_fields['ticketstatus']== $mod_strings["Closed"]) || ($focus->column_fields['comments'] != '' ) || ($_REQUEST['helpdesk_solution'] != $_REQUEST['solution'])) + { + $mail_status = send_mail('HelpDesk',$parent_email,$HELPDESK_SUPPORT_NAME,$HELPDESK_SUPPORT_EMAIL_ID,$subject,$email_body); + } + } + $mail_status_str .= $parent_email."=".$mail_status."&&&"; + } +} +else +{ + $adb->println("'".$parentname."' is not want to get the email about the ticket details as emailoptout is selected"); +} + +$mail_error_status = getMailErrorString($mail_status_str); + +//code added for returning back to the current view after edit from list view +if($_REQUEST['return_viewname'] == '') $return_viewname='0'; +if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; +header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&$mail_error_status&viewname=$return_viewname"); + +?> Modified: vtigercrm/branches/5.1_jens/modules/HelpDesk/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/HelpDesk/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/HelpDesk/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -36,7 +36,6 @@ 'Accounts'=>'Account', 'Contacts'=>'Contact', 'Opportunities'=>'Opportunity', -'LBL_TICKET_INFORMATION'=>'Ticket Information', 'LBL_CUSTOM_INFORMATION'=>'Custom Information', 'LBL_DESCRIPTION_INFORMATION'=>'Description Information', @@ -57,7 +56,6 @@ 'LBL_PRIORITY'=>'Priority', 'LBL_CATEGORY'=>'Category', -'LBL_QUESTION'=>'Question', 'LBL_ANSWER'=>'Answer', 'LBL_COMMENTS'=>'Comments', @@ -83,14 +81,6 @@ 'LBL_SELECT_TICKET'=>'Select Ticket', 'LBL_CHANGE_OWNER'=>'Change Owner', 'LBL_CHANGE_STATUS'=>'Change Status', - - - - - - - - 'LBL_TICKET_TITLE'=>'Title', 'LBL_TICKET_DESCRIPTION'=>'Description', 'LBL_TICKET_CATEGORY'=>'Category', @@ -181,6 +171,23 @@ 'Wait For Response'=>'Wait For Response', 'Closed'=>'Closed', +//added to support i18n in ticket mails +'Hi' => 'Hi', +'Dear'=> 'Dear', +'LBL_PORTAL_BODY_MAILINFO'=> 'The Ticket is', +'LBL_DETAIL' => 'the details are :', +'LBL_REGARDS'=> 'Regards', +'LBL_TEAM'=> 'HelpDesk Team', +'LBL_TICKET_DETAILS' => 'Ticket Details', +'LBL_SUBJECT' => 'Subject : ', +'created' => 'created', +'replied' => 'replied', +'reply'=>'There is a reply to', +'customer_portal' => 'in the "Customer Portal" at VTiger.', +'link' => 'You can use the following link to view the replies made:', +'Thanks' => 'Thanks', +'Support_team' => 'Vtiger Support Team', + ); ?> Modified: vtigercrm/branches/5.1_jens/modules/Home/UnifiedSearch.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Home/UnifiedSearch.php (original) +++ vtigercrm/branches/5.1_jens/modules/Home/UnifiedSearch.php Mon Apr 16 12:27:44 2007 @@ -1,288 +1,294 @@ - object - $object_array = getSearchModules(); - foreach($object_array as $curr_module=>$curr_object) - { - require_once("modules/$curr_module/$curr_object.php"); - } - - global $adb; - global $current_user; - global $theme; - $theme_path="themes/".$theme."/"; - $image_path=$theme_path."images/"; - - $search_val = $query_string; - $search_module = $_REQUEST['search_module']; - - getSearchModulesComboList($search_module); - - foreach($object_array as $module => $object_name) - { - if(isPermitted($module,"index") == "yes") - { - $focus = new $object_name(); - - $smarty = new vtigerCRM_Smarty; - - require_once("modules/$module/language/en_us.lang.php"); - global $mod_strings; - global $app_strings; - - $smarty->assign("MOD", $mod_strings); - $smarty->assign("APP", $app_strings); - $smarty->assign("IMAGE_PATH",$image_path); - $smarty->assign("MODULE",$module); - $smarty->assign("SEARCH_MODULE",$_REQUEST['search_module']); - $smarty->assign("SINGLE_MOD",$module); - - - $listquery = getListQuery($module); - $oCustomView = ''; - - $oCustomView = new CustomView($module); - - if($search_module != '')//This is for Tag search - { - - $where = getTagWhere($search_val,$current_user->id); - $search_msg = $app_strings['LBL_TAG_SEARCH']; - $search_msg .= "".$search_val.""; - } - else //This is for Global search - { - $where = getUnifiedWhere($listquery,$module,$search_val); - $search_msg = $app_strings['LBL_SEARCH_RESULTS_FOR']; - $search_msg .= "".$search_val.""; - } - - if($where != '') - $listquery .= ' and ('.$where.')'; - - $list_result = $adb->query($listquery); - $noofrows = $adb->num_rows($list_result); - - if($noofrows >= 1) - $list_max_entries_per_page = $noofrows; - //Here we can change the max list entries per page per module - $navigation_array = getNavigationValues(1, $noofrows, $list_max_entries_per_page); - - $listview_header = getListViewHeader($focus,$module,"","","","global",$oCustomView); - $listview_entries = getListViewEntries($focus,$module,$list_result,$navigation_array,"","","","",$oCustomView); - - //Do not display the Header if there are no entires in listview_entries - if(count($listview_entries) > 0) - { - $display_header = 1; - } - else - { - $display_header = 0; - } - - $smarty->assign("LISTHEADER", $listview_header); - $smarty->assign("LISTENTITY", $listview_entries); - $smarty->assign("DISPLAYHEADER", $display_header); - $smarty->assign("HEADERCOUNT", count($listview_header)); - - $total_record_count = $total_record_count + $noofrows; - - $smarty->assign("SEARCH_CRITERIA","( $noofrows )".$search_msg); - $smarty->assign("MODULES_LIST", $object_array); - - $smarty->display("GlobalListView.tpl"); - unset($_SESSION['lvs'][$module]); - } - } - - //Added to display the Total record count -?> - -
            ".$mod_strings['ERR_ONE_CHAR'].""; -} - -/** Function to get the where condition for a module based on the field table entries - * @param string $listquery -- ListView query for the module - * @param string $module -- module name - * @param string $search_val -- entered search string value - * @return string $where -- where condition for the module based on field table entries - */ -function getUnifiedWhere($listquery,$module,$search_val) -{ - global $adb; - - $query = "SELECT columnname, tablename FROM vtiger_field WHERE tabid = ".getTabid($module); - $result = $adb->query($query); - $noofrows = $adb->num_rows($result); - - $where = ''; - for($i=0;$i<$noofrows;$i++) - { - $columnname = $adb->query_result($result,$i,'columnname'); - $tablename = $adb->query_result($result,$i,'tablename'); - - //Before form the where condition, check whether the table for the field has been added in the listview query - if(strstr($listquery,$tablename)) - { - if($where != '') - $where .= " OR "; - $where .= $tablename.".".$columnname." LIKE ".$adb->quote("%$search_val%"); - } - } - - return $where; -} - -/** Function to get the Tags where condition - * @param string $search_val -- entered search string value - * @param string $current_user_id -- current user id - * @return string $where -- where condition with the list of crmids, will like vtiger_crmentity.crmid in (1,3,4,etc.,) - */ -function getTagWhere($search_val,$current_user_id) -{ - require_once('include/freetag/freetag.class.php'); - - $freetag_obj = new freetag(); - - $crmid_array = $freetag_obj->get_objects_with_tag_all($search_val,$current_user_id); - - $where = ''; - if(count($crmid_array) > 0) - { - $where = " vtiger_crmentity.crmid IN ("; - foreach($crmid_array as $index => $crmid) - { - $where .= $crmid.','; - } - $where = trim($where,',').')'; - } - - return $where; -} - - -/** Function to get the the List of Searchable Modules as a combo list which will be displayed in right corner under the Header - * @param string $search_module -- search module, this module result will be shown defaultly - */ -function getSearchModulesComboList($search_module) -{ - global $object_array; - global $app_strings; - global $mod_strings; - - ?> - - - - - - - -
       - -
    - $object_name1,$module_name2=>$object_name2,$module_name3=>$object_name3,$module_name4=>$object_name4,-----); - */ - function getSearchModules() - { - global $adb; - $sql = 'select distinct vtiger_field.tabid,name from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where vtiger_tab.tabid not in (16,29)'; - $result = $adb->query($sql); - while($module_result = $adb->fetch_array($result)) - { - $modulename = $module_result['name']; - if($modulename != 'Calendar') - { - $return_arr[$modulename] = $modulename; - }else - { - $return_arr[$modulename] = 'Activity'; - } - } - return $return_arr; - } - -?> + object + $object_array = getSearchModules(); + foreach($object_array as $curr_module=>$curr_object) + { + require_once("modules/$curr_module/$curr_object.php"); + } + + global $adb; + global $current_user; + global $theme; + $theme_path="themes/".$theme."/"; + $image_path=$theme_path."images/"; + + $search_val = $query_string; + $search_module = $_REQUEST['search_module']; + + getSearchModulesComboList($search_module); + + foreach($object_array as $module => $object_name) + { + if(isPermitted($module,"index") == "yes") + { + $focus = new $object_name(); + + $smarty = new vtigerCRM_Smarty; + + require_once("modules/$module/language/en_us.lang.php"); + global $mod_strings; + global $app_strings; + + $smarty->assign("MOD", $mod_strings); + $smarty->assign("APP", $app_strings); + $smarty->assign("IMAGE_PATH",$image_path); + $smarty->assign("MODULE",$module); + $smarty->assign("SEARCH_MODULE",$_REQUEST['search_module']); + $smarty->assign("SINGLE_MOD",$module); + + + $listquery = getListQuery($module); + $oCustomView = ''; + + $oCustomView = new CustomView($module); + $viewid = $oCustomView->getViewId($module); + $listquery = $oCustomView->getModifiedCvListQuery($viewid,$listquery,$module); + if ($module == "Calendar"){ + if (!isset($oCustomView->list_fields['Close'])) $oCustomView->list_fields['Close']=array ( 'activity' => 'status' ); + if (!isset($oCustomView->list_fields_name['Close'])) $oCustomView->list_fields_name['Close']='status'; + } + + if($search_module != '')//This is for Tag search + { + + $where = getTagWhere($search_val,$current_user->id); + $search_msg = $app_strings['LBL_TAG_SEARCH']; + $search_msg .= "".$search_val.""; + } + else //This is for Global search + { + $where = getUnifiedWhere($listquery,$module,$search_val); + $search_msg = $app_strings['LBL_SEARCH_RESULTS_FOR']; + $search_msg .= "".$search_val.""; + } + + if($where != '') + $listquery .= ' and ('.$where.')'; + + $list_result = $adb->query($listquery); + $noofrows = $adb->num_rows($list_result); + + if($noofrows >= 1) + $list_max_entries_per_page = $noofrows; + //Here we can change the max list entries per page per module + $navigation_array = getNavigationValues(1, $noofrows, $list_max_entries_per_page); + + $listview_header = getListViewHeader($focus,$module,"","","","global",$oCustomView); + $listview_entries = getListViewEntries($focus,$module,$list_result,$navigation_array,"","","","",$oCustomView); + + //Do not display the Header if there are no entires in listview_entries + if(count($listview_entries) > 0) + { + $display_header = 1; + } + else + { + $display_header = 0; + } + + $smarty->assign("LISTHEADER", $listview_header); + $smarty->assign("LISTENTITY", $listview_entries); + $smarty->assign("DISPLAYHEADER", $display_header); + $smarty->assign("HEADERCOUNT", count($listview_header)); + + $total_record_count = $total_record_count + $noofrows; + + $smarty->assign("SEARCH_CRITERIA","( $noofrows )".$search_msg); + $smarty->assign("MODULES_LIST", $object_array); + + $smarty->display("GlobalListView.tpl"); + unset($_SESSION['lvs'][$module]); + } + } + + //Added to display the Total record count +?> + +
            ".$mod_strings['ERR_ONE_CHAR'].""; +} + +/** Function to get the where condition for a module based on the field table entries + * @param string $listquery -- ListView query for the module + * @param string $module -- module name + * @param string $search_val -- entered search string value + * @return string $where -- where condition for the module based on field table entries + */ +function getUnifiedWhere($listquery,$module,$search_val) +{ + global $adb; + + $query = "SELECT columnname, tablename FROM vtiger_field WHERE tabid = ".getTabid($module); + $result = $adb->query($query); + $noofrows = $adb->num_rows($result); + + $where = ''; + for($i=0;$i<$noofrows;$i++) + { + $columnname = $adb->query_result($result,$i,'columnname'); + $tablename = $adb->query_result($result,$i,'tablename'); + + //Before form the where condition, check whether the table for the field has been added in the listview query + if(strstr($listquery,$tablename)) + { + if($where != '') + $where .= " OR "; + $where .= $tablename.".".$columnname." LIKE ".$adb->quote("%$search_val%"); + } + } + + return $where; +} + +/** Function to get the Tags where condition + * @param string $search_val -- entered search string value + * @param string $current_user_id -- current user id + * @return string $where -- where condition with the list of crmids, will like vtiger_crmentity.crmid in (1,3,4,etc.,) + */ +function getTagWhere($search_val,$current_user_id) +{ + require_once('include/freetag/freetag.class.php'); + + $freetag_obj = new freetag(); + + $crmid_array = $freetag_obj->get_objects_with_tag_all($search_val,$current_user_id); + + $where = ''; + if(count($crmid_array) > 0) + { + $where = " vtiger_crmentity.crmid IN ("; + foreach($crmid_array as $index => $crmid) + { + $where .= $crmid.','; + } + $where = trim($where,',').')'; + } + + return $where; +} + + +/** Function to get the the List of Searchable Modules as a combo list which will be displayed in right corner under the Header + * @param string $search_module -- search module, this module result will be shown defaultly + */ +function getSearchModulesComboList($search_module) +{ + global $object_array; + global $app_strings; + global $mod_strings; + + ?> + + + + + + + +
       + +
    + $object_name1,$module_name2=>$object_name2,$module_name3=>$object_name3,$module_name4=>$object_name4,-----); + */ + function getSearchModules() + { + global $adb; + $sql = 'select distinct vtiger_field.tabid,name from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where vtiger_tab.tabid not in (16,29)'; + $result = $adb->query($sql); + while($module_result = $adb->fetch_array($result)) + { + $modulename = $module_result['name']; + if($modulename != 'Calendar') + { + $return_arr[$modulename] = $modulename; + }else + { + $return_arr[$modulename] = 'Activity'; + } + } + return $return_arr; + } + +?> Modified: vtigercrm/branches/5.1_jens/modules/Home/index.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Home/index.php (original) +++ vtigercrm/branches/5.1_jens/modules/Home/index.php Mon Apr 16 12:27:44 2007 @@ -54,7 +54,7 @@ } if( count($home_section_order) < 1 ) { - $home_section_order = array("ALVT","HDB","PLVT","QLTQ","CVLVT","HLT","OLV","GRT","OLTSO","ILTI","MNL","OLTPO","LTFAQ"); + $home_section_order = array("HDB","ALVT","PLVT","QLTQ","CVLVT","HLT","OLV","GRT","OLTSO","ILTI","MNL","OLTPO","LTFAQ"); } require('user_privileges/user_privileges_'.$current_user->id.'.php'); @@ -67,8 +67,10 @@ { $activities = Array(); include("modules/Calendar/OpenListView.php") ; - $activities[] = getPendingActivities(0); - $activities[] = getPendingActivities(1); + $activities[] = getPendingActivities(0,"today"); + $activities[] = getPendingActivities(0,"all"); + $activities[] = getPendingActivities(1,"today"); + $activities[] = getPendingActivities(1,"all"); } break; case 'ALVT': @@ -173,9 +175,13 @@ } global $current_language; + +global $current_user; +$user_name = $current_user->column_fields[user_name]; $current_module_strings = return_module_language($current_language, 'Calendar'); $t=Date("Ymd"); +//echo '
    ';print_r($home_values); echo '
    '; $buttoncheck['Calendar'] = isPermitted('Calendar','index'); $smarty->assign("CHECK",$buttoncheck); $smarty->assign("IMAGE_PATH",$image_path); @@ -186,6 +192,7 @@ $smarty->assign("HOMEDETAILS",$home_values); $smarty->assign("HOMEDEFAULTVIEW",DefHomeView()); $smarty->assign("ACTIVITIES",$activities); +$smarty->assign("CURRENTUSER",$user_name); $freetag = new freetag(); $smarty->assign("ALL_TAG",$freetag->get_tag_cloud_html("",$current_user->id)); $smarty->display("HomePage.tpl"); @@ -230,11 +237,13 @@ global $app_strings; $userid= $current_user->id; $groupids = fetchUserGroupids($userid); - if($groupids !='') + //Check for permission before constructing the query. + if($groupids !='' && (isPermitted('Leads','index') == "yes" || isPermitted('Calendar','index') == "yes" || isPermitted('HelpDesk','index') == "yes" || isPermitted('Potentials','index') == "yes" || isPermitted('Accounts','index') == "yes" || isPermitted('Contacts','index') =='yes' || isPermitted('Campaigns','index') =='yes' || isPermitted('SalesOrder','index') =='yes' || isPermitted('Invoice','index') =='yes' || isPermitted('PurchaseOrder','index') == 'yes')) { $query = ''; if(isPermitted('Leads','index') == "yes") { + //code modified to list the vtiger_groups associates to a user om 21-11-05 //Get the leads assigned to group $query = "select vtiger_leaddetails.leadid as id,vtiger_leaddetails.lastname as name,vtiger_leadgrouprelation.groupname as groupname, 'Leads ' as Type from vtiger_leaddetails inner join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid inner join vtiger_groups on vtiger_leadgrouprelation.groupname=vtiger_groups.groupname where vtiger_crmentity.deleted=0 and vtiger_leadgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")"; @@ -254,8 +263,66 @@ $query .= "select vtiger_troubletickets.ticketid,vtiger_troubletickets.title as name,vtiger_ticketgrouprelation.groupname,'Tickets ' as Type from vtiger_troubletickets inner join vtiger_ticketgrouprelation on vtiger_ticketgrouprelation.ticketid=vtiger_troubletickets.ticketid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_troubletickets.ticketid inner join vtiger_groups on vtiger_ticketgrouprelation.groupname=vtiger_groups.groupname where vtiger_crmentity.deleted=0 and vtiger_troubletickets.status != 'Closed' and vtiger_ticketgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")"; } + if(isPermitted('Potentials','index') == "yes") + { + if($query != '') + $query .=" union all "; + //Get the potentials assigned to group(sales stage not Closed Lost or Closed Won-- hardcoded value) + $query .= "select vtiger_potential.potentialid,vtiger_potential.potentialname as name,vtiger_potentialgrouprelation.groupname as groupname,'Potentials ' as Type from vtiger_potential inner join vtiger_potentialgrouprelation on vtiger_potentialgrouprelation.potentialid = vtiger_potential.potentialid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid inner join vtiger_groups on vtiger_potentialgrouprelation.groupname = vtiger_groups.groupname where vtiger_crmentity.deleted=0 and ((vtiger_potential.sales_stage !='Closed Lost') or (vtiger_potential.sales_stage != 'Closed Won')) and vtiger_potentialgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")"; + + } + if(isPermitted('Accounts','index') == "yes") + { + if($query != '') + $query .=" union all "; + //Get the Accounts assigned to group + $query .= "select vtiger_account.accountid as id,vtiger_account.accountname as name,vtiger_accountgrouprelation.groupname as groupname, 'Accounts ' as Type from vtiger_account inner join vtiger_accountgrouprelation on vtiger_account.accountid=vtiger_accountgrouprelation.accountid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid inner join vtiger_groups on vtiger_accountgrouprelation.groupname=vtiger_groups.groupname where vtiger_crmentity.deleted=0 and vtiger_accountgrouprelation.groupname is not null and vtiger_groups.groupid in(".$groupids.")"; + } + if(isPermitted('Contacts','index' =='yes')) + { + if($query != '') + $query .=" union all "; + //Get the Contacts assigned to group + $query .= "select vtiger_contactdetails.contactid as id, vtiger_contactdetails.lastname as name ,vtiger_contactgrouprelation.groupname as groupname, 'Contacts ' as Type from vtiger_contactdetails inner join vtiger_contactgrouprelation on vtiger_contactdetails.contactid = vtiger_contactgrouprelation.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_groups on vtiger_contactgrouprelation.groupname = vtiger_groups.groupname where vtiger_crmentity.deleted=0 and vtiger_contactgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")"; + } + if(isPermitted('Campaigns','index' =='yes')) + { + if($query != '') + $query .=" union all "; + //Get the Campaigns assigned to group(Campaign status not Complete -- hardcoded value) + $query .= "select vtiger_campaign.campaignid as id, vtiger_campaign.campaignname as name, vtiger_campaigngrouprelation.groupname as groupname,'Campaigns ' as Type from vtiger_campaign inner join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid inner join vtiger_groups on vtiger_campaigngrouprelation.groupname = vtiger_groups.groupname where vtiger_crmentity.deleted=0 and (vtiger_campaign.campaignstatus != 'Complete') and vtiger_campaigngrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")"; + } + if(isPermitted('Quotes','index' == 'yes')) + { + if($query != '') + $query .=" union all "; + //Get the Quotes assigned to group(Quotes stage not Rejected -- hardcoded value) + $query .="select vtiger_quotes.quoteid as id,vtiger_quotes.subject as name, vtiger_quotegrouprelation.groupname as groupname ,'Quotes 'as Type from vtiger_quotes inner join vtiger_quotegrouprelation on vtiger_quotes.quoteid = vtiger_quotegrouprelation.quoteid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_quotes.quoteid inner join vtiger_groups on vtiger_quotegrouprelation.groupname = vtiger_groups.groupname where vtiger_crmentity.deleted=0 and (vtiger_quotes.quotestage != 'Rejected') and vtiger_quotegrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")"; + } + if(isPermitted('SalesOrder','index' =='yes')) + { + if($query != '') + $query .=" union all "; + //Get the Sales Order assigned to group + $query .="select vtiger_salesorder.salesorderid as id, vtiger_salesorder.subject as name,vtiger_sogrouprelation.groupname as groupname,'SalesOrder ' as Type from vtiger_salesorder inner join vtiger_sogrouprelation on vtiger_salesorder.salesorderid = vtiger_sogrouprelation.salesorderid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_salesorder.salesorderid inner join vtiger_groups on vtiger_sogrouprelation.groupname = vtiger_groups.groupname where vtiger_crmentity.deleted=0 and vtiger_sogrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")"; + } + + if(isPermitted('Invoice','index' =='yes')) + { + if($query != '') + $query .=" union all "; + //Get the Sales Order assigned to group(Invoice status not Paid -- hardcoded value) + $query .="select vtiger_invoice.invoiceid as Id , vtiger_invoice.subject as Name, vtiger_invoicegrouprelation.groupname as Groupname,'Invoice ' as Type from vtiger_invoice inner join vtiger_invoicegrouprelation on vtiger_invoice.invoiceid=vtiger_invoicegrouprelation.invoiceid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_invoice.invoiceid inner join vtiger_groups on vtiger_invoicegrouprelation.groupname = vtiger_groups.groupname where vtiger_crmentity.deleted=0 and(vtiger_invoice.invoicestatus != 'Paid') and vtiger_invoicegrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")"; + } + if(isPermitted('PurchaseOrder','index' == 'yes')) + { + if($query != '') + $query .=" union all "; + //Get the Purchase Order assigned to group + $query .="select vtiger_purchaseorder.purchaseorderid as id,vtiger_purchaseorder.subject as name,vtiger_pogrouprelation.groupname as groupname, 'PurchaseOrder ' as Type from vtiger_purchaseorder inner join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid= vtiger_pogrouprelation.purchaseorderid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_purchaseorder.purchaseorderid inner join vtiger_groups on vtiger_pogrouprelation.groupname =vtiger_groups.groupname where vtiger_crmentity.deleted=0 and vtiger_pogrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")"; + } $log->info("Here is the where clause for the list view: $query"); - $result = $adb->limitquery($query,0,5) or die("Couldn't get the group listing"); + $result = $adb->query($query) or die("Couldn't get the group listing"); $title=array(); $title[]='myGroupAllocation.gif'; Modified: vtigercrm/branches/5.1_jens/modules/Import/ImportAjax.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Import/ImportAjax.php (original) +++ vtigercrm/branches/5.1_jens/modules/Import/ImportAjax.php Mon Apr 16 12:27:44 2007 @@ -14,53 +14,69 @@ include('modules/Import/Forms.php'); //This is to delete the map -if($_REQUEST['delete_map'] != '') + +if($_REQUEST['ajax_action'] == 'check_dup_map_name') { - $query = "update vtiger_import_maps set deleted=1 where id = ".$_REQUEST['mapping']; - $adb->query($query); + $map_name=$_REQUEST['name']; + global $adb; + $query="select * from vtiger_import_maps where deleted=0 and name='".$map_name."'"; + $Result = $adb->query($query); + $noofrows = $adb->num_rows($Result); + if($noofrows > 0) + echo "false"; //Map name already exists + else + echo "true"; +} +else +{ + + if($_REQUEST['delete_map'] != '') + { + $query = "update vtiger_import_maps set deleted=1 where id = ".$_REQUEST['mapping']; + $adb->query($query); + } + + $mapping_file = new ImportMap(); + $mapping_arr = $mapping_file->getSavedMappingContent($_REQUEST['mapping']); + + $importable_fields = $_SESSION['import_module_object_column_fields']; + $field_count = $_SESSION['import_module_field_count']; + $required_fields = $_SESSION['import_module_object_required_fields']; + $translated_column_fields = $_SESSION['import_module_translated_column_fields']; + + $tablename = ''; + $has_header = $_SESSION['import_has_header']; + $firstrow = $_SESSION['import_firstrow']; + $field_map = &$mapping_arr;//$_SESSION['import_field_map']; + $smarty_array1 = array(); + + for($i=0;$i<$field_count;$i++) + { + $suggest = ''; + if ($has_header && isset( $field_map[$firstrow[$i]] ) ) + { + $suggest = $field_map[$firstrow[$i]]; + } + else if (isset($field_map[$i])) + { + $suggest = $field_map[$i]; + } + + $smarty_array1[$i+1] = getFieldSelect( $importable_fields, + $i, + $required_fields, + $suggest, + $translated_column_fields, + $tablename + ); + } + + $smarty = new vtigerCRM_Smarty; + $smarty->assign("FIRSTROW",$firstrow); + $smarty->assign("SELECTFIELD",$smarty_array1); + + $smarty->display('ImportMap.tpl'); + } -$mapping_file = new ImportMap(); -$mapping_arr = $mapping_file->getSavedMappingContent($_REQUEST['mapping']); - -$importable_fields = $_SESSION['import_module_object_column_fields']; -$field_count = $_SESSION['import_module_field_count']; -$required_fields = $_SESSION['import_module_object_required_fields']; -$translated_column_fields = $_SESSION['import_module_translated_column_fields']; - -$tablename = ''; -$has_header = $_SESSION['import_has_header']; -$firstrow = $_SESSION['import_firstrow']; -$field_map = &$mapping_arr;//$_SESSION['import_field_map']; -$smarty_array1 = array(); - -for($i=0;$i<$field_count;$i++) -{ - $suggest = ''; - if ($has_header && isset( $field_map[$firstrow[$i]] ) ) - { - $suggest = $field_map[$firstrow[$i]]; - } - else if (isset($field_map[$i])) - { - $suggest = $field_map[$i]; - } - - $smarty_array1[$i+1] = getFieldSelect( $importable_fields, - $i, - $required_fields, - $suggest, - $translated_column_fields, - $tablename - ); -} - -$smarty = new vtigerCRM_Smarty; -$smarty->assign("FIRSTROW",$firstrow); -$smarty->assign("SELECTFIELD",$smarty_array1); - -$smarty->display('ImportMap.tpl'); - - - ?> Modified: vtigercrm/branches/5.1_jens/modules/Import/ImportSave.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Import/ImportSave.php (original) +++ vtigercrm/branches/5.1_jens/modules/Import/ImportSave.php Mon Apr 16 12:27:44 2007 @@ -29,6 +29,7 @@ { global $current_user; global $adb; + global $mod_strings; // MWC ** Getting vtiger_users $temp = get_user_array(FALSE); @@ -233,7 +234,7 @@ '.$start.' to '.$end.' of '.$totalnoofrows.' are imported successfully'; +$_SESSION['import_display_message'] = '
    '.$start.' '.$mod_strings['to'].' '.$end.' '.$mod_strings['of'].' '.$totalnoofrows.' '.$mod_strings['are_imported_succesfully']; //return $_SESSION['import_display_message']; } ?> Modified: vtigercrm/branches/5.1_jens/modules/Import/ImportStep2.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Import/ImportStep2.php (original) +++ vtigercrm/branches/5.1_jens/modules/Import/ImportStep2.php Mon Apr 16 12:27:44 2007 @@ -226,10 +226,11 @@ $list_string_key = strtolower($_REQUEST['module']); $list_string_key .= "_import_fields"; -$translated_column_fields = $mod_list_strings[$list_string_key]; +//Now we are getting the import fields from DB instead of hard coded array $mod_list_strings +$translated_column_fields = getImportFieldsList($_REQUEST['module']);//$mod_list_strings[$list_string_key]; // adding custom vtiger_fields translations -getCustomFieldTrans($_REQUEST['module'],&$translated_column_fields); +//getCustomFieldTrans($_REQUEST['module'],&$translated_column_fields); $cnt=1; for($field_count = 0; $field_count < $ret_field_count; $field_count++) @@ -385,7 +386,7 @@ else { //if a vtiger_field mapped more than once, alert the user and return - alert("'"+tagName.options[tagName.selectedIndex].text+"' is mapped more than once. Please check the mapping."); + alert("'"+tagName.options[tagName.selectedIndex].text+""); return false; } } @@ -397,7 +398,7 @@ { if(seq_string.indexOf(required_fields[inner_loop]) == -1) { - alert('Please map the mandatory field "'+required_fields_name[inner_loop]+'"'); + alert(''+required_fields_name[inner_loop]+'"'); return false; } } @@ -407,7 +408,7 @@ { if(trim(document.getElementById("save_map_as").value) == '') { - alert("Please Enter Save Map Name"); + alert(""); return false; } } Modified: vtigercrm/branches/5.1_jens/modules/Import/ImportSteplast.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Import/ImportSteplast.php (original) +++ vtigercrm/branches/5.1_jens/modules/Import/ImportSteplast.php Mon Apr 16 12:27:44 2007 @@ -145,11 +145,11 @@ $implict_account = false; $import_modules_array = Array( - "Leads"=>"Lead", - "Accounts"=>"Account", - "Contacts"=>"Contact", - "Potentials"=>"Potential", - "Products"=>"Product" + "Leads"=>"Leads", + "Accounts"=>"Accounts", + "Contacts"=>"Contacts", + "Potentials"=>"Potentials", + "Products"=>"Products" ); foreach($import_modules_array as $module_name => $object_name) @@ -220,8 +220,8 @@ //Retreive the List View Header and Entries $listview_header = getListViewHeader($object,$module_name); $listview_entries = getListViewEntries($object,$module_name,$list_result,$navigation_array,"","","EditView","Delete",""); - - $smarty->assign("NAVIGATION", $navigationOutput); + //commented to remove navigation buttons from import list view + //$smarty->assign("NAVIGATION", $navigationOutput); $smarty->assign("HIDE_CUSTOM_LINKS", 1);//Added to hide the CustomView links in imported records ListView $smarty->assign("LISTHEADER", $listview_header); $smarty->assign("LISTENTITY", $listview_entries); Modified: vtigercrm/branches/5.1_jens/modules/Import/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Import/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Import/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -125,7 +125,6 @@ 'LBL_LEADS_NOTE_2'=>'Company Name must be mapped.', 'LBL_IMPORT_NOW'=>'Import Now', 'LBL_'=>'', -'LBL_'=>'', 'LBL_CANNOT_OPEN'=>'Cannot open the imported file for reading', 'LBL_NOT_SAME_NUMBER'=>'There were not the same number of fields per line in your file', 'LBL_NO_LINES'=>'There were no lines in your import file', @@ -163,11 +162,20 @@ 'LBL_STEP_3_3'=>'Step 3 of 3 : ', 'LBL_MAPPING_RESULTS'=>'Mapping Results ', 'LBL_LAST_IMPORTED'=>'Last Imported', +//Added for sript alerts +'PLEASE_CHECK_MAPPING' => "' is mapped more than once. Please check the mapping.", +'MAP_MANDATORY_FIELD' => 'Please map the mandatory field "', +'ENTER_SAVEMAP_NAME' => 'Please Enter Save Map Name', + +//Added for 5.0.3 +'to'=>'to', +'of'=>'of', +'are_imported_succesfully'=>'are imported successfully', + ); /*$mod_list_strings = Array( -'contacts_import_fields' => Array( "id"=>"Contact ID" ,"first_name"=>"First Name" ,"last_name"=>"Last Name" Modified: vtigercrm/branches/5.1_jens/modules/Invoice/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Invoice/CreatePDF.php (original) +++ vtigercrm/branches/5.1_jens/modules/Invoice/CreatePDF.php Mon Apr 16 12:27:44 2007 @@ -11,12 +11,13 @@ require_once('include/fpdf/pdf.php'); +require_once('include/fpdf/pdfconfig.php'); require_once('modules/Invoice/Invoice.php'); require_once('modules/Organization/Organization.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/EditViewUtils.php'); -global $adb,$app_strings,$products_per_page,$focus; +global $adb,$app_strings,$focus; global $log; // for template checking ... @@ -29,7 +30,6 @@ // would you like and end page? 1 for yes 0 for no $endpage="1"; -$products_per_page="6"; $id = $_REQUEST['record']; @@ -37,7 +37,7 @@ $focus = new Invoice(); $focus->retrieve_entity_info($_REQUEST['record'],"Invoice"); $account_name = getAccountName($focus->column_fields[account_id]); - +$invoice_no = $focus->column_fields[invoice_no]; // **************** BEGIN POPULATE DATA ******************** @@ -57,14 +57,15 @@ $bill_code = $focus->column_fields["bill_code"]; $bill_country = $focus->column_fields["bill_country"]; +$contact_name =getContactName($focus->column_fields["contact_id"]); $ship_street = $focus->column_fields["ship_street"]; $ship_city = $focus->column_fields["ship_city"]; $ship_state = $focus->column_fields["ship_state"]; $ship_code = $focus->column_fields["ship_code"]; $ship_country = $focus->column_fields["ship_country"]; -$conditions = $focus->column_fields["terms_conditions"]; -$description = $focus->column_fields["description"]; +$conditions = from_html($focus->column_fields["terms_conditions"]); +$description = from_html($focus->column_fields["description"]); $status = $focus->column_fields["invoicestatus"]; // Company information @@ -140,7 +141,11 @@ if($discount_amount != "") $price_discount = number_format($discount_amount,2,'.',','); else if($discount_percent != "") - $price_discount = $discount_percent."%"; +{ + //This will be displayed near Discount label - used in include/fpdf/templates/body.php + $final_price_discount_percent = "(".number_format($discount_percent,2,'.',',')." %)"; + $price_discount = number_format((($discount_percent*$focus->column_fields["hdnSubTotal"])/100),2,'.',','); +} else $price_discount = "0.00"; @@ -198,6 +203,8 @@ $list_price[$i] = number_format($associated_products[$i]['listPrice'.$i],2,'.',','); $list_pricet[$i] = $associated_products[$i]['listPrice'.$i]; $discount_total[$i] = $associated_products[$i]['discountTotal'.$i]; + //aded for 5.0.3 pdf changes + $product_code[$i] = $associated_products[$i]['hdnProductcode'.$i]; $taxable_total = $qty[$i]*$list_pricet[$i]-$discount_total[$i]; @@ -219,12 +226,47 @@ } $prod_total[$i] = number_format($producttotal,2,'.',','); + $product_line[$j]["Product Code"] = $product_code[$i]; $product_line[$j]["Product Name"] = $product_name[$i]; - $product_line[$j]["Description"] = $prod_description[$i]; $product_line[$j]["Qty"] = $qty[$i]; $product_line[$j]["Price"] = $list_price[$i]; $product_line[$j]["Discount"] = $discount_total[$i]; $product_line[$j]["Total"] = $prod_total[$i]; + + // Product piecelists + $query = "SELECT vtiger_crmentity.crmid, + vtiger_products.productname as productname, + vtiger_products2products_rel.related_productid as prodid, + vtiger_products2products_rel.quantity as quantity, + vtiger_products2products_rel.product_relgroup as product_relgroup + FROM vtiger_products2products_rel + INNER JOIN vtiger_products + ON vtiger_products.productid = vtiger_products2products_rel.related_productid + INNER JOIN vtiger_crmentity + ON vtiger_crmentity.crmid = vtiger_products.productid + WHERE vtiger_crmentity.deleted = 0 + AND vtiger_products2products_rel.productid = ".$product_id[$i]." + AND vtiger_products2products_rel.relation_type = 10"; + $result = $adb->query($query); + $pieces = $adb->num_rows($result); + if( $pieces > 0) { + $product_line[++$j]["Product Name"] = ""; + $product_line[$j]["Description"] = "consisting of:"; + $product_line[$j]["Qty"] = ""; + $product_line[$j]["Price"] = ""; + $product_line[$j]["Discount"] = ""; + $product_line[$j]["Total"] = ""; + for( $pl=0; $pl<$pieces; $pl++) { + $product_line[++$j]["Product Name"] = ""; + $product_line[$j]["Description"] = + $adb->query_result( $result, $pl, "productname"); + $product_line[$j]["Qty"] = + $adb->query_result( $result, $pl, "quantity"); + $product_line[$j]["Price"] = ""; + $product_line[$j]["Discount"] = ""; + $product_line[$j]["Total"] = ""; + } + } } //echo '
    Product Details ==>';print_r($product_line);echo '
    '; @@ -236,7 +278,7 @@ $pdf = new PDF( 'P', 'mm', 'A4' ); $pdf->Open(); -$num_pages=ceil(($num_products/$products_per_page)); +$num_pages=ceil(count($product_line)/$products_per_page); $current_product=0; @@ -252,15 +294,21 @@ $current_product++; } + //if bottom > 145 then we skip the Description and T&C in every + //page and display only in lastpage + //if you want to display the description and T&C in each page then + //set the display_desc_tc='true' and bottom <= 145 in pdfconfig.php $pdf->AddPage(); if( $page_num == "1") { include("pdf_templates/".$template."/firstpage/header.php"); include("pdf_templates/".$template."/firstpage/body.php"); - include("pdf_templates/".$template."/firstpage/footer.php"); + if($display_desc_tc == 'true' && $bottom <= 145) + include("pdf_templates/".$template."/firstpage/footer.php"); } else { include("pdf_templates/".$template."/pages/header.php"); include("pdf_templates/".$template."/pages/body.php"); - include("pdf_templates/".$template."/pages/footer.php"); + if($display_desc_tc == 'true' && $bottom <= 145) + include("pdf_templates/".$template."/pages/footer.php"); } $page_num++; Modified: vtigercrm/branches/5.1_jens/modules/Invoice/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Invoice/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Invoice/DetailView.php Mon Apr 16 12:27:44 2007 @@ -93,6 +93,7 @@ $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); $smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); if($singlepane_view == 'true') { $related_array = getRelatedLists($currentModule,$focus); Modified: vtigercrm/branches/5.1_jens/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Invoice/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Invoice/EditView.php Mon Apr 16 12:27:44 2007 @@ -31,6 +31,8 @@ require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); require_once('include/FormValidationUtil.php'); +//Addded for Custom Invoice Number +require_once('user_privileges/CustomInvoiceNo.php'); global $app_strings,$mod_strings,$currentModule,$log,$current_user; global $current_organization; @@ -351,16 +353,29 @@ $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); +//Added for Custom Invoice Number +//we have check the Invoice Number for duplicate only in create view +if($focus->mode != 'edit') +{ + $invoiceno=$inv_str.$inv_no; + if(CheckDuplicateInvoiceNumber($invoiceno)) + echo '
    Duplicate Invoice Number - Click here to Configure the Invoice Number'.$num_rows; + else + $smarty->assign("inv_no",($inv_str.$inv_no)); +} + + $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); $organization = new Organization; $organization->id = $current_organization; $smarty->assign("ASSIGN_ORGUNIT_LIST", getOrgUnits($organization)); if($focus->mode == 'edit') - $smarty->display("Inventory/InventoryEditView.tpl"); + $smarty->display("Inventory/InventoryEditView.tpl"); else - $smarty->display('Inventory/InventoryCreateView.tpl'); + $smarty->display('Inventory/InventoryCreateView.tpl'); ?> Modified: vtigercrm/branches/5.1_jens/modules/Invoice/Invoice.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Invoice/Invoice.php (original) +++ vtigercrm/branches/5.1_jens/modules/Invoice/Invoice.php Mon Apr 16 12:27:44 2007 @@ -83,6 +83,8 @@ var $default_order_by = 'crmid'; var $default_sort_order = 'ASC'; + var $groupTable = Array('vtiger_invoicegrouprelation','invoiceid'); + /** Constructor which will set the column_fields in this object */ function Invoice() { @@ -107,8 +109,20 @@ $query1 = "update vtiger_salesorder set sostatus='Approved' where salesorderid=".$so_id; $this->db->query($query1); } - //Based on the total Number of rows we will save the product relationship with this entity - saveInventoryProductDetails(&$this, 'Invoice'); + + //in ajax save we should not call this function, because this will delete all the existing product values + if($_REQUEST['action'] != 'InvoiceAjax' && $_REQUEST['ajxaction'] != 'DETAILVIEW') + { + //Based on the total Number of rows we will save the product relationship with this entity + saveInventoryProductDetails(&$this, 'Invoice'); + } + //Added For Custom Invoice Number + //Here we Incrementing the new InvoiceNumber + if($this->mode != 'edit') + { + setInventoryInvoiceNumber("increment_invoiceno"); + } + } @@ -174,7 +188,7 @@ else $returnset = '&return_module=Invoice&return_action=CallRelatedList&return_id='.$id; - $query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL AND vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL AND vtiger_activity.status != 'Deferred')"; + $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL and vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL and vtiger_activity.status != 'Deferred')"; $log->debug("Exiting get_activities method ..."); return GetRelatedList('Invoice','Calendar',$focus,$query,$button,$returnset); } @@ -187,17 +201,15 @@ { global $log; $log->debug("Entering get_history(".$id.") method ..."); - $query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, - vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, - vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name + $query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime,vtiger_crmentity.createdtime, vtiger_crmentity.description, case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid - inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid - left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname + left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname + left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_activity.activitytype='Task' and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred') and vtiger_seactivityrel.crmid=".$id; Modified: vtigercrm/branches/5.1_jens/modules/Invoice/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Invoice/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Invoice/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -183,7 +183,8 @@ 'Sent'=>'Sent', 'Credit Invoice'=>'Credit Invoice', 'Paid'=>'Paid', - +//Added to Custom Invoice Number +'invoice_no'=>'Invoice No', ); ?> Modified: vtigercrm/branches/5.1_jens/modules/Invoice/pdf_templates/Default/_default/header.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Invoice/pdf_templates/Default/_default/header.php (original) +++ vtigercrm/branches/5.1_jens/modules/Invoice/pdf_templates/Default/_default/header.php Mon Apr 16 12:27:44 2007 @@ -51,7 +51,7 @@ $pdf->addTextBlock( "Shipping Address:", $shipText, $shipLocation ); // billing Address -$billPositions = array("147","43","60"); +$billPositions = array("147","40","60"); $billText=$bill_street."\n".$bill_city.", ".$bill_state." ".$bill_code."\n".$bill_country; $pdf->addTextBlock("Billing Address:",$billText, $billPositions); // ********** End Addresses ****************** @@ -60,16 +60,24 @@ /* ******** Begin Invoice Data ************************ */ // terms block -$termBlock=array("10","65"); +$termBlock=array("10","67"); $pdf->addRecBlock($account_name, "Customer Name", $termBlock); +// issue date block +$issueBlock=array("80","37"); +$pdf->addRecBlock(date("Y-m-d"), "Issue Date",$issueBlock); + // due date block -$dueBlock=array("80","65"); +$dueBlock=array("81","52"); $pdf->addRecBlock($valid_till, "Due Date",$dueBlock); +// Contact Name block +$conBlock=array("79","67"); +$pdf->addRecBlock($contact_name, "Contact Name",$conBlock); + // vtiger_invoice number block -$invBlock=array("145","65"); -$pdf->addRecBlock($id, "Invoice Number",$invBlock); +$invBlock=array("145","67"); +$pdf->addRecBlock($invoice_no, "Invoice Number",$invBlock); /* ************ End Invoice Data ************************ */ Modified: vtigercrm/branches/5.1_jens/modules/Leads/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/CallRelatedList.php (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/CallRelatedList.php Mon Apr 16 12:27:44 2007 @@ -66,10 +66,11 @@ $smarty->assign("ID",$focus->id); $smarty->assign("NAME",$focus->lastname.' '.$focus->firstname); +$smarty->assign("EMAIL",$focus->column_fields['email']); +$smarty->assign("YAHOO",$focus->column_fields['yahooid']); $related_array = getRelatedLists($currentModule,$focus); $smarty->assign("RELATEDLISTS", $related_array); $smarty->assign("SINGLE_MOD",$app_strings['Lead']); -$smarty->assign("REDIR_MOD","leads"); $smarty->assign("MODULE", $currentmodule); $smarty->assign("UPDATEINFO",updateInfo($focus->id)); $smarty->assign("MOD",$mod_strings); Modified: vtigercrm/branches/5.1_jens/modules/Leads/ConvertLead.html ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/ConvertLead.html (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/ConvertLead.html Mon Apr 16 12:27:44 2007 @@ -96,6 +96,6 @@ {JAVASCRIPT} - + Modified: vtigercrm/branches/5.1_jens/modules/Leads/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/DetailView.php Mon Apr 16 12:27:44 2007 @@ -61,7 +61,6 @@ $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); $smarty->assign("ID", $focus->id); $smarty->assign("SINGLE_MOD", 'Lead'); -$smarty->assign("REDIR_MOD","leads"); $smarty->assign("NAME",$focus->lastname.' '.$focus->firstname); @@ -97,6 +96,9 @@ $parent_email = getEmailParentsList('Leads',$_REQUEST['record']); $smarty->assign("HIDDEN_PARENTS_LIST",$parent_email); $smarty->assign("SENDMAILBUTTON","permitted"); + $smarty->assign("EMAIL1",$focus->column_fields['email']); + $smarty->assign("EMAIL2",$focus->column_fields['yahooid']); + } if(isPermitted("Leads","Merge",'') == 'yes') @@ -110,6 +112,7 @@ $optionString[$tempVal["templateid"]] =$tempVal["filename"]; $tempVal = $adb->fetch_array($wordTemplateResult); } + $smarty->assign("TEMPLATECOUNT",$tempCount); $smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']); $smarty->assign("TOPTIONS",$optionString); } @@ -121,12 +124,14 @@ $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); - + $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); $smarty->assign("MODULE", $currentModule); $smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); + +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); if($singlepane_view == 'true') { Modified: vtigercrm/branches/5.1_jens/modules/Leads/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/EditView.php Mon Apr 16 12:27:44 2007 @@ -112,6 +112,7 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("DUPLICATE",$_REQUEST['isDuplicate']); // Assigned organizations $smarty->assign("CURRENT_ORGANIZATION",$current_organization); Modified: vtigercrm/branches/5.1_jens/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/LeadConvertToEntities.php Mon Apr 16 12:27:44 2007 @@ -13,7 +13,6 @@ require_once('modules/Leads/Leads.php'); //Getting the Parameters from the ConvertLead Form $id = $_REQUEST["record"]; - $module = $_REQUEST["module"]; $createpotential = $_REQUEST["createpotential"]; @@ -228,26 +227,20 @@ /** Function used to save the lead related products with other entities Account, Contact and Potential * $leadid - leadid * $relatedid - related entity id (accountid/contactid/potentialid) - * $relatedmodule - related entity module name - optional, but for contacts we have to pass Contact because we have to update contactid in vtiger_products table. */ -function saveLeadRelatedProducts($leadid, $relatedid, $relatedmodule = '') +function saveLeadRelatedProducts($leadid, $relatedid) { global $adb, $log; - $log->debug("Entering into function saveLeadRelatedProducts($leadid, $relatedid, \"$relatedmodule\")"); + $log->debug("Entering into function saveLeadRelatedProducts($leadid, $relatedid)"); $product_result = $adb->query("select * from vtiger_seproductsrel where crmid=$leadid"); $noofproducts = $adb->num_rows($product_result); for($i = 0; $i < $noofproducts; $i++) { $productid = $adb->query_result($product_result,$i,'productid'); - - $adb->query("insert into vtiger_seproductsrel (productid, crmid) values($productid, $relatedid)"); - - if($relatedmodule == 'Contacts') - { - //update contactid in products table then only the products will be shown in contact relatedlist - $adb->query("update vtiger_products set contactid=$relatedid where productid=$productid"); - } + $setype = $adb->query_result($product_result,$i,'setype'); + + $adb->query("insert into vtiger_seproductsrel values($relatedid, $productid,'".$setype."')"); } $log->debug("Exit from function saveLeadRelatedProducts."); @@ -272,7 +265,6 @@ } $log->debug("Exit from function saveLeadRelatedCampaigns."); } - /*Code integrated to avoid duplicate Account creation during ConvertLead Operation START-- by Bharathi*/ @@ -297,10 +289,10 @@ /* Modified by Minnie -- END*/ $adb->query($sql_insert_account); - $sql_insert_accountbillads = "INSERT INTO vtiger_accountbillads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')"; + $sql_insert_accountbillads = "INSERT INTO vtiger_accountbillads (accountaddressid,city,code,country,state,street,pobox) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."','".$row["pobox"]."')"; $adb->query($sql_insert_accountbillads); - $sql_insert_accountshipads = "INSERT INTO vtiger_accountshipads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')"; + $sql_insert_accountshipads = "INSERT INTO vtiger_accountshipads (accountaddressid,city,code,country,pobox,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["pobox"]."','".$row["state"] ."','" .$row["lane"]."')"; $adb->query($sql_insert_accountshipads); //Getting the custom vtiger_field values from leads and inserting into Accounts if the vtiger_field is mapped - Jaguar @@ -329,7 +321,6 @@ //Up to this, Account related data save finshed - $date_entered = $adb->formatDate(date('YmdHis')); $date_modified = $adb->formatDate(date('YmdHis')); @@ -351,7 +342,7 @@ $adb->query($sql_insert_contactsubdetails); -$sql_insert_contactaddress = "INSERT INTO vtiger_contactaddress (contactaddressid,mailingcity,mailingstreet,mailingstate,mailingcountry,mailingzip) VALUES (".$contact_id.",'".$row["city"] ."','" .$row["lane"] ."','".$row['state']."','" .$row["country"] ."','".$row['code']."')"; +$sql_insert_contactaddress = "INSERT INTO vtiger_contactaddress (contactaddressid,mailingcity,mailingstreet,mailingstate,mailingcountry,mailingpobox,mailingzip) VALUES (".$contact_id.",'".$row["city"] ."','" .$row["lane"] ."','".$row['state']."','" .$row["country"] ."','".$row["pobox"]."','".$row['code']."')"; $adb->query($sql_insert_contactaddress); @@ -376,7 +367,7 @@ getRelatedActivities($account_id,$contact_id); //To convert relates Activites and Email -Jaguar //Retrieve the lead related products and relate them with this new contact -saveLeadRelatedProducts($id, $contact_id, "Contacts"); +saveLeadRelatedProducts($id, $contact_id); //Retrieve the lead related Campaigns and relate them with this new contact --Minnie saveLeadRelatedCampaigns($id, $contact_id); Modified: vtigercrm/branches/5.1_jens/modules/Leads/Leads.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Leads/Leads.php (original) +++ vtigercrm/branches/5.1_jens/modules/Leads/Leads.php Mon Apr 16 12:27:44 2007 @@ -1,431 +1,443 @@ -'crmid','vtiger_leaddetails'=>'leadid','vtiger_leadsubdetails'=>'leadsubscriptionid','vtiger_leadaddress'=>'leadaddressid','vtiger_leadscf'=>'leadid','vtiger_entity2org'=>'crmid'); - - - - //construct this from database; - var $column_fields = Array(); - var $sortby_fields = Array('lastname','firstname','email','phone','company','smownerid','website'); - - // This is used to retrieve related vtiger_fields from form posts. - var $additional_column_fields = Array('smcreatorid', 'smownerid', 'contactid','potentialid' ,'crmid'); - - // This is the list of vtiger_fields that are in the lists. - var $list_fields = Array( - 'Last Name'=>Array('leaddetails'=>'lastname'), - 'First Name'=>Array('leaddetails'=>'firstname'), - 'Company'=>Array('leaddetails'=>'company'), - 'Phone'=>Array('leadaddress'=>'phone'), - 'Website'=>Array('leadsubdetails'=>'website'), - 'Email'=>Array('leaddetails'=>'email'), - 'Assigned To'=>Array('crmentity'=>'smownerid') - ); - var $list_fields_name = Array( - 'Last Name'=>'lastname', - 'First Name'=>'firstname', - 'Company'=>'company', - 'Phone'=>'phone', - 'Website'=>'website', - 'Email'=>'email', - 'Assigned To'=>'assigned_user_id' - ); - var $list_link_field= 'lastname'; - - var $search_fields = Array( - 'Name'=>Array('leaddetails'=>'lastname'), - 'Company'=>Array('leaddetails'=>'company') - ); - var $search_fields_name = Array( - 'Name'=>'lastname', - 'Company'=>'company' - ); - - var $required_fields = array("lastname"=>1, 'company'=>1); - - //Added these variables which are used as default order by and sortorder in ListView - var $default_order_by = 'lastname'; - var $default_sort_order = 'ASC'; - - function Leads() { - $this->log = LoggerManager::getLogger('lead'); - $this->log->debug("Entering Leads() method ..."); - $this->db = new PearDatabase(); - $this->column_fields = getColumnFields('Leads'); - $this->log->debug("Exiting Lead method ..."); - } - - /** Function to handle module specific operations when saving a entity - */ - function save_module($module) - { - } - - // Mike Crowe Mod --------------------------------------------------------Default ordering for us - /** - * Function to get sort order - * return string $sorder - sortorder string either 'ASC' or 'DESC' - */ - function getSortOrder() - { - global $log; - $log->debug("Entering getSortOrder() method ..."); - if(isset($_REQUEST['sorder'])) - $sorder = $_REQUEST['sorder']; - else - $sorder = (($_SESSION['LEADS_SORT_ORDER'] != '')?($_SESSION['LEADS_SORT_ORDER']):($this->default_sort_order)); - - $log->debug("Exiting getSortOrder method ..."); - return $sorder; - } - - /** - * Function to get order by - * return string $order_by - fieldname(eg: 'leadname') - */ - function getOrderBy() - { - global $log; - $log->debug("Entering getOrderBy() method ..."); - if (isset($_REQUEST['order_by'])) - $order_by = $_REQUEST['order_by']; - else - $order_by = (($_SESSION['LEADS_ORDER_BY'] != '')?($_SESSION['LEADS_ORDER_BY']):($this->default_order_by)); - - $log->debug("Exiting getOrderBy method ..."); - return $order_by; - } - // Mike Crowe Mod -------------------------------------------------------- - - - - /** Function to export the lead records in CSV Format - * @param reference variable - order by is passed when the query is executed - * @param reference variable - where condition is passed when the query is executed - * Returns Export Leads Query. - */ - function create_export_query(&$order_by, &$where) - { - global $log; - global $current_user; - $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - - include("include/utils/ExportUtils.php"); - - //To get the Permitted fields query and the permitted fields list - $sql = getPermittedFieldsQuery("Leads", "detail_view"); - $fields_list = getFieldsListFromQuery($sql); - - $query = "SELECT $fields_list FROM ".$this->entity_table." - INNER JOIN vtiger_leaddetails - ON vtiger_crmentity.crmid=vtiger_leaddetails.leadid - LEFT JOIN vtiger_leadsubdetails - ON vtiger_leaddetails.leadid = vtiger_leadsubdetails.leadsubscriptionid - LEFT JOIN vtiger_leadaddress - ON vtiger_leaddetails.leadid=vtiger_leadaddress.leadaddressid - LEFT JOIN vtiger_leadscf - ON vtiger_leadscf.leadid=vtiger_leaddetails.leadid - LEFT JOIN vtiger_leadgrouprelation - ON vtiger_leadscf.leadid = vtiger_leadgrouprelation.leadid - LEFT JOIN vtiger_groups - ON vtiger_groups.groupname = vtiger_leadgrouprelation.groupname - LEFT JOIN vtiger_users - ON vtiger_crmentity.smownerid = vtiger_users.id - "; - - - $where_auto = " vtiger_users.status='Active' - AND vtiger_crmentity.deleted=0 AND vtiger_leaddetails.converted =0"; - - if($where != "") - $query .= "where ($where) AND ".$where_auto; - else - $query .= "where ".$where_auto; - - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - //we should add security check when the user has Private Access - if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[7] == 3) - { - //Added security check to get the permitted records only - $query = $query." ".getListViewSecurityParameter("Leads"); - } - - if(!empty($order_by)) - $query .= " ORDER BY $order_by"; - - $log->debug("Exiting create_export_query method ..."); - return $query; - } - - - - /** Returns a list of the associated tasks - * @param integer $id - leadid - * returns related Task or Event record in array format - */ -function get_activities($id) -{ - global $log, $singlepane_view; - $log->debug("Entering get_activities(".$id.") method ..."); - global $app_strings; - - $focus = new Activity(); - $button = ''; - - if(isPermitted("Calendar",1,"") == 'yes') - { - $button .= ' '; - $button .= '     		".$mod_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."".$mod_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."'. $app_strings["LBL_CREATE_MERGE_TEMPLATE"].'
    Modified: vtigercrm/branches/5.1_jens/modules/Products/AddProductToPriceBooks.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/AddProductToPriceBooks.php (original) +++ vtigercrm/branches/5.1_jens/modules/Products/AddProductToPriceBooks.php Mon Apr 16 12:27:44 2007 @@ -79,7 +79,7 @@ //we should not display the Add to PriceBook button if there is no pricebooks to associate if($num_rows != $num_prod_rows) - $other_text .=' '; + $other_text .=' '; $other_text .=''; $other_text .=' @@ -115,9 +115,12 @@ $field_name=$entity_id."_listprice"; $list_body .= ''; $list_body .= ''; - $list_body .= ''; - $list_body .= ''; - $list_body .= ''; + $list_body .= ''; } } Modified: vtigercrm/branches/5.1_jens/modules/Products/AddProductsToPriceBook.html ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/AddProductsToPriceBook.html (original) +++ vtigercrm/branches/5.1_jens/modules/Products/AddProductsToPriceBook.html Mon Apr 16 12:27:44 2007 @@ -27,7 +27,7 @@ } - +

    {PRODUCTLISTHEADER} Modified: vtigercrm/branches/5.1_jens/modules/Products/AddProductsToPriceBook.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/AddProductsToPriceBook.php (original) +++ vtigercrm/branches/5.1_jens/modules/Products/AddProductsToPriceBook.php Mon Apr 16 12:27:44 2007 @@ -78,7 +78,7 @@ //we should not display the Add to PriceBook button if there is no products to associate if($num_rows != $num_prod_rows) - $other_text .=''; + $other_text .=''; $other_text .=' '; @@ -135,8 +135,12 @@ $list_body .= ''; $list_body .= ''; $list_body .= ''; - $list_body .= ''; - $list_body .= ''; + $list_body .= ''; } } Modified: vtigercrm/branches/5.1_jens/modules/Products/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Products/DetailView.php Mon Apr 16 12:27:44 2007 @@ -94,6 +94,8 @@ $smarty->assign("MODULE", $currentModule); $smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); + if($singlepane_view == 'true') { $related_array = getRelatedLists($currentModule,$focus); Modified: vtigercrm/branches/5.1_jens/modules/Products/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Products/EditView.php Mon Apr 16 12:27:44 2007 @@ -207,6 +207,7 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); // Assigned organizations $smarty->assign("CURRENT_ORGANIZATION",$current_organization); @@ -219,7 +220,7 @@ $smarty->assign("USER_ORGANIZATIONS",$org_array); if($focus->mode == 'edit') - $smarty->display('Inventory/InventoryEditView.tpl'); + $smarty->display('Inventory/InventoryEditView.tpl'); else - $smarty->display('Inventory/InventoryCreateView.tpl'); + $smarty->display('Inventory/InventoryCreateView.tpl'); ?> Modified: vtigercrm/branches/5.1_jens/modules/Products/Products.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/Products.php (original) +++ vtigercrm/branches/5.1_jens/modules/Products/Products.php Mon Apr 16 12:27:44 2007 @@ -66,6 +66,17 @@ 'Unit Price'=>'unit_price' ); + var $dependend_fields = Array( + 'Product Name'=>Array('products'=>'productname'), + 'Part Number'=>Array('products'=>'productcode'), + 'Unit Price'=>Array('products'=>'unit_price') + ); + var $dependend_fields_name = Array( + 'Product Name'=>'productname', + 'Part Number'=>'productcode', + 'Unit Price'=>'unit_price' + ); + //Added these variables which are used as default order by and sortorder in ListView var $default_order_by = 'productname'; var $default_sort_order = 'ASC'; @@ -82,15 +93,6 @@ function save_module($module) { - //Inserting into vtiger_seproductsrel table - if(isset($this->column_fields['parent_id']) && $this->column_fields['parent_id'] != '') - { - $this->insertIntoEntityTable('vtiger_seproductsrel', 'Products'); - } - elseif($this->column_fields['parent_id']=='' && $insertion_mode=="edit") - { - $this->deleteRelation('vtiger_seproductsrel'); - } //Inserting into product_taxrel table if($_REQUEST['ajxaction'] != 'DETAILVIEW') { @@ -270,30 +272,142 @@ return getAttachmentsAndNotes('Products',$query,$id); } + /** function used to get the list of leads which are related to the product + * @param int $id - product id + * @return array - array which will be returned from the function GetRelatedList + */ + function get_leads($id) + { + global $log, $singlepane_view, $mod_strings; + $log->debug("Entering get_leads(".$id.") method ..."); + + require_once('modules/Leads/Leads.php'); + $focus = new Leads(); + + $button = ''; + + if($singlepane_view == 'true') + $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT vtiger_leaddetails.leadid, vtiger_crmentity.crmid, vtiger_leaddetails.firstname, vtiger_leaddetails.lastname, vtiger_leaddetails.company, vtiger_leadaddress.phone, vtiger_leadsubdetails.website, vtiger_leaddetails.email, case when (vtiger_users.user_name not like \"\") then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_crmentity.smownerid, vtiger_products.productname, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_products.expiry_date + FROM vtiger_leaddetails + INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_leaddetails.leadid + INNER JOIN vtiger_leadaddress ON vtiger_leadaddress.leadaddressid = vtiger_leaddetails.leadid + INNER JOIN vtiger_leadsubdetails ON vtiger_leadsubdetails.leadsubscriptionid = vtiger_leaddetails.leadid + INNER JOIN vtiger_seproductsrel ON vtiger_seproductsrel.crmid=vtiger_leaddetails.leadid + INNER JOIN vtiger_products ON vtiger_seproductsrel.productid = vtiger_products.productid + LEFT JOIN vtiger_users ON vtiger_users.id = vtiger_crmentity.smownerid + LEFT JOIN vtiger_leadgrouprelation ON vtiger_leaddetails.leadid = vtiger_leadgrouprelation.leadid + LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_leadgrouprelation.groupname + WHERE vtiger_crmentity.deleted = 0 AND vtiger_products.productid = ".$id; + + $log->debug("Exiting get_leads($id) method ..."); + return GetRelatedList('Products','Leads',$focus,$query,$button,$returnset); + } + + /** function used to get the list of accounts which are related to the product + * @param int $id - product id + * @return array - array which will be returned from the function GetRelatedList + */ + function get_accounts($id) + { + global $log, $singlepane_view, $mod_strings; + $log->debug("Entering get_accounts(".$id.") method ..."); + + require_once('modules/Accounts/Accounts.php'); + $focus = new Accounts(); + + $button = ''; + + if($singlepane_view == 'true') + $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT vtiger_account.accountid, vtiger_crmentity.crmid, vtiger_account.accountname, vtiger_accountbillads.city, vtiger_account.website, vtiger_account.phone, case when (vtiger_users.user_name not like \"\") then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_crmentity.smownerid, vtiger_products.productname, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_products.expiry_date + FROM vtiger_account + INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_account.accountid + INNER JOIN vtiger_accountbillads ON vtiger_accountbillads.accountaddressid = vtiger_account.accountid + INNER JOIN vtiger_seproductsrel ON vtiger_seproductsrel.crmid=vtiger_account.accountid + INNER JOIN vtiger_products ON vtiger_seproductsrel.productid = vtiger_products.productid + LEFT JOIN vtiger_users ON vtiger_users.id = vtiger_crmentity.smownerid + LEFT JOIN vtiger_accountgrouprelation ON vtiger_account.accountid = vtiger_accountgrouprelation.accountid + LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_accountgrouprelation.groupname + WHERE vtiger_crmentity.deleted = 0 AND vtiger_products.productid = ".$id; + + + $log->debug("Exiting get_accounts method ..."); + return GetRelatedList('Products','Accounts',$focus,$query,$button,$returnset); + } + + /** function used to get the list of contacts which are related to the product + * @param int $id - product id + * @return array - array which will be returned from the function GetRelatedList + */ + function get_contacts($id) + { + global $log, $singlepane_view, $mod_strings; + $log->debug("Entering get_contacts(".$id.") method ..."); + + require_once('modules/Contacts/Contacts.php'); + $focus = new Contacts(); + + $button = ''; + + if($singlepane_view == 'true') + $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_contactdetails.title, vtiger_contactdetails.accountid, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, case when (vtiger_users.user_name not like \"\") then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_crmentity.smownerid, vtiger_products.productname, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_products.expiry_date + FROM vtiger_contactdetails + INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_contactdetails.contactid + INNER JOIN vtiger_seproductsrel ON vtiger_seproductsrel.crmid=vtiger_contactdetails.contactid + INNER JOIN vtiger_products ON vtiger_seproductsrel.productid = vtiger_products.productid + LEFT JOIN vtiger_users ON vtiger_users.id = vtiger_crmentity.smownerid + LEFT JOIN vtiger_contactgrouprelation ON vtiger_contactdetails.contactid = vtiger_contactgrouprelation.contactid + LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname + WHERE vtiger_crmentity.deleted = 0 AND vtiger_products.productid = ".$id; + + $log->debug("Exiting get_contacts method ..."); + return GetRelatedList('Products','Contacts',$focus,$query,$button,$returnset); + } + + /** function used to get the list of potentials which are related to the product * @param int $id - product id - * @return void - but this function will call the function renderRelatedPotentials with parameter query + * @return array - array which will be returned from the function GetRelatedList */ function get_opportunities($id) { - global $log; + global $log, $singlepane_view, $mod_strings; $log->debug("Entering get_opportunities(".$id.") method ..."); - $query = "SELECT vtiger_potential.potentialid, vtiger_potential.potentialname, - vtiger_potential.potentialtype, vtiger_products.productid, - vtiger_products.productname, vtiger_products.qty_per_unit, - vtiger_products.unit_price, vtiger_products.expiry_date + + require_once('modules/Potentials/Potentials.php'); + $focus = new Potentials(); + + $button = ''; + + if($singlepane_view == 'true') + $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT vtiger_potential.potentialid, vtiger_crmentity.crmid, vtiger_potential.potentialname, vtiger_account.accountname, vtiger_potential.accountid, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, case when (vtiger_users.user_name not like \"\") then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_crmentity.smownerid, vtiger_products.productname, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_products.expiry_date FROM vtiger_potential - INNER JOIN vtiger_products - ON vtiger_potential.productid = vtiger_products.productid - LEFT JOIN vtiger_potentialgrouprelation - ON vtiger_potential.potentialid = vtiger_potentialgrouprelation.potentialid - LEFT JOIN vtiger_groups - ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname - inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid - WHERE vtiger_crmentity.deleted = 0 - AND vtiger_products.productid = ".$id; - $log->debug("Exiting get_opportunities method ..."); - renderRelatedPotentials($query); + INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_potential.potentialid + INNER JOIN vtiger_account ON vtiger_potential.accountid = vtiger_account.accountid + INNER JOIN vtiger_seproductsrel ON vtiger_seproductsrel.crmid = vtiger_potential.potentialid + INNER JOIN vtiger_products ON vtiger_seproductsrel.productid = vtiger_products.productid + LEFT JOIN vtiger_users ON vtiger_users.id = vtiger_crmentity.smownerid + LEFT JOIN vtiger_potentialgrouprelation ON vtiger_potential.potentialid = vtiger_potentialgrouprelation.potentialid + LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname + WHERE vtiger_crmentity.deleted = 0 AND vtiger_products.productid = ".$id; + + $log->debug("Exiting get_opportunities($id) method ..."); + return GetRelatedList('Products','Potentials',$focus,$query,$button,$returnset); } /** function used to get the list of tickets which are related to the product @@ -315,7 +429,7 @@ else $returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id; - $query = "SELECT vtiger_users.user_name, vtiger_users.id, + $query = "SELECT case when (vtiger_users.user_name not like \"\") then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_users.id, vtiger_products.productid, vtiger_products.productname, vtiger_troubletickets.ticketid, vtiger_troubletickets.parent_id, vtiger_troubletickets.title, @@ -335,7 +449,8 @@ ON vtiger_groups.groupname = vtiger_ticketgrouprelation.groupname WHERE vtiger_crmentity.deleted = 0 AND vtiger_products.productid = ".$id; - $log->debug("Exiting get_tickets method ..."); + + $log->debug("Exiting get_tickets method ..."); return GetRelatedList('Products','HelpDesk',$focus,$query,$button,$returnset); } @@ -419,7 +534,8 @@ vtiger_quotes.*, vtiger_potential.potentialname, vtiger_account.accountname, - vtiger_inventoryproductrel.productid + vtiger_inventoryproductrel.productid, + vtiger_users.user_name FROM vtiger_quotes INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_quotes.quoteid @@ -433,6 +549,8 @@ ON vtiger_quotes.quoteid = vtiger_quotegrouprelation.quoteid LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_quotegrouprelation.groupname + LEFT JOIN vtiger_users + ON vtiger_users.id=vtiger_crmentity.smownerid WHERE vtiger_crmentity.deleted = 0 AND vtiger_inventoryproductrel.productid = ".$id; $log->debug("Exiting get_quotes method ..."); @@ -461,7 +579,8 @@ $query = "SELECT vtiger_crmentity.*, vtiger_purchaseorder.*, vtiger_products.productname, - vtiger_inventoryproductrel.productid + vtiger_inventoryproductrel.productid, + vtiger_users.user_name FROM vtiger_purchaseorder INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_purchaseorder.purchaseorderid @@ -473,6 +592,8 @@ ON vtiger_purchaseorder.purchaseorderid = vtiger_pogrouprelation.purchaseorderid LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_pogrouprelation.groupname + LEFT JOIN vtiger_users + ON vtiger_users.id=vtiger_crmentity.smownerid WHERE vtiger_crmentity.deleted = 0 AND vtiger_products.productid = ".$id; $log->debug("Exiting get_purchase_orders method ..."); @@ -501,7 +622,8 @@ $query = "SELECT vtiger_crmentity.*, vtiger_salesorder.*, vtiger_products.productname AS productname, - vtiger_account.accountname + vtiger_account.accountname, + vtiger_users.user_name FROM vtiger_salesorder INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_salesorder.salesorderid @@ -515,6 +637,8 @@ ON vtiger_salesorder.salesorderid = vtiger_sogrouprelation.salesorderid LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_sogrouprelation.groupname + LEFT JOIN vtiger_users + ON vtiger_users.id=vtiger_crmentity.smownerid WHERE vtiger_crmentity.deleted = 0 AND vtiger_products.productid = ".$id; $log->debug("Exiting get_salesorder method ..."); @@ -543,7 +667,8 @@ $query = "SELECT vtiger_crmentity.*, vtiger_invoice.*, vtiger_inventoryproductrel.quantity, - vtiger_account.accountname + vtiger_account.accountname, + vtiger_users.user_name FROM vtiger_invoice INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_invoice.invoiceid @@ -555,6 +680,8 @@ ON vtiger_invoice.invoiceid = vtiger_invoicegrouprelation.invoiceid LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_invoicegrouprelation.groupname + LEFT JOIN vtiger_users + ON vtiger_users.id=vtiger_crmentity.smownerid WHERE vtiger_crmentity.deleted = 0 AND vtiger_inventoryproductrel.productid = ".$id; $log->debug("Exiting get_invoices method ..."); @@ -591,6 +718,82 @@ AND vtiger_pricebookproductrel.productid = ".$id; $log->debug("Exiting get_product_pricebooks method ..."); return GetRelatedList('Products','PriceBooks',$focus,$query,$button,$returnset); + } + + /** function used to get the piecelist for this product + * @param int $id - product id + * @return array - array which will be returned from the function GetRelatedList + */ + function get_product_piecelist($id) + { + return $this->get_product_dependencies($id,10); + } + + /** function used to get the list of required products for this product + * @param int $id - product id + * @return array - array which will be returned from the function GetRelatedList + */ + function get_product_depends($id) + { + return $this->get_product_dependencies($id,20); + } + + /** function used to get the list of products incompatible with this product + * @param int $id - product id + * @return array - array which will be returned from the function GetRelatedList + */ + function get_product_incompatibles($id) + { + return $this->get_product_dependencies($id,21); + } + + /** function used to get the list of optional products related to this product + * @param int $id - product id + * @return array - array which will be returned from the function GetRelatedList + */ + function get_product_options($id) + { + return $this->get_product_dependencies($id,30); + } + + /** function used to get the list of products to be purchased to sell this product + * @param int $id - product id + * @return array - array which will be returned from the function GetRelatedList + */ + function get_product_purchaselist($id) + { + return $this->get_product_dependencies($id,40); + } + + /** function used to get generic product dependencies + * @param int $id - product id + * @param int $type - dependency typ (10=piecelist, 20=requirement, 21=incompatible, 30=option, 40=purchaselist) + * @return array - array which will be returned from the function GetRelatedList + */ + function get_product_dependencies($id,$type) + { + global $log,$singlepane_view; + $log->debug("Entering get_product_dependencies(".$id.",".$type.") method ..."); + global $mod_strings; + $button = ''; + $returnset = '&return_module=Products&return_action=CallDependencyList&return_id='.$id; + $focus = new Products(); + + $query = "SELECT vtiger_crmentity.crmid, + vtiger_products.*, + vtiger_products2products_rel.related_productid as prodid, + vtiger_products2products_rel.quantity as quantity, + vtiger_products2products_rel.product_relgroup as product_relgroup + FROM vtiger_products2products_rel + INNER JOIN vtiger_products + ON vtiger_products.productid = vtiger_products2products_rel.related_productid + INNER JOIN vtiger_crmentity + ON vtiger_crmentity.crmid = vtiger_products.productid + WHERE vtiger_crmentity.deleted = 0 + AND vtiger_products2products_rel.productid = ".$id." + AND vtiger_products2products_rel.relation_type = ".$type; + $log->debug("Exiting get_product_dependencies method ..."); + return GetRelatedList('Products','Products',$focus,$query,$button,$returnset,'','','',$type); } /** function used to get the number of vendors which are related to the product @@ -650,18 +853,19 @@ LEFT JOIN vtiger_potential vtiger_ProductRelatedToPotential ON vtiger_ProductRelatedToPotential.potentialid = vtiger_seproductsrel.crmid - LEFT JOIN vtiger_contactdetails - ON vtiger_contactdetails.contactid = vtiger_products.contactid + LEFT JOIN vtiger_contactdetails vtiger_ProductRelatedToContact + ON vtiger_ProductRelatedToContact.contactid = vtiger_seproductsrel.crmid + LEFT JOIN vtiger_vendor ON vtiger_vendor.vendorid = vtiger_products.vendor_id WHERE vtiger_crmentity.deleted = 0 AND vtiger_users.status = 'Active' - AND ((vtiger_seproductsrel.crmid IS NULL - AND (vtiger_products.contactid = 0 OR vtiger_products.contactid IS NULL)) - OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Leads').") - OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Accounts').") - OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Potentials').") - OR vtiger_products.contactid IN (".getReadEntityIds('Contacts').")) + AND ( + (vtiger_seproductsrel.crmid IS NULL) + OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Leads').") + OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Accounts').") + OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Potentials').") + OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Contacts').")) group by vtiger_products.productid "; //ProductRelatedToLead, Account and Potential tables are added to get the Related to field Modified: vtigercrm/branches/5.1_jens/modules/Products/Save.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/Save.php (original) +++ vtigercrm/branches/5.1_jens/modules/Products/Save.php Mon Apr 16 12:27:44 2007 @@ -24,7 +24,7 @@ require_once('modules/Products/Products.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -global $log,$current_user; +global $log,$current_user,$mod_strings; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); $rate = $rate_symbol['rate']; @@ -139,14 +139,14 @@ $handler_name = getUserName($handler); $sender_name = getUserName($current_user->id); $to_address= getUserEmail($handler); - $subject = $productname.' Stock Level is Low'; - $body = 'Dear '.$handler_name.', + $subject = $productname.' '.$mod_strings['MSG_STOCK_LEVEL']; + $body = $mod_strings['MSG_DEAR'].' '.$handler_name.',

    '. - The current stock of '.$productname.' in our warehouse is '.$qty_stk.'. Kindly procure required number of units as the stock level is below reorder level '.$reord.'. + $mod_strings['MSG_CURRENT_STOCK'].' '.$productname.' '.$mod_strings['MSG_IN_OUR_WAREHOUSE'].' '.$qty_stk.'. '.$mod_strings['MSG_PROCURE_REQUIRED_NUMBER'].' '.$reord.'.
    '. - Severity: Major - Thanks, - '.$sender_name; + $mod_strings['MSG_SEVERITY'].'

    '. + $mod_strings['MSG_THANKS'].'
    '. + $sender_name; include("modules/Emails/mail.php"); $mail_status = send_mail("Products",$to_address,$current_user->user_name,$current_user->email1,$subject,$body); Modified: vtigercrm/branches/5.1_jens/modules/Products/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Products/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -63,7 +63,6 @@ 'LBL_COLON'=>':', 'LBL_ATTACHMENTS'=>'Attachments', -'LBL_NEW_ATTACHMENT'=>'New Attachment', 'LBL_ATTACH_FILE'=>'File Attachment', 'LBL_DESCRIPTION'=>'Description', 'LBL_FILE'=>'File Name', @@ -94,13 +93,18 @@ //Added for 4GA 'Product Name'=>'Product Name', -'Product Code'=>'Part Number', +//'Product Code'=>'Part Number', +'Part Number'=>'Part Number', 'Product Active'=>'Product Active', 'Commission Rate'=>'Commission Rate (%)', 'Qty/Unit'=>'Qty/Unit', 'Unit Price'=>'Unit Price', 'Manufacturer'=>'Manufacturer', 'Product Category'=>'Product Category', +'Product Class'=>'Product Class', +'Product Type'=>'Product Type', +'Product Validation'=>'Product Validation', +'Contract Bound'=>'Contract Required', 'Support Start Date'=>'Support Start Date', 'Support Expiry Date'=>'Support Expiry Date', 'Purchase Date'=>'Purchase Date', @@ -108,14 +112,12 @@ 'Sales End Date'=>'Sales End Date', 'Created Time'=>'Created Time', 'Modified Time'=>'Modified Time', -'Description'=>'Description', 'Related To'=>'Related To', 'Usage Unit'=>'Usage Unit', 'Handler'=>'Handler', 'Contact Name'=>'Contact Name', 'Currency'=>'Currency', 'Reorder Level'=>'Reorder Level', -'Website'=>'Website', 'Tax Class'=>'Tax Class', 'Mfr PartNo'=>'Mfr Part No', 'Vendor PartNo'=>'Vendor Part No', @@ -215,6 +217,15 @@ 'LBL_COMPANY_ASSIGNMENT'=>'Organization Assignment', 'Organization Assignment'=>'Assigned to', +//Added for 5.0.3 +'MSG_STOCK_LEVEL'=>'Stock Level is Low', +'MSG_DEAR'=>'Dear', +'MSG_CURRENT_STOCK'=>'The current stock of', +'MSG_IN_OUR_WAREHOUSE'=>'in our warehouse is', +'MSG_PROCURE_REQUIRED_NUMBER'=>'Kindly procure required number of units as the stock level is below reorder level', +'MSG_SEVERITY'=>'Severity: Major', +'MSG_THANKS'=>'Thanks,', + ); ?> Modified: vtigercrm/branches/5.1_jens/modules/Products/updateRelations.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Products/updateRelations.php (original) +++ vtigercrm/branches/5.1_jens/modules/Products/updateRelations.php Mon Apr 16 12:27:44 2007 @@ -11,34 +11,114 @@ require_once('include/database/PearDatabase.php'); global $adb; +global $log; +$dest_mod = $_REQUEST['destination_module']; -//This if will be true, when we select product from vendor related list -if($_REQUEST['destination_module']=='Products') +$log->debug("Entering Products/updateRelations.php"); + +if($singlepane_view == 'true') + $return_action = "DetailView"; +else + $return_action = "CallRelatedList"; + +if($_REQUEST['return_module'] != '') $return_module = $_REQUEST['return_module']; + +//if select Lead, Account, Contact, Potential from Product RelatedList +//we have to insert in vtiger_seproductsrel +if($dest_mod =='Leads' || $dest_mod =='Accounts' ||$dest_mod =='Contacts' ||$dest_mod =='Potentials') { + //For Bulk updates + if($_REQUEST['idlist'] != '') + { + $entityids = explode(';',trim($_REQUEST['idlist'],';')); + $productid = $_REQUEST['parentid']; + } + else + { + $entityids[] = $_REQUEST['entityid']; + $productid = $_REQUEST['parid']; + } + + foreach($entityids as $ind => $crmid) + { + if($crmid != '' && $productid != '') + { + $sql = "insert into vtiger_seproductsrel values ($crmid,$productid,'".$dest_mod."')"; + $adb->query($sql); + } + } + + $return_module = 'Products'; + $return_record = $productid; +} + +//if the destination module is also a product, we have to update dependency +//lists +else if($dest_mod=='Products') { + if( !isset( $_REQUEST['dependency_type']) || $_REQUEST['dependency_type'] == '') { + + //select product from vendor related list if($_REQUEST['parid'] != '' && $_REQUEST['entityid'] != '') { $sql = "update vtiger_products set vendor_id=".$_REQUEST['parid']." where productid=".$_REQUEST['entityid']; $adb->query($sql); } -} -if($_REQUEST['destination_module']=='Contacts') -{ - if($_REQUEST['smodule']=='VENDOR') - { - $sql = "insert into vtiger_vendorcontactrel values (".$_REQUEST['parid'].",".$_REQUEST['entityid'].")"; + + $return_module = 'Products'; + $return_record = $_REQUEST['parid']; + + } else { + //module dependency list change + $sql = "SELECT count(*) FROM vtiger_products2products_rel + WHERE productid=".$_REQUEST['parentid']." AND relation_type=".$_REQUEST['dependency_type']; + $count_result = $adb->query( $sql); + $sequence = $adb->query_result($count_result,0,"count"); + + //get the list of dependencies from the request + $idlist = $_REQUEST['idlist']; + $storearray = explode (";",$idlist); + $qtylist = $_REQUEST['qtylist']; + $tmparray = explode (";",$qtylist); + $qtyarray = array(); + foreach( $tmparray as $avp) { + $avplist = explode( ":",$avp); + $qtyarray[$avplist[0]] = $avplist[1]; + } + + //get the values from the requies and store them into the database + foreach($storearray as $id) { + if($id != '') { + + //We have quantities for piecelists and purchase lists + $qty = $grp = 1; + if( isset( $qtyarray[$id])) { + if( $_REQUEST['dependency_type'] == 10 || $_REQUEST['dependency_type'] == 40) { + $qty = $qtyarray[$id]; + } elseif( $_REQUEST['dependency_type'] == 20) { + $grp = $qtyarray[$id]; + } + } + + //database query + $sql = "INSERT INTO vtiger_products2products_rel(productid,related_productid,relation_type,sequence_no,quantity,comment,product_relgroup) VALUES(".$_REQUEST["parentid"].",".$id.",".$_REQUEST['dependency_type'].",".++$sequence.",".$qty.",'',".$grp.")"; $adb->query($sql); + } } + + //Navigation + $return_action = "CallDependencyList"; + $return_module = "Products"; + $return_record = $_REQUEST['parentid']; + } } -$return_action = 'DetailView'; -if($_REQUEST['return_action'] != '') - $return_action = $_REQUEST['return_action']; -header("Location:index.php?action=$return_action&module=Vendors&record=".$_REQUEST["parid"]); +if( $return_action == "") { + $return_action = 'DetailView'; + if($_REQUEST['return_action'] != '') + $return_action = $_REQUEST['return_action']; +} - - - - +header("Location:index.php?action=$return_action&module=$return_module&record=$return_record"); ?> Modified: vtigercrm/branches/5.1_jens/modules/PurchaseOrder/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/PurchaseOrder/CreatePDF.php (original) +++ vtigercrm/branches/5.1_jens/modules/PurchaseOrder/CreatePDF.php Mon Apr 16 12:27:44 2007 @@ -10,6 +10,7 @@ ********************************************************************************/ require('include/fpdf/pdf.php'); +require_once('include/fpdf/pdfconfig.php'); require_once('modules/PurchaseOrder/PurchaseOrder.php'); require_once('modules/Organization/Organization.php'); require_once('include/database/PearDatabase.php'); @@ -28,8 +29,6 @@ // would you like and end page? 1 for yes 0 for no $endpage="1"; -global $products_per_page; -$products_per_page="6"; $id = $_REQUEST['record']; //retreiving the vtiger_invoice info @@ -55,14 +54,15 @@ $bill_code = $focus->column_fields["bill_code"]; $bill_country = $focus->column_fields["bill_country"]; +$contact_name =getContactName($focus->column_fields["contact_id"]); $ship_street = $focus->column_fields["ship_street"]; $ship_city = $focus->column_fields["ship_city"]; $ship_state = $focus->column_fields["ship_state"]; $ship_code = $focus->column_fields["ship_code"]; $ship_country = $focus->column_fields["ship_country"]; -$conditions = $focus->column_fields["terms_conditions"]; -$description = $focus->column_fields["description"]; +$conditions = from_html($focus->column_fields["terms_conditions"]); +$description = from_html($focus->column_fields["description"]); $status = $focus->column_fields["postatus"]; // Company information @@ -141,7 +141,11 @@ if($discount_amount != "") $price_discount = number_format($discount_amount,2,'.',','); else if($discount_percent != "") - $price_discount = $discount_percent."%"; +{ + //This will be displayed near Discount label - used in include/fpdf/templates/body.php + $final_price_discount_percent = "(".number_format($discount_percent,2,'.',',')." %)"; + $price_discount = number_format((($discount_percent*$focus->column_fields["hdnSubTotal"])/100),2,'.',','); +} else $price_discount = "0.00"; @@ -199,6 +203,8 @@ $list_price[$i] = number_format($associated_products[$i]['listPrice'.$i],2,'.',','); $list_pricet[$i] = $associated_products[$i]['listPrice'.$i]; $discount_total[$i] = $associated_products[$i]['discountTotal'.$i]; + //aded for 5.0.3 pdf changes + $product_code[$i] = $associated_products[$i]['hdnProductcode'.$i]; $taxable_total = $qty[$i]*$list_pricet[$i]-$discount_total[$i]; @@ -219,13 +225,47 @@ $product_line[$j]["Tax"] = number_format($total_taxes,2,'.',',')."\n ($total_tax_percent %) "; } $prod_total[$i] = number_format($producttotal,2,'.',','); - + $product_line[$j]["Product Code"] = $product_code[$i]; $product_line[$j]["Product Name"] = $product_name[$i]; - $product_line[$j]["Description"] = $prod_description[$i]; $product_line[$j]["Qty"] = $qty[$i]; $product_line[$j]["Price"] = $list_price[$i]; $product_line[$j]["Discount"] = $discount_total[$i]; $product_line[$j]["Total"] = $prod_total[$i]; + + // Product piecelists + $query = "SELECT vtiger_crmentity.crmid, + vtiger_products.productname as productname, + vtiger_products2products_rel.related_productid as prodid, + vtiger_products2products_rel.quantity as quantity, + vtiger_products2products_rel.product_relgroup as product_relgroup + FROM vtiger_products2products_rel + INNER JOIN vtiger_products + ON vtiger_products.productid = vtiger_products2products_rel.related_productid + INNER JOIN vtiger_crmentity + ON vtiger_crmentity.crmid = vtiger_products.productid + WHERE vtiger_crmentity.deleted = 0 + AND vtiger_products2products_rel.productid = ".$product_id[$i]." + AND vtiger_products2products_rel.relation_type = 10"; + $result = $adb->query($query); + $pieces = $adb->num_rows($result); + if( $pieces > 0) { + $product_line[++$j]["Product Name"] = ""; + $product_line[$j]["Description"] = "consisting of:"; + $product_line[$j]["Qty"] = ""; + $product_line[$j]["Price"] = ""; + $product_line[$j]["Discount"] = ""; + $product_line[$j]["Total"] = ""; + for( $pl=0; $pl<$pieces; $pl++) { + $product_line[++$j]["Product Name"] = ""; + $product_line[$j]["Description"] = + $adb->query_result( $result, $pl, "productname"); + $product_line[$j]["Qty"] = + $adb->query_result( $result, $pl, "quantity"); + $product_line[$j]["Price"] = ""; + $product_line[$j]["Discount"] = ""; + $product_line[$j]["Total"] = ""; + } + } } //echo '
    Product Details ==>';print_r($product_line);echo '
    '; //echo '
    ';print_r($associated_products);echo '
    '; @@ -240,7 +280,7 @@ $pdf = new PDF( 'P', 'mm', 'A4' ); $pdf->Open(); -$num_pages=ceil(($num_products/$products_per_page)); +$num_pages=ceil(count($product_line)/$products_per_page); $current_product=0; @@ -256,15 +296,21 @@ $current_product++; } + //if bottom > 145 then we skip the Description and T&C in every + //page and display only in lastpage + //if you want to display the description and T&C in each page then + //set the display_desc_tc='true' and bottom <= 145 in pdfconfig.php $pdf->AddPage(); if( $page_num == "1") { include("pdf_templates/".$template."/firstpage/header.php"); include("pdf_templates/".$template."/firstpage/body.php"); - include("pdf_templates/".$template."/firstpage/footer.php"); + if($display_desc_tc == 'true' && $bottom <= 145) + include("pdf_templates/".$template."/firstpage/footer.php"); } else { include("pdf_templates/".$template."/pages/header.php"); include("pdf_templates/".$template."/pages/body.php"); - include("pdf_templates/".$template."/pages/footer.php"); + if($display_desc_tc == 'true' && $bottom <= 145) + include("pdf_templates/".$template."/pages/footer.php"); } $page_num++; Modified: vtigercrm/branches/5.1_jens/modules/PurchaseOrder/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/PurchaseOrder/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/PurchaseOrder/DetailView.php Mon Apr 16 12:27:44 2007 @@ -94,6 +94,8 @@ $smarty->assign("CHECK", $check_button); $smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); + if($singlepane_view == 'true') { $related_array = getRelatedLists($currentModule,$focus); Modified: vtigercrm/branches/5.1_jens/modules/PurchaseOrder/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/PurchaseOrder/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/PurchaseOrder/EditView.php Mon Apr 16 12:27:44 2007 @@ -200,13 +200,14 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); $organization = new Organization; $organization->id = $current_organization; $smarty->assign("ASSIGN_ORGUNIT_LIST", getOrgUnits($organization)); if($focus->mode == 'edit') - $smarty->display('Inventory/InventoryEditView.tpl'); + $smarty->display('Inventory/InventoryEditView.tpl'); else - $smarty->display('Inventory/InventoryCreateView.tpl'); + $smarty->display('Inventory/InventoryCreateView.tpl'); ?> Modified: vtigercrm/branches/5.1_jens/modules/PurchaseOrder/PurchaseOrder.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/PurchaseOrder/PurchaseOrder.php (original) +++ vtigercrm/branches/5.1_jens/modules/PurchaseOrder/PurchaseOrder.php Mon Apr 16 12:27:44 2007 @@ -86,6 +86,8 @@ var $default_order_by = 'subject'; var $default_sort_order = 'ASC'; + var $groupTable = Array('vtiger_pogrouprelation','purchaseorderid'); + /** Constructor Function for Order class * This function creates an instance of LoggerManager class using getLogger method * creates an instance for PearDatabase class and get values for column_fields array of Order class. @@ -98,8 +100,12 @@ function save_module($module) { - //Based on the total Number of rows we will save the product relationship with this entity - saveInventoryProductDetails(&$this, 'PurchaseOrder', $this->update_prod_stock); + //in ajax save we should not call this function, because this will delete all the existing product values + if($_REQUEST['action'] != 'PurchaseOrderAjax' && $_REQUEST['ajxaction'] != 'DETAILVIEW') + { + //Based on the total Number of rows we will save the product relationship with this entity + saveInventoryProductDetails(&$this, 'PurchaseOrder', $this->update_prod_stock); + } } @@ -153,7 +159,7 @@ else $returnset = '&return_module=PurchaseOrder&return_action=CallRelatedList&return_id='.$id; - $query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL AND vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL AND vtiger_activity.status != 'Deferred') "; + $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL and vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL and vtiger_activity.status != 'Deferred') "; $log->debug("Exiting get_activities method ..."); return GetRelatedList('PurchaseOrder','Calendar',$focus,$query,$button,$returnset); } @@ -166,17 +172,15 @@ { global $log; $log->debug("Entering get_history(".$id.") method ..."); - $query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, - vtiger_activity.* ,vtiger_seactivityrel.*, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, - vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name + $query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,vtiger_activity.* ,vtiger_seactivityrel.*, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_crmentity.createdtime, vtiger_crmentity.description,case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid - inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname + left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_activity.activitytype='Task' and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred') and vtiger_seactivityrel.crmid=".$id; Modified: vtigercrm/branches/5.1_jens/modules/PurchaseOrder/Save.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/PurchaseOrder/Save.php (original) +++ vtigercrm/branches/5.1_jens/modules/PurchaseOrder/Save.php Mon Apr 16 12:27:44 2007 @@ -33,13 +33,18 @@ //Added code for auto product stock updation on receiving goods $focus->update_prod_stock=''; -if($focus->column_fields['postatus'] == 'Received Shipment' && $focus->mode == 'edit') +if($focus->column_fields['postatus'] == 'Received Shipment') { - $prev_postatus=getPoStatus($focus->id); - if($focus->column_fields['postatus'] != $prev_postatus) - { - $focus->update_prod_stock='true'; - } + if($focus->mode != 'edit') + $focus->update_prod_stock='true'; + else + { + $prev_postatus=getPoStatus($focus->id); + if($focus->column_fields['postatus'] != $prev_postatus) + { + $focus->update_prod_stock='true'; + } + } } Modified: vtigercrm/branches/5.1_jens/modules/PurchaseOrder/pdf_templates/Default/_default/header.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/PurchaseOrder/pdf_templates/Default/_default/header.php (original) +++ vtigercrm/branches/5.1_jens/modules/PurchaseOrder/pdf_templates/Default/_default/header.php Mon Apr 16 12:27:44 2007 @@ -51,7 +51,7 @@ $pdf->addTextBlock( "Shipping Address:", $shipText, $shipLocation ); // billing Address -$billPositions = array("147","43","60"); +$billPositions = array("147","40","60"); $billText=$bill_street."\n".$bill_city.", ".$bill_state." ".$bill_code."\n".$bill_country; $pdf->addTextBlock("Billing Address:",$billText, $billPositions); // ********** End Addresses ****************** @@ -59,13 +59,22 @@ /* ******** Begin Invoice Data ************************ */ +// issue date block +$issueBlock=array("80","37"); +$pdf->addRecBlock(date("Y-m-d"), "Issue Date",$issueBlock); + +// due date block +$dueBlock=array("81","52"); +$pdf->addRecBlock($valid_till, "Due Date",$dueBlock); + // terms block $termBlock=array("10","65"); $pdf->addRecBlock($vendor_name, "Vendor Name", $termBlock); -// due date block -$dueBlock=array("80","65"); -$pdf->addRecBlock($valid_till, "Due Date",$dueBlock); +// Contact Name block +$conBlock=array("79","67"); +$pdf->addRecBlock($contact_name, "Contact Name",$conBlock); + // vtiger_invoice number block $invBlock=array("145","65"); Modified: vtigercrm/branches/5.1_jens/modules/Quotes/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Quotes/CreatePDF.php (original) +++ vtigercrm/branches/5.1_jens/modules/Quotes/CreatePDF.php Mon Apr 16 12:27:44 2007 @@ -11,6 +11,7 @@ require_once('include/fpdf/pdf.php'); +require_once('include/fpdf/pdfconfig.php'); require_once('modules/Quotes/Quotes.php'); require_once('modules/Organization/Organization.php'); require_once('include/database/PearDatabase.php'); @@ -29,8 +30,6 @@ // would you like and end page? 1 for yes 0 for no $endpage="1"; -global $products_per_page; -$products_per_page="6"; $focus = new Quotes(); $focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); @@ -54,6 +53,7 @@ $bill_state = $focus->column_fields["bill_state"]; $bill_code = $focus->column_fields["bill_code"]; $bill_country = $focus->column_fields["bill_country"]; +$contact_name =getContactName($focus->column_fields["contact_id"]); $ship_street = $focus->column_fields["ship_street"]; $ship_city = $focus->column_fields["ship_city"]; @@ -61,8 +61,8 @@ $ship_code = $focus->column_fields["ship_code"]; $ship_country = $focus->column_fields["ship_country"]; -$conditions = $focus->column_fields["terms_conditions"]; -$description = $focus->column_fields["description"]; +$conditions = from_html($focus->column_fields["terms_conditions"]); +$description = from_html($focus->column_fields["description"]); $status = $focus->column_fields["quotestage"]; // Company information @@ -141,7 +141,11 @@ if($discount_amount != "") $price_discount = number_format($discount_amount,2,'.',','); else if($discount_percent != "") - $price_discount = $discount_percent."%"; +{ + //This will be displayed near Discount label - used in include/fpdf/templates/body.php + $final_price_discount_percent = "(".number_format($discount_percent,2,'.',',')." %)"; + $price_discount = number_format((($discount_percent*$focus->column_fields["hdnSubTotal"])/100),2,'.',','); +} else $price_discount = "0.00"; @@ -199,6 +203,8 @@ $list_price[$i] = number_format($associated_products[$i]['listPrice'.$i],2,'.',','); $list_pricet[$i] = $associated_products[$i]['listPrice'.$i]; $discount_total[$i] = $associated_products[$i]['discountTotal'.$i]; + //aded for 5.0.3 pdf changes + $product_code[$i] = $associated_products[$i]['hdnProductcode'.$i]; $taxable_total = $qty[$i]*$list_pricet[$i]-$discount_total[$i]; @@ -220,13 +226,49 @@ } $prod_total[$i] = number_format($producttotal,2,'.',','); + $product_line[$j]["Product Code"] = $product_code[$i]; $product_line[$j]["Product Name"] = $product_name[$i]; - $product_line[$j]["Description"] = $prod_description[$i]; $product_line[$j]["Qty"] = $qty[$i]; $product_line[$j]["Price"] = $list_price[$i]; $product_line[$j]["Discount"] = $discount_total[$i]; $product_line[$j]["Total"] = $prod_total[$i]; -} + + // Product piecelists + $query = "SELECT vtiger_crmentity.crmid, + vtiger_products.productname as productname, + vtiger_products2products_rel.related_productid as prodid, + vtiger_products2products_rel.quantity as quantity, + vtiger_products2products_rel.product_relgroup as product_relgroup + FROM vtiger_products2products_rel + INNER JOIN vtiger_products + ON vtiger_products.productid = vtiger_products2products_rel.related_productid + INNER JOIN vtiger_crmentity + ON vtiger_crmentity.crmid = vtiger_products.productid + WHERE vtiger_crmentity.deleted = 0 + AND vtiger_products2products_rel.productid = ".$product_id[$i]." + AND vtiger_products2products_rel.relation_type = 10"; + $result = $adb->query($query); + $pieces = $adb->num_rows($result); + if( $pieces > 0) { + $product_line[++$j]["Product Name"] = ""; + $product_line[$j]["Description"] = "consisting of:"; + $product_line[$j]["Qty"] = ""; + $product_line[$j]["Price"] = ""; + $product_line[$j]["Discount"] = ""; + $product_line[$j]["Total"] = ""; + for( $pl=0; $pl<$pieces; $pl++) { + $product_line[++$j]["Product Name"] = ""; + $product_line[$j]["Description"] = + $adb->query_result( $result, $pl, "productname"); + $product_line[$j]["Qty"] = + $adb->query_result( $result, $pl, "quantity"); + $product_line[$j]["Price"] = ""; + $product_line[$j]["Discount"] = ""; + $product_line[$j]["Total"] = ""; + } + } +} + //echo '
    Product Details ==>';print_r($product_line);echo '
    '; //echo '
    ';print_r($associated_products);echo '
    '; @@ -240,7 +282,7 @@ $pdf = new PDF( 'P', 'mm', 'A4' ); $pdf->Open(); -$num_pages=ceil(($num_products/$products_per_page)); +$num_pages=ceil(count($product_line)/$products_per_page); $current_product=0; @@ -256,15 +298,21 @@ $current_product++; } + //if bottom > 145 then we skip the Description and T&C in every + //page and display only in lastpage + //if you want to display the description and T&C in each page then + //set the display_desc_tc='true' and bottom <= 145 in pdfconfig.php $pdf->AddPage(); if( $page_num == "1") { include("pdf_templates/".$template."/firstpage/header.php"); include("pdf_templates/".$template."/firstpage/body.php"); - include("pdf_templates/".$template."/firstpage/footer.php"); + if($display_desc_tc == 'true' && $bottom <= 145) + include("pdf_templates/".$template."/firstpage/footer.php"); } else { include("pdf_templates/".$template."/pages/header.php"); include("pdf_templates/".$template."/pages/body.php"); - include("pdf_templates/".$template."/pages/footer.php"); + if($display_desc_tc == 'true' && $bottom <= 145) + include("pdf_templates/".$template."/pages/footer.php"); } $page_num++; Modified: vtigercrm/branches/5.1_jens/modules/Quotes/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Quotes/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Quotes/DetailView.php Mon Apr 16 12:27:44 2007 @@ -104,6 +104,8 @@ $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); $smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); + if($singlepane_view == 'true') { $related_array = getRelatedLists($currentModule,$focus); Modified: vtigercrm/branches/5.1_jens/modules/Quotes/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Quotes/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Quotes/EditView.php Mon Apr 16 12:27:44 2007 @@ -211,14 +211,15 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); $organization = new Organization; $organization->id = $current_organization; $smarty->assign("ASSIGN_ORGUNIT_LIST", getOrgUnits($organization)); if($focus->mode == 'edit') - $smarty->display("Inventory/InventoryEditView.tpl"); + $smarty->display("Inventory/InventoryEditView.tpl"); else - $smarty->display('Inventory/InventoryCreateView.tpl'); + $smarty->display('Inventory/InventoryCreateView.tpl'); ?> Modified: vtigercrm/branches/5.1_jens/modules/Quotes/ListTopQuotes.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Quotes/ListTopQuotes.php (original) +++ vtigercrm/branches/5.1_jens/modules/Quotes/ListTopQuotes.php Mon Apr 16 12:27:44 2007 @@ -60,7 +60,10 @@ //<<<<<<<<>>>>>>>> $date_var = date('Y-m-d'); - $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_quotes.validtill >= \''.$date_var.'\''; + $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_quotes.quotestage != \'Rejected\' and vtiger_quotes.validtill >= \''.$date_var.'\''; + //$where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_quotes.validtill >= \''.$date_var.'\''; + + $query = getListQuery("Quotes",$where); $query .=" ORDER BY total DESC"; //<<<<<<<>>>>>>>> Modified: vtigercrm/branches/5.1_jens/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Quotes/ListView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Quotes/ListView.php Mon Apr 16 12:27:44 2007 @@ -131,8 +131,8 @@ if($order_by == 'smownerid') { if( $adb->dbType == "pgsql") - $query .= ' GROUP BY user_name'; - $query .= ' ORDER BY user_name '.$sorder; + $query .= ' GROUP BY vtiger_users.user_name'; + $query .= " ORDER BY case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end ".$sorder; } else { Modified: vtigercrm/branches/5.1_jens/modules/Quotes/Quotes.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Quotes/Quotes.php (original) +++ vtigercrm/branches/5.1_jens/modules/Quotes/Quotes.php Mon Apr 16 12:27:44 2007 @@ -1,266 +1,285 @@ -'crmid','vtiger_quotes'=>'quoteid','vtiger_quotesbillads'=>'quotebilladdressid','vtiger_quotesshipads'=>'quoteshipaddressid','vtiger_quotescf'=>'quoteid'); - - var $entity_table = "vtiger_crmentity"; - - var $billadr_table = "vtiger_quotesbillads"; - - var $object_name = "Quote"; - - var $new_schema = true; - - var $module_id = "quoteid"; - - var $column_fields = Array(); - - var $sortby_fields = Array('subject','crmid','smownerid'); - - // This is used to retrieve related vtiger_fields from form posts. - var $additional_column_fields = Array('assigned_user_name', 'smownerid', 'opportunity_id', 'case_id', 'contact_id', 'task_id', 'note_id', 'meeting_id', 'call_id', 'email_id', 'parent_name', 'member_id' ); - - // This is the list of vtiger_fields that are in the lists. - var $list_fields = Array( - 'Quote Id'=>Array('crmentity'=>'crmid'), - 'Subject'=>Array('quotes'=>'subject'), - 'Quote Stage'=>Array('quotes'=>'quotestage'), - 'Potential Name'=>Array('quotes'=>'potentialid'), - 'Account Name'=>Array('account'=> 'accountid'), - 'Total'=>Array('quotes'=> 'total'), - 'Assigned To'=>Array('crmentity'=>'smownerid') - ); - - var $list_fields_name = Array( - 'Quote Id'=>'', - 'Subject'=>'subject', - 'Quote Stage'=>'quotestage', - 'Potential Name'=>'potential_id', - 'Account Name'=>'account_id', - 'Total'=>'hdnGrandTotal', - 'Assigned To'=>'assigned_user_id' - ); - var $list_link_field= 'subject'; - - var $search_fields = Array( - 'Quote Id'=>Array('crmentity'=>'crmid'), - 'Subject'=>Array('quotes'=>'subject'), - 'Account Name'=>Array('quotes'=>'accountid'), - 'Quote Stage'=>Array('quotes'=>'quotestage'), - ); - - var $search_fields_name = Array( - 'Quote Id'=>'', - 'Subject'=>'subject', - 'Account Name'=>'account_id', - 'Quote Stage'=>'quotestage', - ); - - // This is the list of vtiger_fields that are required. - var $required_fields = array("accountname"=>1); - - //Added these variables which are used as default order by and sortorder in ListView - var $default_order_by = 'crmid'; - var $default_sort_order = 'ASC'; - - /** Constructor which will set the column_fields in this object - */ - function Quotes() { - $this->log =LoggerManager::getLogger('quote'); - $this->db = new PearDatabase(); - $this->column_fields = getColumnFields('Quotes'); - } - - function save_module() - { - } - - /** Function used to get the sort order for Quote listview - * @return string $sorder - first check the $_REQUEST['sorder'] if request value is empty then check in the $_SESSION['QUOTES_SORT_ORDER'] if this session value is empty then default sort order will be returned. - */ - function getSortOrder() - { - global $log; - $log->debug("Entering getSortOrder() method ..."); - if(isset($_REQUEST['sorder'])) - $sorder = $_REQUEST['sorder']; - else - $sorder = (($_SESSION['QUOTES_SORT_ORDER'] != '')?($_SESSION['QUOTES_SORT_ORDER']):($this->default_sort_order)); - $log->debug("Exiting getSortOrder() method ..."); - return $sorder; - } - - /** Function used to get the order by value for Quotes listview - * @return string $order_by - first check the $_REQUEST['order_by'] if request value is empty then check in the $_SESSION['QUOTES_ORDER_BY'] if this session value is empty then default order by will be returned. - */ - function getOrderBy() - { - global $log; - $log->debug("Entering getOrderBy() method ..."); - if (isset($_REQUEST['order_by'])) - $order_by = $_REQUEST['order_by']; - else - $order_by = (($_SESSION['QUOTES_ORDER_BY'] != '')?($_SESSION['QUOTES_ORDER_BY']):($this->default_order_by)); - $log->debug("Exiting getOrderBy method ..."); - return $order_by; - } - - /** function used to get the list of sales orders which are related to the Quotes - * @param int $id - quote id - * @return array - return an array which will be returned from the function GetRelatedList - */ - function get_salesorder($id) - { - global $log,$singlepane_view; - $log->debug("Entering get_salesorder(".$id.") method ..."); - require_once('modules/SalesOrder/SalesOrder.php'); - $focus = new SalesOrder(); - - $button = ''; - - if($singlepane_view == 'true') - $returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Quotes&return_action=CallRelatedList&return_id='.$id; - - $query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.quoteid = ".$id; - $log->debug("Exiting get_salesorder method ..."); - return GetRelatedList('Quotes','SalesOrder',$focus,$query,$button,$returnset); - } - - /** function used to get the list of activities which are related to the Quotes - * @param int $id - quote id - * @return array - return an array which will be returned from the function GetRelatedList - */ - function get_activities($id) - { - global $log,$singlepane_view; - $log->debug("Entering get_activities(".$id.") method ..."); - global $app_strings; - require_once('modules/Calendar/Activity.php'); - $focus = new Activity(); - - $button = ''; - - if($singlepane_view == 'true') - $returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id; - else - $returnset = '&return_module=Quotes&return_action=CallRelatedList&return_id='.$id; - - $query = "SELECT vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and (vtiger_activity.status is not NULL AND vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL AND vtiger_activity.status != 'Deferred')"; - $log->debug("Exiting get_activities method ..."); - return GetRelatedList('Quotes','Calendar',$focus,$query,$button,$returnset); - } - - /** function used to get the the activity history related to the quote - * @param int $id - quote id - * @return array - return an array which will be returned from the function GetHistory - */ - function get_history($id) - { - global $log; - $log->debug("Entering get_history(".$id.") method ..."); - $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, - vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_contactdetails.contactid, - vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime, - vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name - from vtiger_activity - inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid - inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid - left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid - left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid - inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id - left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid - left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname - where vtiger_activity.activitytype='Task' - and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred') - and vtiger_seactivityrel.crmid=".$id; - //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php - - $log->debug("Exiting get_history method ..."); - return getHistory('Quotes',$query,$id); - } - - - /** Function used to get the Quote Stage history of the Quotes - * @param $id - quote id - * @return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are arrays which contains header values and all column values of all entries - */ - function get_quotestagehistory($id) - { - global $log; - $log->debug("Entering get_quotestagehistory(".$id.") method ..."); - - global $adb; - global $mod_strings; - global $app_strings; - - $query = 'select vtiger_quotestagehistory.*, vtiger_quotes.subject from vtiger_quotestagehistory inner join vtiger_quotes on vtiger_quotes.quoteid = vtiger_quotestagehistory.quoteid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_quotes.quoteid where vtiger_crmentity.deleted = 0 and vtiger_quotes.quoteid = '.$id; - $result=$adb->query($query); - $noofrows = $adb->num_rows($result); - - $header[] = $app_strings['Quote Id']; - $header[] = $app_strings['LBL_ACCOUNT_NAME']; - $header[] = $app_strings['LBL_AMOUNT']; - $header[] = $app_strings['Quote Stage']; - $header[] = $app_strings['LBL_LAST_MODIFIED']; - - while($row = $adb->fetch_array($result)) - { - $entries = Array(); - - $entries[] = $row['quoteid']; - $entries[] = $row['accountname']; - $entries[] = $row['total']; - $entries[] = $row['quotestage']; - $entries[] = getDisplayDate($row['lastmodified']); - - $entries_list[] = $entries; - } - - $return_data = Array('header'=>$header,'entries'=>$entries_list); - - $log->debug("Exiting get_quotestagehistory method ..."); - - return $return_data; - } - -} - -?> +'crmid','vtiger_quotes'=>'quoteid','vtiger_quotesbillads'=>'quotebilladdressid','vtiger_quotesshipads'=>'quoteshipaddressid','vtiger_quotescf'=>'quoteid'); + + var $entity_table = "vtiger_crmentity"; + + var $billadr_table = "vtiger_quotesbillads"; + + var $object_name = "Quote"; + + var $new_schema = true; + + var $module_id = "quoteid"; + + var $column_fields = Array(); + + var $sortby_fields = Array('subject','crmid','smownerid'); + + // This is used to retrieve related vtiger_fields from form posts. + var $additional_column_fields = Array('assigned_user_name', 'smownerid', 'opportunity_id', 'case_id', 'contact_id', 'task_id', 'note_id', 'meeting_id', 'call_id', 'email_id', 'parent_name', 'member_id' ); + + // This is the list of vtiger_fields that are in the lists. + var $list_fields = Array( + 'Quote Id'=>Array('crmentity'=>'crmid'), + 'Subject'=>Array('quotes'=>'subject'), + 'Quote Stage'=>Array('quotes'=>'quotestage'), + 'Potential Name'=>Array('quotes'=>'potentialid'), + 'Account Name'=>Array('account'=> 'accountid'), + 'Total'=>Array('quotes'=> 'total'), + 'Assigned To'=>Array('crmentity'=>'smownerid') + ); + + var $list_fields_name = Array( + 'Quote Id'=>'', + 'Subject'=>'subject', + 'Quote Stage'=>'quotestage', + 'Potential Name'=>'potential_id', + 'Account Name'=>'account_id', + 'Total'=>'hdnGrandTotal', + 'Assigned To'=>'assigned_user_id' + ); + var $list_link_field= 'subject'; + + var $search_fields = Array( + 'Quote Id'=>Array('crmentity'=>'crmid'), + 'Subject'=>Array('quotes'=>'subject'), + 'Account Name'=>Array('quotes'=>'accountid'), + 'Quote Stage'=>Array('quotes'=>'quotestage'), + ); + + var $search_fields_name = Array( + 'Quote Id'=>'', + 'Subject'=>'subject', + 'Account Name'=>'account_id', + 'Quote Stage'=>'quotestage', + ); + + // This is the list of vtiger_fields that are required. + var $required_fields = array("accountname"=>1); + + //Added these variables which are used as default order by and sortorder in ListView + var $default_order_by = 'crmid'; + var $default_sort_order = 'ASC'; + var $groupTable = Array('vtiger_quotegrouprelation','quoteid'); + + + + /** Constructor which will set the column_fields in this object + */ + function Quotes() { + $this->log =LoggerManager::getLogger('quote'); + $this->db = new PearDatabase(); + $this->column_fields = getColumnFields('Quotes'); + } + + function save_module() + { + //in ajax save we should not call this function, because this will delete all the existing product values + if($_REQUEST['action'] != 'QuotesAjax' && $_REQUEST['ajxaction'] != 'DETAILVIEW') + { + //Based on the total Number of rows we will save the product relationship with this entity + saveInventoryProductDetails(&$this, 'Quotes'); + } + } + + /** Function used to get the sort order for Quote listview + * @return string $sorder - first check the $_REQUEST['sorder'] if request value is empty then check in the $_SESSION['QUOTES_SORT_ORDER'] if this session value is empty then default sort order will be returned. + */ + function getSortOrder() + { + global $log; + $log->debug("Entering getSortOrder() method ..."); + if(isset($_REQUEST['sorder'])) + $sorder = $_REQUEST['sorder']; + else + $sorder = (($_SESSION['QUOTES_SORT_ORDER'] != '')?($_SESSION['QUOTES_SORT_ORDER']):($this->default_sort_order)); + $log->debug("Exiting getSortOrder() method ..."); + return $sorder; + } + + /** Function used to get the order by value for Quotes listview + * @return string $order_by - first check the $_REQUEST['order_by'] if request value is empty then check in the $_SESSION['QUOTES_ORDER_BY'] if this session value is empty then default order by will be returned. + */ + function getOrderBy() + { + global $log; + $log->debug("Entering getOrderBy() method ..."); + if (isset($_REQUEST['order_by'])) + $order_by = $_REQUEST['order_by']; + else + $order_by = (($_SESSION['QUOTES_ORDER_BY'] != '')?($_SESSION['QUOTES_ORDER_BY']):($this->default_order_by)); + $log->debug("Exiting getOrderBy method ..."); + return $order_by; + } + + /** function used to get the list of sales orders which are related to the Quotes + * @param int $id - quote id + * @return array - return an array which will be returned from the function GetRelatedList + */ + function get_salesorder($id) + { + global $log,$singlepane_view; + $log->debug("Entering get_salesorder(".$id.") method ..."); + require_once('modules/SalesOrder/SalesOrder.php'); + $focus = new SalesOrder(); + + $button = ''; + + if($singlepane_view == 'true') + $returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Quotes&return_action=CallRelatedList&return_id='.$id; + + $query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname,case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name + from vtiger_salesorder + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid + left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid + left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid + left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid + left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname + left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid + where vtiger_crmentity.deleted=0 and vtiger_salesorder.quoteid = ".$id; + $log->debug("Exiting get_salesorder method ..."); + return GetRelatedList('Quotes','SalesOrder',$focus,$query,$button,$returnset); + } + + /** function used to get the list of activities which are related to the Quotes + * @param int $id - quote id + * @return array - return an array which will be returned from the function GetRelatedList + */ + function get_activities($id) + { + global $log,$singlepane_view; + $log->debug("Entering get_activities(".$id.") method ..."); + global $app_strings; + require_once('modules/Calendar/Activity.php'); + $focus = new Activity(); + + $button = ''; + + if($singlepane_view == 'true') + $returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id; + else + $returnset = '&return_module=Quotes&return_action=CallRelatedList&return_id='.$id; + + $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and (vtiger_activity.status is not NULL and vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL and vtiger_activity.status != 'Deferred')"; + $log->debug("Exiting get_activities method ..."); + return GetRelatedList('Quotes','Calendar',$focus,$query,$button,$returnset); + } + + /** function used to get the the activity history related to the quote + * @param int $id - quote id + * @return array - return an array which will be returned from the function GetHistory + */ + function get_history($id) + { + global $log; + $log->debug("Entering get_history(".$id.") method ..."); + $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, + vtiger_activity.eventstatus, vtiger_activity.activitytype,vtiger_activity.date_start, + vtiger_activity.due_date,vtiger_activity.time_start, vtiger_activity.time_end, + vtiger_contactdetails.contactid, + vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime, + vtiger_crmentity.createdtime, vtiger_crmentity.description, case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name + from vtiger_activity + inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid + left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid + left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid + left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid + left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname + left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid + where vtiger_activity.activitytype='Task' + and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred') + and vtiger_seactivityrel.crmid=".$id; + //Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php + + $log->debug("Exiting get_history method ..."); + return getHistory('Quotes',$query,$id); + } + + + /** Function used to get the Quote Stage history of the Quotes + * @param $id - quote id + * @return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are arrays which contains header values and all column values of all entries + */ + function get_quotestagehistory($id) + { + global $log; + $log->debug("Entering get_quotestagehistory(".$id.") method ..."); + + global $adb; + global $mod_strings; + global $app_strings; + + $query = 'select vtiger_quotestagehistory.*, vtiger_quotes.subject from vtiger_quotestagehistory inner join vtiger_quotes on vtiger_quotes.quoteid = vtiger_quotestagehistory.quoteid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_quotes.quoteid where vtiger_crmentity.deleted = 0 and vtiger_quotes.quoteid = '.$id; + $result=$adb->query($query); + $noofrows = $adb->num_rows($result); + + $header[] = $app_strings['Quote Id']; + $header[] = $app_strings['LBL_ACCOUNT_NAME']; + $header[] = $app_strings['LBL_AMOUNT']; + $header[] = $app_strings['Quote Stage']; + $header[] = $app_strings['LBL_LAST_MODIFIED']; + + while($row = $adb->fetch_array($result)) + { + $entries = Array(); + + $entries[] = $row['quoteid']; + $entries[] = $row['accountname']; + $entries[] = $row['total']; + $entries[] = $row['quotestage']; + $entries[] = getDisplayDate($row['lastmodified']); + + $entries_list[] = $entries; + } + + $return_data = Array('header'=>$header,'entries'=>$entries_list); + + $log->debug("Exiting get_quotestagehistory method ..."); + + return $return_data; + } + +} + +?> Modified: vtigercrm/branches/5.1_jens/modules/Quotes/Save.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Quotes/Save.php (original) +++ vtigercrm/branches/5.1_jens/modules/Quotes/Save.php Mon Apr 16 12:27:44 2007 @@ -28,23 +28,10 @@ $local_log =& LoggerManager::getLogger('index'); -global $log,$current_user; -$currencyid=fetchCurrency($current_user->id); -$rate_symbol = getCurrencySymbolandCRate($currencyid); -$rate = $rate_symbol['rate']; -$log->debug("Inside Quote Save"); - $focus = new Quotes(); - setObjectValuesFromRequest(&$focus); -$log->debug("The Field Value Array -----> ".$focus->column_fields); $focus->save("Quotes"); - - -//Based on the total Number of rows we will save the product relationship with this entity -saveInventoryProductDetails(&$focus, 'Quotes'); - $return_id = $focus->id; Modified: vtigercrm/branches/5.1_jens/modules/Quotes/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Quotes/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Quotes/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -45,7 +45,6 @@ //END DON'T CONVERT 'LBL_ACCOUNT'=>'Account:', -'LBL_ACCOUNT_NAME'=>'Account Name:', 'LBL_PHONE'=>'Phone:', 'LBL_WEBSITE'=>'Website:', 'LBL_FAX'=>'Fax:', Modified: vtigercrm/branches/5.1_jens/modules/Quotes/pdf_templates/Default/_default/header.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Quotes/pdf_templates/Default/_default/header.php (original) +++ vtigercrm/branches/5.1_jens/modules/Quotes/pdf_templates/Default/_default/header.php Mon Apr 16 12:27:44 2007 @@ -46,7 +46,7 @@ $pdf->addTextBlock( "Shipping Address:", $shipText, $shipLocation ); // billing Address -$billPositions = array("147","43","60"); +$billPositions = array("147","40","60"); $billText=$bill_street."\n".$bill_city.", ".$bill_state." ".$bill_code."\n".$bill_country; $pdf->addTextBlock("Billing Address:",$billText, $billPositions); // ********** End Addresses ****************** @@ -54,15 +54,25 @@ /* ******** Begin Quote Data ************************ */ -// terms block +// issue date block +$issueBlock=array("80","35"); +$pdf->addRecBlock(date("Y-m-d"), "Issue Date",$issueBlock); + +// valid till block +$dueBlock=array("80","50"); +$pdf->addRecBlock($valid_till, "Valid Till",$dueBlock); + +// customer name block $termBlock=array("10","65"); $pdf->addRecBlock($account_name, "Customer Name", $termBlock); -// due date block -$dueBlock=array("80","65"); -$pdf->addRecBlock($valid_till, "Valid Till",$dueBlock); -// vtiger_invoice number block +// Contact Name block +$conBlock=array("79","65"); +$pdf->addRecBlock($contact_name, "Contact Name",$conBlock); + + +// quote number block $invBlock=array("147","65"); $pdf->addRecBlock($quote_id, "Quote Number",$invBlock); Modified: vtigercrm/branches/5.1_jens/modules/Reports/AdvancedFilter.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Reports/AdvancedFilter.php (original) +++ vtigercrm/branches/5.1_jens/modules/Reports/AdvancedFilter.php Mon Apr 16 12:27:44 2007 @@ -140,7 +140,7 @@ { foreach($ogReport->sec_module_columnslist[$secmodule[$i]][$key] as $field=>$fieldlabel) { - if(isset($mod_strings[$fieldlable])) + if(isset($mod_strings[$fieldlabel])) { if($selected == $field) { Modified: vtigercrm/branches/5.1_jens/modules/Reports/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Reports/CreatePDF.php (original) +++ vtigercrm/branches/5.1_jens/modules/Reports/CreatePDF.php Mon Apr 16 12:27:44 2007 @@ -52,6 +52,7 @@ function Html2PDF($orientation='P',$unit='mm',$format='A4') { +//echo '
    ';print_r($format);echo '
    '; //Call parent constructor $this->FPDF($orientation,$unit,$format); //Initialization @@ -295,35 +296,6 @@ $filterlist = $oReportRun->RunTimeFilter($filtercolumn,$filter,$_REQUEST["startdate"],$_REQUEST["enddate"]); $arr_val = $oReportRun->GenerateReport("PDF",$filterlist); - -if(isset($arr_val)) -{ - $columnlength = count($arr_val[0]); -} - -if($columnlength > 0 && $columnlength <= 4) -{ - $pdf = new Html2PDF('P','mm','A4'); -}elseif($columnlength >= 5 && $columnlength < 8) -{ - $pdf = new Html2PDF('L','mm','A4'); -}elseif($columnlength >= 8 && $columnlength <= 12) -{ - $pdf = new Html2PDF('P','mm','A3'); -}elseif($columnlength > 12) -{ - $pdf = new Html2PDF('L','mm','A3'); -} - -$pdf->AddPage(); - -$pdf->SetFillColor(224,235,255); -$pdf->SetTextColor(0); -$pdf->SetFont('Arial','B',14); -$pdf->Cell(($pdf->columnlength*50),10,$oReport->reportname,0,0,'C',0); -$pdf->Ln(); - -$pdf->SetFont('Arial','',10); if(isset($arr_val)) { @@ -396,6 +368,35 @@ '.$dataHTML.'
     
    '.$adb->query_result($list_result,$i,"bookname").''.$unit_price.'
    '.$unit_price.''; + if(isPermitted("PriceBooks","EditView","") == 'yes') + $list_body .= ''; + else + $list_body .= ''; + $list_body .= '
    '.$adb->query_result($list_result,$i,"productname").''.$adb->query_result($list_result,$i,"productcode").''.$unit_price.'
    '.$unit_price.''; + if(isPermitted("PriceBooks","EditView","") == 'yes') + $list_body .= ''; + else + $list_body .= ''; + $list_body .= '
    '; +if(isset($arr_val)) +{ + $columnlength = array_sum($col_width); +} + +if($columnlength <= 420 ) +{ + $pdf = new Html2PDF('P','mm','A5'); +}elseif($columnlength >= 421 && $columnlength <= 600) +{ + $pdf = new Html2PDF('L','mm','A4'); +}elseif($columnlength >=601 && $columnlength <= 850) +{ + $pdf = new Html2PDF('P','mm','A3'); +}elseif($columnlength >=851 ) +{ + $pdf = new Html2PDF('L','mm','A1'); +} +//echo '
    ';print_r($columnlength);echo '
    '; +$pdf->AddPage(); + +$pdf->SetFillColor(224,235,255); +$pdf->SetTextColor(0); +$pdf->SetFont('Arial','B',14); +$pdf->Cell(($pdf->columnlength*50),10,$oReport->reportname,0,0,'C',0); +$pdf->Ln(); + +$pdf->SetFont('Arial','',10); + $pdf->WriteHTML($html); $pdf->Output('Reports.pdf','D'); exit(); Modified: vtigercrm/branches/5.1_jens/modules/Reports/PopulateReports.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Reports/PopulateReports.php (original) +++ vtigercrm/branches/5.1_jens/modules/Reports/PopulateReports.php Mon Apr 16 12:27:44 2007 @@ -53,19 +53,19 @@ 'vtiger_contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V', 'vtiger_accountContacts:accountname:Contacts_Account_Name:account_id:I', 'vtiger_account:industry:Accounts_industry:industry:V', - 'vtiger_contactdetails:email:Contacts_Email:email:V'), + 'vtiger_contactdetails:email:Contacts_Email:email:E'), Array('vtiger_contactdetails:firstname:Contacts_First_Name:firstname:V', 'vtiger_contactdetails:lastname:Contacts_Last_Name:lastname:V', 'vtiger_contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V', 'vtiger_accountContacts:accountname:Contacts_Account_Name:account_id:I', 'vtiger_account:industry:Accounts_industry:industry:V', - 'vtiger_contactdetails:email:Contacts_Email:email:V'), + 'vtiger_contactdetails:email:Contacts_Email:email:E'), Array('vtiger_contactdetails:firstname:Contacts_First_Name:firstname:V', 'vtiger_contactdetails:lastname:Contacts_Last_Name:lastname:V', 'vtiger_accountContacts:accountname:Contacts_Account_Name:account_id:I', - 'vtiger_contactdetails:email:Contacts_Email:email:V', + 'vtiger_contactdetails:email:Contacts_Email:email:E', 'vtiger_potential:potentialname:Potentials_Potential_Name:potentialname:V', 'vtiger_potential:sales_stage:Potentials_Sales_Stage:sales_stage:V'), @@ -164,7 +164,7 @@ 'vtiger_contactdetails:firstname:Contacts_First_Name:firstname:V', 'vtiger_contactdetails:lastname:Contacts_Last_Name:lastname:V', 'vtiger_contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V', - 'vtiger_contactdetails:email:Contacts_Email:email:V'), + 'vtiger_contactdetails:email:Contacts_Email:email:E'), Array('vtiger_purchaseorder:subject:PurchaseOrder_Subject:subject:V', 'vtiger_vendorRel:vendorname:PurchaseOrder_Vendor_Name:vendor_id:I', @@ -562,7 +562,7 @@ global $adb; if($queryid != "") { - $ireportmodulesql = "insert into vtiger_reportdatefilter (DATEFILTERID,DATECOLUMNNAME,DATEFILTER,STARTDATE,ENDDATE) values (".$queryid.",'".$filtercolumn."','".$datefilter."','".$adb->formatString("vtiger_crmentity","startdate",$startdate)."','".$adb->formatString("vtiger_crmentity","enddate",$enddate)."')"; + $ireportmodulesql = "insert into vtiger_reportdatefilter (DATEFILTERID,DATECOLUMNNAME,DATEFILTER,STARTDATE,ENDDATE) values (".$queryid.",'".$filtercolumn."','".$datefilter."','".$startdate."','".$enddate."')"; $ireportmoduleresult = $adb->query($ireportmodulesql); } Modified: vtigercrm/branches/5.1_jens/modules/Reports/PrintReport.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Reports/PrintReport.php (original) +++ vtigercrm/branches/5.1_jens/modules/Reports/PrintReport.php Mon Apr 16 12:27:44 2007 @@ -13,6 +13,7 @@ require_once("modules/Reports/Reports.php"); global $app_strings; +global $mod_strings; $oPrint_smarty=new vtigerCRM_Smarty; $reportid = $_REQUEST["record"]; $oReport = new Reports($reportid); @@ -25,6 +26,7 @@ $total_report = $oReportRun->GenerateReport("PRINT_TOTAL",$filterlist); $oPrint_smarty->assign("COUNT",$arr_values[1]); $oPrint_smarty->assign("APP",$app_strings); +$oPrint_smarty->assign("MOD",$mod_strings); $oPrint_smarty->assign("REPORT_NAME",$oReport->reportname); $oPrint_smarty->assign("PRINT_CONTENTS",$arr_values[0]); $oPrint_smarty->assign("TOTAL_HTML",$total_report); Modified: vtigercrm/branches/5.1_jens/modules/Reports/ReportColumns.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Reports/ReportColumns.php (original) +++ vtigercrm/branches/5.1_jens/modules/Reports/ReportColumns.php Mon Apr 16 12:27:44 2007 @@ -64,6 +64,7 @@ { global $ogReport; global $app_list_strings; + global $app_strings; global $current_language; $mod_strings = return_module_language($current_language,$module); @@ -71,7 +72,8 @@ { if(isset($ogReport->pri_module_columnslist[$module][$key])) { - $shtml .= ""; + + $shtml .= ""; foreach($ogReport->pri_module_columnslist[$module][$key] as $field=>$fieldlabel) { if(isset($mod_strings[$fieldlabel])) @@ -97,7 +99,7 @@ function getSecondaryColumnsHTML($module) { global $ogReport; - global $app_list_strings; + global $app_list_strings,$app_strings; global $current_language; if($module != "") @@ -110,7 +112,7 @@ { if(isset($ogReport->sec_module_columnslist[$secmodule[$i]][$key])) { - $shtml .= ""; + $shtml .= ""; foreach($ogReport->sec_module_columnslist[$secmodule[$i]][$key] as $field=>$fieldlabel) { if(isset($mod_strings[$fieldlabel])) Modified: vtigercrm/branches/5.1_jens/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Reports/ReportRun.php (original) +++ vtigercrm/branches/5.1_jens/modules/Reports/ReportRun.php Mon Apr 16 12:27:44 2007 @@ -68,7 +68,7 @@ $ssql .= " where vtiger_report.reportid =".$reportid; $ssql .= " order by vtiger_selectcolumn.columnindex"; $result = $adb->query($ssql); - + $permitted_fields = Array(); while($columnslistrow = $adb->fetch_array($result)) @@ -81,12 +81,13 @@ { list($module,$field) = split("_",$module_field); $permitted_fields = $this->getaccesfield($module); + } $selectedfields = explode(":",$fieldcolname); $querycolumns = $this->getEscapedColumns($selectedfields); - if(sizeof($permitted_fields) != 0 && !in_array($fieldname,$permitted_fields)) + if(sizeof($permitted_fields) != 0 && !in_array($colname,$permitted_fields)) { continue; } @@ -94,7 +95,30 @@ { if($querycolumns == "") { - $columnslist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1].' AS "'.$selectedfields[2].'"'; + if($selectedfields[0] == 'vtiger_activity' && $selectedfields[1] == 'status') + { + $columnslist[$fieldcolname] = " case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end as Calendar_Status"; + } + elseif($selectedfields[0] == 'vtiger_activity' && $selectedfields[1] == 'date_start') + { + $columnslist[$fieldcolname] = "concat(vtiger_activity.date_start,' ',vtiger_activity.time_start) as Calendar_Start_Date_and_Time"; + } + elseif(stristr($selectedfields[0],"vtiger_users") && ($selectedfields[1] == 'user_name') && $module_field != 'Products_Handler') + { + $columnslist[$fieldcolname] = " case when (".$selectedfields[0].".user_name not like '') then ".$selectedfields[0].".user_name else vtiger_groups.groupname end as ".$this->primarymodule."_Assigned_To"; + } + elseif(stristr($selectedfields[0],"vtiger_users") && ($selectedfields[1] == 'user_name') && $module_field == 'Products_Handler')//Products cannot be assiged to group only to handler so group is not included + { + $columnslist[$fieldcolname] = $selectedfields[0].".user_name as ".$this->primarymodule."_Handler"; + } + elseif($selectedfields[0] == "vtiger_crmentity".$this->primarymodule) + { + $columnslist[$fieldcolname] = "vtiger_crmentity.".$selectedfields[1]." AS '".$selectedfields[2]."'"; + } + else + { + $columnslist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1].' AS "'.$selectedfields[2].'"'; + } } else { @@ -117,7 +141,15 @@ $access_fields = Array(); $profileList = getCurrentUserProfileList(); - $query = "select vtiger_field.fieldname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=(select tabid from vtiger_tab where vtiger_tab.name='".$module."') and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; + $query = "select vtiger_field.fieldname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where"; + if($module == "Calendar") + { + $query .= " vtiger_field.tabid in (9,16) and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; + } + else + { + $query .= " vtiger_field.tabid in (select tabid from vtiger_tab where vtiger_tab.name in ('".$this->primarymodule."','".$this->secondarymodule."')) and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; + } $result = $adb->query($query); @@ -125,6 +157,9 @@ { $access_fields[] = $collistrow["fieldname"]; } + //added to include ticketid for Reports module in select columnlist for all users + if($module == "HelpDesk") + $access_fields[] = "ticketid"; return $access_fields; } @@ -139,7 +174,7 @@ { if($this->primarymodule == "HelpDesk" && $selectedfields[0] == "vtiger_crmentityRelHelpDesk") { - $querycolumn = "case vtiger_crmentityRelHelpDesk.setype when 'Accounts' then vtiger_accountRelHelpDesk.accountname when 'Contacts' then vtiger_contactdetailsRelHelpDesk.lastname End"." '".$selectedfields[2]."', vtiger_crmentityRelHelpDesk.setype 'Entity_type'"; + $querycolumn = "case vtiger_crmentityRelHelpDesk.setype when 'Accounts' then vtiger_accountRelHelpDesk.accountname when 'Contacts' then concat(vtiger_contactdetailsRelHelpDesk.lastname,' ',vtiger_contactdetailsRelHelpDesk.firstname) End"." '".$selectedfields[2]."', vtiger_crmentityRelHelpDesk.setype 'Entity_type'"; return $querycolumn; } if($this->primarymodule == "Products" || $this->secondarymodule == "Products") @@ -197,6 +232,8 @@ if($ordercolumnsequal) { $selectedfields = explode(":",$fieldcolname); + if($selectedfields[0] == "vtiger_crmentity".$this->primarymodule) + $selectedfields[0] = "vtiger_crmentity"; $sSQLList[] = $selectedfields[0].".".$selectedfields[1]." '".$selectedfields[2]."'"; } } @@ -322,15 +359,42 @@ $advorsql = ""; for($n=0;$ngetAdvComparator($comparator,trim($valuearray[$n]),$datatype); + if($selectedfields[0] == 'vtiger_crmentityRelHelpDesk' && $selectedfields[1] == 'setype') + { + $advorsql[] = "(case vtiger_crmentityRelHelpDesk.setype when 'Accounts' then vtiger_accountRelHelpDesk.accountname else concat(vtiger_contactdetailsRelHelpDesk.lastname,' ',vtiger_contactdetailsRelHelpDesk.firstname) end) ". $this->getAdvComparator($comparator,trim($valuearray[$n]),$datatype); + }elseif($selectedfields[1] == 'status') + { + $advorsql[] = "(case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end)".$this->getAdvComparator($comparator,trim($valuearray[$n]),$datatype); + }else + { + $advorsql[] = $selectedfields[0].".".$selectedfields[1].$this->getAdvComparator($comparator,trim($valuearray[$n]),$datatype); + } } $advorsqls = implode(" or ",$advorsql); $fieldvalue = " (".$advorsqls.") "; - }else + }elseif($selectedfields[0] == 'vtiger_activity' && $selectedfields[1] == 'status') + { + $fieldvalue = "(case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end)".$this->getAdvComparator($comparator,trim($value),$datatype); + } + elseif($selectedfields[0] == "vtiger_users".$this->primarymodule && $selectedfields[1] == 'user_name') + { + $fieldvalue = " case when (".$selectedfields[0].".user_name not like '') then ".$selectedfields[0].".user_name else vtiger_groups.groupname end ".$this->getAdvComparator($comparator,trim($value),$datatype); + } + elseif($selectedfields[0] == "vtiger_crmentity".$this->primarymodule) + { + $fieldvalue = "vtiger_crmentity.".$selectedfields[1]." ".$this->getAdvComparator($comparator,trim($value),$datatype); + } + elseif($selectedfields[0] == 'vtiger_crmentityRelHelpDesk' && $selectedfields[1]=='setype') + { + $fieldvalue = "(vtiger_accountRelHelpDesk.accountname ".$this->getAdvComparator($comparator,trim($value),$datatype)." or vtiger_contactdetailsRelHelpDesk.lastname ".$this->getAdvComparator($comparator,trim($value),$datatype)." or vtiger_contactdetailsRelHelpDesk.firstname ".$this->getAdvComparator($comparator,trim($value),$datatype).")"; + } + else { $fieldvalue = $selectedfields[0].".".$selectedfields[1].$this->getAdvComparator($comparator,trim($value),$datatype); } - $advfilterlist[$fieldcolname] = $fieldvalue; + if(isset($advfilterlist[$fieldcolname])) + $advfilterlist[$fieldcolname] = $advfilterlist[$fieldcolname].' and '.$fieldvalue; + else $advfilterlist[$fieldcolname] = $fieldvalue; } } @@ -366,16 +430,17 @@ if($fieldcolname != "none") { + $selectedfields = explode(":",$fieldcolname); + if($selectedfields[0] == "vtiger_crmentity".$this->primarymodule) + $selectedfields[0] = "vtiger_crmentity"; if($datefilter == "custom") { if($startdate != "0000-00-00" && $enddate != "0000-00-00") { - $selectedfields = explode(":",$fieldcolname); $stdfilterlist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1]." between '".$startdate."' and '".$enddate."'"; } }else { - $selectedfields = explode(":",$fieldcolname); $startenddate = $this->getStandarFiltersStartAndEndDate($datefilter); if($startenddate[0] != "" && $startenddate[1] != "") { @@ -401,18 +466,19 @@ { if($filtercolumn != "none") { + $selectedfields = explode(":",$filtercolumn); + if($selectedfields[0] == "vtiger_crmentity".$this->primarymodule) + $selectedfields[0] = "vtiger_crmentity"; if($filter == "custom") { if($startdate != "" && $enddate != "") { - $selectedfields = explode(":",$filtercolumn); $stdfilterlist[$filtercolumn] = $selectedfields[0].".".$selectedfields[1]." between '".$startdate."' and '".$enddate."'"; } }else { if($startdate != "" && $enddate != "") { - $selectedfields = explode(":",$filtercolumn); $startenddate = $this->getStandarFiltersStartAndEndDate($filter); if($startenddate[0] != "" && $startenddate[1] != "") { @@ -453,16 +519,17 @@ if($fieldcolname != "none") { + $selectedfields = explode(":",$fieldcolname); + if($selectedfields[0] == "vtiger_crmentity".$this->primarymodule) + $selectedfields[0] = "vtiger_crmentity"; if($datefilter == "custom") { if($startdate != "0000-00-00" && $enddate != "0000-00-00") { - $selectedfields = explode(":",$fieldcolname); $sSQL .= $selectedfields[0].".".$selectedfields[1]." between '".$startdate."' and '".$enddate."'"; } }else { - $selectedfields = explode(":",$fieldcolname); $startenddate = $this->getStandarFiltersStartAndEndDate($datefilter); if($startenddate[0] != "" && $startenddate[1] != "") { @@ -721,6 +788,8 @@ if($fieldcolname != "none") { $selectedfields = explode(":",$fieldcolname); + if($selectedfields[0] == "vtiger_crmentity".$this->primarymodule) + $selectedfields[0] = "vtiger_crmentity"; $sqlvalue = $selectedfields[0].".".$selectedfields[1]." ".$sortorder; $grouplist[$fieldcolname] = $sqlvalue; $this->groupbylist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1]." ".$selectedfields[2]; @@ -775,6 +844,8 @@ $sSQL .= ", "; $this->orderbylistsql .= ", "; } + if($selectedfields[0] == "vtiger_crmentity".$this->primarymodule) + $selectedfields[0] = "vtiger_crmentity"; $sSQL .= $selectedfields[0].".".$selectedfields[1]." ".$sortorder; $this->orderbylistsql .= $selectedfields[0].".".$selectedfields[1]." ".$selectedfields[2]; } @@ -898,12 +969,12 @@ } if($secmodule == "Products") { - $query = "left join vtiger_seproductsrel on vtiger_seproductsrel.crmid = vtiger_account.accountid + $query = "left join vtiger_seproductsrel on vtiger_seproductsrel.crmid = vtiger_account.accountid and vtiger_seproductsrel.setype = 'Accounts' left join vtiger_products on vtiger_products.productid = vtiger_seproductsrel.productid left join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid - left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid - left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid + left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_products.handler + left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_seproductsrel.crmid left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id left join vtiger_crmentity as vtiger_crmentityRel on vtiger_crmentityRel.crmid = vtiger_seproductsrel.crmid left join vtiger_account as vtiger_accountRel on vtiger_accountRel.accountid=vtiger_crmentityRel.crmid @@ -986,11 +1057,14 @@ left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid "; } } + + //Here we will get the Products - Accounts, Contacts relationship (Also Leads, Potentials) if($module == "Products") { if($secmodule == "Accounts") { - $query = "left join vtiger_account on vtiger_account.accountid = vtiger_crmentityRelProducts.crmid + $query = " + left join vtiger_account on vtiger_account.accountid = vtiger_seproductsrel.crmid left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid @@ -1000,7 +1074,8 @@ } if($secmodule == "Contacts") { - $query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_products.contactid + $query = " + left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_seproductsrel.crmid left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid @@ -1058,8 +1133,7 @@ $query = "left join vtiger_products on vtiger_products.productid = vtiger_troubletickets.product_id left join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid - left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid - left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid + left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_products.handler left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid left join vtiger_crmentity as vtiger_crmentityRelProducts on vtiger_crmentityRelProducts.crmid = vtiger_seproductsrel.crmid @@ -1070,6 +1144,29 @@ } if($module == "Calendar") { + //Added Leads,Accounts,Potentials as secondarymodule for Calendar + + if($secmodule == "Leads") + { + $query = "left join vtiger_leaddetails on vtiger_leaddetails.leadid = vtiger_seactivityrel.crmid + left join vtiger_crmentity as vtiger_crmentityLeads on vtiger_crmentityLeads.crmid = vtiger_leaddetails.leadid + left join vtiger_leadaddress on vtiger_leaddetails.leadid = vtiger_leadaddress.leadaddressid + left join vtiger_leadsubdetails on vtiger_leadsubdetails.leadsubscriptionid = vtiger_leaddetails.leadid + left join vtiger_leadscf on vtiger_leadscf.leadid = vtiger_leaddetails.leadid + left join vtiger_users as vtiger_usersLeads on vtiger_usersLeads.id = vtiger_crmentityLeads.smownerid "; + + } + if($secmodule == "Accounts") + { + $query = "left join vtiger_account on vtiger_account.accountid = vtiger_seactivityrel.crmid + left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid + left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid + left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid + left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid + left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid + left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid "; + + } if($secmodule == "Contacts") { $query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid @@ -1082,6 +1179,14 @@ left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid "; } + if($secmodule == "Potentials") + { + $query = "left join vtiger_potential on vtiger_potential.potentialid = vtiger_seactivityrel.crmid + left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid + left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid + left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid "; + + } } if($module == 'Campaigns') { @@ -1090,22 +1195,13 @@ $query = "left join vtiger_products on vtiger_products.productid = vtiger_campaign.product_id left join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid - left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid - left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid + left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_products.handler left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid left join vtiger_crmentity as vtiger_crmentityRelProducts on vtiger_crmentityRelProducts.crmid = vtiger_seproductsrel.crmid left join vtiger_account as vtiger_accountRelProducts on vtiger_accountRelProducts.accountid=vtiger_seproductsrel.crmid left join vtiger_leaddetails as vtiger_leaddetailsRelProducts on vtiger_leaddetailsRelProducts.leadid = vtiger_seproductsrel.crmid left join vtiger_potential as vtiger_potentialRelProducts on vtiger_potentialRelProducts.potentialid = vtiger_seproductsrel.crmid "; - } - elseif($secmodule == 'Contacts') - { - $query = "left join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid=vtiger_campaign.campaignid - left join vtiger_contactdetails on vtiger_campaigncontrel.contactid=vtiger_contactdetails.contactid - left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid - left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid - left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid "; } } $log->info("ReportRun :: Successfully returned getRelatedModulesQuery".$secmodule); @@ -1122,91 +1218,100 @@ if($module == "Leads") { $query = "from vtiger_leaddetails - inner join vtiger_crmentity as vtiger_crmentityLeads on vtiger_crmentityLeads.crmid=vtiger_leaddetails.leadid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid inner join vtiger_leadsubdetails on vtiger_leadsubdetails.leadsubscriptionid=vtiger_leaddetails.leadid inner join vtiger_leadaddress on vtiger_leadaddress.leadaddressid=vtiger_leadsubdetails.leadsubscriptionid inner join vtiger_leadscf on vtiger_leaddetails.leadid = vtiger_leadscf.leadid - left join vtiger_users as vtiger_usersLeads on vtiger_usersLeads.id = vtiger_crmentityLeads.smownerid - where vtiger_crmentityLeads.deleted=0 and vtiger_leaddetails.converted=0"; + left join vtiger_leadgrouprelation on vtiger_leaddetails.leadid = vtiger_leadgrouprelation.leadid + left join vtiger_groups on vtiger_groups.groupname = vtiger_leadgrouprelation.groupname + left join vtiger_users as vtiger_usersLeads on vtiger_usersLeads.id = vtiger_crmentity.smownerid + where vtiger_crmentity.deleted=0 and vtiger_leaddetails.converted=0"; } if($module == "Accounts") { $query = "from vtiger_account - inner join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid inner join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid inner join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid inner join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid + left join vtiger_accountgrouprelation on vtiger_account.accountid = vtiger_accountgrouprelation.accountid + left join vtiger_groups on vtiger_groups.groupname = vtiger_accountgrouprelation.groupname left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid - left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid + left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentity.smownerid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - where vtiger_crmentityAccounts.deleted=0 "; + where vtiger_crmentity.deleted=0 "; } if($module == "Contacts") { $query = "from vtiger_contactdetails - inner join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid + inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid inner join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid inner join vtiger_customerdetails on vtiger_customerdetails.customerid = vtiger_contactdetails.contactid inner join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid inner join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid + left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid = vtiger_contactgrouprelation.contactid + left join vtiger_groups on vtiger_groups.groupname = vtiger_contactgrouprelation.groupname left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid - left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid + left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentity.smownerid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - where vtiger_crmentityContacts.deleted=0"; + where vtiger_crmentity.deleted=0"; } if($module == "Potentials") { $query = "from vtiger_potential - inner join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid inner join vtiger_account as vtiger_accountPotentials on vtiger_potential.accountid = vtiger_accountPotentials.accountid inner join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid - left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid + left join vtiger_potentialgrouprelation on vtiger_potential.potentialid = vtiger_potentialgrouprelation.potentialid + left join vtiger_groups on vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname + left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentity.smownerid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - where vtiger_crmentityPotentials.deleted=0 "; - } - + where vtiger_crmentity.deleted=0 "; + } + + //For this Product - we can related Accounts, Contacts (Also Leads, Potentials) if($module == "Products") { $query = "from vtiger_products - inner join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid - left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid - left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid - left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id - left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid - left join vtiger_crmentity as vtiger_crmentityRelProducts on vtiger_crmentityRelProducts.crmid = vtiger_seproductsrel.crmid - left join vtiger_account as vtiger_accountRelProducts on vtiger_accountRelProducts.accountid=vtiger_crmentityRelProducts.crmid - left join vtiger_leaddetails as vtiger_leaddetailsRelProducts on vtiger_leaddetailsRelProducts.leadid = vtiger_crmentityRelProducts.crmid - left join vtiger_potential as vtiger_potentialRelProducts on vtiger_potentialRelProducts.potentialid = vtiger_crmentityRelProducts.crmid + left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_products.handler + left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id + left join vtiger_seproductsrel on vtiger_seproductsrel.productid= vtiger_products.productid and vtiger_seproductsrel.setype='".$this->secondarymodule."' ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - where vtiger_crmentityProducts.deleted=0 "; + where vtiger_crmentity.deleted=0"; } if($module == "HelpDesk") { $query = "from vtiger_troubletickets - inner join vtiger_crmentity as vtiger_crmentityHelpDesk - on vtiger_crmentityHelpDesk.crmid=vtiger_troubletickets.ticketid + inner join vtiger_crmentity + on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid left join vtiger_crmentity as vtiger_crmentityRelHelpDesk on vtiger_crmentityRelHelpDesk.crmid = vtiger_troubletickets.parent_id left join vtiger_account as vtiger_accountRelHelpDesk on vtiger_accountRelHelpDesk.accountid=vtiger_crmentityRelHelpDesk.crmid left join vtiger_contactdetails as vtiger_contactdetailsRelHelpDesk on vtiger_contactdetailsRelHelpDesk.contactid= vtiger_crmentityRelHelpDesk.crmid left join vtiger_products as vtiger_productsRel on vtiger_productsRel.productid = vtiger_troubletickets.product_id - left join vtiger_users as vtiger_usersHelpDesk on vtiger_crmentityHelpDesk.smownerid=vtiger_usersHelpDesk.id + left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid = vtiger_ticketgrouprelation.ticketid + left join vtiger_groups on vtiger_groups.groupname = vtiger_ticketgrouprelation.groupname + + left join vtiger_users as vtiger_usersHelpDesk on vtiger_crmentity.smownerid=vtiger_usersHelpDesk.id ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - where vtiger_crmentityHelpDesk.deleted=0 "; + where vtiger_crmentity.deleted=0 "; } if($module == "Calendar") { $query = "from vtiger_activity - inner join vtiger_crmentity as vtiger_crmentityCalendar on vtiger_crmentityCalendar.crmid=vtiger_activity.activityid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails as vtiger_contactdetailsCalendar on vtiger_contactdetailsCalendar.contactid= vtiger_cntactivityrel.contactid - left join vtiger_users as vtiger_usersCalendar on vtiger_usersCalendar.id = vtiger_crmentityCalendar.smownerid + left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid + left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname + left join vtiger_users as vtiger_usersCalendar on vtiger_usersCalendar.id = vtiger_crmentity.smownerid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left join vtiger_crmentity as vtiger_crmentityRelCalendar on vtiger_crmentityRelCalendar.crmid = vtiger_seactivityrel.crmid left join vtiger_account as vtiger_accountRelCalendar on vtiger_accountRelCalendar.accountid=vtiger_crmentityRelCalendar.crmid @@ -1216,55 +1321,61 @@ left join vtiger_purchaseorder as vtiger_purchaseorderRelCalendar on vtiger_purchaseorderRelCalendar.purchaseorderid = vtiger_crmentityRelCalendar.crmid left join vtiger_invoice as vtiger_invoiceRelCalendar on vtiger_invoiceRelCalendar.invoiceid = vtiger_crmentityRelCalendar.crmid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - WHERE vtiger_crmentityCalendar.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')"; + WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')"; } if($module == "Quotes") { $query = "from vtiger_quotes - inner join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid inner join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid inner join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid left join vtiger_quotescf on vtiger_quotes.quoteid = vtiger_quotescf.quoteid - left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid + left join vtiger_quotegrouprelation on vtiger_quotes.quoteid = vtiger_quotegrouprelation.quoteid + left join vtiger_groups on vtiger_groups.groupname = vtiger_quotegrouprelation.groupname + left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentity.smownerid left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - where vtiger_crmentityQuotes.deleted=0"; + where vtiger_crmentity.deleted=0"; } if($module == "PurchaseOrder") { $query = "from vtiger_purchaseorder - inner join vtiger_crmentity as vtiger_crmentityPurchaseOrder on vtiger_crmentityPurchaseOrder.crmid=vtiger_purchaseorder.purchaseorderid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid inner join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid inner join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid left join vtiger_purchaseordercf on vtiger_purchaseorder.purchaseorderid = vtiger_purchaseordercf.purchaseorderid - left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentityPurchaseOrder.smownerid + left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid = vtiger_pogrouprelation.purchaseorderid + left join vtiger_groups on vtiger_groups.groupname = vtiger_pogrouprelation.groupname + left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentity.smownerid left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_purchaseorder.vendorid left join vtiger_contactdetails as vtiger_contactdetailsPurchaseOrder on vtiger_contactdetailsPurchaseOrder.contactid = vtiger_purchaseorder.contactid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - where vtiger_crmentityPurchaseOrder.deleted=0"; + where vtiger_crmentity.deleted=0"; } if($module == "Invoice") { $query = "from vtiger_invoice - inner join vtiger_crmentity as vtiger_crmentityInvoice on vtiger_crmentityInvoice.crmid=vtiger_invoice.invoiceid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_invoice.invoiceid inner join vtiger_invoicebillads on vtiger_invoice.invoiceid=vtiger_invoicebillads.invoicebilladdressid inner join vtiger_invoiceshipads on vtiger_invoice.invoiceid=vtiger_invoiceshipads.invoiceshipaddressid left join vtiger_invoicecf on vtiger_invoice.invoiceid = vtiger_invoicecf.invoiceid - left join vtiger_users as vtiger_usersInvoice on vtiger_usersInvoice.id = vtiger_crmentityInvoice.smownerid + left join vtiger_invoicegrouprelation on vtiger_invoice.invoiceid = vtiger_invoicegrouprelation.invoiceid + left join vtiger_groups on vtiger_groups.groupname = vtiger_invoicegrouprelation.groupname + left join vtiger_users as vtiger_usersInvoice on vtiger_usersInvoice.id = vtiger_crmentity.smownerid left join vtiger_account as vtiger_accountInvoice on vtiger_accountInvoice.accountid = vtiger_invoice.accountid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - where vtiger_crmentityInvoice.deleted=0"; + where vtiger_crmentity.deleted=0"; } if($module == "SalesOrder") { $query = "from vtiger_salesorder - inner join vtiger_crmentity as vtiger_crmentitySalesOrder on vtiger_crmentitySalesOrder.crmid=vtiger_salesorder.salesorderid + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid inner join vtiger_sobillads on vtiger_salesorder.salesorderid=vtiger_sobillads.sobilladdressid inner join vtiger_soshipads on vtiger_salesorder.salesorderid=vtiger_soshipads.soshipaddressid left join vtiger_salesordercf on vtiger_salesorder.salesorderid = vtiger_salesordercf.salesorderid @@ -1272,8 +1383,10 @@ left join vtiger_quotes as vtiger_quotesSalesOrder on vtiger_quotesSalesOrder.quoteid = vtiger_salesorder.quoteid left join vtiger_account as vtiger_accountSalesOrder on vtiger_accountSalesOrder.accountid = vtiger_salesorder.accountid left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_salesorder.potentialid - left join vtiger_users as vtiger_usersSalesOrder on vtiger_usersSalesOrder.id = vtiger_crmentitySalesOrder.smownerid - where vtiger_crmentitySalesOrder.deleted=0"; + left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid = vtiger_sogrouprelation.salesorderid + left join vtiger_groups on vtiger_groups.groupname = vtiger_sogrouprelation.groupname + left join vtiger_users as vtiger_usersSalesOrder on vtiger_usersSalesOrder.id = vtiger_crmentity.smownerid + where vtiger_crmentity.deleted=0"; } @@ -1281,10 +1394,13 @@ { $query = "from vtiger_campaign inner join vtiger_campaignscf as vtiger_campaignscf on vtiger_campaignscf.campaignid=vtiger_campaign.campaignid - inner join vtiger_crmentity as vtiger_crmentityCampaigns on vtiger_crmentityCampaigns.crmid=vtiger_campaign.campaignid - left join vtiger_users as vtiger_usersCampaigns on vtiger_usersCampaigns.id = vtiger_crmentityCampaigns.smownerid - ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." - where vtiger_crmentityCampaigns.deleted=0"; + inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_campaign.campaignid + left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid = vtiger_campaigngrouprelation.campaignid + left join vtiger_groups on vtiger_groups.groupname = vtiger_campaigngrouprelation.groupname + + left join vtiger_users as vtiger_usersCampaigns on vtiger_usersCampaigns.id = vtiger_crmentity.smownerid + ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." + where vtiger_crmentity.deleted=0"; } $log->info("ReportRun :: Successfully returned getReportsQuery".$module); return $query; @@ -1308,6 +1424,10 @@ $columnstotallist = $this->getColumnsTotal($reportid); $advfilterlist = $this->getAdvFilterList($reportid); $this->totallist = $columnstotallist; + global $current_user; + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + $tab_id = getTabid($this->primarymodule); if($this->reporttype == "summary") { if(isset($this->groupbylist)) @@ -1322,7 +1442,6 @@ { $selectlist = $columnlist; } - //columns list if(isset($selectlist)) { @@ -1363,7 +1482,6 @@ } $reportquery = $this->getReportsQuery($this->primarymodule); - if($type == 'COLUMNSTOTOTAL') { if(trim($groupsquery) != "") @@ -1389,6 +1507,12 @@ $reportquery = "select ".$selectedcolumns." ".$reportquery." ".$wheresql; } } + if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) + { + $sec_parameter=getListViewSecurityParameter($this->primarymodule); + $reportquery .= $sec_parameter; + } + $log->info("ReportRun :: Successfully returned sGetSQLforReport".$reportid); return $reportquery; @@ -1415,14 +1539,25 @@ { $sSQL = $this->sGetSQLforReport($this->reportid,$filterlist); $result = $adb->query($sSQL); - $y=$adb->num_fields($result); if($result) { + $y=$adb->num_fields($result); + $arrayHeaders = Array(); for ($x=0; $x<$y; $x++) { $fld = $adb->field_name($result, $x); - $header .= "    		".$this->getLstringforReportHeaders($fld->name)."".$headerLabel."".$this->getLstringforReportHeaders($fld->name)."".$headerLabel."
    - - - -"; - echo "\n"; - echo "\n"; - echo ""; - echo "\n"; -} -else echo ""; -?> - - - - - - - - - -
    Change Password
    ".$mod_strings['LBL_OLD_PASSWORD']."
    -
    - - - - - - - -
    ' accessKey='' class='crmbutton small save' LANGUAGE=javascript onclick='if (set_password(this.form)) window.close(); else return false;' type='submit' name='button' value=' '>' accessyKey='' class='crmbutton small cancel' LANGUAGE=javascript onclick='window.close()' type='submit' name='button' value=' '>
    - -
    - + + + + +
    + + + + + + +"; + echo "\n"; + echo "\n"; + echo ""; + echo "\n"; +} +else echo ""; +?> + + + + + + + + + +
    ".$mod_strings['LBL_OLD_PASSWORD']."
    +
    + + + + + + + +
    ' accessKey='' class='crmbutton small save' LANGUAGE=javascript onclick='if (set_password(this.form)) window.close(); else return false;' type='submit' name='button' value=' '>' accessyKey='' class='crmbutton small cancel' LANGUAGE=javascript onclick='window.close()' type='submit' name='button' value=' '>
    +
    +
    + Modified: vtigercrm/branches/5.1_jens/modules/Users/CreateUserPrivilegeFile.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/CreateUserPrivilegeFile.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/CreateUserPrivilegeFile.php Mon Apr 16 12:27:44 2007 @@ -1359,7 +1359,9 @@ $code = 'array('; foreach ($var as $key => $value) { - if($i<$size) + //fix for signatue quote(') issue + $value=addslashes($value); + if($i<$size) { $code .= "'".$key."'=>'".$value."',"; } Modified: vtigercrm/branches/5.1_jens/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/DefaultDataPopulator.php Mon Apr 16 12:27:44 2007 @@ -55,33 +55,33 @@ $this->db->completeTransaction(); $this->db->startTransaction(); - $this->db->query("INSERT INTO vtiger_tab VALUES (3,'Home',0,1,'Home',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (7,'Leads',0,4,'Leads',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (6,'Accounts',0,5,'Accounts',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (4,'Contacts',0,6,'Contacts',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (2,'Potentials',0,7,'Potentials',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (8,'Notes',0,9,'Notes',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (9,'Calendar',0,3,'Calendar',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (10,'Emails',0,10,'Emails',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (13,'HelpDesk',0,11,'HelpDesk',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (14,'Products',0,8,'Products',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (1,'Dashboard',0,12,'Dashboards',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (15,'Faq',0,14,'Faq',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (16,'Events',2,13,'Events',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (18,'Vendors',0,15,'Vendors',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (19,'PriceBooks',0,16,'PriceBooks',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (20,'Quotes',0,17,'Quotes',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (21,'PurchaseOrder',0,18,'PurchaseOrder',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (22,'SalesOrder',0,19,'SalesOrder',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (23,'Invoice',0,20,'Invoice',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (24,'Rss',0,21,'Rss',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (25,'Reports',0,22,'Reports',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (26,'Campaigns',0,23,'Campaigns',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (27,'Portal',0,24,'Portal',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (29,'Users',0,26,'Users',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (30,'Organization',0,30,'Organization',null,null,1)"); - $this->db->query("INSERT INTO vtiger_tab VALUES (31,'OrgUnit',0,31,'OrgUnit',null,null,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (3,'Home',0,1,'Home',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (7,'Leads',0,4,'Leads',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (6,'Accounts',0,5,'Accounts',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (4,'Contacts',0,6,'Contacts',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (2,'Potentials',0,7,'Potentials',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (8,'Notes',0,9,'Notes',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (9,'Calendar',0,3,'Calendar',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (10,'Emails',0,10,'Emails',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (13,'HelpDesk',0,11,'HelpDesk',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (14,'Products',0,8,'Products',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (1,'Dashboard',0,12,'Dashboards',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (15,'Faq',0,14,'Faq',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (16,'Events',2,13,'Events',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (18,'Vendors',0,15,'Vendors',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (19,'PriceBooks',0,16,'PriceBooks',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (20,'Quotes',0,17,'Quotes',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (21,'PurchaseOrder',0,18,'PurchaseOrder',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (22,'SalesOrder',0,19,'SalesOrder',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (23,'Invoice',0,20,'Invoice',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (24,'Rss',0,21,'Rss',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (25,'Reports',0,22,'Reports',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (26,'Campaigns',0,23,'Campaigns',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (27,'Portal',0,24,'Portal',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (28,'Webmails',0,25,'Webmails',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (29,'Users',0,26,'Users',null,null,0,1)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (30,'Organization',0,30,'Organization',null,null,0,0)"); + $this->db->query("INSERT INTO vtiger_tab VALUES (31,'OrgUnit',0,31,'OrgUnit',null,null,0,0)"); $this->db->completeTransaction(); @@ -459,36 +459,38 @@ //Product Details -- START //Block31-36 -- Start + $this->db->query("INSERT INTO vtiger_field VALUES (14,".$this->db->getUniqueID("vtiger_field").",'quantity','vtiger_products2products_rel',1,'1','dependency_qty','LBL_QTY',1,0,0,3,0,33,1,'V~O',1,null,'DEP')"); + $this->db->query("INSERT INTO vtiger_field VALUES (14,".$this->db->getUniqueID("vtiger_field").",'product_relgroup','vtiger_products2products_rel',1,'1','dependency_grp','LBL_GRP',1,0,0,3,0,33,1,'V~O',1,null,'DEP')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productname','vtiger_products',1,'2','productname','Product Name',1,0,0,100,1,31,1,'V~M',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productcode','vtiger_products',1,'1','productcode','Product Code',1,0,0,100,2,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productcode','vtiger_products',1,'1','productcode','Part Number',1,0,0,100,2,31,1,'V~O',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'discontinued','vtiger_products',1,'56','discontinued','Product Active',1,0,0,100,3,31,1,'V~O',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'manufacturer','vtiger_products',1,'15','manufacturer','Manufacturer',1,0,0,100,4,31,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productcategory','vtiger_products',1,'15','productcategory','Product Category',1,0,0,100,4,31,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'sales_start_date','vtiger_products',1,'5','sales_start_date','Sales Start Date',1,0,0,100,5,31,1,'D~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'sales_end_date','vtiger_products',1,'5','sales_end_date','Sales End Date',1,0,0,100,6,31,1,'D~O~OTH~GE~sales_start_date~Sales Start Date',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'start_date','vtiger_products',1,'5','start_date','Support Start Date',1,0,0,100,7,31,1,'D~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'expiry_date','vtiger_products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,31,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')"); - - - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'crmid','vtiger_seproductsrel',1,'66','parent_id','Related To',1,0,0,100,10,31,1,'I~O',1,null,'BAS')"); - - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'contactid','vtiger_products',1,'57','contact_id','Contact Name',1,0,0,100,11,31,1,'I~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'website','vtiger_products',1,'17','website','Website',1,0,0,100,12,31,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'vendor_id','vtiger_products',1,'75','vendor_id','Vendor Name',1,0,0,100,13,31,1,'I~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'mfr_part_no','vtiger_products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,14,31,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'vendor_part_no','vtiger_products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,15,31,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'serialno','vtiger_products',1,'1','serial_no','Serial No',1,0,0,100,16,31,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productsheet','vtiger_products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'glacct','vtiger_products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productcategory','vtiger_products',1,'15','productcategory','Product Category',1,0,0,100,5,31,1,'V~O',1,null,'BAS')"); + $this->db->query("INSERT INTO vtiger_field VALUES ( 14, ".$this->db->getUniqueID("vtiger_field").", 'productclass','vtiger_products',1,'15','productclass','Product Class',1,0,0,100,6,31,1,'V~M',1,null,'BAS')"); + $this->db->query("INSERT INTO vtiger_field VALUES ( 14, ".$this->db->getUniqueID("vtiger_field").", 'producttype','vtiger_products',1,'15','producttype','Product Type',1,0,0,100,7,31,1,'V~M',1,null,'BAS')"); + $this->db->query("INSERT INTO vtiger_field VALUES ( 14, ".$this->db->getUniqueID("vtiger_field").", 'productvalidation','vtiger_products',1,'15','productvalidation','Product Validation',1,0,0,100,8,31,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'sales_start_date','vtiger_products',1,'5','sales_start_date','Sales Start Date',1,0,0,100,9,31,1,'D~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'sales_end_date','vtiger_products',1,'5','sales_end_date','Sales End Date',1,0,0,100,10,31,1,'D~O~OTH~GE~sales_start_date~Sales Start Date',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'start_date','vtiger_products',1,'5','start_date','Support Start Date',1,0,0,100,11,31,1,'D~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'expiry_date','vtiger_products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,12,31,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')"); + $this->db->query("INSERT INTO vtiger_field VALUES ( 14, ".$this->db->getUniqueID("vtiger_field").", 'contractbound','vtiger_products',1,'56','contractbound','Contract Bound',1,0,0,100,14,31,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'website','vtiger_products',1,'17','website','Website',1,0,0,100,16,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'vendor_id','vtiger_products',1,'75','vendor_id','Vendor Name',1,0,0,100,17,31,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'mfr_part_no','vtiger_products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,18,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'vendor_part_no','vtiger_products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,19,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'serialno','vtiger_products',1,'1','serial_no','Serial No',1,0,0,100,20,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productsheet','vtiger_products',1,'1','productsheet','Product Sheet',1,0,0,100,21,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'glacct','vtiger_products',1,'15','glacct','GL Account',1,0,0,100,22,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,23,31,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,24,31,2,'T~O',1,null,'BAS')"); //Block32 Pricing Information $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'unit_price','vtiger_products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'commissionrate','vtiger_products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'taxclass','vtiger_producttaxrel',1,'83','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'taxclass','vtiger_products',1,'83','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')"); //Block 33 stock info @@ -916,7 +918,8 @@ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'ADV')"); //Block74 $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'terms_conditions','vtiger_invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'ADV')"); - + //Added for Custom invoice Number + $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'invoice_no','vtiger_invoice',1,'1','invoice_no','invoice_no',1,0,0,100,3,69,1,'V~M',1,null,'BAS')"); //Invoice Details -- END //users Details Starts Block 79,80,81 @@ -995,26 +998,26 @@ //The Entity Name for the modules are maintained in this table - $this->db->query("insert into vtiger_entityname values(7,'Leads','vtiger_leaddetails','lastname,firstname','leadid')"); - $this->db->query("insert into vtiger_entityname values(6,'Accounts','vtiger_account','accountname','accountid')"); - $this->db->query("insert into vtiger_entityname values(4,'Contacts','vtiger_contactdetails','lastname,firstname','contactid')"); - $this->db->query("insert into vtiger_entityname values(2,'Potentials','vtiger_potential','potentialname','potentialid')"); - $this->db->query("insert into vtiger_entityname values(8,'Notes','vtiger_notes','title','notesid')"); - $this->db->query("insert into vtiger_entityname values(13,'HelpDesk','vtiger_troubletickets','title','ticketid')"); - $this->db->query("insert into vtiger_entityname values(9,'Calendar','vtiger_activity','subject','activityid')"); - $this->db->query("insert into vtiger_entityname values(10,'Emails','vtiger_activity','subject','activityid')"); - $this->db->query("insert into vtiger_entityname values(14,'Products','vtiger_products','productname','productid')"); - $this->db->query("insert into vtiger_entityname values(29,'Users','vtiger_users','last_name,first_name','id')"); - $this->db->query("insert into vtiger_entityname values(23,'Invoice','vtiger_invoice','subject','invoiceid')"); - $this->db->query("insert into vtiger_entityname values(20,'Quotes','vtiger_quotes','subject','quoteid')"); - $this->db->query("insert into vtiger_entityname values(21,'PurchaseOrder','vtiger_purchaseorder','subject','purchaseorderid')"); - $this->db->query("insert into vtiger_entityname values(22,'SalesOrder','vtiger_salesorder','subject','salesorderid')"); - $this->db->query("insert into vtiger_entityname values(18,'Vendors','vtiger_vendor','vendorname','vendorid')"); - $this->db->query("insert into vtiger_entityname values(19,'PriceBooks','vtiger_pricebook','bookname','pricebookid')"); - $this->db->query("insert into vtiger_entityname values(26,'Campaigns','vtiger_campaign','campaignname','campaignid')"); - $this->db->query("insert into vtiger_entityname values(15,'Faq','vtiger_faq','question','id')"); - $this->db->query("insert into vtiger_entityname values(30,'Organization','vtiger_organizationdetails','organizationname','organizationname')"); - $this->db->query("insert into vtiger_entityname values(31,'OrgUnit','vtiger_orgunit','name','orgunitid')"); + $this->db->query("insert into vtiger_entityname values(7,'Leads','vtiger_leaddetails','lastname,firstname','leadid','leadid')"); + $this->db->query("insert into vtiger_entityname values(6,'Accounts','vtiger_account','accountname','accountid','account_id')"); + $this->db->query("insert into vtiger_entityname values(4,'Contacts','vtiger_contactdetails','lastname,firstname','contactid','contact_id')"); + $this->db->query("insert into vtiger_entityname values(2,'Potentials','vtiger_potential','potentialname','potentialid','potential_id')"); + $this->db->query("insert into vtiger_entityname values(8,'Notes','vtiger_notes','title','notesid','notesid')"); + $this->db->query("insert into vtiger_entityname values(13,'HelpDesk','vtiger_troubletickets','title','ticketid','ticketid')"); + $this->db->query("insert into vtiger_entityname values(9,'Calendar','vtiger_activity','subject','activityid','activityid')"); + $this->db->query("insert into vtiger_entityname values(10,'Emails','vtiger_activity','subject','activityid','activityid')"); + $this->db->query("insert into vtiger_entityname values(14,'Products','vtiger_products','productname','productid','product_id')"); + $this->db->query("insert into vtiger_entityname values(29,'Users','vtiger_users','last_name,first_name','id','id')"); + $this->db->query("insert into vtiger_entityname values(23,'Invoice','vtiger_invoice','subject','invoiceid','invoiceid')"); + $this->db->query("insert into vtiger_entityname values(20,'Quotes','vtiger_quotes','subject','quoteid','quote_id')"); + $this->db->query("insert into vtiger_entityname values(21,'PurchaseOrder','vtiger_purchaseorder','subject','purchaseorderid','purchaseorderid')"); + $this->db->query("insert into vtiger_entityname values(22,'SalesOrder','vtiger_salesorder','subject','salesorderid','salesorder_id')"); + $this->db->query("insert into vtiger_entityname values(18,'Vendors','vtiger_vendor','vendorname','vendorid','vendor_id')"); + $this->db->query("insert into vtiger_entityname values(19,'PriceBooks','vtiger_pricebook','bookname','pricebookid','pricebookid')"); + $this->db->query("insert into vtiger_entityname values(26,'Campaigns','vtiger_campaign','campaignname','campaignid','campaignid')"); + $this->db->query("insert into vtiger_entityname values(15,'Faq','vtiger_faq','question','id','id')"); + $this->db->query("insert into vtiger_entityname values(30,'Organization','vtiger_organizationdetails','organizationname','organizationname','organizationname')"); + $this->db->query("insert into vtiger_entityname values(31,'OrgUnit','vtiger_orgunit','name','orgunitid','orgunitid')"); // Insert End @@ -1751,26 +1754,25 @@ //insert into related list vtiger_table //Inserting for vtiger_account related lists $this->db->startTransaction(); - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)"); - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)"); - - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Calendar").",'get_activities',3,'Activities',0)"); - - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)"); - - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Calendar").",'get_history',5,'Activity History',0)"); - - - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",0,'get_attachments',6,'Attachments',0)"); - - - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',7,'Quotes',0)"); - - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',8,'Invoice',0)"); - - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',9,'Sales Order',0)"); - + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',2,'Potentials',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',3,'Quotes',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',4,'Sales Order',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',5,'Invoice',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Calendar").",'get_activities',6,'Activities',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Calendar").",'get_history',7,'Activity History',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",0,'get_attachments',8,'Attachments',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',9,'HelpDesk',0)"); + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Products").",'get_products',10,'Products',0)"); //Inserting Lead Related Lists @@ -1847,6 +1849,14 @@ $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Invoice").",'get_invoices',7,'Invoice',0)"); $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("PriceBooks").",'get_product_pricebooks',8,'PriceBooks',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Leads").",'get_leads',9,'Leads',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Accounts").",'get_accounts',10,'Accounts',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Contacts").",'get_contacts',11,'Contacts',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Potentials").",'get_opportunities',12,'Potentials',0)"); //Inserting Emails Related Lists @@ -1953,41 +1963,41 @@ $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_notificationscheduler").",'LBL_ACTIVITY_REMINDER_DESCRIPTION' ,1,'Activity Reminder Notification','This is a reminder notification for the Activity','LBL_ACTIVITY_NOTIFICATION')"); //Inserting Inventory Notifications - $invoice_body = 'Dear {HANDLER}, - + $invoice_body = 'Dear {HANDLER},
    +
    The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. Kindly procure required number of units as the stock level is below reorder level {REORDERLEVELVALUE}. - +

    Please treat this information as Urgent as the invoice is already sent to the customer. - +

    Severity: Critical - -Thanks, +
    +Thanks,
    {CURRENTUSER}'; - - $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_inventorynotification").",'InvoiceNotification','{PRODUCTNAME} Stock Level is Low','".$invoice_body." ','InvoiceNotificationDescription')"); - - $quote_body = 'Dear {HANDLER}, + + $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_inventorynotification").",'InvoiceNotification','{PRODUCTNAME} Stock Level is Low','".$invoice_body." ','InvoiceNotificationDescription')"); + + $quote_body = 'Dear {HANDLER},

    Quote is generated for {QUOTEQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. - +

    Severity: Minor - -Thanks, +

    +Thanks,
    {CURRENTUSER}'; - - - $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_inventorynotification").",'QuoteNotification','Quote given for {PRODUCTNAME}','".$quote_body." ','QuoteNotificationDescription')"); - - $so_body = 'Dear {HANDLER}, - + + + $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_inventorynotification").",'QuoteNotification','Quote given for {PRODUCTNAME}','".$quote_body." ','QuoteNotificationDescription')"); + + $so_body = 'Dear {HANDLER}, +

    SalesOrder is generated for {SOQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. - +

    Please treat this information with priority as the sales order is already generated. - +

    Severity: Major - -Thanks, +

    +Thanks,
    {CURRENTUSER}'; @@ -2242,7 +2252,7 @@ $this->db->query("insert into vtiger_parenttab values (8,'Settings',8,0)"); $this->db->query("insert into vtiger_parenttabrel values (1,9,2)"); - $this->db->query("insert into vtiger_parenttabrel values (1,10,4)"); + $this->db->query("insert into vtiger_parenttabrel values (1,28,4)"); $this->db->query("insert into vtiger_parenttabrel values (1,3,1)"); $this->db->query("insert into vtiger_parenttabrel values (3,7,1)"); $this->db->query("insert into vtiger_parenttabrel values (3,6,2)"); @@ -2275,15 +2285,15 @@ $this->db->query("insert into vtiger_parenttabrel values (2,26,1)"); $this->db->query("insert into vtiger_parenttabrel values (2,6,2)"); $this->db->query("insert into vtiger_parenttabrel values (2,4,3)"); - $this->db->query("insert into vtiger_parenttabrel values (2,10,4)"); - $this->db->query("insert into vtiger_parenttabrel values (4,10,7)"); + $this->db->query("insert into vtiger_parenttabrel values (2,28,4)"); + $this->db->query("insert into vtiger_parenttabrel values (4,28,7)"); $this->db->query("insert into vtiger_parenttabrel values (2,7,5)"); $this->db->query("insert into vtiger_parenttabrel values (2,9,6)"); $this->db->query("insert into vtiger_parenttabrel values (4,9,8)"); $this->db->query("insert into vtiger_parenttabrel values (2,8,8)"); $this->db->query("insert into vtiger_parenttabrel values (3,9,11)"); $this->db->query("insert into vtiger_parenttabrel values (8,30,2)"); - $this->db->query("insert into vtiger_parenttabrel values (30,31,2)"); + $this->db->query("insert into vtiger_parenttabrel values (8,31,2)"); $this->db->completeTransaction(); //Added to populate the default inventory tax informations @@ -2313,6 +2323,41 @@ $this->db->query("alter table vtiger_inventoryshippingrel add column shtax$shserviceid decimal(7,3) default NULL"); $this->db->completeTransaction(); + + //Added to populate the default dependency and product classes + $this->db->startTransaction(); + $this->db->query("INSERT INTO vtiger_dependendlists VALUES (".$this->db->getUniqueID("vtiger_dependendlists").",14,'get_product_piecelist',1,'Piecelist',0)"); + $this->db->query("INSERT INTO vtiger_dependendlists VALUES (".$this->db->getUniqueID("vtiger_dependendlists").",14,'get_product_depends',2,'Dependencies',0)"); + $this->db->query("INSERT INTO vtiger_dependendlists VALUES (".$this->db->getUniqueID("vtiger_dependendlists").",14,'get_product_incompatibles',3,'Incompatibles',0)"); + $this->db->query("INSERT INTO vtiger_dependendlists VALUES (".$this->db->getUniqueID("vtiger_dependendlists").",14,'get_product_options',4,'Options',0)"); + $this->db->query("INSERT INTO vtiger_dependendlists VALUES (".$this->db->getUniqueID("vtiger_dependendlists").",14,'get_product_purchaselist',5,'Purchaselist',0)"); + + $this->db->query("INSERT into vtiger_productclass VALUES ( ".$this->db->getUniqueID("vtiger_productclass").", 'Sales', 0, 1)"); + $this->db->query("INSERT into vtiger_productclass VALUES ( ".$this->db->getUniqueID("vtiger_productclass").", 'Purchase', 0, 1)"); + + $this->db->query("INSERT into vtiger_producttype VALUES ( ".$this->db->getUniqueID("vtiger_producttype").", 'One time fixed', 0, 1)"); + $this->db->query("INSERT into vtiger_producttype VALUES ( ".$this->db->getUniqueID("vtiger_producttype").", 'Periodically fixed', 10, 1)"); + $this->db->query("INSERT into vtiger_producttype VALUES ( ".$this->db->getUniqueID("vtiger_producttype").", 'Rental', 20, 1)"); + $this->db->query("INSERT into vtiger_producttype VALUES ( ".$this->db->getUniqueID("vtiger_producttype").", 'Contingent Accounting', 30, 1)"); + $this->db->query("INSERT into vtiger_producttype VALUES ( ".$this->db->getUniqueID("vtiger_producttype").", 'Usage Accouting', 31, 1)"); + $this->db->query("INSERT into vtiger_producttype VALUES ( ".$this->db->getUniqueID("vtiger_producttype").", 'Manually', 98, 1)"); + $this->db->query("INSERT into vtiger_producttype VALUES ( ".$this->db->getUniqueID("vtiger_producttype").", 'Free of charge', 99, 1)"); + + $this->db->query("INSERT into vtiger_productvalidation VALUES ( ".$this->db->getUniqueID("vtiger_productvalidation").", 'On delivery', 0, 1)"); + $this->db->query("INSERT into vtiger_productvalidation VALUES ( ".$this->db->getUniqueID("vtiger_productvalidation").", 'On demand', 0, 1)"); + $this->db->query("INSERT into vtiger_productvalidation VALUES ( ".$this->db->getUniqueID("vtiger_productvalidation").", 'Per day', 0, 1)"); + $this->db->query("INSERT into vtiger_productvalidation VALUES ( ".$this->db->getUniqueID("vtiger_productvalidation").", 'Per week', 0, 1)"); + $this->db->query("INSERT into vtiger_productvalidation VALUES ( ".$this->db->getUniqueID("vtiger_productvalidation").", 'Per month', 0, 1)"); + $this->db->query("INSERT into vtiger_productvalidation VALUES ( ".$this->db->getUniqueID("vtiger_productvalidation").", 'Per quarter', 0, 1)"); + $this->db->query("INSERT into vtiger_productvalidation VALUES ( ".$this->db->getUniqueID("vtiger_productvalidation").", 'Per year', 0, 1)"); + $this->db->query("INSERT into vtiger_productvalidation VALUES ( ".$this->db->getUniqueID("vtiger_productvalidation").", 'Never', 0, 1)"); + + $this->db->completeTransaction(); + + //version file is included here because without including this + //file version cannot be get + include('vtigerversion.php'); + $this->db->query("insert into vtiger_version values(0,'".$vtiger_current_version."','".$vtiger_current_version."')"); } } ?> Modified: vtigercrm/branches/5.1_jens/modules/Users/DeleteGroup.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/DeleteGroup.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/DeleteGroup.php Mon Apr 16 12:27:44 2007 @@ -33,5 +33,5 @@ deleteGroup($del_id,$transferId,$transferType); -header("Location: index.php?action=listgroups&module=Users&parenttab=Settings"); +header("Location: index.php?action=listgroups&module=Settings&parenttab=Settings"); ?> Modified: vtigercrm/branches/5.1_jens/modules/Users/DeleteProfile.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/DeleteProfile.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/DeleteProfile.php Mon Apr 16 12:27:44 2007 @@ -14,5 +14,5 @@ $tran_id = $_REQUEST['transfer_prof_id']; //Deleting the Profile deleteProfile($del_id,$tran_id); -header("Location: index.php?module=Users&action=ListProfiles&parenttab=Settings"); +header("Location: index.php?module=Settings&action=ListProfiles&parenttab=Settings"); ?> Modified: vtigercrm/branches/5.1_jens/modules/Users/DeleteRole.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/DeleteRole.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/DeleteRole.php Mon Apr 16 12:27:44 2007 @@ -15,5 +15,5 @@ deleteRole($del_id,$tran_id); -header("Location: index.php?action=listroles&module=Users"); +header("Location: index.php?action=listroles&module=Settings"); ?> Modified: vtigercrm/branches/5.1_jens/modules/Users/DeleteSharingRule.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/DeleteSharingRule.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/DeleteSharingRule.php Mon Apr 16 12:27:44 2007 @@ -13,5 +13,5 @@ $shareid = $_REQUEST['shareid']; deleteSharingRule($shareid); -header("Location: index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings"); +header("Location: index.php?module=Settings&action=OrgSharingDetailView&parenttab=Settings"); ?> Modified: vtigercrm/branches/5.1_jens/modules/Users/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/DetailView.php Mon Apr 16 12:27:44 2007 @@ -1,205 +1,247 @@ -retrieve_entity_info($_REQUEST['record'],'Users'); - $focus->id = $_REQUEST['record']; -} -else -{ - - echo " - - "; -} - -if( $focus->user_name == "" ) -{ - - echo " - - - - - - - -
    - User does not exist. -
    - List Users -
    - "; - exit; -} - - -if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { - $focus->id = ""; -} - -global $theme; -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; -require_once($theme_path.'layout_utils.php'); - -//the user might belong to multiple groups -$log->info("User detail view"); - -$category = getParenttab(); - -$smarty = new vtigerCRM_Smarty; - -$smarty->assign("UMOD", $mod_strings); -global $current_language; -$smod_strings = return_module_language($current_language, 'Settings'); -$smarty->assign("MOD", $smod_strings); - -$smarty->assign("APP", $app_strings); - -$oGetUserGroups = new GetUserGroups(); -$oGetUserGroups->getAllUserGroups($focus->id); - - -$smarty->assign("GROUP_COUNT",count($oGetUserGroups->user_groups)); -$smarty->assign("THEME", $theme); -$smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); -$smarty->assign("ID", $focus->id); -$smarty->assign("CATEGORY", $category); -if(isset($focus->imagename) && $focus->imagename!='') -{ - $imagestring="
    -
    -
    - - -
    -

    "; - //$smarty->assign("USER_IMAGE",$imagestring); -} - -if(isset($_REQUEST['modechk']) && $_REQUEST['modechk'] != '' ) -{ - $modepref = $_REQUEST['modechk']; -} - if($_REQUEST['modechk'] == 'prefview') - $parenttab = ''; - else - $parenttab = 'Settings'; - -$smarty->assign("PARENTTAB", $parenttab); - -if ((is_admin($current_user) || $_REQUEST['record'] == $current_user->id) - && isset($default_user_name) - && $default_user_name == $focus->user_name - && isset($lock_default_user_name) - && $lock_default_user_name == true ) { - $buttons = ""; - $smarty->assign('EDIT_BUTTON',$buttons); -} -elseif (is_admin($current_user) || $_REQUEST['record'] == $current_user->id) { - $buttons = ""; - $smarty->assign('EDIT_BUTTON',$buttons); - - $buttons = ""; - $smarty->assign('CHANGE_PW_BUTTON',$buttons); - - -} -if (is_admin($current_user)) -{ - $buttons = ""; - $smarty->assign('DUPLICATE_BUTTON',$buttons); - - //done so that only the admin user can see the customize tab button - if($_REQUEST['record'] != $current_user->id) - { - $buttons = "id')\" type='button' name='Delete' value=' ".$app_strings['LBL_DELETE_BUTTON_LABEL']." '>"; - $smarty->assign('DELETE_BUTTON',$buttons); - } - - if($_SESSION['authenticated_user_roleid'] == 'administrator') - { - $buttons = ""; - $smarty->assign('LISTROLES_BUTTON',$buttons); - } - -} - -if(is_admin($current_user)) - $smarty->assign("IS_ADMIN", true); -else - $smarty->assign("IS_ADMIN", false); - -$lead_tables = Array('vtiger_users','vtiger_user2role'); -$tabid = getTabid("Users"); -$validationData = getDBValidationData($lead_tables,$tabid); -$data = split_validationdataArray($validationData); - -$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); -$smarty->assign("MODULE", 'Users'); -$smarty->assign("CURRENT_USERID", $current_user->id); -$smarty->assign("HOMEORDER",$focus->getHomeOrder($focus->id)); -$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields)); -$smarty->assign("USERNAME",$focus->last_name.' '.$focus->first_name); - - -//Organization assignment -$crmid=$focus->id; -require('modules/Users/GetUserOrg.php'); - -//Assign the organization details to the html output -$smarty->assign("MULTISELECT_COMBO_BOX_ITEM_SEPARATOR_STRING", $org_separator); -$smarty->assign("ALL_USER_ORGANIZATIONS", $smarty_allorgs); -$smarty->assign("EDIT_USER_ORGANIZATIONS", $smarty_orgs); -$smarty->assign("EDIT_USER_ORGUNITS", $smarty_orgunits); -$smarty->assign("EDIT_USER_PRIMARY_ORGANIZATION", $curorg); -$smarty->assign("EDIT_USER_ASSIGNED_ORGANIZATIONS", $assigned_org); -$smarty->assign("EDIT_USER_PRIMARY_ORGUNITS", $prim_orgunits); - -$smarty->display("UserDetailView.tpl"); - - -?> +retrieve_entity_info($_REQUEST['record'],'Users'); + $focus->id = $_REQUEST['record']; +} +else +{ + + echo " + + "; +} + +if( $focus->user_name == "" ) +{ + + if(is_admin($current_user)) + { + echo " + + + + "; + + echo " + + + +
    + User does not exist. +
    + List Users +
    + "; + exit; + } + +} + + +if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { + $focus->id = ""; +} + +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; +require_once($theme_path.'layout_utils.php'); + +//the user might belong to multiple groups +$log->info("User detail view"); + +$category = getParenttab(); + +$smarty = new vtigerCRM_Smarty; + +$smarty->assign("UMOD", $mod_strings); +global $current_language; +$smod_strings = return_module_language($current_language, 'Settings'); +$smarty->assign("MOD", $smod_strings); + +$smarty->assign("APP", $app_strings); + +$oGetUserGroups = new GetUserGroups(); +$oGetUserGroups->getAllUserGroups($focus->id); + + +$smarty->assign("GROUP_COUNT",count($oGetUserGroups->user_groups)); +$smarty->assign("THEME", $theme); +$smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); +$smarty->assign("ID", $focus->id); +$smarty->assign("CATEGORY", $category); +if(isset($focus->imagename) && $focus->imagename!='') +{ + $imagestring="
    +
    +
    + + +
    +

    "; + //$smarty->assign("USER_IMAGE",$imagestring); +} + +if(isset($_REQUEST['modechk']) && $_REQUEST['modechk'] != '' ) +{ + $modepref = $_REQUEST['modechk']; +} + if($_REQUEST['modechk'] == 'prefview') + $parenttab = ''; + else + $parenttab = 'Settings'; + +$smarty->assign("PARENTTAB", $parenttab); + +if ((is_admin($current_user) || $_REQUEST['record'] == $current_user->id) + && isset($default_user_name) + && $default_user_name == $focus->user_name + && isset($lock_default_user_name) + && $lock_default_user_name == true ) { + $buttons = ""; + $smarty->assign('EDIT_BUTTON',$buttons); +} +elseif (is_admin($current_user) || $_REQUEST['record'] == $current_user->id) { + $buttons = ""; + $smarty->assign('EDIT_BUTTON',$buttons); + + $buttons = ""; + $smarty->assign('CHANGE_PW_BUTTON',$buttons); + + +} +if (is_admin($current_user)) +{ + $buttons = ""; + $smarty->assign('DUPLICATE_BUTTON',$buttons); + + //done so that only the admin user can see the customize tab button + if($_REQUEST['record'] != $current_user->id) + { + $buttons = "id')\" type='button' name='Delete' value=' ".$app_strings['LBL_DELETE_BUTTON_LABEL']." '>"; + $smarty->assign('DELETE_BUTTON',$buttons); + } + + if($_SESSION['authenticated_user_roleid'] == 'administrator') + { + $buttons = ""; + $smarty->assign('LISTROLES_BUTTON',$buttons); + } + +} + +if(is_admin($current_user)) + $smarty->assign("IS_ADMIN", true); +else + $smarty->assign("IS_ADMIN", false); + +$lead_tables = Array('vtiger_users','vtiger_user2role'); +$tabid = getTabid("Users"); +$validationData = getDBValidationData($lead_tables,$tabid); +$data = split_validationdataArray($validationData); + +if($current_user->id == $_REQUEST['record'] || is_admin($current_user) == true) +{ +$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); +$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); +$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); +$smarty->assign("MODULE", 'Users'); +$smarty->assign("CURRENT_USERID", $current_user->id); +$smarty->assign("HOMEORDER",$focus->getHomeOrder($focus->id)); +$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields)); +$smarty->assign("USERNAME",$focus->last_name.' '.$focus->first_name); + +//for check audittrail if it is enable or not +$smarty->assign("AUDITTRAIL",$audit_trail); + +//Organization assignment +$crmid=$focus->id; +require('modules/Users/GetUserOrg.php'); + +//Assign the organization details to the html output +$smarty->assign("MULTISELECT_COMBO_BOX_ITEM_SEPARATOR_STRING", $org_separator); +$smarty->assign("ALL_USER_ORGANIZATIONS", $smarty_allorgs); +$smarty->assign("EDIT_USER_ORGANIZATIONS", $smarty_orgs); +$smarty->assign("EDIT_USER_ORGUNITS", $smarty_orgunits); +$smarty->assign("EDIT_USER_PRIMARY_ORGANIZATION", $curorg); +$smarty->assign("EDIT_USER_ASSIGNED_ORGANIZATIONS", $assigned_org); +$smarty->assign("EDIT_USER_PRIMARY_ORGUNITS", $prim_orgunits); + +$smarty->display("UserDetailView.tpl"); +} +else +{ + $output = ' + +
    +
    + + + + + + + + +
    + + + '.$app_strings["LBL_PERMISSION"].' + +
    + '.$app_strings["LBL_GO_BACK"].' +
    +
    +
    +
    '; + echo $output; +} + + + +?> Modified: vtigercrm/branches/5.1_jens/modules/Users/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/EditView.php Mon Apr 16 12:27:44 2007 @@ -42,7 +42,7 @@ $smarty->assign("ID",$_REQUEST['record']); $mode='edit'; if (!is_admin($current_user) && $_REQUEST['record'] != $current_user->id) die ("Unauthorized access to user administration."); - $focus->retrieve_entity_info($_REQUEST['record'],'Users'); + $focus->retrieve_entity_info($_REQUEST['record'],'Users'); $smarty->assign("USERNAME",$focus->last_name.' '.$focus->first_name); }else { @@ -58,11 +58,6 @@ $focus->column_fields['user_password']=''; $focus->column_fields['confirm_password']=''; } - -if(is_admin($current_user)) - $smarty->assign("IS_ADMIN", true); -else - $smarty->assign("IS_ADMIN", false); global $theme; $theme_path="themes/".$theme."/"; @@ -115,56 +110,9 @@ } $smarty->assign("HOMEORDER",$focus->getHomeOrder($focus->id)); +$smarty->assign("DUPLICATE",$_REQUEST['isDuplicate']); + $smarty->assign('PARENTTAB',$_REQUEST['parenttab']); - -//Organization assignment -if( $mode == "create" ) { - $orgs = array(); - $smarty_orgs = array($orgs); - - //all organizations - $sql = "SELECT organizationname FROM vtiger_organizationdetails WHERE deleted=0"; - $result = $adb->query($sql); - $allorgs = array(); - while($org_result = $adb->fetch_array($result)) { - $key = $org_result["organizationname"]; - $allorgs[$key] = ''; - } - $smarty_allorgs = array($allorgs); - - //Organization untis - $orgunits = array(); - $smarty_orgunits = array($orgunits); - - //The remaining field are intentially left blank - $curorg = ""; - $assigned_org = ""; - $prim_orgunits = ""; - $org_separator = "
     "; - - //Set up session variables - $_SESSION['all_user_organizations'] = $smarty_allorgs; - $_SESSION['edit_user_organizations'] = $smarty_orgs; - $_SESSION['edit_user_orgunits'] = $smarty_orgunits; - $_SESSION['edit_user_primary_organization'] = $curorg; - $_SESSION['edit_user_assigned_organization'] = $assigned_org; - $_SESSION['edit_user_primary_orgunits'] = $prim_orgunits; -} - -//In case of edit mode use the predefined gathering fuction -else { - $crmid = $focus->id; - require('modules/Users/GetUserOrg.php'); -} - -//Assign the organization details to the html output -$smarty->assign("MULTISELECT_COMBO_BOX_ITEM_SEPARATOR_STRING", $org_separator); -$smarty->assign("ALL_USER_ORGANIZATIONS", $smarty_allorgs); -$smarty->assign("EDIT_USER_ORGANIZATIONS", $smarty_orgs); -$smarty->assign("EDIT_USER_ORGUNITS", $smarty_orgunits); -$smarty->assign("EDIT_USER_PRIMARY_ORGANIZATION", $curorg); -$smarty->assign("EDIT_USER_ASSIGNED_ORGANIZATIONS", $assigned_org); -$smarty->assign("EDIT_USER_PRIMARY_ORGUNITS", $prim_orgunits); $smarty->display('UserEditView.tpl'); Modified: vtigercrm/branches/5.1_jens/modules/Users/Forms.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/Forms.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/Forms.php Mon Apr 16 12:27:44 2007 @@ -40,6 +40,11 @@ $lbl_user_email1 = $mod_strings['LBL_LIST_EMAIL']; $err_missing_required_fields = $app_strings['ERR_MISSING_REQUIRED_FIELDS']; $err_invalid_email_address = $app_strings['ERR_INVALID_EMAIL_ADDRESS']; +$lbl_user_image=$mod_strings['User Image']; +$the_emailid = $app_strings['THE_EMAILID']; +$email_field_is = $app_strings['EMAIL_FILED_IS'].$err_invalid_email_address; +$other_email_field_is = $app_strings['OTHER_EMAIL_FILED_IS'].$err_invalid_email_address; +$yahoo_email_field_is = $app_strings['YAHOO_EMAIL_FILED_IS'].$err_invalid_email_address; $the_script = << - - - - - -
    '.$mod_strings['LBL_DELETE_GROUP'].''.$app_strings[
    - - - - -
    - - - - - - - - - -
    '.$mod_strings['LBL_DELETE_GROUPNAME'].''.$delete_group_name.'
    '.$mod_strings['LBL_TRANSFER_GROUP'].''; - global $adb; - $sql = "select groupid,groupname from vtiger_groups"; - $result = $adb->query($sql); - $num_groups = $adb->num_rows($result); - - $sql1 = "select id,user_name from vtiger_users where deleted=0"; - $result1= $adb->query($sql1); - $num_users = $adb->num_rows($result1); - - - $output.= ' User'; - if($num_groups > 1) - { - $output .= ' Group'; - } - - $output .= ''; - - $output .= ''; - - if($num_groups > 1) - { - $output .= ''; - } - - $output.='
    -
    - - - - -
    -
    -
    '; - -echo $output; -?> + +
    + + + + + + + + +
    '.$mod_strings['LBL_DELETE_GROUP'].''.$app_strings[
    + + + + +
    + + + + + + + + + +
    '.$mod_strings['LBL_DELETE_GROUPNAME'].''.$delete_group_name.'
    '.$mod_strings['LBL_TRANSFER_GROUP'].''; + global $adb; + $sql = "select groupid,groupname from vtiger_groups"; + $result = $adb->query($sql); + $num_groups = $adb->num_rows($result); + + $sql1 = "select id,user_name from vtiger_users where deleted=0"; + $result1= $adb->query($sql1); + $num_users = $adb->num_rows($result1); + + + $output.= ' User'; + if($num_groups > 1) + { + $output .= ' Group'; + } + + $output .= ''; + + $output .= ''; + + if($num_groups > 1) + { + $output .= ''; + } + + $output.='
    +
    + + + + +
    +
    +
    '; + +echo $output; +?> Modified: vtigercrm/branches/5.1_jens/modules/Users/Login.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/Login.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/Login.php Mon Apr 16 12:27:44 2007 @@ -86,95 +86,76 @@ +

    +
    + + + + +
    + + + + + + + + smcreatorid - - - smownerid - - - modifiedby - - - deleted - smownerid - - - smownerid - deleted - - Type=InnoDB -
    vtiger CRMThe honest Open Source CRM
    - - - ","","","",""); +$search_fields = Array("SUBJECT","BODY","TO","CC","BCC","FROM"); +$listview_header = array("","","","",""); $listview_entries = array(); $displayed_msgs=0; $new_msgs=0; -if(($numEmails-1) <= 0) - $listview_entries[0][] = ''; +if(($numEmails) <= 0) + $listview_entries[0][] = ''; else { -if(isset($_REQUEST["search"])) { - $searchstring = $_REQUEST["search_type"].' "'.$_REQUEST["search_input"].'"'; - //echo $searchstring."
    "; - $searchlist = imap_search($MailBox->mbox,$searchstring); - if($searchlist === false) - echo "The search failed"; - - $num_searches = count($searchlist); - - //print_r($searchlist); - $c=$numEmails; -} - -flush(); - -// MAIN LOOP -// Main loop to create listview entries -$i=1; -while ($i<$c) { - if(is_array($searchlist)) { - for($l=0;$l<$num_searches;$l++) { - if($mails[$start_message]->msgno == $searchlist[$l]) + if(isset($_REQUEST["search"]) && trim($_REQUEST["search_input"]) != '') { + $searchstring = $_REQUEST["search_type"].' "'.$_REQUEST["search_input"].'"'; + //echo $searchstring."
    "; + $searchlist = Array(); + $searchlist = imap_search($MailBox->mbox,$searchstring); + + if(is_array($searchlist)) + { + $num_searches = count($searchlist); + $c=$numEmails; + } + + while ($i<=$c) { + if(is_array($searchlist)) { + for($l=0;$l<$num_searches;$l++) { + if($mails[$start_message]->msgno == $searchlist[$l]) + $listview_entries[] = show_msg($mails,$start_message); + } + } + $i++; + $start_message--; + } + }else + { + $i=1; + while ($i<=$c) { + if($start_message > 0) + { $listview_entries[] = show_msg($mails,$start_message); - } - } else { - $listview_entries[] = show_msg($mails,$start_message); - if($displayed_msgs == $MailBox->mails_per_page) {break;} - } - $i++; - $start_message--; -} -} + if($displayed_msgs == $MailBox->mails_per_page) {break;} + } + $i++; + $start_message--; + } + + } + + flush(); + // MAIN LOOP + // Main loop to create listview entries + +} + +$search_html = ''; // Build folder list and move_to dropdown box $list = imap_getmailboxes($MailBox->mbox, "{".$MailBox->imapServerAddress."}", "*"); sort($list); $i=0; if (is_array($list)) { - $boxes = ''; + $boxes .= ''; + foreach ($list as $key => $val) { $tmpval = preg_replace(array("/\{.*?\}/i"),array(""),$val->name); if(preg_match("/trash/i",$tmpval)) $img = "webmail_trash.gif"; elseif(preg_match("/sent/i",$tmpval)) - $img = "webmail_uparrow.gif"; + $img = "emailOutFolder.gif"; else - $img = "webmail_downarrow.gif"; + $img = "emailInFolder.gif"; $i++; + if($_REQUEST["mailbox"] == '') + $_REQUEST["mailbox"] = 'INBOX'; + if ($_REQUEST["mailbox"] == $tmpval) { - $boxes .= '"; - if ($mails[$start_message]->deleted) { - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; - } elseif(!$mails[$start_message]->seen || $mails[$start_message]->recent) { - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; - } else { - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; - } + if ($mails[$start_message]->deleted) + { + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + } + elseif(!$mails[$start_message]->seen || $mails[$start_message]->recent) + { + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + } + else + { + //IMPORTANT - This UTF-8 conversion has been done in ListView.php so no need to do again here + //Added to shown the original UTF-8 characters - Mickie - 30-11-06 - Starts + //we can use the option 1 or option 2 + //Option 1 - Starts + /* + $translated_subject = imap_mime_header_decode($mails[$start_message]->subject); + for($i=0;$icharset != 'default') + { + $tmp .= $translated_subject[$i]->text; + $mails[$start_message]->subject = utf8_decode($tmp);//$tmp; + } + } + //Option 1 - Ends + */ + //Option 2 - Starts + //$mails[$start_message]->subject = utf8_decode(imap_utf8($mails[$start_message]->subject));//imap_utf8($mails[$start_message]->subject); + //Option 2 - Ends + //Added to shown the original UTF-8 characters - Mickie - 30-11-06 - Ends + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + } + + + if($mails[$start_message]->deleted) - $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; else - $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + return $listview_entries[$num]; } Modified: vtigercrm/branches/5.1_jens/modules/Webmails/Save.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Webmails/Save.php (original) +++ vtigercrm/branches/5.1_jens/modules/Webmails/Save.php Mon Apr 16 12:27:44 2007 @@ -1,130 +1,130 @@ -mbox, $_REQUEST["mailid"]); -$subject = $email->subject; -$date = $email->date; - -$email->loadMail(); -$msgData = $email->body; - -$focus->column_fields['subject']=$subject; -$focus->column_fields["activitytype"]="Emails"; - -$ddate = date("Y-m-d"); -$dtime = date("h:m"); -$focus->column_fields["assigned_user_id"]=$current_user->id; -$focus->column_fields["date_start"]=$ddate; -$focus->column_fields["time_start"]=$dtime; - -//$tmpBody = preg_replace(array('//i',"/>/i","/</i","/ /i","/&/i","/©/i","/(.*?)<\/style>/i","/\{(.*?)\}/i","/BODY/i"),array("\r",">","<"," ","&","(c)","","",""),$msgData); -//$focus->column_fields["description"]=strip_tags($tmpBody); -$focus->column_fields["description"]=$msgData; - - -//to save the email details in vtiger_emaildetails vtiger_tables -$fieldid = $adb->query_result($adb->query('select fieldid from vtiger_field where tablename="contactdetails" and fieldname="email" and columnname="email"'),0,'fieldid'); - -if($email->relationship != 0) { - $focus->column_fields['parent_id']=$email->relationship["id"].'@'.$fieldid.'|'; - - if($email->relationship["type"] == "Contacts") - add_attachment_to_contact($email->relationship["id"],$email); -}else { - //if relationship is not available create a contact and relate the email to the contact - require_once('modules/Contacts/Contacts.php'); - $contact_focus = new Contacts(); - $contact_focus->column_fields['lastname'] =$email->fromname; - $contact_focus->column_fields['email'] = $email->from; - $contact_focus->save("Contacts"); - $focus->column_fields['parent_id']=$contact_focus->id.'@'.$fieldid.'|'; - - add_attachment_to_contact($contact_focus->id,$email); -} - -function add_attachment_to_contact($cid,$email) { - // add vtiger_attachments to contact - global $adb,$current_user; - for($j=0;$j<2;$j++) { - if($j==0) - $attachments=$email->downloadAttachments(); - else - $attachments=$email->downloadInlineAttachments(); - - $upload_filepath = decideFilePath(); - for($i=0,$num_files=count($attachments);$i<$num_files;$i++) { - $current_id = $adb->getUniqueID("vtiger_crmentity"); - $date_var = $adb->formatDate(date('YmdHis')); - - $filename = ereg_replace("[ ()-]+", "_",$attachments[$i]["filename"]); - $filetype= substr($filename,strstr($filename,"."),strlen($filename)); - $filesize = $attachments[$i]["filesize"]; - - $query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('"; - $query .= $current_id."','".$current_user->id."','".$current_user->id."','Contacts Attachment','Uploaded from webmail during qualification',".$date_var.")"; - $result = $adb->query($query); - - $sql = "insert into vtiger_attachments values("; - $sql .= $current_id.",'".$filename."','Uploaded ".$filename." from webmail','".$filetype."','".$upload_filepath."')"; - echo $query; - $result = $adb->query($sql); - - $sql1 = "insert into vtiger_seattachmentsrel values('"; - $sql1 .= $cid."','".$current_id."')"; - $result = $adb->query($sql1); - - $fp = fopen($upload_filepath.'/'.$filename, "w") or die("Can't open file"); - fputs($fp, base64_decode($attachments[$i]["filedata"])); - fclose($fp); - } - } -} - -$_REQUEST['parent_id'] = $focus->column_fields['parent_id']; -$focus->save("Emails"); - -//saving in vtiger_emaildetails vtiger_table -$id_lists = $focus->column_fields['parent_id'].'@'.$fieldid; -$all_to_ids = $email->from; -$query = 'insert into vtiger_emaildetails values ('.$focus->id.',"","'.$all_to_ids.'","","","","'.$id_lists.'","WEBMAIL")'; -$adb->query($query); - -$return_id = $_REQUEST["mailid"]; -$return_module='Webmails'; -$return_action='ListView'; - - -if($_POST["ajax"] != "true") - header("Location: index.php?action=$return_action&module=$return_module&record=$return_id"); - -return; -?> +mbox, $_REQUEST["mailid"]); +$subject = $email->subject; +$date = $email->date; +$array_tab = Array(); +$email->loadMail($array_tab); +$msgData = $email->body; + +$focus->column_fields['subject']=$subject; +$focus->column_fields["activitytype"]="Emails"; + +$ddate = date("Y-m-d"); +$dtime = date("h:m"); +$focus->column_fields["assigned_user_id"]=$current_user->id; +$focus->column_fields["date_start"]=$ddate; +$focus->column_fields["time_start"]=$dtime; + +//$tmpBody = preg_replace(array('//i',"/>/i","/</i","/ /i","/&/i","/©/i","/(.*?)<\/style>/i","/\{(.*?)\}/i","/BODY/i"),array("\r",">","<"," ","&","(c)","","",""),$msgData); +//$focus->column_fields["description"]=strip_tags($tmpBody); +$focus->column_fields["description"]=$msgData; + + +//to save the email details in vtiger_emaildetails vtiger_tables +$fieldid = $adb->query_result($adb->query('select fieldid from vtiger_field where tablename="contactdetails" and fieldname="email" and columnname="email"'),0,'fieldid'); + +if(count($email->relationship) != 0) { + $focus->column_fields['parent_id']=$email->relationship["id"].'@'.$fieldid.'|'; + + if($email->relationship["type"] == "Contacts") + add_attachment_to_contact($email->relationship["id"],$email); +}else { + //if relationship is not available create a contact and relate the email to the contact + require_once('modules/Contacts/Contacts.php'); + $contact_focus = new Contacts(); + $contact_focus->column_fields['lastname'] =$email->fromname; + $contact_focus->column_fields['email'] = $email->from; + $contact_focus->save("Contacts"); + $focus->column_fields['parent_id']=$contact_focus->id.'@'.$fieldid.'|'; + + add_attachment_to_contact($contact_focus->id,$email); +} + +function add_attachment_to_contact($cid,$email) { + // add vtiger_attachments to contact + global $adb,$current_user; + for($j=0;$j<2;$j++) { + if($j==0) + $attachments=$email->downloadAttachments(); + else + $attachments=$email->downloadInlineAttachments(); + + $upload_filepath = decideFilePath(); + for($i=0,$num_files=count($attachments);$i<$num_files;$i++) { + $current_id = $adb->getUniqueID("vtiger_crmentity"); + $date_var = $adb->formatDate(date('YmdHis')); + + $filename = ereg_replace("[ ()-]+", "_",$attachments[$i]["filename"]); + $filetype= substr($filename,strstr($filename,"."),strlen($filename)); + $filesize = $attachments[$i]["filesize"]; + + $query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('"; + $query .= $current_id."','".$current_user->id."','".$current_user->id."','Contacts Attachment','Uploaded from webmail during qualification',".$date_var.")"; + $result = $adb->query($query); + + $sql = "insert into vtiger_attachments values("; + $sql .= $current_id.",'".$filename."','Uploaded ".$filename." from webmail','".$filetype."','".$upload_filepath."')"; + echo $query; + $result = $adb->query($sql); + + $sql1 = "insert into vtiger_seattachmentsrel values('"; + $sql1 .= $cid."','".$current_id."')"; + $result = $adb->query($sql1); + + $fp = fopen($upload_filepath.'/'.$filename, "w") or die("Can't open file"); + fputs($fp, base64_decode($attachments[$i]["filedata"])); + fclose($fp); + } + } +} + +$_REQUEST['parent_id'] = $focus->column_fields['parent_id']; +$focus->save("Emails"); + +//saving in vtiger_emaildetails vtiger_table +$id_lists = $focus->column_fields['parent_id'].'@'.$fieldid; +$all_to_ids = $email->from; +$query = 'insert into vtiger_emaildetails values ('.$focus->id.',"","'.$all_to_ids.'","","","","'.$id_lists.'","WEBMAIL")'; +$adb->query($query); + +$return_id = $_REQUEST["mailid"]; +$return_module='Webmails'; +$return_action='ListView'; + + +if($_POST["ajax"] != "true") + header("Location: index.php?action=$return_action&module=$return_module&record=$return_id"); + +return; +?> Modified: vtigercrm/branches/5.1_jens/modules/Webmails/WebmailsAjax.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Webmails/WebmailsAjax.php (original) +++ vtigercrm/branches/5.1_jens/modules/Webmails/WebmailsAjax.php Mon Apr 16 12:27:44 2007 @@ -13,7 +13,7 @@ require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once('modules/Webmails/MailBox.php'); -require_once('modules/Webmails/Webmail.php'); +require_once('modules/Webmails/Webmails.php'); global $adb,$current_user; @@ -42,6 +42,17 @@ $command = $_REQUEST["command"]; if($command == "expunge") { $MailBox = new MailBox($mailbox); + /* + $search = imap_search($MailBox->mbox,'DELETED'); + $data = imap_fetch_overview($MailBox->mbox,implode(',',$search)); + for($i=0;$i<$num;$i++) + { + if($data[$i]->deleted != 0) + { + imap_delete($MailBox->mbox,$data[$i]->message_id); + } + } + */ imap_expunge($MailBox->mbox); imap_close($MailBox->mbox); flush(); @@ -50,8 +61,8 @@ if($command == "delete_msg") { $adb->println("DELETE SINGLE WEBMAIL MESSAGE $mailid"); $MailBox = new MailBox($mailbox); - $email = new Webmail($MailBox->mbox,$mailid); - $email->delete(); + imap_mail_move($MailBox->mbox,$mailid,"Deleted"); + $email = new Webmails($MailBox->mbox,$mailid); imap_close($MailBox->mbox); echo $mailid; flush(); @@ -61,9 +72,10 @@ $MailBox = new MailBox($mailbox); $tlist = explode(":",$mailid); foreach($tlist as $id) { + imap_mail_move($MailBox->mbox,$id,"Trash"); $adb->println("DELETE MULTI MESSAGE $id"); - $email = new Webmail($MailBox->mbox,$id); - $email->delete(); + $email = new Webmails($MailBox->mbox,$id); + $email->delete(); } imap_close($MailBox->mbox); echo $mailid; @@ -72,7 +84,7 @@ } if($command == "undelete_msg") { $MailBox = new MailBox($mailbox); - $email = new Webmail($MailBox->mbox,$mailid); + $email = new Webmails($MailBox->mbox,$mailid); $email->unDeleteMsg(); imap_close($MailBox->mbox); echo $mailid; @@ -81,17 +93,19 @@ } if($command == "set_flag") { $MailBox = new MailBox($mailbox); - $email = new Webmail($MailBox->mbox,$mailid); + $email = new Webmails($MailBox->mbox,$mailid); $email->setFlag(); imap_close($MailBox->mbox); + echo $mailid; flush(); exit(); } if($command == "clear_flag") { $MailBox = new MailBox($mailbox); - $email = new Webmail($MailBox->mbox,$mailid); + $email = new Webmails($MailBox->mbox,$mailid); $email->delFlag(); imap_close($MailBox->mbox); + echo $mailid; flush(); exit(); } Modified: vtigercrm/branches/5.1_jens/modules/Webmails/body.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Webmails/body.php (original) +++ vtigercrm/branches/5.1_jens/modules/Webmails/body.php Mon Apr 16 12:27:44 2007 @@ -12,15 +12,24 @@ global $current_user; require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); -require_once('modules/Webmails/Webmail.php'); +require_once('modules/Webmails/Webmails.php'); require_once('modules/Webmails/MailBox.php'); +global $mod_strings; if(!isset($_SESSION["authenticated_user_id"]) || $_SESSION["authenticated_user_id"] != $current_user->id) {echo "ajax failed";flush();exit();} $mailid=$_REQUEST["mailid"]; -if(isset($_REQUEST["mailbox"]) && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";} +if(isset($_REQUEST["mailbox"]) && $_REQUEST["mailbox"] != "") +{ + $mailbox=$_REQUEST["mailbox"]; +} +else +{ + $mailbox="INBOX"; +} $MailBox = new MailBox($mailbox); -$email = new Webmail($MailBox->mbox,$mailid); - +$mail = $MailBox->mbox; +$email = new Webmails($MailBox->mbox,$mailid); +$status=imap_setflag_full($MailBox->mbox,$mailid,"\\Seen"); ?> -loadMail(); - echo $email->body; - echo "

    "; - if(is_array($email->inline)) { - $inline = $email->downloadInlineAttachments(); - $num=sizeof($inline); - echo "

    Inline Attachments:

    "; - for($i=0;$i<$num;$i++) { - //var_dump($inline[$i]); - // PLAIN TEXT - if($inline[$i]["subtype"] == "RFC822") { - echo ($i+1).") ".$inline[$i]["filename"].""; - } elseif($inline[$i]["subtype"] == "JPEG" || $inline[$i]["subtype"] == "GIF") { - echo ($i+1).") ".$inline[$i]["filename"]."


    '; - } else - echo ($i+1).") ".$inline[$i]["filename"]."
    "; +loadMail($attach_tab); +$content['body'] = ''.$email->body.''; +$content['attachtab'] = $email->attachtab; +//Need to put this along with the subject block +echo $email->att; +echo $content['body']; + +//test added by Richie +if (!isset($_REQUEST['display_images']) || $_REQUEST['display_images'] != 1) +{ + $content['body'] = eregi_replace('src="[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]"', 'src="none"', $content['body']); + $content['body'] = eregi_replace('src=[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]', 'src="none"', $content['body']); +} + +//Display embedded HTML images +$tmp_attach_tab=$content['attachtab']; +$i = 0; +$conf->display_img_attach = true; +$conf->display_text_attach = true; + +while ($tmp = array_pop($tmp_attach_tab)) +{ + if ($conf->display_img_attach && (eregi('image', $tmp['mime']) && ($tmp['number'] != ''))) + { + $exploded = explode('/', $tmp['mime']); + $img_type = array_pop($exploded); + if (eregi('JPEG', $img_type) || eregi('JPG', $img_type) || eregi('GIF', $img_type) || eregi ('PNG', $img_type)) + { + $new_img_src = 'src="get_img.php?mail=' . $mailid.'&num=' . $tmp['number'] . '&mime=' . $img_type . '&transfer=' . $tmp['transfer'] . '"'; + $img_id = str_replace('<', '', $tmp['id']); + $img_id = str_replace('>', '', $img_id); + $content['body'] = str_replace('src="cid:'.$img_id.'"', $new_img_src, $content['body']); + $content['body'] = str_replace('src=cid:'.$img_id, $new_img_src, $content['body']); } - } + } +} +while ($tmp = array_pop($content['attachtab'])) +{ + if ((!eregi('ATTACHMENT', $tmp['disposition'])) && $conf->display_text_attach && (eregi('text/plain', $tmp['mime']))) + echo '
    '.view_part_detail($mail, $mailid, $tmp['number'], $tmp['transfer'], $tmp['charset'], $charset); + if ($conf->display_img_attach && (eregi('image', $tmp['mime']) && ($tmp['number'] != ''))) + { + $exploded = explode('/', $tmp['mime']); + $img_type = array_pop($exploded); + if (eregi('JPEG', $img_type) || eregi('JPG', $img_type) || eregi('GIF', $img_type) || eregi ('PNG', $img_type)) + { + echo '
    '; + echo '
    '; + echo ''; + echo '
    '; + } +} +} + + +//test ended by Richie + imap_close($MailBox->mbox); + + ?> + Modified: vtigercrm/branches/5.1_jens/modules/Webmails/dlAttachments.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Webmails/dlAttachments.php (original) +++ vtigercrm/branches/5.1_jens/modules/Webmails/dlAttachments.php Mon Apr 16 12:27:44 2007 @@ -1,4 +1,4 @@ -mbox,$mailid); +$email = new Webmails($MailBox->mbox,$mailid); $attachments=$email->downloadAttachments(); $inline=$email->downloadInlineAttachments(); -if($num == "" || !isset($num) && count($attachments) >0 ) { - echo "




    - - - - -
    - - - - - - - -
    - - - - -
    - - + + + - -
    + + +
    +
    + + + + + - + - - -
    - vtiger CRM 5 - 100% Open Source CRM - Sign in
    -- AJAX-based user interface
    -- Complete customer life cycle management
    -- Collaboration through e-mail, portal, and live chat
    -- Customization & fine-grained security management
    -- Ready to use reports & dashboards
    -
    - -
    		- - - - - - - - - - - - -
    Sign In
    -
    - - - +
    + +
    + - + + - + + + + + + + + + + + + @@ -188,44 +169,23 @@ ?> + + - + +
    - - - - - - - -
    - -
    - -
    -
     
    - - - -
    - -  
    -
    +

    - -
    - +
    - - - - - - - - -
    - - - -
    +
    + Modified: vtigercrm/branches/5.1_jens/modules/Users/RecalculateSharingRules.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/RecalculateSharingRules.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/RecalculateSharingRules.php Mon Apr 16 12:27:44 2007 @@ -11,7 +11,7 @@ RecalculateSharingRules(); -header("Location: index.php?action=OrgSharingDetailView&parenttab=Settings&module=Users"); +header("Location: index.php?action=OrgSharingDetailView&parenttab=Settings&module=Settings"); ?> Modified: vtigercrm/branches/5.1_jens/modules/Users/RoleDragDrop.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/RoleDragDrop.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/RoleDragDrop.php Mon Apr 16 12:27:44 2007 @@ -14,7 +14,7 @@ $fromid=$_REQUEST['childId']; -global $adb; +global $adb,$mod_strings; $query = "select * from vtiger_role where roleid='".$toid."'"; $result=$adb->query($query); $parentRoleList=$adb->query_result($result,0,'parentrole'); @@ -27,7 +27,7 @@ if(in_array($fromid,$parentRoles)) { - echo 'You cannot move a Parent Node under a Child Node'; + echo $mod_strings['ROLE_DRAG_ERR_MSG']; die; } @@ -58,5 +58,5 @@ -header("Location: index.php?action=UsersAjax&module=Users&file=listroles&ajax=true"); +header("Location: index.php?action=SettingsAjax&module=Settings&file=listroles&ajax=true"); ?> Modified: vtigercrm/branches/5.1_jens/modules/Users/SaveGroup.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/SaveGroup.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/SaveGroup.php Mon Apr 16 12:27:44 2007 @@ -112,7 +112,7 @@ $groupMemberArray=constructGroupMemberArray($member_array); updateGroup($groupId,$groupName,$groupMemberArray,$description); - $loc = "Location: index.php?action=".$returnaction."&module=Users&parenttab=Settings&groupId=".$groupId; + $loc = "Location: index.php?action=".$returnaction."&module=Settings&parenttab=Settings&groupId=".$groupId; } elseif(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'create') { @@ -120,7 +120,7 @@ $member_array = explode(';',$selected_col_string); $groupMemberArray=constructGroupMemberArray($member_array); $groupId=createGroup($groupName,$groupMemberArray,$description); - $loc = "Location: index.php?action=".$returnaction."&parenttab=Settings&module=Users&groupId=".$groupId; + $loc = "Location: index.php?action=".$returnaction."&parenttab=Settings&module=Settings&groupId=".$groupId; } Modified: vtigercrm/branches/5.1_jens/modules/Users/SaveOrgSharing.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/SaveOrgSharing.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/SaveOrgSharing.php Mon Apr 16 12:27:44 2007 @@ -39,6 +39,6 @@ } } -$loc = "Location: index.php?action=OrgSharingDetailView&module=Users&parenttab=Settings"; +$loc = "Location: index.php?action=OrgSharingDetailView&module=Settings&parenttab=Settings"; header($loc); ?> Modified: vtigercrm/branches/5.1_jens/modules/Users/SaveProfile.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/SaveProfile.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/SaveProfile.php Mon Apr 16 12:27:44 2007 @@ -13,8 +13,8 @@ require_once('include/utils/UserInfoUtil.php'); require_once('include/utils/utils.php'); global $adb; -$profilename = $_REQUEST['profile_name']; -$description= $_REQUEST['profile_description']; +$profilename = addslashes($_REQUEST['profile_name']); +$description= addslashes($_REQUEST['profile_description']); $def_module = $_REQUEST['selected_module']; $def_tab = $_REQUEST['selected_tab']; //Inserting values into Profile Table @@ -27,10 +27,17 @@ $profileid = $adb->query_result($result2,0,'current_id'); -//Retreiving the vtiger_tabs permission array -$tab_perr_result = $adb->query("select * from vtiger_profile2tab where profileid=1"); -$act_perr_result = $adb->query("select * from vtiger_profile2standardpermissions where profileid=1"); -$act_utility_result = $adb->query("select * from vtiger_profile2utility where profileid=1"); + //Retreiving the vtiger_tabs permission array + // + + //Retreiving the first profileid + $prof_query="select profileid from vtiger_profile order by profileid ASC"; + $prof_result = $adb->query($prof_query); + $first_prof_id = $adb->query_result($prof_result,0,'profileid'); + +$tab_perr_result = $adb->query("select * from vtiger_profile2tab where profileid=".$first_prof_id); +$act_perr_result = $adb->query("select * from vtiger_profile2standardpermissions where profileid=".$first_prof_id); +$act_utility_result = $adb->query("select * from vtiger_profile2utility where profileid=".$first_prof_id); $num_tab_per = $adb->num_rows($tab_perr_result); $num_act_per = $adb->num_rows($act_perr_result); $num_act_util_per = $adb->num_rows($act_utility_result); @@ -154,7 +161,7 @@ foreach($modArr as $fld_module => $fld_label) { - $fieldListResult = getProfile2FieldList($fld_module, 1); + $fieldListResult = getProfile2FieldList($fld_module, $first_prof_id); $noofrows = $adb->num_rows($fieldListResult); $tab_id = getTabid($fld_module); for($i=0; $i<$noofrows; $i++) @@ -171,7 +178,7 @@ } //Updating the Mandatory vtiger_fields $uitype = $adb->query_result($fieldListResult,$i,"uitype"); - if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16) + if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 53) { $visible_value = 0; } @@ -180,7 +187,7 @@ $adb->query($sql11); } } - $loc = "Location: index.php?action=ListProfiles&module=Users&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module; + $loc = "Location: index.php?action=ListProfiles&module=Settings&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module; header($loc); Modified: vtigercrm/branches/5.1_jens/modules/Users/UpdateProfileChanges.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/UpdateProfileChanges.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/UpdateProfileChanges.php Mon Apr 16 12:27:44 2007 @@ -162,7 +162,7 @@ } //Updating the Mandatory vtiger_fields $uitype = $adb->query_result($fieldListResult,$i,"uitype"); - if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16) + if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 53) { $visible_value = 0; } @@ -172,7 +172,14 @@ } } - $loc = "Location: index.php?action=".$return_action."&module=Users&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module; + if($return_action == 'profilePrivileges' || $return_action == 'ListProfiles') + { + $loc = "Location: index.php?action=".$return_action."&module=Settings&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module; + } + else + { + $loc = "Location: index.php?action=".$return_action."&module=Users&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module; + } header($loc); /** returns value 0 if request permission is on else returns value 1 Modified: vtigercrm/branches/5.1_jens/modules/Users/Users.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/Users.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/Users.php Mon Apr 16 12:27:44 2007 @@ -115,7 +115,7 @@ var $object_name = "User"; var $user_preferences; var $defhomeview; - var $homeorder_array = array('ALVT','HDB','PLVT','QLTQ','CVLVT','HLT','OLV','GRT','OLTSO','ILTI','MNL','OLTPO','LTFAQ'); + var $homeorder_array = array('HDB','ALVT','PLVT','QLTQ','CVLVT','HLT','OLV','GRT','OLTSO','ILTI','MNL','OLTPO','LTFAQ'); var $encodeFields = Array("first_name", "last_name", "description"); @@ -1185,7 +1185,8 @@ if($_REQUEST[$this->homeorder_array[$i]] != '') $save_array[] = $this->homeorder_array[$i]; } - $homeorder = implode(',',$save_array); + if(count($save_array)) + $homeorder = implode(',',$save_array); $query = "update vtiger_users set homeorder ='$homeorder' where id=$id"; $adb->query($query); $log->debug("Exiting from function saveHomeOrder($id)"); Modified: vtigercrm/branches/5.1_jens/modules/Users/UsersAjax.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/UsersAjax.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/UsersAjax.php Mon Apr 16 12:27:44 2007 @@ -11,27 +11,8 @@ global $current_user; global $adb; - if(isset($_REQUEST['file']) && ($_REQUEST['file'] !='')) { require_once('modules/Users/'.$_REQUEST['file'].'.php'); } -if(isset($_REQUEST['orgajax']) && ($_REQUEST['orgajax'] !='')) -{ - require_once('modules/Users/CreateSharingRule.php'); -} -elseif(isset($_REQUEST['announce_save']) && ($_REQUEST['announce_save'] != '')) -{ - $date_var = date('YmdHis'); - $announcement = $_REQUEST['announcement']; - $title = $_REQUEST['title_announcement']; - $sql="select * from vtiger_announcement where creatorid=".$current_user->id; - $is_announce=$adb->query($sql); - if($adb->num_rows($is_announce) > 0) - $query="update vtiger_announcement set announcement=".$adb->formatString("vtiger_announcement","announcement",$announcement).",time=".$adb->formatString("vtiger_announcement","time",$date_var).",title='announcement' where creatorid=".$current_user->id; - else - $query="insert into vtiger_announcement values (".$current_user->id.",".$adb->formatString("vtiger_announcement","announcement",$announcement).",'announcement',".$adb->formatString("vtiger_announcement","time",$date_var).")"; - $result=$adb->query($query); - echo $announcement; -} ?> Modified: vtigercrm/branches/5.1_jens/modules/Users/about_us.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/about_us.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/about_us.php Mon Apr 16 12:27:44 2007 @@ -32,9 +32,10 @@ "http://www.w3.org/TR/html4/loose.dtd"> - -vtiger CRM 5 - Free, Commercial grade Open Source CRM - + +<?php echo $mod_strings['TITLE_VTIGER_CRM_5'];?> + + - + @@ -86,7 +84,9 @@ + + @@ -96,6 +96,8 @@ + + @@ -131,35 +133,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -171,13 +173,13 @@ - - Modified: vtigercrm/branches/5.1_jens/modules/Users/updateLeadDBStatus.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/updateLeadDBStatus.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/updateLeadDBStatus.php Mon Apr 16 12:27:44 2007 @@ -79,7 +79,9 @@ //First we have to delete the group relationship $delete_query = "delete from ". $deletegroup_array[$return_module] ." where " . $tableId_array[$return_module] . "='".$id."'"; $result = $adb->query($delete_query); - + //Inserting changed owner information to salesmanactivityrel table + $insert = "insert into vtiger_salesmanactivityrel values(".$idval.",".$id.")"; + $result = $adb->query($insert); //Now we have to update the smownerid $sql = "update vtiger_crmentity set modifiedby=".$current_user->id.",smownerid='" .$idval ."', modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid='" .$id."'"; $result = $adb->query($sql); Modified: vtigercrm/branches/5.1_jens/modules/Vendors/Delete.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Vendors/Delete.php (original) +++ vtigercrm/branches/5.1_jens/modules/Vendors/Delete.php Mon Apr 16 12:27:44 2007 @@ -29,11 +29,11 @@ if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); - + if($_REQUEST['module'] == $_REQUEST['return_module']) { + delVendorRelRecords($_REQUEST['record']); $focus->mark_deleted($_REQUEST['record']); - $smod ="smodule=VENDOR&"; } -header("Location: index.php?".$smod."module=".$_REQUEST['return_module']."&action=".$_REQUEST['return_action']."&record=".$_REQUEST['return_id']."&relmodule=".$_REQUEST['module']); +header("Location: index.php?module=".$_REQUEST['return_module']."&action=".$_REQUEST['return_action']."&record=".$_REQUEST['return_id']."&relmodule=".$_REQUEST['module']); ?> Modified: vtigercrm/branches/5.1_jens/modules/Vendors/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Vendors/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Vendors/DetailView.php Mon Apr 16 12:27:44 2007 @@ -74,6 +74,8 @@ $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); $smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); +$smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); + if($singlepane_view == 'true') { $related_array = getRelatedLists($currentModule,$focus); Modified: vtigercrm/branches/5.1_jens/modules/Vendors/EditView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Vendors/EditView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Vendors/EditView.php Mon Apr 16 12:27:44 2007 @@ -99,6 +99,7 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("DUPLICATE", $_REQUEST['isDuplicate']); // Assigned organizations $smarty->assign("CURRENT_ORGANIZATION",$current_organization); Modified: vtigercrm/branches/5.1_jens/modules/Vendors/Vendors.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Vendors/Vendors.php (original) +++ vtigercrm/branches/5.1_jens/modules/Vendors/Vendors.php Mon Apr 16 12:27:44 2007 @@ -89,7 +89,14 @@ else $returnset = '&return_module=Vendors&return_action=CallRelatedList&return_id='.$id; - $query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_vendor.vendorname from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid left outer join vtiger_vendor on vtiger_vendor.vendorid = vtiger_products.vendor_id where vtiger_vendor.vendorid = '.$id.' and vtiger_crmentity.deleted = 0'; + $query = "SELECT vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, + vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, + vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_vendor.vendorname + FROM vtiger_products + INNER JOIN vtiger_vendor ON vtiger_vendor.vendorid = vtiger_products.vendor_id + INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_products.productid + WHERE vtiger_crmentity.deleted = 0 AND vtiger_vendor.vendorid = $id"; + $log->debug("Exiting get_products method ..."); return GetRelatedList('Vendors','Products',$focus,$query,$button,$returnset); } @@ -113,7 +120,7 @@ else $returnset = '&return_module=Vendors&return_action=CallRelatedList&return_id='.$id; - $query = "select vtiger_users.user_name,vtiger_groups.groupname,vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.vendorid=".$id; + $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.vendorid=".$id; $log->debug("Exiting get_purchase_orders method ..."); return GetRelatedList('Vendors','PurchaseOrder',$focus,$query,$button,$returnset); } @@ -136,7 +143,7 @@ else $returnset = '&return_module=Vendors&return_action=CallRelatedList&return_id='.$id; - $query = 'SELECT vtiger_users.user_name,vtiger_groups.groupname,vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_vendorcontactrel.vendorid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid inner join vtiger_vendorcontactrel on vtiger_vendorcontactrel.contactid=vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_vendorcontactrel.vendorid = '.$id; + $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_vendorcontactrel.vendorid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid inner join vtiger_vendorcontactrel on vtiger_vendorcontactrel.contactid=vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_vendorcontactrel.vendorid = ".$id; $log->debug("Exiting get_contacts method ..."); return GetRelatedList('Vendors','Contacts',$focus,$query,$button,$returnset); Modified: vtigercrm/branches/5.1_jens/modules/Vendors/updateRelations.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Vendors/updateRelations.php (original) +++ vtigercrm/branches/5.1_jens/modules/Vendors/updateRelations.php Mon Apr 16 12:27:44 2007 @@ -15,40 +15,63 @@ $idlist = $_REQUEST['idlist']; -if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '') +if($singlepane_view == 'true') + $action = "DetailView"; +else + $action = "CallRelatedList"; + +$dest_mod = $_REQUEST['destination_module']; + +//This will be true, when we select product from vendor related list +if($_REQUEST['destination_module']=='Products') { - //split the string and store in an array - $storearray = explode (";",$idlist); - foreach($storearray as $id) + if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '') { - if($id != '') + $record = $_REQUEST["parentid"]; + $storearray = explode (";",$idlist); + foreach($storearray as $id) { - $sql = "insert into vtiger_vendorcontactrel values (".$_REQUEST["parentid"].",".$id.")"; - $adb->query($sql); - $sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parentid"] .",".$id.")"; - $adb->query($sql); + if($id != '') + $adb->query("update vtiger_products set vendor_id=".$record." where productid=".$id); } } - if($singlepane_view == 'true') - header("Location: index.php?action=DetailView&module=Vendors&record=".$_REQUEST["parentid"]); - else - header("Location: index.php?action=CallRelatedList&module=Vendors&record=".$_REQUEST["parentid"]); + elseif($_REQUEST['parid'] != '' && $_REQUEST['entityid'] != '') + { + $sql = "update vtiger_products set vendor_id=".$_REQUEST['parid']." where productid=".$_REQUEST['entityid']; + $adb->query($sql); + $record = $_REQUEST['parid']; + } } -elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '') +//select contact from vendor relatedlist +if($_REQUEST['destination_module']=='Contacts') { + if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '') + { + $record = $_REQUEST["parentid"]; - $sql = "insert into vtiger_vendorcontactrel values (".$_REQUEST['parid'].",".$_REQUEST['entityid'].")"; + //split the string and store in an array + $storearray = explode (";",$idlist); + foreach($storearray as $id) + { + if($id != '') + { + $sql = "insert into vtiger_vendorcontactrel values (".$record.",".$id.")"; + $adb->query($sql); + } + } + } + elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '') + { + $record = $_REQUEST["parid"]; + + $sql = "insert into vtiger_vendorcontactrel values (".$record.",".$_REQUEST['entityid'].")"; $adb->query($sql); - $sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parid"] .",".$_REQUEST["entityid"] .")"; - $adb->query($sql); - if($singlepane_view == 'true') - header("Location: index.php?action=DetailView&module=Vendors&record=".$_REQUEST["parid"]); - else - header("Location:index.php?action=CallRelatedList&module=Vendors&record=".$_REQUEST["parid"]); + } } +header("Location:index.php?action=$action&module=Vendors&record=".$record); Modified: vtigercrm/branches/5.1_jens/modules/Webmails/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Webmails/CallRelatedList.php (original) +++ vtigercrm/branches/5.1_jens/modules/Webmails/CallRelatedList.php Mon Apr 16 12:27:44 2007 @@ -18,7 +18,7 @@ require_once('include/upload_file.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/Webmails/Webmail.php'); +require_once('modules/Webmails/Webmails.php'); require_once('modules/Webmails/MailParse.php'); global $log; @@ -40,7 +40,7 @@ $mbox = getImapMbox($mailbox,$temprow); -$email = new Webmail($mbox, $mailid); +$email = new Webmails($mbox, $mailid); $from = $email->from; $subject=$email->subject; $date=$email->date; @@ -85,7 +85,6 @@ $smarty->assign("NAME","From: ".$from); $smarty->assign("RELATEDLISTS", $block); $smarty->assign("SINGLE_MOD","Webmails"); -$smarty->assign("REDIR_MOD","Webmails"); $smarty->assign("MODULE", "Webmails"); $smarty->assign("ID",$_REQUEST["record"] ); $smarty->assign("MOD",$mod_strings); Modified: vtigercrm/branches/5.1_jens/modules/Webmails/DetailView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Webmails/DetailView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Webmails/DetailView.php Mon Apr 16 12:27:44 2007 @@ -9,7 +9,7 @@ * ********************************************************************************/ require_once('include/utils/UserInfoUtil.php'); -require_once("modules/Webmails/Webmail.php"); +require_once("modules/Webmails/Webmails.php"); require_once("modules/Webmails/MailBox.php"); global $app_strings; @@ -21,7 +21,7 @@ global $MailBox; $MailBox = new MailBox($mailbox); -$webmail = new Webmail($MailBox->mbox,$mailid); +$webmail = new Webmails($MailBox->mbox,$mailid); $elist = $MailBox->mailList["overview"][($mailid-1)]; echo '
     
    Anusha
    Bharath
    Bharathi
    Dina
    Don
    Fenzik
    Gopal
    Jeri
    Mani
    Philip
    Radiant
    Richie
    Shahul
    Tamilmani
    Vashni
     
    Valmir Carlos Trindade
     
    -
    ADOdb
    Ajax Popup Chat
    Apache HTTP Server
    Attachments in E-mail Client
    Calculator
    Carousel Slideshow
    class_http
    ExcelReader
    FCKeditor
    FPDF
    freetag
    gdwin32
    Graph
    Image Crossfade Redux
    Image_Canvas
    Image_Color
    jscalendar
    log4php
    MagpieRSS
    Mailfeed
    MySQL
    nusoap
    PHP
    PHPMailer
    phpSysinfo
    Prototype
    script.oculo.us
    Smarty Template Engine
    SugarCRM (SPL 1.1.2)
    ADOdb
    Ajax Popup Chat
    Apache HTTP Server
    Attachments in E-mail Client
    Calculator
    Carousel Slideshow
    class_http
    ExcelReader
    FCKeditor
    FPDF
    freetag
    gdwin32
    Graph
    Image Crossfade Redux
    Image_Canvas
    Image_Color
    jscalendar
    log4php
    MagpieRSS
    Mailfeed
    MySQL
    nusoap
    PHP
    PHPMailer
    phpSysinfo
    Prototype
    script.oculo.us
    Smarty Template Engine
    SugarCRM (SPL 1.1.2)
     
     
     
    + "; - printf("",$temprow["description"]); - $cnt++; + $templatename = $temprow["templatename"]; + if($is_admin == false) + { + $folderName = $temprow['foldername']; + if($folderName != 'Personal') + { + printf(""; + printf("",$temprow["description"]); + } + } + else + { + printf(""; + printf("",$temprow["description"]); + } + $cnt++; + }while($temprow = $adb->fetch_array($result)); ?>
     |  -  |  - +  |  + Modified: vtigercrm/branches/5.1_jens/modules/Users/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -1,621 +1,659 @@ -'Users', -'LBL_MODULE_TITLE'=>'Users: Home', -'LBL_SEARCH_FORM_TITLE'=>'User Search', -'LBL_LIST_FORM_TITLE'=>'User List', -'LBL_NEW_FORM_TITLE'=>'New User', -'LBL_CREATE_NEW_USER'=>'Create New User', -'LBL_USER'=>'Users:', -'LBL_LOGIN'=>'Login', -'LBL_USER_ROLE'=>'Role', -'LBL_LIST_NAME'=>'Name', -'LBL_LIST_LAST_NAME'=>'Last Name', -'LBL_LIST_USER_NAME'=>'User Name', -'LBL_LIST_DEPARTMENT'=>'Department', -'LBL_LIST_EMAIL'=>'E-Mail', -'LBL_LIST_PRIMARY_PHONE'=>'Primary Phone', -'LBL_LIST_ADMIN'=>'Admin', -'LBL_LIST_PASSWORD'=>'Password', -'LBL_LIST_CONFIRM_PASSWORD'=>'Confirm Password', -'LBL_LIST_USER_NAME_ROLE'=>'User ID , Name & Role', -'LBL_LIST_SELECT'=>'Select', -'LBL_LIST_PHONE'=>'Phone', -'LBL_LIST_NO'=>'#', - -'LBL_ADMINS'=>'Admins', -'LBL_STD_USERS'=>'Standard Users', - -'UserName'=>'UserName', -'Role'=>'Role', -'Email'=>'Email', -'Name'=>'Name', -'Admin'=>'Admin', -'Tools'=>'Tools', - - -//added for patch2 -'LBL_GROUP'=>'Group', -'LBL_CURRENCY_NAME'=>'Currency', - -'LBL_NEW_USER_BUTTON_TITLE'=>'New User [Alt+N]', -'LBL_NEW_USER_BUTTON_LABEL'=>'New User', -'LBL_NEW_USER_BUTTON_KEY'=>'N', -'LBL_DATE_FORMAT'=>'Date Format', - -'LBL_ERROR'=>'Error:', -'LBL_PASSWORD'=>'Password', -'LBL_USER_NAME'=>'User Name', -'LBL_CRM_ID'=>'CRM ID', -'LBL_FIRST_NAME'=>'First Name', -'LBL_LAST_NAME'=>'Last Name', -'LBL_YAHOO_ID'=>'Yahoo ID', -'LBL_USER_SETTINGS'=>'User Settings', -'LBL_THEME'=>'Color Theme', -'LBL_LANGUAGE'=>'Language', -'LBL_ADMIN'=>'Admin', -'LBL_USER_INFORMATION'=>'User Information', -'LBL_OFFICE_PHONE'=>'Office Phone', -'LBL_REPORTS_TO'=>'Reports to', -'LBL_OTHER_PHONE'=>'Other Phone', -'LBL_OTHER_EMAIL'=>'Other Email', -'LBL_NOTES'=>'Notes', -'LBL_DEPARTMENT'=>'Department', -'LBL_STATUS'=>'Status', -'LBL_TITLE'=>'Title', -'LBL_ANY_PHONE'=>'Any Phone:', -'LBL_ANY_EMAIL'=>'Any Email:', -'LBL_ADDRESS'=>'Street Address', -'LBL_CITY'=>'City', -'LBL_STATE'=>'State', -'LBL_POSTAL_CODE'=>'Postal Code', -'LBL_COUNTRY'=>'Country', -'LBL_NAME'=>'Name:', -'LBL_USER_SETTINGS'=>'User Settings', -'LBL_USER_INFORMATION'=>'User Information', -'LBL_MOBILE_PHONE'=>'Mobile', -'LBL_OTHER'=>'Other', -'LBL_FAX'=>'Fax', -'LBL_EMAIL'=>'E-Mail Id', -'LBL_HOME_PHONE'=>'Home Phone', -'LBL_ADDRESS_INFORMATION'=>'User Address', -'LBL_CAL_HRFORMAT'=>'Calendar Time Format', -'LBL_CAL_DURATION'=>'Day starts at', -'LBL_PRIMARY_ADDRESS'=>'Primary Address:', - -'LBL_ORGANIZATION_INFORMATION'=>'Organizations', -'LBL_PRIMARY_ORGANIZATION'=>'Primary organization', -'LBL_ASSIGNED_ORGANIZATIONS'=>'Assigned to organizations', -'LBL_PRIMARY_ORGUNITS'=>'Primary organization units', - -'LBL_CHANGE_PASSWORD_BUTTON_TITLE'=>'Change Password [Alt+P]', -'LBL_CHANGE_PASSWORD_BUTTON_KEY'=>'P', -'LBL_CHANGE_PASSWORD_BUTTON_LABEL'=>'Change Password', -'LBL_LOGIN_BUTTON_TITLE'=>'Login [Alt+L]', -'LBL_LOGIN_BUTTON_KEY'=>'L', -'LBL_LOGIN_BUTTON_LABEL'=>'Login', -'LBL_LOGIN_HISTORY_BUTTON_TITLE'=>'Login History [Alt+H]', -'LBL_LOGIN_HISTORY_BUTTON_KEY'=>'H', -'LBL_LOGIN_HISTORY_BUTTON_LABEL'=>'Login History', -'LBL_LOGIN_HISTORY_TITLE'=>'Users: Login History', -'LBL_RESET_PREFERENCES'=>'Reset To Default Preferences', - -'LBL_CHANGE_PASSWORD'=>'Change Password', -'LBL_OLD_PASSWORD'=>'Old Password:', -'LBL_NEW_PASSWORD'=>'New Password:', -'LBL_CONFIRM_PASSWORD'=>'Confirm Password:', -'ERR_ENTER_OLD_PASSWORD'=>'Please enter your old password.', -'ERR_ENTER_NEW_PASSWORD'=>'Please enter your new password.', -'ERR_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', -'ERR_REENTER_PASSWORDS'=>'Please re-enter passwords. The \"new password\" and \"confirm password\" values do not match.', -'ERR_INVALID_PASSWORD'=>'You must specify a valid username and password.', -'ERR_PASSWORD_CHANGE_FAILED_1'=>'User password change failed for ', -'ERR_PASSWORD_CHANGE_FAILED_2'=>' failed. The new password must be set.', -'ERR_PASSWORD_INCORRECT_OLD'=>'Incorrect old password specified. Re-enter password information.', -'ERR_USER_NAME_EXISTS_1'=>'The user name ', -'ERR_USER_NAME_EXISTS_2'=>' already exists. Duplicate user names are not allowed.
    Change the user name to be unique.', -'ERR_LAST_ADMIN_1'=>'The user name ', -'ERR_LAST_ADMIN_2'=>' is the last Admin user. At least one user must be an Admin user.
    Check the Admin user setting.', - -'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.", - -// Additional Fields for i18n --- Release vtigerCRM 3.2 Patch 2 -// Users--listroles.php , createrole.php , ListPermissions.php , editpermissions.php - -'LBL_ROLES'=>'Roles', -'LBL_ROLES_SUBORDINATES'=>'Roles and Subordinates', -'LBL_ROLE_NAME'=>'Role Name', -'LBL_CREATE_NEW_ROLE'=>'Create New Role', - -'LBL_CREATE_NEW_ROLE'=>'Create New Role', -'LBL_INDICATES_REQUIRED_FIELD'=>'Indicates Required Field', -'LBL_NEW_ROLE'=>'New Role', -'LBL_PARENT_ROLE'=>'Parent Role', - -'LBL_LIST_ROLES'=>'List Roles', -'LBL_ENTITY_LEVEL_PERMISSIONS'=>'Entity Level Permissions', -'LBL_ENTITY'=>'Entity', -'LBL_CREATE_EDIT'=>'Create/Edit', -'LBL_DELETE'=>'Delete', -'LBL_VIEW'=>'View', -'LBL_LEADS'=>'Leads', -'LBL_ACCOUNTS'=>'Accounts', -'LBL_CONTACTS'=>'Contacts', -'LBL_OPPURTUNITIES'=>'Opportunities', -'LBL_TASKS'=>'Tasks', -'LBL_CASES'=>'Cases', -'LBL_EMAILS'=>'Emails', -'LBL_NOTES'=>'Notes', -'LBL_MEETINGS'=>'Meetings', -'LBL_CALLS'=>'Calls', -'LBL_IMPORT_PERMISSIONS'=>'Import Permissions', -'LBL_IMPORT_LEADS'=>'Import Leads', -'LBL_IMPORT_ACCOUNTS'=>'Import Accounts', -'LBL_IMPORT_CONTACTS'=>'Import Contacts', -'LBL_IMPORT_OPPURTUNITIES'=>'Import Opportunities', - -'LBL_ROLE_DETAILS'=>'Role Details', -//added for vtigercrm4 rc -'LBL_FILE'=> 'File Name', -'LBL_FILE_TYPE'=>'File Type', -'LBL_UPLOAD'=>'Upload File', -'LBL_ATTACH_FILE'=>'Attach Mail Merge Template', -'LBL_EMAIL_TEMPLATES'=>'Email Templates', -'LBL_TEMPLATE_NAME'=>'Template Name', -'LBL_TEMPLATE_HEADER'=>'Template', -'LBL_TEMPLATE_DETAILS'=>'Template Details', -'LBL_EDIT_TEMPLATE'=>'Edit Template', -'LBL_TEMPLATE_FILE'=>'Template File', -'LBL_DESCRIPTION'=>'Description', -'LBL_EMAIL_TEMPLATES_LIST'=>'Communication Templates > Email Templates', -'LBL_MAILMERGE_TEMPLATES_LIST'=>' > Communication Templates > Mail Merge Templates', -'LBL_MAILMERGE_TEMPLATES_ATTACHMENT' => '> Communication Templates > Attach Mail Merge Template', -'LBL_DOWNLOAD_NOW'=>'Download Now', -'LBL_DOWNLOAD'=>'Download', -'LBL_SELECT_MODULE'=>'Select Module', -'LBL_MERGE_FILE'=>'File : ', -'LBL_MERGE_MSG'=>'Select a module to assign this Template', -'LBL_MERGE_FIELDS'=>'Merge Fields', -'LBL_COPY_PASTE'=>'Copy & Paste', -'LNK_GO_TO_TOP'=>'Go to Page Top', -'LNK_SAMPLE_EMAIL'=>'View Sample Email', -'LBL_COLON'=>':', -'LBL_EMAIL_TEMPLATE'=>'Email Template', -'LBL_NEW_TEMPLATE'=>'New Template', -'LBL_ADD_TEMPLATE'=>'Add Template', -'LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT'=>'Use merge fields to personalize your email content.', -'LBL_AVAILABLE_MERGE_FIELDS'=>'Available Merge Fields', -'LBL_SELECT_FIELD_TYPE'=>'Select Field Type', -'LBL_SELECT_FIELD'=>'Select Field :', -'LBL_MERGE_FIELD_VALUE'=>'Copy Merge Field Value :', -'LBL_ACCOUNT_FIELDS'=>'Account Fields', -'LBL_CONTACT_FIELDS'=>'Contact Fields', -'LBL_LEAD_FIELDS'=>'Lead Fields', -'LBL_COPY_AND_PASTE_MERGE_FIELD'=>'Copy and paste the merge field value into your template below.', -'LBL_EMAIL_TEMPLATE_INFORMATION'=>'Communication Templates > Email Templates > Viewing', -'LBL_FOLDER'=>'Folder', -'LBL_PERSONAL'=>'Personal', -'LBL_PUBLIC'=>'Public', -'LBL_TEMPLATE_NAME'=>'Template Name:', -'LBL_SUBJECT'=>'Subject', -'LBL_BODY'=>'Email Body', -'LBL_TEMPLATE_TOOLS'=>'Tools', -'LBL_TEMPLATE_PUBLIC'=>'Public Access', -'LBL_TEMPLATE_PRIVATE'=>'Private Access', -'LBL_TEMPLATE_SUBJECT'=>'Email Subject', -'LBL_TEMPLATE_MESSAGE'=>'Email Message', -'LBL_VIEWING'=>'Viewing', -'LBL_PROPERTIES'=>'Properties of', - - - -// Added fields in createnewgroup.php -'LBL_CREATE_NEW_GROUP'=>'Create New Group', -'LBL_NEW_GROUP'=>'New Group', -'LBL_EDIT_GROUP'=>'Edit Group', -'LBL_GROUP_NAME'=>'Group Name', -'LBL_GROUP_DETAILS'=>'Group Details', -'LBL_MEMBER'=>'Members', -'LBL_MEMBER_AVLBL'=>'Available Entities & Members', -'LBL_MEMBER_SELECTED'=>'Selected Members', -'LBL_DESCRIPTION'=>'Description', -'LBL_GROUP_MESG1'=>'Groups are a flexible way to assign access rights, when complex access rights has to be defined. You can combine multiple entities like Roles, Users, profiles etc into a single group.', -'LBL_GROUP_MESG2'=>'To add, select the Entity members from left and click the ">>" button.', -'LBL_GROUP_MESG3'=>'To remove, select the group members from the right and click the "<<" button.', - - -// Added fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php -'LBL_DETAIL_VIEW_OF_EMAIL_TEMPLATE'=>'Detail View of Email Template', -'LBL_DETAIL_VIEW'=>'Detail View of', -'LBL_EDIT_VIEW'=>'Editing details of the user', -'LBL_EDITING'=>'Editing user', -'LBL_GROUP_MEMBERS_LIST'=>'Group members list', -'LBL_GROUPS'=>'Groups', -'LBL_MY_GROUPS'=>'My Groups', -'LBL_ADD_GROUP_BUTTON'=>'Add Group', -'LBL_WORD_TEMPLATES'=>'Mail Merge Templates', -'LBL_NEW_WORD_TEMPLATE'=>'New Template', -'LBL_EMAIL_TEMPLATE_DESC'=>'Manage email templates used for Campaigns and Mass mailing', -'LBL_NAME'=>'Name', - -// Added fields in TabCustomise.php,html and UpdateTab.php,html -'LBL_CUSTOMISE_TABS'=>'Customize Tabs', -'LBL_CHOOSE_TABS'=>'Choose Tabs', -'LBL_AVAILABLE_TABS'=>'Available Tabs', -'LBL_SELECTED_TABS'=>'Selected Tabs', -'LBL_USER'=>'User', -'LBL_TAB_MENU_UPDATED'=>'Tab Menu Updated! kindly go to ', -'LBL_TO_VIEW_CHANGES'=>' to view the changes', - -// Added to change homepage order -'LBL_CHANGE_HOMEPAGE_LABEL'=>'Homepage Order', -'LBL_CHANGE_HOMEPAGE_TITLE'=>'Homepage', - -// Added fields in binaryfilelist.php -'LBL_OERATION'=>'Operation', - -// Added fields in CreateProfile.php -'LBL_PROFILE_NAME'=>'Create New Profile:', -'LBL_NEW_PROFILE'=>'New Profile', -'LBL_NEW_PROFILE_NAME'=>'Profile Name', -'LBL_PARENT_PROFILE'=>'Parent Profile', -'LBL_BASIC_PROFILE_DETAILS'=>'Basic details of Profile', -'LBL_STEP_1_2'=>'Step 1 of 2', -'LBL_STEP_2_2'=>'Step 2 of 2', -'LBL_STEP'=>'Step', -'LBL_SELECT_BASE_PROFILE'=>'Select Base Profile', -'LBL_PROFILE_PRIVILEGES'=>'Profile Privileges', -'LBL_GLOBAL_PRIVILEGES'=>'Global Privileges', -'LBL_TAB_PRIVILEGES'=>'Tab Privileges', -'LBL_FIELD_PRIVILEGES'=>'Field Privileges', -'LBL_STANDARD_PRIVILEGES'=>'Standard Privileges', -'LBL_UTILITY_PRIVILEGES'=>'Utility Privileges', -'LBL_UTILITIES'=>'Utilities', -'LBL_BASE_PROFILE_MESG'=>'I would like to setup a base profile and edit privileges (Recommended)', -'LBL_BASE_PROFILE'=>'Base Profile:', -'LBL_OR'=>'OR', -'LBL_BASE_PROFILE_MESG_ADV'=>'I will choose the privileges from scratch (Advanced Users)', -'LBL_FOR'=>'for', -'LBL_GLOBAL_MESG_OPTION'=>'Select the options below to change global privileges', -'LBL_VIEW_ALL'=>'View all', -'LBL_EDIT_ALL'=>'Edit all', -'LBL_ALLOW'=>'Allows', -'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM', -'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM', -'LBL_STD_MESG_OPTION'=>'Select the standard actions to be permitted', -'LBL_TAB_MESG_OPTION'=>'modules to be shown', -'LBL_UTILITY_MESG_OPTION'=>'Select the utility actions to be permitted', -'LBL_FIELD_MESG_OPTION'=>'Select the fields to be permitted', -'LBL_FINISH_BUTTON'=>'Finish', -'LBL_PROFILE_DETAIL_VIEW'=>'Detail View of Profile', -'LBL_PROFILE_MESG'=>'Viewing access privileges for', -'LBL_PROFILE_M'=>'Profile', -'LBL_DEFINE_PRIV_FOR'=>' Define Privileges for ', -'LBL_USE_OPTION_TO_SET_PRIV'=>'Use the options below to set privileges', -'LBL_SUPER_USER_PRIV'=>'Global Privileges', -'LBL_SET_PRIV_FOR_EACH_MODULE'=>'Set Privileges for each Module ', -'LBL_FIELDS_AND_TOOLS_SETTINGS'=>'Fields & Tools Settings', -'LBL_SHOW_FIELDS'=>'Show Fields', -'LBL_TOOLS_TO_BE_SHOWN'=>'Tools to be shown', -'LBL_WELCOME_PROFILE_CREATE'=>'Welcome to Privilege Profile Creator ', -'LBL_SELECT_CHOICE_NEW_PROFILE'=>'Select your choice of creating the new profile', -'LBL_ADD_CUSTOM_RULE'=>'Add Custom Privilege Rule', -'LBL_EDIT_CUSTOM_RULE'=>'Edit Custom Privilege Rule', -'LBL_CLOSE'=>'Close', -'LBL_SELECT_ENTITY'=>'Select an entity below', -'LBL_CAN_BE_ACCESSED_BY'=>'Can be accessed by', -'LBL_PERMISSIONS'=>'Permissions', -'LBL_ACCESS_RIGHTS_FOR_MODULES'=>'Access rights for relative modules', -'LBL_RULE_CONSTRUCTION'=>'Rule Construction Display', -'LBL_ADD_RULE'=>'Add Rule', -'LBL_RELATED_MODULE_RIGHTS'=>'Related Module Rights', -'LBL_IN_PERMISSION'=>'in the permission', - -//Added fields in createrole.php -'LBL_HDR_ROLE_NAME'=>'Create New Role:', -'LBL_TITLE_ROLE_NAME'=>'New Role', -'LBL_ROLE_NAME'=>'Role Name', -'LBL_ROLE_PROFILE_NAME'=>'Associate With Profile', -'LBL_SPECIFY_ROLE_NAME'=>'Specify a name for new role :', -'LBL_ASSIGN_PROFILE'=>'Assign Profile(s)', -'LBL_PROFILE_SELECT_TEXT'=>'Select the Profiles below and click on assign button', -'LBL_PROFILES_AVLBL'=>'Profiles Available', -'LBL_ASSIGN_PROFILES'=>'Assigned Profiles', -'LBL_REPORTS_TO_ROLE'=>'Reports to Role', -'LBL_ASSOCIATED_PROFILES'=>'Associated Profiles :', -'LBL_ASSOCIATED_USERS'=>'Associated Users :', - - -//Added fields in OrgSharingDetailsView.php -'LBL_ORG_SHARING_PRIVILEGES'=>'Organisation Sharing Privileges', -'LBL_EDIT_PERMISSIONS'=>'Edit Permissions', -'LBL_SAVE_PERMISSIONS'=>'Save Permissions', -'LBL_READ_ONLY'=>'Public: Read Only', -'LBL_EDIT_CREATE_ONLY'=>'Public: Read, Create/Edit', -'LBL_READ_CREATE_EDIT_DEL'=>'Public: Read, Create/Edit, Delete', -'LBL_PRIVATE'=>'Private', - -//Added fields in listnotificationschedulers.php -'LBL_HDR_EMAIL_SCHDS'=>'Users : Email Notifications', -'LBL_EMAIL_SCHDS_DESC'=>'The following is the list of notifications that are activated automatically when the corresponding event has happened.', -'LBL_ACTIVE'=>'Active', -'LBL_INACTIVE'=>'Inactive', -'LBL_NOTIFICATION'=>'Notification', -'LBL_DESCRIPTION'=>'Description', -'LBL_TASK_NOTIFICATION'=>'Delayed Task Notification', -'LBL_TASK_NOTIFICATION_DESCRITPION'=>'Notify when a task is delayed beyond 24 hrs', -'LBL_MANY_TICKETS'=>'Too many tickets Notification', -'LBL_MANY_TICKETS_DESCRIPTION'=>'Notify when a particular entity is allocated too many tickets, might reflect Service Level commitments', -'LBL_PENDING_TICKETS'=>'Pending Tickets Notification', -'LBL_TICKETS_DESCRIPTION'=>'Notify for getting attention to status of tickets which are pending', -'LBL_START_NOTIFICATION'=>'Support Start Notification', -'LBL_START_DESCRIPTION'=>'Notifiy stating the start of support/service', -'LBL_BIG_DEAL'=>'Big Deal Notification', -'LBL_BIG_DEAL_DESCRIPTION'=>'Notify on completion of big deal', -'LBL_SUPPORT_NOTICIATION'=>'Support End Notification', -'LBL_SUPPORT_DESCRIPTION'=>'Notify when support is about to end', -'LBL_BUTTON_UPDATE'=>'Update', -'LBL_MODULENAMES'=>'Module', - -//Added fields in ListFieldPermissions.html -'LBL_FIELD_PERMISSION_FIELD_NAME'=>'Field Name', -'LBL_FIELD_PERMISSION_VISIBLE'=>'Visible', -'LBL_FIELD_PERMISSIOM_TABLE_HEADER'=>'Standard Fields', -'LBL_FIELD_LEVEL_ACCESS'=>'Field Level Access', - -//Added fields after 4.0.1 -'LBL_SIGNATURE'=>'Signature', - -//Added for Event Reminder 4.2 Alpha release -'LBL_ACTIVITY_NOTIFICATION'=>'Event Reminder Notification', -'LBL_ACTIVITY_REMINDER_DESCRIPTION'=>'Notify before an event to occur based on the reminder set', -'LBL_MESSAGE'=>'Message', - -//Added for Global Privileges - -'Public: Read Only'=>'Public: Read Only', -'Public: Read, Create/Edit'=>'Public: Read, Create/Edit', -'Public: Read, Create/Edit, Delete'=>'Public: Read, Create/Edit, Delete', -'Private'=>'Private', -'Hide Details'=>'Hide Details', -'Hide Details and Add Events'=>'Hide Details and Add Events', -'Show Details'=>'Show Details', -'Show Details and Add Events'=>'Show Details and Add Events', - -'LBL_USR_CANNOT_ACCESS'=>'Users cannot access other users ', -'LBL_USR_CAN_ACCESS'=>'Users can ', -'LBL_USR_OTHERS'=>' other users ', - -'Read Only '=>'Read Only ', -'Read, Create/Edit, Delete '=>'Read, Create/Edit, Delete ', -'Read, Create/Edit '=>'Read, Create/Edit ', -'Read/Write'=>'Read/Write', -'LBL_GO_TO_TOP'=>'Go to Top', -'LNK_CLICK_HERE'=>'Click here', -'LBL_RULE_NO'=>'Rule No.', -'LBL_CAN_BE_ACCESSED'=>'can be accessed by', -'LBL_PRIVILEGES'=>'Privileges', -'LBL_OF'=>'of', - - - -//Added for 4.2GA support for mail server integration -'LBL_ADD_MAILSERVER_BUTTON_TITLE'=>'Add Mail Server', -'LBL_ADD_MAILSERVER_BUTTON_KEY'=>'M', -'LBL_ADD_MAILSERVER_BUTTON_LABEL'=>'Add Mail Server', - -'LBL_LIST_MAILSERVER_BUTTON_TITLE'=>'List Mail Server', -'LBL_LIST_MAILSERVER_BUTTON_KEY'=>'L', -'LBL_LIST_MAILSERVER_BUTTON_LABEL'=>'List Mail Server', -//added for inventory terms and conditions -'INV_TANDC'=>'Terms & Coditions', -'INV_TERMSANDCONDITIONS'=>'Inventory Terms & Coditions', -'LBL_INV_TERMSANDCONDITIONS'=>'Inventory Management', - - -'INVENTORYNOTIFICATION'=>'Inventory Notifications', -'LBL_INVENTORY_NOTIFICATIONS'=>'Edit Inventory Email Notifications', -'LBL_INV_NOT_DESC'=>'The following are the list of notifications that are sent to the product handler regarding the demand and the current quantity in hand during the creation of a Quote, SalesOrder and Invoice.', - -'InvoiceNotification'=>'Product Stock Notification during Invoice Generation', -'InvoiceNotificationDescription'=>'When the product stock level goes below the re-order level, notification will be sent to the product handler', - -'QuoteNotification'=>'Product Stock Notification during Quote Generation', -'QuoteNotificationDescription'=>'During quote generation if the product stock in warehouse is lesser than the quantity mentioned in quote then this notification will be sent to the product handler', - -'SalesOrderNotification'=>'Product Stock Notification during Sales Order Generation', -'SalesOrderNotificationDescription'=>'During sales order generation if the product stock in warehouse is lesser than the quantity mentioned in sales order then this notification will be sent to the product handler', - -//New addition for 4.2 GA -'LBL_USER_FIELDS'=>'User Fields', -'LBL_NOTE_DO_NOT_REMOVE_INFO'=>'Note: Donot remove or alter the values within { }', - -//Added for patch2 -'LBL_FILE_INFORMATION'=>'File Information', - -//Added after pathc2 -'LBL_LEAD_FIELD_ACCESS'=>'Lead Field Access', - -'LBL_ACCOUNT_FIELD_ACCESS'=>'Account Field Access', - -'LBL_CONTACT_FIELD_ACCESS'=>'Contact Field Access', - -'LBL_OPPORTUNITY_FIELD_ACCESS'=>'Potential Field Access', - -'LBL_HELPDESK_FIELD_ACCESS'=>'HelpDesk Field Access', - -'LBL_PRODUCT_FIELD_ACCESS'=>'Product Field Access', - -'LBL_NOTE_FIELD_ACCESS'=>'Note Field Access', - -'LBL_EMAIL_FIELD_ACCESS'=>'Email Field Access', - -'LBL_TASK_FIELD_ACCESS'=>'Task Field Access', - -'LBL_EVENT_FIELD_ACCESS'=>'Event Field Access', -'LBL_VENDOR_FIELD_ACCESS'=>'Vendor Field Access', -'LBL_PB_FIELD_ACCESS'=>'PriceBook Field Access', -'LBL_QUOTE_FIELD_ACCESS'=>'Quote Field Access', -'LBL_PO_FIELD_ACCESS'=>'Purchase Order Field Access', -'LBL_SO_FIELD_ACCESS'=>'Sales Order Access', -'LBL_INVOICE_FIELD_ACCESS'=>'Invoice Field Access', - -//given for calendar color for an user user -'LBL_COLOR'=>'Color in Calendar', -//added for activity view in home page -'LBL_ACTIVITY_VIEW'=>'Default Activity View', -//Added to change Home page order -'LBL_HOMEPAGE_ORDER_UPDATE'=>'Update Home Page Block Order', -'LBL_HOMEPAGE_ID'=>'Block Order', -'ERR_INVALID_USER'=>'Invalid access--Please call from My Accounts', -'ALVT'=>'Top Accounts', -'PLVT'=>'Top Potentials', -'QLTQ'=>'Top Quotes', -'CVLVT'=>'Key Metrics', -'HLT'=>'Top Trouble Tickets', -'OLV'=>'Upcoming & Pending Activities', -'GRT'=>'My Group Allocation', -'OLTSO'=>'Top Sales Orders', -'ILTI'=>'Top Invoices', -'HDB'=>'Home Page Dashboard', -'OLTPO'=>'Top Purchase Orders', -'LTFAQ'=>'My Recent FAQs', - -//Added for 5.0 alpha -'LBL_GROUP_NAME_ERROR'=>'Group Name already exists!', -'MNL'=>'My New Leads', -'LBL_LEAD_VIEW'=>'Default Leads View', -'LBL_TAG_CLOUD'=>'Tag Cloud', -'LBL_LIST_TOOLS'=>'Tools', -'LBL_STATISTICS'=>'Statistics', -'LBL_TOTAL'=>'Total :', -'LBL_OTHERS'=>'Others :', -'LBL_USERS'=>'User(s)', -'LBL_USER_LOGIN_ROLE'=>'User Login & Role', -'LBL_USER_MORE_INFN'=>'More Information', -'LBL_USER_ADDR_INFN'=>'Address Information', -'LBL_USER_IMAGE'=>'User Image', -'LBL_USR'=>'Users', - -'LBL_MY'=>'My', -'LBL_MY_DEFAULTS'=>'My Defaults', -'LBL_MY_DESG'=>'My Designation & Contact Details', -'LBL_MY_ADDR'=>'My Postal Address', -'LBL_MY_DETAILS'=>'My Details', -'LBL_MY_PHOTO'=>'My Photo', -'LBL_CHANGE_PHOTO'=>'Change Photo...', -'LBL_CHANGE'=>'Change', - - -//Added for Access Privileges - -'LBL_GLOBAL_FIELDS_MANAGER'=>'Global Fields Manager', -'LBL_GLOBAL_ACCESS_PRIVILEGES'=>'Organization-level Sharing Rules', -'LBL_CUSTOM_ACCESS_PRIVILEGES'=>'Custom Sharing Rules', -'LBL_BOTH'=>'Both', -'LBL_VIEW'=>'View', -'LBL_RECALCULATE_BUTTON'=>'Recalculate', -'LBL_ADD_PRIVILEGES_BUTTON'=>'Add Privileges', -'LBL_CUSTOM_ACCESS_MESG'=>'No Custom Access Rules defined .', -'LBL_CREATE_RULE_MESG'=>'to create a new Rule', -'LBL_SELECT_SCREEN'=>'Select the Screen / Module :', -'LBL_FIELDS_AVLBL'=>'Fields Available in', -'LBL_FIELDS_SELECT_DESELECT'=>'Fields to be shown', -'LBL_ROLE_TO_BE_DELETED'=>'Role to be Deleted', -'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role', -'LBL_DELETE_ROLE'=>'Delete Role', -'LBL_MORE_INFORMATION'=>'More Information', -'LBL_USERLOGIN_ROLE'=>'User Login & Role', -'LBL_USER_IMAGE_INFORMATION'=>'User Photograph', - -//Added for 5.0 for all fields -'Role'=>'Role', -'Email'=>'Email', -'Admin'=>'Admin', -'User Name'=>'User Name', -'First Name'=>'First Name', -'Last Name'=>'Last Name', -'Status'=>'Status', -'Default Activity View'=>'Default Calendar View', -'Default Lead View'=>'Default Lead View', -'Currency'=>'Currency', -'Title'=>'Title', -'Office Phone'=>'Office Phone', -'Department'=>'Department', -'Mobile'=>'Mobile', -'Reports To'=>'Reports To', -'Other Phone'=>'Other Phone', -'Other Email'=>'Other Email', -'Fax'=>'Fax', -'Yahoo id'=>'Yahoo id', -'Home Phone'=>'Home Phone', -'User Image'=>'Upload Photograph', -'Date Format'=>'Date Format', -'Tag Cloud'=>'Tag Cloud', -'Signature'=>'Signature', -'Notes'=>'Notes', -'Street Address'=>'Street Address', -'City'=>'City', -'State'=>'State', -'Postal Code'=>'Postal Code', -'Country'=>'Country', -'Password'=>'Password', -'Confirm Password'=>'Confirm Password', -'LBL_SHOWN'=>'Shown', -'LBL_HIDDEN'=>'Hidden', -'LBL_SHOW'=>'Show', -'LBL_HIDE'=>'Hide', -'LBL_HOME_PAGE_COMP'=>'Home Page Components', -'LBL_LOGIN_HISTORY'=>'Login History', -'LBL_USERDETAIL_INFO'=>'Viewing details about the user', -'LBL_DELETE_GROUP'=>'Delete Group', -'LBL_DELETE_GROUPNAME'=>'Group to be Deleted', -'LBL_TRANSFER_GROUP'=>'Transfer Ownership to: ', -'LBL_DELETE_USER'=>'User to be Deleted', -'LBL_TRANSFER_USER'=>'Transfer Ownership to User', -'LBL_DELETE_PROFILE'=>'Delete Profile', -'LBL_TRANSFER_ROLES_TO_PROFILE'=>'Transfer Roles to Profile', -'LBL_PROFILE_TO_BE_DELETED'=>'Profile to be Deteted', - -//Added for disabling window Recalculate - -'LBL_RECALC_MSG'=>'Are you sure, you wish to Recalculate Sharing Access?', -'LBL_YES'=>'Yes', -'LBL_NO'=>'No', - -'LBL_MANDATORY_MSG'=>'Mandatory Fields', -'LBL_DISABLE_FIELD_MSG'=>'Fields Disabled from Global Field Access Settings', - -//Added for About Us - -'LBL_CONTACT_US'=>'Contact Us', -'LBL_READ_LICENSE'=>'Read License', -'LBL_VERSION'=>'Version', -'LBL_TEAM'=>'Team', -'LBL_CREDITS'=>'Credits', -'LBL_THIRD_PARTY'=>'Third Party Packages', -'LBL_COMMUNITY'=>'And vtiger Community', - -'LBL_ASSIGN_ROLE'=>'Assign Role', - -); - -?> +'Users', +'LBL_MODULE_TITLE'=>'Users: Home', +'LBL_SEARCH_FORM_TITLE'=>'User Search', +'LBL_LIST_FORM_TITLE'=>'User List', +'LBL_NEW_FORM_TITLE'=>'New User', +'LBL_CREATE_NEW_USER'=>'Create New User', +'LBL_LOGIN'=>'Login', +'LBL_USER_ROLE'=>'Role', +'LBL_LIST_NAME'=>'Name', +'LBL_LIST_LAST_NAME'=>'Last Name', +'LBL_LIST_USER_NAME'=>'User Name', +'LBL_LIST_DEPARTMENT'=>'Department', +'LBL_LIST_EMAIL'=>'E-Mail', +'LBL_LIST_PRIMARY_PHONE'=>'Primary Phone', +'LBL_LIST_ADMIN'=>'Admin', +'LBL_LIST_CONFIRM_PASSWORD'=>'Confirm Password', +'LBL_LIST_USER_NAME_ROLE'=>'User ID , Name & Role', +'LBL_LIST_SELECT'=>'Select', +'LBL_LIST_PHONE'=>'Phone', +'LBL_LIST_NO'=>'#', + +'LBL_ADMINS'=>'Admins', +'LBL_STD_USERS'=>'Standard Users', + +'UserName'=>'UserName', +'Name'=>'Name', +'Tools'=>'Tools', + + +//added for patch2 +'LBL_GROUP'=>'Group', +'LBL_CURRENCY_NAME'=>'Currency', + +'LBL_NEW_USER_BUTTON_TITLE'=>'New User [Alt+N]', +'LBL_NEW_USER_BUTTON_LABEL'=>'New User', +'LBL_NEW_USER_BUTTON_KEY'=>'N', +'LBL_DATE_FORMAT'=>'Date Format', + +'LBL_ERROR'=>'Error:', +'LBL_PASSWORD'=>'Password', +'LBL_USER_NAME'=>'User Name', +'LBL_CRM_ID'=>'CRM ID', +'LBL_FIRST_NAME'=>'First Name', +'LBL_LAST_NAME'=>'Last Name', +'LBL_YAHOO_ID'=>'Yahoo ID', +'LBL_THEME'=>'Color Theme', +'LBL_LANGUAGE'=>'Language', +'LBL_ADMIN'=>'Admin', +'LBL_OFFICE_PHONE'=>'Office Phone', +'LBL_REPORTS_TO'=>'Reports to', +'LBL_OTHER_PHONE'=>'Other Phone', +'LBL_OTHER_EMAIL'=>'Other Email', +'LBL_DEPARTMENT'=>'Department', +'LBL_STATUS'=>'Status', +'LBL_TITLE'=>'Title', +'LBL_ANY_PHONE'=>'Any Phone:', +'LBL_ANY_EMAIL'=>'Any Email:', +'LBL_ADDRESS'=>'Street Address', +'LBL_CITY'=>'City', +'LBL_STATE'=>'State', +'LBL_POSTAL_CODE'=>'Postal Code', +'LBL_COUNTRY'=>'Country', +'LBL_USER_SETTINGS'=>'User Settings', +'LBL_USER_INFORMATION'=>'User Information', +'LBL_MOBILE_PHONE'=>'Mobile', +'LBL_OTHER'=>'Other', +'LBL_FAX'=>'Fax', +'LBL_EMAIL'=>'E-Mail Id', +'LBL_HOME_PHONE'=>'Home Phone', +'LBL_ADDRESS_INFORMATION'=>'User Address', +'LBL_CAL_HRFORMAT'=>'Calendar Time Format', +'LBL_CAL_DURATION'=>'Day starts at', +'LBL_PRIMARY_ADDRESS'=>'Primary Address:', + +'LBL_ORGANIZATION_INFORMATION'=>'Organizations', +'LBL_PRIMARY_ORGANIZATION'=>'Primary organization', +'LBL_ASSIGNED_ORGANIZATIONS'=>'Assigned to organizations', +'LBL_PRIMARY_ORGUNITS'=>'Primary organization units', + +'LBL_CHANGE_PASSWORD_BUTTON_TITLE'=>'Change Password [Alt+P]', +'LBL_CHANGE_PASSWORD_BUTTON_KEY'=>'P', +'LBL_CHANGE_PASSWORD_BUTTON_LABEL'=>'Change Password', +'LBL_LOGIN_BUTTON_TITLE'=>'Login [Alt+L]', +'LBL_LOGIN_BUTTON_KEY'=>'L', +'LBL_LOGIN_BUTTON_LABEL'=>'Login', +'LBL_LOGIN_HISTORY_BUTTON_TITLE'=>'Login History [Alt+H]', +'LBL_LOGIN_HISTORY_BUTTON_KEY'=>'H', +'LBL_LOGIN_HISTORY_BUTTON_LABEL'=>'Login History', +'LBL_LOGIN_HISTORY_TITLE'=>'Users: Login History', +'LBL_RESET_PREFERENCES'=>'Reset To Default Preferences', + +'LBL_CHANGE_PASSWORD'=>'Change Password', +'LBL_OLD_PASSWORD'=>'Old Password:', +'LBL_NEW_PASSWORD'=>'New Password:', +'LBL_CONFIRM_PASSWORD'=>'Confirm Password:', +'ERR_ENTER_OLD_PASSWORD'=>'Please enter your old password.', +'ERR_ENTER_NEW_PASSWORD'=>'Please enter your new password.', +'ERR_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', +'ERR_REENTER_PASSWORDS'=>'Please re-enter passwords. The \"new password\" and \"confirm password\" values do not match.', +'ERR_INVALID_PASSWORD'=>'You must specify a valid username and password.', +'ERR_PASSWORD_CHANGE_FAILED_1'=>'User password change failed for ', +'ERR_PASSWORD_CHANGE_FAILED_2'=>' failed. The new password must be set.', +'ERR_PASSWORD_INCORRECT_OLD'=>'Incorrect old password specified. Re-enter password information.', +'ERR_USER_NAME_EXISTS_1'=>'The user name ', +'ERR_USER_NAME_EXISTS_2'=>' already exists. Duplicate user names are not allowed.
    Change the user name to be unique.', +'ERR_LAST_ADMIN_1'=>'The user name ', +'ERR_LAST_ADMIN_2'=>' is the last Admin user. At least one user must be an Admin user.
    Check the Admin user setting.', + +'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.", + +// Additional Fields for i18n --- Release vtigerCRM 3.2 Patch 2 +// Users--listroles.php , createrole.php , ListPermissions.php , editpermissions.php + +'LBL_ROLES'=>'Roles', +'LBL_ROLES_SUBORDINATES'=>'Roles and Subordinates', + +'LBL_CREATE_NEW_ROLE'=>'Create New Role', +'LBL_INDICATES_REQUIRED_FIELD'=>'Indicates Required Field', +'LBL_NEW_ROLE'=>'New Role', +'LBL_PARENT_ROLE'=>'Parent Role', + +'LBL_LIST_ROLES'=>'List Roles', +'LBL_ENTITY_LEVEL_PERMISSIONS'=>'Entity Level Permissions', +'LBL_ENTITY'=>'Entity', +'LBL_CREATE_EDIT'=>'Create/Edit', +'LBL_DELETE'=>'Delete', +'LBL_LEADS'=>'Leads', +'LBL_ACCOUNTS'=>'Accounts', +'LBL_CONTACTS'=>'Contacts', +'LBL_OPPURTUNITIES'=>'Opportunities', +'LBL_TASKS'=>'Tasks', +'LBL_CASES'=>'Cases', +'LBL_EMAILS'=>'Email', +'LBL_NOTES'=>'Notes', +'LBL_MEETINGS'=>'Meetings', +'LBL_CALLS'=>'Calls', +'LBL_IMPORT_PERMISSIONS'=>'Import Permissions', +'LBL_IMPORT_LEADS'=>'Import Leads', +'LBL_IMPORT_ACCOUNTS'=>'Import Accounts', +'LBL_IMPORT_CONTACTS'=>'Import Contacts', +'LBL_IMPORT_OPPURTUNITIES'=>'Import Opportunities', + +'LBL_ROLE_DETAILS'=>'Role Details', +//added for vtigercrm4 rc +'LBL_FILE'=> 'File Name', +'LBL_FILE_TYPE'=>'File Type', +'LBL_UPLOAD'=>'Upload File', +'LBL_ATTACH_FILE'=>'Attach Mail Merge Template', +'LBL_EMAIL_TEMPLATES'=>'Email Templates', +'LBL_TEMPLATE_HEADER'=>'Template', +'LBL_TEMPLATE_DETAILS'=>'Template Details', +'LBL_EDIT_TEMPLATE'=>'Edit Template', +'LBL_TEMPLATE_FILE'=>'Template File', +'LBL_EMAIL_TEMPLATES_LIST'=>'Communication Templates > Email Templates', +'LBL_MAILMERGE_TEMPLATES_LIST'=>' > Communication Templates > Mail Merge Templates', +'LBL_MAILMERGE_TEMPLATES_ATTACHMENT' => '> Communication Templates > Attach Mail Merge Template', +'LBL_DOWNLOAD_NOW'=>'Download Now', +'LBL_DOWNLOAD'=>'Download', +'LBL_SELECT_MODULE'=>'Select Module', +'LBL_MERGE_FILE'=>'File : ', +'LBL_MERGE_MSG'=>'Select a module to assign this Template', +'LBL_MERGE_FIELDS'=>'Merge Fields', +'LBL_COPY_PASTE'=>'Copy & Paste', +'LNK_GO_TO_TOP'=>'Go to Page Top', +'LBL_COLON'=>':', +'LBL_EMAIL_TEMPLATE'=>'Email Template', +'LBL_NEW_TEMPLATE'=>'New Template', +'LBL_ADD_TEMPLATE'=>'Add Template', +'LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT'=>'Use merge fields to personalize your email content.', +'LBL_AVAILABLE_MERGE_FIELDS'=>'Available Merge Fields', +'LBL_SELECT_FIELD_TYPE'=>'Select Field Type', +'LBL_SELECT_FIELD'=>'Select Field :', +'LBL_MERGE_FIELD_VALUE'=>'Copy Merge Field Value :', +'LBL_ACCOUNT_FIELDS'=>'Account Fields', +'LBL_CONTACT_FIELDS'=>'Contact Fields', +'LBL_LEAD_FIELDS'=>'Lead Fields', +'LBL_COPY_AND_PASTE_MERGE_FIELD'=>'Copy and paste the merge field value into your template below.', +'LBL_EMAIL_TEMPLATE_INFORMATION'=>'Communication Templates > Email Templates > Viewing', +'LBL_FOLDER'=>'Folder', +'LBL_PERSONAL'=>'Personal', +'LBL_PUBLIC'=>'Public', +'LBL_TEMPLATE_NAME'=>'Template Name:', +'LBL_SUBJECT'=>'Subject', +'LBL_BODY'=>'Email Body', +'LBL_TEMPLATE_TOOLS'=>'Tools', +'LBL_TEMPLATE_PUBLIC'=>'Public Access', +'LBL_TEMPLATE_PRIVATE'=>'Private Access', +'LBL_TEMPLATE_SUBJECT'=>'Email Subject', +'LBL_TEMPLATE_MESSAGE'=>'Email Message', +'LBL_VIEWING'=>'Viewing', +'LBL_PROPERTIES'=>'Properties of', + + + +// Added fields in createnewgroup.php +'LBL_CREATE_NEW_GROUP'=>'Create New Group', +'LBL_NEW_GROUP'=>'New Group', +'LBL_EDIT_GROUP'=>'Edit Group', +'LBL_GROUP_NAME'=>'Group Name', +'LBL_GROUP_DETAILS'=>'Group Details', +'LBL_MEMBER'=>'Members', +'LBL_MEMBER_AVLBL'=>'Available Entities & Members', +'LBL_MEMBER_SELECTED'=>'Selected Members', +'LBL_DESCRIPTION'=>'Description', +'LBL_GROUP_MESG1'=>'Groups are a flexible way to assign access rights, when complex access rights has to be defined. You can combine multiple entities like Roles, Users, profiles etc into a single group.', +'LBL_GROUP_MESG2'=>'To add, select the Entity members from left and click the ">>" button.', +'LBL_GROUP_MESG3'=>'To remove, select the group members from the right and click the "<<" button.', + + +// Added fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php +'LBL_DETAIL_VIEW_OF_EMAIL_TEMPLATE'=>'Detail View of Email Template', +'LBL_DETAIL_VIEW'=>'Detail View of', +'LBL_EDIT_VIEW'=>'Editing details of the user', +'LBL_EDITING'=>'Editing user', +'LBL_GROUP_MEMBERS_LIST'=>'Group members list', +'LBL_GROUPS'=>'Groups', +'LBL_MY_GROUPS'=>'My Groups', +'LBL_ADD_GROUP_BUTTON'=>'Add Group', +'LBL_WORD_TEMPLATES'=>'Mail Merge Templates', +'LBL_NEW_WORD_TEMPLATE'=>'New Template', +'LBL_EMAIL_TEMPLATE_DESC'=>'Manage email templates used for Campaigns and Mass mailing', +'LBL_NAME'=>'Name', + +// Added fields in TabCustomise.php,html and UpdateTab.php,html +'LBL_CUSTOMISE_TABS'=>'Customize Tabs', +'LBL_CHOOSE_TABS'=>'Choose Tabs', +'LBL_AVAILABLE_TABS'=>'Available Tabs', +'LBL_SELECTED_TABS'=>'Selected Tabs', +'LBL_USER'=>'User', +'LBL_TAB_MENU_UPDATED'=>'Tab Menu Updated! kindly go to ', +'LBL_TO_VIEW_CHANGES'=>' to view the changes', + +// Added to change homepage order +'LBL_CHANGE_HOMEPAGE_LABEL'=>'Homepage Order', +'LBL_CHANGE_HOMEPAGE_TITLE'=>'Homepage', + +// Added fields in binaryfilelist.php +'LBL_OERATION'=>'Operation', + +// Added fields in CreateProfile.php +'LBL_PROFILE_NAME'=>'Create New Profile:', +'LBL_NEW_PROFILE'=>'New Profile', +'LBL_NEW_PROFILE_NAME'=>'Profile Name', +'LBL_PARENT_PROFILE'=>'Parent Profile', +'LBL_BASIC_PROFILE_DETAILS'=>'Basic details of Profile', +'LBL_STEP_1_2'=>'Step 1 of 2', +'LBL_STEP_2_2'=>'Step 2 of 2', +'LBL_STEP'=>'Step', +'LBL_SELECT_BASE_PROFILE'=>'Select Base Profile', +'LBL_PROFILE_PRIVILEGES'=>'Profile Privileges', +'LBL_GLOBAL_PRIVILEGES'=>'Global Privileges', +'LBL_TAB_PRIVILEGES'=>'Tab Privileges', +'LBL_FIELD_PRIVILEGES'=>'Field Privileges', +'LBL_STANDARD_PRIVILEGES'=>'Standard Privileges', +'LBL_UTILITY_PRIVILEGES'=>'Utility Privileges', +'LBL_UTILITIES'=>'Utilities', +'LBL_BASE_PROFILE_MESG'=>'I would like to setup a base profile and edit privileges (Recommended)', +'LBL_BASE_PROFILE'=>'Base Profile:', +'LBL_OR'=>'OR', +'LBL_BASE_PROFILE_MESG_ADV'=>'I will choose the privileges from scratch (Advanced Users)', +'LBL_FOR'=>'for', +'LBL_GLOBAL_MESG_OPTION'=>'Select the options below to change global privileges', +'LBL_VIEW_ALL'=>'View all', +'LBL_EDIT_ALL'=>'Edit all', +'LBL_ALLOW'=>'Allows', +'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM', +'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM', +'LBL_STD_MESG_OPTION'=>'Select the standard actions to be permitted', +'LBL_TAB_MESG_OPTION'=>'modules to be shown', +'LBL_UTILITY_MESG_OPTION'=>'Select the utility actions to be permitted', +'LBL_FIELD_MESG_OPTION'=>'Select the fields to be permitted', +'LBL_FINISH_BUTTON'=>'Finish', +'LBL_PROFILE_DETAIL_VIEW'=>'Detail View of Profile', +'LBL_PROFILE_MESG'=>'Viewing access privileges for', +'LBL_PROFILE_M'=>'Profile', +'LBL_DEFINE_PRIV_FOR'=>' Define Privileges for ', +'LBL_USE_OPTION_TO_SET_PRIV'=>'Use the options below to set privileges', +'LBL_SUPER_USER_PRIV'=>'Global Privileges', +'LBL_SET_PRIV_FOR_EACH_MODULE'=>'Set Privileges for each Module ', +'LBL_FIELDS_AND_TOOLS_SETTINGS'=>'Fields & Tools Settings', +'LBL_SHOW_FIELDS'=>'Show Fields', +'LBL_TOOLS_TO_BE_SHOWN'=>'Tools to be shown', +'LBL_WELCOME_PROFILE_CREATE'=>'Welcome to Privilege Profile Creator ', +'LBL_SELECT_CHOICE_NEW_PROFILE'=>'Select your choice of creating the new profile', +'LBL_ADD_CUSTOM_RULE'=>'Add Custom Privilege Rule', +'LBL_EDIT_CUSTOM_RULE'=>'Edit Custom Privilege Rule', +'LBL_CLOSE'=>'Close', +'LBL_SELECT_ENTITY'=>'Select an entity below', +'LBL_CAN_BE_ACCESSED_BY'=>'Can be accessed by', +'LBL_PERMISSIONS'=>'Permissions', +'LBL_ACCESS_RIGHTS_FOR_MODULES'=>'Access rights for relative modules', +'LBL_RULE_CONSTRUCTION'=>'Rule Construction Display', +'LBL_ADD_RULE'=>'Add Rule', +'LBL_RELATED_MODULE_RIGHTS'=>'Related Module Rights', +'LBL_IN_PERMISSION'=>'in the permission', + +//Added fields in createrole.php +'LBL_HDR_ROLE_NAME'=>'Create New Role:', +'LBL_TITLE_ROLE_NAME'=>'New Role', +'LBL_ROLE_NAME'=>'Role Name', +'LBL_ROLE_PROFILE_NAME'=>'Associate With Profile', +'LBL_SPECIFY_ROLE_NAME'=>'Specify a name for new role :', +'LBL_ASSIGN_PROFILE'=>'Assign Profile(s)', +'LBL_PROFILE_SELECT_TEXT'=>'Select the Profiles below and click on assign button', +'LBL_PROFILES_AVLBL'=>'Profiles Available', +'LBL_ASSIGN_PROFILES'=>'Assigned Profiles', +'LBL_REPORTS_TO_ROLE'=>'Reports to Role', +'LBL_ASSOCIATED_PROFILES'=>'Associated Profiles :', +'LBL_ASSOCIATED_USERS'=>'Associated Users :', + + +//Added fields in OrgSharingDetailsView.php +'LBL_ORG_SHARING_PRIVILEGES'=>'Organisation Sharing Privileges', +'LBL_EDIT_PERMISSIONS'=>'Edit Permissions', +'LBL_SAVE_PERMISSIONS'=>'Save Permissions', +'LBL_READ_ONLY'=>'Public: Read Only', +'LBL_EDIT_CREATE_ONLY'=>'Public: Read, Create/Edit', +'LBL_READ_CREATE_EDIT_DEL'=>'Public: Read, Create/Edit, Delete', +'LBL_PRIVATE'=>'Private', + +//Added fields in listnotificationschedulers.php +'LBL_HDR_EMAIL_SCHDS'=>'Users : Email Notifications', +'LBL_EMAIL_SCHDS_DESC'=>'The following is the list of notifications that are activated automatically when the corresponding event has happened.', +'LBL_ACTIVE'=>'Active', +'LBL_INACTIVE'=>'Inactive', +'LBL_NOTIFICATION'=>'Notification', +'LBL_DESCRIPTION'=>'Description', +'LBL_TASK_NOTIFICATION'=>'Delayed Task Notification', +'LBL_TASK_NOTIFICATION_DESCRITPION'=>'Notify when a task is delayed beyond 24 hrs', +'LBL_MANY_TICKETS'=>'Too many tickets Notification', +'LBL_MANY_TICKETS_DESCRIPTION'=>'Notify when a particular entity is allocated too many tickets, might reflect Service Level commitments', +'LBL_PENDING_TICKETS'=>'Pending Tickets Notification', +'LBL_TICKETS_DESCRIPTION'=>'Notify for getting attention to status of tickets which are pending', +'LBL_START_NOTIFICATION'=>'Support Start Notification', +'LBL_START_DESCRIPTION'=>'Notifiy stating the start of support/service', +'LBL_BIG_DEAL'=>'Big Deal Notification', +'LBL_BIG_DEAL_DESCRIPTION'=>'Notify on completion of big deal', +'LBL_SUPPORT_NOTICIATION'=>'Support End Notification', +'LBL_SUPPORT_DESCRIPTION'=>'Notify when support is about to end', +'LBL_BUTTON_UPDATE'=>'Update', +'LBL_MODULENAMES'=>'Module', + +//Added fields in ListFieldPermissions.html +'LBL_FIELD_PERMISSION_FIELD_NAME'=>'Field Name', +'LBL_FIELD_PERMISSION_VISIBLE'=>'Visible', +'LBL_FIELD_PERMISSIOM_TABLE_HEADER'=>'Standard Fields', +'LBL_FIELD_LEVEL_ACCESS'=>'Field Level Access', + +//Added fields after 4.0.1 +'LBL_SIGNATURE'=>'Signature', + +//Added for Event Reminder 4.2 Alpha release +'LBL_ACTIVITY_NOTIFICATION'=>'Event Reminder Notification', +'LBL_ACTIVITY_REMINDER_DESCRIPTION'=>'Notify before an event to occur based on the reminder set', +'LBL_MESSAGE'=>'Message', + +//Added for Global Privileges + +'Public: Read Only'=>'Public: Read Only', +'Public: Read, Create/Edit'=>'Public: Read, Create/Edit', +'Public: Read, Create/Edit, Delete'=>'Public: Read, Create/Edit, Delete', +'Private'=>'Private', +'Hide Details'=>'Hide Details', +'Hide Details and Add Events'=>'Hide Details and Add Events', +'Show Details'=>'Show Details', +'Show Details and Add Events'=>'Show Details and Add Events', + +'LBL_USR_CANNOT_ACCESS'=>'Users cannot access other users ', +'LBL_USR_CAN_ACCESS'=>'Users can ', +'LBL_USR_OTHERS'=>' other users ', + +'Read Only '=>'Read Only ', +'Read, Create/Edit, Delete '=>'Read, Create/Edit, Delete ', +'Read, Create/Edit '=>'Read, Create/Edit ', +'Read/Write'=>'Read/Write', +'LBL_GO_TO_TOP'=>'Go to Top', +'LNK_CLICK_HERE'=>'Click here', +'LBL_RULE_NO'=>'Rule No.', +'LBL_CAN_BE_ACCESSED'=>'can be accessed by', +'LBL_PRIVILEGES'=>'Privileges', +'LBL_OF'=>'of', + + + +//Added for 4.2GA support for mail server integration +'LBL_ADD_MAILSERVER_BUTTON_TITLE'=>'Add Mail Server', +'LBL_ADD_MAILSERVER_BUTTON_KEY'=>'M', +'LBL_ADD_MAILSERVER_BUTTON_LABEL'=>'Add Mail Server', + +'LBL_LIST_MAILSERVER_BUTTON_TITLE'=>'List Mail Server', +'LBL_LIST_MAILSERVER_BUTTON_KEY'=>'L', +'LBL_LIST_MAILSERVER_BUTTON_LABEL'=>'List Mail Server', +//added for inventory terms and conditions +'INV_TANDC'=>'Terms & Coditions', +'INV_TERMSANDCONDITIONS'=>'Inventory Terms & Coditions', +'LBL_INV_TERMSANDCONDITIONS'=>'Inventory Management', + + +'INVENTORYNOTIFICATION'=>'Inventory Notifications', +'LBL_INVENTORY_NOTIFICATIONS'=>'Edit Inventory Email Notifications', +'LBL_INV_NOT_DESC'=>'The following are the list of notifications that are sent to the product handler regarding the demand and the current quantity in hand during the creation of a Quote, SalesOrder and Invoice.', + +'InvoiceNotification'=>'Product Stock Notification during Invoice Generation', +'InvoiceNotificationDescription'=>'When the product stock level goes below the re-order level, notification will be sent to the product handler', + +'QuoteNotification'=>'Product Stock Notification during Quote Generation', +'QuoteNotificationDescription'=>'During quote generation if the product stock in warehouse is lesser than the quantity mentioned in quote then this notification will be sent to the product handler', + +'SalesOrderNotification'=>'Product Stock Notification during Sales Order Generation', +'SalesOrderNotificationDescription'=>'During sales order generation if the product stock in warehouse is lesser than the quantity mentioned in sales order then this notification will be sent to the product handler', + +//New addition for 4.2 GA +'LBL_USER_FIELDS'=>'User Fields', +'LBL_NOTE_DO_NOT_REMOVE_INFO'=>'Note: Donot remove or alter the values within { }', + +//Added for patch2 +'LBL_FILE_INFORMATION'=>'File Information', + +//Added after pathc2 +'LBL_LEAD_FIELD_ACCESS'=>'Lead Field Access', + +'LBL_ACCOUNT_FIELD_ACCESS'=>'Account Field Access', + +'LBL_CONTACT_FIELD_ACCESS'=>'Contact Field Access', + +'LBL_OPPORTUNITY_FIELD_ACCESS'=>'Potential Field Access', + +'LBL_HELPDESK_FIELD_ACCESS'=>'HelpDesk Field Access', + +'LBL_PRODUCT_FIELD_ACCESS'=>'Product Field Access', + +'LBL_NOTE_FIELD_ACCESS'=>'Note Field Access', + +'LBL_EMAIL_FIELD_ACCESS'=>'Email Field Access', + +'LBL_TASK_FIELD_ACCESS'=>'Task Field Access', + +'LBL_EVENT_FIELD_ACCESS'=>'Event Field Access', +'LBL_VENDOR_FIELD_ACCESS'=>'Vendor Field Access', +'LBL_PB_FIELD_ACCESS'=>'PriceBook Field Access', +'LBL_QUOTE_FIELD_ACCESS'=>'Quote Field Access', +'LBL_PO_FIELD_ACCESS'=>'Purchase Order Field Access', +'LBL_SO_FIELD_ACCESS'=>'Sales Order Access', +'LBL_INVOICE_FIELD_ACCESS'=>'Invoice Field Access', + +//given for calendar color for an user user +'LBL_COLOR'=>'Color in Calendar', +//added for activity view in home page +'LBL_ACTIVITY_VIEW'=>'Default Activity View', +//Added to change Home page order +'LBL_HOMEPAGE_ORDER_UPDATE'=>'Update Home Page Block Order', +'LBL_HOMEPAGE_ID'=>'Block Order', +'ERR_INVALID_USER'=>'Invalid access--Please call from My Accounts', +'ALVT'=>'Top Accounts', +'PLVT'=>'Top Potentials', +'QLTQ'=>'Top Quotes', +'CVLVT'=>'Key Metrics', +'HLT'=>'Top Trouble Tickets', +'OLV'=>'Upcoming & Pending Activities', +'GRT'=>'My Group Allocation', +'OLTSO'=>'Top Sales Orders', +'ILTI'=>'Top Invoices', +'HDB'=>'Home Page Dashboard', +'OLTPO'=>'Top Purchase Orders', +'LTFAQ'=>'My Recent FAQs', + +//Added for 5.0 alpha +'LBL_GROUP_NAME_ERROR'=>'Group Name already exists!', +'MNL'=>'My New Leads', +'LBL_LEAD_VIEW'=>'Default Leads View', +'LBL_TAG_CLOUD'=>'Tag Cloud', +'LBL_LIST_TOOLS'=>'Tools', +'LBL_STATISTICS'=>'Statistics', +'LBL_TOTAL'=>'Total :', +'LBL_OTHERS'=>'Others :', +'LBL_USERS'=>'User(s)', +'LBL_USER_LOGIN_ROLE'=>'User Login & Role', +'LBL_USER_MORE_INFN'=>'More Information', +'LBL_USER_ADDR_INFN'=>'Address Information', +'LBL_USER_IMAGE'=>'User Image', +'LBL_USR'=>'Users', + +'LBL_MY'=>'My', +'LBL_MY_DEFAULTS'=>'My Defaults', +'LBL_MY_DESG'=>'My Designation & Contact Details', +'LBL_MY_ADDR'=>'My Postal Address', +'LBL_MY_PHOTO'=>'My Photo', +'LBL_CHANGE_PHOTO'=>'Change Photo...', +'LBL_CHANGE'=>'Change', + + +//Added for Access Privileges + +'LBL_GLOBAL_FIELDS_MANAGER'=>'Global Fields Manager', +'LBL_GLOBAL_ACCESS_PRIVILEGES'=>'Organization-level Sharing Rules', +'LBL_CUSTOM_ACCESS_PRIVILEGES'=>'Custom Sharing Rules', +'LBL_BOTH'=>'Both', +'LBL_VIEW'=>'View', +'LBL_RECALCULATE_BUTTON'=>'Recalculate', +'LBL_ADD_PRIVILEGES_BUTTON'=>'Add Privileges', +'LBL_CUSTOM_ACCESS_MESG'=>'No Custom Access Rules defined .', +'LBL_CREATE_RULE_MESG'=>'to create a new Rule', +'LBL_SELECT_SCREEN'=>'Select the Screen / Module :', +'LBL_FIELDS_AVLBL'=>'Fields Available in', +'LBL_FIELDS_SELECT_DESELECT'=>'Fields to be shown', +'LBL_ROLE_TO_BE_DELETED'=>'Role to be Deleted', +'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role', +'LBL_DELETE_ROLE'=>'Delete Role', +'LBL_MORE_INFORMATION'=>'More Information', +'LBL_USERLOGIN_ROLE'=>'User Login & Role', +'LBL_USER_IMAGE_INFORMATION'=>'User Photograph', + +//Added for 5.0 for all fields +'Role'=>'Role', +'Email'=>'Email', +'Admin'=>'Admin', +'User Name'=>'User Name', +'First Name'=>'First Name', +'Last Name'=>'Last Name', +'Status'=>'Status', +'Default Activity View'=>'Default Calendar View', +'Default Lead View'=>'Default Lead View', +'Currency'=>'Currency', +'Title'=>'Title', +'Office Phone'=>'Office Phone', +'Department'=>'Department', +'Mobile'=>'Mobile', +'Reports To'=>'Reports To', +'Other Phone'=>'Other Phone', +'Other Email'=>'Other Email', +'Fax'=>'Fax', +'Yahoo id'=>'Yahoo id', +'Home Phone'=>'Home Phone', +'User Image'=>'Upload Photograph', +'Date Format'=>'Date Format', +'Tag Cloud'=>'Tag Cloud', +'Signature'=>'Signature', +'Notes'=>'Notes', +'Street Address'=>'Street Address', +'City'=>'City', +'State'=>'State', +'Postal Code'=>'Postal Code', +'Country'=>'Country', +'Password'=>'Password', +'Confirm Password'=>'Confirm Password', +'LBL_SHOWN'=>'Shown', +'LBL_HIDDEN'=>'Hidden', +'LBL_SHOW'=>'Show', +'LBL_HIDE'=>'Hide', +'LBL_HOME_PAGE_COMP'=>'Home Page Components', +'LBL_LOGIN_HISTORY'=>'Login History', +'LBL_USERDETAIL_INFO'=>'Viewing details about the user', +'LBL_DELETE_GROUP'=>'Delete Group', +'LBL_DELETE_GROUPNAME'=>'Group to be Deleted', +'LBL_TRANSFER_GROUP'=>'Transfer Ownership to: ', +'LBL_DELETE_USER'=>'User to be Deleted', +'LBL_TRANSFER_USER'=>'Transfer Ownership to User', +'LBL_DELETE_PROFILE'=>'Delete Profile', +'LBL_TRANSFER_ROLES_TO_PROFILE'=>'Transfer Roles to Profile', +'LBL_PROFILE_TO_BE_DELETED'=>'Profile to be Deteted', + +//Added for disabling window Recalculate + +'LBL_RECALC_MSG'=>'Are you sure, you wish to Recalculate Sharing Access?', +'LBL_YES'=>'Yes', +'LBL_NO'=>'No', + +'LBL_MANDATORY_MSG'=>'Mandatory Fields', +'LBL_DISABLE_FIELD_MSG'=>'Fields Disabled from Global Field Access Settings', + +//Added for About Us + +'LBL_CONTACT_US'=>'Contact Us', +'LBL_READ_LICENSE'=>'Read License', +'LBL_VERSION'=>'Version', +'LBL_TEAM'=>'Team', +'LBL_CREDITS'=>'Credits', +'LBL_THIRD_PARTY'=>'Third Party Packages', +'LBL_COMMUNITY'=>'And vtiger Community', + +'LBL_ASSIGN_ROLE'=>'Assign Role', + +//Moved from Settings to here for Webmail client integration (for 5.0.3 release) + +'LBL_ADD_MAIL_ACCOUNT'=>'Add Mail Account', +'LBL_NEW_MAIL_ACCOUNT_TITLE'=>'New Mail Account [Alt+M]', +'LBL_NEW_MAIL_ACCOUNT_KEY'=>'M', +'LBL_NEW_MAIL_ACCOUNT_LABEL'=>'New Mail Account', +'LBL_GENERAL_INFO'=>'General Information', +'LBL_DISPLAY_NAME'=>'Display Name', +'LBL_MAIL_PROTOCOL'=>'Mail Protocol', +'LBL_LIST_PASSWORD'=>'Password', +'LBL_MAIL_SERVER_NAME'=>'Mail Server Name or IP', +'LBL_INCOME_SERVER_SETTINGS'=>'Incoming Server', +'LBL_TEST_SETTINGS'=>'Test my account setting immediately', +'LBL_TEST_BUTTON_TITLE'=>'Test my account now! [Alt+T]', +'LBL_TEST_BUTTON_KEY'=>'T', +'LBL_TEST_BUTTON_LABEL'=>'Test my account now!', +'LBL_DEFAULT'=>'Default', +'LBL_IMAP2'=>'IMAP2', +'LBL_IMAP4'=>'IMAP4', +'LBL_POP'=>'POP', +'LBL_IMAP'=>'IMAP', +'LBL_MAIL_DISCLAIM'=>'Items marked with * are required
    Items marked with * * are not fully supported', +'LBL_SSL_OPTIONS'=>'SSL Options', +'LBL_TLS'=>'TLS', +'LBL_NO_TLS'=>'No TLS', +'LBL_CERT_VAL'=>'Certificate Validations', +'LBL_INT_MAILER'=>'Use Internal Mailer?', +'LBL_INT_MAILER_USE'=>'Yes', +'LBL_INT_MAILER_NOUSE'=>'No', +'LBL_VAL_SSL_CERT'=>'Validate SSL Cert', +'LBL_DONOT_VAL_SSL_CERT'=>'Do Not Validate SSL Cert', +'LBL_WEB_MAIL_CONFIG'=>'Web Mail Configuration', +'LBL_CONFIGURE_WEB_MAIL'=>' - Configure Web Mail', +'LBL_LIST_MAIL_ACCOUNT'=>' List Mail Account', +'LBL_MY_MAIL_SERVER_DET'=>'My Incoming Mail Server Details', +'LBL_MY_DETAILS'=>'My Details', +'LBL_EMAIL_ID'=>'Email ID', +'LBL_EMAIL_ADDRESS'=>'Email', +'LBL_NAME_EXAMPLE'=>'(example : John Fenner)', +'LBL_EMAIL_EXAMPLE'=>'(example : johnfenner at xyz.com)', +'LBL_REFRESH_TIMEOUT'=>'Refresh Timeout', +'LBL_1_MIN'=>'1 minute', +'LBL_2_MIN'=>'2 minutes', +'LBL_3_MIN'=>'3 minutes', +'LBL_4_MIN'=>'4 minutes', +'LBL_5_MIN'=>'5 minutes', +'LBL_EMAILS_PER_PAGE'=>'Email per Page', + +// Added for 5.0.3 + +'LBL_ENTER_PROFILE'=>'Enter The Profile Name', +'TITLE_USER_DOCUMENT'=>'Untitled Document', +'TITLE_VTIGER_CRM_5'=>'vtiger CRM 5 - Free, Commercial grade Open Source CRM', +'ROLE_DRAG_ERR_MSG'=>'You cannot move a Parent Node under a Child Node', +); + +?> Modified: vtigercrm/branches/5.1_jens/modules/Users/lookupemailtemplates.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/lookupemailtemplates.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/lookupemailtemplates.php Mon Apr 16 12:27:44 2007 @@ -13,9 +13,8 @@ require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -global $theme; +global $theme,$current_user; $theme_path="themes/".$theme."/"; - ?> @@ -39,16 +38,32 @@ $sql = "select * from vtiger_emailtemplates order by templateid desc"; $result = $adb->query($sql); $temprow = $adb->fetch_array($result); + $cnt=1; require_once('include/utils/UserInfoUtil.php'); +require('user_privileges/user_privileges_'.$current_user->id.'.php'); do { - printf("
    "); - $templatename = $temprow["templatename"]; - echo "".$temprow["templatename"]."%s
    "); + echo "".$temprow["templatename"]."%s
    "); + echo "".$temprow["templatename"]."%s
    Modified: vtigercrm/branches/5.1_jens/modules/Users/massdelete.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/massdelete.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/massdelete.php Mon Apr 16 12:27:44 2007 @@ -45,6 +45,8 @@ // Perform the delete action $result = $adb->query($sql); + if($returnmodule == 'Accounts') + delAccRelRecords($id); } else { Modified: vtigercrm/branches/5.1_jens/modules/Users/notify_detail.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Users/notify_detail.php (original) +++ vtigercrm/branches/5.1_jens/modules/Users/notify_detail.php Mon Apr 16 12:27:44 2007 @@ -10,6 +10,8 @@ ********************************************************************************/ global $theme; +global $app_strings; +global $mod_strings; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -20,8 +22,8 @@ -Untitled Document - +<?php echo $mod_strings['TITLE_USER_DOCUMENT']; ?> +
    @@ -44,7 +46,7 @@
    Active: + [Deactivate]
    '; @@ -29,22 +29,29 @@ echo ''; +$array_tab = Array(); +$webmail->loadMail($array_tab); -$webmail->loadMail(); - -echo ''; - -echo ""; - -foreach($webmail->attachments as $key=>$value) { +echo ''; +if($webmail->has_attachments) +{ + //check for attachments + echo ""; + echo ""; +} +/*foreach($webmail->attachments as $key=>$value) { echo '"; -} +}*/ echo '
    '; echo ''; -echo ''; -echo ''; -echo ''; -echo ''; +echo ''; +echo ''; + +//Added to get the UTF-8 string - 30-11-06 - Mickie +$elist->subject = utf8_decode(imap_utf8($elist->subject)); + +echo ''; +echo ''; echo '
    From:'.$elist->from.'
    To:'.$elist->to.'
    Subject:'.$elist->subject.'
    Date:'.$elist->date.'
    '.$mod_strings['LBL_FROM'].''.$elist->from.'
    '.$mod_strings['LBL_TO'].''.$elist->to.'
    '.$mod_strings['LBL_SUBJECT'].''.$elist->subject.'
    '.$mod_strings['LBL_DATE'].''.$elist->date.'
    '; echo '

    Email Attachments:

    ".$mod_strings['LBL_EMAIL_ATTACHMENTS']."

    ".$webmail->att_links."
    '.($key+1).') '.$value["filename"]."
    '; ?> Modified: vtigercrm/branches/5.1_jens/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.1_jens/modules/Webmails/ListView.php Mon Apr 16 12:27:44 2007 @@ -10,11 +10,28 @@ ********************************************************************************/ // figure out which page we are on and what mailbox we want to view -if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";} -if($_REQUEST["start"] && $_REQUEST["start"] != "") {$start=$_REQUEST["start"];} else {$start="1";} +//if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != ""){$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";} +if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != "") +{ + $mailbox=$_REQUEST["mailbox"]; +} +else +{ + $mailbox="INBOX"; +} + +if($_REQUEST["start"] && $_REQUEST["start"] != "") +{ + $start=$_REQUEST["start"]; +} +else +{ + $start="1"; +} $show_hidden=$_REQUEST["show_hidden"]; global $current_user; + require_once('Smarty_setup.php'); require_once("data/Tracker.php"); require_once('themes/'.$theme.'/layout_utils.php'); @@ -22,7 +39,7 @@ require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once("modules/Webmails/MailBox.php"); -require_once("modules/Webmails/Webmail.php"); +require_once("modules/Webmails/Webmails.php"); require_once("modules/Webmails/MailParse.php"); $MailBox = new MailBox($mailbox); @@ -39,7 +56,6 @@ $degraded_service='false'; if($MailBox->mail_protocol == "imap" || $MailBox->mail_protocol == "pop3") $degraded_service='true'; - if($_POST["command"] == "check_mbox_all") { exit(); @@ -83,38 +99,52 @@ flush(); exit(); } - +//This is invoked from Webmails.js as a result of the periodic event function call, checks only for NEW mails; this in turn checks for new mails in all the mailboxes if($_POST["command"] == "check_mbox") { $adb->println("Inside check_mbox AJAX command"); - $search = imap_search($MailBox->mbox, "ALL NEW"); - if($search === false) {echo "failed";flush();exit();} - - $data = imap_fetch_overview($MailBox->mbox,implode(',',$search)); + $search = imap_search($MailBox->mbox, 'NEW'); + + //if($search === false) {echo "failed";flush();exit();} + + $adb->println("imap_search($MailBox->mbox, $criteria) ===> "); + $adb->println($search); + + $data = imap_fetch_overview($MailBox->mbox,implode(',',$search)); $num=sizeof($data); + + $adb->println("fetched data using imap_fetch_overview ==>"); + $adb->println($data); $ret = ''; if($num > 0) { $ret = '{"mails":['; - for($i=0;$i<$num;$i++) { - $ret .= '{"mail":'; - $ret .= '{'; - $ret .= '"mailid":"'.$data[$i]->msgno.'",'; - $ret .= '"subject":"'.substr($data[$i]->subject,0,40).'",'; - $ret .= '"date":"'.substr($data[$i]->date,0,30).'",'; - $ret .= '"from":"'.substr($data[$i]->from,0,20).'",'; - $ret .= '"to":"'.$data[$i]->to.'",'; - $email = new Webmail($MailBox->mbox,$data[$i]->msgno); - if($email->has_attachments) - $ret .= '"attachments":"1"}'; - else - $ret .= '"attachments":"0"}'; - if(($i+1) == $num) - $ret .= '}'; - else - $ret .= '},'; + for($i=0;$i<$num;$i++) + { + //Added condition to avoid show the deleted mails and readed mails + if($data[$i]->deleted == 0)// && $data[$i]->seen == 0) + { + $ret .= '{"mail":'; + $ret .= '{'; + $ret .= '"mailid":"'.$data[$i]->msgno.'",'; + $ret .= '"subject":"'.substr($data[$i]->subject,0,40).'",'; + $ret .= '"date":"'.substr($data[$i]->date,0,30).'",'; + $ret .= '"from":"'.substr($data[$i]->from,0,20).'",'; + $ret .= '"to":"'.$data[$i]->to.'",'; + echo ' to field is ' .$data[$i]->to; + $email = new Webmails($MailBox->mbox,$data[$i]->msgno); + if($email->has_attachments) + $ret .= '"attachments":"1"}'; + else + $ret .= '"attachments":"0"}'; + if(($i+1) == $num) + $ret .= '}'; + else + $ret .= '},'; + } } $ret .= ']}'; + $adb->println("Ret Value ==> $ret"); } echo $ret; @@ -129,7 +159,15 @@ - - +mbox,$_REQUEST["mailid"],$_REQUEST["mvbox"]); + if(isset($_REQUEST["mailid"]) && $_REQUEST["mailid"] != '') + { + $mailids = explode(':',$_REQUEST["mailid"]); + } + foreach($mailids as $mailid) + { + imap_mail_move($MailBox->mbox,$mailid,$_REQUEST["mvbox"]); + } imap_close($MailBox->mbox); echo "SUCCESS"; flush(); @@ -176,21 +221,28 @@ $elist = $MailBox->mailList; $numEmails = $elist["count"]; $headers = $elist["headers"]; +$mails_per_page = $MailBox->mails_per_page; + if($start == 1 || $start == "") { $start_message=$numEmails; } else { - $start_message=($numEmails-($start*$mails_per_page)); -} + $start_message=($numEmails-(($start-1)*$mails_per_page)); +} + $c=$numEmails; if(!isset($_REQUEST["search"])) { - $numPages = round($numEmails/$MailBox->mails_per_page); + $numPages = ceil($numEmails/$MailBox->mails_per_page); if($numPages > 1) { + if($start != 1){ $navigationOutput = "  "; $navigationOutput .= "  "; + } + if($start <= ($numPages-1)){ $navigationOutput .= "  "; $navigationOutput .= ""; + } } } @@ -202,108 +254,155 @@ // these are mainly used in the preview window and could be ajaxified/ // during the preview window load instead. var msgCount = ""; -msgno] = $val; +if (is_array($overview)) +{ + foreach ($overview as $val) + { + $mails[$val->msgno] = $val; + $hdr = @imap_headerinfo($MailBox->mbox, $val->msgno); + //Added to get the UTF-8 string - 30-11-06 - Mickie + //we have to do this utf8 decode for the fields which may contains special characters -- Mickie - 02-02-07 + $val->from = utf8_decode(imap_utf8(addslashes($val->from))); + $val->to = utf8_decode(imap_utf8(addslashes($val->to))); + $val->subject = utf8_decode(imap_utf8($val->subject)); ?> - webmail[msgno;?>] = new Array(); - webmail[msgno;?>]["from"]="from);?>"; - webmail[msgno;?>]["to"]="to);?>"; - webmail[msgno;?>]["subject"]="subject);?>"; - webmail[msgno;?>]["date"]="date);?>"; - msgno;?>] = new Array(); + webmail[msgno;?>]["from"]="from);?>"; + webmail[msgno;?>]["to"]="to);?>"; + webmail[msgno;?>]["subject"]="subject);?>"; + webmail[msgno;?>]["date"]="date);?>"; + + webmail[msgno;?>]["cc"]="ccaddress;?>"; + + "; -$listview_header = array("    		InfoSubjectDateFromDel".$mod_strings['LBL_INFO']."".$mod_strings['LBL_LIST_SUBJECT']."".$mod_strings['LABEL_DATE']."".$mod_strings['LABEL_FROM']."".$mod_strings['LBL_DEL']."No Emails In This Folder'.$mod_strings['LBL_NO_EMAILS'].'
    "; - elseif (!$mails[$start_message]->seen || $mails[$start_message]->recent) { - $flags = "
    "; - $new_msgs++; - } else - $flags = "
    "; + $displayed_msgs++; + if ($mails[$start_message]->deleted && !$show_hidden) + { + $flags = "
    "; + } + elseif (!$mails[$start_message]->seen || $mails[$start_message]->recent) + { + $flags = "
    "; + $new_msgs++; + } + else + { + $flags = "
    "; + + } + + + // Attachment Icons if($msg_ob->has_attachments) - $flags.=' '; + $flags.=' '; else $flags.=' '; + + // read/unread/forwarded/replied if(!$mails[$start_message]->seen || $mails[$start_message]->recent) - { - $flags.=' '; - } - elseif ($mails[$start_message]->in_reply_to || $mails[$start_message]->references || preg_match("/^re:/i",$mails[$start_message]->subject)) - $flags.=' '; - elseif (preg_match("/^fw:/i",$mails[$start_message]->subject)) - $flags.=' '; - else - $flags.=' '; + { + $flags.=' '; + } + elseif ($mails[$start_message]->in_reply_to || $mails[$start_message]->references || preg_match("/^re:/i",$mails[$start_message]->subject)) + { + $flags.=' '; + } + elseif (preg_match("/^fw:/i",$mails[$start_message]->subject)) + { + $flags.=' '; + } + else + { + $flags.=' '; + } // Set IMAP flag - if($mails[$start_message]->flagged) - $flags.=''; - else - $flags.=''; + if($mails[$start_message]->flagged) + { + $flags.=''; + } + else + { + $flags.=''; + } $tmp=imap_mime_header_decode($mails[$start_message]->from); $from = $tmp[0]->text; @@ -72,24 +97,53 @@ $listview_entries[$num][] = $flags."'.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).''.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).'            '.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).''.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).''.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).'            '.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).''.substr($from,0,20).'del
    del
    del
    del
    "; +if($num == "" || !isset($num) && count($attachments) >0 ) +{ + echo "
    There are ".count($attachments)." attachment(s) to choose from:
    "; - for($i=0;$i"; + for($i=0;$i"; } echo "
     There are ".count($attachments)." attachment(s) to choose from:
    ".count($attachments).")   ".$attachments[$i]["filename"]."
        ".($i+1).")   ".$attachments[$i]["filename"]."

    "; - echo ""; + echo "
    There are ".count($inline)." inline attachment(s) to choose from:
    "; - for($i=0;$i"; + for($i=0;$i"; } echo "
     There are ".count($inline)." inline attachment(s) to choose from:
    ".count($inline).")   ".$inline[$i]["filename"]."
        ".($i+1).")   ".$inline[$i]["filename"]."


    "; -} elseif (count(attachments) == 0 && count($inline) == 0) { +} +elseif (count($attachments) == 0 && count($inline) == 0) +{ echo "
    No vtiger_attachments for this email


    "; -} else { +} +else +{ -global $root_directory; -$save_path=$root_directory.'/modules/Webmails/tmp'; -if(!is_dir($save_path)) - mkdir($save_path); + global $root_directory; + $save_path=$root_directory.'/modules/Webmails/tmp'; + if(!is_dir($save_path)) + mkdir($save_path); -$user_dir=$save_path."/".$_SESSION["authenticated_user_id"]; -if(!is_dir($user_dir)) - mkdir($user_dir); + $user_dir=$save_path."/".$_SESSION["authenticated_user_id"]; + if(!is_dir($user_dir)) + mkdir($user_dir); -if(isset($_REQUEST["inline"]) && $_REQUEST["inline"] == "true") { - $fp = fopen($user_dir.'/'.$inline[$num]["filename"], "w") or die("Can't open file"); - fputs($fp, base64_decode($inline[$num]["filedata"])); - $filename = 'modules/Webmails/tmp/'.$_SESSION['authenticated_user_id'].'/'.$inline[$num]['filename']; -} else { - $fp = fopen($user_dir.'/'.$attachments[$num]["filename"], "w") or die("Can't open file"); - fputs($fp, base64_decode($attachments[$num]["filedata"])); - $filename = 'modules/Webmails/tmp/'.$_SESSION['authenticated_user_id'].'/'.$attachments[$num]['filename']; + if(isset($_REQUEST["inline"]) && $_REQUEST["inline"] == "true") + { + $fp = fopen($user_dir.'/'.$inline[$num]["filename"], "w") or die("Can't open file"); + fputs($fp, base64_decode($inline[$num]["filedata"])); + $filename = 'modules/Webmails/tmp/'.$_SESSION['authenticated_user_id'].'/'.$inline[$num]['filename']; + } + else + { + $fp = fopen($user_dir.'/'.$attachments[$num]["filename"], "w") or die("Can't open file"); + fputs($fp, base64_decode($attachments[$num]["filedata"])); + $filename = 'modules/Webmails/tmp/'.$_SESSION['authenticated_user_id'].'/'.$attachments[$num]['filename']; + } + fclose($fp); + imap_close($MailBox->mbox); + + ?> +

    File Download

    + mbox); + ?> -

    File Download

    - Modified: vtigercrm/branches/5.1_jens/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/Webmails/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -1,140 +1,164 @@ -'Emails', -'LBL_MODULE_TITLE'=>'Emails: Home', -'LBL_SEARCH_FORM_TITLE'=>'Email Search', -'LBL_LIST_FORM_TITLE'=>'Email List', -'LBL_NEW_FORM_TITLE'=>'Track Email', - -'LBL_LIST_SUBJECT'=>'Subject', -'LBL_LIST_CONTACT'=>'Contact', -'LBL_LIST_RELATED_TO'=>'Related to', -'LBL_LIST_DATE'=>'Date Sent', -'LBL_LIST_TIME'=>'Time Sent', +'Email', +'LBL_MODULE_TITLE'=>'Email: Home', +'LBL_SEARCH_FORM_TITLE'=>'Email Search', +'LBL_LIST_FORM_TITLE'=>'Email List', +'LBL_NEW_FORM_TITLE'=>'Track Email', + +'LBL_LIST_SUBJECT'=>'Subject', +'LBL_LIST_CONTACT'=>'Contact', +'LBL_LIST_RELATED_TO'=>'Related to', +'LBL_LIST_DATE'=>'Date Sent', +'LBL_LIST_TIME'=>'Time Sent', 'LBL_MOVE_TO'=>'Move To', 'LBL_DELETE'=>'Delete', - -'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.", -'LBL_DATE_SENT'=>'Date Sent:', -'LBL_SUBJECT'=>'Subject :', -'LBL_DATE_AND_TIME'=>'Date & Time Sent:', -'LBL_DATE'=>'Date :', -'LBL_TIME'=>'Time Sent:', -'LBL_BODY'=>'Body:', -'LBL_CONTACT_NAME'=>' Contact Name: ', -'LBL_EMAIL'=>'Email:', -'LBL_COLON'=>':', -'LBL_TO'=>'To :', -'LBL_CHK_MAIL'=>'Check Mail', -'LBL_COMPOSE'=>'Compose', -'LBL_SETTINGS'=>'Settings', -'LBL_EMAIL_FOLDERS'=>'Email Folders', -'LBL_INBOX'=>'Inbox', -'LBL_SENT_MAILS'=>'Sent Mails', -'LBL_TRASH'=>'Trash', -'LBL_JUNK_MAILS'=>'Junk Mails', -'LBL_TO_LEADS'=>'To Leads', -'LBL_TO_CONTACTS'=>'To Contacts', -'LBL_TO_ACCOUNTS'=>'To Accounts', -'LBL_MY_MAILS'=>'My Mails', -'LBL_QUAL_CONTACT'=>'Qualified Mails (As Contacts)', -'LBL_MAILS'=>'Mails', -'LBL_QUALIFY_BUTTON'=>'Qualify', -'LBL_REPLY_BUTTON'=>'Reply', -'LBL_FORWARD_BUTTON'=>'Forward', -'LBL_DOWNLOAD_ATTCH_BUTTON'=>'Download Attachments', -'LBL_FROM'=>'From :', -'LBL_CC'=>'CC :', -'LBL_REPLY_TO_SENDER'=>'Reply to Sender', -'LBL_REPLY_ALL'=>'Reply All', -'LBL_SHOW_HIDDEN'=>'Show Hidden', -'LBL_EXPUNGE_MAILBOX'=>'Expunge Mailbox', - -'NTC_REMOVE_INVITEE'=>'Are you sure you want to remove this recipient from the email?', -'LBL_INVITEE'=>'Recipients', - -// Added Fields -// Contacts-SubPanelViewContactsAndUsers.php -'LBL_BULK_MAILS'=>'Bulk Mails', -'LBL_ATTACHMENT'=>'Attachment', -'LBL_DESCRIPTION'=>'Description', -'LBL_UPLOAD'=>'Upload', -'LBL_FILE_NAME'=>'File Name', -'LBL_SEND'=>'Send', - -'LBL_EMAIL_TEMPLATES'=>'Email Templates', -'LBL_TEMPLATE_NAME'=>'Template Name', -'LBL_DESCRIPTION'=>'Description', -'LBL_EMAIL_TEMPLATES_LIST'=>'Email Templates List', -'LBL_EMAIL_INFORMATION'=>'Email Information', - - - - -//for v4 release added -'LBL_NEW_LEAD'=>'New Lead', -'LBL_LEAD_TITLE'=>'Leads', - -'LBL_NEW_PRODUCT'=>'New Product', -'LBL_PRODUCT_TITLE'=>'Products', -'LBL_NEW_CONTACT'=>'New Contact', -'LBL_CONTACT_TITLE'=>'Contacts', -'LBL_NEW_ACCOUNT'=>'New Account', -'LBL_ACCOUNT_TITLE'=>'Accounts', - -// Added vtiger_fields after vtiger4 - Beta -'LBL_USER_TITLE'=>'Users', -'LBL_NEW_USER'=>'New User', - -// Added for 4 GA -'LBL_TOOL_FORM_TITLE'=>'Email Tools', -//Added for 4GA -'Date & Time Sent'=>'Date & Time Sent', -'Sales Enity Module'=>'Sales Enity Module', -'Activtiy Type'=>'Activtiy Type', -'Related To'=>'Related To', -'Assigned To'=>'Assigned To', -'Subject'=>'Subject', -'Attachment'=>'Attachment', -'Description'=>'Description', -'Time Start'=>'Time Start', -'Created Time'=>'Created Time', -'Modified Time'=>'Modified Time', - -'MESSAGE_CHECK_MAIL_SERVER_NAME'=>'Please Check the Mail Server Name...', -'MESSAGE_CHECK_MAIL_ID'=>'Please Check the Email Id of "Assigned To" User...', -'MESSAGE_MAIL_HAS_SENT_TO_USERS'=>'Mail has been sent to the following User(s) :', -'MESSAGE_MAIL_HAS_SENT_TO_CONTACTS'=>'Mail has been sent to the following Contact(s) :', -'MESSAGE_MAIL_ID_IS_INCORRECT'=>'Mail Id is incorrect. Please Check this Mail Id...', -'MESSAGE_ADD_USER_OR_CONTACT'=>'Please Add any User(s) or Contact(s)...', -'MESSAGE_MAIL_SENT_SUCCESSFULLY'=>' Mail(s) sent successfully!', - -// Added for web mail post 4.0.1 release -'LBL_FETCH_WEBMAIL'=>'Fetch Web Mail', -//Added for 4.2 Release -- CustomView -'LBL_ALL'=>'All', -'MESSAGE_CONTACT_NOT_WANT_MAIL'=>'This Contact does not want to receive mails.', -'LBL_WEBMAILS_TITLE'=>'WebMails', -'LBL_EMAILS_TITLE'=>'Emails', -'LBL_MAIL_CONNECT_ERROR_INFO'=>'Error connecting mail server!
    Check in My Accounts->List Mail Server -> List Mail Account', - -); -?> + +'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.", +'LBL_DATE_SENT'=>'Date Sent:', +'LBL_SUBJECT'=>'Subject :', +'LBL_DATE_AND_TIME'=>'Date & Time Sent:', +'LBL_DATE'=>'Date :', +'LBL_TIME'=>'Time Sent:', +'LBL_BODY'=>'Body:', +'LBL_CONTACT_NAME'=>' Contact Name: ', +'LBL_EMAIL'=>'Email:', +'LBL_COLON'=>':', +'LBL_TO'=>'To :', +'LBL_CHK_MAIL'=>'Check Mail', +'LBL_COMPOSE'=>'Compose', +'LBL_SETTINGS'=>'Incmg. MailServer Settings', +'LBL_EMAIL_FOLDERS'=>'Email Folders', +'LBL_INBOX'=>'Inbox', +'LBL_SENT_MAILS'=>'Sent Mails', +'LBL_TRASH'=>'Trash', +'LBL_JUNK_MAILS'=>'Junk Mails', +'LBL_TO_LEADS'=>'To Leads', +'LBL_TO_CONTACTS'=>'To Contacts', +'LBL_TO_ACCOUNTS'=>'To Accounts', +'LBL_MY_MAILS'=>'My Mails', +'LBL_QUAL_CONTACT'=>'Qualified Mails (As Contacts)', +'LBL_MAILS'=>'Mails', +'LBL_QUALIFY_BUTTON'=>'Qualify', +'LBL_REPLY_BUTTON'=>'Reply', +'LBL_FORWARD_BUTTON'=>'Forward', +'LBL_DOWNLOAD_ATTCH_BUTTON'=>'Download Attachments', +'LBL_FROM'=>'From :', +'LBL_CC'=>'cc :', +'LBL_REPLY_TO_SENDER'=>'Reply to Sender', +'LBL_REPLY_ALL'=>'Reply All', +'LBL_SHOW_HIDDEN'=>'Show Hidden Mails', +'LBL_EXPUNGE_MAILBOX'=>'Trim Mailbox', + +'NTC_REMOVE_INVITEE'=>'Are you sure you want to remove this recipient from the email?', +'LBL_INVITEE'=>'Recipients', + +// Added Fields +// Contacts-SubPanelViewContactsAndUsers.php +'LBL_BULK_MAILS'=>'Bulk Mails', +'LBL_ATTACHMENT'=>'Attachment', +'LBL_UPLOAD'=>'Upload', +'LBL_FILE_NAME'=>'File Name', +'LBL_SEND'=>'Send', + +'LBL_EMAIL_TEMPLATES'=>'Email Templates', +'LBL_TEMPLATE_NAME'=>'Template Name', +'LBL_DESCRIPTION'=>'Description', +'LBL_EMAIL_TEMPLATES_LIST'=>'Email Templates List', +'LBL_EMAIL_INFORMATION'=>'Email Information', + + + + +//for v4 release added +'LBL_NEW_LEAD'=>'New Lead', +'LBL_LEAD_TITLE'=>'Leads', + +'LBL_NEW_PRODUCT'=>'New Product', +'LBL_PRODUCT_TITLE'=>'Products', +'LBL_NEW_CONTACT'=>'New Contact', +'LBL_CONTACT_TITLE'=>'Contacts', +'LBL_NEW_ACCOUNT'=>'New Account', +'LBL_ACCOUNT_TITLE'=>'Accounts', + +// Added vtiger_fields after vtiger4 - Beta +'LBL_USER_TITLE'=>'Users', +'LBL_NEW_USER'=>'New User', + +// Added for 4 GA +'LBL_TOOL_FORM_TITLE'=>'Email Tools', +//Added for 4GA +'Date & Time Sent'=>'Date & Time Sent', +'Sales Enity Module'=>'Sales Enity Module', +'Activtiy Type'=>'Activtiy Type', +'Related To'=>'Related To', +'Assigned To'=>'Assigned To', +'Subject'=>'Subject', +'Attachment'=>'Attachment', +'Description'=>'Description', +'Time Start'=>'Time Start', +'Created Time'=>'Created Time', +'Modified Time'=>'Modified Time', + +'MESSAGE_CHECK_MAIL_SERVER_NAME'=>'Please Check the Mail Server Name...', +'MESSAGE_CHECK_MAIL_ID'=>'Please Check the Email Id of "Assigned To" User...', +'MESSAGE_MAIL_HAS_SENT_TO_USERS'=>'Mail has been sent to the following User(s) :', +'MESSAGE_MAIL_HAS_SENT_TO_CONTACTS'=>'Mail has been sent to the following Contact(s) :', +'MESSAGE_MAIL_ID_IS_INCORRECT'=>'Mail Id is incorrect. Please Check this Mail Id...', +'MESSAGE_ADD_USER_OR_CONTACT'=>'Please Add any User(s) or Contact(s)...', +'MESSAGE_MAIL_SENT_SUCCESSFULLY'=>' Mail(s) sent successfully!', + +// Added for web mail post 4.0.1 release +'LBL_FETCH_WEBMAIL'=>'Fetch Web Mail', +//Added for 4.2 Release -- CustomView +'LBL_ALL'=>'All', +'MESSAGE_CONTACT_NOT_WANT_MAIL'=>'This Contact does not want to receive mails.', +'LBL_WEBMAILS_TITLE'=>'WebMails', +'LBL_EMAILS_TITLE'=>'Email', +'LBL_MAIL_CONNECT_ERROR_INFO'=>'Error connecting mail server!
    Check in My Accounts->List Mail Server -> List Mail Account', +// Added for 5.0.3 release +'LBL_MAIL_CONNECT_ERROR'=>'Could not connect to the mail server. Please check the mail server details', +'IN_REPLY_TO_THE_MESSAGE' => 'In reply to the message sent by ', +'LBL_CLICK_HERE' => 'Click Here ', +'LBL_GOTO_EMAILS_MODULE' => ' go to Email module', +'LBL_NO_EMAILS'=>'No Email In This Folder', +'LBL_MOVE_TO'=>'Move To...', +'LBL_DEL'=>'Del ', +'LABEL_FROM'=>'From', +'LBL_INFO'=>'Info', +'LABEL_DATE'=>'Date', +'LBL_NO_IFRAMES_SUPPORTED'=>'No Iframes supported', +'LBL_EMAIL_ATTACHMENTS'=>'Email Attachments:', +'LBL_ALLMAILS'=>'Email', +'LBL_TO_USERS'=>'To Users', +'LBL_TO_GROUPS'=>'To Groups', +'SUBJECT' => 'Subject', +'BODY' => 'Body', +'TO' => 'To:', +'CC' => 'CC:', +'BCC' => 'BCC:', +'FROM' => 'From:', +'IN'=>'in', +'ADD_FOLDER' => 'Add Folder[X]', +//Added for 5.0.3 +'LBL_LOADING_IMAGE' => 'Loading Image', +); +?> Modified: vtigercrm/branches/5.1_jens/modules/uploads/add2db.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/uploads/add2db.php (original) +++ vtigercrm/branches/5.1_jens/modules/uploads/add2db.php Mon Apr 16 12:27:44 2007 @@ -18,8 +18,10 @@ $vtigerpath = str_replace("/index.php?module=uploads&action=add2db", "", $vtigerpath); $crmid = $_REQUEST['return_id']; -$log->debug("DGDEBUG In add2db.php"); +$log->debug("DEBUG In add2db.php"); + //fix for space in file name. + $_FILES['filename']['name'] = preg_replace('/\s+/', '_', $_FILES['filename']['name']); // Arbitrary File Upload Vulnerability fix - Philip $binFile = $_FILES['filename']['name']; @@ -51,37 +53,35 @@ $desc = $_REQUEST['txtDescription']; $description = addslashes($desc); $date_var = $adb->formatDate(date('YmdHis')); - - $query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('"; - $query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."',".$date_var.")"; + $current_date = getdate(); + $current_date = $adb->formatDate(date('YmdHis')); + $query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('"; + $query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."',".$date_var.",".$current_date.")"; $result = $adb->query($query); # Added by DG 26 Oct 2005 # Attachments added to contacts are also added to their accounts - $log->debug("DGDEBUG Here's the test:"); - $log->debug("DGDEBUG return_module: ".$_REQUEST['return_module']); + $log->debug("DEBUG return_module: ".$_REQUEST['return_module']); if ($_REQUEST['return_module'] == 'Contacts') { - $log->debug("DGDEBUG Passed the test."); $crmid = $_REQUEST['return_id']; $query = 'select accountid from vtiger_contactdetails where contactid='.$crmid; - $log->debug("DGDEBUG Running query: ".$query); $result = $adb->query($query); if($adb->num_rows($result) != 0) { - $log->debug("DGDEBUG Returned a row"); + $log->debug("DEBUG Returned a row"); $associated_account = $adb->query_result($result,0,"accountid"); # Now make sure that we haven't already got this attachment associated to this account # Hmmm... if this works, should we NOT upload the attachment again, and just set the relation for the contact too? - $log->debug("DGDEBUG Associated Account: ".$associated_account); + $log->debug("DEBUG Associated Account: ".$associated_account); $query = "select name,attachmentsize from vtiger_attachments where name= '".$filename."'"; $result = $adb->query($query); if($adb->num_rows($result) != 0) { - $log->debug("DGDEBUG Matched a row"); + $log->debug("DEBUG Matched a row"); # Whoops! We matched the name. Is it the same size? $dg_size = $adb->query_result($result,0,"attachmentsize"); - $log->debug("DGDEBUG: These should be the same size: ".$dg_size." ".$filesize); + $log->debug("DEBUG: These should be the same size: ".$dg_size." ".$filesize); if ($dg_size == $filesize) { # Yup, it is probably the same file @@ -97,7 +97,6 @@ # DG 19 June 2006 # Strip out single quotes from filenames $filename = preg_replace('/\'/', '', $filename); - $sql = "insert into vtiger_attachments values("; $sql .= $current_id.",'".$filename."','".$description."','".$filetype."','".$upload_filepath."')"; $result = $adb->query($sql); @@ -111,10 +110,9 @@ # Attachments added to contacts are also added to their accounts if ($associated_account) { - $log->debug("DGDEBUG: inserting into vtiger_seattachmentsrel from add2db 2"); + $log->debug("DEBUG: inserting into vtiger_seattachmentsrel from add2db 2"); $sql1 = "insert into vtiger_seattachmentsrel values('"; $sql1 .= $associated_account."','".$current_id."')"; - $log->debug("DGDEBUG: Here's the query: ".$sql1); $result = $adb->query($sql1); } @@ -126,33 +124,36 @@
  • Invalid file OR
  • File has no data
    " ; - echo $errormessage; - include "upload.php"; + header("Location: index.php?module=uploads&action=uploadsAjax&msg=true&file=upload&errormessage=".$errormessage); } } else { $errorCode = $_FILES['binFile']['error']; + $errormessage = ""; if($errorCode == 4) { $errormessage = "Kindly give a valid file for upload!
    " ; - echo $errormessage; - include "upload.php"; } else if($errorCode == 2) { - $errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 1000000 bytes
    "; - echo $errormessage; - include "upload.php"; - //echo $errorCode; + $errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than $upload_maxsize bytes
    "; + } + else if($errorCode == 6) + { + $errormessage = "Please configure upload_tmp_dir variable in php.ini file.
    " ; } else if($errorCode == 3 || $errorcode == '') { - echo "Problems in file upload. Please try again!
    "; - include "upload.php"; + $errormessage = "Problems in file upload. Please try again!
    "; } + if($errormessage != '') + { + echo $errormessage; + include("upload.php"); + } } ?> Modified: vtigercrm/branches/5.1_jens/modules/uploads/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/uploads/language/en_us.lang.php (original) +++ vtigercrm/branches/5.1_jens/modules/uploads/language/en_us.lang.php Mon Apr 16 12:27:44 2007 @@ -24,6 +24,8 @@ //Added fields for uploads (attach files) 'LBL_ATTACH_FILE'=>'Attach File', +'LBL_ATTACH'=>'Attach', +'LBL_CANCEL'=>'Cancel', 'LBL_STEP_SELECT_FILE'=>'Step 1 : Select File', 'LBL_BROWSE_FILES'=>'Click the browse button and select the file to be attached', 'LBL_DESCRIPTION'=>'Step 2 : Write some description', Modified: vtigercrm/branches/5.1_jens/modules/uploads/upload.php ============================================================================== --- vtigercrm/branches/5.1_jens/modules/uploads/upload.php (original) +++ vtigercrm/branches/5.1_jens/modules/uploads/upload.php Mon Apr 16 12:27:44 2007 @@ -8,13 +8,13 @@ * ********************************************************************************/ --> - - + @@ -25,7 +25,7 @@ ?> - + @@ -34,7 +34,7 @@
    		• - +
     
    @@ -44,8 +44,8 @@ @@ -54,7 +54,7 @@ @@ -66,8 +66,8 @@
    -
    - +
    +
     
    - +
    -    - +  " class="crmbutton small save" />   + " class="crmbutton small cancel" onclick="self.close();" />
    Modified: vtigercrm/branches/5.1_jens/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/branches/5.1_jens/pkg/bin/startvTiger.bat (original) +++ vtigercrm/branches/5.1_jens/pkg/bin/startvTiger.bat Mon Apr 16 12:27:44 2007 @@ -43,23 +43,23 @@ echo "" echo "making an attempt to kill any existing vtigercrm service" echo "" -bin\apache -k stop -n vtigercrm501 -bin\apache -k uninstall -n vtigercrm501 +bin\apache -k stop -n vtigercrm503 +bin\apache -k uninstall -n vtigercrm503 echo "Uninstalling apache service again for confirmation after sleeping for 10 seconds" echo "" %SLEEP_STR% -n 10 127.0.0.1>nul -bin\apache -k stop -n vtigercrm501 -bin\apache -k uninstall -n vtigercrm501 +bin\apache -k stop -n vtigercrm503 +bin\apache -k uninstall -n vtigercrm503 echo "" echo "" -echo "Installing vtigercrm501 apache service after sleeping for 10 seconds" +echo "Installing vtigercrm503 apache service after sleeping for 10 seconds" echo "" %SLEEP_STR% -n 10 127.0.0.1>nul -bin\apache -k install -n vtigercrm501 -f conf\httpd.conf +bin\apache -k install -n vtigercrm503 -f conf\httpd.conf echo "" -echo "Starting vtigercrm501 apache service" +echo "Starting vtigercrm503 apache service" echo "" -bin\apache -n vtigercrm501 -k start +bin\apache -n vtigercrm503 -k start IF ERRORLEVEL 1 goto stopservice goto checkmysql @@ -105,7 +105,7 @@ echo "" echo "Starting MySQL on port specified by the user" echo "" -start mysqld-nt -b .. --skip-bdb --log-queries-not-using-indexes --log-slow-admin-statements --log-error --low-priority-updates --log-slow-queries=vtslowquery.log --datadir=../data --port=%mysql_port% +start mysqld-nt -b .. --skip-bdb --log-queries-not-using-indexes --log-slow-admin-statements --log-error --low-priority-updates --log-slow-queries=vtslowquery.log --default-storage-engine=InnoDB --datadir=../data --port=%mysql_port% %SLEEP_STR% -n 11 127.0.0.1>nul mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases" > NUL IF ERRORLEVEL 1 goto notstarted @@ -117,27 +117,27 @@ :checkdatabase echo "" -echo "check to see if vtigercrm501 database already exists" +echo "check to see if vtigercrm503 database already exists" echo "" -mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm501'" | "%WINDIR%\system32\find.exe" "vtigercrm501" > NUL +mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm503'" | "%WINDIR%\system32\find.exe" "vtigercrm503" > NUL IF ERRORLEVEL 1 goto dbnotexists echo "" -ECHO "vtigercrm501 database exists" +ECHO "vtigercrm503 database exists" echo "" goto end :dbnotexists echo "" -ECHO "vtigercrm501 database does not exist" +ECHO "vtigercrm503 database does not exist" echo "" echo %cd% echo "" -echo "Proceeding to create database vtigercrm501 and populate the same" +echo "Proceeding to create database vtigercrm503 and populate the same" echo "" -mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm501" +mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm503" echo "" -echo "vtigercrm501 database created" +echo "vtigercrm503 database created" echo "" goto end Modified: vtigercrm/branches/5.1_jens/pkg/bin/startvTiger.sh ============================================================================== --- vtigercrm/branches/5.1_jens/pkg/bin/startvTiger.sh (original) +++ vtigercrm/branches/5.1_jens/pkg/bin/startvTiger.sh Mon Apr 16 12:27:44 2007 @@ -111,14 +111,14 @@ fi echo "" -echo "Checking if the vtigercrm501 database already exists" +echo "Checking if the vtigercrm503 database already exists" echo "" -echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm501 >/dev/null +echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm503 >/dev/null if [ $? -ne 0 ]; then echo "" - echo "Database vtigercrm501 does not exist. Creating database vtigercrm501" + echo "Database vtigercrm503 does not exist. Creating database vtigercrm503" echo "" - ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm501" + ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm503" fi host=`hostname` Modified: vtigercrm/branches/5.1_jens/pkg/bin/stopvTiger.bat ============================================================================== --- vtigercrm/branches/5.1_jens/pkg/bin/stopvTiger.bat (original) +++ vtigercrm/branches/5.1_jens/pkg/bin/stopvTiger.bat Mon Apr 16 12:27:44 2007 @@ -32,13 +32,13 @@ cd /d %apache_dir% rem shut down apache echo "" -echo "stopping vtigercrm501 apache service" +echo "stopping vtigercrm503 apache service" echo "" -bin\apache -n vtigercrm501 -k stop +bin\apache -n vtigercrm503 -k stop echo "" -echo "uninstalling vtigercrm501 apache service" +echo "uninstalling vtigercrm503 apache service" echo "" -bin\apache -k uninstall -n vtigercrm501 +bin\apache -k uninstall -n vtigercrm503 rem .\bin\ShutdownApache.exe logs\httpd.pid goto StopMySQL Modified: vtigercrm/branches/5.1_jens/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/5.1_jens/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/5.1_jens/schema/DatabaseSchema.xml Mon Apr 16 12:27:44 2007 @@ -1,6300 +1,6484 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - user_name - - - user_password - - Type=InnoDB + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + user_name + + + user_password + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + smcreatorid + + + smownerid + + + modifiedby + + + deleted + smownerid + + + smownerid + deleted + + Type=InnoDB +
    + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + name + + + + modifiedby + + + tabid + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + tabid + +
    + + + ADD CONSTRAINT fk_1_vtiger_blocks FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + tabid + + + fieldname + + + block + + + displaytype + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_vtiger_field FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + account_type + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_account FOREIGN KEY (accountid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_accountbillads FOREIGN KEY (accountaddressid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_accountshipads FOREIGN KEY (accountaddressid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_accountscf FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + accountid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_contactdetails FOREIGN KEY (contactid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_contactsubdetails FOREIGN KEY (contactsubscriptionid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_contactaddress FOREIGN KEY (contactaddressid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_contactscf FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + +
    + + +ADD CONSTRAINT fk_1_vtiger_portalinfo FOREIGN KEY (id) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + +
    + + +ADD CONSTRAINT fk_1_vtiger_customerdetails FOREIGN KEY (customerid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + converted + leadstatus + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_leaddetails FOREIGN KEY (leadid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_leadsubdetails FOREIGN KEY (leadsubscriptionid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_leadaddress FOREIGN KEY (leadaddressid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_leadscf FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + title + + + notesid + + + crmid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_notes FOREIGN KEY (notesid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + accountid + + + potentialid + + + sales_stage + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_potential FOREIGN KEY (potentialid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + potentialid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_potstagehistory FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_potentialscf FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + activityid + subject + + + activitytype + date_start + + + date_start + due_date + + + date_start + time_start + + + eventstatus + + + status + eventstatus + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_activity FOREIGN KEY (activityid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + attachmentsid + + + description + name + type + attachmentsid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_attachments FOREIGN KEY (attachmentsid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + attachmentsid + + + crmid + + + attachmentsid + crmid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_seattachmentsrel FOREIGN KEY (attachmentsid) REFERENCES vtiger_attachments(attachmentsid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_seattachmentsrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + +
    + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_competitor FOREIGN KEY (competitorid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + potentialid + + + competitorid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_potcompetitorrel FOREIGN KEY (competitorid) REFERENCES vtiger_competitor(competitorid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_potcompetitorrel FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_vendor FOREIGN KEY (vendorid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_products FOREIGN KEY (productid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_products2products_rel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON UPDATE CASCADE ON DELETE CASCADE + ADD CONSTRAINT fk_2_products2products_rel FOREIGN KEY (related_productid) REFERENCES vtiger_products(productid) ON UPDATE CASCADE ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + productclass + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + producttype + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + productvalidation + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + currency + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + visibility + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + manufacturer + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + productid + filename + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_productcollaterals FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + + + roleid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_user2role FOREIGN KEY (roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_user2role FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + groupname + + + Type=InnoDB +
    + + + + + + + + + + + groupid + userid + +
    + + +ADD CONSTRAINT fk_1_vtiger_users2group FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_users2group FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_group2grouprel FOREIGN KEY (containsgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_group2grouprel FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + +
    + + +ADD CONSTRAINT fk_1_vtiger_group2role FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_group2role FOREIGN KEY (roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + +
    + + +ADD CONSTRAINT fk_1_vtiger_group2rs FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_group2rs FOREIGN KEY (roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + leadid + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_leadpotrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_leadpotrel FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + campaignstatus + + + campaignname + + + campaignid + + Type=InnoDB +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_campaignscf FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + contactid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_campaigncontrel FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_campaigncontrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + leadid + campaignid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_campaignleadrel FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_campaignleadrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + contactid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_leadcontrel FOREIGN KEY (leadcontrel_contactid_idx) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_leadcontrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + accountid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_leadacctrel FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_leadacctrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + potentialid + + + contactid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_contpotentialrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_contpotentialrel FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + dealname + + + Type=InnoDB +
    + + + + + + + + + + + + + + contactid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_cntactivityrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_cntactivityrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + name + + + + createdby + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_lar FOREIGN KEY (createdby) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + notesid + + + crmid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_crmentitynotesrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_crmentitynotesrel FOREIGN KEY (notesid) REFERENCES vtiger_notes(notesid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + ticketid + + + status + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_troubletickets FOREIGN KEY (ticketid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + ticketid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_ticketcomments FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + activityid + + + smid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_salesmanactivityrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_salesmanactivityrel FOREIGN KEY (smid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + vendorid + + + contactid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_vendorcontactrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_vendorcontactrel FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + smid + + + id + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_salesmanticketrel FOREIGN KEY (id) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_salesmanticketrel FOREIGN KEY (smid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + activityid + + + crmid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_seactivityrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_seactivityrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + productid + + + crmid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_seproductsrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_seproductsrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + crmid + + + ticketid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_seticketsrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_seticketsrel FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + assigned_user_id + module + name + deleted + +
    + + + + + + + + + + leadid + + + groupname + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_leadgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_leadgrouprelation FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + groupname + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_accountgrouprelation FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_accountgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + groupname + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_contactgrouprelation FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_contactgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + groupname + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_potentialgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_potentialgrouprelation FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + groupname + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_campaigngrouprelation FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_campaigngrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + activityid + + + groupname + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_activitygrouprelation FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_activitygrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + ticketid + + + groupname + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_ticketgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_ticketgrouprelation FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + +
    + + + + + + + + + +
    + + +ADD CONSTRAINT fk_1_vtiger_defaultcv FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + foldername + templatename + subject + +
    + + + + + + + + + + + + + + + + + + + + id + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_faq FOREIGN KEY (id) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + faqid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_faqcomments FOREIGN KEY (faqid) REFERENCES vtiger_faq(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + assigned_user_id + name + deleted + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + notesid + + + crmid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_senotesrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_senotesrel FOREIGN KEY (notesid) REFERENCES vtiger_notes(notesid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + ticket_id + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_ticketcf FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_productcf FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + assigned_user_id + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + deploymentstatus + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + ownership + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + rating + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + region + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + accounttype + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + contacttype + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + source + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + opportunity_type + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + stage + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + status + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + status + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + status + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + status + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + stage + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + priority + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + businesstype + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + industry + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + revenuetype + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + activitytype + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + usertype + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + purpose + + + Type=InnoDB +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + status + + + Type=InnoDB +
    + + + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + + + + profileid + globalactionid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_profile2globalpermissions FOREIGN KEY (profileid) REFERENCES vtiger_profile(profileid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + profileid + tabid + +
    + + + + + + + + + + + + + + + profileid + tabid + Operation + +
    + + + + + + + + + + + + + + profileid + tabid + fieldname + + + tabid + profileid + + + visible + profileid + +
    + + + + + + + + + + roleid + profileid + +
    + + + + + + + + Type=InnoDB +
    + + + + + + + + + + + + +
    + + +ADD CONSTRAINT fk_1_vtiger_def_org_share FOREIGN KEY (permission) REFERENCES vtiger_org_share_action_mapping(share_action_id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + tabid + fieldid + + + tabid + + + visible + fieldid + +
    + + + + + + + + + + + + + + + profileid + tabid + activityid + +
    + + + + + + + + + + + + + + + + + + + + productcategory + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vendorid + + + contactid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_salesorder FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_salesorder FOREIGN KEY (salesorderid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_salesorder FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + groupname + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_sogrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_sogrouprelation FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_sobillads FOREIGN KEY (sobilladdressid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_soshipads FOREIGN KEY (soshipaddressid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_salesordercf FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + schedulednotificationname + + + Type=InnoDB +
    + + + + + + + + + + + + + activityid + + + productid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_activityproductrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_activityproductrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + relation_id + +
    + + + + + + + + + + + + + + + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_vendorcf FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_pricebook FOREIGN KEY (pricebookid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_pricebookcf FOREIGN KEY (pricebookid) REFERENCES vtiger_pricebook(pricebookid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + pricebookid + + + productid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_pricebookproductrel FOREIGN KEY (pricebookid) REFERENCES vtiger_pricebook(pricebookid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_pricebookproductrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + quotestage + + + potentialid + + + contactid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_quotes FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_quotes FOREIGN KEY (quoteid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_quotes FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_quotesbillads FOREIGN KEY (quotebilladdressid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_quotesshipads FOREIGN KEY (quoteshipaddressid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + groupname + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_quotegrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_quotegrouprelation FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_quotescf FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vendorid + + + quoteid + + + contactid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_purchaseorder FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_purchaseorder FOREIGN KEY (purchaseorderid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_purchaseorder FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE +ADD CONSTRAINT fk_4_vtiger_purchaseorder FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + groupname + purchaseorderid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_pogrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_pogrouprelation FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_pobillads FOREIGN KEY (pobilladdressid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_poshipads FOREIGN KEY (poshipaddressid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_purchaseordercf FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + invoiceid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_invoice FOREIGN KEY (invoiceid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_invoice FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + groupname + invoiceid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_invoicegrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_invoicegrouprelation FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_invoicebillads FOREIGN KEY (invoicebilladdressid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_invoiceshipads FOREIGN KEY (invoiceshipaddressid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_invoicecf FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + entitytype + + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_vtiger_customview FOREIGN KEY (entitytype) REFERENCES vtiger_tab (name) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + + + + + + columnindex + + + cvid + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_vtiger_cvcolumnlist FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + cvid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_cvstdfilter FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + cvid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_cvadvfilter FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + cvid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_customaction FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + queryid + + Type=InnoDB +
    + + + + + + + + + + + + + + + + queryid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_selectcolumn FOREIGN KEY (queryid) REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + queryid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_relcriteria FOREIGN KEY (queryid) REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + queryid + + + folderid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_report FOREIGN KEY (folderid) REFERENCES vtiger_reportfolder (folderid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_report FOREIGN KEY (queryid) REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_reportmodules FOREIGN KEY (reportmodulesid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_reportsortcol FOREIGN KEY (reportid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + datefilterid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_reportdatefilter FOREIGN KEY (datefilterid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + reportsummaryid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_reportsummary FOREIGN KEY (reportsummaryid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + usageunit + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + glacct + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + quotestage + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + invoicestatus + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + postatus + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + sostatus + + + Type=InnoDB + +
    + + + + + + + + + + + + + + + + + + + + carrier + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + taxclass + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + recurringtype + + + Type=InnoDB +
    + + + + + + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + +
    + + + + + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_org_share_action2tab FOREIGN KEY (share_action_id) REFERENCES vtiger_org_share_action_mapping(share_action_id) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_org_share_action2tab FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + tabid + user_id + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_moduleowners FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + crmid + flag + + Type=InnoDB +
    + + + + + + + + + + + Type=InnoDB + + tabid + +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_module_rel FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + share_groupid + + + to_groupid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_grp2grp FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_grp2grp FOREIGN KEY (share_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_grp2grp FOREIGN KEY (to_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + share_groupid + + + to_roleid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_grp2role FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_grp2role FOREIGN KEY (share_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_grp2role FOREIGN KEY (to_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + share_groupid + + + to_roleandsubid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_grp2rs FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_grp2rs FOREIGN KEY (share_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_grp2rs FOREIGN KEY (to_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + share_roleid + + + to_groupid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_role2group FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_role2group FOREIGN KEY (to_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_role2group FOREIGN KEY (share_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + share_roleid + + + to_roleid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_role2role FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_role2role FOREIGN KEY (share_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_role2role FOREIGN KEY (to_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + share_roleid + + + to_roleandsubid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_role2rs FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_role2rs FOREIGN KEY (share_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_role2rs FOREIGN KEY (to_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + share_roleandsubid + + + to_groupid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_rs2grp FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_rs2grp FOREIGN KEY (to_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_rs2grp FOREIGN KEY (share_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + share_roleandsubid + + + to_roleid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_rs2role FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_rs2role FOREIGN KEY (share_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_rs2role FOREIGN KEY (to_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + share_roleandsubid + + + to_roleandsubid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_rs2rs FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_rs2rs FOREIGN KEY (share_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_datashare_rs2rs FOREIGN KEY (to_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + tabid + + + relatedto_tabid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_datashare_relatedmodules FOREIGN KEY (relatedto_tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_datashare_relatedmodules FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + shareid + permission + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + parenttabid + parenttab_label + visible + + Type=InnoDB +
    + + + + + + + + + + + + + + userid + shareduserid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_tmp_read_user_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_read_user_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_read_user_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + userid + sharedgroupid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_tmp_read_group_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_read_group_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_read_group_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + userid + shareduserid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_tmp_write_user_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_write_user_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_write_user_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + userid + sharedgroupid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_tmp_write_group_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_write_group_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_write_group_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + userid + shareduserid + relatedtabid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE +ADD CONSTRAINT fk_4_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + userid + sharedgroupid + tabid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_4_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + userid + shareduserid + tabid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE +ADD CONSTRAINT fk_4_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + userid + sharedgroupid + tabid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE +ADD CONSTRAINT fk_2_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_3_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE +ADD CONSTRAINT fk_4_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + tabid + parenttabid + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_vtiger_parenttabrel FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE + Type=InnoDB + + +
    + + + ADD CONSTRAINT fk_2_vtiger_parenttabrel FOREIGN KEY (parenttabid) REFERENCES vtiger_parenttab(parenttabid) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + campaigntype + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + campaignstatus + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + expectedresponse + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + portalname + + Type=InnoDB +
    + + + + + + + + + + + + + creatorid + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + nick + + + session + + + ping + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + + chat_from + + + chat_to + + + born + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_chat_msg FOREIGN KEY (chat_from) REFERENCES vtiger_chat_users(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + msg + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_chat_pchat FOREIGN KEY (msg) REFERENCES vtiger_chat_msg(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + msg + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_chat_pvchat FOREIGN KEY (msg) REFERENCES vtiger_chat_msg(id) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + tag_id + tagger_id + object_id + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + +
    + + + + + + + + + + + + + + + + taxname + + + Type=InnoDB +
    + + + + + + + + + + + + + productid + + + taxid + + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_producttaxrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + source + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + source + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + source + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + + + source + + + Type=InnoDB +
    + + + + + + + + + + + + + + + + purchaseorderid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_postatushistory FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + salesorderid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_sostatushistory FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + quoteid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_quotestagehistory FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + + + + + + invoiceid + + Type=InnoDB +
    + + +ADD CONSTRAINT fk_1_vtiger_invoicestatushistory FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE +Type=InnoDB + + +
    + + + + + + + + + + + Type=InnoDB +
    + + + + + + + + + + + + + + id + + + productid + + Type=InnoDB +
    + + + + + + + + + + + + + + + + taxname + + + Type=InnoDB +
    + + + + + + id + + Type=InnoDB +
    + + + + + + + + + + + + + smid + + + attachmentsid + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_vtiger_salesmanattachmentsrel FOREIGN KEY (smid) REFERENCES vtiger_users(id) ON DELETE CASCADE + ADD CONSTRAINT fk_2_vtiger_salesmanattachmentsrel FOREIGN KEY (attachmentsid) REFERENCES vtiger_attachments(attachmentsid) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + tabid + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_vtiger_entityname FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + organizationname + name + + + + organizationname + type + + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_vtiger_orgunit FOREIGN KEY (organizationname) REFERENCES vtiger_organizationdetails(organizationname) ON UPDATE CASCADE ON DELETE CASCADE + Type=InnoDB
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
    + + + + + + + + + + + + + + + + + + orgunittype + + + Type=InnoDB +
    - - - - + + + + + + + + + + + + + + + + + organizationname + + + userid + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_vtiger_user2org FOREIGN KEY (organizationname) REFERENCES vtiger_organizationdetails(organizationname) ON UPDATE CASCADE ON DELETE CASCADE + ADD CONSTRAINT fk_2_vtiger_user2org FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE + Type=InnoDB +
    - -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - name - - - - modifiedby - - - tabid - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tabid - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tabid - - - fieldname - - - block - - - displaytype - - Type=InnoDB -
    - - - ADD CONSTRAINT fk_1_vtiger_field FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE - Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - account_type - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_account FOREIGN KEY (accountid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_accountbillads FOREIGN KEY (accountaddressid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_accountshipads FOREIGN KEY (accountaddressid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_accountscf FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - accountid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_contactdetails FOREIGN KEY (contactid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_contactsubdetails FOREIGN KEY (contactsubscriptionid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_contactaddress FOREIGN KEY (contactaddressid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_contactscf FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - -
    - - -ADD CONSTRAINT fk_1_vtiger_portalinfo FOREIGN KEY (id) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - -
    - - -ADD CONSTRAINT fk_1_vtiger_customerdetails FOREIGN KEY (customerid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - converted - leadstatus - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_leaddetails FOREIGN KEY (leadid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_leadsubdetails FOREIGN KEY (leadsubscriptionid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_leadaddress FOREIGN KEY (leadaddressid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_leadscf FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - title - - - notesid - - - crmid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_notes FOREIGN KEY (notesid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - accountid - - - potentialid - - - sales_stage - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_potential FOREIGN KEY (potentialid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - potentialid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_potstagehistory FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_potentialscf FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - activityid - subject - - - activitytype - date_start - - - date_start - due_date - - - date_start - time_start - - - eventstatus - - - status - eventstatus - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_activity FOREIGN KEY (activityid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - attachmentsid - - - description - name - type - attachmentsid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_attachments FOREIGN KEY (attachmentsid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - attachmentsid - - - crmid - - - attachmentsid - crmid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_seattachmentsrel FOREIGN KEY (attachmentsid) REFERENCES vtiger_attachments(attachmentsid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_seattachmentsrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - -
    - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_competitor FOREIGN KEY (competitorid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - potentialid - - - competitorid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_potcompetitorrel FOREIGN KEY (competitorid) REFERENCES vtiger_competitor(competitorid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_potcompetitorrel FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_vendor FOREIGN KEY (vendorid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_products FOREIGN KEY (productid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - currency - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - visibility - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - manufacturer - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - productid - filename - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_productcollaterals FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - - - roleid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_user2role FOREIGN KEY (roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_user2role FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - groupname - - - Type=InnoDB -
    - - - - - - - - - - - groupid - userid - -
    - - -ADD CONSTRAINT fk_1_vtiger_users2group FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_users2group FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_group2grouprel FOREIGN KEY (containsgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_group2grouprel FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - -
    - - -ADD CONSTRAINT fk_1_vtiger_group2role FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_group2role FOREIGN KEY (roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - -
    - - -ADD CONSTRAINT fk_1_vtiger_group2rs FOREIGN KEY (groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_group2rs FOREIGN KEY (roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - leadid - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_leadpotrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_leadpotrel FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - campaignstatus - - - campaignname - - - campaignid - - Type=InnoDB -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_campaignscf FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - contactid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_campaigncontrel FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_campaigncontrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - leadid - campaignid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_campaignleadrel FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_campaignleadrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - contactid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_leadcontrel FOREIGN KEY (leadcontrel_contactid_idx) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_leadcontrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - accountid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_leadacctrel FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_leadacctrel FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - potentialid - - - contactid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_contpotentialrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_contpotentialrel FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - dealname - - - Type=InnoDB -
    - - - - - - - - - - - - - - contactid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_cntactivityrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_cntactivityrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - name - - - - createdby - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_lar FOREIGN KEY (createdby) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - notesid - - - crmid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_crmentitynotesrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_crmentitynotesrel FOREIGN KEY (notesid) REFERENCES vtiger_notes(notesid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - ticketid - - - status - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_troubletickets FOREIGN KEY (ticketid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - ticketid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_ticketcomments FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - activityid - - - smid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_salesmanactivityrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_salesmanactivityrel FOREIGN KEY (smid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - vendorid - - - contactid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_vendorcontactrel FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_vendorcontactrel FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - smid - - - id - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_salesmanticketrel FOREIGN KEY (id) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_salesmanticketrel FOREIGN KEY (smid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - activityid - - - crmid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_seactivityrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_seactivityrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - productid - - - crmid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_seproductsrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_seproductsrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - crmid - - - ticketid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_seticketsrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_seticketsrel FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - assigned_user_id - module - name - deleted - -
    - - - - - - - - - - leadid - - - groupname - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_leadgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_leadgrouprelation FOREIGN KEY (leadid) REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - groupname - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_accountgrouprelation FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_accountgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - groupname - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_contactgrouprelation FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_contactgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - groupname - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_potentialgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_potentialgrouprelation FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - groupname - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_campaigngrouprelation FOREIGN KEY (campaignid) REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_campaigngrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - activityid - - - groupname - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_activitygrouprelation FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_activitygrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - ticketid - - - groupname - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_ticketgrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_ticketgrouprelation FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - -
    - - - - - - - - - -
    - - -ADD CONSTRAINT fk_1_vtiger_defaultcv FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - foldername - templatename - subject - -
    - - - - - - - - - - - - - - - - - - - - id - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_faq FOREIGN KEY (id) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - faqid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_faqcomments FOREIGN KEY (faqid) REFERENCES vtiger_faq(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - assigned_user_id - name - deleted - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - notesid - - - crmid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_senotesrel FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_senotesrel FOREIGN KEY (notesid) REFERENCES vtiger_notes(notesid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - ticket_id - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_ticketcf FOREIGN KEY (ticketid) REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_productcf FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - assigned_user_id - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - deploymentstatus - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - ownership - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - rating - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - region - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - accounttype - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - contacttype - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - source - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - opportunity_type - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - stage - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - status - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - status - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - status - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - status - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - stage - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - priority - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - businesstype - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - industry - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - revenuetype - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - activitytype - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - usertype - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - purpose - - - Type=InnoDB -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - status - - - Type=InnoDB -
    - - - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - - - - profileid - globalactionid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_profile2globalpermissions FOREIGN KEY (profileid) REFERENCES vtiger_profile(profileid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - profileid - tabid - -
    - - - - - - - - - - - - - - - profileid - tabid - Operation - -
    - - - - - - - - - - - - - - profileid - tabid - fieldname - - - tabid - profileid - - - visible - profileid - -
    - - - - - - - - - - roleid - profileid - -
    - - - - - - - - Type=InnoDB -
    - - - - - - - - - - - - -
    - - -ADD CONSTRAINT fk_1_vtiger_def_org_share FOREIGN KEY (permission) REFERENCES vtiger_org_share_action_mapping(share_action_id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - tabid - fieldid - - - tabid - - - visible - fieldid - -
    - - - - - - - - - - - - - - - profileid - tabid - activityid - -
    - - - - - - - - - - - - - - - - - - - - productcategory - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - vendorid - - - contactid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_salesorder FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_salesorder FOREIGN KEY (salesorderid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_salesorder FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - groupname - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_sogrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_sogrouprelation FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_sobillads FOREIGN KEY (sobilladdressid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_soshipads FOREIGN KEY (soshipaddressid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_salesordercf FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - schedulednotificationname - - - Type=InnoDB -
    - - - - - - - - - - - - - activityid - - - productid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_activityproductrel FOREIGN KEY (activityid) REFERENCES vtiger_activity(activityid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_activityproductrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - relation_id - -
    - - - - - - - - - - - - - - - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_vendorcf FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_pricebook FOREIGN KEY (pricebookid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_pricebookcf FOREIGN KEY (pricebookid) REFERENCES vtiger_pricebook(pricebookid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - pricebookid - - - productid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_pricebookproductrel FOREIGN KEY (pricebookid) REFERENCES vtiger_pricebook(pricebookid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_pricebookproductrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - quotestage - - - potentialid - - - contactid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_quotes FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_quotes FOREIGN KEY (quoteid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_quotes FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_quotesbillads FOREIGN KEY (quotebilladdressid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_quotesshipads FOREIGN KEY (quoteshipaddressid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - groupname - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_quotegrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_quotegrouprelation FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_quotescf FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - vendorid - - - quoteid - - - contactid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_purchaseorder FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_purchaseorder FOREIGN KEY (purchaseorderid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_purchaseorder FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE -ADD CONSTRAINT fk_4_vtiger_purchaseorder FOREIGN KEY (vendorid) REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - groupname - purchaseorderid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_pogrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_pogrouprelation FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_pobillads FOREIGN KEY (pobilladdressid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_poshipads FOREIGN KEY (poshipaddressid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_purchaseordercf FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - invoiceid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_invoice FOREIGN KEY (invoiceid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_invoice FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - groupname - invoiceid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_invoicegrouprelation FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_invoicegrouprelation FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_invoicebillads FOREIGN KEY (invoicebilladdressid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_invoiceshipads FOREIGN KEY (invoiceshipaddressid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_invoicecf FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - columnindex - - - cvid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_cvcolumnlist FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - cvid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_cvstdfilter FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - cvid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_cvadvfilter FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - cvid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_customaction FOREIGN KEY (cvid) REFERENCES vtiger_customview (cvid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - queryid - - Type=InnoDB -
    - - - - - - - - - - - - - - - - queryid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_selectcolumn FOREIGN KEY (queryid) REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - - queryid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_relcriteria FOREIGN KEY (queryid) REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - queryid - - - folderid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_report FOREIGN KEY (folderid) REFERENCES vtiger_reportfolder (folderid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_report FOREIGN KEY (queryid) REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_reportmodules FOREIGN KEY (reportmodulesid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_reportsortcol FOREIGN KEY (reportid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - datefilterid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_reportdatefilter FOREIGN KEY (datefilterid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - reportsummaryid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_reportsummary FOREIGN KEY (reportsummaryid) REFERENCES vtiger_report (reportid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - usageunit - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - glacct - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - quotestage - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - invoicestatus - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - postatus - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - sostatus - - - Type=InnoDB - -
    - - - - - - - - - - - - - - - - - - - - carrier - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - taxclass - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - recurringtype - - - Type=InnoDB -
    - - - - - - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - -
    - - - - - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_org_share_action2tab FOREIGN KEY (share_action_id) REFERENCES vtiger_org_share_action_mapping(share_action_id) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_org_share_action2tab FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - tabid - user_id - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_moduleowners FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - crmid - flag - - Type=InnoDB -
    - - - - - - - - - - - Type=InnoDB - - tabid - -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_module_rel FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - share_groupid - - - to_groupid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_grp2grp FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_grp2grp FOREIGN KEY (share_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_datashare_grp2grp FOREIGN KEY (to_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - share_groupid - - - to_roleid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_grp2role FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_grp2role FOREIGN KEY (share_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_datashare_grp2role FOREIGN KEY (to_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - share_groupid - - - to_roleandsubid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_grp2rs FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_grp2rs FOREIGN KEY (share_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_datashare_grp2rs FOREIGN KEY (to_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - share_roleid - - - to_groupid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_role2group FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_role2group FOREIGN KEY (to_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_datashare_role2group FOREIGN KEY (share_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - share_roleid - - - to_roleid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_role2role FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_role2role FOREIGN KEY (share_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_datashare_role2role FOREIGN KEY (to_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - share_roleid - - - to_roleandsubid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_role2rs FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_role2rs FOREIGN KEY (share_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_datashare_role2rs FOREIGN KEY (to_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - share_roleandsubid - - - to_groupid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_rs2grp FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_rs2grp FOREIGN KEY (to_groupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_datashare_rs2grp FOREIGN KEY (share_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - share_roleandsubid - - - to_roleid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_rs2role FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_rs2role FOREIGN KEY (share_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_datashare_rs2role FOREIGN KEY (to_roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - share_roleandsubid - - - to_roleandsubid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_rs2rs FOREIGN KEY (shareid) REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_rs2rs FOREIGN KEY (share_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_datashare_rs2rs FOREIGN KEY (to_roleandsubid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - tabid - - - relatedto_tabid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_datashare_relatedmodules FOREIGN KEY (relatedto_tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_datashare_relatedmodules FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - shareid - permission - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - parenttabid - parenttab_label - visible - -
    - - - - - - - - - - - - - - userid - shareduserid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_tmp_read_user_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_tmp_read_user_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_tmp_read_user_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - userid - sharedgroupid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_tmp_read_group_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_tmp_read_group_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_tmp_read_group_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - userid - shareduserid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_tmp_write_user_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_tmp_write_user_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_tmp_write_user_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - userid - sharedgroupid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_tmp_write_group_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_tmp_write_group_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_tmp_write_group_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - userid - shareduserid - relatedtabid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE -ADD CONSTRAINT fk_4_vtiger_tmp_read_user_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - userid - sharedgroupid - tabid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_4_vtiger_tmp_read_group_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - userid - shareduserid - tabid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (shareduserid) REFERENCES vtiger_users(id) ON DELETE CASCADE -ADD CONSTRAINT fk_4_vtiger_tmp_write_user_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - userid - sharedgroupid - tabid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (sharedgroupid) REFERENCES vtiger_groups(groupid) ON DELETE CASCADE -ADD CONSTRAINT fk_2_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (relatedtabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_3_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (tabid) REFERENCES vtiger_tab(tabid) ON DELETE CASCADE -ADD CONSTRAINT fk_4_vtiger_tmp_write_group_rel_sharing_per FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - tabid - parenttabid - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - campaigntype - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - campaignstatus - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - expectedresponse - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - portalname - - Type=InnoDB -
    - - - - - - - - - - - - - creatorid - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - nick - - - session - - - ping - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - - chat_from - - - chat_to - - - born - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_chat_msg FOREIGN KEY (chat_from) REFERENCES vtiger_chat_users(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - msg - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_chat_pchat FOREIGN KEY (msg) REFERENCES vtiger_chat_msg(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - msg - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_chat_pvchat FOREIGN KEY (msg) REFERENCES vtiger_chat_msg(id) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - tag_id - tagger_id - object_id - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - taxname - - - Type=InnoDB -
    - - - - - - - - - - - - - productid - - - taxid - - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_producttaxrel FOREIGN KEY (productid) REFERENCES vtiger_products(productid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - source - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - source - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - source - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - source - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - purchaseorderid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_postatushistory FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - salesorderid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_sostatushistory FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - quoteid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_quotestagehistory FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - - - - - - invoiceid - - Type=InnoDB -
    - - -ADD CONSTRAINT fk_1_vtiger_invoicestatushistory FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE -Type=InnoDB - - -
    - - - - - - - - - - - Type=InnoDB -
    - - - - - - - - - - - - - id - - - productid - - Type=InnoDB -
    - - - - - - - - - - - - - - - - taxname - - - Type=InnoDB -
    - - - - - - id - - Type=InnoDB -
    - - - - - - - - - - - - - smid - - - attachmentsid - - Type=InnoDB -
    - - - ADD CONSTRAINT fk_1_vtiger_salesmanattachmentsrel FOREIGN KEY (smid) REFERENCES vtiger_users(id) ON DELETE CASCADE - ADD CONSTRAINT fk_2_vtiger_salesmanattachmentsrel FOREIGN KEY (attachmentsid) REFERENCES vtiger_attachments(attachmentsid) ON DELETE CASCADE - Type=InnoDB - - -
    - - - - - - - - - - - - - - - - - - - - tabid - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - organizationname - name - - - - organizationname - type - - - Type=InnoDB -
    - - - ADD CONSTRAINT fk_1_vtiger_orgunit FOREIGN KEY (organizationname) REFERENCES vtiger_organizationdetails(organizationname) ON UPDATE CASCADE ON DELETE CASCADE - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - - - orgunittype - - - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - organizationname - - - userid - - Type=InnoDB -
    - - - ADD CONSTRAINT fk_1_vtiger_user2org FOREIGN KEY (organizationname) REFERENCES vtiger_organizationdetails(organizationname) ON UPDATE CASCADE ON DELETE CASCADE - ADD CONSTRAINT fk_2_vtiger_user2org FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - orgunitid - - - userid - - Type=InnoDB -
    - - - ADD CONSTRAINT fk_1_vtiger_user2orgunit FOREIGN KEY (orgunitid) REFERENCES vtiger_orgunit(orgunitid) ON DELETE CASCADE - ADD CONSTRAINT fk_2_vtiger_user2orgunit FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE - Type=InnoDB -
    - - - - - - - - - - - - - - - - - - organizationname - - - crmid - - Type=InnoDB -
    - - +
    + + + + + + + + + + + + + + + + orgunitid + + + userid + + Type=InnoDB +
    + + + ADD CONSTRAINT fk_1_vtiger_user2orgunit FOREIGN KEY (orgunitid) REFERENCES vtiger_orgunit(orgunitid) ON DELETE CASCADE + ADD CONSTRAINT fk_2_vtiger_user2orgunit FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE + Type=InnoDB +
    + + + + + + + + + + + + + + + + + + organizationname + + + crmid + + Type=InnoDB +
    + + ADD CONSTRAINT fk_1_vtiger_entity2org FOREIGN KEY (organizationname) REFERENCES vtiger_organizationdetails(organizationname) ON UPDATE CASCADE ON DELETE CASCADEADD CONSTRAINT fk_2_vtiger_entity2org FOREIGN KEY (crmid) REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE - Type=InnoDB -
    - - - + Type=InnoDB +
    + + + + Modified: vtigercrm/branches/5.1_jens/soap/customerportal.php ============================================================================== --- vtigercrm/branches/5.1_jens/soap/customerportal.php (original) +++ vtigercrm/branches/5.1_jens/soap/customerportal.php Mon Apr 16 12:27:44 2007 @@ -17,11 +17,12 @@ $log = &LoggerManager::getLogger('customerportal'); -//$serializer = new XML_Serializer(); -$NAMESPACE = 'http://www.vtigercrm.com/vtigercrm'; +error_reporting(0); + +$NAMESPACE = 'http://www.vtiger.com/products/crm'; $server = new soap_server; -$server->configureWSDL('vtigersoap'); +$server->configureWSDL('customerportal'); @@ -165,6 +166,17 @@ ) ); +//Added to return the file content +$server->wsdl->addComplexType( + 'get_filecontent_array', + 'complexType', + 'array', + '', + array( + 'fileid'=>'xsd:string','type'=>'tns:xsd:string', + ) +); + $server->wsdl->addComplexType( 'add_ticket_attachment_array', 'complexType', @@ -274,6 +286,12 @@ 'get_ticket_attachments', array('id'=>'xsd:string','ticketid'=>'xsd:string'), array('return'=>'tns:get_ticket_attachments_array'), + $NAMESPACE); + +$server->register( + 'get_filecontent', + array('id'=>'xsd:string','fileid'=>'xsd:string','filename'=>'xsd:string'), + array('return'=>'tns:get_filecontent_array'), $NAMESPACE); $server->register( @@ -569,7 +587,32 @@ $updatequery = "update vtiger_crmentity set modifiedtime=".$servercreatedtime." where crmid=".$ticketid; $adb->query($updatequery); - } + + //To get the username and user email id, user means assigned to user of the ticket + $result = $adb->query("select user_name, email1 from vtiger_users inner join vtiger_crmentity on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.crmid=$ticketid"); + $owner = $adb->query_result($result,0,'user_name'); + $to_email = $adb->query_result($result,0,'email1'); + + //To get the contact name + $result1 = $adb->query("select lastname, firstname, email from vtiger_contactdetails where contactid=$ownerid"); + $customername = $adb->query_result($result1,0,'firstname').' '.$adb->query_result($result1,0,'lastname'); + $from_email = $adb->query_result($result1,0,'email'); + + //send mail to the assigned to user when customer add comment + $subject = "Respond to Ticket ID ## $ticketid ## in Customer Portal - URGENT"; + $contents = "Dear $owner,

    + Customer has provided the following additional information to your reply:

    + + ".nl2br($comments)."

    + + Kindly respond to above ticket at the earliest.

    + + Regards,
    + Support Administrator + "; + + $mailstatus = send_mail('HelpDesk',$to_email,$customername,$from_email,$subject,$contents); + } } /** function used to close the ticket @@ -781,16 +824,43 @@ $filesize = filesize($filepath.$fileid."_".$filename); $filetype = $adb->query_result($res,$i,'type'); - $filecontents = base64_encode(file_get_contents($filepath.$fileid."_".$filename));//fread(fopen($filepath.$filename, "r"), $filesize)); + //Now we will not pass the file content to CP, when the customer click on the link we will retrieve + //$filecontents = base64_encode(file_get_contents($filepath.$fileid."_".$filename));//fread(fopen($filepath.$filename, "r"), $filesize)); $output[$i]['fileid'] = $fileid; $output[$i]['filename'] = $filename; $output[$i]['filetype'] = $filetype; $output[$i]['filesize'] = $filesize; - $output[$i]['filecontents'] = $filecontents; + //$output[$i]['filecontents'] = $filecontents; } return $output; +} + +/** function used to get the contents of a file + * @param int $contactid - customer ie., contact id + * @param int $fileid - id of the file to which we want contents + * @param string $filename - name of the file to which we want contents + * return $filecontents array with single file contents like [fileid] => filecontent + */ +function get_filecontent($contactid, $fileid, $filename) +{ + global $adb; + $query = "select vtiger_attachments.path from vtiger_troubletickets + inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid = vtiger_troubletickets.ticketid + inner join vtiger_attachments on vtiger_attachments.attachmentsid = vtiger_seattachmentsrel.attachmentsid + where vtiger_troubletickets.parent_id= $contactid and + vtiger_attachments.attachmentsid= $fileid and + vtiger_attachments.name='$filename'"; + $res = $adb->query($query); + + if($adb->num_rows($res)>0) + { + $filenamewithpath = $adb->query_result($res,0,'path').$fileid."_".$filename; + $filecontents[$fileid] = base64_encode(file_get_contents($filenamewithpath)); + $adb->println("Going to return the content of the file ==> $filenamewithpath"); + } + return $filecontents; } /** function to add attachment for a ticket ie., the passed contents will be write in a file and the details will be stored in database Modified: vtigercrm/branches/5.1_jens/soap/firefoxtoolbar.php ============================================================================== --- vtigercrm/branches/5.1_jens/soap/firefoxtoolbar.php (original) +++ vtigercrm/branches/5.1_jens/soap/firefoxtoolbar.php Mon Apr 16 12:27:44 2007 @@ -1,747 +1,759 @@ -configureWSDL('vtigersoap'); - -$server->register( - 'get_version', - array('user_name'=>'xsd:string','password'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'create_lead_from_webform', - array('username'=>'xsd:string', - 'lastname'=>'xsd:string', - 'email'=>'xsd:string', - 'phone'=>'xsd:string', - 'company'=>'xsd:string', - 'country'=>'xsd:string', - 'description'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - - - - -$server->register( - 'create_site_from_webform', - array('username'=>'xsd:string', - 'portalname'=>'xsd:string', - 'portalurl'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - - - -$server->register( - 'create_rss_from_webform', - array('username'=>'xsd:string', - 'rssurl'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - - - - - -$server->register( - 'create_contacts', - array('user_name'=>'xsd:string','lastname'=>'xsd:string','phone'=>'xsd:string','mobile'=>'xsd:string','email'=>'xsd:string','street'=>'xsd:string','city'=>'xsd:string','state'=>'xsd:string','country'=>'xsd:string','zipcode'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - - - -$server->register( - 'create_account', - array('username'=>'xsd:string', 'accountname'=>'xsd:string', 'email'=>'xsd:string', 'phone'=>'xsd:string','$primary_address_street'=>'xsd:string','$primary_address_city'=>'xsd:string','$primary_address_state'=>'xsd:string','$primary_address_postalcode'=>'xsd:string','$primary_address_country'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - - - $server->register( - 'create_ticket_from_toolbar', - array('username'=>'xsd:string', 'title'=>'xsd:string','description'=>'xsd:string','priority'=>'xsd:string','severity'=>'xsd:string','category'=>'xsd:string','user_name'=>'xsd:string','parent_id'=>'xsd:string','product_id'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - - -$server->register( - 'create_vendor_from_webform', - array('username'=>'xsd:string', 'vendorname'=>'xsd:string', - 'email'=>'xsd:string', - 'phone'=>'xsd:string', - 'website'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - - -$server->register( - 'create_product_from_webform', - array('username'=>'xsd:string', 'productname'=>'xsd:string', - 'productcode'=>'xsd:string', - 'website'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - - -$server->register( - 'create_note_from_webform', - array('username'=>'xsd:string', 'title'=>'xsd:string', - 'notecontent'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'LogintoVtigerCRM', - array('user_name'=>'xsd:string','password'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'CheckLeadPermission', - array('username'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'CheckContactPermission', - array('username'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'CheckAccountPermission', - array('username'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'CheckTicketPermission', - array('username'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'CheckVendorPermission', - array('username'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'CheckProductPermission', - array('username'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'CheckNotePermission', - array('username'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'CheckSitePermission', - array('username'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'CheckRssPermission', - array('username'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - - -function CheckLeadPermission($username) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("Leads","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -function CheckContactPermission($username) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("Contacts","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -function CheckAccountPermission($username) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("Accounts","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -function CheckTicketPermission($username) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("HelpDesk","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -function CheckVendorPermission($username) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("Vendors","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -function CheckProductPermission($username) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("Products","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -function CheckNotePermission($username) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("Notes","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -function CheckSitePermission($username) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("Portal","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -function CheckRssPermission($username) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("Rss","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - - -function create_site_from_webform($username,$portalname,$portalurl) -{ - global $log; - global $adb; - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - require_once("modules/Portal/Portal.php"); - if(isPermitted("Portals","EditView") == "yes") - { - $result = SavePortal($portalname,$portalurl); - - $adb->println("Create New Portal from Web Form - Ends"); - - if($result != '') - return 'Portal added sucessfully'; - else - return "Portal creation failed. Try again"; - } - else - { - return $accessDenied; - } -} -function LogintoVtigerCRM($user_name,$password) -{ - global $log; - require_once('modules/Users/Users.php'); - - $return_access = "FALSE"; - - $objuser = new Users(); - - if($password != "") - { - $objuser->column_fields['user_name'] = $user_name; - $objuser->load_user($password); - if($objuser->is_authenticated()) - { - $return_access = "TRUE"; - }else - { - $return_access = "FALSE"; - } - }else - { - //$server->setError("Invalid username and/or password"); - $return_access = "FALSE"; - } - $objuser = $objuser; - return $return_access; -} - -function create_rss_from_webform($username,$url) -{ - - global $log; - global $adb; - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - require_once("modules/Rss/Rss.php"); - - $oRss = new vtigerRSS(); - if(isPermitted("RSS","EditView") == "yes") - { - if($oRss->setRSSUrl($url)) - { - if($oRss->saveRSSUrl($url) == false) - { - return "RSS feed addition failed. Try again"; - } - else - { - return 'RSS feed added sucessfully.'; - } - - }else - { - return "Not a valid RSS Feed or your Proxy Settings is not correct. Try again"; - } - } - else - { - return $accessDenied; - } - -} - - -function create_note_from_webform($username,$subject,$desc) -{ - global $log; - global $adb; - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - $adb->println("Create New Note from Web Form - Starts"); - require_once("modules/Notes/Notes.php"); - - $focus = new Notes(); - if(isPermitted("Notes","EditView") == "yes") - { - $focus->column_fields['notes_title'] = $subject; - $focus->column_fields['notecontent'] = $desc; - - $focus->save("Notes"); - - $focus->retrieve_entity_info($focus->id,"Notes"); - - $adb->println("Create New Note from Web Form - Ends"); - - if($focus->id != '') - return 'Note added sucessfully.'; - else - return "Note creation failed. Try again"; - } - else - { - return $accessDenied; - } - -} - -function create_product_from_webform($username,$productname,$code,$website) -{ - global $log; - global $adb; - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - $adb->println("Create New Product from Web Form - Starts"); - - require_once("modules/Products/Products.php"); - if(isPermitted("Products","EditView") == "yes") - { - $focus = new Products(); - $focus->column_fields['productname'] = $productname; - $focus->column_fields['productcode'] = $code; - $focus->column_fields['website'] = $website; - $focus->save("Products"); - $adb->println("Create New Product from Web Form - Ends"); - - if($focus->id != '') - return 'Product added sucessfully.'; - else - return "Product creation failed. Try again"; - } - else - { - return $accessDenied; - } - - -} - -function create_vendor_from_webform($username,$vendorname,$email,$phone,$website) -{ - global $log; - global $adb; - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - $adb->println("Create New Vendor from Web Form - Starts"); - require_once("modules/Vendors/Vendors.php"); - if(isPermitted("Vendors","EditView" ) == "yes") - { - $focus = new Vendors(); - $focus->column_fields['vendorname'] = $vendorname; - $focus->column_fields['email'] = $email; - $focus->column_fields['phone'] = $phone; - $focus->column_fields['website'] = $website; - - $focus->save("Vendors"); - - $focus->retrieve_entity_info($focus->id,"Vendors"); - - $adb->println("Create New Vendor from Web Form - Ends"); - - if($focus->id != '') - return 'Vendor added sucessfully'; - else - return "Vendor creation failed. Try again"; - } - else - { - return $accessDenied; - } - - -} - -function create_ticket_from_toolbar($username,$title,$description,$priority,$severity,$category,$user_name,$parent_id,$product_id) -{ - global $log; - global $adb; - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - - if(isPermitted("HelpDesk","EditView") == "yes") - { - - $seed_ticket = new HelpDesk(); - $output_list = Array(); - - require_once('modules/HelpDesk/HelpDesk.php'); - $ticket = new HelpDesk(); - - $ticket->column_fields[ticket_title] = $title; - $ticket->column_fields[description]=$description; - $ticket->column_fields[ticketpriorities]=$priority; - $ticket->column_fields[ticketseverities]=$severity; - $ticket->column_fields[ticketcategories]=$category; - $ticket->column_fields[ticketstatus]='Open'; - - $ticket->column_fields[parent_id]=$parent_id; - $ticket->column_fields[product_id]=$product_id; - $ticket->column_fields[assigned_user_id]=$user_id; - //$ticket->saveentity("HelpDesk"); - $ticket->save("HelpDesk"); - - if($ticket->id != '') - return "Ticket Created Sucessfully"; - else - return "Error while creating Ticket.Try again"; - } - else - { - return $accessDenied; - } - - -} - -function create_account($username,$accountname,$email,$phone,$primary_address_street,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country) -{ - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id,'Users'); - require_once("modules/Accounts/Accounts.php"); - if(isPermitted("Accounts","EditView") == "yes") - { - $account=new Accounts(); - $account->column_fields['accountname']=$accountname; - $account->column_fields['email1']=$email; - $account->column_fields['phone']=$phone; - $account->column_fields['bill_street']=$primary_address_street; - $account->column_fields['bill_city']=$primary_address_city; - $account->column_fields['bill_state']=$primary_address_state; - $account->column_fields['bill_code']=$primary_address_postalcode; - $account->column_fields['bill_country']=$primary_address_country; - $account->column_fields['ship_street']=$primary_address_street; - $account->column_fields['ship_city']=$primary_address_city; - $account->column_fields['ship_state']=$primary_address_state; - $account->column_fields['ship_code']=$primary_address_postalcode; - $account->column_fields['ship_country']=$primary_address_country; - $account->column_fields['assigned_user_id']=$user_id; - $account->save('Accounts'); - if($account->id != '') - return "Account added Sucessfully"; - else - return "Error while adding Account.Try again"; - } - else - { - return $accessDenied; - } - -} - - - -function get_version($user_name, $password) -{ - return "5.0.0"; -} - - - -function create_lead_from_webform($username,$lastname,$email,$phone,$company,$country,$description) -{ - - global $log; - global $adb; - global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); - $user_id=$seed_user->retrieve_user_id($username); - $current_user=$seed_user; - $current_user->retrieve_entity_info($user_id, 'Users'); - $adb->println("Create New Lead from Web Form - Starts"); - require_once("modules/Leads/Leads.php"); - - $focus = new Leads(); - if(isPermitted("Leads","EditView") == "yes") - { - $focus->column_fields['lastname'] = $lastname; - $focus->column_fields['email'] = $email; - $focus->column_fields['phone'] = $phone; - $focus->column_fields['company'] = $company; - $focus->column_fields['country'] = $country; - $focus->column_fields['description'] = $description; - $focus->column_fields['assigned_user_id'] = $user_id; - $focus->save("Leads"); - $adb->println("Create New Lead from Web Form - Ends"); - if($focus->id != '') - return 'Thank you for your interest. Information has been successfully added as Lead.'; - else - return "Lead creation failed. Try again"; - } - else - { - return $accessDenied; - } - - -} - -function create_contacts($user_name,$lastname,$phone,$mobile,$email,$street,$city,$state,$country,$zipcode) -{ - global $log; - $log->debug($user_name); - $birthdate = "0000-00-00"; - - return create_contact1($user_name, "", $lastname, $email,"", "","", $mobile, "",$street,$city,$state,$zipcode,$country,$city,$street,$state,$zipcode,$country,$phone,"","","","",$birthdate,"",""); - -} - -function create_contact1($user_name, $first_name, $last_name, $email_address ,$account_name , $salutation , $title, $phone_mobile, $reports_to,$primary_address_street,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country,$alt_address_city,$alt_address_street,$alt_address_state,$alt_address_postalcode,$alt_address_country,$office_phone,$home_phone,$other_phone,$fax,$department,$birthdate,$assistant_name,$assistant_phone,$description='') -{ - global $adb,$log; - global $current_user; - require_once('modules/Users/Users.php'); - $seed_user = new Users(); - $user_id = $seed_user->retrieve_user_id($user_name); - $current_user = $seed_user; - $current_user->retrieve_entity_info($user_id,'Users'); - - require_once('modules/Contacts/Contacts.php'); - if(isPermitted("Contacts","EditView") == "yes") - { - $contact = new Contacts(); - $contact->column_fields[firstname]= $first_name; - $contact->column_fields[lastname]= $last_name; - //$contact->column_fields[account_id]=retrieve_account_id($account_name,$user_id);// NULL value is not supported NEED TO FIX - $contact->column_fields[salutation]=$salutation; - // EMAIL IS NOT ADDED - $contact->column_fields[title]=$title; - $contact->column_fields[email]=$email_address; - $contact->column_fields[mobile]=$phone_mobile; - //$contact->column_fields[reports_to_id] =retrievereportsto($reports_to,$user_id,$account_id);// NOT FIXED IN SAVEENTITY.PHP - $contact->column_fields[mailingstreet]=$primary_address_street; - $contact->column_fields[mailingcity]=$primary_address_city; - $contact->column_fields[mailingcountry]=$primary_address_country; - $contact->column_fields[mailingstate]=$primary_address_state; - $contact->column_fields[mailingzip]=$primary_address_postalcode; - $contact->column_fields[otherstreet]=$alt_address_street; - $contact->column_fields[othercity]=$alt_address_city; - $contact->column_fields[othercountry]=$alt_address_country; - $contact->column_fields[otherstate]=$alt_address_state; - $contact->column_fields[otherzip]=$alt_address_postalcode; - $contact->column_fields[assigned_user_id]=$user_id; - // new Fields - $contact->column_fields[phone]= $office_phone; - $contact->column_fields[homephone]= $home_phone; - $contact->column_fields[otherphone]= $other_phone; - $contact->column_fields[fax]= $fax; - $contact->column_fields[department]=$department; - $contact->column_fields[birthday]= getDisplayDate($birthdate); - $contact->column_fields[assistant]= $assistant_name; - $contact->column_fields[assistantphone]= $assistant_phone; - $contact->column_fields[description]= $description; - $contact->save("Contacts"); - if($contact->id != '') - return 'Contact added Sucessfully'; - else - return "Contact creation failed. Try again"; - } - else - { - return $accessDenied; - } - -} - -$server->service($HTTP_RAW_POST_DATA); -exit(); -?> +configureWSDL('vtigersoap'); + +$server->register( + 'get_version', + array('user_name'=>'xsd:string','password'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'create_lead_from_webform', + array('username'=>'xsd:string', + 'lastname'=>'xsd:string', + 'firstname'=>'xsd:string', + 'email'=>'xsd:string', + 'phone'=>'xsd:string', + 'company'=>'xsd:string', + 'country'=>'xsd:string', + 'description'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + + + + +$server->register( + 'create_site_from_webform', + array('username'=>'xsd:string', + 'portalname'=>'xsd:string', + 'portalurl'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + + + +$server->register( + 'create_rss_from_webform', + array('username'=>'xsd:string', + 'rssurl'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + + + + + +$server->register( + 'create_contacts', + array('user_name'=>'xsd:string','firstname'=>'xsd:string','lastname'=>'xsd:string','phone'=>'xsd:string','mobile'=>'xsd:string','email'=>'xsd:string','street'=>'xsd:string','city'=>'xsd:string','state'=>'xsd:string','country'=>'xsd:string','zipcode'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + + + +$server->register( + 'create_account', + array('username'=>'xsd:string', 'accountname'=>'xsd:string', 'email'=>'xsd:string', 'phone'=>'xsd:string','$primary_address_street'=>'xsd:string','$primary_address_city'=>'xsd:string','$primary_address_state'=>'xsd:string','$primary_address_postalcode'=>'xsd:string','$primary_address_country'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + + + $server->register( + 'create_ticket_from_toolbar', + array('username'=>'xsd:string', 'title'=>'xsd:string','description'=>'xsd:string','priority'=>'xsd:string','severity'=>'xsd:string','category'=>'xsd:string','user_name'=>'xsd:string','parent_id'=>'xsd:string','product_id'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + + +$server->register( + 'create_vendor_from_webform', + array('username'=>'xsd:string', 'vendorname'=>'xsd:string', + 'email'=>'xsd:string', + 'phone'=>'xsd:string', + 'website'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + + +$server->register( + 'create_product_from_webform', + array('username'=>'xsd:string', 'productname'=>'xsd:string', + 'productcode'=>'xsd:string', + 'website'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + + +$server->register( + 'create_note_from_webform', + array('username'=>'xsd:string', 'title'=>'xsd:string', + 'notecontent'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'LogintoVtigerCRM', + array('user_name'=>'xsd:string','password'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'CheckLeadPermission', + array('username'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'CheckContactPermission', + array('username'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'CheckAccountPermission', + array('username'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'CheckTicketPermission', + array('username'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'CheckVendorPermission', + array('username'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'CheckProductPermission', + array('username'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'CheckNotePermission', + array('username'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'CheckSitePermission', + array('username'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'CheckRssPermission', + array('username'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + + +function CheckLeadPermission($username) +{ + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("Leads","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + +function CheckContactPermission($username) +{ + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("Contacts","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + +function CheckAccountPermission($username) +{ + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("Accounts","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + +function CheckTicketPermission($username) +{ + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("HelpDesk","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + +function CheckVendorPermission($username) +{ + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("Vendors","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + +function CheckProductPermission($username) +{ + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("Products","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + +function CheckNotePermission($username) +{ + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("Notes","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + +function CheckSitePermission($username) +{ + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("Portal","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + +function CheckRssPermission($username) +{ + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("Rss","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + + +function create_site_from_webform($username,$portalname,$portalurl) +{ + global $log; + global $adb; + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + require_once("modules/Portal/Portal.php"); + if(isPermitted("Portals","EditView") == "yes") + { + $result = SavePortal($portalname,$portalurl); + + $adb->println("Create New Portal from Web Form - Ends"); + + if($result != '') + return 'URL added sucessfully'; + else + return "Portal creation failed. Try again"; + } + else + { + return $accessDenied; + } +} +function LogintoVtigerCRM($user_name,$password) +{ + global $log; + require_once('modules/Users/Users.php'); + + $return_access = "FALSE"; + + $objuser = new Users(); + + if($password != "") + { + $objuser->column_fields['user_name'] = $user_name; + $objuser->load_user($password); + if($objuser->is_authenticated()) + { + $return_access = "TRUE"; + }else + { + $return_access = "FALSE"; + } + }else + { + //$server->setError("Invalid username and/or password"); + $return_access = "FALSE"; + } + $objuser = $objuser; + return $return_access; +} + +function create_rss_from_webform($username,$url) +{ + + global $log; + global $adb; + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + require_once("modules/Rss/Rss.php"); + + $oRss = new vtigerRSS(); + if(isPermitted("RSS","EditView") == "yes") + { + if($oRss->setRSSUrl($url)) + { + if($oRss->saveRSSUrl($url) == false) + { + return "RSS feed addition failed. Try again"; + } + else + { + return 'RSS feed added sucessfully.'; + } + + }else + { + return "Not a valid RSS Feed or your Proxy Settings is not correct. Try again"; + } + } + else + { + return $accessDenied; + } + +} + + +function create_note_from_webform($username,$subject,$desc) +{ + global $log; + global $adb; + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + $adb->println("Create New Note from Web Form - Starts"); + require_once("modules/Notes/Notes.php"); + + $focus = new Notes(); + if(isPermitted("Notes","EditView") == "yes") + { + $focus->column_fields['notes_title'] = $subject; + $focus->column_fields['notecontent'] = $desc; + + $focus->save("Notes"); + + $focus->retrieve_entity_info($focus->id,"Notes"); + + $adb->println("Create New Note from Web Form - Ends"); + + if($focus->id != '') + return 'Note added sucessfully.'; + else + return "Note creation failed. Try again"; + } + else + { + return $accessDenied; + } + +} + +function create_product_from_webform($username,$productname,$code,$website) +{ + global $log; + global $adb; + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + $adb->println("Create New Product from Web Form - Starts"); + + require_once("modules/Products/Products.php"); + if(isPermitted("Products","EditView") == "yes") + { + $focus = new Products(); + $focus->column_fields['productname'] = $productname; + $focus->column_fields['productcode'] = $code; + $focus->column_fields['website'] = $website; + $focus->save("Products"); + $adb->println("Create New Product from Web Form - Ends"); + + if($focus->id != '') + return 'Product added sucessfully.'; + else + return "Product creation failed. Try again"; + } + else + { + return $accessDenied; + } + + +} + +function create_vendor_from_webform($username,$vendorname,$email,$phone,$website) +{ + global $log; + global $adb; + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + $adb->println("Create New Vendor from Web Form - Starts"); + require_once("modules/Vendors/Vendors.php"); + if(isPermitted("Vendors","EditView" ) == "yes") + { + $focus = new Vendors(); + $focus->column_fields['vendorname'] = $vendorname; + $focus->column_fields['email'] = $email; + $focus->column_fields['phone'] = $phone; + $focus->column_fields['website'] = $website; + + $focus->save("Vendors"); + + $focus->retrieve_entity_info($focus->id,"Vendors"); + + $adb->println("Create New Vendor from Web Form - Ends"); + + if($focus->id != '') + return 'Vendor added sucessfully'; + else + return "Vendor creation failed. Try again"; + } + else + { + return $accessDenied; + } + + +} + +function create_ticket_from_toolbar($username,$title,$description,$priority,$severity,$category,$user_name,$parent_id,$product_id) +{ + global $log; + global $adb; + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + + if(isPermitted("HelpDesk","EditView") == "yes") + { + + $seed_ticket = new HelpDesk(); + $output_list = Array(); + + require_once('modules/HelpDesk/HelpDesk.php'); + $ticket = new HelpDesk(); + + $ticket->column_fields[ticket_title] = $title; + $ticket->column_fields[description]=$description; + $ticket->column_fields[ticketpriorities]=$priority; + $ticket->column_fields[ticketseverities]=$severity; + $ticket->column_fields[ticketcategories]=$category; + $ticket->column_fields[ticketstatus]='Open'; + + $ticket->column_fields[parent_id]=$parent_id; + $ticket->column_fields[product_id]=$product_id; + $ticket->column_fields[assigned_user_id]=$user_id; + //$ticket->saveentity("HelpDesk"); + $ticket->save("HelpDesk"); + + if($ticket->id != '') + return "Ticket Created Sucessfully"; + else + return "Error while creating Ticket.Try again"; + } + else + { + return $accessDenied; + } + + +} + +function create_account($username,$accountname,$email,$phone,$primary_address_street,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country) +{ + global $current_user,$log,$adb; + $log->DEBUG("Entering with data ".$username.$accountname.$email.$phone."
    ".$primary_address_street.$primary_address_city.$primary_address_state.$primary_address_postalcode.$primary_address_country); + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id,'Users'); + require_once("modules/Accounts/Accounts.php"); + if(isPermitted("Accounts","EditView") == "yes") + { + $query = "SELECT accountname FROM vtiger_account,vtiger_crmentity WHERE accountname ='".$accountname."' and vtiger_account.accountid = vtiger_crmentity.crmid and vtiger_crmentity.deleted != 1"; + $result = $adb->query($query); + if($adb->num_rows($result) > 0) + { + return "Account Name already exists"; + die; + } + $account=new Accounts(); + $account->column_fields['accountname']=$accountname; + $account->column_fields['email1']=$email; + $account->column_fields['phone']=$phone; + $account->column_fields['bill_street']=$primary_address_street; + $account->column_fields['bill_city']=$primary_address_city; + $account->column_fields['bill_state']=$primary_address_state; + $account->column_fields['bill_code']=$primary_address_postalcode; + $account->column_fields['bill_country']=$primary_address_country; + $account->column_fields['ship_street']=$primary_address_street; + $account->column_fields['ship_city']=$primary_address_city; + $account->column_fields['ship_state']=$primary_address_state; + $account->column_fields['ship_code']=$primary_address_postalcode; + $account->column_fields['ship_country']=$primary_address_country; + $account->column_fields['assigned_user_id']=$user_id; + $account->save('Accounts'); + if($account->id != '') + return "Account added Sucessfully"; + else + return "Error while adding Account.Try again"; + } + else + { + return $accessDenied; + } + +} + + + +function get_version($user_name, $password) +{ + return "5.0.0"; +} + + + +function create_lead_from_webform($username,$lastname,$email,$phone,$company,$country,$description,$firstname) +{ + + global $log; + global $adb; + global $current_user; + require_once("modules/Users/Users.php"); + $seed_user=new Users(); + $user_id=$seed_user->retrieve_user_id($username); + $current_user=$seed_user; + $current_user->retrieve_entity_info($user_id, 'Users'); + $adb->println("Create New Lead from Web Form - Starts"); + require_once("modules/Leads/Leads.php"); + + $focus = new Leads(); + if(isPermitted("Leads","EditView") == "yes") + { + $focus->column_fields['lastname'] = $lastname; + $focus->column_fields['firstname'] = $firstname; + $focus->column_fields['email'] = $email; + $focus->column_fields['phone'] = $phone; + $focus->column_fields['company'] = $company; + $focus->column_fields['country'] = $country; + $focus->column_fields['description'] = $description; + $focus->column_fields['assigned_user_id'] = $user_id; + $focus->save("Leads"); + $adb->println("Create New Lead from Web Form - Ends"); + if($focus->id != '') + return 'Thank you for your interest. Information has been successfully added as Lead.'; + else + return "Lead creation failed. Try again"; + } + else + { + return $accessDenied; + } + + +} + +function create_contacts($user_name,$firstname,$lastname,$phone,$mobile,$email,$street,$city,$state,$country,$zipcode) +{ + global $log; + $log->DEBUG("Entering into create_contacts"); + $log->DEBUG($firstname."Firstisname"); + $birthdate = "0000-00-00"; + + return create_contact1($user_name, $firstname, $lastname, $email,"", "","", $mobile, "",$street,$city,$state,$zipcode,$country,$city,$street,$state,$zipcode,$country,$phone,"","","","",$birthdate,"",""); + +} + +function create_contact1($user_name, $first_name, $last_name, $email_address ,$account_name , $salutation , $title, $phone_mobile, $reports_to,$primary_address_street,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country,$alt_address_city,$alt_address_street,$alt_address_state,$alt_address_postalcode,$alt_address_country,$office_phone,$home_phone,$other_phone,$fax,$department,$birthdate,$assistant_name,$assistant_phone,$description='') +{ + global $adb,$log; + global $current_user; + require_once('modules/Users/Users.php'); + $seed_user = new Users(); + $user_id = $seed_user->retrieve_user_id($user_name); + $current_user = $seed_user; + $current_user->retrieve_entity_info($user_id,'Users'); + + require_once('modules/Contacts/Contacts.php'); + $log->DEBUG($first_name."First & Name"); + if(isPermitted("Contacts","EditView") == "yes") + { + $contact = new Contacts(); + $contact->column_fields[firstname]= $first_name; + $contact->column_fields[lastname]= $last_name; + //$contact->column_fields[account_id]=retrieve_account_id($account_name,$user_id);// NULL value is not supported NEED TO FIX + $contact->column_fields[salutation]=$salutation; + // EMAIL IS NOT ADDED + $contact->column_fields[title]=$title; + $contact->column_fields[email]=$email_address; + $contact->column_fields[mobile]=$phone_mobile; + //$contact->column_fields[reports_to_id] =retrievereportsto($reports_to,$user_id,$account_id);// NOT FIXED IN SAVEENTITY.PHP + $contact->column_fields[mailingstreet]=$primary_address_street; + $contact->column_fields[mailingcity]=$primary_address_city; + $contact->column_fields[mailingcountry]=$primary_address_country; + $contact->column_fields[mailingstate]=$primary_address_state; + $contact->column_fields[mailingzip]=$primary_address_postalcode; + $contact->column_fields[otherstreet]=$alt_address_street; + $contact->column_fields[othercity]=$alt_address_city; + $contact->column_fields[othercountry]=$alt_address_country; + $contact->column_fields[otherstate]=$alt_address_state; + $contact->column_fields[otherzip]=$alt_address_postalcode; + $contact->column_fields[assigned_user_id]=$user_id; + // new Fields + $contact->column_fields[phone]= $office_phone; + $contact->column_fields[homephone]= $home_phone; + $contact->column_fields[otherphone]= $other_phone; + $contact->column_fields[fax]= $fax; + $contact->column_fields[department]=$department; + $contact->column_fields[birthday]= getDisplayDate($birthdate); + $contact->column_fields[assistant]= $assistant_name; + $contact->column_fields[assistantphone]= $assistant_phone; + $contact->column_fields[description]= $description; + $contact->save("Contacts"); + if($contact->id != '') + return 'Contact added Sucessfully'; + else + return "Contact creation failed. Try again"; + } + else + { + return $accessDenied; + } + +} + +$server->service($HTTP_RAW_POST_DATA); +exit(); +?> Modified: vtigercrm/branches/5.1_jens/soap/thunderbirdplugin.php ============================================================================== --- vtigercrm/branches/5.1_jens/soap/thunderbirdplugin.php (original) +++ vtigercrm/branches/5.1_jens/soap/thunderbirdplugin.php Mon Apr 16 12:27:44 2007 @@ -1,547 +1,581 @@ -configureWSDL('vtigersoap'); - -$server->register( - 'create_session', - array('user_name'=>'xsd:string','password'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'end_session', - array('user_name'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'SearchContactsByEmail', - array('username'=>'xsd:string','emailaddress'=>'xsd:string'), - array('return'=>'tns:contactdetails'), - $NAMESPACE); - -$server->register( - 'GetContacts', - array('username'=>'xsd:string'), - array('return'=>'tns:contactdetails'), - $NAMESPACE); - -$server->register( - 'CheckContactPerm',array('user_name'=>'xsd:string'),array('return'=>'xsd:string'),$NAMESPACE); - -$server->register( - 'CheckContactViewPerm',array('user_name'=>'xsd:string'),array('return'=>'xsd:string'),$NAMESPACE); - -$server->register( - 'AddContact', - array('user_name'=>'xsd:string', - 'first_name'=>'xsd:string', - 'last_name'=>'xsd:string', - 'email_address'=>'xsd:string', - 'account_name'=>'xsd:string', - 'salutation'=>'xsd:string', - 'title'=>'xsd:string', - 'phone_mobile'=>'xsd:string', - 'reports_to'=>'xsd:string', - 'primary_address_street'=>'xsd:string', - 'primary_address_city'=>'xsd:string', - 'primary_address_state'=>'xsd:string' , - 'primary_address_postalcode'=>'xsd:string', - 'primary_address_country'=>'xsd:string', - 'alt_address_city'=>'xsd:string', - 'alt_address_street'=>'xsd:string', - 'alt_address_state'=>'xsd:string', - 'alt_address_postalcode'=>'xsd:string', - 'alt_address_country'=>'xsd:string', - 'office_phone'=>'xsd:string', - 'home_phone'=>'xsd:string', - 'fax'=>'xsd:string', - 'department'=>'xsd:string', - 'description'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'AddLead', - array('user_name'=>'xsd:string', - 'first_name'=>'xsd:string', - 'last_name'=>'xsd:string', - 'email_address'=>'xsd:string', - 'account_name'=>'xsd:string', - 'salutation'=>'xsd:string', - 'title'=>'xsd:string', - 'phone_mobile'=>'xsd:string', - 'reports_to'=>'xsd:string', - 'primary_address_street'=>'xsd:string', - 'primary_address_city'=>'xsd:string', - 'primary_address_state'=>'xsd:string' , - 'primary_address_postalcode'=>'xsd:string', - 'primary_address_country'=>'xsd:string', - 'alt_address_city'=>'xsd:string', - 'alt_address_street'=>'xsd:string', - 'alt_address_state'=>'xsd:string', - 'alt_address_postalcode'=>'xsd:string', - 'alt_address_country'=>'xsd:string', - 'office_phone'=>'xsd:string', - 'home_phone'=>'xsd:string', - 'fax'=>'xsd:string', - 'department'=>'xsd:string', - 'description'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->register( - 'track_email', - array('user_name'=>'xsd:string', 'contact_ids'=>'xsd:string', 'date_sent'=>'xsd:date', 'email_subject'=>'xsd:string', 'email_body'=>'xsd:string'), - array('return'=>'xsd:string'), - $NAMESPACE); - -$server->wsdl->addComplexType( - 'contactdetail', - 'complexType', - 'struct', - 'all', - '', - array( - 'id' => array('name'=>'id','type'=>'xsd:string'), - 'firstname' => array('name'=>'firstname','type'=>'xsd:string'), - 'lastname' => array('name'=>'lastname','type'=>'xsd:string'), - 'emailaddress' => array('name'=>'emailaddress','type'=>'xsd:string'), - 'accountname' => array('name'=>'accountname','type'=>'xsd:string'), - 'middlename' => array('name'=>'middlename','type'=>'xsd:string'), - 'birthdate'=> array('name'=>'birthdate','type'=>'xsd:string'), - 'jobtitle'=> array('name'=>'jobtitle','type'=>'xsd:string'), - 'department'=> array('name'=>'department','type'=>'xsd:string'), - 'title' => array('name'=>'title','type'=>'xsd:string'), - 'officephone'=> array('name'=>'officephone','type'=>'xsd:string'), - 'homephone'=> array('name'=>'homephone','type'=>'xsd:string'), - 'otherphone'=> array('name'=>'otherphone','type'=>'xsd:string'), - 'fax'=> array('name'=>'fax','type'=>'xsd:string'), - 'mobile'=> array('name'=>'mobile','type'=>'xsd:string'), - 'asstname'=> array('name'=>'asstname','type'=>'xsd:string'), - 'asstphone'=> array('name'=>'asstphone','type'=>'xsd:string'), - 'reportsto'=> array('name'=>'reportsto','type'=>'xsd:string'), - 'mailingstreet'=> array('name'=>'mailingstreet','type'=>'xsd:string'), - 'mailingcity'=> array('name'=>'mailingcity','type'=>'xsd:string'), - 'mailingstate'=> array('name'=>'mailingstate','type'=>'xsd:string'), - 'mailingzip'=> array('name'=>'mailingzip','type'=>'xsd:string'), - 'mailingcountry'=> array('name'=>'mailingcountry','type'=>'xsd:string'), - 'otherstreet'=> array('name'=>'otherstreet','type'=>'xsd:string'), - 'othercity'=> array('name'=>'othercity','type'=>'xsd:string'), - 'otherstate'=> array('name'=>'otherstate','type'=>'xsd:string'), - 'otherzip'=> array('name'=>'otherzip','type'=>'xsd:string'), - 'othercountry'=> array('name'=>'othercountry','type'=>'xsd:string'), - 'description'=> array('name'=>'description','type'=>'xsd:string'), - 'category'=> array('name'=>'category','type'=>'xsd:string'), - ) -); - -$server->wsdl->addComplexType( - 'contactdetails', - 'complexType', - 'array', - '', - 'SOAP-ENC:Array', - array(), - array( - array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:contactdetail[]') - ), - 'tns:contactdetail' -); - - -function SearchContactsByEmail($username,$emailaddress) -{ - require_once('modules/Contacts/Contacts.php'); - - $seed_contact = new Contacts(); - $output_list = Array(); - - $response = $seed_contact->get_searchbyemailid($username,$emailaddress); - $contactList = $response['list']; - - // create a return array of names and email addresses. - foreach($contactList as $contact) - { - $output_list[] = Array( - "id" => $contact[contactid], - "firstname" => $contact[firstname], - "lastname" => $contact[lastname], - "emailaddress" => $contact[email], - "accountname" => $contact[accountname], - ); - } - - //to remove an erroneous compiler warning - $seed_contact = $seed_contact; - return $output_list; -} - -function track_email($user_name, $contact_ids, $date_sent, $email_subject, $email_body) -{ - global $adb; - require_once('modules/Users/Users.php'); - require_once('modules/Emails/Emails.php'); - - $seed_user = new Users(); - $user_id = $seed_user->retrieve_user_id($user_name); - - $email = new Emails(); - //$log->debug($msgdtls['contactid']); - $emailbody = str_replace("'", "''", $email_body); - $emailsubject = str_replace("'", "''",$email_subject); - $datesent = getDisplayDate($date_sent); - - $email->column_fields[subject] = $emailsubject; - $email->column_fields[assigned_user_id] = $user_id; - $email->column_fields[date_start] = $datesent; - $email->column_fields[description] = htmlentities($emailbody); - $email->column_fields[activitytype] = 'Emails'; - $email->plugin_save = true; - $email->save("Emails"); - - $email->set_emails_contact_invitee_relationship($email->id,$contact_ids); - $email->set_emails_se_invitee_relationship($email->id,$contact_ids); - $email->set_emails_user_invitee_relationship($email->id,$user_id); - $sql = "select email from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted =0 and vtiger_contactdetails.contactid='".$contact_ids."'"; - $result = $adb->query($sql); - $camodulerow = $adb->fetch_array($result); - if(isset($camodulerow)) - { - $emailid = $camodulerow["email"]; - $query = 'insert into vtiger_emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$contact_ids."@77|".'","THUNDERBIRD")'; - $adb->query($query); - } - return $email->id; -} - - -function GetContacts($username) -{ - global $adb; - global $log; - require_once('modules/Contacts/Contacts.php'); - - $seed_contact = new Contacts(); - $output_list = Array(); - - $query = $seed_contact->get_contactsforol($username); - $result = $adb->query($query); - - while($contact = $adb->fetch_array($result)) - { - if($contact["birthdate"] == "0000-00-00") - { - $contact["birthdate"] = ""; - } - if($contact["salutation"] == "--None--") - { - $contact["salutation"] = ""; - } - - $namelist = explode(" ", $contact["lastname"]); - if(isset($namelist)) - { - if(count($namelist) >= 2) - { - $contact["lastname"] = $namelist[count($namelist)-1]; - for($i=0; $i $contact["id"], - "title" => $contact["salutation"], - "firstname" => $contact["firstname"], - "middlename" => trim($middlename), - "lastname" => trim($contact["lastname"]), - "birthdate" => $contact["birthday"], - "emailaddress" => $contact["email"], - "jobtitle" => $contact["title"], - "department" => $contact["department"], - "accountname" => $contact["accountname"], - "officephone" => $contact["phone"], - "homephone" => $contact["homephone"], - "otherphone" => $contact["otherphone"], - "fax" => $contact["fax"], - "mobile" => $contact["mobile"], - "asstname" => $contact["assistant"], - "asstphone" => $contact["assistantphone"], - "reportsto" => $contact["reports_to_name"], - "mailingstreet" => $contact["mailingstreet"], - "mailingcity" => $contact["mailingcity"], - "mailingstate" => $contact["mailingstate"], - "mailingzip" => $contact["mailingzip"], - "mailingcountry" => $contact["mailingcountry"], - "otherstreet" => $contact["otherstreet"], - "othercity" => $contact["othercity"], - "otherstate" => $contact["otherstate"], - "otherzip" => $contact["otherzip"], - "othercountry" => $contact["othercountry"], - "description" => "", - "category" => "", - ); - } - //to remove an erroneous compiler warning - $seed_contact = $seed_contact; - return $output_list; -} - -function retrieve_account_id($account_name,$user_id) -{ - - if($account_name=="") - { - return null; - } - - $query = "select vtiger_account.accountname accountname,vtiger_account.accountid accountid from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_account.accountname='" .$account_name."'"; - - - $db = new PearDatabase(); - $result= $db->query($query) or die ("Not able to execute insert"); - - $rows_count = $db->getRowCount($result); - if($rows_count==0) - { - require_once('modules/Accounts/Accounts.php'); - $account = new Accounts(); - $account->column_fields[accountname] = $account_name; - $account->column_fields[assigned_user_id]=$user_id; - //$account->saveentity("Accounts"); - $account->save("Accounts"); - //mysql_close(); - return $account->id; - } - else if ($rows_count==1) - { - $row = $db->fetchByAssoc($result, 0); - //mysql_close(); - return $row["accountid"]; - } - else - { - $row = $db->fetchByAssoc($result, 0); - //mysql_close(); - return $row["accountid"]; - } - -} - -function AddContact($user_name, $first_name, $last_name, $email_address ,$account_name , $salutation , $title, $phone_mobile, $reports_to,$primary_address_street,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country,$alt_address_city,$alt_address_street,$alt_address_state,$alt_address_postalcode,$alt_address_country,$office_phone="",$home_phone="",$fax="",$department="",$description="") -{ - global $adb; - global $current_user; - require_once('modules/Users/Users.php'); - require_once('modules/Contacts/Contacts.php'); - - $seed_user = new Users(); - $user_id = $seed_user->retrieve_user_id($user_name); - $current_user = $seed_user; - $current_user->retrieve_entity_info($user_id,"Users"); - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) - { - $sql1 = "select fieldname,columnname from vtiger_field where tabid=4 and block <> 75 and block <> 6 and block <> 5"; - }else - { - $profileList = getCurrentUserProfileList(); - $sql1 = "select fieldname,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=4 and vtiger_field.block <> 75 and vtiger_field.block <> 6 and vtiger_field.block <> 5 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; - } - $result1 = $adb->query($sql1); - for($i=0;$i < $adb->num_rows($result1);$i++) - { - $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); - } - - $contact = new Contacts(); - $contact->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $first_name : ""; - $contact->column_fields[lastname]=in_array('lastname',$permitted_lists) ? $last_name : ""; - $contact->column_fields[birthday]=in_array('birthday',$permitted_lists) ? getDisplayDate("0000-00-00") : ""; - $contact->column_fields[email]=in_array('email',$permitted_lists) ? $email_address : ""; - $contact->column_fields[title]=in_array('title',$permitted_lists) ? $title : ""; - $contact->column_fields[department]=in_array('department',$permitted_lists) ? $department : ""; - $contact->column_fields[account_id]=in_array('account_id',$permitted_lists) ? retrieve_account_id($account_name,$user_id) : ""; - $contact->column_fields[phone]=in_array('phone',$permitted_lists) ? $office_phone : ""; - $contact->column_fields[homephone]=in_array('homephone',$permitted_lists) ? $home_phone : ""; - $contact->column_fields[fax]=in_array('fax',$permitted_lists) ? $fax : ""; - $contact->column_fields[mobile]=in_array('mobile',$permitted_lists) ? $phone_mobile : ""; - $contact->column_fields[mailingstreet]=in_array('mailingstreet',$permitted_lists) ? $primary_address_street : ""; - $contact->column_fields[mailingcity]=in_array('mailingcity',$permitted_lists) ? $primary_address_city : ""; - $contact->column_fields[mailingstate]=in_array('mailingstate',$permitted_lists) ? $primary_address_state : ""; - $contact->column_fields[mailingzip]=in_array('mailingzip',$permitted_lists) ? $primary_address_postalcode : ""; - $contact->column_fields[mailingcountry]=in_array('mailingcountry',$permitted_lists) ? $primary_address_country : ""; - $contact->column_fields[otherstreet]=in_array('otherstreet',$permitted_lists) ? $alt_address_street : ""; - $contact->column_fields[othercity]=in_array('othercity',$permitted_lists) ? $alt_address_city : ""; - $contact->column_fields[otherstate]=in_array('otherstate',$permitted_lists) ? $alt_address_state : ""; - $contact->column_fields[otherzip]=in_array('otherzip',$permitted_lists) ? $alt_address_postalcode : ""; - $contact->column_fields[othercountry]=in_array('othercountry',$permitted_lists) ? $alt_address_country : ""; - $contact->column_fields[assigned_user_id]=in_array('assigned_user_id',$permitted_lists) ? $user_id : ""; - $contact->column_fields[description]= ""; - $contact->save("Contacts"); - - $contact = $contact; - return $contact->id; -} - -function AddLead($user_name, $first_name, $last_name, $email_address ,$account_name , $salutation , $title, $phone_mobile, $reports_to ,$primary_address_street , $website ,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country,$alt_address_city,$alt_address_street,$alt_address_state,$alt_address_postalcode,$alt_address_country,$office_phone="",$home_phone="",$fax="",$department="",$description="") -{ - global $adb; - global $current_user; - require_once('modules/Users/Users.php'); - require_once('modules/Leads/Leads.php'); - - $seed_user = new Users(); - $user_id = $seed_user->retrieve_user_id($user_name); - $current_user = $seed_user; - $current_user->retrieve_entity_info($user_id,"Users"); - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) - { - $sql1 = "select fieldname,columnname from vtiger_field where tabid=7 and block <> 14"; - }else - { - $profileList = getCurrentUserProfileList(); - $sql1 = "select fieldname,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=7 and vtiger_field.block <> 14 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; - } - $result1 = $adb->query($sql1); - for($i=0;$i < $adb->num_rows($result1);$i++) - { - $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); - } - - $Lead = new Leads(); - $Lead->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $first_name : ""; - $Lead->column_fields[lastname]=in_array('lastname',$permitted_lists) ? $last_name : ""; - $Lead->column_fields[birthday]=in_array('birthday',$permitted_lists) ? getDisplayDate("0000-00-00") : ""; - $Lead->column_fields[company]=in_array('company',$permitted_lists) ? $account_name : ""; - $Lead->column_fields[email]=in_array('email',$permitted_lists) ? $email_address : ""; - $Lead->column_fields[title]=in_array('title',$permitted_lists) ? $title : ""; - $Lead->column_fields[designation]=in_array('designation',$permitted_lists) ? $department : ""; - $Lead->column_fields[phone]=in_array('phone',$permitted_lists) ? $office_phone : ""; - $Lead->column_fields[homephone]=in_array('homephone',$permitted_lists) ? $home_phone : ""; - $Lead->column_fields[website]=in_array('website',$permitted_lists) ? $website : ""; - $Lead->column_fields[fax]=in_array('fax',$permitted_lists) ? $fax : ""; - $Lead->column_fields[mobile]=in_array('mobile',$permitted_lists) ? $phone_mobile : ""; - $Lead->column_fields[mailingstreet]=in_array('mailingstreet',$permitted_lists) ? $primary_address_street : ""; - $Lead->column_fields[mailingcity]=in_array('mailingcity',$permitted_lists) ? $primary_address_city : ""; - $Lead->column_fields[mailingstate]=in_array('mailingstate',$permitted_lists) ? $primary_address_state : ""; - $Lead->column_fields[mailingzip]=in_array('mailingzip',$permitted_lists) ? $primary_address_postalcode : ""; - $Lead->column_fields[workCountry]=in_array('mailingcountry',$permitted_lists) ? $workCountry : ""; - $Lead->column_fields[street]=in_array('street',$permitted_lists) ? $alt_address_street : ""; - $Lead->column_fields[city]=in_array('city',$permitted_lists) ? $alt_address_city : ""; - $Lead->column_fields[state]=in_array('state',$permitted_lists) ? $alt_address_state : ""; - $Lead->column_fields[code]=in_array('code',$permitted_lists) ? $alt_address_postalcode : ""; - $Lead->column_fields[country]=in_array('country',$permitted_lists) ? $alt_address_country : ""; - $Lead->column_fields[assigned_user_id]=in_array('assigned_user_id',$permitted_lists) ? $user_id : ""; - $Lead->column_fields[description]= ""; -// $log->fatal($Lead->column_fields); - $Lead->save("Leads"); - - $Lead = $Lead; - return $Lead->id; -} - -function create_session($user_name, $password) -{ - global $adb,$log; - $return_access = 'failure'; - require_once('modules/Users/Users.php'); - $objuser = new Users(); - if($password != "" && $user_name != '') - { - $objuser->column_fields['user_name'] = $user_name; - $encrypted_password = $objuser->encrypt_password($password); - $query = "select id from vtiger_users where user_name='$user_name' and user_password='$encrypted_password'"; - $result = $adb->query($query); - if($adb->num_rows($result) > 0) - { - $return_access = 'success'; - $log->debug("Logged in sucessfully from thunderbirdplugin"); - }else - { - $return_access = 'failure'; - $log->debug("Logged in failure from thunderbirdplugin"); - } - }else - { - $return_access = 'failure'; - $log->debug("Logged in failure from thunderbirdplugin"); - } - return $return_access; -} - -function end_session($user_name) -{ - return "Success"; -} - -function CheckContactPerm($user_name) -{ - global $current_user; - require_once('modules/Users/Users.php'); - $seed_user = new Users(); - $user_id = $seed_user->retrieve_user_id($user_name); - $current_user = $seed_user; - $current_user->retrieve_entity_info($user_id,"Users"); - if(isPermitted("Contacts","EditView") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -function CheckContactViewPerm($user_name) -{ - global $current_user,$log; - require_once('modules/Users/Users.php'); - $seed_user = new Users(); - $user_id = $seed_user->retrieve_user_id($user_name); - $current_user = $seed_user; - $current_user->retrieve_entity_info($user_id,"Users"); - if(isPermitted("Contacts","index") == "yes") - { - return "allowed"; - }else - { - return "denied"; - } -} - -$server->service($HTTP_RAW_POST_DATA); -exit(); -?> +configureWSDL('vtigersoap'); + +$server->register( + 'create_session', + array('user_name'=>'xsd:string','password'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'end_session', + array('user_name'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'SearchContactsByEmail', + array('username'=>'xsd:string','emailaddress'=>'xsd:string'), + array('return'=>'tns:contactdetails'), + $NAMESPACE); + +$server->register( + 'GetContacts', + array('username'=>'xsd:string'), + array('return'=>'tns:contactdetails'), + $NAMESPACE); + +$server->register( + 'CheckContactPerm',array('user_name'=>'xsd:string'),array('return'=>'xsd:string'),$NAMESPACE); + +$server->register( + 'CheckContactViewPerm',array('user_name'=>'xsd:string'),array('return'=>'xsd:string'),$NAMESPACE); + +$server->register( + 'CheckLeadViewPerm',array('user_name'=>'xsd:string'),array('return'=>'xsd:string'),$NAMESPACE); + +$server->register( + 'AddContact', + array('user_name'=>'xsd:string', + 'first_name'=>'xsd:string', + 'last_name'=>'xsd:string', + 'email_address'=>'xsd:string', + 'account_name'=>'xsd:string', + 'salutation'=>'xsd:string', + 'title'=>'xsd:string', + 'phone_mobile'=>'xsd:string', + 'reports_to'=>'xsd:string', + 'primary_address_street'=>'xsd:string', + 'primary_address_city'=>'xsd:string', + 'primary_address_state'=>'xsd:string' , + 'primary_address_postalcode'=>'xsd:string', + 'primary_address_country'=>'xsd:string', + 'alt_address_city'=>'xsd:string', + 'alt_address_street'=>'xsd:string', + 'alt_address_state'=>'xsd:string', + 'alt_address_postalcode'=>'xsd:string', + 'alt_address_country'=>'xsd:string', + 'office_phone'=>'xsd:string', + 'home_phone'=>'xsd:string', + 'fax'=>'xsd:string', + 'department'=>'xsd:string', + 'description'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'AddLead', + array('user_name'=>'xsd:string', + 'first_name'=>'xsd:string', + 'last_name'=>'xsd:string', + 'email_address'=>'xsd:string', + 'account_name'=>'xsd:string', + 'salutation'=>'xsd:string', + 'title'=>'xsd:string', + 'phone_mobile'=>'xsd:string', + 'reports_to'=>'xsd:string', + 'primary_address_street'=>'xsd:string', + 'primary_address_city'=>'xsd:string', + 'primary_address_state'=>'xsd:string' , + 'primary_address_postalcode'=>'xsd:string', + 'primary_address_country'=>'xsd:string', + 'alt_address_city'=>'xsd:string', + 'alt_address_street'=>'xsd:string', + 'alt_address_state'=>'xsd:string', + 'alt_address_postalcode'=>'xsd:string', + 'alt_address_country'=>'xsd:string', + 'office_phone'=>'xsd:string', + 'home_phone'=>'xsd:string', + 'fax'=>'xsd:string', + 'department'=>'xsd:string', + 'description'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->register( + 'track_email', + array('user_name'=>'xsd:string', 'contact_ids'=>'xsd:string', 'date_sent'=>'xsd:date', 'email_subject'=>'xsd:string', 'email_body'=>'xsd:string'), + array('return'=>'xsd:string'), + $NAMESPACE); + +$server->wsdl->addComplexType( + 'contactdetail', + 'complexType', + 'struct', + 'all', + '', + array( + 'id' => array('name'=>'id','type'=>'xsd:string'), + 'firstname' => array('name'=>'firstname','type'=>'xsd:string'), + 'lastname' => array('name'=>'lastname','type'=>'xsd:string'), + 'emailaddress' => array('name'=>'emailaddress','type'=>'xsd:string'), + 'accountname' => array('name'=>'accountname','type'=>'xsd:string'), + 'middlename' => array('name'=>'middlename','type'=>'xsd:string'), + 'birthdate'=> array('name'=>'birthdate','type'=>'xsd:string'), + 'jobtitle'=> array('name'=>'jobtitle','type'=>'xsd:string'), + 'department'=> array('name'=>'department','type'=>'xsd:string'), + 'title' => array('name'=>'title','type'=>'xsd:string'), + 'officephone'=> array('name'=>'officephone','type'=>'xsd:string'), + 'homephone'=> array('name'=>'homephone','type'=>'xsd:string'), + 'otherphone'=> array('name'=>'otherphone','type'=>'xsd:string'), + 'fax'=> array('name'=>'fax','type'=>'xsd:string'), + 'mobile'=> array('name'=>'mobile','type'=>'xsd:string'), + 'asstname'=> array('name'=>'asstname','type'=>'xsd:string'), + 'asstphone'=> array('name'=>'asstphone','type'=>'xsd:string'), + 'reportsto'=> array('name'=>'reportsto','type'=>'xsd:string'), + 'mailingstreet'=> array('name'=>'mailingstreet','type'=>'xsd:string'), + 'mailingcity'=> array('name'=>'mailingcity','type'=>'xsd:string'), + 'mailingstate'=> array('name'=>'mailingstate','type'=>'xsd:string'), + 'mailingzip'=> array('name'=>'mailingzip','type'=>'xsd:string'), + 'mailingcountry'=> array('name'=>'mailingcountry','type'=>'xsd:string'), + 'otherstreet'=> array('name'=>'otherstreet','type'=>'xsd:string'), + 'othercity'=> array('name'=>'othercity','type'=>'xsd:string'), + 'otherstate'=> array('name'=>'otherstate','type'=>'xsd:string'), + 'otherzip'=> array('name'=>'otherzip','type'=>'xsd:string'), + 'othercountry'=> array('name'=>'othercountry','type'=>'xsd:string'), + 'description'=> array('name'=>'description','type'=>'xsd:string'), + 'category'=> array('name'=>'category','type'=>'xsd:string'), + ) +); + +$server->wsdl->addComplexType( + 'contactdetails', + 'complexType', + 'array', + '', + 'SOAP-ENC:Array', + array(), + array( + array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:contactdetail[]') + ), + 'tns:contactdetail' +); + + +function SearchContactsByEmail($username,$emailaddress) +{ + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); + $output_list = Array(); + + $response = $seed_contact->get_searchbyemailid($username,$emailaddress); + $contactList = $response['list']; + + // create a return array of names and email addresses. + foreach($contactList as $contact) + { + $output_list[] = Array( + "id" => $contact[contactid], + "firstname" => $contact[firstname], + "lastname" => $contact[lastname], + "emailaddress" => $contact[email], + "accountname" => $contact[accountname], + ); + } + + //to remove an erroneous compiler warning + $seed_contact = $seed_contact; + return $output_list; +} + +function track_email($user_name, $contact_ids, $date_sent, $email_subject, $email_body) +{ + global $current_user; + global $adb; + global $log; + require_once('modules/Users/Users.php'); + require_once('modules/Emails/Emails.php'); + + $current_user = new Users(); + $user_id = $current_user->retrieve_user_id($user_name); + $query = "select email1 from vtiger_users where id =".$user_id; + $result = $adb->query($query); + $user_emailid = $adb->query_result($result,0,"email1"); + $current_user = $current_user->retrieveCurrentUserInfoFromFile($user_id); + $email = new Emails(); + //$log->debug($msgdtls['contactid']); + $emailbody = str_replace("'", "''", $email_body); + $emailsubject = str_replace("'", "''",$email_subject); + $datesent = getDisplayDate($date_sent); + + $email->column_fields[subject] = $emailsubject; + $email->column_fields[assigned_user_id] = $user_id; + $email->column_fields[date_start] = $datesent; + $email->column_fields[description] = htmlentities($emailbody); + $email->column_fields[activitytype] = 'Emails'; + $email->plugin_save = true; + $email->save("Emails"); + $query = "select fieldid from vtiger_field where fieldname = 'email' and tabid = 4"; + $result = $adb->query($query); + $field_id = $adb->query_result($result,0,"fieldid"); + $email->set_emails_contact_invitee_relationship($email->id,$contact_ids); + $email->set_emails_se_invitee_relationship($email->id,$contact_ids); + $email->set_emails_user_invitee_relationship($email->id,$user_id); + $sql = "select email from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted =0 and vtiger_contactdetails.contactid='".$contact_ids."'"; + $result = $adb->query($sql); + $camodulerow = $adb->fetch_array($result); + if(isset($camodulerow)) + { + $emailid = $camodulerow["email"]; + $query = 'insert into vtiger_emaildetails values ('.$email->id.',"'.$emailid.'","'.$user_emailid.'","","","","'.$user_id.'@-1|'.$contact_ids.'@'.$field_id.'|","THUNDERBIRD")'; + $adb->query($query); + } + return $email->id; +} + + +function GetContacts($username) +{ + global $adb; + global $log; + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); + $output_list = Array(); + + $query = $seed_contact->get_contactsforol($username); + $result = $adb->query($query); + + while($contact = $adb->fetch_array($result)) + { + if($contact["birthdate"] == "0000-00-00") + { + $contact["birthdate"] = ""; + } + if($contact["salutation"] == "--None--") + { + $contact["salutation"] = ""; + } + + $namelist = explode(" ", $contact["lastname"]); + if(isset($namelist)) + { + if(count($namelist) >= 2) + { + $contact["lastname"] = $namelist[count($namelist)-1]; + for($i=0; $i $contact["id"], + "title" => $contact["salutation"], + "firstname" => $contact["firstname"], + "middlename" => trim($middlename), + "lastname" => trim($contact["lastname"]), + "birthdate" => $contact["birthday"], + "emailaddress" => $contact["email"], + "jobtitle" => $contact["title"], + "department" => $contact["department"], + "accountname" => $contact["accountname"], + "officephone" => $contact["phone"], + "homephone" => $contact["homephone"], + "otherphone" => $contact["otherphone"], + "fax" => $contact["fax"], + "mobile" => $contact["mobile"], + "asstname" => $contact["assistant"], + "asstphone" => $contact["assistantphone"], + "reportsto" => $contact["reports_to_name"], + "mailingstreet" => $contact["mailingstreet"], + "mailingcity" => $contact["mailingcity"], + "mailingstate" => $contact["mailingstate"], + "mailingzip" => $contact["mailingzip"], + "mailingcountry" => $contact["mailingcountry"], + "otherstreet" => $contact["otherstreet"], + "othercity" => $contact["othercity"], + "otherstate" => $contact["otherstate"], + "otherzip" => $contact["otherzip"], + "othercountry" => $contact["othercountry"], + "description" => "", + "category" => "", + ); + } + //to remove an erroneous compiler warning + $seed_contact = $seed_contact; + return $output_list; +} + +function retrieve_account_id($account_name,$user_id) +{ + + if($account_name=="") + { + return null; + } + + $query = "select vtiger_account.accountname accountname,vtiger_account.accountid accountid from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_account.accountname='" .$account_name."'"; + + + $db = new PearDatabase(); + $result= $db->query($query) or die ("Not able to execute insert"); + + $rows_count = $db->getRowCount($result); + if($rows_count==0) + { + require_once('modules/Accounts/Accounts.php'); + $account = new Accounts(); + $account->column_fields[accountname] = $account_name; + $account->column_fields[assigned_user_id]=$user_id; + //$account->saveentity("Accounts"); + $account->save("Accounts"); + //mysql_close(); + return $account->id; + } + else if ($rows_count==1) + { + $row = $db->fetchByAssoc($result, 0); + //mysql_close(); + return $row["accountid"]; + } + else + { + $row = $db->fetchByAssoc($result, 0); + //mysql_close(); + return $row["accountid"]; + } + +} + +function AddContact($user_name, $first_name, $last_name, $email_address ,$account_name , $salutation , $title, $phone_mobile, $reports_to,$primary_address_street,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country,$alt_address_city,$alt_address_street,$alt_address_state,$alt_address_postalcode,$alt_address_country,$office_phone="",$home_phone="",$fax="",$department="",$description="") +{ + global $adb; + global $current_user; + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.php'); + + $seed_user = new Users(); + $user_id = $seed_user->retrieve_user_id($user_name); + $current_user = $seed_user; + $current_user->retrieve_entity_info($user_id,"Users"); + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) + { + $sql1 = "select fieldname,columnname from vtiger_field where tabid=4 and block <> 75 and block <> 6 and block <> 5"; + }else + { + $profileList = getCurrentUserProfileList(); + $sql1 = "select fieldname,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=4 and vtiger_field.block <> 75 and vtiger_field.block <> 6 and vtiger_field.block <> 5 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; + } + $result1 = $adb->query($sql1); + for($i=0;$i < $adb->num_rows($result1);$i++) + { + $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); + } + + $contact = new Contacts(); + $contact->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $first_name : ""; + $contact->column_fields[lastname]=in_array('lastname',$permitted_lists) ? $last_name : ""; + $contact->column_fields[email]=in_array('email',$permitted_lists) ? $email_address : ""; + $contact->column_fields[title]=in_array('title',$permitted_lists) ? $title : ""; + $contact->column_fields[department]=in_array('department',$permitted_lists) ? $department : ""; + $contact->column_fields[account_id]=in_array('account_id',$permitted_lists) ? retrieve_account_id($account_name,$user_id) : ""; + $contact->column_fields[phone]=in_array('phone',$permitted_lists) ? $office_phone : ""; + $contact->column_fields[homephone]=in_array('homephone',$permitted_lists) ? $home_phone : ""; + $contact->column_fields[fax]=in_array('fax',$permitted_lists) ? $fax : ""; + $contact->column_fields[mobile]=in_array('mobile',$permitted_lists) ? $phone_mobile : ""; + $contact->column_fields[mailingstreet]=in_array('mailingstreet',$permitted_lists) ? $primary_address_street : ""; + $contact->column_fields[mailingcity]=in_array('mailingcity',$permitted_lists) ? $primary_address_city : ""; + $contact->column_fields[mailingstate]=in_array('mailingstate',$permitted_lists) ? $primary_address_state : ""; + $contact->column_fields[mailingzip]=in_array('mailingzip',$permitted_lists) ? $primary_address_postalcode : ""; + $contact->column_fields[mailingcountry]=in_array('mailingcountry',$permitted_lists) ? $primary_address_country : ""; + $contact->column_fields[otherstreet]=in_array('otherstreet',$permitted_lists) ? $alt_address_street : ""; + $contact->column_fields[othercity]=in_array('othercity',$permitted_lists) ? $alt_address_city : ""; + $contact->column_fields[otherstate]=in_array('otherstate',$permitted_lists) ? $alt_address_state : ""; + $contact->column_fields[otherzip]=in_array('otherzip',$permitted_lists) ? $alt_address_postalcode : ""; + $contact->column_fields[othercountry]=in_array('othercountry',$permitted_lists) ? $alt_address_country : ""; + $contact->column_fields[assigned_user_id]=in_array('assigned_user_id',$permitted_lists) ? $user_id : ""; + $contact->column_fields[description]= ""; + $contact->save("Contacts"); + + $contact = $contact; + return $contact->id; +} + +function AddLead($user_name, $first_name, $last_name, $email_address ,$account_name , $salutation , $title, $phone_mobile, $reports_to ,$primary_address_street , $website ,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country,$alt_address_city,$alt_address_street,$alt_address_state,$alt_address_postalcode,$alt_address_country,$office_phone="",$home_phone="",$fax="",$department="",$description="") +{ + global $adb; + global $current_user; + require_once('modules/Users/Users.php'); + require_once('modules/Leads/Leads.php'); + + $seed_user = new Users(); + $user_id = $seed_user->retrieve_user_id($user_name); + $current_user = $seed_user; + $current_user->retrieve_entity_info($user_id,"Users"); + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) + { + $sql1 = "select fieldname,columnname from vtiger_field where tabid=7 and block <> 14"; + }else + { + $profileList = getCurrentUserProfileList(); + $sql1 = "select fieldname,columnname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=7 and vtiger_field.block <> 14 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; + } + $result1 = $adb->query($sql1); + for($i=0;$i < $adb->num_rows($result1);$i++) + { + $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); + } + + $Lead = new Leads(); + $Lead->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $first_name : ""; + $Lead->column_fields[lastname]=in_array('lastname',$permitted_lists) ? $last_name : ""; + $Lead->column_fields[company]=in_array('company',$permitted_lists) ? $account_name : ""; + $Lead->column_fields[email]=in_array('email',$permitted_lists) ? $email_address : ""; + $Lead->column_fields[title]=in_array('title',$permitted_lists) ? $title : ""; + $Lead->column_fields[designation]=in_array('designation',$permitted_lists) ? $department : ""; + $Lead->column_fields[phone]=in_array('phone',$permitted_lists) ? $office_phone : ""; + $Lead->column_fields[homephone]=in_array('homephone',$permitted_lists) ? $home_phone : ""; + $Lead->column_fields[website]=in_array('website',$permitted_lists) ? $website : ""; + $Lead->column_fields[fax]=in_array('fax',$permitted_lists) ? $fax : ""; + $Lead->column_fields[mobile]=in_array('mobile',$permitted_lists) ? $phone_mobile : ""; + $Lead->column_fields[mailingstreet]=in_array('mailingstreet',$permitted_lists) ? $primary_address_street : ""; + $Lead->column_fields[mailingcity]=in_array('mailingcity',$permitted_lists) ? $primary_address_city : ""; + $Lead->column_fields[mailingstate]=in_array('mailingstate',$permitted_lists) ? $primary_address_state : ""; + $Lead->column_fields[mailingzip]=in_array('mailingzip',$permitted_lists) ? $primary_address_postalcode : ""; + $Lead->column_fields[workCountry]=in_array('mailingcountry',$permitted_lists) ? $workCountry : ""; + $Lead->column_fields[street]=in_array('street',$permitted_lists) ? $alt_address_street : ""; + $Lead->column_fields[city]=in_array('city',$permitted_lists) ? $alt_address_city : ""; + $Lead->column_fields[state]=in_array('state',$permitted_lists) ? $alt_address_state : ""; + $Lead->column_fields[code]=in_array('code',$permitted_lists) ? $alt_address_postalcode : ""; + $Lead->column_fields[country]=in_array('country',$permitted_lists) ? $alt_address_country : ""; + $Lead->column_fields[assigned_user_id]=in_array('assigned_user_id',$permitted_lists) ? $user_id : ""; + $Lead->column_fields[description]= ""; +// $log->fatal($Lead->column_fields); + $Lead->save("Leads"); + + $Lead = $Lead; + return $Lead->id; +} + +function create_session($user_name, $password) +{ + global $adb,$log; + $return_access = 'failure'; + require_once('modules/Users/Users.php'); + $objuser = new Users(); + if($password != "" && $user_name != '') + { + $objuser->column_fields['user_name'] = $user_name; + $encrypted_password = $objuser->encrypt_password($password); + if($objuser->load_user($password) && $objuser->is_authenticated()) + { + $query = "select id from vtiger_users where user_name='$user_name' and user_password='$encrypted_password'"; + $result = $adb->query($query); + if($adb->num_rows($result) > 0) + { + $return_access = 'success'; + $log->debug("Logged in sucessfully from thunderbirdplugin"); + }else + { + $return_access = 'failure'; + $log->debug("Logged in failure from thunderbirdplugin"); + } + } + }else + { + $return_access = 'failure'; + $log->debug("Logged in failure from thunderbirdplugin"); + } + return $return_access; +} + +function end_session($user_name) +{ + return "Success"; +} + +function CheckContactPerm($user_name) +{ + global $current_user; + require_once('modules/Users/Users.php'); + $seed_user = new Users(); + $user_id = $seed_user->retrieve_user_id($user_name); + $current_user = $seed_user; + $current_user->retrieve_entity_info($user_id,"Users"); + if(isPermitted("Contacts","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} + +function CheckContactViewPerm($user_name) +{ + global $current_user,$log; + require_once('modules/Users/Users.php'); + $seed_user = new Users(); + $user_id = $seed_user->retrieve_user_id($user_name); + $current_user = $seed_user; + $current_user->retrieve_entity_info($user_id,"Users"); + if(isPermitted("Contacts","index") == "yes") + { + if(isPermitted("Emails","EditView") == "yes") + { + return "allowed"; + } + else + { + return "email"; + } + }else + { + return "contact"; + } +} + +function CheckLeadViewPerm($user_name) +{ + global $current_user,$log; + require_once('modules/Users/Users.php'); + $seed_user = new Users(); + $user_id = $seed_user->retrieve_user_id($user_name); + $current_user = $seed_user; + $current_user->retrieve_entity_info($user_id,"Users"); + if(isPermitted("Leads","EditView") == "yes") + { + return "allowed"; + }else + { + return "denied"; + } +} +$server->service($HTTP_RAW_POST_DATA); +exit(); +?> Modified: vtigercrm/branches/5.1_jens/soap/vtigerolservice.php ============================================================================== --- vtigercrm/branches/5.1_jens/soap/vtigerolservice.php (original) +++ vtigercrm/branches/5.1_jens/soap/vtigerolservice.php Mon Apr 16 12:27:44 2007 @@ -307,12 +307,17 @@ function AddMessageToContact($username,$contactid,$msgdtls) { + global $current_user; global $adb; require_once('modules/Users/Users.php'); require_once('modules/Emails/Emails.php'); - $seed_user = new Users(); - $user_id = $seed_user->retrieve_user_id($username); + $current_user = new Users(); + $user_id = $current_user->retrieve_user_id($username); + $query = "select email1 from vtiger_users where id =".$user_id; + $result = $adb->query($query); + $user_emailid = $adb->query_result($result,0,"email1"); + $current_user = $current_user->retrieveCurrentUserInfoFromFile($user_id); foreach($msgdtls as $msgdtl) { @@ -331,17 +336,19 @@ $email->column_fields[activitytype] = 'Emails'; $email->plugin_save = true; $email->save("Emails"); - + $query = "select fieldid from vtiger_field where fieldname = 'email' and tabid = 4"; + $result = $adb->query($query); + $field_id = $adb->query_result($result,0,"fieldid"); $email->set_emails_contact_invitee_relationship($email->id,$contactid); $email->set_emails_se_invitee_relationship($email->id,$contactid); - $email->set_emails_user_invitee_relationship($email->id,$user_id); + $email->set_emails_user_invitee_relationship($email->id,$user_id); $sql = "select email from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted =0 and vtiger_contactdetails.contactid='".$contactid."'"; $result = $adb->query($sql); $camodulerow = $adb->fetch_array($result); if(isset($camodulerow)) { $emailid = $camodulerow["email"]; - $query = 'insert into vtiger_emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$contactid."@77|".'","OUTLOOK")'; + $query = 'insert into vtiger_emaildetails values ('.$email->id.',"'.$emailid.'","'.$user_emailid.'","","","","'.$user_id.'@-1|'.$contactid.'@'.$field_id.'|","OUTLOOK")'; $adb->query($query); } return $email->id; @@ -353,31 +360,36 @@ } } -function LoginToVtiger($userid,$password) -{ +function LoginToVtiger($userid,$password,$version) +{ + global $log; global $adb; + $log->DEBUG("Entered into vtigerCRM with userid".$userid." and Version".$version); + include('vtigerversion.php'); + if($version != $vtiger_current_version) + { + return "VERSION"; + } require_once('modules/Users/Users.php'); - $return_access = "FALSE"; - $objuser = new Users(); - if($password != "") { $objuser->column_fields['user_name'] = $userid; $objuser->load_user($password); if($objuser->is_authenticated()) { - $return_access = "TRUE"; + $return_access = "TRUES"; }else { - $return_access = "FALSE"; + $return_access = "LOGIN"; } }else { //$server->setError("Invalid username and/or password"); $return_access = "FALSE"; } +$log->DEBUG("The return access to outlook was ".$return_access." from vtigerCRM"); $objuser = $objuser; return $return_access; } @@ -391,7 +403,7 @@ $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); - if(isPermitted("Emails","EditView") == "yes") + if(isPermitted("Emails","EditView") == "yes" && (isPermitted("Contacts","index") == 'yes')) { return "allowed"; }else @@ -595,7 +607,7 @@ { if(isset($cntrow)) { - $contact->column_fields[salutation]=in_array('salutation',$permitted_lists) ? $cntrow["title"] : ""; + $contact->column_fields[salutationtype]=in_array('salutationtype',$permitted_lists) ? $cntrow["title"] : ""; $contact->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $cntrow["firstname"] : ""; if($cntrow["middlename"] != "") @@ -677,7 +689,7 @@ if(isset($cntrow)) { $contact->retrieve_entity_info($cntrow["id"],"Contacts"); - $contact->column_fields[salutation]=in_array('salutation',$permitted_lists) ? $cntrow["title"] : ""; + $contact->column_fields[salutationtype]=in_array('salutationtype',$permitted_lists) ? $cntrow["title"] : ""; $contact->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $cntrow["firstname"] : ""; if($cntrow["middlename"] != "") { @@ -751,7 +763,7 @@ return null; } - $query = "select vtiger_account.accountname accountname,vtiger_account.accountid accountid from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_account.accountname='" .$account_name."'"; + $query = "select vtiger_account.accountname accountname,vtiger_account.accountid accountid from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_account.accountname='" .addslashes($account_name)."'"; $db = new PearDatabase(); Modified: vtigercrm/branches/5.1_jens/soap/wordplugin.php ============================================================================== --- vtigercrm/branches/5.1_jens/soap/wordplugin.php (original) +++ vtigercrm/branches/5.1_jens/soap/wordplugin.php Mon Apr 16 12:27:44 2007 @@ -327,19 +327,22 @@ $objuser = new Users(); if($password != "" && $user_name != '') { - $objuser->column_fields['user_name'] = $user_name; - $encrypted_password = $objuser->encrypt_password($password); - $query = "select id from vtiger_users where user_name='$user_name' and user_password='$encrypted_password'"; - $result = $adb->query($query); - if($adb->num_rows($result) > 0) - { - $return_access = "TempSessionID"; - $log->debug("Logged in sucessfully from wordplugin"); - }else - { - $return_access = "false"; - $log->debug("Logged in failure from wordplugin"); - } + $objuser->column_fields['user_name'] = $user_name; + $encrypted_password = $objuser->encrypt_password($password); + if($objuser->load_user($password) && $objuser->is_authenticated()) + { + $query = "select id from vtiger_users where user_name='$user_name' and user_password='$encrypted_password'"; + $result = $adb->query($query); + if($adb->num_rows($result) > 0) + { + $return_access = "TempSessionID"; + $log->debug("Logged in sucessfully from wordplugin"); + }else + { + $return_access = "false"; + $log->debug("Logged in failure from wordplugin"); + } + } }else { $return_access = "false"; Modified: vtigercrm/branches/5.1_jens/tabdata.php ============================================================================== --- vtigercrm/branches/5.1_jens/tabdata.php (original) +++ vtigercrm/branches/5.1_jens/tabdata.php Mon Apr 16 12:27:44 2007 @@ -11,7 +11,7 @@ //This file contains the commonly used variables -$tab_info_array=array('Home'=>3,'Leads'=>7,'Accounts'=>6,'Contacts'=>4,'Potentials'=>2,'Notes'=>8,'Calendar'=>9,'Emails'=>10,'HelpDesk'=>13,'Products'=>14,'Dashboard'=>1,'Faq'=>15,'Events'=>16,'Vendors'=>18,'PriceBooks'=>19,'Quotes'=>20,'PurchaseOrder'=>21,'SalesOrder'=>22,'Invoice'=>23,'Rss'=>24,'Reports'=>25,'Campaigns'=>26,'Portal'=>27,'Webmails'=>28,); +$tab_info_array=array('Home'=>3,'Leads'=>7,'Accounts'=>6,'Contacts'=>4,'Potentials'=>2,'Notes'=>8,'Calendar'=>9,'Emails'=>10,'HelpDesk'=>13,'Products'=>14,'Dashboard'=>1,'Faq'=>15,'Events'=>16,'Vendors'=>18,'PriceBooks'=>19,'Quotes'=>20,'PurchaseOrder'=>21,'SalesOrder'=>22,'Invoice'=>23,'Rss'=>24,'Reports'=>25,'Campaigns'=>26,'Portal'=>27,'Webmails'=>28,'Users'=>29,); $tab_seq_array=array('3'=>0,'7'=>0,'6'=>0,'4'=>0,'2'=>0,'8'=>0,'9'=>0,'10'=>0,'13'=>0,'14'=>0,'1'=>0,'15'=>0,'16'=>2,'18'=>0,'19'=>0,'20'=>0,'21'=>0,'22'=>0,'23'=>0,'24'=>0,'25'=>0,'26'=>0,'27'=>0,'28'=>0,); ?> Modified: vtigercrm/branches/5.1_jens/themes/alphagrey/images/aboutUS.jpg ============================================================================== Binary files - no diff available. Modified: vtigercrm/branches/5.1_jens/themes/alphagrey/images/cal12x12Shared.gif ============================================================================== Binary files - no diff available. Modified: vtigercrm/branches/5.1_jens/themes/alphagrey/style.css ============================================================================== --- vtigercrm/branches/5.1_jens/themes/alphagrey/style.css (original) +++ vtigercrm/branches/5.1_jens/themes/alphagrey/style.css Mon Apr 16 12:27:44 2007 @@ -1,2219 +1,2284 @@ -/********************************************************************************* - -** The contents of this file are subject to the vtiger CRM Public License Version 1.0 - * ("License"); You may not use this file except in compliance with the License - * The Original Code is: vtiger CRM Open Source - * The Initial Developer of the Original Code is vtiger. - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - ********************************************************************************/ - - -/* ALPHA GRAY - COLOR THEME*/ - -.small { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; -} -.big { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 18px; - color: #000000; - font-weight:bold; -} - -.componentName { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - line-height: 18px; - color: #000; - font-weight:bold; - border-left:2px dotted #333; - padding:10px; -} - - -.genHeaderBig{ - font-family: Arial, Helvetica, sans-serif; - font-size: 16px; - line-height: 19px; - color: #000000; - font-weight:bold; -} -.genHeaderSmall{ - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 16px; - color: #000000; - font-weight:bold; - -} - -.moduleName { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - color: #000000; - font-weight:bold; -} - - -.hdrNameBg { - background:#ffffff url(images/hdrNameBg.gif) repeat-x; - - -} - -.hdrTabBg { - /*background:#ffffff url(images/hdrTabBg.gif) bottom repeat-x ;*/ - background-color:#dadada; -} - -.tabSelected { - background:#eeeeee url(images/tabSelectedBg.gif) repeat-x; - font-family: Arial, Helvetica, sans-serif; - font-weight:bold; - font-size: 11px; - padding-left:10px; - padding-right:10px; - padding-top:2px; - padding-bottom:2px; - -} - -.tabSelected a{ - color:white; -} - -.tabUnSelected { - - background: #eaeaea url(images/tabUnSelectedBg.gif) bottom repeat-x; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:10px; - padding-right:10px; - padding-top:2px; - padding-bottom:2px; - border-bottom:1px solid #ffffff; -} - -.tabUnSelected a{ - color:#000099; -} - -.tabSeperator { - background-color:#aaa; - width:1px; -} - - - -/*.level2text { - - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:15px; - padding-right:15px; - padding-top:5px; - padding-bottom:5px; - font-weight:bold; - color:white; -} - -.level2text a{ - text-decoration:none; - color:#555555; -} - -.level2text a:hover { - text-decoration:underline; - color:#555555; - -}*/ - - -.level2Bg { - /*background:#999 url(images/level2TabBg.gif) bottom repeat-x;*/ - background-color:#9a9a9a; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - border-bottom:1px dashed #fff; - color:white; -} - -.level2Bg a{ - /* background:#1F5BFF url(images/level2TabBg.gif) bottom repeat-x; */ - color:#fff; -} - - -.level2SelTab{ - font-weight:bold; - color:#000000; - padding-left:20px; - padding-right:20px; - padding-top:5px; - padding-bottom:5px; - -} - -.level2UnSelTab{ - color:#000000; - padding-left:20px; - padding-right:20px; - padding-top:5px; - padding-bottom:5px; -} -.sep1 { - background:#999999; -} - -.showPanelBg { - background:url(images/showPanelTopBg.gif) repeat-x; -} - -a { - text-decoration:none; - color:#000099; -} - -a:hover { - text-decoration:underline; -} - -.hdrLink { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - text-decoration:none; - color:#000099; - font-weight:bold; -} - -.hdrLink:hover { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - text-decoration:underline; - color:#000099; - font-weight:bold; -} - -.searchBox { - border: 0px solid #0000aa; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:2px; - width:100px; - background-color:#ffffef; -} - -.searchBtn { - border :0px #cccccc solid; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - font-weight:bold; - width:30px; - height:19px; - background-color:#555; - color:white; -} - - -/* List View Table classes starts +++++++++++++++++ */ - -.lvt { - background-color:#ccc; - border:1px solid #ccc; -} - -.lvtBg { -} - -.lvtHeaderText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - font-weight:bold; -} - -.lvtCol { - border-top:1px solid #eaeaea; - border-left:1px solid #eaeaea; - border-right:1px solid #999; - border-bottom:1px solid #999; - background-color:#ccc; - font-weight:bold; -} - -.lvtColData { - background-color:#ffffff; -} - -.lvtColDataHover { - background-color:#ffffee; - -} - - -/* List View Table classes ends --------------------------------*/ - - - -/* Detailed View classes starts +++++++++++++++++++++++ */ -.dvHeaderText{ - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - color:#000000; - font-weight:bold; - -} - -.dvInnerHeader{ - border-bottom:2px dotted #555; - padding:5px; - background-color:#dadada; - -} - -.dvtSelectedCell { - border-left:2px solid #aaaaaa; - border-top:2px solid #aaaaaa; - border-right:2px solid #aaaaaa; - padding-left:20px; - padding-right:20px; - background-color:white; - font-weight:bold; -} - -.dvtUnSelectedCell { - border-left:2px solid #aaaaaa; - border-top:2px solid #aaaaaa; - border-right:2px solid #aaaaaa; - border-bottom:2px solid #aaaaaa; - padding-left:20px; - padding-right:20px; - background-color:#f5f5f5; - cursor:pointer; -} - -.dvtTabCache { - border-bottom:2px solid #aaaaaa; -} - -.dvtContentSpace { - border-left:2px solid #aaaaaa; - border-right:2px solid #aaaaaa; - border-bottom:2px solid #aaaaaa; - padding-left:0px; -} -.dvtCellLabel, .cellLabel { - background-color:#efefef; - padding-right:10px; - padding-left:10px; - border-bottom:1px solid #dddddd; - border-top:1px solid #ffffff ; - color:#545454; - white-space:nowrap; - font-weight:bold; -} - -.dvtCellInfo, .cellInfo { - padding-left:10px; - padding-right:10px; - border-bottom:1px dotted #efefef; - white-space:nowrap; -} - -.rightMailMerge { - border:2px solid #aaa; -} - -.rightMailMergeHeader { - border-bottom:1px solid #ddd; - padding:5px; - background-color:#efefef; - -} - -.rightMailMergeContent { - padding:5px; - background-color:#fafafa; - -} -.detailedViewHeader{ - border-bottom:2px solid #dadada; - padding:5px; - background-color:#aaaaaa; -} - -.detailedViewTextBox { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:90%; - background-color:#ffffff; -} -.detailedViewTextBoxOn { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:90%; - background-color:#ffffdd; -} - -.advSearch { - padding:10px; - border-left:1px solid #eaeaea; - border-right:1px solid #eaeaea; - border-bottom:1px solid #eaeaea; - overflow:auto; - width:600px; - height:150px; - background-color:#f5f5f5; - -} - -.searchAlph { - border:1px solid #dadada; - background-color:#ffffff; - cursor:pointer; - width:10px - -} -.searchAlphselected { - border:1px solid #666666; - background-color:#bbbbbb; - cursor:pointer; - width:10px - -} -.textbox { - border:1px solid #999999; - background-color:#ffffff; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - width:120px; - padding:2px; - -} -.mx { -} -.calListTable td{ - border-bottom:1px solid #efefef; - border-left:1px solid #efefef; -} -.calDIV { - width:100%; - border:1px solid #999999; - -} -.calDayHour { - border-top:1px solid #dddddd; - border-left:1px solid #dddddd; - border-bottom:1px solid #dddddd; - border-right:1px solid #dddddd; - background-color:#eaeaea; -} -.calAddEvent { - position:absolute; - z-index:10000; - width:500px; - left:200px; - top:150px; - background-color:#ffffff; -} -.addEventInnerBox { - border:1px dotted #dadada; - -} -.cellNormal { - border:0px; - background-color:#ffffff; -} -.EventToDo{ - -} - -.thumbnail{ - background-color:#ffffff; -padding: 7px; -border: 1px solid #ddd; -float: left; - margin-right: 10px; - margin-bottom: 15px; -} -.padTab{ - padding-top:0px; - padding-left:0px; - padding-left:10px; - padding-bottom:0px; - vertical-align:top; - -} -#company{ - position:relative; - width:100%; - height:200px; - display:block; - background-color:#FFFFFF; - white-space:nowrap; - overflow:auto; - border:1px solid #CCCCCC; -} - - -#user{position:relative;left:0px;top:0px;width:100%;display:block;} -#communication{position:relative;left:0px;top:0px;width:100%;display:block;} -#config{position:relative;left:0px;top:0px;width:100%;display:block;} -#userTab{position:relative;left:0px;top:0px;width:100%;display:none;} -#one{ - position:relative; - display:block; - width:245px; -} - -#mnuTab1{ - - position:relative; - - overflow:auto; - - width:100%; - - display:none; - -} - -#mnuTab2{ - - position:relative; - - overflow:auto; - - width:100%; - - display:none; - -} - - -/* End of Settings */ - -.bggray{ - background-color: #dfdfdf; -} -.bgwhite{ - background-color: #FFFFFF; -} -.copy{ - font-size:9px; - font-family: Verdana, Arial, Helvetica, Sans-serif; -} - -#basicTab{ - position:relative; - overflow:auto; - width:100%; - display:block; -} - -#moreTab{ - position:relative; - overflow:auto; - width:100%; - display:none; -} - -/*Added for Advance Seearch*/ - -#one{ - position:relative; - display:block; - width:245px; -} - - -/* Dashboard CSS */ -a.dash_href{ - display:block; - width:24px;height:24px; - vertical-align:middle; - margin-top:10px; -} - - -.dashHeading { - font-family:Arial, Helvetica, sans-serif; - font-size:24px; - font-weight:bold; - color:#fff; -} - -.dashSelectBg{ - background-image:url(images/dashSelectBg.gif); - background-repeat:repeat-x; -} -.dash_top{ - background-image:url(images/dashTopBg.gif); - background-repeat:repeat-x; - height:63px; - vertical-align:middle; -} - -.dash_border{ - background-color:#bfbfbf; - padding:5px; -} -.dash_white{ - background-color:#FFFFFF; - padding:5px 10px 5px 10px; -} - -.dash_bdr_btm{ - border-bottom:2px dotted #dadada; -} - -.dash_count{ - font-size:36px; - font-weight:bold; - text-decoration:none; - color:#000000; - padding-left:10px;padding-right:10px; -} -.dash_switch{ - cursor:pointer; - width:26px; - height:26px; -} - -.dash_row_sel{ - background-image:url(images/dash_sel_chart.jpg); - background-repeat:no-repeat; - background-position:center; - width:26px;height:26px; - text-align:center; - vertical-align:middle; - font-weight:bold; - font-size:10px; - text-decoration:none; -} - -.dash_row_unsel{ - background-image:url(images/dash_unsel_chart.jpg); - background-repeat:no-repeat; - background-position:center; - width:26px;height:26px; - text-align:center; - vertical-align:middle; - font-weight:normal; - font-size:10px; - text-decoration:none; - cursor:pointer; -} - -.dash_chart_btm{ - border-bottom:2px solid #000000; -} - - -.dash_bottom{ - background-image:url(images/dashBottomBg.gif); - background-repeat:repeat-x; - height:99px; - vertical-align:middle; -} - -.dash_btm{ - background-image:url(images/dash_btm_center.jpg); - background-repeat:repeat-x; - position:top; -} - -/* menu */ - - - - a.submenu{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - padding-top:5px; - padding-bottom:5px; - padding-left:10px; - border-bottom:1px solid #CCCCCC; - background-color:#ECECEC; - color:#000000; - text-align:left; - text-decoration:none; - display:block; -} - -a.submenu:Hover{ - background-color:#DDDDDD; - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - padding-top:5px; - padding-bottom:5px; - padding-left:10px; - border-bottom:1px solid #CCCCCC; - color:#000000; - text-align:left; - text-decoration:none; - display:block; -} - -#mnuKey{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - background-color:#666666; - color:#FFFFFF; - text-decoration:none; - padding:5px; - font-weight:bold; - width:8px; - cursor:pointer; - vertical-align:top; - height:100px; - position:relative; - top:0px; - left:0px; -} - -#slidemenu{ - height:525px; - vertical-align:top; - width:100px; - background-color:#CCCCCC; - border-right:1px solid #CCCCCC; - opacity:.9; - display:none; -}*/ - -/* clock */ - -.citystyle{ - position:relative; - top:0px; - left:0px; - text-align:left; - -} -#theClockLayer{ - position:relative; - height:180px; - left:20px; - text-align:center; -} -.handsanddotsstyle{ - margin-top:10px; - position:absolute; - top:0px; - left:0px; - width:2px; - height:2px; - font-size:2px; - background-color:#000000; -} -.facestyle{ - margin-top:10px; - position:absolute; - top:0px; - left:0px; - width:15px; - height:15px; - text-align:center; - font-family:arial,sans-serif; - font-size:10px; - color:#000000; -} -.datestyle{ - margin-top:20px; - position:absolute; - top:0px; - left:0px; - width:100px; - text-align:center; - font-family:arial,sans-serif; - font-size:10px; - color:#000000; -} -.ampmstyle{ - margin-top:23px; - position:absolute; - top:0px; - left:0px; - width:20px; - text-align:center; - font-family:arial,sans-serif; - font-size:10px; - color:#000000; -} - -#wclock{ - position:absolute; - left:100px; - top:100px; - display:none; - background-color:#CCCCCC; - width:175px; -} - -.leftFormBorder1 { - border: 1px solid #AFC8E4; - background-color: #FFFFFF; - opacity:.7; -} - - - - -/* Calculator */ -.calcResult { - width: 100%; - height: 25px; - background-color: #FFFFCC;/*CBDFD6*/ - border-top: 1px solid #CCC; - border-left: 0px; - border-right: 1px solid #CCC; - border-bottom: 1px solid #CCC; - font-size: 10px; - text-align: right; -} -.calcMem { - width: 100%; - height: 25px; - border-top: 1px solid #CCC; - border-left: 1px solid #CCC; - border-right: 0px; - border-bottom: 1px solid #CCC; - background-color: #FFFFCC;/*CBDFD6*/ - font-family: Arial; - font-size: 10px; - color: #BBB; - text-align: left; -} -.calcBlackBtn, .calcGreyBtn, .calcBigBtn, .calcCancBtn, .calcMemBtn, .calcBackBtn { - border: none; - height: 20px; - font-size: 11px; - color: #FFF; - text-align:center; -} -.calcBackBtn { - background: url(images/calc_back_btn.gif) no-repeat; - width:25px; -} -.calcBlackBtn { - background: url(images/calc_black_btn.gif) no-repeat; - width:25px; -} -.calcGreyBtn { - background: url(images/calc_grey_btn.gif) no-repeat; - width:25px; -} -.calcCancBtn { - background: url(images/calc_canc_btn.gif) no-repeat; - width:25px; - -} -.calcMemBtn { - background: url(images/calc_mem_btn.gif) no-repeat; - width:25px; - /*background-color: #CCC;*/ -} -#calc{ - position:absolute; - left:100px; - top:100px; - background-color:#FFFFFF; - width:185px; - border-bottom:2px solid #000000; - border-right:2px solid #666666; - border-left:2px solid #CCCCCC; - border-top:2px solid #CCCCCC; -} - -/* RSS STYLES */ - -.subHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-image:url(images/rssHeader.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; -} - -.delBg{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-image:url(images/rssdelete.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; -} - -#rssScroll{ - font-family:Arial, Helvetica, sans-serif ; - font-size:12px; - background-color:#FFFFFF; - width:100%; - height:130px; - overflow:auto; - border:0px solid #000000; -} - -.rssTable{ - width:100%; - border:0px solid #CCCCCC; -} - -.rssTable tr th{ - background-color:#a9a9a9; - text-align:left; - border-bottom:1px solid #555; - border-top:1px solid #FFFFFF; - color:#000000; - padding-left:5px; - padding-right:5px; - height:20px; -} - -.rssTable tr td{ - text-align:left; - border-bottom:1px dotted #dadada; - border-left:1px dotted #dadada; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - white-space:nowrap; - padding:2px; - -} -.forwardBg{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - color:#000000; - background-image:url(images/rssforward.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; - background-color:#D7D7D7; -} - - -/* New Styles */ - -.mnuTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#000000; - width:100%; - border:0px solid #000000; -} - -.mnuTab tr td{ - border-bottom:1px solid #EBEBEB; - padding-left:5px; - vertical-align:middle; -} -/* profile */ - -.prvPrfBigText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; -} - -.prvPrfTopBg { - background-color:#ebebeb; -} - -.prvPrfBottomBg { - background-color:#ebebeb; -} - -.prvPrfOutline { - border:1px solid #ebebeb; -} - -.prvPrfTexture { - background:url(images/prvPrfTexture1.gif); - -} -.prvPrfHoverOn { - background-color:#ffffef; - -} -/* Organization */ - -.orgTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - color:#666666; - border:0px solid #9B9B9B; - border-collapse:collapse; - width:100%; -} - -.orgTab tr th{ - text-align:left; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-decoration:none; - font-weight:bold; - height:20px; - padding-left:5px; -} - -.orgTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:none; - font-weight:normal; - padding-left:5px; - height:20px; - border-bottom:1px solid #CCCCCC; - border-right:1px solid #CCCCCC; -} - -/* Groups */ -.groupli{ - margin-left:20px; - font-family:Arial, Helvetica, sans-serif; - font-weight:normal; - font-size:12px; - text-decoration:none; - color:#333333; - list-style-type:none; - text-align:left; -} - -/* tree menu */ - -/*Oraganization Edit Features */ - -#orgLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:500px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - display:block; - position:absolute; - left:0px; - top:0px; -} - -/* Role */ - -#roleLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - display:none; - position:absolute; -} - -.classBtn{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:10px; - background-color:#DBDBDB; - border-bottom:2px solid #999999; - border-right:2px solid #999999; - border-top:2px solid #F5F5F5; - border-left:2px solid #F5F5F5; - color:#000000; - text-align:center; - padding-top:3px; - padding-bottom:3px; -} - - -.txtBox{ - width:85%; - border:1px solid #666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; -} - -/* IMPORT LEADS */ - -.leadTable{ - border:3px solid #CCCCCC; - border-collapse:collapse; -} - -.leadTable tr td{ -/* border:0px solid #CCCCCC;*/ -} - -.genHeaderGray{ - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 16px; - color: #888888; - font-weight:bold; -} - -.genHeaderGrayBig{ - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - line-height: 16px; - color: #888888; - font-weight:bold; -} - -.importBox{ - width:125px; - border:1px solid #666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; -} -.txtGreen{ - color:green; -} - -/* PICK LIST */ -ul li{ - padding-bottom:2px; - padding-top:2px; -} -/* MY PREFERENCES */ -/* CSS FOR REPORTS */ - -.reportHdr{ - background-color:#DDDDDD; - font-size:12px; - font-weight:bold; - vertical-align:middle; - text-align:left; - height:30px; - border-bottom:2px solid #959595; - color:#000000; - padding-left:10px; -} - -#reportLay{ - width:175px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; - z-index:2000; -} - -#locateMap{ - width:120px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; - z-index:2000; -} - - - a.reportMnu{ - font-size:11px; - color:#0070BA; - text-decoration:none; - display:block; - width:155px; - height:20px; - border-bottom:1px solid #E1E1E1; - padding-left:20px; - padding-top:3px; -} - -a.reportMnu:Hover{ - font-size:11px; - color:#0070BA; - text-decoration:underline; - display:block; - width:155px; - height:20px; - border-bottom:1px solid #E1E1E1; - padding-left:20px; - padding-top:3px; -} - -#Generate{ - position:relative; - width:100%; - text-align:center; - display:none; -} - -/* END OF REPORT */ -/* WEB MAIL */ - a.webMnu{ - font-size:11px; - color:#0070BA; - text-decoration:underline; -} -a.webMnu:Hover{ - font-size:11px; - color:#0070BA; - text-decoration:underline; -} -/* END OF WEB MAIL */ -/* POPUP */ - a.alpha{ - font-size:11px; - color:gray; - text-decoration:none; - padding-Left:5px; - padding-right:5px; - border:1px dotted #CCCCCC; - background-color:#FFFFCC; -} - -a.alpha:Hover{ - font-size:11px; - color:gray; - text-decoration:underline; - padding-Left:5px; - padding-right:5px; - border:1px dotted #CCCCCC; - background-color:#FFFFCC; -} - -/* Home Page */ -.MatrixLayer{ - border:2px solid #aaaaaa; - background-color:#FFFFFF; - width:29%; - position:relative; - visibility:visible; - margin:9px; - height:280px; -} - -.fontBold{ - font-size:13px; - color:#000000; - text-decoration:none; - font-weight:bold; -} - -.style_Gray{ - color:gray; -} - -/* End of Home Page */ - -/* All Menu */ -#allMenu{ - width:500px; - border:4px solid #aaa; - left:200px; - top:100px; - position:absolute; - z-index:1000001; - display:none; - padding:10px; - background:#ffffff url(images/layerPopUpBg.gif); -} - - -.allMnuTable{ - width:100%; - background-color:#FFFFFF; -} - -.allMnuHandle td{ - height:20px; - color:#FFFFFF; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - text-decoration:none; - background-color:#555; - cursor:move; - padding:2px; - border-bottom:2px solid #666666; -} - -.allMnuHdr{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-weight:Bold; - font-size:11px; - text-decoration:none; - display:block; - background-color:#FFFFFF; - color:#333; - padding-top:5px; - padding-bottom:5px; -} - -a.allMnu{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:10px; - text-decoration:none; - font-weight:normal; - display:block; - width:125px; - height:15px; - padding-left:5px; - padding-top:0px; - padding-bottom:0px; - background-color:#FFFFFF; - border:1px solid #FFFFFF; - color:#000099; - margin-left:10px; -} - -a.allMnu:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:10px; - text-decoration:none; - font-weight:normal; - display:block; - width:125px; - height:15px; - padding-left:5px; - padding-top:0px; - padding-bottom:0px; - background-color:#ddd; - -} -/* End Of All Menu */ -/* Calendar */ -.calHdr{ - background-image:url(images/mailSubHeaderBg.gif); - background-repeat:repeat-x; - background-position:left top; -} - -.calSel{ - background-image:url(images/dashSelectBg.gif); - background-repeat:repeat-x; - text-align:center; - color:#FFFFFF; - font-weight:bold; - width:8%; -} - -.calAddButton { - border: 1px solid #999; - background:#ddd url(images/calAddButtonBg.gif) repeat-x; - cursor:pointer; - height:20px; - - -} -.calInnerBorder { - border-left:2px solid #a5a5a5; - border-right:2px solid #a5a5a5; - border-bottom:2px solid #a5a5a5; -} - -.calBorder { - border-left: 1px solid #a5a5a5; - border-right: 1px solid #a5a5a5; - border-bottom: 1px solid #a5a5a5; - background:#fefefe url(images/layerPopupBg.gif); - -} -.calTopRight { - border-right: 1px solid #a5a5a5; -} - - -.calUnSel{ - color:#000000; - font-weight:normal; - text-align:center; - width:8%; -} - -a.calMnu{ - font-size:11px; - color:#009; - text-decoration:none; - display:block; - height:20px; - padding-left:5px; - padding-top:3px; -} - -a.calMnu:Hover{ - font-size:11px; - color:#009; - text-decoration:underline; - display:block; - height:20px; - padding-left:5px; - padding-top:3px; -} - -/*.bggray{ - background-color: #dfdfdf; -}*/ -.bgwhite{ - background-color: #FFFFFF; -} -.copy{ - font-size:9px; - font-family: Verdana, Arial, Helvetica, Sans-serif; -} - -#mnuTab{ - position:relative; - width:100%; - display:block; -} - -#mnuTab2{ - position:relative; - overflow:auto; - width:100%; - display:none; -} -.style1 {color: #FF0000} -.event{ - background-color:#ddd; - border:1px solid #999999; - text-align:left; - width:100%; - position:relative; - left:0px; - top:0px; - vertical-align:middle; - padding:1px; -} - -#hrView{ - display:block; -} -.calendarNav{ - font-size:12px; - color:#FFFFFF; - white-space:nowrap; - text-align:center; - font-weight:bold; - padding-left:10px; - padding-right:10px; - background-image:url(images/cal_nav.gif); - background-repeat:repeat-x; -} -#addEventDropDown{ - position:absolute; - display:none; - width:150px; - border:1px solid #666666; - left:0px; - top:0px; - overflow:visible; - z-index:5000; -} - -.calAction{ - width:175px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; - z-index:2000; -} - -.calSettings{ - position:absolute; - z-index:20000; - width:500px; - left:200px; - top:150px; - background-color:#ffffff; -} -.outer{ - border-bottom:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - border-right:1px solid #CCCCCC; -} -.calTxt{ - width:50%; - border:1px solid #CCCCCC; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - padding-left:5px; -} - -#leadLay{ - position:relative; - width:100%; - float:left; - visibility:hidden; - padding:5px; - z-index:10000; -} - -/* End of Calendar */ - -/* Cal Year View */ -.eventDay{ - background-color:#FF9966; - font-weight:bold; -} - -.currDay{ - background-color:#006600; - font-weight:bold; - text-decoration:underline; -} - -.currDay a{ - color:#FFFFFF; - font-weight:bold; - text-decoration:underline; -} - - -/* End of Cal Year View */ - -/* Level 2 Menu Selected*/ - -level2Sel{ - color:#000000; - font-weight:bold; - text-decoration:underline; -} - -#DeleteLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; -} - -#CurrencyDeleteLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:350px; -} - - -/* For Report HTML Generation*/ -.rptCellLabel { - background-color:#f6f6f6; - padding-right:10px; - border-right: 1px solid #DDDDDD; - border-bottom:1px solid #eaeaea; - color:#737373; - font-weight: bold; - white-space:nowrap; -} -.rptTable { - border-left: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; - border-top: 1px solid #DDDDDD; -} -.rptTitle, .rptHead, .rptData, .rptGrpHead{ - font-family: Verdana, Arial, Helvetica, Sans-serif; - font-size: 11px; - text-align:left; - font-weight: normal; - height: 20px; - padding: 4px; - border-right: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; - background: #DDDDDD; -} -.rptGrp1Total, .rptGrp2Total, .rptTotal { - font-family: Verdana, Arial, Helvetica, Sans-serif; - font-size: 11px; - text-align:center; - font-weight: normal; - background: #FFF; - height: 20px; - padding: 4px; - border-right: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; -} -.rptGrpHead { - background: #FFF; - border-bottom: 1px solid #FFF; - border-top: 1px solid #DDDDDD; - font-weight: normal; -} - -.rptData { - background: #FFF; - font-weight: normal; -} -.rptEmptyGrp { - background: #FFF; - border-right: 1px solid #DDDDDD; -} -.statechange -{ - position:absolute; - visibility:hidden; - left:10px; - top:20px; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; -} -#PopupLay{ - position:absolute; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:500px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; - display:none; - left:100px; - top:100px; -} - -#folderLay{ - width:175px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; -} - -/* Css for quick Create */ - -.qcTransport{ - background-color:#dadada; - -} - -#role_popup{ - position:relative; - left:0px; - top:0px; - width:95%; - height:300px; - overflow:auto; - border:1px solid #999999; - text-align:left; - background-color:#FFFFFF; - } - -.unread_email { - font-weight:bold; -} - - -/* MY SITES */ - -.unread_email { - font-weight:bold; -} - - -.tagCloud { - border:1px solid #737373; -} - - -.tagCloudTopBg { - background: url(images/tagCloudBg.gif) repeat-x; - -} - -.tagCloudDisplay { - background-color:#e5e5e5; - padding:10px; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 14px; - color: #000000; - -} -.h2 { - - font-size:18px; - line-height:20px; - -} - -.gray { - - color:gray; -} -ul { - list-style:circle; - line-height:20px; - padding-left:5px; - margin-left:20px; - font-weight:normal; - -} -.tagCloudTopBg { - background-image: url(images/tagCloudBg.gif); - background-repeat: repeat-x; -} - -.tagCloudDisplay { - background-color:#e5e5e5; - padding:5px; -} - -.heading2 { - font-family: Arial, Helvetica, sans-serif; - font-size: 16px; - line-height: 16px; - font-weight:bold; - color: #000000; -} - -.settingsUI { - - text-align:left; - background-color:#fff; - background-image:url(images/layerPopupBg.gif); - border:2px solid #aaaaaa; - -} - - -.settingsTabHeader { - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height:22px; - font-weight:bold; - color:#333; - background-image: url(images/mailSubHeaderBg.gif); - background-color:#dddddd; - background-repeat: repeat-x; - padding-left:10px; - padding-right:10px; - -} - -.settingsTabList { - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:20px; - font-weight:normal; - color:#000000; - background-color:#e5e5e5; - padding-left:30px; - border-bottom:1px solid #ccc; - border-top:1px solid #fff; -} -.settingsTabSelected { - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:20px; - font-weight:bold; - color:#000000; - background-color:#ffffff; - padding-left:30px; - border-left:1px solid #ddd; -} -.settingsSelectedUI { - padding:10px; - background:url(images/settingsSelUIBg.gif) repeat-x; - background-color:#ffffff; -} -.settingsIconDisplay { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:14px; - padding:10px; - - color:#000000; - background-color:#ffffff; - padding-left:10px; -} -.settingsSelUITopLine{ - border-bottom:2px dotted #999999; - -} - -.tableHeading{ - background-color:#ffffff; - border-bottom:2px solid #555; -} -.colHeader{ - background-color:#ddd; - border-left:1px solid #fff; - border-top:1px solid #fff; - border-right:1px solid #aaa; - border-bottom:1px solid #aaa; - font-weight:bold; - -} -.cellLabel { - background-color:#eaebd9; - border-top:1px solid #efefef; - border-bottom:1px solid #dadada; - color:#555555; - -} -.cellText { - color:#333333; - border-bottom:1px solid #dadada; -} - -.listTable{ - border-left:1px solid #cccccc; - border-right:1px solid #cccccc; - border-bottom:1px solid #cccccc; - -} - -.listTableRow{ - border-bottom:1px solid #eaeaea; - border-right :1px solid #eaeaea; - border-bottom:1px solid #eaeaea; - border-bottom:1px solid #eaeaea; -} -.listRow{ - border-bottom:2px solid #eaeaea; - -} - -.listTableTopButtons{ - background-color:#efefef; - background-image:url(images/layerPopupBg.gif); - -} - - -/* Buttons */ -.crmButton{ - - border-left:1px solid #ffffff; - border-top:1px solid #ffffff; - border-right:1px solid #555555; - border-bottom:1px solid #555555; -} - -.create{ - background-color:#55aa55; - color:#fff; - font-weight:bold; -} -.delete { - background-color:#ffaa22; - color:#000; - font-weight:bold; -} -.edit { - background-color:#55aa55; - color:#fff; - font-weight:bold; -} -.save{ - background-color:#55aa55; - color:#fff; - font-weight:bold; -} -.cancel { - background-color:#ffaa22; - color:#000; - font-weight:bold; -} - -.inactive{ -color:#999999; -} - -.active{ -color:#229922; - -} - -/* Buttons ends */ - - - -textarea { - width:95%; - height:70px; - border:1px solid #dadada; -} -.treeTable1{ - padding:0px; -} - -.prvPrfBigText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; -} - -.prvPrfTopBg { - background-color:#ebebeb; -} - -.prvPrfBottomBg { - background-color:#ebebeb; -} - -.prvPrfOutline { - border:1px solid #ebebeb; -} -.prvPrfTexture { - background:url(images/prvPrfTexture1.gif); - -} - -.prvPrfHoverOn { - background-color:#ffffef; - -} -.cellBottomDotLine { - border-bottom-width: 2px; - border-bottom-style: dotted; - border-bottom-color: #CCCCCC; - background-color:#ededed; -} -.crmFormList{ - border:1px solid #cccccc; - width:90%; - height:120px; - -} -.cellBottomDotLinePlain { - border-bottom-width: 2px; - border-bottom-style: dotted; - border-bottom-color: #CCCCCC; - -} - -.thickBorder { - border: 2px solid #999999; -} -.trackerHeading { - background-color:#efefef; -} -.trackerListBullet { - border-right:1px dotted #cccccc; - background-color:#f9f9f9; -} -.trackerList { - border-bottom:1px solid #eeeeee; -} - -/* Table Definitions */ -.crmTable { - border:1px solid #dadada; -} - -.crmTableRow { - border-bottom:1px dotted #dadada; - border-right:1px dotted #dadada -} - -/* Inventory */ - -.lineOnTop { - border-top:1px solid #999999; -} - -.discountUI{ - border:3px solid #CCCCCC; - width:250px; - padding:5px; - position:absolute; - background-color:#FFFFFF; - display:none; -} - -.TaxShow{ - display:inline-table; -} - -.TaxHide{ - display:none; -} - -/* Inventory */ - - -/* Email Client Classes ++++++++++++++++++++++ */ - -.emailSelected{ - background-color:#eaeaea; - color:#000000; - font-size:bold; -} - - -.mailClient{ - border:2px solid #656565; -} - -.mailClientBg { - background-color:#efefef; - background-image:url(images/layerPopupBg.gif); -} - -.mailSubHeader { - background:#d9d9d9 url(images/mailSubHeaderBg.gif) repeat-x; - padding:4px; -} -.mailClientWriteEmailHeader { - font-family:arial, helvetica, sans-serif; - font-size:20px; - line-height:24px; - font-weight:bold; - background:#e0e0e0 url(images/mailSubHeaderBg.gif) repeat-x; - padding:10px; - border-left:1px solid #eaeaea; - border-top:1px solid #eaeaea; - border-right:1px solid #999; - border-left:1px solid #999;; -} - -.mailClientCSSButton { - border-left:1px solid #fff; - border-top:1px solid #fff; - border-right:1px solid #333; - border-bottom:1px solid #333; - padding:2px; - background-color:#cfcfcf; -} - -/* Email Client Classes ends ------------------------------------ */ - - - -/* Layer Popup */ -.layerPopup { - border:3px solid #959595; - background:#fffff5 url(images/layerPopupBg.gif) ; - position:absolute; -} - -.layerPopupHeading { - font-family:arial, helvetica, sans-serif; - font-size:16px; - line-height:24px; - font-weight:bold; -} -.layerHeadingULine { - border-bottom:2px solid #777; -} -.layerPopupTransport { - background-color:#eaeaea; - -} -.homePageSeperator { - border-right:1px dotted #ddd; -} -.homePageMatrixHdr { - border-bottom:1px solid #d3d3d3; - background:#fffff5 url(images/layerPopupBg.gif) ; -} - -.reportsListTable { - background-color:white; - border-left:1px solid #aaa; - border-right:1px solid #aaa; - border-bottom:1px solid #aaa; -} - -.reportGenerateTable{ - background-image:url(images/layerPopupBg.gif); - border-left:2px dotted #aaa; - border-right:2px dotted #aaa; - border-bottom:2px dotted #aaa; -} -.reportCreateBottom{ - background-color:#eaeaea; - border-bottom:2px solid #777; - -} -.importLeadUI{ - /*background:#ffffff url(images/select.gif) ; */ - background-color:#fff; -} - -a.customMnu{ - padding-left:30px; - padding-top:5px; - padding-bottom:5px; - display:block; - background-repeat:no-repeat; - background-position:left; - width:155px; - color:#000000; - text-decoration:none; -} - -a.customMnuSelected{ - padding-left:30px; - padding-top:5px; - padding-bottom:5px; - display:block; - background-repeat:no-repeat; - background-position:left; - width:155px; - background-color:#0099FF; - color:#FFFFFF; - text-decoration:none; -} - - -/* Drop Down Menu */ -.drop_mnu{ - position:absolute; - left:0px; - top:0px; - z-index:1000000001; - border-left:1px solid #a5a5a5; - border-right:1px solid #a5a5a5; - border-bottom:1px solid #a5a5a5; - width:150px; - display:none; - padding:0px; - text-align:left; - overflow-x:hidden; - overflow-y:hidden; - background-color:#eee; -} - -a.drop_down{ - width:150px; - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:20px; - font-weight:normal; - color:#009; - background-color:#eee; - padding:2px 5px 2px 5px; - border-top:1px solid #fafafa; - border-bottom:1px solid #d3d3d3; - display:block; -} - -a.drop_down:Hover{ - padding:2px 5px 2px 5px; - width:150px; - text-align:left; - color:#33a; - font-weight:normal; - text-decoration:underline; - background-color:#dadada; -} - -.bgwhite{ - background-color:white; -} - -.searchUIBasic { - background-image:url(images/layerPopupBg.gif); - border:2px solid #a5a5a5; -} -.searchUIAdv1{ - background-image:url(images/layerPopupBg.gif); - border-top:2px solid #a5a5a5; - border-left:2px solid #a5a5a5; - border-right:2px solid #a5a5a5; -} -.searchUIAdv2{ - background-image:url(images/layerPopupBg.gif); - border-left:2px solid #a5a5a5; - border-right:2px solid #a5a5a5; -} -.searchUIAdv3{ - background-image:url(images/layerPopupBg.gif); - border-bottom:2px solid #a5a5a5; - border-left:2px solid #a5a5a5; - border-right:2px solid #a5a5a5; -} - - - -/* Recalculate Disabling Window */ - -.veil{ - background: url(images/layerPopupBg.gif) ; - height: 100%; - width: 100%; - top: 0px; - left: 0px; - overflow: hidden; - z-index: 10000; - Filter: Alpha(opacity = 70); - -moz-opacity: 0.7; - text-align: center; - vertical-align: middle; - position: absolute; -} - -.veil_new{ - background: url(images/layerPopupBg.gif) ; - height: 100%; - width: 100%; - top: 0px; - left: 0px; - overflow: hidden; - z-index: 50000; - Filter: Alpha(opacity = 70); - -moz-opacity: 0.7; - text-align: center; - vertical-align: middle; - position: absolute; -} - -.optioncontainer{ - vertical-align: middle; - height: 100%; - width: 100%; - position: absolute; - z-index: 90000; -} - - -.options{ - vertical-align: middle; - margin-left: 25%; - margin-top: 16%; - color: #FFFFFF; - width:650px; - background-color: Black; - border: 2px solid #222; - position: relative; - text-align: left; - z-index: 80000; -} - -.options h2{ - color: White; - font-family: Verdana, Arial, Helvetica, sans-serif; - border-bottom: 1px solid #373D4C; - margin: 0; - font-weight: normal; -} - -/* Recalculate Disable Ends */ - +/********************************************************************************* + +** The contents of this file are subject to the vtiger CRM Public License Version 1.0 + * ("License"); You may not use this file except in compliance with the License + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + ********************************************************************************/ + + +/* ALPHA GRAY - COLOR THEME*/ + +.small { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; +} +.big { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height: 18px; + color: #000000; + font-weight:bold; +} + +.componentName { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + line-height: 3px; + color: #000; + font-weight:bold; + border-left:2px dotted #333; + padding:10px; +} + + +.genHeaderBig{ + font-family: Arial, Helvetica, sans-serif; + font-size: 16px; + line-height: 19px; + color: #000000; + font-weight:bold; +} +.genHeaderSmall{ + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + line-height: 16px; + color: #000000; + font-weight:bold; + +} + +.moduleName { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + color: #000000; + font-weight:bold; +} + + +.hdrNameBg { + background:#ffffff url(images/hdrNameBg.gif) repeat-x; + + +} + +.hdrTabBg { + /*background:#ffffff url(images/hdrTabBg.gif) bottom repeat-x ;*/ + background-color:#dadada; +} + +.tabSelected { + background:#eeeeee url(images/tabSelectedBg.gif) repeat-x; + font-family: Arial, Helvetica, sans-serif; + font-weight:bold; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + +} + +.tabSelected a{ + color:white; +} + +.tabUnSelected { + + background: #eaeaea url(images/tabUnSelectedBg.gif) bottom repeat-x; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + border-bottom:1px solid #ffffff; +} + +.tabUnSelected a{ + color:#000099; +} + +.tabSeperator { + background-color:#aaa; + width:1px; +} + + + +/*.level2text { + + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding-left:15px; + padding-right:15px; + padding-top:5px; + padding-bottom:5px; + font-weight:bold; + color:white; +} + +.level2text a{ + text-decoration:none; + color:#555555; +} + +.level2text a:hover { + text-decoration:underline; + color:#555555; + +}*/ + + +.level2Bg { + /*background:#999 url(images/level2TabBg.gif) bottom repeat-x;*/ + background-color:#9a9a9a; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + border-bottom:1px dashed #fff; + color:white; +} + +.level2Bg a{ + /* background:#1F5BFF url(images/level2TabBg.gif) bottom repeat-x; */ + color:#fff; +} + + +.level2SelTab{ + font-weight:bold; + color:#000000; + padding-left:20px; + padding-right:20px; + padding-top:5px; + padding-bottom:5px; + +} + +.level2UnSelTab{ + color:#000000; + padding-left:20px; + padding-right:20px; + padding-top:5px; + padding-bottom:5px; +} +.sep1 { + background:#999999; +} + +.showPanelBg { + background:url(images/showPanelTopBg.gif) repeat-x; +} + +a { + text-decoration:none; + color:#000099; +} + +a:hover { + text-decoration:underline; +} + +.hdrLink { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + text-decoration:none; + color:#000099; + font-weight:bold; +} + +.hdrLink:hover { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + text-decoration:underline; + color:#000099; + font-weight:bold; +} + +.searchBox { + border: 0px solid #0000aa; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding-left:2px; + width:100px; + background-color:#ffffef; +} + +.searchBtn { + border :0px #cccccc solid; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + font-weight:bold; + width:30px; + height:19px; + background-color:#555; + color:white; +} + + +/* List View Table classes starts +++++++++++++++++ */ + +.lvt { + background-color:#ccc; + border:1px solid #ccc; +} + +.lvtBg { +} + +.lvtHeaderText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + font-weight:bold; +} + +.lvtCol { + border-top:1px solid #eaeaea; + border-left:1px solid #eaeaea; + border-right:1px solid #999; + border-bottom:1px solid #999; + background-color:#ccc; + font-weight:bold; +} + +.lvtColData { + background-color:#ffffff; +} + +.lvtColDataHover { + background-color:#ffffee; + +} + + +/* List View Table classes ends --------------------------------*/ + + + +/* Detailed View classes starts +++++++++++++++++++++++ */ +.dvHeaderText{ + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + color:#000000; + font-weight:bold; + +} + +.dvInnerHeader{ + border-bottom:2px dotted #555; + padding:5px; + background-color:#dadada; + +} + +.dvtSelectedCell { + border-left:2px solid #aaaaaa; + border-top:2px solid #aaaaaa; + border-right:2px solid #aaaaaa; + padding-left:20px; + padding-right:20px; + background-color:white; + font-weight:bold; +} + +.dvtUnSelectedCell { + border-left:2px solid #aaaaaa; + border-top:2px solid #aaaaaa; + border-right:2px solid #aaaaaa; + border-bottom:2px solid #aaaaaa; + padding-left:20px; + padding-right:20px; + background-color:#f5f5f5; + cursor:pointer; +} + +.dvtTabCache { + border-bottom:2px solid #aaaaaa; +} + +.dvtContentSpace { + border-left:2px solid #aaaaaa; + border-right:2px solid #aaaaaa; + border-bottom:2px solid #aaaaaa; + padding-left:0px; +} +.dvtCellLabel, .cellLabel { + background-color:#efefef; + padding-right:10px; + padding-left:10px; + border-bottom:1px solid #dddddd; + border-top:1px solid #ffffff ; + color:#545454; + white-space:nowrap; + font-weight:bold; +} + +.dvtCellInfo, .cellInfo { + padding-left:10px; + padding-right:10px; + border-bottom:1px dotted #efefef; +} + +.rightMailMerge { + border:2px solid #aaa; +} + +.rightMailMergeHeader { + border-bottom:1px solid #ddd; + padding:5px; + background-color:#efefef; + +} + +.rightMailMergeContent { + padding:5px; + background-color:#fafafa; + +} +.detailedViewHeader{ + border-bottom:2px solid #dadada; + padding:5px; + background-color:#aaaaaa; +} + +.detailedViewTextBox { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:90%; + background-color:#ffffff; +} +.detailedViewTextBoxOn { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:90%; + background-color:#ffffdd; +} + +.detailedViewTextBoxDis { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #555555; + border:1px solid #bababa; + padding-left:5px; + width:90%; + background-color:#aaaaaa; +} + +.detailedViewTextArea { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:95%; + height:100px; + background-color:#ffffff; + text-align:left; +} + +.advSearch { + padding:10px; + border-left:1px solid #eaeaea; + border-right:1px solid #eaeaea; + border-bottom:1px solid #eaeaea; + overflow:auto; + width:600px; + height:150px; + background-color:#f5f5f5; + +} + +.searchAlph { + border:1px solid #dadada; + background-color:#ffffff; + cursor:pointer; + width:10px + +} +.searchAlphselected { + border:1px solid #666666; + background-color:#bbbbbb; + cursor:pointer; + width:10px + +} +.textbox { + border:1px solid #999999; + background-color:#ffffff; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + width:120px; + padding:2px; + +} +.mx { +} +.calListTable td{ + border-bottom:1px solid #efefef; + border-left:1px solid #efefef; +} +.calDIV { + width:100%; + border:1px solid #999999; + +} +.calDayHour { + border-top:1px solid #dddddd; + border-left:1px solid #dddddd; + border-bottom:1px solid #dddddd; + border-right:1px solid #dddddd; + background-color:#eaeaea; +} +.calAddEvent { + position:absolute; + z-index:10000; + width:500px; + left:200px; + top:150px; + background-color:#ffffff; +} +.addEventInnerBox { + border:1px dotted #dadada; + +} +.cellNormal { + border:0px; + background-color:#ffffff; +} +.EventToDo{ + +} + +.thumbnail{ + background-color:#ffffff; +padding: 7px; +border: 1px solid #ddd; +float: left; + margin-right: 10px; + margin-bottom: 15px; +} +.padTab{ + padding-top:0px; + padding-left:0px; + padding-left:10px; + padding-bottom:0px; + vertical-align:top; + +} +#company{ + position:relative; + width:100%; + height:200px; + display:block; + background-color:#FFFFFF; + white-space:nowrap; + overflow:auto; + border:1px solid #CCCCCC; +} + + +#user{position:relative;left:0px;top:0px;width:100%;display:block;} +#communication{position:relative;left:0px;top:0px;width:100%;display:block;} +#config{position:relative;left:0px;top:0px;width:100%;display:block;} +#userTab{position:relative;left:0px;top:0px;width:100%;display:none;} +#one{ + position:relative; + display:block; + width:245px; +} + +#mnuTab1{ + + position:relative; + + overflow:auto; + + width:100%; + + display:none; + +} + +#mnuTab2{ + + position:relative; + + overflow:auto; + + width:100%; + + display:none; + +} + + +/* End of Settings */ + +.bggray{ + background-color: #dfdfdf; +} +.bgwhite{ + background-color: #FFFFFF; +} +.copy{ + font-size:9px; + font-family: Verdana, Arial, Helvetica, Sans-serif; +} + +#basicTab{ + position:relative; + overflow:auto; + width:100%; + display:block; +} + +#moreTab{ + position:relative; + overflow:auto; + width:100%; + display:none; +} + +/*Added for Advance Seearch*/ + +#one{ + position:relative; + display:block; + width:245px; +} + + +/* Dashboard CSS */ +a.dash_href{ + display:block; + width:24px;height:24px; + vertical-align:middle; + margin-top:10px; +} + + +.dashHeading { + font-family:Arial, Helvetica, sans-serif; + font-size:24px; + font-weight:bold; + color:#fff; +} + +.dashSelectBg{ + background-image:url(images/dashSelectBg.gif); + background-repeat:repeat-x; +} +.dash_top{ + background-image:url(images/dashTopBg.gif); + background-repeat:repeat-x; + height:63px; + vertical-align:middle; +} + +.dash_border{ + background-color:#bfbfbf; + padding:5px; +} +.dash_white{ + background-color:#FFFFFF; + padding:5px 10px 5px 10px; +} + +.dash_bdr_btm{ + border-bottom:2px dotted #dadada; +} + +.dash_count{ + font-size:36px; + font-weight:bold; + text-decoration:none; + color:#000000; + padding-left:10px;padding-right:10px; +} +.dash_switch{ + cursor:pointer; + width:26px; + height:26px; +} + +.dash_row_sel{ + background-image:url(images/dash_sel_chart.jpg); + background-repeat:no-repeat; + background-position:center; + width:26px;height:26px; + text-align:center; + vertical-align:middle; + font-weight:bold; + font-size:10px; + text-decoration:none; +} + +.dash_row_unsel{ + background-image:url(images/dash_unsel_chart.jpg); + background-repeat:no-repeat; + background-position:center; + width:26px;height:26px; + text-align:center; + vertical-align:middle; + font-weight:normal; + font-size:10px; + text-decoration:none; + cursor:pointer; +} + +.dash_chart_btm{ + border-bottom:2px solid #000000; +} + + +.dash_bottom{ + background-image:url(images/dashBottomBg.gif); + background-repeat:repeat-x; + height:99px; + vertical-align:middle; +} + +.dash_btm{ + background-image:url(images/dash_btm_center.jpg); + background-repeat:repeat-x; + position:top; +} + +/* menu */ + + + + a.submenu{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + padding-top:5px; + padding-bottom:5px; + padding-left:10px; + border-bottom:1px solid #CCCCCC; + background-color:#ECECEC; + color:#000000; + text-align:left; + text-decoration:none; + display:block; +} + +a.submenu:Hover{ + background-color:#DDDDDD; + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + padding-top:5px; + padding-bottom:5px; + padding-left:10px; + border-bottom:1px solid #CCCCCC; + color:#000000; + text-align:left; + text-decoration:none; + display:block; +} + +#mnuKey{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + background-color:#666666; + color:#FFFFFF; + text-decoration:none; + padding:5px; + font-weight:bold; + width:8px; + cursor:pointer; + vertical-align:top; + height:100px; + position:relative; + top:0px; + left:0px; +} + +#slidemenu{ + height:525px; + vertical-align:top; + width:100px; + background-color:#CCCCCC; + border-right:1px solid #CCCCCC; + opacity:.9; + display:none; +}*/ + +/* clock */ + +.citystyle{ + position:relative; + top:0px; + left:0px; + text-align:left; + +} +#theClockLayer{ + position:relative; + height:180px; + left:20px; + text-align:center; +} +.handsanddotsstyle{ + margin-top:10px; + position:absolute; + top:0px; + left:0px; + width:2px; + height:2px; + font-size:2px; + background-color:#000000; +} +.facestyle{ + margin-top:10px; + position:absolute; + top:0px; + left:0px; + width:15px; + height:15px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} +.datestyle{ + margin-top:20px; + position:absolute; + top:0px; + left:0px; + width:100px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} +.ampmstyle{ + margin-top:23px; + position:absolute; + top:0px; + left:0px; + width:20px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} + +#wclock{ + position:absolute; + left:100px; + top:100px; + display:none; + background-color:#CCCCCC; + width:175px; +} + +.leftFormBorder1 { + border: 1px solid #AFC8E4; + background-color: #FFFFFF; + opacity:.7; +} + + + + +/* Calculator */ +.calcResult { + width: 100%; + height: 25px; + background-color: #FFFFCC;/*CBDFD6*/ + border-top: 1px solid #CCC; + border-left: 0px; + border-right: 1px solid #CCC; + border-bottom: 1px solid #CCC; + font-size: 10px; + text-align: right; +} +.calcMem { + width: 100%; + height: 25px; + border-top: 1px solid #CCC; + border-left: 1px solid #CCC; + border-right: 0px; + border-bottom: 1px solid #CCC; + background-color: #FFFFCC;/*CBDFD6*/ + font-family: Arial; + font-size: 10px; + color: #BBB; + text-align: left; +} +.calcBlackBtn, .calcGreyBtn, .calcBigBtn, .calcCancBtn, .calcMemBtn, .calcBackBtn { + border: none; + height: 20px; + font-size: 11px; + color: #FFF; + text-align:center; +} +.calcBackBtn { + background: url(images/calc_back_btn.gif) no-repeat; + width:25px; +} +.calcBlackBtn { + background: url(images/calc_black_btn.gif) no-repeat; + width:25px; +} +.calcGreyBtn { + background: url(images/calc_grey_btn.gif) no-repeat; + width:25px; +} +.calcCancBtn { + background: url(images/calc_canc_btn.gif) no-repeat; + width:25px; + +} +.calcMemBtn { + background: url(images/calc_mem_btn.gif) no-repeat; + width:25px; + /*background-color: #CCC;*/ +} +#calc{ + position:absolute; + left:100px; + top:100px; + background-color:#FFFFFF; + width:185px; + border-bottom:2px solid #000000; + border-right:2px solid #666666; + border-left:2px solid #CCCCCC; + border-top:2px solid #CCCCCC; +} + +/* RSS STYLES */ + +.subHdr{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#FFFFFF; + background-image:url(images/rssHeader.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; +} + +.delBg{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#FFFFFF; + background-image:url(images/rssdelete.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; +} + +#rssScroll{ + font-family:Arial, Helvetica, sans-serif ; + font-size:12px; + background-color:#FFFFFF; + width:100%; + height:175px; + overflow:auto; + border:0px solid #000000; +} + +.rssTable{ + width:100%; + border:0px solid #CCCCCC; +} + +.rssTable tr th{ + background-color:#a9a9a9; + text-align:left; + border-bottom:1px solid #555; + border-top:1px solid #FFFFFF; + color:#000000; + padding-left:5px; + padding-right:5px; + height:20px; +} + +.rssTable tr td{ + text-align:left; + border-bottom:1px dotted #dadada; + border-left:1px dotted #dadada; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + font-weight:normal; + white-space:nowrap; + padding:2px; + +} +.forwardBg{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#000000; + background-image:url(images/rssforward.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; + background-color:#D7D7D7; +} + + +/* New Styles */ + +.mnuTab{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:12px; + color:#000000; + width:100%; + border:0px solid #000000; +} + +.mnuTab tr td{ + border-bottom:1px solid #EBEBEB; + padding-left:5px; + vertical-align:middle; +} +/* profile */ + +.prvPrfBigText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; +} + +.prvPrfTopBg { + background-color:#ebebeb; +} + +.prvPrfBottomBg { + background-color:#ebebeb; +} + +.prvPrfOutline { + border:1px solid #ebebeb; +} + +.prvPrfTexture { + background:url(images/prvPrfTexture1.gif); + +} +.prvPrfHoverOn { + background-color:#ffffef; + +} +/* Organization */ + +.orgTab{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + font-weight:normal; + color:#666666; + border:0px solid #9B9B9B; + border-collapse:collapse; + width:100%; +} + +.orgTab tr th{ + text-align:left; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + text-decoration:none; + font-weight:bold; + height:20px; + padding-left:5px; +} + +.orgTab tr td{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-decoration:none; + font-weight:normal; + padding-left:5px; + height:20px; + border-bottom:1px solid #CCCCCC; + border-right:1px solid #CCCCCC; +} + +/* Groups */ +.groupli{ + margin-left:20px; + font-family:Arial, Helvetica, sans-serif; + font-weight:normal; + font-size:12px; + text-decoration:none; + color:#333333; + list-style-type:none; + text-align:left; +} + +/* tree menu */ + +/*Oraganization Edit Features */ + +#orgLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:500px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + display:block; + position:absolute; + left:0px; + top:0px; +} + +/* Role */ + +#roleLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + display:none; + position:absolute; +} + +.classBtn{ + font-family:Verdana, Arial, Helvetica, sans-serif; + text-decoration:none; + font-weight:normal; + font-size:10px; + background-color:#DBDBDB; + border-bottom:2px solid #999999; + border-right:2px solid #999999; + border-top:2px solid #F5F5F5; + border-left:2px solid #F5F5F5; + color:#000000; + text-align:center; + padding-top:3px; + padding-bottom:3px; +} + + +.txtBox{ + width:85%; + border:1px solid #666666; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; +} + +/* IMPORT LEADS */ + +.leadTable{ + border:3px solid #CCCCCC; + border-collapse:collapse; +} + +.leadTable tr td{ +/* border:0px solid #CCCCCC;*/ +} + +.genHeaderGray{ + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + line-height: 16px; + color: #888888; + font-weight:bold; +} + +.genHeaderGrayBig{ + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + line-height: 16px; + color: #888888; + font-weight:bold; +} + +.importBox{ + width:125px; + border:1px solid #666666; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; +} +.txtGreen{ + color:green; +} + +/* PICK LIST */ +ul li{ + padding-bottom:2px; + padding-top:2px; +} +/* MY PREFERENCES */ +/* CSS FOR REPORTS */ + +.reportHdr{ + background-color:#DDDDDD; + font-size:12px; + font-weight:bold; + vertical-align:middle; + text-align:left; + height:30px; + border-bottom:2px solid #959595; + color:#000000; + padding-left:10px; +} + +#reportLay{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; + z-index:2000; +} + +#locateMap{ + width:120px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; + z-index:2000; +} + + + a.reportMnu{ + font-size:11px; + color:#0070BA; + text-decoration:none; + display:block; + width:155px; + height:20px; + border-bottom:1px solid #E1E1E1; + padding-left:20px; + padding-top:3px; +} + +a.reportMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; + display:block; + width:155px; + height:20px; + border-bottom:1px solid #E1E1E1; + padding-left:20px; + padding-top:3px; +} + +#Generate{ + position:relative; + width:100%; + text-align:center; + display:none; +} + +/* END OF REPORT */ +/* WEB MAIL */ + a.webMnu{ + font-size:11px; + color:#0070BA; + text-decoration:underline; +} +a.webMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; +} +/* END OF WEB MAIL */ +/* POPUP */ + a.alpha{ + font-size:11px; + color:gray; + text-decoration:none; + padding-Left:5px; + padding-right:5px; + border:1px dotted #CCCCCC; + background-color:#FFFFCC; +} + +a.alpha:Hover{ + font-size:11px; + color:gray; + text-decoration:underline; + padding-Left:5px; + padding-right:5px; + border:1px dotted #CCCCCC; + background-color:#FFFFCC; +} + +/* Home Page */ +.MatrixLayer{ + border:2px solid #aaaaaa; + background-color:#FFFFFF; + width:29%; + position:relative; + visibility:visible; + margin:9px; + height:280px; +} + +.fontBold{ + font-size:13px; + color:#000000; + text-decoration:none; + font-weight:bold; +} + +.style_Gray{ + color:gray; +} + +/* End of Home Page */ + +/* All Menu */ +#allMenu{ + width:500px; + border:4px solid #aaa; + left:200px; + top:100px; + position:absolute; + z-index:1000001; + display:none; + padding:10px; + background:#ffffff url(images/layerPopUpBg.gif); +} + + +.allMnuTable{ + width:100%; + background-color:#FFFFFF; +} + +.allMnuHandle td{ + height:20px; + color:#FFFFFF; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + font-weight:bold; + text-decoration:none; + background-color:#555; + cursor:move; + padding:2px; + border-bottom:2px solid #666666; +} + +.allMnuHdr{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-weight:Bold; + font-size:11px; + text-decoration:none; + display:block; + background-color:#FFFFFF; + color:#333; + padding-top:5px; + padding-bottom:5px; +} + +a.allMnu{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:10px; + text-decoration:none; + font-weight:normal; + display:block; + width:125px; + height:15px; + padding-left:5px; + padding-top:0px; + padding-bottom:0px; + background-color:#FFFFFF; + border:1px solid #FFFFFF; + color:#000099; + margin-left:10px; +} + +a.allMnu:Hover{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:10px; + text-decoration:none; + font-weight:normal; + display:block; + width:125px; + height:15px; + padding-left:5px; + padding-top:0px; + padding-bottom:0px; + background-color:#ddd; + +} +/* End Of All Menu */ +/* Calendar */ +.calHdr{ + background-image:url(images/mailSubHeaderBg.gif); + background-repeat:repeat-x; + background-position:left top; +} + +.calSel{ + background-image:url(images/dashSelectBg.gif); + background-repeat:repeat-x; + text-align:center; + color:#FFFFFF; + font-weight:bold; + width:8%; +} + +.calAddButton { + border: 1px solid #999; + background:#ddd url(images/calAddButtonBg.gif) repeat-x; + cursor:pointer; + height:20px; + + +} +.calInnerBorder { + border-left:2px solid #a5a5a5; + border-right:2px solid #a5a5a5; + border-bottom:2px solid #a5a5a5; +} + +.calBorder { + border-left: 1px solid #a5a5a5; + border-right: 1px solid #a5a5a5; + border-bottom: 1px solid #a5a5a5; + background:#fefefe url(images/layerPopupBg.gif); + +} +.calTopRight { + border-right: 1px solid #a5a5a5; +} + + +.calUnSel{ + color:#000000; + font-weight:normal; + text-align:center; + width:8%; +} + +a.calMnu{ + font-size:11px; + color:#009; + text-decoration:none; + display:block; + height:20px; + padding-left:5px; + padding-top:3px; +} + +a.calMnu:Hover{ + font-size:11px; + color:#009; + text-decoration:underline; + display:block; + height:20px; + padding-left:5px; + padding-top:3px; +} + +/*.bggray{ + background-color: #dfdfdf; +}*/ +.bgwhite{ + background-color: #FFFFFF; +} +.copy{ + font-size:9px; + font-family: Verdana, Arial, Helvetica, Sans-serif; +} + +#mnuTab{ + position:relative; + width:100%; + display:block; +} + +#mnuTab2{ + position:relative; + overflow:auto; + width:100%; + display:none; +} +.style1 {color: #FF0000} +.event{ + background-color:#ddd; + border:1px solid #999999; + text-align:left; + width:100%; + position:relative; + left:0px; + top:0px; + vertical-align:middle; + padding:1px; +} + +#hrView{ + display:block; +} +.calendarNav{ + font-size:12px; + color:#FFFFFF; + white-space:nowrap; + text-align:center; + font-weight:bold; + padding-left:10px; + padding-right:10px; + background-image:url(images/cal_nav.gif); + background-repeat:repeat-x; +} +#addEventDropDown{ + position:absolute; + display:none; + width:150px; + border:1px solid #666666; + left:0px; + top:0px; + overflow:visible; + z-index:5000; +} + +.calAction{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; + z-index:2000; +} + +.calSettings{ + position:absolute; + z-index:20000; + width:500px; + left:200px; + top:150px; + background-color:#ffffff; +} +.outer{ + border-bottom:1px solid #CCCCCC; + border-left:1px solid #CCCCCC; + border-right:1px solid #CCCCCC; +} +.calTxt{ + width:50%; + border:1px solid #CCCCCC; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + padding-left:5px; +} + +#leadLay{ + position:relative; + width:100%; + float:left; + visibility:hidden; + padding:5px; + z-index:10000; +} + +/* End of Calendar */ + +/* Cal Year View */ +.eventDay{ + background-color:#FF9966; + font-weight:bold; +} + +.currDay{ + background-color:#006600; + font-weight:bold; + text-decoration:underline; +} + +.currDay a{ + color:#FFFFFF; + font-weight:bold; + text-decoration:underline; +} + + +/* End of Cal Year View */ + +/* Level 2 Menu Selected*/ + +level2Sel{ + color:#000000; + font-weight:bold; + text-decoration:underline; +} + +#DeleteLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; +} + +#CurrencyDeleteLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:350px; +} + + +/* For Report HTML Generation*/ +.rptCellLabel { + background-color:#f6f6f6; + padding-right:10px; + border-right: 1px solid #DDDDDD; + border-bottom:1px solid #eaeaea; + color:#737373; + font-weight: bold; + white-space:nowrap; +} +.rptTable { + border-left: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; + border-top: 1px solid #DDDDDD; +} +.rptTitle, .rptHead, .rptData, .rptGrpHead{ + font-family: Verdana, Arial, Helvetica, Sans-serif; + font-size: 11px; + text-align:left; + font-weight: normal; + height: 20px; + padding: 4px; + border-right: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; + background: #DDDDDD; +} +.rptGrp1Total, .rptGrp2Total, .rptTotal { + font-family: Verdana, Arial, Helvetica, Sans-serif; + font-size: 11px; + text-align:center; + font-weight: normal; + background: #FFF; + height: 20px; + padding: 4px; + border-right: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; +} +.rptGrpHead { + background: #FFF; + border-bottom: 1px solid #FFF; + border-top: 1px solid #DDDDDD; + font-weight: normal; +} + +.rptData { + background: #FFF; + font-weight: normal; +} +.rptEmptyGrp { + background: #FFF; + border-right: 1px solid #DDDDDD; +} +.statechange +{ + position:absolute; + visibility:hidden; + left:10px; + top:20px; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; +} +#PopupLay{ + position:absolute; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:500px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; + display:none; + left:100px; + top:100px; +} + +#folderLay{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; +} + +/* Css for quick Create */ + +.qcTransport{ + background-color:#dadada; + +} + +#role_popup{ + position:relative; + left:0px; + top:0px; + width:95%; + height:300px; + overflow:auto; + border:1px solid #999999; + text-align:left; + background-color:#FFFFFF; + } + +.unread_email { + font-weight:bold; + background-color:#00FF00; +} +.delete_email { + font-weight:bold; + background-color:#FF5151; + +} +.qualify_email { + font-weight:bold; + background-color:#CDB5CD; + + } + + + + +.mailSelected { + font-family: Arial, Helvetica, sans-serif; + font-weight:bold; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + +} +.mailSelected_select { + background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; + background-color:#1F5EFF; + font-family: Arial, Helvetica, sans-serif; + font-weight:bold; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + +} + +/* MY SITES */ + +.unread_email:hover { + font-weight:bold; +} + + +.tagCloud { + border:1px solid #737373; +} + + +.tagCloudTopBg { + background: url(images/tagCloudBg.gif) repeat-x; + +} + +.tagCloudDisplay { + background-color:#e5e5e5; + padding:10px; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height: 14px; + color: #000000; + +} +.h2 { + + font-size:18px; + line-height:20px; + +} + +.gray { + + color:gray; +} +ul { + list-style:circle; + line-height:20px; + padding-left:5px; + margin-left:20px; + font-weight:normal; + +} +.tagCloudTopBg { + background-image: url(images/tagCloudBg.gif); + background-repeat: repeat-x; +} + +.tagCloudDisplay { + background-color:#e5e5e5; + padding:5px; +} + +.heading2 { + font-family: Arial, Helvetica, sans-serif; + font-size: 16px; + line-height: 16px; + font-weight:bold; + color: #000000; +} + +.settingsUI { + + text-align:left; + background-color:#fff; + background-image:url(images/layerPopupBg.gif); + border:2px solid #aaaaaa; + +} + + +.settingsTabHeader { + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height:22px; + font-weight:bold; + color:#333; + background-image: url(images/mailSubHeaderBg.gif); + background-color:#dddddd; + background-repeat: repeat-x; + padding-left:10px; + padding-right:10px; + +} + +.settingsTabList { + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:20px; + font-weight:normal; + color:#000000; + background-color:#e5e5e5; + padding-left:30px; + border-bottom:1px solid #ccc; + border-top:1px solid #fff; +} +.settingsTabSelected { + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:20px; + font-weight:bold; + color:#000000; + background-color:#ffffff; + padding-left:30px; + border-left:1px solid #ddd; +} +.settingsSelectedUI { + padding:10px; + background:url(images/settingsSelUIBg.gif) repeat-x; + background-color:#ffffff; +} +.settingsIconDisplay { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:14px; + padding:10px; + + color:#000000; + background-color:#ffffff; + padding-left:10px; +} +.settingsSelUITopLine{ + border-bottom:2px dotted #999999; + +} + +.tableHeading{ + background-color:#ffffff; + border-bottom:2px solid #555; +} +.colHeader{ + background-color:#ddd; + border-left:1px solid #fff; + border-top:1px solid #fff; + border-right:1px solid #aaa; + border-bottom:1px solid #aaa; + font-weight:bold; + +} +.cellLabel { + background-color:#eaebd9; + border-top:1px solid #efefef; + border-bottom:1px solid #dadada; + color:#555555; + +} +.cellText { + color:#333333; + border-bottom:1px solid #dadada; +} + +.listTable{ + border-left:1px solid #cccccc; + border-right:1px solid #cccccc; + border-bottom:1px solid #cccccc; + +} + +.listTableRow{ + border-bottom:1px solid #eaeaea; + border-right :1px solid #eaeaea; + border-bottom:1px solid #eaeaea; + border-bottom:1px solid #eaeaea; +} +.listRow{ + border-bottom:2px solid #eaeaea; + +} + +.listTableTopButtons{ + background-color:#efefef; + background-image:url(images/layerPopupBg.gif); + +} + + +/* Buttons */ +.crmButton{ + + border-left:1px solid #ffffff; + border-top:1px solid #ffffff; + border-right:1px solid #555555; + border-bottom:1px solid #555555; +} + +.create{ + background-color:#55aa55; + color:#fff; + font-weight:bold; +} +.delete { + background-color:#ffaa22; + color:#000; + font-weight:bold; +} +.edit { + background-color:#55aa55; + color:#fff; + font-weight:bold; +} +.save{ + background-color:#55aa55; + color:#fff; + font-weight:bold; +} +.cancel { + background-color:#ffaa22; + color:#000; + font-weight:bold; +} + +.inactive{ +color:#999999; +} + +.active{ +color:#229922; + +} + +/* Buttons ends */ + + + +textarea { + width:95%; + height:70px; + border:1px solid #dadada; +} +.treeTable1{ + padding:0px; +} + +.prvPrfBigText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; +} + +.prvPrfTopBg { + background-color:#ebebeb; +} + +.prvPrfBottomBg { + background-color:#ebebeb; +} + +.prvPrfOutline { + border:1px solid #ebebeb; +} +.prvPrfTexture { + background:url(images/prvPrfTexture1.gif); + +} + +.prvPrfHoverOn { + background-color:#ffffef; + +} +.cellBottomDotLine { + border-bottom-width: 2px; + border-bottom-style: dotted; + border-bottom-color: #CCCCCC; + background-color:#ededed; +} +.crmFormList{ + border:1px solid #cccccc; + width:90%; + height:120px; + +} +.cellBottomDotLinePlain { + border-bottom-width: 2px; + border-bottom-style: dotted; + border-bottom-color: #CCCCCC; + +} + +.thickBorder { + border: 2px solid #999999; +} +.trackerHeading { + background-color:#efefef; +} +.trackerListBullet { + border-right:1px dotted #cccccc; + background-color:#f9f9f9; +} +.trackerList { + border-bottom:1px solid #eeeeee; +} + +/* Table Definitions */ +.crmTable { + border:1px solid #dadada; +} + +.crmTableRow { + border-bottom:1px dotted #dadada; + border-right:1px dotted #dadada +} + +/* Inventory */ + +.lineOnTop { + border-top:1px solid #999999; +} + +.discountUI{ + border:3px solid #CCCCCC; + width:250px; + padding:5px; + position:absolute; + background-color:#FFFFFF; + display:none; +} + +.TaxShow{ + display:inline-table; +} + +.TaxHide{ + display:none; +} + +/* Inventory */ + + +/* Email Client Classes ++++++++++++++++++++++ */ + +.emailSelected{ + background-color:#eaeaea; + color:#000000; + font-size:bold; +} + + +.mailClient{ + border:2px solid #656565; +} + +.mailClientBg { + background-color:#efefef; + background-image:url(images/layerPopupBg.gif); +} + +.mailSubHeader { + background:#d9d9d9 url(images/mailSubHeaderBg.gif) repeat-x; + padding:4px; +} +.mailClientWriteEmailHeader { + font-family:arial, helvetica, sans-serif; + font-size:20px; + line-height:24px; + font-weight:bold; + background:#e0e0e0 url(images/mailSubHeaderBg.gif) repeat-x; + padding:10px; + border-left:1px solid #eaeaea; + border-top:1px solid #eaeaea; + border-right:1px solid #999; + border-left:1px solid #999;; +} + +.mailClientCSSButton { + border-left:1px solid #fff; + border-top:1px solid #fff; + border-right:1px solid #333; + border-bottom:1px solid #333; + padding:2px; + background-color:#cfcfcf; +} + +/* Email Client Classes ends ------------------------------------ */ + + + +/* Layer Popup */ +.layerPopup { + border:3px solid #959595; + background:#fffff5 url(images/layerPopupBg.gif) ; + position:absolute; +} + +.layerPopupHeading { + font-family:arial, helvetica, sans-serif; + font-size:16px; + line-height:24px; + font-weight:bold; +} +.layerHeadingULine { + border-bottom:2px solid #777; +} +.layerPopupTransport { + background-color:#eaeaea; + +} +.homePageSeperator { + border-right:1px dotted #ddd; +} +.homePageMatrixHdr { + border-bottom:1px solid #d3d3d3; + background:#fffff5 url(images/layerPopupBg.gif) ; +} + +.reportsListTable { + background-color:white; + border-left:1px solid #aaa; + border-right:1px solid #aaa; + border-bottom:1px solid #aaa; +} + +.reportGenerateTable{ + background-image:url(images/layerPopupBg.gif); + border-left:2px dotted #aaa; + border-right:2px dotted #aaa; + border-bottom:2px dotted #aaa; +} +.reportCreateBottom{ + background-color:#eaeaea; + border-bottom:2px solid #777; + +} +.importLeadUI{ + /*background:#ffffff url(images/select.gif) ; */ + background-color:#fff; +} + +a.customMnu{ + padding-left:30px; + padding-top:5px; + padding-bottom:5px; + display:block; + background-repeat:no-repeat; + background-position:left; + width:155px; + color:#000000; + text-decoration:none; +} + +a.customMnuSelected{ + padding-left:30px; + padding-top:5px; + padding-bottom:5px; + display:block; + background-repeat:no-repeat; + background-position:left; + width:155px; + background-color:#0099FF; + color:#FFFFFF; + text-decoration:none; +} + + +/* Drop Down Menu */ +.drop_mnu{ + position:absolute; + left:0px; + top:0px; + z-index:1000000001; + border-left:1px solid #a5a5a5; + border-right:1px solid #a5a5a5; + border-bottom:1px solid #a5a5a5; + width:150px; + display:none; + padding:0px; + text-align:left; + overflow-x:hidden; + overflow-y:hidden; + background-color:#eee; +} + +a.drop_down{ + width:150px; + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:20px; + font-weight:normal; + color:#009; + background-color:#eee; + padding:2px 5px 2px 5px; + border-top:1px solid #fafafa; + border-bottom:1px solid #d3d3d3; + display:block; +} + +a.drop_down:Hover{ + padding:2px 5px 2px 5px; + width:150px; + text-align:left; + color:#33a; + font-weight:normal; + text-decoration:underline; + background-color:#dadada; +} + +.bgwhite{ + background-color:white; +} + +.searchUIBasic { + background-image:url(images/layerPopupBg.gif); + border:2px solid #a5a5a5; +} +.searchUIAdv1{ + background-image:url(images/layerPopupBg.gif); + border-top:2px solid #a5a5a5; + border-left:2px solid #a5a5a5; + border-right:2px solid #a5a5a5; +} +.searchUIAdv2{ + background-image:url(images/layerPopupBg.gif); + border-left:2px solid #a5a5a5; + border-right:2px solid #a5a5a5; +} +.searchUIAdv3{ + background-image:url(images/layerPopupBg.gif); + border-bottom:2px solid #a5a5a5; + border-left:2px solid #a5a5a5; + border-right:2px solid #a5a5a5; +} + + + +/* Recalculate Disabling Window */ + +.veil{ + background: url(images/layerPopupBg.gif) ; + height: 100%; + width: 100%; + top: 0px; + left: 0px; + overflow: hidden; + z-index: 10000; + Filter: Alpha(opacity = 70); + -moz-opacity: 0.7; + text-align: center; + vertical-align: middle; + position: absolute; +} + +.veil_new{ + background: url(images/layerPopupBg.gif) ; + height: 100%; + width: 100%; + top: 0px; + left: 0px; + overflow: hidden; + z-index: 50000; + Filter: Alpha(opacity = 70); + -moz-opacity: 0.7; + text-align: center; + vertical-align: middle; + position: absolute; +} + +.optioncontainer{ + vertical-align: middle; + height: 100%; + width: 100%; + position: absolute; + z-index: 90000; +} + + +.options{ + vertical-align: middle; + margin-left: 25%; + margin-top: 16%; + color: #FFFFFF; + width:650px; + background-color: Black; + border: 2px solid #222; + position: relative; + text-align: left; + z-index: 80000; +} + +.options h2{ + color: White; + font-family: Verdana, Arial, Helvetica, sans-serif; + border-bottom: 1px solid #373D4C; + margin: 0; + font-weight: normal; +} +.groupname{ + width:125px; + } +.winmarkModulesdef{ + background-image:url(images/alphagrayHomeMark.gif); + background-position:top; + background-repeat:repeat-x; + + +/* Recalculate Disable Ends */ + Modified: vtigercrm/branches/5.1_jens/themes/bluelagoon/images/aboutUS.jpg ============================================================================== Binary files - no diff available. Modified: vtigercrm/branches/5.1_jens/themes/bluelagoon/images/cal12x12Shared.gif ============================================================================== Binary files - no diff available. Modified: vtigercrm/branches/5.1_jens/themes/bluelagoon/style.css ============================================================================== --- vtigercrm/branches/5.1_jens/themes/bluelagoon/style.css (original) +++ vtigercrm/branches/5.1_jens/themes/bluelagoon/style.css Mon Apr 16 12:27:44 2007 @@ -1,2234 +1,2284 @@ -/********************************************************************************* - -** The contents of this file are subject to the vtiger CRM Public License Version 1.0 - * ("License"); You may not use this file except in compliance with the License - * The Original Code is: vtiger CRM Open Source - * The Initial Developer of the Original Code is vtiger. - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - ********************************************************************************/ - - -/* WOOD SPICE - COLOR THEME*/ - -.small { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; -} -.big { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 18px; - color: #000000; - font-weight:bold; -} - -.componentName { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - line-height: 18px; - color: #3333ff; - font-weight:bold; - border-left:2px dotted #fff; - padding:10px; -} - - -.genHeaderBig{ - font-family: Arial, Helvetica, sans-serif; - font-size: 16px; - line-height: 19px; - color: #000000; - font-weight:bold; -} -.genHeaderSmall{ - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 16px; - color: #000000; - font-weight:bold; -} - -.moduleName { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - color: #000033; - font-weight:bold; -} - - -.hdrNameBg { - background:#ffffff url(images/hdrNameBg.gif) repeat-x; - - -} - -.hdrTabBg { - background:#ffffff url(images/hdrTabBg.gif) bottom repeat-x ; - background-color:#fff; -} - -.tabSelected { - background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; - background-color:#1F5EFF; - font-family: Arial, Helvetica, sans-serif; - font-weight:bold; - font-size: 11px; - padding-left:10px; - padding-right:10px; - padding-top:2px; - padding-bottom:2px; - -} - -.tabSelected a{ - color:white; -} - -.tabUnSelected { - - background: #efedd4 url(images/tabUnSelectedBg.gif) bottom repeat-x; - background-color:#AFDBFF; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:10px; - padding-right:10px; - padding-top:2px; - padding-bottom:2px; - border-bottom:1px solid #ffffff; -} - -.tabUnSelected a{ - color:#000099; -} - -.tabSeperator { - background-color:#aae; - width:1px; -} - - - -.level2text { - - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:15px; - padding-right:15px; - padding-top:5px; - padding-bottom:5px; - font-weight:bold; - color:white; -} - -.level2text a{ - text-decoration:none; - color:#555555; -} - -.level2text a:hover { - text-decoration:underline; - color:#555555; - -} - - -.level2Bg { - background:#1F5BFF url(images/level2TabBg.gif) bottom repeat-x; - background-color:#1F5BFF; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - border-bottom:1px solid #222255; - color:white; -} - -.level2Bg a{ - /* background:#1F5BFF url(images/level2TabBg.gif) bottom repeat-x; */ - color:white; -} - - -.level2SelTab{ - font-weight:bold; - color:#000000; - padding-left:20px; - padding-right:20px; - padding-top:5px; - padding-bottom:5px; - -} - -.level2UnSelTab{ - color:#000000; - padding-left:20px; - padding-right:20px; - padding-top:5px; - padding-bottom:5px; -} -.sep1 { - background:#999999; -} - -.showPanelBg { - background:url(images/showPanelTopBg.gif) repeat-x; -} - -a { - text-decoration:none; - color:#3344bb; -} - -a:hover { - text-decoration:underline; -} - -.hdrLink { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - text-decoration:none; - color:#0000cc; - font-weight:bold; -} - -.hdrLink:hover { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - text-decoration:underline; - color:#0000cc; - font-weight:bold; -} - -.searchBox { - border: 0px solid #0000aa; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:2px; - width:100px; - background-color:#ffffef; -} - -.searchBtn { - border :0px #cccccc solid; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - font-weight:bold; - width:30px; - height:19px; - background-color:#009; - color:white; -} - - -/* List View Table classes starts +++++++++++++++++ */ - -.lvt { - background-color:#ddf; - border:1px solid #cce; -} - -.lvtBg { -} - -.lvtHeaderText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - font-weight:bold; -} - -.lvtCol { - border-top:1px solid #eeeeff; - border-left:1px solid #eeeeff; - border-right:1px solid #9999dd; - border-bottom:1px solid #9999dd; - background-color:#eef; - font-weight:bold; -} - -.lvtColData { - background-color:#ffffff; -} - -.lvtColDataHover { - background-color:#eeefff; - -} - - -/* List View Table classes ends --------------------------------*/ - - - -/* Detailed View classes starts +++++++++++++++++++++++ */ -.dvHeaderText{ - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - color:#000000; - font-weight:bold; - -} - -.dvInnerHeader{ - border-bottom:2px solid #4F94CD; - padding:5px; - background-color:#afdbff; - -} - -.dvtSelectedCell { - border-left:2px solid #00BFFF; - border-top:2px solid #00BFFF; - border-right:2px solid #00BFFF; - padding-left:20px; - padding-right:20px; - background-color:white; - font-weight:bold; -} - -.dvtUnSelectedCell { - border-left:2px solid #00BFFF; - border-top:2px solid #00BFFF; - border-right:2px solid #00BFFF; - border-bottom:2px solid #00BFFF; - padding-left:20px; - padding-right:20px; - background-color:#ffffee; - cursor:pointer; -} - -.dvtTabCache { - border-bottom:2px solid #00BFFF; -} - -.dvtContentSpace { - border-left:2px solid #00BFFF; - border-right:2px solid #00BFFF; - border-bottom:2px solid #00BFFF; - padding-left:0px; -} - -.dvtCellLabel, .cellLabel { - background-color:#f5f5ff; - padding-right:10px; - padding-left:10px; - border-bottom:1px solid #dadaee ; - border-top:1px solid #ffffff ; - color:#545454; - white-space:nowrap; -} - -.dvtCellInfo, .cellInfo { - padding-left:10px; - padding-right:10px; - border-bottom:1px solid #efefef; - white-space:nowrap; -} - -.rightMailMerge { - border:2px solid #aae; -} - -.rightMailMergeHeader { - border-bottom:1px solid #dde; - padding:5px; - background-color:#eef; - -} - -.rightMailMergeContent { - padding:5px; - background-color:#fafafa; - -} - -.detailedViewHeader{ - border-bottom:2px solid #4F94CD; - padding:5px; - background-color:#afdbff; -} - -.detailedViewTextBox { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:90%; - background-color:#ffffff; -} - -.detailedViewTextBoxOn { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:90%; - background-color:#ffffdd; -} - -.detailedViewTextBoxDis { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #555555; - border:1px solid #bababa; - padding-left:5px; - width:90%; - background-color:#aaaaaa; -} - -.detailedViewTextArea { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:95%; - height:100px; - background-color:#ffffff; - text-align:left; -} - -.advSearch { - padding:10px; - border-left:1px solid #eaeaea; - border-right:1px solid #eaeaea; - border-bottom:1px solid #eaeaea; - overflow:auto; - width:600px; - height:150px; - background-color:#ffffef; - -} - -.searchAlph { - border:1px solid #dadada; - background-color:#ffffff; - cursor:pointer; - width:10px - -} -.searchAlphselected { - border:1px solid #666666; - background-color:#bbbbbb; - cursor:pointer; - width:10px - -} -.textbox { - border:1px solid #999999; - background-color:#ffffff; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - width:120px; - padding:2px; - -} - - -.mx { -} - -.calListTable td{ - border-bottom:1px solid #efefef; - border-left:1px solid #efefef; -} -.calDIV { - width:100%; - border:1px solid #999999; - -} - -.calDayHour { - border-top:1px solid #c5d5ff; - border-left:1px solid #c5d5ff; - border-bottom:1px solid #c5d5ff; - border-right:1px solid #c5d5ff; - background-color:#eae7da; -} - -.calAddEvent { - position:absolute; - z-index:10000; - width:500px; - left:200px; - top:150px; - background-color:#ffffff; -} -.addEventInnerBox { - border:1px dotted #dadada; - -} - - -.cellNormal { - border:0px; - background-color:#ffffff; -} - - -.thumbnail{ - background-color:#ffffff; -padding: 7px; -border: 1px solid #ddd; -float: left; - margin-right: 10px; - margin-bottom: 15px; -} - - -.padTab{ - padding-top:0px; - padding-left:0px; - padding-left:10px; - padding-bottom:0px; - vertical-align:top; - -} -#company{ - position:relative; - width:100%; - height:200px; - display:block; - background-color:#FFFFFF; - white-space:nowrap; - overflow:auto; - border:1px solid #CCCCCC; -} - - -#user{position:relative;left:0px;top:0px;width:100%;display:block;} -/*#studio{position:relative;left:0px;top:0px;width:100%;display:block;}*/ -#communication{position:relative;left:0px;top:0px;width:100%;display:block;} -#config{position:relative;left:0px;top:0px;width:100%;display:block;} - -#userTab{position:relative;left:0px;top:0px;width:100%;display:none;} -#one{ - position:relative; - display:block; - width:245px; -} - -#mnuTab1{ - - position:relative; - - overflow:auto; - - width:100%; - - display:none; - -} - -#mnuTab2{ - - position:relative; - - overflow:auto; - - width:100%; - - display:none; - -} - - -/* End of Settings */ - -.bgwhite{ - background-color: #FFFFFF; -} -.copy{ - font-size:9px; - font-family: Verdana, Arial, Helvetica, Sans-serif; -} - -#basicTab{ - position:relative; - overflow:auto; - width:100%; - display:block; -} - -#moreTab{ - position:relative; - overflow:auto; - width:100%; - display:none; -} - -/*Added for Advance Seearch*/ - - -#one{ - position:relative; - display:block; - width:245px; -} - -/* Dashboard CSS */ -a.dash_href{ - display:block; - width:24px;height:24px; - vertical-align:middle; - margin-top:10px; -} -.dashHeading { - font-family:Arial, Helvetica, sans-serif; - font-size:24px; - font-weight:bold; - color:#fff; -} -.dashSelectBg{ - background-image:url(images/dashSelectBg.gif); - background-repeat:repeat-x; -} -.dash_top{ - background-image:url(images/dashTopBg.gif); - background-repeat:repeat-x; - height:63px; - vertical-align:middle; -} - -.dash_border{ - background-color:#738bff; - padding:5px; -} - - -.dash_white{ - background-color:#FFFFFF; - padding:5px 10px 5px 10px; -} - -.dash_bdr_btm{ - border-bottom:2px dotted #939271; -} - -.dash_count{ - font-size:36px; - font-weight:bold; - text-decoration:none; - color:#000000; - padding-left:10px;padding-right:10px; -} -.dash_switch{ - cursor:pointer; - width:26px; - height:26px; -} - -.dash_row_sel{ - background-image:url(images/dash_sel_chart.jpg); - background-repeat:no-repeat; - background-position:center; - width:26px;height:26px; - text-align:center; - vertical-align:middle; - font-weight:bold; - font-size:10px; - text-decoration:none; -} - -.dash_row_unsel{ - background-image:url(images/dash_unsel_chart.jpg); - background-repeat:no-repeat; - background-position:center; - width:26px;height:26px; - text-align:center; - vertical-align:middle; - font-weight:normal; - font-size:10px; - text-decoration:none; - cursor:pointer; -} - -.dash_chart_btm{ - border-bottom:2px solid #000000; -} - - -.dash_bottom{ - background-image:url(images/dashBottomBg.gif); - background-repeat:repeat-x; - height:99px; - vertical-align:middle; -} - -.dash_btm{ - background-image:url(images/dash_btm_center.jpg); - background-repeat:repeat-x; - position:top; -} - - -/* clock */ - -.citystyle{ - position:relative; - top:0px; - left:0px; - text-align:left; - -} -#theClockLayer{ - position:relative; - height:180px; - left:20px; - text-align:center; -} -.handsanddotsstyle{ - margin-top:10px; - position:absolute; - top:0px; - left:0px; - width:2px; - height:2px; - font-size:2px; - background-color:#000000; -} -.facestyle{ - margin-top:10px; - position:absolute; - top:0px; - left:0px; - width:15px; - height:15px; - text-align:center; - font-family:arial,sans-serif; - font-size:10px; - color:#000000; -} -.datestyle{ - margin-top:20px; - position:absolute; - top:0px; - left:0px; - width:100px; - text-align:center; - font-family:arial,sans-serif; - font-size:10px; - color:#000000; -} -.ampmstyle{ - margin-top:23px; - position:absolute; - top:0px; - left:0px; - width:20px; - text-align:center; - font-family:arial,sans-serif; - font-size:10px; - color:#000000; -} - -#wclock{ - position:absolute; - left:100px; - top:100px; - display:none; - background-color:#CCCCCC; - width:175px; -} - -.leftFormBorder1 { - border: 1px solid #AFC8E4; - background-color: #FFFFFF; - opacity:.7; -} - - - - -/* Calculator */ -.calcResult { - width: 100%; - height: 25px; - background-color: #FFFFCC;/*CBDFD6*/ - border-top: 1px solid #CCC; - border-left: 0px; - border-right: 1px solid #CCC; - border-bottom: 1px solid #CCC; - font-size: 10px; - text-align: right; -} -.calcMem { - width: 100%; - height: 25px; - border-top: 1px solid #CCC; - border-left: 1px solid #CCC; - border-right: 0px; - border-bottom: 1px solid #CCC; - background-color: #FFFFCC;/*CBDFD6*/ - font-family: Arial; - font-size: 10px; - color: #BBB; - text-align: left; -} -.calcBlackBtn, .calcGreyBtn, .calcBigBtn, .calcCancBtn, .calcMemBtn, .calcBackBtn { - border: none; - height: 20px; - font-size: 11px; - color: #FFF; - text-align:center; -} -.calcBackBtn { - background: url(images/calc_back_btn.gif) no-repeat; - width:25px; -} -.calcBlackBtn { - background: url(images/calc_black_btn.gif) no-repeat; - width:25px; -} -.calcGreyBtn { - background: url(images/calc_grey_btn.gif) no-repeat; - width:25px; -} -.calcCancBtn { - background: url(images/calc_canc_btn.gif) no-repeat; - width:25px; - -} -.calcMemBtn { - background: url(images/calc_mem_btn.gif) no-repeat; - width:25px; - /*background-color: #CCC;*/ -} - -#calc{ - position:absolute; - left:100px; - top:100px; - background-color:#FFFFFF; - width:185px; - border-bottom:2px solid #000000; - border-right:2px solid #666666; - border-left:2px solid #CCCCCC; - border-top:2px solid #CCCCCC; -} - -/* RSS STYLES */ - -.subHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-image:url(images/rssHeader.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; -} - -.delBg{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-image:url(images/rssdelete.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; -} - -#rssScroll{ - font-family:Arial, Helvetica, sans-serif ; - font-size:12px; - background-color:#FFFFFF; - width:100%; - height:130px; - overflow:auto; - border:0px solid #000000; -} - -.rssTable{ - width:100%; - border:0px solid #CCCCCC; -} - -.rssTable tr th{ - background-color:#00BFFF; - text-align:left; - border-bottom:1px solid #99F; - border-top:1px solid #FFFFFF; - color:#000000; - padding-left:5px; - padding-right:5px; - height:20px; -} - -.rssTable tr td{ - text-align:left; - border-bottom:1px dotted #dadada; - border-left:1px dotted #dadada; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - white-space:nowrap; - padding:2px; - -} - - -.forwardBg{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - color:#000000; - background-image:url(images/rssforward.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; - background-color:#D7D7D7; -} - - -/* New Styles */ - -.mnuTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#000000; - width:100%; - border:0px solid #000000; -} - -.mnuTab tr td{ - border-bottom:1px solid #EBEBEB; - padding-left:5px; - vertical-align:middle; -} - -/* profile */ - -.prvPrfBigText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; -} - -.prvPrfTopBg { - background-color:#ebebeb; -} - -.prvPrfBottomBg { - background-color:#ebebeb; -} - -.prvPrfOutline { - border:1px solid #ebebeb; -} - -.prvPrfTexture { - background:url(images/prvPrfTexture1.gif); - -} -.prvPrfHoverOn { - background-color:#ffffef; - -} - -/* Organization */ - -.orgTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - color:#666666; - border:0px solid #9B9B9B; - border-collapse:collapse; - width:100%; -} - -.orgTab tr th{ - text-align:left; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-decoration:none; - font-weight:bold; - height:20px; - padding-left:5px; -} - -.orgTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:none; - font-weight:normal; - padding-left:5px; - height:20px; - border-bottom:1px solid #CCCCCC; - border-right:1px solid #CCCCCC; -} - - -.groupli{ - margin-left:20px; - font-family:Arial, Helvetica, sans-serif; - font-weight:normal; - font-size:12px; - text-decoration:none; - color:#333333; - list-style-type:none; - text-align:left; -} - -/* tree menu */ - -/*Oraganization Edit Features */ - -#orgLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:500px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - display:block; - position:absolute; - left:0px; - top:0px; -} - -/* Role */ - -#roleLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - display:none; - position:absolute; -} - -.classBtn{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:10px; - background-color:#DBDBDB; - border-bottom:2px solid #999999; - border-right:2px solid #999999; - border-top:2px solid #F5F5F5; - border-left:2px solid #F5F5F5; - color:#000000; - text-align:center; - padding-top:3px; - padding-bottom:3px; -} - - -.txtBox{ - width:85%; - border:1px solid #666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; -} - -/* IMPORT LEADS */ - -.leadTable{ - border:3px solid #CCCCCC; - border-collapse:collapse; -} - -.leadTable tr td{ -/* border:0px solid #CCCCCC;*/ -} - -.genHeaderGray{ - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 16px; - color: #888888; - font-weight:bold; -} - -.genHeaderGrayBig{ - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - line-height: 16px; - color: #888888; - font-weight:bold; -} - -.importBox{ - width:125px; - border:1px solid #666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; -} - - -.txtGreen{ - color:green; -} - -/* PICK LIST */ -ul li{ - padding-bottom:2px; - padding-top:2px; -} -/* MY PREFERENCES */ - - -/* CSS FOR REPORTS */ - -.reportHdr{ - background-color:#DDDDDD; - font-size:12px; - font-weight:bold; - vertical-align:middle; - text-align:left; - height:30px; - border-bottom:2px solid #959595; - color:#000000; - padding-left:10px; -} - -#reportLay{ - width:175px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; - z-index:2000; -} - -#locateMap{ - width:120px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; - z-index:2000; -} - - -a.reportMnu{ - font-size:11px; - color:#0070BA; - text-decoration:none; - display:block; - width:155px; - height:20px; - border-bottom:1px solid #E1E1E1; - padding-left:20px; - padding-top:3px; -} - -a.reportMnu:Hover{ - font-size:11px; - color:#0070BA; - text-decoration:underline; - display:block; - width:155px; - height:20px; - border-bottom:1px solid #E1E1E1; - padding-left:20px; - padding-top:3px; -} - -#Generate{ - position:relative; - width:100%; - text-align:center; - display:none; -} -/* END OF REPORT */ -/* WEB MAIL */ -a.webMnu{ - font-size:11px; - color:#0070BA; - text-decoration:underline; -} -a.webMnu:Hover{ - font-size:11px; - color:#0070BA; - text-decoration:underline; -} - - -/* END OF WEB MAIL */ - -/* POPUP */ - - a.alpha{ - font-size:11px; - color:gray; - text-decoration:none; - padding-Left:5px; - padding-right:5px; - border:1px dotted #CCCCCC; - background-color:#FFFFCC; -} - -a.alpha:Hover{ - font-size:11px; - color:gray; - text-decoration:underline; - padding-Left:5px; - padding-right:5px; - border:1px dotted #CCCCCC; - background-color:#FFFFCC; -} - -/* Home Page */ -.MatrixLayer{ - border:2px solid #a5b5ee; - background-color:#FFFFFF; - width:29%; - position:relative; - visibility:visible; - margin:9px; - height:280px; -} - -.fontBold{ - font-size:13px; - color:#000000; - text-decoration:none; - font-weight:bold; -} - -.style_Gray{ - color:gray; -} - -/* End of Home Page */ - -/* All Menu */ -#allMenu{ - width:500px; - border:4px solid #a5b5ff; - left:300px; - top:100px; - position:absolute; - z-index:1000001; - display:none; - padding:10px; - background:#ffffff url(images/layerPopUpBg.gif); -} - - -.allMnuTable{ - width:100%; - background-color:#FFFFFF; -} - -.allMnuHandle td{ - height:20px; - color:#FFFFFF; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - text-decoration:none; - background-color:#000066; - cursor:move; - padding:2px; - border-bottom:2px solid #666666; -} - -.allMnuHdr{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-weight:Bold; - font-size:11px; - text-decoration:none; - display:block; - background-color:#FFFFFF; - color:#000099; - padding-top:5px; - padding-bottom:5px; -} - -a.allMnu{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:10px; - text-decoration:none; - font-weight:normal; - display:block; - width:125px; - height:15px; - padding-left:5px; - padding-top:0px; - padding-bottom:0px; - background-color:#FFFFFF; - border:1px solid #FFFFFF; - color:#000033; - margin-left:20px; -} - -a.allMnu:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:10px; - text-decoration:none; - font-weight:normal; - display:block; - width:125px; - height:15px; - padding-left:5px; - padding-top:0px; - padding-bottom:0px; - background-color:#eef; - color:#333; -} -/* End Of All Menu */ - - - -/* Calendar */ -.calHdr{ - background-image:url(images/mailSubHeaderBg.gif); - background-repeat:repeat-x; - background-position:left top; - -} - -.calSel{ - background-image:url(images/dashSelectBg.gif); - background-repeat:repeat-x; - text-align:center; - color:#FFFFFF; - font-weight:bold; - width:8%; -} - -.calAddButton { - border: 1px solid #A5B5EF; - background:#D6D2AB url(images/calAddButtonBg.gif) repeat-x; - cursor:pointer; - height:20px; - - -} - -.calInnerBorder { - border-left:2px solid #A5B5EE; - border-right:2px solid #A5B5EE; - border-bottom:2px solid #A5B5EE; -} - -.calBorder { - border-left: 1px solid #A5B5EE; - border-right: 1px solid #A5B5EE; - border-bottom: 1px solid #A5B5EE; - background:#fefefe url(images/layerPopupBg.gif); - -} -.calTopRight { - border-right: 1px solid #A5B5EE; -} -.calUnSel{ - color:#000000; - font-weight:normal; - text-align:center; - width:8%; -} - - -a.calMnu{ - font-size:11px; - color:#0070BA; - text-decoration:none; - display:block; - height:20px; - padding-left:5px; - padding-top:3px; -} - -a.calMnu:Hover{ - font-size:11px; - color:#0070BA; - text-decoration:underline; - display:block; - height:20px; - padding-left:5px; - padding-top:3px; -} - -.bgwhite{ - background-color: #FFFFFF; -} -.copy{ - font-size:9px; - font-family: Verdana, Arial, Helvetica, Sans-serif; -} - -#mnuTab{ - position:relative; - width:100%; - display:block; -} - -#mnuTab2{ - position:relative; - overflow:auto; - width:100%; - display:none; -} -.style1 {color: #FF0000} - - -.event{ - background-color:#D3EAF0; - border:1px solid #999999; - text-align:left; - width:100%; - position:relative; - left:0px; - top:0px; - vertical-align:middle; - padding:1px; -} - -#hrView{ - display:block; -} - - -.calendarNav{ - font-size:12px; - color:#FFFFFF; - white-space:nowrap; - text-align:center; - font-weight:bold; - padding-left:10px; - padding-right:10px; - background-image:url(images/cal_nav.gif); - background-repeat:repeat-x; -} - -#addEventDropDown{ - position:absolute; - display:none; - width:150px; - border:1px solid #666666; - left:0px; - top:0px; - overflow:visible; - z-index:5000; -} - -.calAction{ - width:175px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; - z-index:2000; -} - -.calSettings{ - position:absolute; - z-index:20000; - width:500px; - left:200px; - top:150px; - background-color:#ffffff; -} - - -.outer{ - border-bottom:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - border-right:1px solid #CCCCCC; -} - - -.calTxt{ - width:50%; - border:1px solid #CCCCCC; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - padding-left:5px; -} - -#leadLay{ - position:relative; - width:100%; - float:left; - visibility:hidden; - padding:5px; - z-index:10000; -} - -/* End of Calendar */ - -/* Cal Year View */ -.eventDay{ - background-color:#FF9966; - font-weight:bold; -} - -.currDay{ - background-color:#006600; - font-weight:bold; - text-decoration:underline; -} - -.currDay a{ - color:#FFFFFF; - font-weight:bold; - text-decoration:underline; -} - - -/* End of Cal Year View */ - -/* Level 2 Menu Selected*/ - -level2Sel{ - color:#000000; - font-weight:bold; - text-decoration:underline; -} - -#DeleteLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; -} - -#CurrencyDeleteLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:350px; -} - - -/* For Report HTML Generation*/ -.rptCellLabel { - background-color:#f6f6f6; - padding-right:10px; - border-right: 1px solid #DDDDDD; - border-bottom:1px solid #eaeaea; - color:#737373; - font-weight: bold; - white-space:nowrap; -} -.rptTable { - border-left: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; - border-top: 1px solid #DDDDDD; -} -.rptTitle, .rptHead, .rptData, .rptGrpHead{ - font-family: Verdana, Arial, Helvetica, Sans-serif; - font-size: 11px; - text-align:left; - font-weight: normal; - height: 20px; - padding: 4px; - border-right: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; - background: #DDDDDD; -} -.rptGrp1Total, .rptGrp2Total, .rptTotal { - font-family: Verdana, Arial, Helvetica, Sans-serif; - font-size: 11px; - text-align:center; - font-weight: normal; - background: #FFF; - height: 20px; - padding: 4px; - border-right: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; -} -.rptGrpHead { - background: #FFF; - border-bottom: 1px solid #FFF; - border-top: 1px solid #DDDDDD; - font-weight: normal; -} - -.rptData { - background: #FFF; - font-weight: normal; -} -.rptEmptyGrp { - background: #FFF; - border-right: 1px solid #DDDDDD; -} -.statechange -{ - position:absolute; - visibility:hidden; - left:10px; - top:20px; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; -} -#PopupLay{ - position:absolute; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:500px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; - display:none; - left:100px; - top:100px; -} - -#folderLay{ - width:175px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; -} - -/* Css for quick Create */ - -.qcTransport{ - background-color:#d5d6ff; - -} - -#role_popup{ - position:relative; - left:0px; - top:0px; - width:95%; - height:300px; - overflow:auto; - border:1px solid #999999; - text-align:left; - background-color:#FFFFFF; - } - -.unread_email { - font-weight:bold; -} - - -/* MY SITES */ - -.unread_email { - font-weight:bold; -} - - -.tagCloud { - border:1px solid #aaf; -} - - -.tagCloudTopBg { - background: url(images/tagCloudBg.gif) repeat-x; - -} - -.tagCloudDisplay { - background-color:#fff; - padding:10px; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 14px; - color: #000000; - -} - -.h2 { - - font-size:18px; - line-height:20px; - -} - -.gray { - - color:gray; -} - - -ul { - list-style:circle; - line-height:20px; - padding-left:5px; - margin-left:20px; - font-weight:normal; - -} -.tagCloudTopBg { - background-image: url(images/tagCloudBg.gif); - background-repeat: repeat-x; -} - -.tagCloudDisplay { - background-color:#fff; - padding:5px; -} -.heading2 { - font-family: Arial, Helvetica, sans-serif; - font-size: 16px; - line-height: 16px; - font-weight:bold; - color: #000000; -} -.settingsUI { - - text-align:left; - background-color:#fff; - background-image:url(images/layerPopupBg.gif); - border:2px solid #aaaaff; -} - -.settingsTabHeader { - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height:22px; - font-weight:bold; - color:#ddf; - /* background-image: url(images/mailSubHeaderBg.gif); */ - background-color:#222299; - background-repeat: repeat-x; - padding-left:10px; - padding-right:10px; - -} - -.settingsTabList { - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:20px; - font-weight:normal; - color:#000000; - background-color:#efefff; - padding-left:30px; - border-top:1px solid #fff; - border-bottom:1px solid #99a; - border-right:1px solid #99a; - border-left:1px solid #fff; -} -.settingsTabSelected { - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:20px; - font-weight:bold; - color:#000000; - background-color:#ffffff; - padding-left:30px; - border-left:2px solid #ddf; - border-bottom:2px solid #ddf; - border-top:2px solid #ddf; -} -.settingsSelectedUI { - padding:10px; - background:url(images/settingsSelUIBg.gif) repeat-x; - background-color:#ffffff; -} -.settingsIconDisplay { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:14px; - padding:10px; - - color:#000000; - background-color:#ffffff; - padding-left:10px; -} -.settingsSelUITopLine{ - border-bottom:2px dotted #999999; - -} - -.tableHeading{ - background-color:#ffffff; - border-bottom:2px solid #555599; -} -.colHeader{ - background-color:#ddf; - border-left:1px solid #fff; - border-top:1px solid #fff; - border-right:1px solid #aaf; - border-bottom:1px solid #aaf; - font-weight:bold; - -} -.cellLabel { - background-color:#eaebd9; - border-top:1px solid #efefef; - border-bottom:1px solid #dadada; - color:#555555; - -} -.cellText { - color:#333333; - border-bottom:1px solid #dadada; -} - -.listTable{ - border-left:1px solid #cccccc; - border-right:1px solid #cccccc; - border-bottom:1px solid #cccccc; - -} - -.listTableRow{ - border-bottom:1px solid #eaeaea; - border-right :1px solid #eaeaea; - border-bottom:1px solid #eaeaea; - border-bottom:1px solid #eaeaea; -} -.listRow{ - border-bottom:2px solid #eaeaea; - -} - -.listTableTopButtons{ - background-color:#efefff; - background-image:url(images/layerPopupBg.gif); - -} - - -/* Buttons */ -.crmButton{ - - border-left:1px solid #ffffff; - border-top:1px solid #ffffff; - border-right:1px solid #555555; - border-bottom:1px solid #555555; -} - -.create{ - background-color:#0000CD; - color:#fff; - font-weight:bold; -} -.delete { - background-color:#C6E2FF; - color:#000; - font-weight:bold; -} -.edit { - background-color:#0000CD; - color:#fff; - font-weight:bold; -} -.save{ - background-color:#0000CD; - color:#fff; - font-weight:bold; -} -.cancel { - background-color:#C6E2FF; - color:#000; - font-weight:bold; -} - -.inactive{ -color:#999999; -} - -.active{ -color:#229922; - -} - -/* Buttons ends */ - - - -textarea { - width:95%; - height:70px; - border:1px solid #dadada; -} -.treeTable1{ - padding:0px; -} - -.prvPrfBigText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; -} - -.prvPrfTopBg { - background-color:#ebebeb; -} - -.prvPrfBottomBg { - background-color:#ebebeb; -} - -.prvPrfOutline { - border:1px solid #ebebeb; -} - - - -.prvPrfTexture { - background:url(images/prvPrfTexture1.gif); - -} - -.prvPrfHoverOn { - background-color:#ffffef; - -} - -.cellBottomDotLine { - border-bottom-width: 2px; - border-bottom-style: dotted; - border-bottom-color: #CCCCCC; - background-color:#ededed; -} -.crmFormList{ - border:1px solid #cccccc; - width:90%; - height:120px; - -} -.cellBottomDotLinePlain { - border-bottom-width: 2px; - border-bottom-style: dotted; - border-bottom-color: #CCCCCC; - -} -.thickBorder { - border: 2px solid #999999; -} -.trackerHeading { - background-color:#efefef; -} -.trackerListBullet { - border-right:1px dotted #cccccc; - background-color:#f9f9f9; -} -.trackerList { - border-bottom:1px solid #eeeeee; -} - -/* Table Definitions */ -.crmTable { - border:1px solid #dadada; -} -.crmTableRow { - border-bottom:1px dotted #dadada; - border-right:1px dotted #dadada -} -/* Inventory */ - -.lineOnTop { - border-top:1px solid #999999; -} - -.discountUI{ - border:3px solid #CCCCCC; - width:250px; - padding:5px; - position:absolute; - background-color:#FFFFFF; - display:none; -} - -.TaxShow{ - display:inline-table; -} - -.TaxHide{ - display:none; -} - -/* Inventory */ - - - - - -/* styles for RSS Display starts */ -/*.rssDisplay{ - background-color:#e8e3ca; -}*/ - - -/* styles for RSS Display ends */ - - - - - - - - -/* Email Client Classes ++++++++++++++++++++++ */ - -.emailSelected{ - background-color:#eaeaea; - color:#000000; - font-size:bold; -} - - -.mailClient{ - border:2px solid #6565ee; -} - -.mailClientBg { - background-color:#efefff; - background-image:url(images/layerPopupBg.gif); -} - -.mailSubHeader { - background:#b4b8ff url(images/mailSubHeaderBg.gif) repeat-x; - padding:4px; -} - -.mailClientWriteEmailHeader { - font-family:arial, helvetica, sans-serif; - font-size:20px; - line-height:24px; - font-weight:bold; - background:#e0dbb0 url(images/mailSubHeaderBg.gif) repeat-x; - padding:10px; - border-left:1px solid #eaeaea; - border-top:1px solid #eaeaea; - border-right:1px solid #939271; - border-left:1px solid #939271;; -} - -.mailClientCSSButton { - border-left:1px solid #fff; - border-top:1px solid #fff; - border-right:1px solid #333; - border-bottom:1px solid #333; - padding:2px; - background-color:#c3c2b1; -} - -/* Email Client Classes ends ------------------------------------ */ - - - -/* Layer Popup */ -.layerPopup { - border:3px solid #95a5ff; - background:#fffff5 url(images/layerPopupBg.gif) ; - position:absolute; -} - -.layerPopupHeading { - font-family:arial, helvetica, sans-serif; - font-size:16px; - line-height:24px; - font-weight:bold; -} -.layerHeadingULine { - border-bottom:2px solid #717351; -} -.layerPopupTransport { - background-color:#e2e5ff; - -} -.homePageSeperator { - border-right:1px dotted #d3d2c1; -} -.homePageMatrixHdr { - border-bottom:1px solid #d3d2c1; - background:#fffff5 url(images/layerPopupBg.gif) ; -} - -.reportsListTable { - background-color:white; - border-left:1px solid #a3a29f; - border-right:1px solid #a3a29f; - border-bottom:1px solid #a3a29f; -} - -.reportGenerateTable{ - background-image:url(images/layerPopupBg.gif); - border-left:2px dotted #a5b5ee; - border-right:2px dotted #a5b5ee; - border-bottom:2px dotted #a5b5ee; -} -.reportCreateBottom{ - background-color:#ddf; - border-bottom:2px solid #737251; - -} -.importLeadUI{ - /*background:#fffff5 url(images/select.gif) ; */ - background-color:white; -} - -a.customMnu{ - padding-left:30px; - padding-top:5px; - padding-bottom:5px; - display:block; - background-repeat:no-repeat; - background-position:left; - width:155px; - color:#000000; - text-decoration:none; -} - -a.customMnuSelected{ - padding-left:30px; - padding-top:5px; - padding-bottom:5px; - display:block; - background-repeat:no-repeat; - background-position:left; - width:155px; - background-color:#0099FF; - color:#FFFFFF; - text-decoration:none; -} - - -/* Drop Down Menu */ -.drop_mnu{ - position:absolute; - left:0px; - top:0px; - z-index:1000000001; - border-left:1px solid #a5b5ee; - border-right:1px solid #a5b5ee; - border-bottom:1px solid #a5b5ee; - width:150px; - display:none; - padding:0px; - text-align:left; - overflow-x:hidden; - overflow-y:hidden; - background-color:#eef; -} - -a.drop_down{ - width:150px; - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:20px; - font-weight:normal; - color:#33a; - background-color:#eef; - padding:2px 5px 2px 5px; - border-top:1px solid #fafafa; - border-bottom:1px solid #d3d3f3; - display:block; -} - -a.drop_down:Hover{ - padding:2px 5px 2px 5px; - width:150px; - text-align:left; - color:#33a; - font-weight:normal; - text-decoration:underline; - background-color:#ccf; -} - -.bgwhite{ - background-color:white; -} - -.searchUIBasic { - background-image:url(images/layerPopupBg.gif); - border:2px solid #a5b5ee; -} -.searchUIAdv1{ - background-image:url(images/layerPopupBg.gif); - border-top:2px solid #a5b5ee; - border-left:2px solid #a5b5ee; - border-right:2px solid #a5b5ee; -} -.searchUIAdv2{ - background-image:url(images/layerPopupBg.gif); - border-left:2px solid #a5b5ee; - border-right:2px solid #a5b5ee; -} -.searchUIAdv3{ - background-image:url(images/layerPopupBg.gif); - border-bottom:2px solid #a5b5ee; - border-left:2px solid #a5b5ee; - border-right:2px solid #a5b5ee; -} - -/* Recalculate Disabling Window */ - -.veil{ - background: url(images/layerPopupBg.gif) ; - height: 100%; - width: 100%; - top: 0px; - left: 0px; - overflow: hidden; - z-index: 10000; - Filter: Alpha(opacity = 70); - -moz-opacity: 0.7; - text-align: center; - vertical-align: middle; - position: absolute; -} - -.veil_new{ - background: url(images/layerPopupBg.gif) ; - height: 100%; - width: 100%; - top: 0px; - left: 0px; - overflow: hidden; - z-index: 50000; - Filter: Alpha(opacity = 70); - -moz-opacity: 0.7; - text-align: center; - vertical-align: middle; - position: absolute; -} - -.optioncontainer{ - vertical-align: middle; - height: 100%; - width: 100%; - position: absolute; - z-index: 90000; -} - - -.options{ - vertical-align: middle; - margin-left: 25%; - margin-top: 16%; - color: #FFFFFF; - width:650px; - background-color: Black; - border: 2px solid #222; - position: relative; - text-align: left; - z-index: 80000; -} - -.options h2{ - color: White; - font-family: Verdana, Arial, Helvetica, sans-serif; - border-bottom: 1px solid #373D4C; - margin: 0; - font-weight: normal; -} - -/* Recalculate Disable Ends */ - +/********************************************************************************* + +** The contents of this file are subject to the vtiger CRM Public License Version 1.0 + * ("License"); You may not use this file except in compliance with the License + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + ********************************************************************************/ + + +/* WOOD SPICE - COLOR THEME*/ + +.small { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; +} +.big { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height: 18px; + color: #000000; + font-weight:bold; +} + +.componentName { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + line-height: 18px; + color: #3333ff; + font-weight:bold; + border-left:2px dotted #fff; + padding:10px; +} + + +.genHeaderBig{ + font-family: Arial, Helvetica, sans-serif; + font-size: 16px; + line-height: 19px; + color: #000000; + font-weight:bold; +} +.genHeaderSmall{ + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + line-height: 16px; + color: #000000; + font-weight:bold; +} + +.moduleName { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + color: #000033; + font-weight:bold; +} + + +.hdrNameBg { + background:#ffffff url(images/hdrNameBg.gif) repeat-x; + + +} + +.hdrTabBg { + background:#ffffff url(images/hdrTabBg.gif) bottom repeat-x ; + background-color:#fff; +} + +.tabSelected { + background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; + background-color:#1F5EFF; + font-family: Arial, Helvetica, sans-serif; + font-weight:bold; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + +} + +.tabSelected a{ + color:white; +} + +.tabUnSelected { + + background: #efedd4 url(images/tabUnSelectedBg.gif) bottom repeat-x; + background-color:#AFDBFF; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + border-bottom:1px solid #ffffff; +} + +.tabUnSelected a{ + color:#000099; +} + +.tabSeperator { + background-color:#aae; + width:1px; +} + + + +.level2text { + + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding-left:15px; + padding-right:15px; + padding-top:5px; + padding-bottom:5px; + font-weight:bold; + color:white; +} + +.level2text a{ + text-decoration:none; + color:#555555; +} + +.level2text a:hover { + text-decoration:underline; + color:#555555; + +} + + +.level2Bg { + background:#1F5BFF url(images/level2TabBg.gif) bottom repeat-x; + background-color:#1F5BFF; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + border-bottom:1px solid #222255; + color:white; +} + +.level2Bg a{ + /* background:#1F5BFF url(images/level2TabBg.gif) bottom repeat-x; */ + color:white; +} + + +.level2SelTab{ + font-weight:bold; + color:#000000; + padding-left:20px; + padding-right:20px; + padding-top:5px; + padding-bottom:5px; + +} + +.level2UnSelTab{ + color:#000000; + padding-left:20px; + padding-right:20px; + padding-top:5px; + padding-bottom:5px; +} +.sep1 { + background:#999999; +} + +.showPanelBg { + background:url(images/showPanelTopBg.gif) repeat-x; +} + +a { + text-decoration:none; + color:#3344bb; +} + +a:hover { + text-decoration:underline; +} + +.hdrLink { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + text-decoration:none; + color:#0000cc; + font-weight:bold; +} + +.hdrLink:hover { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + text-decoration:underline; + color:#0000cc; + font-weight:bold; +} + +.searchBox { + border: 0px solid #0000aa; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding-left:2px; + width:100px; + background-color:#ffffef; +} + +.searchBtn { + border :0px #cccccc solid; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + font-weight:bold; + width:30px; + height:19px; + background-color:#009; + color:white; +} + + +/* List View Table classes starts +++++++++++++++++ */ + +.lvt { + background-color:#ddf; + border:1px solid #cce; +} + +.lvtBg { +} + +.lvtHeaderText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + font-weight:bold; +} + +.lvtCol { + border-top:1px solid #eeeeff; + border-left:1px solid #eeeeff; + border-right:1px solid #9999dd; + border-bottom:1px solid #9999dd; + background-color:#eef; + font-weight:bold; +} + +.lvtColData { + background-color:#ffffff; +} + +.lvtColDataHover { + background-color:#eeefff; + +} + + +/* List View Table classes ends --------------------------------*/ + + + +/* Detailed View classes starts +++++++++++++++++++++++ */ +.dvHeaderText{ + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + color:#000000; + font-weight:bold; + +} + +.dvInnerHeader{ + border-bottom:2px solid #4F94CD; + padding:5px; + background-color:#afdbff; + +} + +.dvtSelectedCell { + border-left:2px solid #00BFFF; + border-top:2px solid #00BFFF; + border-right:2px solid #00BFFF; + padding-left:20px; + padding-right:20px; + background-color:white; + font-weight:bold; +} + +.dvtUnSelectedCell { + border-left:2px solid #00BFFF; + border-top:2px solid #00BFFF; + border-right:2px solid #00BFFF; + border-bottom:2px solid #00BFFF; + padding-left:20px; + padding-right:20px; + background-color:#ffffee; + cursor:pointer; +} + +.dvtTabCache { + border-bottom:2px solid #00BFFF; +} + +.dvtContentSpace { + border-left:2px solid #00BFFF; + border-right:2px solid #00BFFF; + border-bottom:2px solid #00BFFF; + padding-left:0px; +} + +.dvtCellLabel, .cellLabel { + background-color:#f5f5ff; + padding-right:10px; + padding-left:10px; + border-bottom:1px solid #dadaee ; + border-top:1px solid #ffffff ; + color:#545454; + white-space:nowrap; +} + +.dvtCellInfo, .cellInfo { + padding-left:10px; + padding-right:10px; + border-bottom:1px solid #efefef; +} + +.rightMailMerge { + border:2px solid #aae; +} + +.rightMailMergeHeader { + border-bottom:1px solid #dde; + padding:5px; + background-color:#eef; + +} + +.rightMailMergeContent { + padding:5px; + background-color:#fafafa; + +} + +.detailedViewHeader{ + border-bottom:2px solid #4F94CD; + padding:5px; + background-color:#afdbff; +} + +.detailedViewTextBox { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:90%; + background-color:#ffffff; +} + +.detailedViewTextBoxOn { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:90%; + background-color:#ffffdd; +} + +.detailedViewTextBoxDis { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #555555; + border:1px solid #bababa; + padding-left:5px; + width:90%; + background-color:#aaaaaa; +} + +.detailedViewTextArea { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:95%; + height:100px; + background-color:#ffffff; + text-align:left; +} + +.advSearch { + padding:10px; + border-left:1px solid #eaeaea; + border-right:1px solid #eaeaea; + border-bottom:1px solid #eaeaea; + overflow:auto; + width:600px; + height:150px; + background-color:#ffffef; + +} + +.searchAlph { + border:1px solid #dadada; + background-color:#ffffff; + cursor:pointer; + width:10px + +} +.searchAlphselected { + border:1px solid #666666; + background-color:#bbbbbb; + cursor:pointer; + width:10px + +} +.textbox { + border:1px solid #999999; + background-color:#ffffff; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + width:120px; + padding:2px; + +} + + +.mx { +} + +.calListTable td{ + border-bottom:1px solid #efefef; + border-left:1px solid #efefef; +} +.calDIV { + width:100%; + border:1px solid #999999; + +} + +.calDayHour { + border-top:1px solid #c5d5ff; + border-left:1px solid #c5d5ff; + border-bottom:1px solid #c5d5ff; + border-right:1px solid #c5d5ff; + background-color:#eae7da; +} + +.calAddEvent { + position:absolute; + z-index:10000; + width:500px; + left:200px; + top:150px; + background-color:#ffffff; +} +.addEventInnerBox { + border:1px dotted #dadada; + +} + + +.cellNormal { + border:0px; + background-color:#ffffff; +} + + +.thumbnail{ + background-color:#ffffff; +padding: 7px; +border: 1px solid #ddd; +float: left; + margin-right: 10px; + margin-bottom: 15px; +} + + +.padTab{ + padding-top:0px; + padding-left:0px; + padding-left:10px; + padding-bottom:0px; + vertical-align:top; + +} +#company{ + position:relative; + width:100%; + height:200px; + display:block; + background-color:#FFFFFF; + white-space:nowrap; + overflow:auto; + border:1px solid #CCCCCC; +} + + +#user{position:relative;left:0px;top:0px;width:100%;display:block;} +/*#studio{position:relative;left:0px;top:0px;width:100%;display:block;}*/ +#communication{position:relative;left:0px;top:0px;width:100%;display:block;} +#config{position:relative;left:0px;top:0px;width:100%;display:block;} + +#userTab{position:relative;left:0px;top:0px;width:100%;display:none;} +#one{ + position:relative; + display:block; + width:245px; +} + +#mnuTab1{ + + position:relative; + + overflow:auto; + + width:100%; + + display:none; + +} + +#mnuTab2{ + + position:relative; + + overflow:auto; + + width:100%; + + display:none; + +} + + +/* End of Settings */ + +.bgwhite{ + background-color: #FFFFFF; +} +.copy{ + font-size:9px; + font-family: Verdana, Arial, Helvetica, Sans-serif; +} + +#basicTab{ + position:relative; + overflow:auto; + width:100%; + display:block; +} + +#moreTab{ + position:relative; + overflow:auto; + width:100%; + display:none; +} + +/*Added for Advance Seearch*/ + + +#one{ + position:relative; + display:block; + width:245px; +} + +/* Dashboard CSS */ +a.dash_href{ + display:block; + width:24px;height:24px; + vertical-align:middle; + margin-top:10px; +} +.dashHeading { + font-family:Arial, Helvetica, sans-serif; + font-size:24px; + font-weight:bold; + color:#fff; +} +.dashSelectBg{ + background-image:url(images/dashSelectBg.gif); + background-repeat:repeat-x; +} +.dash_top{ + background-image:url(images/dashTopBg.gif); + background-repeat:repeat-x; + height:63px; + vertical-align:middle; +} + +.dash_border{ + background-color:#738bff; + padding:5px; +} + + +.dash_white{ + background-color:#FFFFFF; + padding:5px 10px 5px 10px; +} + +.dash_bdr_btm{ + border-bottom:2px dotted #939271; +} + +.dash_count{ + font-size:36px; + font-weight:bold; + text-decoration:none; + color:#000000; + padding-left:10px;padding-right:10px; +} +.dash_switch{ + cursor:pointer; + width:26px; + height:26px; +} + +.dash_row_sel{ + background-image:url(images/dash_sel_chart.jpg); + background-repeat:no-repeat; + background-position:center; + width:26px;height:26px; + text-align:center; + vertical-align:middle; + font-weight:bold; + font-size:10px; + text-decoration:none; +} + +.dash_row_unsel{ + background-image:url(images/dash_unsel_chart.jpg); + background-repeat:no-repeat; + background-position:center; + width:26px;height:26px; + text-align:center; + vertical-align:middle; + font-weight:normal; + font-size:10px; + text-decoration:none; + cursor:pointer; +} + +.dash_chart_btm{ + border-bottom:2px solid #000000; +} + + +.dash_bottom{ + background-image:url(images/dashBottomBg.gif); + background-repeat:repeat-x; + height:99px; + vertical-align:middle; +} + +.dash_btm{ + background-image:url(images/dash_btm_center.jpg); + background-repeat:repeat-x; + position:top; +} + + +/* clock */ + +.citystyle{ + position:relative; + top:0px; + left:0px; + text-align:left; + +} +#theClockLayer{ + position:relative; + height:180px; + left:20px; + text-align:center; +} +.handsanddotsstyle{ + margin-top:10px; + position:absolute; + top:0px; + left:0px; + width:2px; + height:2px; + font-size:2px; + background-color:#000000; +} +.facestyle{ + margin-top:10px; + position:absolute; + top:0px; + left:0px; + width:15px; + height:15px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} +.datestyle{ + margin-top:20px; + position:absolute; + top:0px; + left:0px; + width:100px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} +.ampmstyle{ + margin-top:23px; + position:absolute; + top:0px; + left:0px; + width:20px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} + +#wclock{ + position:absolute; + left:100px; + top:100px; + display:none; + background-color:#CCCCCC; + width:175px; +} + +.leftFormBorder1 { + border: 1px solid #AFC8E4; + background-color: #FFFFFF; + opacity:.7; +} + + + + +/* Calculator */ +.calcResult { + width: 100%; + height: 25px; + background-color: #FFFFCC;/*CBDFD6*/ + border-top: 1px solid #CCC; + border-left: 0px; + border-right: 1px solid #CCC; + border-bottom: 1px solid #CCC; + font-size: 10px; + text-align: right; +} +.calcMem { + width: 100%; + height: 25px; + border-top: 1px solid #CCC; + border-left: 1px solid #CCC; + border-right: 0px; + border-bottom: 1px solid #CCC; + background-color: #FFFFCC;/*CBDFD6*/ + font-family: Arial; + font-size: 10px; + color: #BBB; + text-align: left; +} +.calcBlackBtn, .calcGreyBtn, .calcBigBtn, .calcCancBtn, .calcMemBtn, .calcBackBtn { + border: none; + height: 20px; + font-size: 11px; + color: #FFF; + text-align:center; +} +.calcBackBtn { + background: url(images/calc_back_btn.gif) no-repeat; + width:25px; +} +.calcBlackBtn { + background: url(images/calc_black_btn.gif) no-repeat; + width:25px; +} +.calcGreyBtn { + background: url(images/calc_grey_btn.gif) no-repeat; + width:25px; +} +.calcCancBtn { + background: url(images/calc_canc_btn.gif) no-repeat; + width:25px; + +} +.calcMemBtn { + background: url(images/calc_mem_btn.gif) no-repeat; + width:25px; + /*background-color: #CCC;*/ +} + +#calc{ + position:absolute; + left:100px; + top:100px; + background-color:#FFFFFF; + width:185px; + border-bottom:2px solid #000000; + border-right:2px solid #666666; + border-left:2px solid #CCCCCC; + border-top:2px solid #CCCCCC; +} + +/* RSS STYLES */ + +.subHdr{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#FFFFFF; + background-image:url(images/rssHeader.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; +} + +.delBg{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#FFFFFF; + background-image:url(images/rssdelete.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; +} + +#rssScroll{ + font-family:Arial, Helvetica, sans-serif ; + font-size:12px; + background-color:#FFFFFF; + width:100%; + height:200px; + overflow:auto; + border:0px solid #000000; +} + +.rssTable{ + width:100%; + border:0px solid #CCCCCC; +} + +.rssTable tr th{ + background-color:#00BFFF; + text-align:left; + border-bottom:1px solid #99F; + border-top:1px solid #FFFFFF; + color:#000000; + padding-left:5px; + padding-right:5px; + height:20px; +} + +.rssTable tr td{ + text-align:left; + border-bottom:1px dotted #dadada; + border-left:1px dotted #dadada; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + font-weight:normal; + white-space:nowrap; + padding:2px; + +} + + +.forwardBg{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#000000; + background-image:url(images/rssforward.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; + background-color:#D7D7D7; +} + + +/* New Styles */ + +.mnuTab{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:12px; + color:#000000; + width:100%; + border:0px solid #000000; +} + +.mnuTab tr td{ + border-bottom:1px solid #EBEBEB; + padding-left:5px; + vertical-align:middle; +} + +/* profile */ + +.prvPrfBigText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; +} + +.prvPrfTopBg { + background-color:#ebebeb; +} + +.prvPrfBottomBg { + background-color:#ebebeb; +} + +.prvPrfOutline { + border:1px solid #ebebeb; +} + +.prvPrfTexture { + background:url(images/prvPrfTexture1.gif); + +} +.prvPrfHoverOn { + background-color:#ffffef; + +} + +/* Organization */ + +.orgTab{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + font-weight:normal; + color:#666666; + border:0px solid #9B9B9B; + border-collapse:collapse; + width:100%; +} + +.orgTab tr th{ + text-align:left; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + text-decoration:none; + font-weight:bold; + height:20px; + padding-left:5px; +} + +.orgTab tr td{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-decoration:none; + font-weight:normal; + padding-left:5px; + height:20px; + border-bottom:1px solid #CCCCCC; + border-right:1px solid #CCCCCC; +} + + +.groupli{ + margin-left:20px; + font-family:Arial, Helvetica, sans-serif; + font-weight:normal; + font-size:12px; + text-decoration:none; + color:#333333; + list-style-type:none; + text-align:left; +} + +/* tree menu */ + +/*Oraganization Edit Features */ + +#orgLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:500px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + display:block; + position:absolute; + left:0px; + top:0px; +} + +/* Role */ + +#roleLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + display:none; + position:absolute; +} + +.classBtn{ + font-family:Verdana, Arial, Helvetica, sans-serif; + text-decoration:none; + font-weight:normal; + font-size:10px; + background-color:#DBDBDB; + border-bottom:2px solid #999999; + border-right:2px solid #999999; + border-top:2px solid #F5F5F5; + border-left:2px solid #F5F5F5; + color:#000000; + text-align:center; + padding-top:3px; + padding-bottom:3px; +} + + +.txtBox{ + width:85%; + border:1px solid #666666; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; +} + +/* IMPORT LEADS */ + +.leadTable{ + border:3px solid #CCCCCC; + border-collapse:collapse; +} + +.leadTable tr td{ +/* border:0px solid #CCCCCC;*/ +} + +.genHeaderGray{ + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + line-height: 16px; + color: #888888; + font-weight:bold; +} + +.genHeaderGrayBig{ + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + line-height: 16px; + color: #888888; + font-weight:bold; +} + +.importBox{ + width:125px; + border:1px solid #666666; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; +} + + +.txtGreen{ + color:green; +} + +/* PICK LIST */ +ul li{ + padding-bottom:2px; + padding-top:2px; +} +/* MY PREFERENCES */ + + +/* CSS FOR REPORTS */ + +.reportHdr{ + background-color:#DDDDDD; + font-size:12px; + font-weight:bold; + vertical-align:middle; + text-align:left; + height:30px; + border-bottom:2px solid #959595; + color:#000000; + padding-left:10px; +} + +#reportLay{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; + z-index:2000; +} + +#locateMap{ + width:120px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; + z-index:2000; +} + + +a.reportMnu{ + font-size:11px; + color:#0070BA; + text-decoration:none; + display:block; + width:155px; + height:20px; + border-bottom:1px solid #E1E1E1; + padding-left:20px; + padding-top:3px; +} + +a.reportMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; + display:block; + width:155px; + height:20px; + border-bottom:1px solid #E1E1E1; + padding-left:20px; + padding-top:3px; +} + +#Generate{ + position:relative; + width:100%; + text-align:center; + display:none; +} +/* END OF REPORT */ +/* WEB MAIL */ +a.webMnu{ + font-size:11px; + color:#0070BA; + text-decoration:underline; +} +a.webMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; +} + + +/* END OF WEB MAIL */ + +/* POPUP */ + + a.alpha{ + font-size:11px; + color:gray; + text-decoration:none; + padding-Left:5px; + padding-right:5px; + border:1px dotted #CCCCCC; + background-color:#FFFFCC; +} + +a.alpha:Hover{ + font-size:11px; + color:gray; + text-decoration:underline; + padding-Left:5px; + padding-right:5px; + border:1px dotted #CCCCCC; + background-color:#FFFFCC; +} + +/* Home Page */ +.MatrixLayer{ + border:2px solid #a5b5ee; + background-color:#FFFFFF; + width:29%; + position:relative; + visibility:visible; + margin:9px; + height:280px; +} + +.fontBold{ + font-size:13px; + color:#000000; + text-decoration:none; + font-weight:bold; +} + +.style_Gray{ + color:gray; +} + +/* End of Home Page */ + +/* All Menu */ +#allMenu{ + width:500px; + border:4px solid #a5b5ff; + left:300px; + top:100px; + position:absolute; + z-index:1000001; + display:none; + padding:10px; + background:#ffffff url(images/layerPopUpBg.gif); +} + + +.allMnuTable{ + width:100%; + background-color:#FFFFFF; +} + +.allMnuHandle td{ + height:20px; + color:#FFFFFF; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + font-weight:bold; + text-decoration:none; + background-color:#000066; + cursor:move; + padding:2px; + border-bottom:2px solid #666666; +} + +.allMnuHdr{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-weight:Bold; + font-size:11px; + text-decoration:none; + display:block; + background-color:#FFFFFF; + color:#000099; + padding-top:5px; + padding-bottom:5px; +} + +a.allMnu{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:10px; + text-decoration:none; + font-weight:normal; + display:block; + width:125px; + height:15px; + padding-left:5px; + padding-top:0px; + padding-bottom:0px; + background-color:#FFFFFF; + border:1px solid #FFFFFF; + color:#000033; + margin-left:20px; +} + +a.allMnu:Hover{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:10px; + text-decoration:none; + font-weight:normal; + display:block; + width:125px; + height:15px; + padding-left:5px; + padding-top:0px; + padding-bottom:0px; + background-color:#eef; + color:#333; +} +/* End Of All Menu */ + + + +/* Calendar */ +.calHdr{ + background-image:url(images/mailSubHeaderBg.gif); + background-repeat:repeat-x; + background-position:left top; + +} + +.calSel{ + background-image:url(images/dashSelectBg.gif); + background-repeat:repeat-x; + text-align:center; + color:#FFFFFF; + font-weight:bold; + width:8%; +} + +.calAddButton { + border: 1px solid #A5B5EF; + background:#D6D2AB url(images/calAddButtonBg.gif) repeat-x; + cursor:pointer; + height:20px; + + +} + +.calInnerBorder { + border-left:2px solid #A5B5EE; + border-right:2px solid #A5B5EE; + border-bottom:2px solid #A5B5EE; +} + +.calBorder { + border-left: 1px solid #A5B5EE; + border-right: 1px solid #A5B5EE; + border-bottom: 1px solid #A5B5EE; + background:#fefefe url(images/layerPopupBg.gif); + +} +.calTopRight { + border-right: 1px solid #A5B5EE; +} +.calUnSel{ + color:#000000; + font-weight:normal; + text-align:center; + width:8%; +} + + +a.calMnu{ + font-size:11px; + color:#0070BA; + text-decoration:none; + display:block; + height:20px; + padding-left:5px; + padding-top:3px; +} + +a.calMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; + display:block; + height:20px; + padding-left:5px; + padding-top:3px; +} + +.bgwhite{ + background-color: #FFFFFF; +} +.copy{ + font-size:9px; + font-family: Verdana, Arial, Helvetica, Sans-serif; +} + +#mnuTab{ + position:relative; + width:100%; + display:block; +} + +#mnuTab2{ + position:relative; + overflow:auto; + width:100%; + display:none; +} +.style1 {color: #FF0000} + + +.event{ + background-color:#D3EAF0; + border:1px solid #999999; + text-align:left; + width:100%; + position:relative; + left:0px; + top:0px; + vertical-align:middle; + padding:1px; +} + +#hrView{ + display:block; +} + + +.calendarNav{ + font-size:12px; + color:#FFFFFF; + white-space:nowrap; + text-align:center; + font-weight:bold; + padding-left:10px; + padding-right:10px; + background-image:url(images/cal_nav.gif); + background-repeat:repeat-x; +} + +#addEventDropDown{ + position:absolute; + display:none; + width:150px; + border:1px solid #666666; + left:0px; + top:0px; + overflow:visible; + z-index:5000; +} + +.calAction{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; + z-index:2000; +} + +.calSettings{ + position:absolute; + z-index:20000; + width:500px; + left:200px; + top:150px; + background-color:#ffffff; +} + + +.outer{ + border-bottom:1px solid #CCCCCC; + border-left:1px solid #CCCCCC; + border-right:1px solid #CCCCCC; +} + + +.calTxt{ + width:50%; + border:1px solid #CCCCCC; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + padding-left:5px; +} + +#leadLay{ + position:relative; + width:100%; + float:left; + visibility:hidden; + padding:5px; + z-index:10000; +} + +/* End of Calendar */ + +/* Cal Year View */ +.eventDay{ + background-color:#FF9966; + font-weight:bold; +} + +.currDay{ + background-color:#006600; + font-weight:bold; + text-decoration:underline; +} + +.currDay a{ + color:#FFFFFF; + font-weight:bold; + text-decoration:underline; +} + + +/* End of Cal Year View */ + +/* Level 2 Menu Selected*/ + +level2Sel{ + color:#000000; + font-weight:bold; + text-decoration:underline; +} + +#DeleteLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; +} + +#CurrencyDeleteLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:350px; +} + + +/* For Report HTML Generation*/ +.rptCellLabel { + background-color:#f6f6f6; + padding-right:10px; + border-right: 1px solid #DDDDDD; + border-bottom:1px solid #eaeaea; + color:#737373; + font-weight: bold; + white-space:nowrap; +} +.rptTable { + border-left: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; + border-top: 1px solid #DDDDDD; +} +.rptTitle, .rptHead, .rptData, .rptGrpHead{ + font-family: Verdana, Arial, Helvetica, Sans-serif; + font-size: 11px; + text-align:left; + font-weight: normal; + height: 20px; + padding: 4px; + border-right: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; + background: #DDDDDD; +} +.rptGrp1Total, .rptGrp2Total, .rptTotal { + font-family: Verdana, Arial, Helvetica, Sans-serif; + font-size: 11px; + text-align:center; + font-weight: normal; + background: #FFF; + height: 20px; + padding: 4px; + border-right: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; +} +.rptGrpHead { + background: #FFF; + border-bottom: 1px solid #FFF; + border-top: 1px solid #DDDDDD; + font-weight: normal; +} + +.rptData { + background: #FFF; + font-weight: normal; +} +.rptEmptyGrp { + background: #FFF; + border-right: 1px solid #DDDDDD; +} +.statechange +{ + position:absolute; + visibility:hidden; + left:10px; + top:20px; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; +} +#PopupLay{ + position:absolute; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:500px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; + display:none; + left:100px; + top:100px; +} + +#folderLay{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; +} + +/* Css for quick Create */ + +.qcTransport{ + background-color:#d5d6ff; + +} + +#role_popup{ + position:relative; + left:0px; + top:0px; + width:95%; + height:300px; + overflow:auto; + border:1px solid #999999; + text-align:left; + background-color:#FFFFFF; + } + +.unread_email { + font-weight:bold; + background-color:#00FF00; + +} + + +/* MY SITES */ + +.unread_email:hover{ + font-weight:bold; +} + + + + +.qualify_email { + font-weight:bold; + background-color:#FF7F50; + + } + + +.delete_email { + font-weight:bold; + background-color:#FF5151; + +} + + +.tagCloud { + border:1px solid #aaf; +} + + +.tagCloudTopBg { + background: url(images/tagCloudBg.gif) repeat-x; + +} + +.tagCloudDisplay { + background-color:#fff; + padding:10px; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height: 14px; + color: #000000; + +} + +.h2 { + + font-size:18px; + line-height:20px; + +} + +.gray { + + color:gray; +} + + +ul { + list-style:circle; + line-height:20px; + padding-left:5px; + margin-left:20px; + font-weight:normal; + +} +.tagCloudTopBg { + background-image: url(images/tagCloudBg.gif); + background-repeat: repeat-x; +} + +.tagCloudDisplay { + background-color:#fff; + padding:5px; +} +.heading2 { + font-family: Arial, Helvetica, sans-serif; + font-size: 16px; + line-height: 16px; + font-weight:bold; + color: #000000; +} +.settingsUI { + + text-align:left; + background-color:#fff; + background-image:url(images/layerPopupBg.gif); + border:2px solid #aaaaff; +} + +.settingsTabHeader { + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height:22px; + font-weight:bold; + color:#ddf; + /* background-image: url(images/mailSubHeaderBg.gif); */ + background-color:#222299; + background-repeat: repeat-x; + padding-left:10px; + padding-right:10px; + +} + +.settingsTabList { + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:20px; + font-weight:normal; + color:#000000; + background-color:#efefff; + padding-left:30px; + border-top:1px solid #fff; + border-bottom:1px solid #99a; + border-right:1px solid #99a; + border-left:1px solid #fff; +} +.settingsTabSelected { + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:20px; + font-weight:bold; + color:#000000; + background-color:#ffffff; + padding-left:30px; + border-left:2px solid #ddf; + border-bottom:2px solid #ddf; + border-top:2px solid #ddf; +} +.settingsSelectedUI { + padding:10px; + background:url(images/settingsSelUIBg.gif) repeat-x; + background-color:#ffffff; +} +.settingsIconDisplay { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:14px; + padding:10px; + + color:#000000; + background-color:#ffffff; + padding-left:10px; +} +.settingsSelUITopLine{ + border-bottom:2px dotted #999999; + +} + +.tableHeading{ + background-color:#ffffff; + border-bottom:2px solid #555599; +} +.colHeader{ + background-color:#ddf; + border-left:1px solid #fff; + border-top:1px solid #fff; + border-right:1px solid #aaf; + border-bottom:1px solid #aaf; + font-weight:bold; + +} + +.cellLabel { + background-color:#f5f5ff; + border-top:1px solid #efefef; + border-bottom:1px solid #dadada; + color:#555555; + +} +.cellText { + color:#333333; + border-bottom:1px solid #dadada; +} + +.listTable{ + border-left:1px solid #cccccc; + border-right:1px solid #cccccc; + border-bottom:1px solid #cccccc; + +} + +.listTableRow{ + border-bottom:1px solid #eaeaea; + border-right :1px solid #eaeaea; + border-bottom:1px solid #eaeaea; + border-bottom:1px solid #eaeaea; +} +.listRow{ + border-bottom:2px solid #eaeaea; + +} + +.listTableTopButtons{ + background-color:#efefff; + background-image:url(images/layerPopupBg.gif); + +} + + +/* Buttons */ +.crmButton{ + + border-left:1px solid #ffffff; + border-top:1px solid #ffffff; + border-right:1px solid #555555; + border-bottom:1px solid #555555; +} + +.create{ + background-color:#0000CD; + color:#fff; + font-weight:bold; +} +.delete { + background-color:#C6E2FF; + color:#000; + font-weight:bold; +} +.edit { + background-color:#0000CD; + color:#fff; + font-weight:bold; +} +.save{ + background-color:#0000CD; + color:#fff; + font-weight:bold; +} +.cancel { + background-color:#C6E2FF; + color:#000; + font-weight:bold; +} + +.inactive{ +color:#999999; +} + +.active{ +color:#229922; + +} + +/* Buttons ends */ + + + +textarea { + width:95%; + height:70px; + border:1px solid #dadada; +} +.treeTable1{ + padding:0px; +} + +.prvPrfBigText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; +} + +.prvPrfTopBg { + background-color:#ebebeb; +} + +.prvPrfBottomBg { + background-color:#ebebeb; +} + +.prvPrfOutline { + border:1px solid #ebebeb; +} + + + +.prvPrfTexture { + background:url(images/prvPrfTexture1.gif); + +} + +.prvPrfHoverOn { + background-color:#ffffef; + +} + +.cellBottomDotLine { + border-bottom-width: 2px; + border-bottom-style: dotted; + border-bottom-color: #CCCCCC; + background-color:#ededed; +} +.crmFormList{ + border:1px solid #cccccc; + width:90%; + height:120px; + +} +.cellBottomDotLinePlain { + border-bottom-width: 2px; + border-bottom-style: dotted; + border-bottom-color: #CCCCCC; + +} +.thickBorder { + border: 2px solid #999999; +} +.trackerHeading { + background-color:#efefef; +} +.trackerListBullet { + border-right:1px dotted #cccccc; + background-color:#f9f9f9; +} +.trackerList { + border-bottom:1px solid #eeeeee; +} + +/* Table Definitions */ +.crmTable { + border:1px solid #dadada; +} +.crmTableRow { + border-bottom:1px dotted #dadada; + border-right:1px dotted #dadada +} +/* Inventory */ + +.lineOnTop { + border-top:1px solid #999999; +} + +.discountUI{ + border:3px solid #CCCCCC; + width:250px; + padding:5px; + position:absolute; + background-color:#FFFFFF; + display:none; +} + +.TaxShow{ + display:inline-table; +} + +.TaxHide{ + display:none; +} + +/* Inventory */ + + + + + +/* styles for RSS Display starts */ +/*.rssDisplay{ + background-color:#e8e3ca; +}*/ + + +/* styles for RSS Display ends */ + + + + + + + + +/* Email Client Classes ++++++++++++++++++++++ */ + +.emailSelected{ + background-color:#eaeaea; + color:#000000; + font-size:bold; +} + + +.mailClient{ + border:2px solid #6565ee; +} + +.mailClientBg { + background-color:#efefff; + background-image:url(images/layerPopupBg.gif); +} + +.mailSubHeader { + background:#b4b8ff url(images/mailSubHeaderBg.gif) repeat-x; + padding:4px; +} + +.mailClientWriteEmailHeader { + font-family:arial, helvetica, sans-serif; + font-size:20px; + line-height:24px; + font-weight:bold; + background:#e0dbb0 url(images/mailSubHeaderBg.gif) repeat-x; + padding:10px; + border-left:1px solid #eaeaea; + border-top:1px solid #eaeaea; + border-right:1px solid #939271; + border-left:1px solid #939271;; +} + +.mailClientCSSButton { + border-left:1px solid #fff; + border-top:1px solid #fff; + border-right:1px solid #333; + border-bottom:1px solid #333; + padding:2px; + background-color:#c3c2b1; +} + +/* Email Client Classes ends ------------------------------------ */ + + + +/* Layer Popup */ +.layerPopup { + border:3px solid #95a5ff; + background:#fffff5 url(images/layerPopupBg.gif) ; + position:absolute; +} + +.layerPopupHeading { + font-family:arial, helvetica, sans-serif; + font-size:16px; + line-height:24px; + font-weight:bold; +} +.layerHeadingULine { + border-bottom:2px solid #717351; +} +.layerPopupTransport { + background-color:#e2e5ff; + +} +.homePageSeperator { + border-right:1px dotted #d3d2c1; +} +.homePageMatrixHdr { + border-bottom:1px solid #d3d2c1; + background:#fffff5 url(images/layerPopupBg.gif) ; +} + +.reportsListTable { + background-color:white; + border-left:1px solid #a3a29f; + border-right:1px solid #a3a29f; + border-bottom:1px solid #a3a29f; +} + +.reportGenerateTable{ + background-image:url(images/layerPopupBg.gif); + border-left:2px dotted #a5b5ee; + border-right:2px dotted #a5b5ee; + border-bottom:2px dotted #a5b5ee; +} +.reportCreateBottom{ + background-color:#ddf; + border-bottom:2px solid #737251; + +} +.importLeadUI{ + /*background:#fffff5 url(images/select.gif) ; */ + background-color:white; +} + +a.customMnu{ + padding-left:30px; + padding-top:5px; + padding-bottom:5px; + display:block; + background-repeat:no-repeat; + background-position:left; + width:155px; + color:#000000; + text-decoration:none; +} + +a.customMnuSelected{ + padding-left:30px; + padding-top:5px; + padding-bottom:5px; + display:block; + background-repeat:no-repeat; + background-position:left; + width:155px; + background-color:#0099FF; + color:#FFFFFF; + text-decoration:none; +} + + +/* Drop Down Menu */ +.drop_mnu{ + position:absolute; + left:0px; + top:0px; + z-index:1000000001; + border-left:1px solid #a5b5ee; + border-right:1px solid #a5b5ee; + border-bottom:1px solid #a5b5ee; + width:150px; + display:none; + padding:0px; + text-align:left; + overflow-x:hidden; + overflow-y:hidden; + background-color:#eef; +} + +a.drop_down{ + width:150px; + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:20px; + font-weight:normal; + color:#33a; + background-color:#eef; + padding:2px 5px 2px 5px; + border-top:1px solid #fafafa; + border-bottom:1px solid #d3d3f3; + display:block; +} + +a.drop_down:Hover{ + padding:2px 5px 2px 5px; + width:150px; + text-align:left; + color:#33a; + font-weight:normal; + text-decoration:underline; + background-color:#ccf; +} + +.bgwhite{ + background-color:white; +} + +.searchUIBasic { + background-image:url(images/layerPopupBg.gif); + border:2px solid #a5b5ee; +} +.searchUIAdv1{ + background-image:url(images/layerPopupBg.gif); + border-top:2px solid #a5b5ee; + border-left:2px solid #a5b5ee; + border-right:2px solid #a5b5ee; +} +.searchUIAdv2{ + background-image:url(images/layerPopupBg.gif); + border-left:2px solid #a5b5ee; + border-right:2px solid #a5b5ee; +} +.searchUIAdv3{ + background-image:url(images/layerPopupBg.gif); + border-bottom:2px solid #a5b5ee; + border-left:2px solid #a5b5ee; + border-right:2px solid #a5b5ee; +} + +/* Recalculate Disabling Window */ + +.veil{ + background: url(images/layerPopupBg.gif) ; + height: 100%; + width: 100%; + top: 0px; + left: 0px; + overflow: hidden; + z-index: 10000; + Filter: Alpha(opacity = 70); + -moz-opacity: 0.7; + text-align: center; + vertical-align: middle; + position: absolute; +} + +.veil_new{ + background: url(images/layerPopupBg.gif) ; + height: 100%; + width: 100%; + top: 0px; + left: 0px; + overflow: hidden; + z-index: 50000; + Filter: Alpha(opacity = 70); + -moz-opacity: 0.7; + text-align: center; + vertical-align: middle; + position: absolute; +} + +.optioncontainer{ + vertical-align: middle; + height: 100%; + width: 100%; + position: absolute; + z-index: 90000; +} + + +.options{ + vertical-align: middle; + margin-left: 25%; + margin-top: 16%; + color: #FFFFFF; + width:650px; + background-color: Black; + border: 2px solid #222; + position: relative; + text-align: left; + z-index: 80000; +} + +.options h2{ + color: White; + font-family: Verdana, Arial, Helvetica, sans-serif; + border-bottom: 1px solid #373D4C; + margin: 0; + font-weight: normal; +} + +/* Recalculate Disable Ends */ +.mailSelected { + font-family: Arial, Helvetica, sans-serif; + font-weight:bold; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + +} +.mailSelected_select { + background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; + background-color:#1F5EFF; + font-family: Arial, Helvetica, sans-serif; + font-weight:bold; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + +} + +.groupname{ + width:125px; + } + +.winmarkModulesdef{ + background-image:url(images/blueLagoonHomeMark.gif); + background-position:top left; + background-repeat:no-repeat; +} + Modified: vtigercrm/branches/5.1_jens/themes/woodspice/images/aboutUS.jpg ============================================================================== Binary files - no diff available. Modified: vtigercrm/branches/5.1_jens/themes/woodspice/images/cal12x12Shared.gif ============================================================================== Binary files - no diff available. Modified: vtigercrm/branches/5.1_jens/themes/woodspice/style.css ============================================================================== --- vtigercrm/branches/5.1_jens/themes/woodspice/style.css (original) +++ vtigercrm/branches/5.1_jens/themes/woodspice/style.css Mon Apr 16 12:27:44 2007 @@ -1,2259 +1,2326 @@ -/********************************************************************************* - -** The contents of this file are subject to the vtiger CRM Public License Version 1.0 - * ("License"); You may not use this file except in compliance with the License - * The Original Code is: vtiger CRM Open Source - * The Initial Developer of the Original Code is vtiger. - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - ********************************************************************************/ - -.small { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; -} -.big { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 18px; - color: #000000; - font-weight:bold; -} - -.componentName { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - line-height: 18px; - color: #998877; - font-weight:bold; - border-left:2px dotted #332211; - padding:10px; -} -.genHeaderBig{ - font-family: Arial, Helvetica, sans-serif; - font-size: 16px; - line-height: 19px; - color: #000000; - font-weight:bold; -} -.genHeaderSmall{ - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 16px; - color: #000000; - font-weight:bold; -} - -.moduleName { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - color: #000000; - font-weight:bold; -} -.hdrNameBg { - background:#ffffff url(images/primeTopBg.gif) repeat-x; - -} - -.hdrTabBg { - /*background:#ffffff url(images/hdrTabBg.gif) bottom repeat-x ;*/ - background-color:#eae9da; -} - -.tabSelected { - background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; - font-family: Arial, Helvetica, sans-serif; - font-weight:bold; - font-size: 11px; - padding-left:10px; - padding-right:10px; - padding-top:2px; - padding-bottom:2px; - - -} - -.tabUnSelected { - - /* background: #efedd4 url(images/tabUnSelectedBg.gif) repeat-x; */ - background-color:#D7D5BE; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:10px; - padding-right:10px; - padding-top:2px; - padding-bottom:2px; - border-bottom:1px solid #efedda; -} - - -.tabSeperator { - background-color:#cccbb5; - - width:2px; -} - - -.searchUIBasic { - border:2px dotted #aaaaaa; - background-color:#FFF6CF; - background-image:url(images/searchUIBg.gif); -} - -.searchUIAdv1{ - border-top:2px dotted #aaaaaa; - border-left:2px dotted #aaaaaa; - border-right:2px dotted #aaaaaa; - background-color:#fff6cf; - background-image:url(images/searchUIBg.gif); -} - -.searchUIAdv2{ - border-left:2px dotted #aaaaaa; - border-right:2px dotted #aaaaaa; - background-color:#fff6cf; - background-image:url(images/searchUIBg.gif); -} - -.searchUIAdv3{ - border-bottom:2px dotted #aaaaaa; - border-left:2px dotted #aaaaaa; - border-right:2px dotted #aaaaaa; - background-image:url(images/searchUIBg.gif); - background-color:#fff6cf; -} -.searchUIName { - border-right:1px solid #333333; - padding-right:40px; -} - -.level2Bg { - background:#e0dbb0 url(images/level2TabBg.gif) bottom repeat-x; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - border-bottom:1px solid #a2a77f; -} - -.level2SelTab{ - font-weight:bold; - color:#000000; - padding-left:20px; - padding-right:20px; - padding-top:5px; - padding-bottom:5px; - -} - -.level2UnSelTab{ - color:#000000; - padding-left:20px; - padding-right:20px; - padding-top:5px; - padding-bottom:5px; -} - - -.sep1 { - background:#999999; -} - -.showPanelBg { - background:url(images/showPanelTopBg.gif) repeat-x; -} - -a { - text-decoration:none; - color:#776643; - - -} - -a:hover { - text-decoration:underline; - -} - -.hdrLink { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - text-decoration:none; - color:#333333; - font-weight:bold; -} - -.hdrLink:hover { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - text-decoration:underline; - color:#333333; - font-weight:bold; -} - -.searchBox { - border: 0px solid #999999; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:2px; - width:100px; - background-color:#ffffef; -} - -.searchBtn { - border : 1px #cccccc solid; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - width:30px; - height:19px; - background-color:#cccccc; -} - - -/* List View Table classes starts +++++++++++++++++ */ - -.lvt { - background-color:#e3e2d1; - border:1px solid #939281; -} - -.lvtBg { - - -} - -.lvtHeaderText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - font-weight:bold; -} - -.lvtCol { - border-top:1px solid #eeeecc; - border-left:1px solid #fafafa; - border-right:1px solid #999988; - border-bottom:1px solid #999988; - background-color:#d3d2c1; - font-weight:bold; -} - -.lvtColData { - background-color:#ffffff; -} - -.lvtColDataHover { - background-color:#ffffea; - -} - - -/* List View Table classes ends --------------------------------*/ - - - -/* Detailed View classes starts +++++++++++++++++++++++ */ -.dvHeaderText{ - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - color:#000000; - font-weight:bold; - -} - -.dvInnerHeader{ - border-bottom:2px solid #999999; - padding:5px; - background-color:#fffffff; - -} - -.dvtSelectedCell { - border-left:2px solid #ddccaa; - border-top:3px solid #ddccaa; - border-right:2px solid #ddccaa; - padding-left:20px; - padding-right:20px; - background-color:white; - font-weight:bold; -} - -.dvtUnSelectedCell { - border-left:2px solid #cacaca; - border-top:2px solid #cacaca; - border-right:2px solid #cacaca; - border-bottom:2px solid #ddccaa; - padding-left:20px; - padding-right:20px; - background-color:#efefef; - cursor:pointer; -} - -.dvtTabCache { - border-bottom:2px solid #ddccaa; -} - -.dvtContentSpace { - border-left:2px solid #ddccaa; - border-right:2px solid #ddccaa; - border-bottom:2px solid #ddccaa; - padding-left:0px; -} - -.dvtCellLabel, .cellLabel { - background-color:#efefe2; - padding-right:10px; - padding-left:10px; - border-bottom:1px solid #dadacc ; - color:#333333; - white-space:nowrap; -} - -.dvtCellInfo, .cellInfo { - padding-left:10px; - padding-right:10px; - border-bottom:1px solid #999; - white-space:nowrap; -} - -.rightMailMerge { - border:1px solid #dddddd -} - -.rightMailMergeHeader { - border-bottom:1px solid #dadaaa; - padding:5px; - background-color:#eaeacc; - -} - -.rightMailMergeContent { - padding:5px; - background-color:#fafafa; - -} - -.detailedViewHeader{ - border-bottom:1px solid #ddddcc; - padding:5px; - background-color:#ddddcc; - -} - -.detailedViewTextBox { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:90%; - background-color:#ffffff; -} - -.detailedViewTextBoxOn { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:90%; - background-color:#ffffdd; -} - - -/* Detailed View classes ends ------------------------------------------- */ - - -.advSearch { - padding:10px; - border-left:1px solid #eaeaea; - border-right:1px solid #eaeaea; - border-bottom:1px solid #eaeaea; - overflow:auto; - width:600px; - height:150px; - background-color:#ffffef; - -} - -.searchAlph { - border:1px solid #dadada; - background-color:#ffffff; - cursor:pointer; - width:10px - -} -.searchAlphselected { - border:1px solid #666666; - background-color:#bbbbbb; - cursor:pointer; - width:10px - -} - -.textbox { - border:1px solid #999999; - background-color:#ffffff; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - width:120px; - padding:2px; - -} - - - -.mx { -} - -.calListTable td{ - border-bottom:1px solid #efefef; - border-left:1px solid #efefef; -} -.calDIV { - width:100%; - border:1px solid #999999; - -} - -.calDayHour { - border-top:1px solid #a8a591; - border-left:1px solid #a8a591; - border-bottom:1px solid #a8a591; - border-right:1px solid #a8a591; - background-color:#eae7da; -} - - -.calAddEvent { - position:absolute; - z-index:10000; - width:500px; - left:200px; - top:150px; - background-color:#ffffff; -} - - - -.addEventInnerBox { - border:1px dotted #dadada; - -} - - -.cellNormal { - border:0px; - background-color:#ffffff; -} - -.EventToDo{ - -} - -.thumbnail{ - background-color:#ffffff; -padding: 7px; -border: 1px solid #ddd; -float: left; - margin-right: 10px; - margin-bottom: 15px; -} - -.padTab{ - padding-top:0px; - padding-left:0px; - padding-left:10px; - padding-bottom:0px; - vertical-align:top; - -} - -#company{ - position:relative; - width:100%; - height:200px; - display:block; - background-color:#FFFFFF; - white-space:nowrap; - overflow:auto; - border:1px solid #CCCCCC; -} - - -#user{position:relative;left:0px;top:0px;width:100%;display:block;} - -#communication{position:relative;left:0px;top:0px;width:100%;display:block;} -#config{position:relative;left:0px;top:0px;width:100%;display:block;} - -#userTab{position:relative;left:0px;top:0px;width:100%;display:none;} - - -#one{ - position:relative; - display:block; - width:245px; -} - -#mnuTab1{ - - position:relative; - - overflow:auto; - - width:100%; - - display:none; - -} - -#mnuTab2{ - - position:relative; - - overflow:auto; - - width:100%; - - display:none; - -} - - -/* End of Settings */ - - -.bgwhite{ - background-color: #FFFFFF; -} -.copy{ - font-size:9px; - font-family: Verdana, Arial, Helvetica, Sans-serif; -} - -#basicTab{ - position:relative; - overflow:auto; - width:100%; - display:block; -} - -#moreTab{ - position:relative; - overflow:auto; - width:100%; - display:none; -} - -#one{ - position:relative; - display:block; - width:245px; -} - - -.dashHeading { - font-family:Arial, Helvetica, sans-serif; - font-size:24px; - font-weight:bold; - color:#000; -} - -.dashSelectBg{ - background-image:url(images/dashSelectBg.gif); - background-repeat:repeat-x; -} -.dash_top{ - background-image:url(images/dashTopBg.gif); - background-repeat:repeat-x; - height:63px; - vertical-align:middle; -} - -.dash_border{ - background-color:#e0dbb0; - padding:5px; -} - - -.dash_white{ - background-color:#FFFFFF; - padding:5px 10px 5px 10px; -} - -.dash_bdr_btm{ - border-bottom:2px dotted #939271; -} - -.dash_count{ - font-size:36px; - font-weight:bold; - text-decoration:none; - color:#000000; - padding-left:10px;padding-right:10px; -} - - -.dash_switch{ - cursor:pointer; - width:26px; - height:26px; -} - -.dash_row_sel{ - background-image:url(images/dash_sel_chart.jpg); - background-repeat:no-repeat; - background-position:center; - width:26px;height:26px; - text-align:center; - vertical-align:middle; - font-weight:bold; - font-size:10px; - text-decoration:none; -} - -.dash_row_unsel{ - background-image:url(images/dash_unsel_chart.jpg); - background-repeat:no-repeat; - background-position:center; - width:26px;height:26px; - text-align:center; - vertical-align:middle; - font-weight:normal; - font-size:10px; - text-decoration:none; - cursor:pointer; -} - -.dash_chart_btm{ - border-bottom:2px solid #000000; -} - - -.dash_bottom{ - background-image:url(images/dashBottomBg.gif); - background-repeat:repeat-x; - height:63px; - vertical-align:middle; -} - -.dash_btm{ - background-image:url(images/dash_btm_center.jpg); - background-repeat:repeat-x; - position:top; -} - - -/* menu */ - - - - a.submenu{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - padding-top:5px; - padding-bottom:5px; - padding-left:10px; - border-bottom:1px solid #CCCCCC; - background-color:#ECECEC; - color:#000000; - text-align:left; - text-decoration:none; - display:block; -} - -a.submenu:Hover{ - background-color:#DDDDDD; - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - padding-top:5px; - padding-bottom:5px; - padding-left:10px; - border-bottom:1px solid #CCCCCC; - color:#000000; - text-align:left; - text-decoration:none; - display:block; -} - -#mnuKey{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - background-color:#666666; - color:#FFFFFF; - text-decoration:none; - padding:5px; - font-weight:bold; - width:8px; - cursor:pointer; - vertical-align:top; - height:100px; - position:relative; - top:0px; - left:0px; -} - -#slidemenu{ - height:525px; - vertical-align:top; - width:100px; - background-color:#CCCCCC; - border-right:1px solid #CCCCCC; - opacity:.9; - display:none; -} - -/* clock */ - -.citystyle{ - position:relative; - top:0px; - left:0px; - text-align:left; - -} -#theClockLayer{ - position:relative; - height:180px; - left:20px; - text-align:center; -} -.handsanddotsstyle{ - margin-top:10px; - position:absolute; - top:0px; - left:0px; - width:2px; - height:2px; - font-size:2px; - background-color:#000000; -} -.facestyle{ - margin-top:10px; - position:absolute; - top:0px; - left:0px; - width:15px; - height:15px; - text-align:center; - font-family:arial,sans-serif; - font-size:10px; - color:#000000; -} -.datestyle{ - margin-top:20px; - position:absolute; - top:0px; - left:0px; - width:100px; - text-align:center; - font-family:arial,sans-serif; - font-size:10px; - color:#000000; -} -.ampmstyle{ - margin-top:23px; - position:absolute; - top:0px; - left:0px; - width:20px; - text-align:center; - font-family:arial,sans-serif; - font-size:10px; - color:#000000; -} - -#wclock{ - position:absolute; - left:100px; - top:100px; - display:none; - background-color:#CCCCCC; - width:175px; -} - -.leftFormBorder1 { - border: 1px solid #AFC8E4; - background-color: #FFFFFF; - opacity:.7; -} - - - - -/* Calculator */ - -.calcResult { - width: 100%; - height: 25px; - background-color: #FFFFCC;/*CBDFD6*/ - border-top: 1px solid #CCC; - border-left: 0px; - border-right: 1px solid #CCC; - border-bottom: 1px solid #CCC; - font-size: 10px; - text-align: right; -} -.calcMem { - width: 100%; - height: 25px; - border-top: 1px solid #CCC; - border-left: 1px solid #CCC; - border-right: 0px; - border-bottom: 1px solid #CCC; - background-color: #FFFFCC;/*CBDFD6*/ - font-family: Arial; - font-size: 10px; - color: #BBB; - text-align: left; -} -.calcBlackBtn, .calcGreyBtn, .calcBigBtn, .calcCancBtn, .calcMemBtn, .calcBackBtn { - border: none; - height: 20px; - font-size: 11px; - color: #FFF; - text-align:center; -} -.calcBackBtn { - background: url(images/calc_back_btn.gif) no-repeat; - width:25px; -} -.calcBlackBtn { - background: url(images/calc_black_btn.gif) no-repeat; - width:25px; -} -.calcGreyBtn { - background: url(images/calc_grey_btn.gif) no-repeat; - width:25px; -} -.calcCancBtn { - background: url(images/calc_canc_btn.gif) no-repeat; - width:25px; - -} -.calcMemBtn { - background: url(images/calc_mem_btn.gif) no-repeat; - width:25px; - /*background-color: #CCC;*/ -} -#calc{ - position:absolute; - left:100px; - top:100px; - background-color:#FFFFFF; - width:185px; - border-bottom:2px solid #000000; - border-right:2px solid #666666; - border-left:2px solid #CCCCCC; - border-top:2px solid #CCCCCC; -} - -/* RSS STYLES */ - -.subHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-image:url(images/rssHeader.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; -} - -.delBg{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-image:url(images/rssdelete.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; -} - -#rssScroll{ - font-family:Arial, Helvetica, sans-serif ; - font-size:12px; - background-color:#FFFFFF; - width:100%; - height:130px; - overflow:auto; - border:0px solid #000000; -} - -.rssTable{ - width:100%; - border:0px solid #CCCCCC; -} - -.rssTable tr th{ - background-color:#ead9a2; - text-align:left; - border-bottom:1px solid #c2c7a2; - border-top:1px solid #FFFFFF; - color:#000000; - padding-left:5px; - padding-right:5px; - height:20px; -} - -.rssTable tr td{ - text-align:left; - border-bottom:1px dotted #dadada; - border-left:1px dotted #dadada; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - white-space:nowrap; - padding:2px; - -} - -.forwardBg{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - color:#000000; - background-image:url(images/rssforward.gif); - background-position:top left; - background-repeat:repeat-x; - height:27px; - padding:0px 10px 0px 10px; - vertical-align:middle; - background-color:#D7D7D7; -} - - -/* New Styles */ - - - -.mnuTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#000000; - width:100%; - border:0px solid #000000; -} - -.mnuTab tr td{ - border-bottom:1px solid #EBEBEB; - padding-left:5px; - vertical-align:middle; -} - -/* profile */ - -.prvPrfBigText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; -} - -.prvPrfTopBg { - background-color:#ebebeb; -} - -.prvPrfBottomBg { - background-color:#ebebeb; -} - -.prvPrfOutline { - border:1px solid #ebebeb; -} - - - -.prvPrfTexture { - background:url(images/prvPrfTexture1.gif); - -} - -.prvPrfHoverOn { - background-color:#ffffef; - -} - -/* Organization */ - -.orgTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - color:#666666; - border:0px solid #9B9B9B; - border-collapse:collapse; - width:100%; -} - -.orgTab tr th{ - text-align:left; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-decoration:none; - font-weight:bold; - height:20px; - padding-left:5px; -} - -.orgTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:none; - font-weight:normal; - padding-left:5px; - height:20px; - border-bottom:1px solid #CCCCCC; - border-right:1px solid #CCCCCC; -} - - -/* Groups */ - - -.groupli{ - margin-left:20px; - font-family:Arial, Helvetica, sans-serif; - font-weight:normal; - font-size:12px; - text-decoration:none; - color:#333333; - list-style-type:none; - text-align:left; -} - -/* tree menu */ - -/*Oraganization Edit Features */ - -#orgLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:500px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - display:block; - position:absolute; - left:0px; - top:0px; -} - -/* Role */ - -#roleLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - display:none; - position:absolute; -} - -.classBtn{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:10px; - background-color:#DBDBDB; - border-bottom:2px solid #999999; - border-right:2px solid #999999; - border-top:2px solid #F5F5F5; - border-left:2px solid #F5F5F5; - color:#000000; - text-align:center; - padding-top:3px; - padding-bottom:3px; -} - -.txtBox{ - width:85%; - border:1px solid #666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; -} - -/* IMPORT LEADS */ - -.leadTable{ - border:3px solid #CCCCCC; - border-collapse:collapse; -} - -.leadTable tr td{ -/* border:0px solid #CCCCCC;*/ -} - -.genHeaderGray{ - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 16px; - color: #888888; - font-weight:bold; -} - -.genHeaderGrayBig{ - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - line-height: 16px; - color: #888888; - font-weight:bold; -} - -.importBox{ - width:125px; - border:1px solid #666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; -} - - -.txtGreen{ - color:green; -} - -/* PICK LIST */ -ul li{ - padding-bottom:2px; - padding-top:2px; -} -/* MY PREFERENCES */ - - -/* CSS FOR REPORTS */ - -.reportHdr{ - background-color:#DDDDDD; - font-size:12px; - font-weight:bold; - vertical-align:middle; - text-align:left; - height:30px; - border-bottom:2px solid #959595; - color:#000000; - padding-left:10px; -} - -#reportLay{ - width:175px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; - z-index:2000; -} - -#locateMap{ - width:120px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; - z-index:2000; -} - - -a.reportMnu{ - font-size:11px; - color:#0070BA; - text-decoration:none; - display:block; - width:155px; - height:20px; - border-bottom:1px solid #E1E1E1; - padding-left:20px; - padding-top:3px; -} - -a.reportMnu:Hover{ - font-size:11px; - color:#0070BA; - text-decoration:underline; - display:block; - width:155px; - height:20px; - border-bottom:1px solid #E1E1E1; - padding-left:20px; - padding-top:3px; -} - -#Generate{ - position:relative; - width:100%; - text-align:center; - display:none; -} - - -/* END OF REPORT */ - - - -/* WEB MAIL */ - a.webMnu{ - font-size:11px; - color:#0070BA; - text-decoration:underline; -} -a.webMnu:Hover{ - font-size:11px; - color:#0070BA; - text-decoration:underline; -} - - -/* END OF WEB MAIL */ - -/* POPUP */ - - a.alpha{ - font-size:11px; - color:gray; - text-decoration:none; - padding-Left:5px; - padding-right:5px; - border:1px dotted #CCCCCC; - background-color:#FFFFCC; -} - -a.alpha:Hover{ - font-size:11px; - color:gray; - text-decoration:underline; - padding-Left:5px; - padding-right:5px; - border:1px dotted #CCCCCC; - background-color:#FFFFCC; -} - -/* Home Page */ -.MatrixLayer{ - border:2px solid #a3a295; - background-color:#FFFFFF; - width:29%; - position:relative; - visibility:visible; - margin:9px; - height:280px; -} - -.fontBold{ - font-size:13px; - color:#000000; - text-decoration:none; - font-weight:bold; -} - -.style_Gray{ - color:gray; -} - -/* End of Home Page */ - -/* All Menu */ -#allMenu{ - width:500px; - border:4px solid #C3C2a1; - left:300px; - top:100px; - position:absolute; - z-index:1000001; - display:none; - padding:10px; - background:#ffffff url(images/layerPopUpBg.gif); -} - - -.allMnuTable{ - width:100%; - background-color:#FFFFFF; -} - -.allMnuHandle td{ - height:20px; - color:#FFFFFF; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - text-decoration:none; - background-color:#000066; - cursor:move; - padding:2px; - border-bottom:2px solid #666666; -} - -.allMnuHdr{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-weight:Bold; - font-size:11px; - text-decoration:none; - display:block; - background-color:#FFFFFF; - color:#737251; - padding-top:5px; - padding-bottom:5px; -} - -a.allMnu{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:10px; - text-decoration:none; - font-weight:normal; - display:block; - width:125px; - height:15px; - padding-left:5px; - padding-top:0px; - padding-bottom:0px; - background-color:#FFFFFF; - border:1px solid #FFFFFF; - color:#000033; - margin-left:20px; -} - -a.allMnu:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:10px; - text-decoration:none; - font-weight:normal; - display:block; - width:125px; - height:15px; - padding-left:5px; - padding-top:0px; - padding-bottom:0px; - background-color:#dad7b5; - color:#333; -} -/* End Of All Menu */ - - - -/* Calendar */ -.calHdr{ - background-image:url(images/mailSubHeaderBg.gif); - background-repeat:repeat-x; - background-position:left top; - -} - -.calSel{ - background-image:url(images/dashSelectBg.gif); - background-repeat:repeat-x; - text-align:center; - color:#FFFFFF; - font-weight:bold; - width:8%; -} - -.calAddButton { - border: 1px solid #666666; - background:#D6D2AB url(images/calAddButtonBg.gif) repeat-x; - cursor:pointer; - height:20px; - - -} -.calInnerBorder { - border-left:1px solid #d6d2ab; - border-right:1px solid #d6d2ab; - border-bottom:1px solid #d6d2ab; -} - -.calBorder { - border-left: 1px solid #939271; - border-right: 1px solid #939271; - border-bottom: 1px solid #939271; - background:#fefefe url(images/layerPopupBg.gif); - -} - -.calTopRight { - border-right: 1px solid #939271; -} - - -.calUnSel{ - color:#000000; - font-weight:normal; - text-align:center; - width:8%; -} - - -a.calMnu{ - font-size:11px; - color:#0070BA; - text-decoration:none; - display:block; - height:20px; - padding-left:5px; - padding-top:3px; -} - -a.calMnu:Hover{ - font-size:11px; - color:#0070BA; - text-decoration:underline; - display:block; - height:20px; - padding-left:5px; - padding-top:3px; -} -.bgwhite{ - background-color: #FFFFFF; -} -.copy{ - font-size:9px; - font-family: Verdana, Arial, Helvetica, Sans-serif; -} - -#mnuTab{ - position:relative; - width:100%; - display:block; -} - -#mnuTab2{ - position:relative; - overflow:auto; - width:100%; - display:none; -} -.style1 {color: #FF0000} - -.event{ - background-color:#D3EAF0; - border:1px solid #999999; - text-align:left; - width:100%; - position:relative; - left:0px; - top:0px; - vertical-align:middle; - padding:1px; -} - -#hrView{ - display:block; -} -.calendarNav{ - font-size:12px; - color:#FFFFFF; - white-space:nowrap; - text-align:center; - font-weight:bold; - padding-left:10px; - padding-right:10px; - background-image:url(images/cal_nav.gif); - background-repeat:repeat-x; -} - -#addEventDropDown{ - position:absolute; - display:none; - width:150px; - border:1px solid #666666; - left:0px; - top:0px; - overflow:visible; - z-index:5000; -} - -.calAction{ - width:175px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; - z-index:2000; -} - -.calSettings{ - position:absolute; - z-index:20000; - width:500px; - left:200px; - top:150px; - background-color:#ffffff; -} - -.outer{ - border-bottom:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - border-right:1px solid #CCCCCC; -} - -.calTxt{ - width:50%; - border:1px solid #CCCCCC; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - padding-left:5px; -} - -#leadLay{ - position:relative; - width:100%; - float:left; - visibility:hidden; - padding:5px; - z-index:10000; -} - -/* End of Calendar */ - -/* Cal Year View */ - - -.eventDay{ - background-color:#FF9966; - font-weight:bold; -} - -.currDay{ - background-color:#006600; - font-weight:bold; - text-decoration:underline; -} - -.currDay a{ - color:#FFFFFF; - font-weight:bold; - text-decoration:underline; -} - - -/* End of Cal Year View */ - -/* Level 2 Menu Selected*/ - -level2Sel{ - color:#000000; - font-weight:bold; - text-decoration:underline; -} - -#DeleteLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; -} - -#CurrencyDeleteLay{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:350px; -} - - -/* For Report HTML Generation*/ -.rptCellLabel { - background-color:#f6f6f6; - padding-right:10px; - border-right: 1px solid #DDDDDD; - border-bottom:1px solid #eaeaea; - color:#737373; - font-weight: bold; - white-space:nowrap; -} -.rptTable { - border-left: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; - border-top: 1px solid #DDDDDD; -} -.rptTitle, .rptHead, .rptData, .rptGrpHead{ - font-family: Verdana, Arial, Helvetica, Sans-serif; - font-size: 11px; - text-align:left; - font-weight: normal; - height: 20px; - padding: 4px; - border-right: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; - background: #DDDDDD; -} -.rptGrp1Total, .rptGrp2Total, .rptTotal { - font-family: Verdana, Arial, Helvetica, Sans-serif; - font-size: 11px; - text-align:center; - font-weight: normal; - background: #FFF; - height: 20px; - padding: 4px; - border-right: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; -} - -.rptGrpHead { - background: #FFF; - border-bottom: 1px solid #FFF; - border-top: 1px solid #DDDDDD; - font-weight: normal; -} - -.rptData { - background: #FFF; - font-weight: normal; -} -.rptEmptyGrp { - background: #FFF; - border-right: 1px solid #DDDDDD; -} -.statechange -{ - position:absolute; - visibility:hidden; - left:10px; - top:20px; - width:300px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; -} -#PopupLay{ - position:absolute; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:500px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; - display:none; - left:100px; - top:100px; -} - -#folderLay{ - width:175px; - background-color:#CCCCCC; - border:1px solid #DDDDDD; - padding-top:5px; - position:absolute; - display:none; -} - -/* Css for quick Create */ - - -.qcTransport{ - background-color:#d3d2c1; - -} - -#role_popup{ - position:relative; - left:0px; - top:0px; - width:95%; - height:300px; - overflow:auto; - border:1px solid #999999; - text-align:left; - background-color:#FFFFFF; - } - -.unread_email { - font-weight:bold; -} - - -/* MY SITES */ - - -.unread_email { - font-weight:bold; -} - - -.tagCloud { - border:1px solid #737373; -} - - -.tagCloudTopBg { - background: url(images/tagCloudBg.gif) repeat-x; - -} - -.tagCloudDisplay { - background-color:#e5e5e5; - padding:10px; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 14px; - color: #000000; - -} - -.h2 { - - font-size:18px; - line-height:20px; - -} - -.gray { - - color:gray; -} - - -ul { - list-style:circle; - line-height:20px; - padding-left:5px; - margin-left:20px; - font-weight:normal; - -} - - - - - -.tagCloudTopBg { - background-image: url(images/tagCloudBg.gif); - background-repeat: repeat-x; -} - -.tagCloudDisplay { - background-color:#e5e5e5; - padding:5px; -} - - - - - -.heading2 { - font-family: Arial, Helvetica, sans-serif; - font-size: 16px; - line-height: 16px; - font-weight:bold; - color: #000000; -} - - - -.settingsUI { - - text-align:left; - background-color:#d3d4c2; - border:2px solid #999a77; - -} - - -.settingsTabHeader { - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height:25px; - font-weight:bold; - color:#000000; - background-image: url(images/mailSubHeaderBg.gif); - background-repeat: repeat-x; - padding-left:10px; - padding-right:10px; - - -} - -.settingsTabList { - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:20px; - font-weight:normal; - color:#000000; - background-color:#efede2; - padding-left:30px; - border-top:1px solid #eaeaea; - border-bottom:1px solid #d3d1a3; -} -.settingsTabSelected { - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:20px; - font-weight:bold; - color:#000000; - background-color:#ffffff; - padding-left:30px; -} -.settingsSelectedUI { - padding:10px; - background:url(images/settingsSelUIBg.gif) repeat-x; - background-color:#ffffff; -} -.settingsIconDisplay { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:14px; - padding:10px; - - color:#000000; - background-color:#ffffff; - padding-left:10px; -} -.settingsSelUITopLine{ - border-bottom:2px dotted #999999; - -} - -.tableHeading{ - background-color:#ffffff; - border-bottom:2px solid #5a5b41; -} -.colHeader{ - background-color:#EFECD1; - border-left:1px solid #eaeaea; - border-top:1px solid #eaeaea; - border-right:1px solid #999a77; - border-bottom:1px solid #999a77; - font-weight:bold; - -} -.cellLabel { - background-color:#eaebd9; - border-top:1px solid #efefef; - border-bottom:1px solid #dadada; - color:#555555; - -} -.cellText { - color:#333333; - border-bottom:1px solid #dadada; -} - -.listTable{ - border-left:1px solid #cccccc; - border-right:1px solid #cccccc; - border-bottom:1px solid #cccccc; - -} - -.listTableRow{ - border-bottom:1px solid #eaeaea; - border-right :1px solid #eaeaea; - border-bottom:1px solid #eaeaea; - border-bottom:1px solid #eaeaea; -} -.listRow{ - border-bottom:2px solid #eaeaea; - -} - -.listTableTopButtons{ - background-color:#fafbe3; - -} - - -/* Buttons */ -.crmButton{ - - border-left:1px solid #ffffff; - border-top:1px solid #ffffff; - border-right:1px solid #555555; - border-bottom:1px solid #555555; -} - -.create{ - background-color:#ddccaa; - color:#333333; - font-weight:bold; -} -.delete { - background-color:#8F8C74; - color:#ffffff; - font-weight:bold; -} -.edit { - background-color:#ddccaa; - color:#333333; - font-weight:bold; -} -.save{ - background-color:#ddccaa; - color:#333333; - font-weight:bold; -} -.cancel { - background-color:#8F8C74; - color:#ffffff; - font-weight:bold; -} - -.inactive{ -color:#999999; -} - -.active{ -color:#229922; - -} - -/* Buttons ends */ - - - -textarea { - width:95%; - height:70px; - border:1px solid #dadada; -} -.treeTable1{ - padding:0px; -} - -.prvPrfBigText { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; -} - -.prvPrfTopBg { - background-color:#ebebeb; -} - -.prvPrfBottomBg { - background-color:#ebebeb; -} - -.prvPrfOutline { - border:1px solid #ebebeb; -} - - - -.prvPrfTexture { - background:url(images/prvPrfTexture1.gif); - -} - - -.prvPrfHoverOn { - background-color:#ffffef; - -} - - -.cellBottomDotLine { - border-bottom-width: 2px; - border-bottom-style: dotted; - border-bottom-color: #CCCCCC; - background-color:#ededed; -} -.crmFormList{ - border:1px solid #cccccc; - width:90%; - height:120px; - -} -.cellBottomDotLinePlain { - border-bottom-width: 2px; - border-bottom-style: dotted; - border-bottom-color: #CCCCCC; - -} - -.thickBorder { - border: 2px solid #999999; -} - -.trackerHeading { - background-color:#efefef; -} -.trackerListBullet { - border-right:1px dotted #cccccc; - background-color:#f9f9f9; -} -.trackerList { - border-bottom:1px solid #eeeeee; -} - -/* Table Definitions */ -.crmTable { - border:1px solid #dadada; -} - -.crmTableRow { - border-bottom:1px dotted #dadada; - border-right:1px dotted #dadada -} - - -/* Inventory */ - -.lineOnTop { - border-top:1px solid #999999; -} - -.discountUI{ - border:3px solid #CCCCCC; - width:250px; - padding:5px; - position:absolute; - background-color:#FFFFFF; - display:none; -} - -.TaxShow{ - display:inline-table; -} - -.TaxHide{ - display:none; -} - -/* Inventory */ - - -/* Email Client Classes ++++++++++++++++++++++ */ - -.emailSelected{ - background-color:#eaeaea; - color:#000000; - font-size:bold; -} - - -.mailClient{ - border:2px solid #999a77; -} - -.mailClientBg { - background-color:#e3e1cd; -} - -.mailSubHeader { - background:#e0dbb0 url(images/mailSubHeaderBg.gif) repeat-x; - padding:4px; -} - - -.mailClientWriteEmailHeader{ - font-family:arial, helvetica, sans-serif; - font-size:20px; - line-height:24px; - font-weight:bold; - background:#e0dbb0 url(images/mailSubHeaderBg.gif) repeat-x; - padding:10px; - border-left:1px solid #eaeaea; - border-top:1px solid #eaeaea; - border-right:1px solid #939271; - border-left:1px solid #939271;; - - -} -.mailClientCSSButton { - border-left:1px solid #fff; - border-top:1px solid #fff; - border-right:1px solid #333; - border-bottom:1px solid #333; - padding:2px; - background-color:#c3c2b1; - -} - -/* Email Client Classes ends ------------------------------------ */ - - - -/* Layer Popup */ -.layerPopup { - border:3px solid #939271; - background:#fffff5 url(images/layerPopupBg.gif) ; - position:absolute; -} - -.layerPopupHeading { - font-family:arial, helvetica, sans-serif; - font-size:16px; - line-height:24px; - font-weight:bold; -} -.layerHeadingULine { - border-bottom:2px solid #717351; -} -.layerPopupTransport { - background-color:#DFDFC2; - -} -.homePageSeperator { - border-right:1px dotted #d3d2c1; -} -.homePageMatrixHdr { - border-bottom:1px solid #d3d2c1; - background:#fffff5 url(images/layerPopupBg.gif) ; -} - -.reportsListTable { - background-color:white; - border-left:1px solid #a3a29f; - border-right:1px solid #a3a29f; - border-bottom:1px solid #a3a29f; -} - -.reportGenerateTable{ - background-image:url(images/searchUIBg.gif); - border-left:2px dotted #a3a29a; - border-right:2px dotted #a3a29a; - border-bottom:2px dotted #a3a29a; -} -.reportCreateBottom{ - background-color:#939271; - border-bottom:2px solid #737251; - -} -.importLeadUI{ - - background:#fffff5 url(images/layerPopupBg.gif) ; -} - -a.customMnu{ - padding-left:30px; - padding-top:5px; - padding-bottom:5px; - display:block; - background-repeat:no-repeat; - background-position:left; - width:155px; - color:#000000; - text-decoration:none; -} - -a.customMnuSelected{ - padding-left:30px; - padding-top:5px; - padding-bottom:5px; - display:block; - background-repeat:no-repeat; - background-position:left; - width:155px; - background-color:#0099FF; - color:#FFFFFF; - text-decoration:none; -} - - -/* Drop Down Menu */ -.drop_mnu{ - position:absolute; - left:0px; - top:0px; - z-index:1000000001; - border-left:1px solid #E7E3C0; - border-right:1px solid #E7E3C0; - border-bottom:1px solid #E7E3C0; - width:150px; - display:none; - padding:0px; - text-align:left; - overflow-x:hidden; - overflow-y:hidden; - background-color:#F6F4E7; -} -a.drop_down{ - width:150px; - text-align:left; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height:20px; - font-weight:normal; - color:#000000; - background-color:#F6F4E7; - padding:2px 5px 2px 5px; - border-top:1px solid #fafafa; - border-bottom:1px solid #d3d3c3; - display:block; -} - -a.drop_down:Hover{ - padding:2px 5px 2px 5px; - width:150px; - text-align:left; - color:#FFFFFF; - font-weight:normal; - text-decoration:underline; - background-color:#D7D5BE; -} - -.bgwhite{ - background-color:white; -} - -/* Recalculate Disabling Window */ - -.veil{ - background: url(images/searchUIBg.gif) ; - height: 100%; - width: 100%; - top: 0px; - left: 0px; - overflow: hidden; - z-index: 10000; - Filter: Alpha(opacity = 70); - -moz-opacity: 0.7; - text-align: center; - vertical-align: middle; - position: absolute; -} - -.veil_new{ - background: url(images/searchUIBg.gif) ; - height: 100%; - width: 100%; - top: 0px; - left: 0px; - overflow: hidden; - z-index: 50000; - Filter: Alpha(opacity = 70); - -moz-opacity: 0.7; - text-align: center; - vertical-align: middle; - position: absolute; -} - -.optioncontainer{ - vertical-align: middle; - height: 100%; - width: 100%; - position: absolute; - z-index: 90000; -} - - -.options{ - vertical-align: middle; - margin-left: 25%; - margin-top: 16%; - color: #FFFFFF; - width:650px; - background-color: Black; - border: 2px solid #222; - position: relative; - text-align: left; - z-index: 80000; -} - -.options h2{ - color: White; - font-family: Verdana, Arial, Helvetica, sans-serif; - border-bottom: 1px solid #373D4C; - margin: 0; - font-weight: normal; -} - -/* Recalculate Disable Ends */ +/********************************************************************************* + +** The contents of this file are subject to the vtiger CRM Public License Version 1.0 + * ("License"); You may not use this file except in compliance with the License + * The Original Code is: vtiger CRM Open Source + * The Initial Developer of the Original Code is vtiger. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + ********************************************************************************/ + +.small { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; +} +.big { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height: 18px; + color: #000000; + font-weight:bold; +} + +.componentName { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + line-height: 3px; + color: #998877; + font-weight:bold; + border-left:2px dotted #332211; + padding:10px; +} +.genHeaderBig{ + font-family: Arial, Helvetica, sans-serif; + font-size: 16px; + line-height: 19px; + color: #000000; + font-weight:bold; +} +.genHeaderSmall{ + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + line-height: 16px; + color: #000000; + font-weight:bold; +} + +.moduleName { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + color: #000000; + font-weight:bold; +} +.hdrNameBg { + background:#ffffff url(images/primeTopBg.gif) repeat-x; + +} + +.hdrTabBg { + /*background:#ffffff url(images/hdrTabBg.gif) bottom repeat-x ;*/ + background-color:#eae9da; +} + +.tabSelected { + background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; + font-family: Arial, Helvetica, sans-serif; + font-weight:bold; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + + +} + +.tabUnSelected { + + /* background: #efedd4 url(images/tabUnSelectedBg.gif) repeat-x; */ + background-color:#D7D5BE; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + border-bottom:1px solid #efedda; +} + + +.tabSeperator { + background-color:#cccbb5; + + width:2px; +} + + +.searchUIBasic { + border:2px dotted #aaaaaa; + background-color:#FFF6CF; + background-image:url(images/searchUIBg.gif); +} + +.searchUIAdv1{ + border-top:2px dotted #aaaaaa; + border-left:2px dotted #aaaaaa; + border-right:2px dotted #aaaaaa; + background-color:#fff6cf; + background-image:url(images/searchUIBg.gif); +} + +.searchUIAdv2{ + border-left:2px dotted #aaaaaa; + border-right:2px dotted #aaaaaa; + background-color:#fff6cf; + background-image:url(images/searchUIBg.gif); +} + +.searchUIAdv3{ + border-bottom:2px dotted #aaaaaa; + border-left:2px dotted #aaaaaa; + border-right:2px dotted #aaaaaa; + background-image:url(images/searchUIBg.gif); + background-color:#fff6cf; +} +.searchUIName { + border-right:1px solid #333333; + padding-right:40px; +} + +.level2Bg { + background:#e0dbb0 url(images/level2TabBg.gif) bottom repeat-x; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + border-bottom:1px solid #a2a77f; +} + +.level2SelTab{ + font-weight:bold; + color:#000000; + padding-left:20px; + padding-right:20px; + padding-top:5px; + padding-bottom:5px; + +} + +.level2UnSelTab{ + color:#000000; + padding-left:20px; + padding-right:20px; + padding-top:5px; + padding-bottom:5px; +} + + +.sep1 { + background:#999999; +} + +.showPanelBg { + background:url(images/showPanelTopBg.gif) repeat-x; +} + +a { + text-decoration:none; + color:#776643; + + +} + +a:hover { + text-decoration:underline; + +} + +.hdrLink { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + text-decoration:none; + color:#333333; + font-weight:bold; +} + +.hdrLink:hover { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + text-decoration:underline; + color:#333333; + font-weight:bold; +} + +.searchBox { + border: 0px solid #999999; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding-left:2px; + width:100px; + background-color:#ffffef; +} + +.searchBtn { + border : 1px #cccccc solid; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + width:30px; + height:19px; + background-color:#cccccc; +} + + +/* List View Table classes starts +++++++++++++++++ */ + +.lvt { + background-color:#e3e2d1; + border:1px solid #939281; +} + +.lvtBg { + + +} + +.lvtHeaderText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + font-weight:bold; +} + +.lvtCol { + border-top:1px solid #eeeecc; + border-left:1px solid #fafafa; + border-right:1px solid #999988; + border-bottom:1px solid #999988; + background-color:#d3d2c1; + font-weight:bold; +} + +.lvtColData { + background-color:#ffffff; +} + +.lvtColDataHover { + background-color:#ffffea; + +} + + +/* List View Table classes ends --------------------------------*/ + + + +/* Detailed View classes starts +++++++++++++++++++++++ */ +.dvHeaderText{ + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + color:#000000; + font-weight:bold; + +} + +.dvInnerHeader{ + border-bottom:2px solid #999999; + padding:5px; + background-color:#fffffff; + +} + +.dvtSelectedCell { + border-left:2px solid #ddccaa; + border-top:3px solid #ddccaa; + border-right:2px solid #ddccaa; + padding-left:20px; + padding-right:20px; + background-color:white; + font-weight:bold; +} + +.dvtUnSelectedCell { + border-left:2px solid #cacaca; + border-top:2px solid #cacaca; + border-right:2px solid #cacaca; + border-bottom:2px solid #ddccaa; + padding-left:20px; + padding-right:20px; + background-color:#efefef; + cursor:pointer; +} + +.dvtTabCache { + border-bottom:2px solid #ddccaa; +} + +.dvtContentSpace { + border-left:2px solid #ddccaa; + border-right:2px solid #ddccaa; + border-bottom:2px solid #ddccaa; + padding-left:0px; +} + +.dvtCellLabel, .cellLabel { + background-color:#efefe2; + padding-right:10px; + padding-left:10px; + border-bottom:1px solid #dadacc ; + color:#333333; + white-space:nowrap; +} + +.dvtCellInfo, .cellInfo { + padding-left:10px; + padding-right:10px; + border-bottom:1px solid #999; +} + +.rightMailMerge { + border:1px solid #dddddd +} + +.rightMailMergeHeader { + border-bottom:1px solid #dadaaa; + padding:5px; + background-color:#eaeacc; + +} + +.rightMailMergeContent { + padding:5px; + background-color:#fafafa; + +} + +.detailedViewHeader{ + border-bottom:1px solid #ddddcc; + padding:5px; + background-color:#ddddcc; + +} + +.detailedViewTextBox { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:90%; + background-color:#ffffff; +} + +.detailedViewTextBoxOn { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:90%; + background-color:#ffffdd; +} + +.detailedViewTextBoxDis { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #555555; + border:1px solid #bababa; + padding-left:5px; + width:90%; + background-color:#aaaaaa; +} + +.detailedViewTextArea { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:95%; + height:100px; + background-color:#ffffff; + text-align:left; +} + + +/* Detailed View classes ends ------------------------------------------- */ + + +.advSearch { + padding:10px; + border-left:1px solid #eaeaea; + border-right:1px solid #eaeaea; + border-bottom:1px solid #eaeaea; + overflow:auto; + width:600px; + height:150px; + background-color:#ffffef; + +} + +.searchAlph { + border:1px solid #dadada; + background-color:#ffffff; + cursor:pointer; + width:10px + +} +.searchAlphselected { + border:1px solid #666666; + background-color:#bbbbbb; + cursor:pointer; + width:10px + +} + +.textbox { + border:1px solid #999999; + background-color:#ffffff; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + width:120px; + padding:2px; + +} + + + +.mx { +} + +.calListTable td{ + border-bottom:1px solid #efefef; + border-left:1px solid #efefef; +} +.calDIV { + width:100%; + border:1px solid #999999; + +} + +.calDayHour { + border-top:1px solid #a8a591; + border-left:1px solid #a8a591; + border-bottom:1px solid #a8a591; + border-right:1px solid #a8a591; + background-color:#eae7da; +} + + +.calAddEvent { + position:absolute; + z-index:10000; + width:500px; + left:200px; + top:150px; + background-color:#ffffff; +} + + + +.addEventInnerBox { + border:1px dotted #dadada; + +} + + +.cellNormal { + border:0px; + background-color:#ffffff; +} + +.EventToDo{ + +} + +.thumbnail{ + background-color:#ffffff; +padding: 7px; +border: 1px solid #ddd; +float: left; + margin-right: 10px; + margin-bottom: 15px; +} + +.padTab{ + padding-top:0px; + padding-left:0px; + padding-left:10px; + padding-bottom:0px; + vertical-align:top; + +} + +#company{ + position:relative; + width:100%; + height:200px; + display:block; + background-color:#FFFFFF; + white-space:nowrap; + overflow:auto; + border:1px solid #CCCCCC; +} + + +#user{position:relative;left:0px;top:0px;width:100%;display:block;} + +#communication{position:relative;left:0px;top:0px;width:100%;display:block;} +#config{position:relative;left:0px;top:0px;width:100%;display:block;} + +#userTab{position:relative;left:0px;top:0px;width:100%;display:none;} + + +#one{ + position:relative; + display:block; + width:245px; +} + +#mnuTab1{ + + position:relative; + + overflow:auto; + + width:100%; + + display:none; + +} + +#mnuTab2{ + + position:relative; + + overflow:auto; + + width:100%; + + display:none; + +} + + +/* End of Settings */ + + +.bgwhite{ + background-color: #FFFFFF; +} +.copy{ + font-size:9px; + font-family: Verdana, Arial, Helvetica, Sans-serif; +} + +#basicTab{ + position:relative; + overflow:auto; + width:100%; + display:block; +} + +#moreTab{ + position:relative; + overflow:auto; + width:100%; + display:none; +} + +#one{ + position:relative; + display:block; + width:245px; +} + + +.dashHeading { + font-family:Arial, Helvetica, sans-serif; + font-size:24px; + font-weight:bold; + color:#000; +} + +.dashSelectBg{ + background-image:url(images/dashSelectBg.gif); + background-repeat:repeat-x; +} +.dash_top{ + background-image:url(images/dashTopBg.gif); + background-repeat:repeat-x; + height:63px; + vertical-align:middle; +} + +.dash_border{ + background-color:#e0dbb0; + padding:5px; +} + + +.dash_white{ + background-color:#FFFFFF; + padding:5px 10px 5px 10px; +} + +.dash_bdr_btm{ + border-bottom:2px dotted #939271; +} + +.dash_count{ + font-size:36px; + font-weight:bold; + text-decoration:none; + color:#000000; + padding-left:10px;padding-right:10px; +} + + +.dash_switch{ + cursor:pointer; + width:26px; + height:26px; +} + +.dash_row_sel{ + background-image:url(images/dash_sel_chart.jpg); + background-repeat:no-repeat; + background-position:center; + width:26px;height:26px; + text-align:center; + vertical-align:middle; + font-weight:bold; + font-size:10px; + text-decoration:none; +} + +.dash_row_unsel{ + background-image:url(images/dash_unsel_chart.jpg); + background-repeat:no-repeat; + background-position:center; + width:26px;height:26px; + text-align:center; + vertical-align:middle; + font-weight:normal; + font-size:10px; + text-decoration:none; + cursor:pointer; +} + +.dash_chart_btm{ + border-bottom:2px solid #000000; +} + + +.dash_bottom{ + background-image:url(images/dashBottomBg.gif); + background-repeat:repeat-x; + height:63px; + vertical-align:middle; +} + +.dash_btm{ + background-image:url(images/dash_btm_center.jpg); + background-repeat:repeat-x; + position:top; +} + + +/* menu */ + + + + a.submenu{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + padding-top:5px; + padding-bottom:5px; + padding-left:10px; + border-bottom:1px solid #CCCCCC; + background-color:#ECECEC; + color:#000000; + text-align:left; + text-decoration:none; + display:block; +} + +a.submenu:Hover{ + background-color:#DDDDDD; + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + padding-top:5px; + padding-bottom:5px; + padding-left:10px; + border-bottom:1px solid #CCCCCC; + color:#000000; + text-align:left; + text-decoration:none; + display:block; +} + +#mnuKey{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + background-color:#666666; + color:#FFFFFF; + text-decoration:none; + padding:5px; + font-weight:bold; + width:8px; + cursor:pointer; + vertical-align:top; + height:100px; + position:relative; + top:0px; + left:0px; +} + +#slidemenu{ + height:525px; + vertical-align:top; + width:100px; + background-color:#CCCCCC; + border-right:1px solid #CCCCCC; + opacity:.9; + display:none; +} + +/* clock */ + +.citystyle{ + position:relative; + top:0px; + left:0px; + text-align:left; + +} +#theClockLayer{ + position:relative; + height:180px; + left:20px; + text-align:center; +} +.handsanddotsstyle{ + margin-top:10px; + position:absolute; + top:0px; + left:0px; + width:2px; + height:2px; + font-size:2px; + background-color:#000000; +} +.facestyle{ + margin-top:10px; + position:absolute; + top:0px; + left:0px; + width:15px; + height:15px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} +.datestyle{ + margin-top:20px; + position:absolute; + top:0px; + left:0px; + width:100px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} +.ampmstyle{ + margin-top:23px; + position:absolute; + top:0px; + left:0px; + width:20px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} + +#wclock{ + position:absolute; + left:100px; + top:100px; + display:none; + background-color:#CCCCCC; + width:175px; +} + +.leftFormBorder1 { + border: 1px solid #AFC8E4; + background-color: #FFFFFF; + opacity:.7; +} + + + + +/* Calculator */ + +.calcResult { + width: 100%; + height: 25px; + background-color: #FFFFCC;/*CBDFD6*/ + border-top: 1px solid #CCC; + border-left: 0px; + border-right: 1px solid #CCC; + border-bottom: 1px solid #CCC; + font-size: 10px; + text-align: right; +} +.calcMem { + width: 100%; + height: 25px; + border-top: 1px solid #CCC; + border-left: 1px solid #CCC; + border-right: 0px; + border-bottom: 1px solid #CCC; + background-color: #FFFFCC;/*CBDFD6*/ + font-family: Arial; + font-size: 10px; + color: #BBB; + text-align: left; +} +.calcBlackBtn, .calcGreyBtn, .calcBigBtn, .calcCancBtn, .calcMemBtn, .calcBackBtn { + border: none; + height: 20px; + font-size: 11px; + color: #FFF; + text-align:center; +} +.calcBackBtn { + background: url(images/calc_back_btn.gif) no-repeat; + width:25px; +} +.calcBlackBtn { + background: url(images/calc_black_btn.gif) no-repeat; + width:25px; +} +.calcGreyBtn { + background: url(images/calc_grey_btn.gif) no-repeat; + width:25px; +} +.calcCancBtn { + background: url(images/calc_canc_btn.gif) no-repeat; + width:25px; + +} +.calcMemBtn { + background: url(images/calc_mem_btn.gif) no-repeat; + width:25px; + /*background-color: #CCC;*/ +} +#calc{ + position:absolute; + left:100px; + top:100px; + background-color:#FFFFFF; + width:185px; + border-bottom:2px solid #000000; + border-right:2px solid #666666; + border-left:2px solid #CCCCCC; + border-top:2px solid #CCCCCC; +} + +/* RSS STYLES */ + +.subHdr{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#FFFFFF; + background-image:url(images/rssHeader.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; +} + +.delBg{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#FFFFFF; + background-image:url(images/rssdelete.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; +} + +#rssScroll{ + font-family:Arial, Helvetica, sans-serif ; + font-size:12px; + background-color:#FFFFFF; + width:100%; + height:175px; + overflow:auto; + border:0px solid #000000; +} + +.rssTable{ + width:100%; + border:0px solid #CCCCCC; +} + +.rssTable tr th{ + background-color:#ead9a2; + text-align:left; + border-bottom:1px solid #c2c7a2; + border-top:1px solid #FFFFFF; + color:#000000; + padding-left:5px; + padding-right:5px; + height:20px; +} + +.rssTable tr td{ + text-align:left; + border-bottom:1px dotted #dadada; + border-left:1px dotted #dadada; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + font-weight:normal; + white-space:nowrap; + padding:2px; + +} + +.forwardBg{ + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + color:#000000; + background-image:url(images/rssforward.gif); + background-position:top left; + background-repeat:repeat-x; + height:27px; + padding:0px 10px 0px 10px; + vertical-align:middle; + background-color:#D7D7D7; +} + + +/* New Styles */ + + + +.mnuTab{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:12px; + color:#000000; + width:100%; + border:0px solid #000000; +} + +.mnuTab tr td{ + border-bottom:1px solid #EBEBEB; + padding-left:5px; + vertical-align:middle; +} + +/* profile */ + +.prvPrfBigText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; +} + +.prvPrfTopBg { + background-color:#ebebeb; +} + +.prvPrfBottomBg { + background-color:#ebebeb; +} + +.prvPrfOutline { + border:1px solid #ebebeb; +} + + + +.prvPrfTexture { + background:url(images/prvPrfTexture1.gif); + +} + +.prvPrfHoverOn { + background-color:#ffffef; + +} + +/* Organization */ + +.orgTab{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + font-weight:normal; + color:#666666; + border:0px solid #9B9B9B; + border-collapse:collapse; + width:100%; +} + +.orgTab tr th{ + text-align:left; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + text-decoration:none; + font-weight:bold; + height:20px; + padding-left:5px; +} + +.orgTab tr td{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-decoration:none; + font-weight:normal; + padding-left:5px; + height:20px; + border-bottom:1px solid #CCCCCC; + border-right:1px solid #CCCCCC; +} + + +/* Groups */ + + +.groupli{ + margin-left:20px; + font-family:Arial, Helvetica, sans-serif; + font-weight:normal; + font-size:12px; + text-decoration:none; + color:#333333; + list-style-type:none; + text-align:left; +} + +/* tree menu */ + +/*Oraganization Edit Features */ + +#orgLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:500px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + display:block; + position:absolute; + left:0px; + top:0px; +} + +/* Role */ + +#roleLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + display:none; + position:absolute; +} + +.classBtn{ + font-family:Verdana, Arial, Helvetica, sans-serif; + text-decoration:none; + font-weight:normal; + font-size:10px; + background-color:#DBDBDB; + border-bottom:2px solid #999999; + border-right:2px solid #999999; + border-top:2px solid #F5F5F5; + border-left:2px solid #F5F5F5; + color:#000000; + text-align:center; + padding-top:3px; + padding-bottom:3px; +} + +.txtBox{ + width:85%; + border:1px solid #666666; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; +} + +/* IMPORT LEADS */ + +.leadTable{ + border:3px solid #CCCCCC; + border-collapse:collapse; +} + +.leadTable tr td{ +/* border:0px solid #CCCCCC;*/ +} + +.genHeaderGray{ + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + line-height: 16px; + color: #888888; + font-weight:bold; +} + +.genHeaderGrayBig{ + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + line-height: 16px; + color: #888888; + font-weight:bold; +} + +.importBox{ + width:125px; + border:1px solid #666666; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; +} + + +.txtGreen{ + color:green; +} + +/* PICK LIST */ +ul li{ + padding-bottom:2px; + padding-top:2px; +} +/* MY PREFERENCES */ + + +/* CSS FOR REPORTS */ + +.reportHdr{ + background-color:#DDDDDD; + font-size:12px; + font-weight:bold; + vertical-align:middle; + text-align:left; + height:30px; + border-bottom:2px solid #959595; + color:#000000; + padding-left:10px; +} + +#reportLay{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; + z-index:2000; +} + +#locateMap{ + width:120px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; + z-index:2000; +} + + +a.reportMnu{ + font-size:11px; + color:#0070BA; + text-decoration:none; + display:block; + width:155px; + height:20px; + border-bottom:1px solid #E1E1E1; + padding-left:20px; + padding-top:3px; +} + +a.reportMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; + display:block; + width:155px; + height:20px; + border-bottom:1px solid #E1E1E1; + padding-left:20px; + padding-top:3px; +} + +#Generate{ + position:relative; + width:100%; + text-align:center; + display:none; +} + + +/* END OF REPORT */ + + + +/* WEB MAIL */ + a.webMnu{ + font-size:11px; + color:#0070BA; + text-decoration:underline; +} +a.webMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; +} + + +/* END OF WEB MAIL */ + +/* POPUP */ + + a.alpha{ + font-size:11px; + color:gray; + text-decoration:none; + padding-Left:5px; + padding-right:5px; + border:1px dotted #CCCCCC; + background-color:#FFFFCC; +} + +a.alpha:Hover{ + font-size:11px; + color:gray; + text-decoration:underline; + padding-Left:5px; + padding-right:5px; + border:1px dotted #CCCCCC; + background-color:#FFFFCC; +} + +/* Home Page */ +.MatrixLayer{ + border:2px solid #a3a295; + background-color:#FFFFFF; + width:29%; + position:relative; + visibility:visible; + margin:9px; + height:280px; +} + +.fontBold{ + font-size:13px; + color:#000000; + text-decoration:none; + font-weight:bold; +} + +.style_Gray{ + color:gray; +} + +/* End of Home Page */ + +/* All Menu */ +#allMenu{ + width:500px; + border:4px solid #C3C2a1; + left:300px; + top:100px; + position:absolute; + z-index:1000001; + display:none; + padding:10px; + background:#ffffff url(images/layerPopUpBg.gif); +} + + +.allMnuTable{ + width:100%; + background-color:#FFFFFF; +} + +.allMnuHandle td{ + height:20px; + color:#FFFFFF; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + font-weight:bold; + text-decoration:none; + background-color:#000066; + cursor:move; + padding:2px; + border-bottom:2px solid #666666; +} + +.allMnuHdr{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-weight:Bold; + font-size:11px; + text-decoration:none; + display:block; + background-color:#FFFFFF; + color:#737251; + padding-top:5px; + padding-bottom:5px; +} + +a.allMnu{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:10px; + text-decoration:none; + font-weight:normal; + display:block; + width:125px; + height:15px; + padding-left:5px; + padding-top:0px; + padding-bottom:0px; + background-color:#FFFFFF; + border:1px solid #FFFFFF; + color:#000033; + margin-left:20px; +} + +a.allMnu:Hover{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:10px; + text-decoration:none; + font-weight:normal; + display:block; + width:125px; + height:15px; + padding-left:5px; + padding-top:0px; + padding-bottom:0px; + background-color:#dad7b5; + color:#333; +} +/* End Of All Menu */ + + + +/* Calendar */ +.calHdr{ + background-image:url(images/mailSubHeaderBg.gif); + background-repeat:repeat-x; + background-position:left top; + +} + +.calSel{ + background-image:url(images/dashSelectBg.gif); + background-repeat:repeat-x; + text-align:center; + color:#FFFFFF; + font-weight:bold; + width:8%; +} + +.calAddButton { + border: 1px solid #666666; + background:#D6D2AB url(images/calAddButtonBg.gif) repeat-x; + cursor:pointer; + height:20px; + + +} +.calInnerBorder { + border-left:1px solid #d6d2ab; + border-right:1px solid #d6d2ab; + border-bottom:1px solid #d6d2ab; +} + +.calBorder { + border-left: 1px solid #939271; + border-right: 1px solid #939271; + border-bottom: 1px solid #939271; + background:#fefefe url(images/layerPopupBg.gif); + +} + +.calTopRight { + border-right: 1px solid #939271; +} + + +.calUnSel{ + color:#000000; + font-weight:normal; + text-align:center; + width:8%; +} + + +a.calMnu{ + font-size:11px; + color:#0070BA; + text-decoration:none; + display:block; + height:20px; + padding-left:5px; + padding-top:3px; +} + +a.calMnu:Hover{ + font-size:11px; + color:#0070BA; + text-decoration:underline; + display:block; + height:20px; + padding-left:5px; + padding-top:3px; +} +.bgwhite{ + background-color: #FFFFFF; +} +.copy{ + font-size:9px; + font-family: Verdana, Arial, Helvetica, Sans-serif; +} + +#mnuTab{ + position:relative; + width:100%; + display:block; +} + +#mnuTab2{ + position:relative; + overflow:auto; + width:100%; + display:none; +} +.style1 {color: #FF0000} + +.event{ + background-color:#D3EAF0; + border:1px solid #999999; + text-align:left; + width:100%; + position:relative; + left:0px; + top:0px; + vertical-align:middle; + padding:1px; +} + +#hrView{ + display:block; +} +.calendarNav{ + font-size:12px; + color:#FFFFFF; + white-space:nowrap; + text-align:center; + font-weight:bold; + padding-left:10px; + padding-right:10px; + background-image:url(images/cal_nav.gif); + background-repeat:repeat-x; +} + +#addEventDropDown{ + position:absolute; + display:none; + width:150px; + border:1px solid #666666; + left:0px; + top:0px; + overflow:visible; + z-index:5000; +} + +.calAction{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; + z-index:2000; +} + +.calSettings{ + position:absolute; + z-index:20000; + width:500px; + left:200px; + top:150px; + background-color:#ffffff; +} + +.outer{ + border-bottom:1px solid #CCCCCC; + border-left:1px solid #CCCCCC; + border-right:1px solid #CCCCCC; +} + +.calTxt{ + width:50%; + border:1px solid #CCCCCC; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + padding-left:5px; +} + +#leadLay{ + position:relative; + width:100%; + float:left; + visibility:hidden; + padding:5px; + z-index:10000; +} + +/* End of Calendar */ + +/* Cal Year View */ + + +.eventDay{ + background-color:#FF9966; + font-weight:bold; +} + +.currDay{ + background-color:#006600; + font-weight:bold; + text-decoration:underline; +} + +.currDay a{ + color:#FFFFFF; + font-weight:bold; + text-decoration:underline; +} + + +/* End of Cal Year View */ + +/* Level 2 Menu Selected*/ + +level2Sel{ + color:#000000; + font-weight:bold; + text-decoration:underline; +} + +#DeleteLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; +} + +#CurrencyDeleteLay{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:350px; +} + + +/* For Report HTML Generation*/ +.rptCellLabel { + background-color:#f6f6f6; + padding-right:10px; + border-right: 1px solid #DDDDDD; + border-bottom:1px solid #eaeaea; + color:#737373; + font-weight: bold; + white-space:nowrap; +} +.rptTable { + border-left: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; + border-top: 1px solid #DDDDDD; +} +.rptTitle, .rptHead, .rptData, .rptGrpHead{ + font-family: Verdana, Arial, Helvetica, Sans-serif; + font-size: 11px; + text-align:left; + font-weight: normal; + height: 20px; + padding: 4px; + border-right: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; + background: #DDDDDD; +} +.rptGrp1Total, .rptGrp2Total, .rptTotal { + font-family: Verdana, Arial, Helvetica, Sans-serif; + font-size: 11px; + text-align:center; + font-weight: normal; + background: #FFF; + height: 20px; + padding: 4px; + border-right: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; +} + +.rptGrpHead { + background: #FFF; + border-bottom: 1px solid #FFF; + border-top: 1px solid #DDDDDD; + font-weight: normal; +} + +.rptData { + background: #FFF; + font-weight: normal; +} +.rptEmptyGrp { + background: #FFF; + border-right: 1px solid #DDDDDD; +} +.statechange +{ + position:absolute; + visibility:hidden; + left:10px; + top:20px; + width:300px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; +} +#PopupLay{ + position:absolute; + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:500px; + border:3px solid #CCCCCC; + background-color:#FFFFFF; + padding:5px; + display:none; + left:100px; + top:100px; +} + +#folderLay{ + width:175px; + background-color:#CCCCCC; + border:1px solid #DDDDDD; + padding-top:5px; + position:absolute; + display:none; +} + +/* Css for quick Create */ + + +.qcTransport{ + background-color:#d3d2c1; + +} + +#role_popup{ + position:relative; + left:0px; + top:0px; + width:95%; + height:300px; + overflow:auto; + border:1px solid #999999; + text-align:left; + background-color:#FFFFFF; + } +.unread_email { + font-weight:bold; + background-color:#00FF00; +} + + +.qualify_email { + font-weight:bold; + background-color:#FFA500; + + } + + +.delete_email { + font-weight:bold; + background-color:#FF5151; + +} + +.mailSelected { + font-family: Arial, Helvetica, sans-serif; + font-weight:bold; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + +} +.mailSelected_select { + background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; + background-color:#1F5EFF; + font-family: Arial, Helvetica, sans-serif; + font-weight:bold; + font-size: 11px; + padding-left:10px; + padding-right:10px; + padding-top:2px; + padding-bottom:2px; + +} + +/* MY SITES */ + +.unread_email:hover { + font-weight:bold; +} + + + +.tagCloud { + border:1px solid #737373; +} + + +.tagCloudTopBg { + background: url(images/tagCloudBg.gif) repeat-x; + +} + +.tagCloudDisplay { + background-color:#e5e5e5; + padding:10px; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height: 14px; + color: #000000; + +} + +.h2 { + + font-size:18px; + line-height:20px; + +} + +.gray { + + color:gray; +} + + +ul { + list-style:circle; + line-height:20px; + padding-left:5px; + margin-left:20px; + font-weight:normal; + +} + + + + + +.tagCloudTopBg { + background-image: url(images/tagCloudBg.gif); + background-repeat: repeat-x; +} + +.tagCloudDisplay { + background-color:#e5e5e5; + padding:5px; +} + + + + + +.heading2 { + font-family: Arial, Helvetica, sans-serif; + font-size: 16px; + line-height: 16px; + font-weight:bold; + color: #000000; +} + + + +.settingsUI { + + text-align:left; + background-color:#d3d4c2; + border:2px solid #999a77; + +} + + +.settingsTabHeader { + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height:25px; + font-weight:bold; + color:#000000; + background-image: url(images/mailSubHeaderBg.gif); + background-repeat: repeat-x; + padding-left:10px; + padding-right:10px; + + +} + +.settingsTabList { + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:20px; + font-weight:normal; + color:#000000; + background-color:#efede2; + padding-left:30px; + border-top:1px solid #eaeaea; + border-bottom:1px solid #d3d1a3; +} +.settingsTabSelected { + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:20px; + font-weight:bold; + color:#000000; + background-color:#ffffff; + padding-left:30px; +} +.settingsSelectedUI { + padding:10px; + background:url(images/settingsSelUIBg.gif) repeat-x; + background-color:#ffffff; +} +.settingsIconDisplay { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:14px; + padding:10px; + + color:#000000; + background-color:#ffffff; + padding-left:10px; +} +.settingsSelUITopLine{ + border-bottom:2px dotted #999999; + +} + +.tableHeading{ + background-color:#ffffff; + border-bottom:2px solid #5a5b41; +} +.colHeader{ + background-color:#EFECD1; + border-left:1px solid #eaeaea; + border-top:1px solid #eaeaea; + border-right:1px solid #999a77; + border-bottom:1px solid #999a77; + font-weight:bold; + +} +.cellLabel { + background-color:#eaebd9; + border-top:1px solid #efefef; + border-bottom:1px solid #dadada; + color:#555555; + +} +.cellText { + color:#333333; + border-bottom:1px solid #dadada; +} + +.listTable{ + border-left:1px solid #cccccc; + border-right:1px solid #cccccc; + border-bottom:1px solid #cccccc; + +} + +.listTableRow{ + border-bottom:1px solid #eaeaea; + border-right :1px solid #eaeaea; + border-bottom:1px solid #eaeaea; + border-bottom:1px solid #eaeaea; +} +.listRow{ + border-bottom:2px solid #eaeaea; + +} + +.listTableTopButtons{ + background-color:#fafbe3; + +} + + +/* Buttons */ +.crmButton{ + + border-left:1px solid #ffffff; + border-top:1px solid #ffffff; + border-right:1px solid #555555; + border-bottom:1px solid #555555; +} + +.create{ + background-color:#ddccaa; + color:#333333; + font-weight:bold; +} +.delete { + background-color:#8F8C74; + color:#ffffff; + font-weight:bold; +} +.edit { + background-color:#ddccaa; + color:#333333; + font-weight:bold; +} +.save{ + background-color:#ddccaa; + color:#333333; + font-weight:bold; +} +.cancel { + background-color:#8F8C74; + color:#ffffff; + font-weight:bold; +} + +.inactive{ +color:#999999; +} + +.active{ +color:#229922; + +} + +/* Buttons ends */ + + + +textarea { + width:95%; + height:70px; + border:1px solid #dadada; +} +.treeTable1{ + padding:0px; +} + +.prvPrfBigText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; +} + +.prvPrfTopBg { + background-color:#ebebeb; +} + +.prvPrfBottomBg { + background-color:#ebebeb; +} + +.prvPrfOutline { + border:1px solid #ebebeb; +} + + + +.prvPrfTexture { + background:url(images/prvPrfTexture1.gif); + +} + + +.prvPrfHoverOn { + background-color:#ffffef; + +} + + +.cellBottomDotLine { + border-bottom-width: 2px; + border-bottom-style: dotted; + border-bottom-color: #CCCCCC; + background-color:#ededed; +} +.crmFormList{ + border:1px solid #cccccc; + width:90%; + height:120px; + +} +.cellBottomDotLinePlain { + border-bottom-width: 2px; + border-bottom-style: dotted; + border-bottom-color: #CCCCCC; + +} + +.thickBorder { + border: 2px solid #999999; +} + +.trackerHeading { + background-color:#efefef; +} +.trackerListBullet { + border-right:1px dotted #cccccc; + background-color:#f9f9f9; +} +.trackerList { + border-bottom:1px solid #eeeeee; +} + +/* Table Definitions */ +.crmTable { + border:1px solid #dadada; +} + +.crmTableRow { + border-bottom:1px dotted #dadada; + border-right:1px dotted #dadada +} + + +/* Inventory */ + +.lineOnTop { + border-top:1px solid #999999; +} + +.discountUI{ + border:3px solid #CCCCCC; + width:250px; + padding:5px; + position:absolute; + background-color:#FFFFFF; + display:none; +} + +.TaxShow{ + display:inline-table; +} + +.TaxHide{ + display:none; +} + +/* Inventory */ + + +/* Email Client Classes ++++++++++++++++++++++ */ + +.emailSelected{ + background-color:#eaeaea; + color:#000000; + font-size:bold; +} + + +.mailClient{ + border:2px solid #999a77; +} + +.mailClientBg { + background-color:#e3e1cd; +} + +.mailSubHeader { + background:#e0dbb0 url(images/mailSubHeaderBg.gif) repeat-x; + padding:4px; +} + + +.mailClientWriteEmailHeader{ + font-family:arial, helvetica, sans-serif; + font-size:20px; + line-height:24px; + font-weight:bold; + background:#e0dbb0 url(images/mailSubHeaderBg.gif) repeat-x; + padding:10px; + border-left:1px solid #eaeaea; + border-top:1px solid #eaeaea; + border-right:1px solid #939271; + border-left:1px solid #939271;; + + +} +.mailClientCSSButton { + border-left:1px solid #fff; + border-top:1px solid #fff; + border-right:1px solid #333; + border-bottom:1px solid #333; + padding:2px; + background-color:#c3c2b1; + +} + +/* Email Client Classes ends ------------------------------------ */ + + + +/* Layer Popup */ +.layerPopup { + border:3px solid #939271; + background:#fffff5 url(images/layerPopupBg.gif) ; + position:absolute; +} + +.layerPopupHeading { + font-family:arial, helvetica, sans-serif; + font-size:16px; + line-height:24px; + font-weight:bold; +} +.layerHeadingULine { + border-bottom:2px solid #717351; +} +.layerPopupTransport { + background-color:#DFDFC2; + +} +.homePageSeperator { + border-right:1px dotted #d3d2c1; +} +.homePageMatrixHdr { + border-bottom:1px solid #d3d2c1; + background:#fffff5 url(images/layerPopupBg.gif) ; +} + +.reportsListTable { + background-color:white; + border-left:1px solid #a3a29f; + border-right:1px solid #a3a29f; + border-bottom:1px solid #a3a29f; +} + +.reportGenerateTable{ + background-image:url(images/searchUIBg.gif); + border-left:2px dotted #a3a29a; + border-right:2px dotted #a3a29a; + border-bottom:2px dotted #a3a29a; +} +.reportCreateBottom{ + background-color:#939271; + border-bottom:2px solid #737251; + +} +.importLeadUI{ + + background:#fffff5 url(images/layerPopupBg.gif) ; +} + +a.customMnu{ + padding-left:30px; + padding-top:5px; + padding-bottom:5px; + display:block; + background-repeat:no-repeat; + background-position:left; + width:155px; + color:#000000; + text-decoration:none; +} + +a.customMnuSelected{ + padding-left:30px; + padding-top:5px; + padding-bottom:5px; + display:block; + background-repeat:no-repeat; + background-position:left; + width:155px; + background-color:#0099FF; + color:#FFFFFF; + text-decoration:none; +} + + +/* Drop Down Menu */ +.drop_mnu{ + position:absolute; + left:0px; + top:0px; + z-index:1000000001; + border-left:1px solid #E7E3C0; + border-right:1px solid #E7E3C0; + border-bottom:1px solid #E7E3C0; + width:150px; + display:none; + padding:0px; + text-align:left; + overflow-x:hidden; + overflow-y:hidden; + background-color:#F6F4E7; +} +a.drop_down{ + width:150px; + text-align:left; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + line-height:20px; + font-weight:normal; + color:#000000; + background-color:#F6F4E7; + padding:2px 5px 2px 5px; + border-top:1px solid #fafafa; + border-bottom:1px solid #d3d3c3; + display:block; +} + +a.drop_down:Hover{ + padding:2px 5px 2px 5px; + width:150px; + text-align:left; + color:#FFFFFF; + font-weight:normal; + text-decoration:underline; + background-color:#D7D5BE; +} + +.bgwhite{ + background-color:white; +} + +/* Recalculate Disabling Window */ + +.veil{ + background: url(images/searchUIBg.gif) ; + height: 100%; + width: 100%; + top: 0px; + left: 0px; + overflow: hidden; + z-index: 10000; + Filter: Alpha(opacity = 70); + -moz-opacity: 0.7; + text-align: center; + vertical-align: middle; + position: absolute; +} + +.veil_new{ + background: url(images/searchUIBg.gif) ; + height: 100%; + width: 100%; + top: 0px; + left: 0px; + overflow: hidden; + z-index: 50000; + Filter: Alpha(opacity = 70); + -moz-opacity: 0.7; + text-align: center; + vertical-align: middle; + position: absolute; +} + +.optioncontainer{ + vertical-align: middle; + height: 100%; + width: 100%; + position: absolute; + z-index: 90000; +} + + +.options{ + vertical-align: middle; + margin-left: 25%; + margin-top: 16%; + color: #FFFFFF; + width:650px; + background-color: Black; + border: 2px solid #222; + position: relative; + text-align: left; + z-index: 80000; +} + +.options h2{ + color: White; + font-family: Verdana, Arial, Helvetica, sans-serif; + border-bottom: 1px solid #373D4C; + margin: 0; + font-weight: normal; +} +.groupname{ + width:125px; + } + + +.winmarkModulesdef{ + background-image:url(images/woodspiceHomeMark.gif); + background-position:top; + background-repeat:repeat-x; +} + +/* Recalculate Disable Ends */ Modified: vtigercrm/branches/5.1_jens/user_privileges/default_module_view.php ============================================================================== --- vtigercrm/branches/5.1_jens/user_privileges/default_module_view.php (original) +++ vtigercrm/branches/5.1_jens/user_privileges/default_module_view.php Mon Apr 16 12:27:44 2007 @@ -1,14 +1,14 @@ - + +?> Modified: vtigercrm/branches/5.1_jens/vtigerversion.php ============================================================================== --- vtigercrm/branches/5.1_jens/vtigerversion.php (original) +++ vtigercrm/branches/5.1_jens/vtigerversion.php Mon Apr 16 12:27:44 2007 @@ -10,5 +10,6 @@ ********************************************************************************/ $patch_version = ''; $modified_database = ''; -$vtiger_current_version = '5.0.2'; +$vtiger_current_version = '5.0.3'; +$_SESSION['vtiger_version'] = $vtiger_current_version; ?> From chamberlain at goldak.com Mon Apr 16 15:52:58 2007 From: chamberlain at goldak.com (Dorcas I. Desalinates) Date: Mon, 16 Apr 2007 19:52:58 +0000 Subject: [Vtigercrm-commits] Some useful advices for your health Message-ID: <6894903390.20070416195258@goldak.com> The most powerful medicines for you! Quick-detox - $35.99 - Rid your body of all traces of toxins in as little as two hours with this highly effective detoxification formula. Lipotrexate - $35.99 - one of the safest and most powerful dietary supplements on the market. Its special proprietary blend of pharmaceutical grade botanicals provides you with consistent levels of sustained energy all day without the nervousness or jitters commonly associated with other diet pills. Clearitol - $40.5 - specially formulated to help correct acne-causing internal imbalances in both adults and adolescents. and more! our site http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istian at getto.de Mon Apr 16 16:10:17 2007 From: istian at getto.de (Dr. Renee Vance) Date: Mon, 16 Apr 2007 20:10:17 +0000 Subject: [Vtigercrm-commits] Master Penis Message-ID: <5476124749.20070416201017@getto.de> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070416/bd7fe872/attachment-0001.html From istang at giftchecksadventures.com Mon Apr 16 22:17:05 2007 From: istang at giftchecksadventures.com (Plumping D. Shells) Date: Mon, 16 Apr 2007 22:17:05 -0400 Subject: [Vtigercrm-commits] Can't afford medications you need? Message-ID: <3488171196.20070416221705@giftchecksadventures.com> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://mmera.hk Make right choice: buy medications at LegalRXMedications drug store! From ackerman at greaternycrusade.org Mon Apr 16 19:07:09 2007 From: ackerman at greaternycrusade.org (Audibles A. Gimlet) Date: Mon, 16 Apr 2007 19:07:09 -0400 Subject: [Vtigercrm-commits] Pharmacy for everyone Message-ID: <9220528900.20070416190709@greaternycrusade.org> The most powerful medicines for you! Horny Goat Weed - $35.99 - Epimedium is a genus of twenty-one related plant species. It boosts libido (sex drive), increases energy levels and enhances recovery from exercise. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. Aciphex - $1.08 - used for the treatment of persistent, frequent heartburn and other symptoms associated with acid reflux disease. Persistent and frequent occurrences are classified as 2 or more days a week. and more! our site http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extremists at goldenarms.net Mon Apr 16 17:02:39 2007 From: extremists at goldenarms.net (Frustrate U. Dorm) Date: Mon, 16 Apr 2007 17:02:39 -0400 Subject: [Vtigercrm-commits] Pharmacy for everyone Message-ID: <1118305817.20070416170239@goldenarms.net> The most powerful medicines for you! Aciphex - $1.08 - used for the treatment of persistent, frequent heartburn and other symptoms associated with acid reflux disease. Persistent and frequent occurrences are classified as 2 or more days a week. Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. Premium Diet Patch - $37.12 - Lose weight fast and safe with the most potent weight loss patch on the market today! and more! our site http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istler at gibsonconsult.com Mon Apr 16 17:53:02 2007 From: istler at gibsonconsult.com (Inferno I. Acclimates) Date: Mon, 16 Apr 2007 17:53:02 -0400 Subject: [Vtigercrm-commits] Any health troubles? Message-ID: <5549591224.20070416175302@gibsonconsult.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft ? the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://mmera.hk any pill you need! Absolutely Confidential and Secure purchase From tjohnson at godscope.com Tue Apr 17 02:32:57 2007 From: tjohnson at godscope.com (Tanner J. Weirs) Date: Tue, 17 Apr 2007 02:32:57 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2820852166.20070417023257@godscope.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/c8db4cd9/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: graphology.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/c8db4cd9/attachment.gif From kiishiha at gpmonnin.com Mon Apr 16 22:04:43 2007 From: kiishiha at gpmonnin.com (Heading K. Indeterminate) Date: Tue, 17 Apr 2007 02:04:43 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2164289991.20070417020443@gpmonnin.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/76645341/attachment-0001.html From crusherms at goveconstruction.com Mon Apr 16 22:26:24 2007 From: crusherms at goveconstruction.com (Obviously I. Eight) Date: Tue, 17 Apr 2007 02:26:24 +0000 Subject: [Vtigercrm-commits] Pharmacy for everyone Message-ID: <8299005512.20070417022624@goveconstruction.com> The most powerful medicines for you! Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. Wellbutrin SR - $3 - antidepressant used to treat depression. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. and more! our site http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From owen at good315.com Tue Apr 17 04:34:52 2007 From: owen at good315.com (Ritual I. Slog) Date: Tue, 17 Apr 2007 04:34:52 -0400 Subject: [Vtigercrm-commits] Looking for medications? Message-ID: <8822203029.20070417043452@good315.com> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://mmera.hk Only Secure and Confidential purchase! Verified buy VISA! From extralyrical at gretch.com Tue Apr 17 00:33:15 2007 From: extralyrical at gretch.com (Wallenstein O. Jewelry) Date: Tue, 17 Apr 2007 00:33:15 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <3351987542.20070417003315@gretch.com> The most powerful medicines for you! Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. Hangover Pills - $35.99 Uncle Rummies Hangover Pills are an all-natural dietary supplement providing protection from the "morning after" symptoms experienced after prolonged or excessive alcohol consumption. If taken as directed, Uncle Rummie's Hangover Helper can completely eliminate unpleasant side-effects such as headaches, nausea and dehydration. Glucosamine - $35.99 - used in case of the alleviation of the symptoms of arthritis. and more! our site http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extrameaty at getregistrar.com Mon Apr 16 22:22:10 2007 From: extrameaty at getregistrar.com (Antlered I. Peopling) Date: Mon, 16 Apr 2007 22:22:10 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6034547125.20070416222210@getregistrar.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070416/a226627d/attachment-0001.html From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 00:57:37 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 04:57:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10698 - in /vtigercrm/branches/5.0.3: Smarty/templates/DetailViewUI.tpl Smarty/templates/DisplayFields.tpl include/js/general.js Message-ID: <20070417045737.D2A527C090F@vtiger.fosslabs.com> Author: richie Date: Mon Apr 16 22:57:29 2007 New Revision: 10698 Log: fix for The URL goes like http://http//vtiger.com. Fixes #3372 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl vtigercrm/branches/5.0.3/include/js/general.js Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl Mon Apr 16 22:57:29 2007 @@ -119,7 +119,7 @@ {elseif $keyid eq '17'}     		 {$keyval} Modified: vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl Mon Apr 16 22:57:29 2007 @@ -280,7 +280,7 @@   http:// - +
    From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 04:01:43 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 08:01:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10702 - in /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Webmails/ modules/Webmails/language/ Message-ID: <20070417080143.C076F7DA6EC@vtiger.fosslabs.com> Author: richie Date: Tue Apr 17 02:01:28 2007 New Revision: 10702 Log: * Fixed the issues in mail delete and navigation, Fixed #3246#3551 Added: vtigercrm/branches/5.0.3/Smarty/templates/ListViewAjax.tpl vtigercrm/branches/5.0.3/modules/Webmails/ListViewAjax.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl vtigercrm/branches/5.0.3/modules/Webmails/ListView.php vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl Tue Apr 17 02:01:28 2007 @@ -50,7 +50,7 @@ - + {/foreach} {/foreach} + + {if $ROWS_COUNT eq 0} + + {/if} +
    {$MOD.LBL_EMAIL_FOLDERS}{$ACCOUNT} > {$MAILBOX} {$NAVIGATION}{$ACCOUNT} > {$MAILBOX}
    Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Tue Apr 17 02:01:28 2007 @@ -195,8 +195,15 @@ { imap_mail_move($MailBox->mbox,$mailid,$_REQUEST["mvbox"]); } + imap_expunge($MailBox->mbox); imap_close($MailBox->mbox); - echo "SUCCESS"; + $MailBox = new MailBox($mailbox); + $elist = $MailBox->mailList; + $num_mails = $elist['count']; + $start_page = ceil($num_mails/$MailBox->mails_per_page); + imap_close($MailBox->mbox); + echo "start=".$start_page.";"; + echo "id=".$mailid.";"; flush(); exit(); } @@ -254,6 +261,7 @@ // these are mainly used in the preview window and could be ajaxified/ // during the preview window load instead. var msgCount = ""; +var start = ""; 0) { + $(mailbox+"_unread").innerHTML = unread_count; + } + else{ + $(mailbox+"_count").innerHTML = ""; + } + $("nav").innerHTML = $("navTemp").innerHTML; + $("navTemp").innerHTML = ''; + $(mailbox+"_tempcount").innerHTML = ""; + break; case 'expunge': // NOTE: we either have to reload the page or count up from the messages that // are deleted and moved or we introduce a bug from invalid mail ids - window.location = window.location; + //window.location = window.location; + start = resp; + runEmailCommand("reload",0); break; case 'delete_multi_msg': - var ids=resp; + var ids; + eval(resp); var rows = ids.split(":"); for(i=0;imbox); + $MailBox = new MailBox($mailbox); + $elist = $MailBox->mailList; + $num_mails = $elist['count']; + $start_page = ceil($num_mails/$MailBox->mails_per_page); imap_close($MailBox->mbox); + echo $start_page; flush(); exit(); } if($command == "delete_msg") { $adb->println("DELETE SINGLE WEBMAIL MESSAGE $mailid"); $MailBox = new MailBox($mailbox); - imap_mail_move($MailBox->mbox,$mailid,"Deleted"); + imap_delete($MailBox->mbox,$mailid); + imap_expunge($MailBox->mbox); $email = new Webmails($MailBox->mbox,$mailid); + $MailBox = new MailBox($mailbox); + $elist = $MailBox->mailList; + $num_mails = $elist['count']; + $start_page = ceil($num_mails/$MailBox->mails_per_page); imap_close($MailBox->mbox); - echo $mailid; + echo "start=".$start_page.";"; + echo "id=".$mailid.";"; flush(); exit(); } @@ -72,16 +87,44 @@ $MailBox = new MailBox($mailbox); $tlist = explode(":",$mailid); foreach($tlist as $id) { - imap_mail_move($MailBox->mbox,$id,"Trash"); + imap_delete($MailBox->mbox,$id); $adb->println("DELETE MULTI MESSAGE $id"); $email = new Webmails($MailBox->mbox,$id); $email->delete(); } + imap_expunge($MailBox->mbox); + $MailBox = new MailBox($mailbox); + $elist = $MailBox->mailList; + $num_mails = $elist['count']; + $start_page = ceil($num_mails/$MailBox->mails_per_page); imap_close($MailBox->mbox); - echo $mailid; + echo "start=".$start_page.";"; + echo "ids='".$mailid."';"; flush(); exit(); } + if($_POST["command"] == "move_msg" && $_POST["ajax"] == "true") { + $MailBox = new MailBox($mailbox); + if(isset($_REQUEST["mailid"]) && $_REQUEST["mailid"] != '') + { + $mailids = explode(':',$_REQUEST["mailid"]); + } + foreach($mailids as $mailid) + { + imap_mail_move($MailBox->mbox,$mailid,$_REQUEST["mvbox"]); + } + imap_expunge($MailBox->mbox); + imap_close($MailBox->mbox); + $MailBox = new MailBox($mailbox); + $elist = $MailBox->mailList; + $num_mails = $elist['count']; + $start_page = ceil($num_mails/$MailBox->mails_per_page); + imap_close($MailBox->mbox); + echo $start_page; + flush(); + exit(); + } + if($command == "undelete_msg") { $MailBox = new MailBox($mailbox); $email = new Webmails($MailBox->mbox,$mailid); Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Tue Apr 17 02:01:28 2007 @@ -45,7 +45,7 @@ 'LBL_TO'=>'To :', 'LBL_CHK_MAIL'=>'Check Mail', 'LBL_COMPOSE'=>'Compose', -'LBL_SETTINGS'=>'Incmg. MailServer Settings', +'LBL_SETTINGS'=>'Incoming MailServer Settings', 'LBL_EMAIL_FOLDERS'=>'Email Folders', 'LBL_INBOX'=>'Inbox', 'LBL_SENT_MAILS'=>'Sent Mails', From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 04:18:37 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 08:18:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10703 - in /vtigercrm/branches/5.0.3: Smarty/templates/Reports.tpl include/language/en_us.lang.php modules/Reports/CheckReport.php modules/Reports/SaveReportFolder.php Message-ID: <20070417081838.332DD7C7FC1@vtiger.fosslabs.com> Author: richie Date: Tue Apr 17 02:18:25 2007 New Revision: 10703 Log: * Fixed the issues in Folder name of Reports, Now we can give special characters and the length should be less than or equal to 20, Fixed #3385#3637 Modified: vtigercrm/branches/5.0.3/Smarty/templates/Reports.tpl vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/Reports.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Reports.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Reports.tpl Tue Apr 17 02:18:25 2007 @@ -166,6 +166,13 @@ return false; {literal} } + else if(getObj('folder_name').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length > 20 ) + { + {/literal} + alert('{$APP.FOLDER_NAME_ALLOW_20CHARS}'); + return false; + {literal} + } else { new Ajax.Request( @@ -174,21 +181,22 @@ method: 'post', postBody: 'action=ReportsAjax&mode=ajax&file=CheckReport&module=Reports&check=folderCheck&folderName='+getObj('folder_name').value, onComplete: function(response) { - if((response.responseText==1) && (mode == 'Edit')) + var mode = getObj('fldrsave_mode').value; + if((response.responseText ==1 || response.responseText != 0) && (mode == 'Edit' || mode =='save') &&response.responseText != 999) { {/literal} alert("{$APP.FOLDER_NAME_ALREADY_EXISTS}"); return false; {literal} } - else if((response.responseText !=0) && (mode == 'Edit')) + else if(response.responseText == 999) // 999 check for special chars { - {/literal}; - alert("{$APP.FOLDER_NAME_ALREADY_EXISTS}"); + {/literal} + alert("{$APP.SPECIAL_CHARS_NOT_ALLOWED}"); return false; {literal} } - else + else { fninvsh('orgLay'); var foldername = getObj('folder_name').value; @@ -197,7 +205,6 @@ getObj('folder_desc').value = ''; foldername = foldername.replace(/&/gi,'*amp*') folderdesc = folderdesc.replace(/&/gi,'*amp*') - var mode = getObj('fldrsave_mode').value; if(mode == 'save') { url ='&savemode=Save&foldername='+foldername+'&folderdesc='+folderdesc; Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Tue Apr 17 02:18:25 2007 @@ -851,6 +851,8 @@ 'LNK_READ_LICENSE'=>'Read License', 'ACTIVITIES' => 'Activities', 'MAP_NAME_EXISTS'=>'This map name already exists. \n Do you want to overwrite it?', +'FOLDER_NAME_ALLOW_20CHARS'=> 'Folder name allowed 20 characters only', +'SPECIAL_CHARS_NOT_ALLOWED' => 'Special characters not allowed. try again...', ); $app_list_strings = array ( Modified: vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php Tue Apr 17 02:18:25 2007 @@ -26,11 +26,16 @@ else if($_REQUEST['check']== 'folderCheck') { $folderName = $_REQUEST['folderName']; - $folderName = iconv("UTF-8",$default_charset,$folderName); - $sSQL="select * from vtiger_reportfolder where foldername='".$folderName."'"; - - $sqlresult = $adb->query($sSQL); - echo $adb->num_rows($sqlresult); + $folderName =str_replace(array("'",'"'),'',iconv("UTF-8",$default_charset,$folderName)); + if($folderName == "" || !$folderName) + { + echo "999"; + }else + { + $SQL="select * from vtiger_reportfolder where foldername='".$folderName."'"; + $sqlresult = $adb->query($SQL); + echo trim($adb->num_rows($sqlresult)); + } } ?> Modified: vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php Tue Apr 17 02:18:25 2007 @@ -24,6 +24,13 @@ $folderdesc = addslashes($_REQUEST["folderdesc"]); $foldername = str_replace('*amp*','&',$foldername); $folderdesc = str_replace('*amp*','&',$folderdesc); +/*if($foldername =="") +{ + echo "Please Enter valid Name"; +// header("Location: index.php?action=ReportsAjax&file=ListView&mode=ajax&module=Reports"); + +} +else*/ if($mode=="Save") { if($rfid=="") From aobrien at glorychurch.com Tue Apr 17 09:26:06 2007 From: aobrien at glorychurch.com (Gucci H. Upend) Date: Tue, 17 Apr 2007 09:26:06 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <5148830567.20070417092606@glorychurch.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://mmera.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From istillrise at globalsupply.com Tue Apr 17 09:45:09 2007 From: istillrise at globalsupply.com (Firmness M. Nilling) Date: Tue, 17 Apr 2007 09:45:09 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6571665503.20070417094509@globalsupply.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/578e6c1c/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Alistair.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/578e6c1c/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 05:32:06 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 09:32:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10704 - in /vtigercrm/branches/5.0.3: include/js/QuickCreate.js include/js/general.js modules/Users/DefaultDataPopulator.php schema/DatabaseSchema.xml Message-ID: <20070417093206.E4CCC7DA6C6@vtiger.fosslabs.com> Author: richie Date: Tue Apr 17 03:31:48 2007 New Revision: 10704 Log: fix for emailid and noofemployees validation. Fixes #3278 #3309 #3461 --minnie Modified: vtigercrm/branches/5.0.3/include/js/QuickCreate.js vtigercrm/branches/5.0.3/include/js/general.js vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml Modified: vtigercrm/branches/5.0.3/include/js/QuickCreate.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/QuickCreate.js (original) +++ vtigercrm/branches/5.0.3/include/js/QuickCreate.js Tue Apr 17 03:31:48 2007 @@ -43,7 +43,11 @@ function qcpatternValidate(fldName,fldLabel,type) { var currObj=window.document.QcEditView[fldName]; if (type.toUpperCase()=="EMAIL") //Email ID validation - var re=new RegExp(/^.+ at .+\..+$/) + { + /*changes made to fix -- ticket#3278 & ticket#3461 + var re=new RegExp(/^.+ at .+\..+$/)*/ + var re=new RegExp(/^[a-z0-9]([a-z0-9_\-\.]*)@([a-z0-9_\-\.]*)(\.[a-z]{2,3}(\.[a-z]{2}){0,2})$/) + } if (type.toUpperCase()=="DATE") {//DATE validation //YMD @@ -176,13 +180,17 @@ alert(alert_arr.INVALID+fldLabel) window.document.QcEditView[fldName].focus() return false - } - else if( val < -2147483648 || val > 2147483647) - { - alert(fldLabel +alert_arr.OUT_OF_RANGE); - return false; - } - + } + else if( (fldName != 'employees' || fldName != 'noofemployees') && (val < -2147483648 || val > 2147483647)) + { + alert(fldLabel +alert_arr.OUT_OF_RANGE); + return false; + } + else if((fldName == 'employees' || fldName == 'noofemployees') && (val < 0 || val > 2147483647)) + { + alert(fldLabel +alert_arr.OUT_OF_RANGE); + return false; + } else { return true Modified: vtigercrm/branches/5.0.3/include/js/general.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/general.js (original) +++ vtigercrm/branches/5.0.3/include/js/general.js Tue Apr 17 03:31:48 2007 @@ -240,8 +240,12 @@ function patternValidate(fldName,fldLabel,type) { var currObj=getObj(fldName) if (type.toUpperCase()=="EMAIL") //Email ID validation - var re=new RegExp(/^.+ at .+\..+$/) - + { + /*changes made to fix -- ticket#3278 & ticket#3461 + var re=new RegExp(/^.+ at .+\..+$/)*/ + var re=new RegExp(/^[a-z0-9]([a-z0-9_\-\.]*)@([a-z0-9_\-\.]*)(\.[a-z]{2,3}(\.[a-z]{2}){0,2})$/) + } + if (type.toUpperCase()=="DATE") {//DATE validation //YMD //var reg1 = /^\d{2}(\-|\/|\.)\d{1,2}\1\d{1,2}$/ //2 digit year @@ -700,12 +704,12 @@ getObj(fldName).focus() return false } - else if((fldName != 'employees') && (val < -2147483648 || val > 2147483647)) + else if((fldName != 'employees' || fldName != 'noofemployees') && (val < -2147483648 || val > 2147483647)) { alert(fldLabel +alert_arr.OUT_OF_RANGE); return false; } - else if((fldName == 'employees') && (val < 0 || val > 2147483647)) + else if((fldName == 'employees' || fldName != 'noofemployees') && (val < 0 || val > 2147483647)) { alert(fldLabel +alert_arr.OUT_OF_RANGE); return false; Modified: vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php Tue Apr 17 03:31:48 2007 @@ -248,7 +248,7 @@ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'rating','vtiger_leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')"); $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'noofemployees','vtiger_leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')"); $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'yahooid','vtiger_leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'yahooid','vtiger_leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'E~O',1,null,'ADV')"); $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')"); @@ -294,7 +294,7 @@ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'email','vtiger_contactdetails',1,'13','email','Email',1,0,0,100,15,4,1,'E~O',0,5,'BAS')"); $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'reportsto','vtiger_contactdetails',1,'57','contact_id','Reports To',1,0,0,100,16,4,1,'V~O',1,null,'ADV')"); $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'assistant','vtiger_contactsubdetails',1,'1','assistant','Assistant',1,0,0,100,17,4,1,'V~O',1,null,'ADV')"); - $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'yahooid','vtiger_contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'yahooid','vtiger_contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'E~O',1,null,'ADV')"); $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'assistantphone','vtiger_contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,null,'ADV')"); $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'donotcall','vtiger_contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,null,'ADV')"); $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'emailoptout','vtiger_contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,null,'ADV')"); Modified: vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml Tue Apr 17 03:31:48 2007 @@ -625,7 +625,7 @@ - + From sihusband at greencloud.com Tue Apr 17 03:28:35 2007 From: sihusband at greencloud.com (Pram V. Wowing) Date: Tue, 17 Apr 2007 03:28:35 -0400 Subject: [Vtigercrm-commits] Looking for perfect sex? Message-ID: <9341482286.20070417032835@greencloud.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://mmera.hk Make right choice: buy medications at LegalRXMedications drug store! From cedric at gprdehler.com Tue Apr 17 06:07:05 2007 From: cedric at gprdehler.com (Categorized H. Papergirl) Date: Tue, 17 Apr 2007 06:07:05 -0400 Subject: [Vtigercrm-commits] No doctor appointment is necessary Message-ID: <5307958730.20070417060705@gprdehler.com> The most powerful medicines for you! Singulair - $1.28 - medicine approved to help control asthma in adults and children as young as 12 months old. It also helps to relieve the symptoms of seasonal allergies in adults and children as young as 2 years old. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. Cloalis Soft Tabs - $5.78 - Just like regular Clualis but specially formulated, these pills are soft and dissolvable under the tongue. The effect of this is more direct absorption into the bloodstream, rather than through the stomach. Result ? a powerful, lasting effect of up to 36 hours. and more! our site http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 06:52:21 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 10:52:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10705 - in /vtigercrm/branches/5.0.3: Smarty/templates/ReportColumnsTotal.tpl modules/Reports/ReportColumnsTotal.php modules/Reports/Reports.php modules/Reports/language/en_us.lang.php Message-ID: <20070417105221.CE9607DA6C6@vtiger.fosslabs.com> Author: richie Date: Tue Apr 17 04:52:11 2007 New Revision: 10705 Log: * Avoid display the related entity fields (accountname in contacts etc.,) in SUM, AVG in Reports, Fixed #3629 Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportColumnsTotal.tpl vtigercrm/branches/5.0.3/modules/Reports/ReportColumnsTotal.php vtigercrm/branches/5.0.3/modules/Reports/Reports.php vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportColumnsTotal.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ReportColumnsTotal.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ReportColumnsTotal.tpl Tue Apr 17 04:52:11 2007 @@ -39,6 +39,11 @@
    {$MOD.NO_COLUMN}
    Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportColumnsTotal.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/ReportColumnsTotal.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/ReportColumnsTotal.php Tue Apr 17 04:52:11 2007 @@ -48,5 +48,6 @@ $BLOCK1 = $oReport->sgetColumntoTotal($primarymodule,$secondarymodule); $report_column_tot->assign("BLOCK1",$BLOCK1); } +$report_column_tot->assign("ROWS_COUNT", count($BLOCK1[0])); $report_column_tot->display('ReportColumnsTotal.tpl'); ?> Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Reports.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Reports.php Tue Apr 17 04:52:11 2007 @@ -1058,13 +1058,57 @@ $escapedchars = Array('_SUM','_AVG','_MIN','_MAX'); if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0) { - $ssql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.displaytype = 1 order by sequence"; + $ssql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.displaytype = 1 "; + } else { $profileList = getCurrentUserProfileList(); - $ssql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.displaytype = 1 and vtiger_def_org_field.visible=0 and vtiger_profile2field.visible=0 and vtiger_profile2field.profileid in ".$profileList." order by sequence"; - } + $ssql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.displaytype = 1 and vtiger_def_org_field.visible=0 and vtiger_profile2field.visible=0 and vtiger_profile2field.profileid in ".$profileList; + } + + //Added to avoid display the Related fields (Account name,Vandor name,product name, etc) in Report Calculations(SUM,AVG..) + switch($tabid) + { + case 2://Potentials + //ie. Campaign name will not displayed in Potential's report calcullation + $ssql.= "and vtiger_field.fieldname not in ('campaignid') "; + break; + case 4://Contacts + $ssql.= "and vtiger_field.fieldname not in ('account_id') "; + break; + case 6://Accounts + $ssql.= "and vtiger_field.fieldname not in ('account_id') "; + break; + case 9://Calandar + $ssql.= "and vtiger_field.fieldname not in ('parent_id','contact_id') "; + break; + case 13://Trouble tickets(HelpDesk) + $ssql.= "and vtiger_field.fieldname not in ('parent_id','product_id') "; + break; + case 14://Products + $ssql.= "and vtiger_field.fieldname not in ('vendor_id') "; + break; + case 20://Quotes + $ssql.= "and vtiger_field.fieldname not in ('potential_id','assigned_user_id1','account_id') "; + break; + case 21://Purchase Order + $ssql.= "and vtiger_field.fieldname not in ('contact_id','vendor_id') "; + break; + case 22://SalesOrder + $ssql.= "and vtiger_field.fieldname not in ('potential_id','account_id','contact_id','quote_id') "; + break; + case 23://Invoice + $ssql.= "and vtiger_field.fieldname not in ('salesorder_id','contact_id','account_id') "; + break; + case 26://Campaings + $ssql.= "and vtiger_field.fieldname not in ('product_id') "; + break; + + } + + $ssql.= "order by sequence"; + $result = $adb->query($ssql); $columntototalrow = $adb->fetch_array($result); $options_list = Array(); Modified: vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php Tue Apr 17 04:52:11 2007 @@ -204,7 +204,7 @@ 'LBL_CUSTOM_REPORTS'=>'Custom Reports', 'ticketid'=>'Ticket Id', - +'NO_COLUMN'=>'No Columns available to Total', ) ?> From basil at green-wood.com Tue Apr 17 07:17:39 2007 From: basil at green-wood.com (Horseshoe A. Molecular) Date: Tue, 17 Apr 2007 11:17:39 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2371696489.20070417111739@green-wood.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/aa19443f/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: glissandos.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/aa19443f/attachment.gif From cbrown at globalhealers.com Tue Apr 17 08:07:32 2007 From: cbrown at globalhealers.com (Northrup T. Clicks) Date: Tue, 17 Apr 2007 12:07:32 +0000 Subject: [Vtigercrm-commits] Straining yourself when you are with woman? Message-ID: <1466552842.20070417120732@globalhealers.com> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://mmera.hk Verified by VISA and sell FDA Approved Drugs only! From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 08:19:18 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 12:19:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10706 - /vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Message-ID: <20070417121919.230A778D64E@vtiger.fosslabs.com> Author: richie Date: Tue Apr 17 06:19:12 2007 New Revision: 10706 Log: * Fixed the issue in average because of null values ie., to get average we will use AVG function in MySQL. when we use this NULL values will not be taken to get the average so that we have used sum()/count() to get average instead of avg(), Fixed #3566 Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Tue Apr 17 06:19:12 2007 @@ -2011,7 +2011,9 @@ } if($fieldlist[4] == 3) { - $stdfilterlist[$fieldcolname] = "avg(".$fieldlist[1].".".$fieldlist[2].") '".$fieldlist[3]."'"; + //Fixed average calculation issue due to NULL values ie., when we use avg() function, NULL values will be ignored.to avoid this we use (sum/count) to find average. + //$stdfilterlist[$fieldcolname] = "avg(".$fieldlist[1].".".$fieldlist[2].") '".$fieldlist[3]."'"; + $stdfilterlist[$fieldcolname] = "(sum(".$fieldlist[1].".".$fieldlist[2].")/count(*)) '".$fieldlist[3]."'"; } if($fieldlist[4] == 4) { From smrupp at grantwilson.com Tue Apr 17 09:22:18 2007 From: smrupp at grantwilson.com (Handmaiden Q. Admissibility) Date: Tue, 17 Apr 2007 13:22:18 +0000 Subject: [Vtigercrm-commits] Any health troubles? Message-ID: <7680077976.20070417132218@grantwilson.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://mmera.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From extrahotwings at greensquare.com Tue Apr 17 14:58:58 2007 From: extrahotwings at greensquare.com (Best J. Unemployment) Date: Tue, 17 Apr 2007 14:58:58 -0400 Subject: [Vtigercrm-commits] You can't find cure that you need? Message-ID: <9201471304.20070417145858@greensquare.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://mmera.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From central at grika.com Tue Apr 17 07:50:53 2007 From: central at grika.com (Yachting P. Antiviral) Date: Tue, 17 Apr 2007 07:50:53 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <0318513705.20070417075053@grika.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://mmera.hk Verified by VISA and sell FDA Approved Drugs only! From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 10:48:31 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 14:48:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10707 - in /vtigercrm/branches/5.0.3/modules/Webmails: ListView.php Webmails.js WebmailsAjax.php Message-ID: <20070417144831.DEEAF7DA6FD@vtiger.fosslabs.com> Author: richie Date: Tue Apr 17 08:48:26 2007 New Revision: 10707 Log: * Fixed some issues in webmails Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Tue Apr 17 08:48:26 2007 @@ -295,7 +295,9 @@ $listview_entries = array(); $displayed_msgs=0; -$new_msgs=0; +$info = imap_mailboxmsginfo($MailBox->mbox); +$unread_msgs = $info->Unread; +//$new_msgs=0; if(($numEmails) <= 0) $listview_entries[0][] = '    		'.$mod_strings['LBL_NO_EMAILS'].'
    - - - -
    - - - - - - - - - - - -
    - {foreach key=button_check item=button_label from=$BUTTONS} - {if $button_check eq 'del'} - - {elseif $button_check eq 's_mail'} - - {elseif $button_check eq 's_cmail'} - - {elseif $button_check eq 'c_status'} - - {elseif $button_check eq 'c_owner'} - {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} - - {/if} - {/if} - - {/foreach} - {$RECORD_COUNTS} - - {$NAVIGATION} -
    -     		- - {if $HIDE_CUSTOM_LINKS neq '1'} - - - - - {if $ALL eq 'All'} - - {else} - - {/if} - -
    {$APP.LBL_VIEW} - {$APP.LNK_CV_CREATEVIEW} - | - {$APP.LNK_CV_EDIT} - | - {$APP.LNK_CV_DELETE}{$APP.LNK_CV_CREATEVIEW} - | - {$APP.LNK_CV_EDIT} - | - {$APP.LNK_CV_DELETE}
    - - {/if} - -
    - - -
    - - - - - {foreach name="listviewforeach" item=header from=$LISTHEADER} - - {/foreach} - - - {foreach item=entity key=entity_id from=$LISTENTITY} - - - {foreach item=data from=$entity} - - {/foreach} - - {foreachelse} - - {/foreach} -
    {$header}
    {$data}
    -
    - {assign var=vowel_conf value='LBL_A'} - {if $MODULE eq 'Accounts' || $MODULE eq 'Invoice'} - {assign var=vowel_conf value='LBL_AN'} - {/if} - {assign var=MODULE_CREATE value=$SINGLE_MOD} - {if $MODULE eq 'HelpDesk'} - {assign var=MODULE_CREATE value='Ticket'} - {/if} - - {if $CHECK.EditView eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'} - - - - - - - - - -
    - {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} - {$APP.LBL_NO} {$APP.$MODULE_CREATE} {$APP.LBL_FOUND} ! - {elseif $MODULE eq 'Calendar'} - {$APP.LBL_NO} {$APP.ACTIVITIES} {$APP.LBL_FOUND} ! - {else} - {$APP.LBL_NO} {$APP.$MODULE_CREATE}s {$APP.LBL_FOUND} ! - {/if} -
    {$APP.LBL_YOU_CAN_CREATE} {$APP.$vowel_conf} - - {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} - {$MOD.$MODULE_CREATE} - {else} - {$APP.$MODULE_CREATE} - {/if} - - {$APP.LBL_NOW}. {$APP.LBL_CLICK_THE_LINK}:
    - {if $MODULE neq 'Calendar'} -   -{$APP.LBL_CREATE} {$APP.$vowel_conf} - {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} - {$MOD.$MODULE_CREATE} - {else} - {$APP.$MODULE_CREATE} - {/if} -
    - {else} -   -{$APP.LBL_CREATE} {$APP.LBL_AN} {$APP.Event}
    -   -{$APP.LBL_CREATE} {$APP.LBL_A} {$APP.Task} - {/if} -
    - {else} - - - - - {else} - {$APP.LBL_NO} {$APP.$MODULE_CREATE}s {$APP.LBL_FOUND} ! - {/if} - - - - -
    - {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} - {$APP.LBL_NO} {$APP.$MODULE_CREATE} {$APP.LBL_FOUND} !
    {$APP.LBL_YOU_ARE_NOT_ALLOWED_TO_CREATE} {$APP.$vowel_conf} - {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} - {$MOD.$MODULE_CREATE} - {else} - {$APP.$MODULE_CREATE} - {/if} -
    -
    - {/if} -
    -
    -
    - - - - - - - - -
    - {foreach key=button_check item=button_label from=$BUTTONS} - {if $button_check eq 'del'} - - {elseif $button_check eq 's_mail'} - - {elseif $button_check eq 's_cmail'} - - {elseif $button_check eq 'c_status'} - - {elseif $button_check eq 'c_owner'} - {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} - - {/if} - {/if} - - {/foreach} - {$RECORD_COUNTS} - - {$NAVIGATION} -
    -     		- - - {$WORDTEMPLATEOPTIONS}{$MERGEBUTTON} - -
    -
    -
    - - -{$SELECT_SCRIPT} - +{**} +{if $smarty.request.ajax neq ''} +&#&#&#{$ERROR}&#&#&# +{/if} + +
    + + + + + + + + + + +
    + + + + + + + + + + + +
    + {foreach key=button_check item=button_label from=$BUTTONS} + {if $button_check eq 'del'} + + {elseif $button_check eq 's_mail'} + + {elseif $button_check eq 's_cmail'} + + {elseif $button_check eq 'c_status'} + + {elseif $button_check eq 'c_owner'} + {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} + + {/if} + {/if} + + {/foreach} + {$RECORD_COUNTS} + + {$NAVIGATION} +
    +     		+ + {if $HIDE_CUSTOM_LINKS neq '1'} + + + + + {if $ALL eq 'All'} + + {else} + + {/if} + +
    {$APP.LBL_VIEW} + {$APP.LNK_CV_CREATEVIEW} + | + {$APP.LNK_CV_EDIT} + | + {$APP.LNK_CV_DELETE}{$APP.LNK_CV_CREATEVIEW} + | + {$APP.LNK_CV_EDIT} + | + {$APP.LNK_CV_DELETE}
    + + {/if} + +
    + + +
    + + + + + {foreach name="listviewforeach" item=header from=$LISTHEADER} + + {/foreach} + + + {foreach item=entity key=entity_id from=$LISTENTITY} + + + {foreach item=data from=$entity} + + {/foreach} + + {foreachelse} + + {/foreach} +
    {$header}
    {$data}
    +
    + {assign var=vowel_conf value='LBL_A'} + {if $MODULE eq 'Accounts' || $MODULE eq 'Invoice'} + {assign var=vowel_conf value='LBL_AN'} + {/if} + {assign var=MODULE_CREATE value=$SINGLE_MOD} + {if $MODULE eq 'HelpDesk'} + {assign var=MODULE_CREATE value='Ticket'} + {/if} + + {if $CHECK.EditView eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'} + + + + + + + + + +
    + {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} + {$APP.LBL_NO} {$APP.$MODULE_CREATE} {$APP.LBL_FOUND} ! + {elseif $MODULE eq 'Calendar'} + {$APP.LBL_NO} {$APP.ACTIVITIES} {$APP.LBL_FOUND} ! + {else} + {$APP.LBL_NO} {$APP.$MODULE_CREATE}s {$APP.LBL_FOUND} ! + {/if} +
    {$APP.LBL_YOU_CAN_CREATE} {$APP.$vowel_conf} + + {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} + {$MOD.$MODULE_CREATE} + {else} + {$APP.$MODULE_CREATE} + {/if} + + {$APP.LBL_NOW}. {$APP.LBL_CLICK_THE_LINK}:
    + {if $MODULE neq 'Calendar'} +   -{$APP.LBL_CREATE} {$APP.$vowel_conf} + {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} + {$MOD.$MODULE_CREATE} + {else} + {$APP.$MODULE_CREATE} + {/if} +
    + {else} +   -{$APP.LBL_CREATE} {$APP.LBL_AN} {$APP.Event}
    +   -{$APP.LBL_CREATE} {$APP.LBL_A} {$APP.Task} + {/if} +
    + {else} + + + + + {else} + {$APP.LBL_NO} {$APP.$MODULE_CREATE}s {$APP.LBL_FOUND} ! + {/if} + + + + +
    + {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} + {$APP.LBL_NO} {$APP.$MODULE_CREATE} {$APP.LBL_FOUND} !
    {$APP.LBL_YOU_ARE_NOT_ALLOWED_TO_CREATE} {$APP.$vowel_conf} + {if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'} + {$MOD.$MODULE_CREATE} + {else} + {$APP.$MODULE_CREATE} + {/if} +
    +
    + {/if} +
    +
    +
    + + + + + + + + +
    + {foreach key=button_check item=button_label from=$BUTTONS} + {if $button_check eq 'del'} + + {elseif $button_check eq 's_mail'} + + {elseif $button_check eq 's_cmail'} + + {elseif $button_check eq 'c_status'} + + {elseif $button_check eq 'c_owner'} + {if $MODULE neq 'Notes' && $MODULE neq 'Products' && $MODULE neq 'Faq' && $MODULE neq 'Vendors' && $MODULE neq 'PriceBooks'} + + {/if} + {/if} + + {/foreach} + {$RECORD_COUNTS} + + {$NAVIGATION} +
    +     		+ + + {$WORDTEMPLATEOPTIONS}{$MERGEBUTTON} + +
    +
    +
    + +
    +{$SELECT_SCRIPT} + Modified: vtigercrm/branches/5.0.3/include/js/Merge.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/Merge.js (original) +++ vtigercrm/branches/5.0.3/include/js/Merge.js Tue Apr 17 09:43:35 2007 @@ -11,56 +11,35 @@ //to merge a list of acounts with a template function massMerge(module) { - x = document.massdelete.selected_id.length; - var viewid = document.massdelete.viewname.value; - idstring = ""; + var select_options = document.getElementsByName('selected_id'); + var x = select_options.length; + var viewid =getviewId(); + idstring = ""; - if ( x == undefined) - { - - if (document.massdelete.selected_id.checked) - { - document.massdelete.idlist.value=document.massdelete.selected_id.value; - } - else - { - - alert(alert_arr.SELECT); - return false; - } - } - else - { - xx = 0; - for(i = 0; i < x ; i++) - { - if(document.massdelete.selected_id[i].checked) - { - idstring = document.massdelete.selected_id[i].value +";"+idstring - xx++ - } - } - if (xx != 0) - { - document.massdelete.idlist.value=idstring; - } - else - { - - alert(alert_arr.SELECT); - return false; - } - } - - if(getObj('selectall').checked == true) - { - getObj('idlist').value = getObj('allids').value - } - if(getObj('mergefile').value == '') { alert(alert_arr.SELECT_TEMPLATE_TO_MERGE); return false; } - document.massdelete.action="index.php?module="+module+"&action=Merge&return_module="+module+"&return_action=index"; + xx = 0; + for(i = 0; i < x ; i++) + { + if(select_options[i].checked) + { + idstring = select_options[i].value +";"+idstring + xx++ + } + } + if (xx != 0) + { + document.getElementById('idlist').value=idstring; + } + else + { + alert(alert_arr.SELECT); + return false; + } + + + document.getElementById('massdelete').action="index.php?module="+module+"&action=Merge&return_module="+module+"&return_action=index"; } From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 11:47:02 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 15:47:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10711 - in /vtigercrm/branches/5.0.3/modules/Reports: ReportRun.php Reports.php Message-ID: <20070417154703.2069F78D86B@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 17 09:46:57 2007 New Revision: 10711 Log: salutation for Leads does not export in reports - fixed. Fixes #2650 Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php vtigercrm/branches/5.0.3/modules/Reports/Reports.php Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Tue Apr 17 09:46:57 2007 @@ -144,11 +144,11 @@ $query = "select vtiger_field.fieldname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where"; if($module == "Calendar") { - $query .= " vtiger_field.tabid in (9,16) and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; + $query .= " vtiger_field.tabid in (9,16) and vtiger_field.displaytype in (1,2,3) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; } else { - $query .= " vtiger_field.tabid in (select tabid from vtiger_tab where vtiger_tab.name in ('".$this->primarymodule."','".$this->secondarymodule."')) and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; + $query .= " vtiger_field.tabid in (select tabid from vtiger_tab where vtiger_tab.name in ('".$this->primarymodule."','".$this->secondarymodule."')) and vtiger_field.displaytype in (1,2,3) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; } $result = $adb->query($query); Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Reports.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Reports.php Tue Apr 17 09:46:57 2007 @@ -819,11 +819,11 @@ $query = "select vtiger_field.fieldname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where"; if($module == "Calendar") { - $query .= " vtiger_field.tabid in (9,16) and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; + $query .= " vtiger_field.tabid in (9,16) and vtiger_field.displaytype in (1,2,3) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; } else { - $query .= " vtiger_field.tabid in (select tabid from vtiger_tab where vtiger_tab.name in ('".$this->primodule."','".$this->secmodule."')) and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; + $query .= " vtiger_field.tabid in (select tabid from vtiger_tab where vtiger_tab.name in ('".$this->primodule."','".$this->secmodule."')) and vtiger_field.displaytype in (1,2,3) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence"; } $result = $adb->query($query); From cce at got-webdesign.com Tue Apr 17 17:02:28 2007 From: cce at got-webdesign.com (Dieted K. Oncology) Date: Tue, 17 Apr 2007 17:02:28 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2051608720.20070417170228@got-webdesign.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/6e1d9527/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: exaggerates.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/6e1d9527/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 12:21:34 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 16:21:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10712 - /vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php Message-ID: <20070417162134.46FB17D26B4@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Apr 17 10:21:26 2007 New Revision: 10712 Log: Firefox plugin version compatibility has been fixed.by Bharath Modified: vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php Modified: vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php ============================================================================== --- vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php (original) +++ vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php Tue Apr 17 10:21:26 2007 @@ -114,7 +114,7 @@ $server->register( 'LogintoVtigerCRM', - array('user_name'=>'xsd:string','password'=>'xsd:string'), + array('user_name'=>'xsd:string','password'=>'xsd:string','version'=>'xsd:string'), array('return'=>'xsd:string'), $NAMESPACE); @@ -363,12 +363,16 @@ return $accessDenied; } } -function LogintoVtigerCRM($user_name,$password) +function LogintoVtigerCRM($user_name,$password,$version) { global $log; require_once('modules/Users/Users.php'); - - $return_access = "FALSE"; + include('vtigerversion.php'); + if($version != $vtiger_current_version) + { + return "VERSION"; + } + $return_access = "FALSES"; $objuser = new Users(); @@ -378,15 +382,15 @@ $objuser->load_user($password); if($objuser->is_authenticated()) { - $return_access = "TRUE"; + $return_access = "TRUES"; }else { - $return_access = "FALSE"; + $return_access = "FALSES"; } }else { //$server->setError("Invalid username and/or password"); - $return_access = "FALSE"; + $return_access = "FALSES"; } $objuser = $objuser; return $return_access; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 17 12:24:09 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 17 Apr 2007 16:24:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10713 - /vtigertoolbar/trunk/firefox/chrome/content/vtigercrm_toolbar.js Message-ID: <20070417162409.F0A497DA6F8@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Apr 17 10:24:02 2007 New Revision: 10713 Log: firefox plugin version compatibility issue fixed.by Bharath Modified: vtigertoolbar/trunk/firefox/chrome/content/vtigercrm_toolbar.js Modified: vtigertoolbar/trunk/firefox/chrome/content/vtigercrm_toolbar.js ============================================================================== Binary files - no diff available. From celia at gp-ts.com Tue Apr 17 13:16:41 2007 From: celia at gp-ts.com (Nan C. Sealer) Date: Tue, 17 Apr 2007 13:16:41 -0400 Subject: [Vtigercrm-commits] Why should you pay more? Message-ID: <1059131351.20070417131641@gp-ts.com> The most powerful medicines for you! All-Natural Magnesium Oxide - $35.99 - All-Natural Magnesium Oxide is a rich source of elemental magnesium, an essential mineral. Magnesium plays a role in many vital body functions, including protein biosynthesis, as well as bone and muscle formation, and as a cofactor in hundreds of enzymatic reactions. Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. Clearitol - $40.5 - specially formulated to help correct acne-causing internal imbalances in both adults and adolescents. and more! our site http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From rmaynar at ghosthack.net Tue Apr 17 11:15:33 2007 From: rmaynar at ghosthack.net (Intermingling H. Demarcating) Date: Tue, 17 Apr 2007 11:15:33 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3265908972.20070417111533@ghosthack.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/886cc14a/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Qiqihar.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/886cc14a/attachment.gif From mcmillan at gowebtechnology.com Tue Apr 17 13:33:07 2007 From: mcmillan at gowebtechnology.com (Hounded A. Marx) Date: Tue, 17 Apr 2007 17:33:07 +0000 Subject: [Vtigercrm-commits] Good health is above wealth Message-ID: <7006112668.20070417173307@gowebtechnology.com> The most powerful medicines for you! Pure Natural Hoodia - $35.99 - Pure Natural Hoodia is a natural weght loss pill containing Hoodia Gordoni extract. Lipothin - $35.99 - the finest lipotropic fat burner ever! Made from only the finest pharmaceutical grade botanicals, Lipothin contains a unique and highly effective formula of all-natural ingredients which will increase your heart rate, suppress your appetite, and greatly accelerate the burning of fat. Augmetin - $4.8 - FDA-approved antibiotic for both acute bacterial sinusitis (ABS) and community-acquired pneumonia (CAP). and more! our site http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From noen at godiaygarcia.com Tue Apr 17 14:45:39 2007 From: noen at godiaygarcia.com (George Cooley) Date: Tue, 17 Apr 2007 18:45:39 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <1980706705.20070417184539@godiaygarcia.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/5ceddf6a/attachment-0001.html From choco at greentinted.net Tue Apr 17 15:04:49 2007 From: choco at greentinted.net (Clarke L. Hellenization) Date: Tue, 17 Apr 2007 19:04:49 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2564579236.20070417190449@greentinted.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/1377e5d3/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: bonnet.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/1377e5d3/attachment.gif From butcher at gorasrd.com Tue Apr 17 15:52:11 2007 From: butcher at gorasrd.com (Nurseryman H. Jealousy) Date: Tue, 17 Apr 2007 19:52:11 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4354428979.20070417195211@gorasrd.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/e5666a83/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Hellenistic.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/e5666a83/attachment.gif From darwin at gonzalezgroupinc.com Tue Apr 17 16:24:18 2007 From: darwin at gonzalezgroupinc.com (Refashioned U. Sisyphus) Date: Tue, 17 Apr 2007 16:24:18 -0400 Subject: [Vtigercrm-commits] You can't find cure that you need? Message-ID: <4150851801.20070417162418@gonzalezgroupinc.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://zuaj.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From extrapingon at global-transmission.com Tue Apr 17 16:27:39 2007 From: extrapingon at global-transmission.com (Dissemble H. Jackboot) Date: Tue, 17 Apr 2007 16:27:39 -0400 Subject: [Vtigercrm-commits] Can you imagine that you are healthy? Message-ID: <0330853257.20070417162739@global-transmission.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://zuaj.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From istaggerin at glenmoreantiques.com Tue Apr 17 16:27:45 2007 From: istaggerin at glenmoreantiques.com (Voided V. Bestiality) Date: Tue, 17 Apr 2007 16:27:45 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9103350757.20070417162745@glenmoreantiques.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/e8b6b2b7/attachment-0002.html From extrakrispy at grempompes.com Tue Apr 17 16:28:42 2007 From: extrakrispy at grempompes.com (Unstressed O. Nanchang) Date: Tue, 17 Apr 2007 16:28:42 -0400 Subject: [Vtigercrm-commits] No need to visit local drug store. Message-ID: <1364295647.20070417162842@grempompes.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://zuaj.hk Make right choice: buy medications at LegalRXMedications drug store! From pttaylor at ginecologiapreventiva.com Tue Apr 17 16:32:21 2007 From: pttaylor at ginecologiapreventiva.com (Furnished O. Cathedral) Date: Tue, 17 Apr 2007 16:32:21 -0400 Subject: [Vtigercrm-commits] All medications at low price! Message-ID: <2249491128.20070417163221@ginecologiapreventiva.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://zuaj.hk Only Secure and Confidential purchase! Verified buy VISA! From nicholsonl at goldenvoiceaudio.com Tue Apr 17 16:38:07 2007 From: nicholsonl at goldenvoiceaudio.com (Bushwhacker F. Unparalleled) Date: Tue, 17 Apr 2007 16:38:07 -0400 Subject: [Vtigercrm-commits] The most widely prescribed drugs Message-ID: <9782537917.20070417163807@goldenvoiceaudio.com> The most powerful medicines for you! Delay Ejaculation Pills - $139.48 - Premature ejaculation is a problem faced by men and couples for years. The new delay ejaculation pills is the answer you have to this small but devastating problem Premature ejaculation not only makes the man keep craving for more but has very bad consequences on the sexual psyche of a couple. Ultram - $1.83 - an analgesic used to treat or prevent pain. Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. and more! our site http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From lynch at gianluca-pacchioni.com Tue Apr 17 16:52:30 2007 From: lynch at gianluca-pacchioni.com (Wen E. Pressurization) Date: Tue, 17 Apr 2007 16:52:30 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1794808439.20070417165230@gianluca-pacchioni.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/8b9fd2af/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: funnel.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/8b9fd2af/attachment.gif From phhma at goofballlogic.com Tue Apr 17 22:05:11 2007 From: phhma at goofballlogic.com (Ordinals V. Nissan) Date: Tue, 17 Apr 2007 22:05:11 -0400 Subject: [Vtigercrm-commits] See the results after using V1 agra Message-ID: <9326738141.20070417220511@goofballlogic.com> The most powerful medicines for you! Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. Lipitor - $1.42 - used with diet changes to reduce the amount of cholesterol and certain fatty substances in the blood. Lowering blood levels of cholesterol and fats may help to prevent heart disease, angina, strokes, and heart attacks. and more! our site http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extraterrestos at gesaman.com Tue Apr 17 23:14:24 2007 From: extraterrestos at gesaman.com (Othello O. Spirituality) Date: Tue, 17 Apr 2007 23:14:24 -0400 Subject: [Vtigercrm-commits] Need to buy medications but don't know where? Message-ID: <6450892305.20070417231424@gesaman.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://mmera.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From cnt at gfms-metalsconsulting.com Tue Apr 17 19:59:14 2007 From: cnt at gfms-metalsconsulting.com (Restricted O. Revealings) Date: Tue, 17 Apr 2007 23:59:14 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3796900392.20070417235914@gfms-metalsconsulting.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://mmera.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/223503c8/attachment.html From rainbowkevin at gk-biz.com Tue Apr 17 20:15:03 2007 From: rainbowkevin at gk-biz.com (Stacey H. Fireplug) Date: Tue, 17 Apr 2007 20:15:03 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1463391163.20070417201503@gk-biz.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/3bea8f87/attachment-0002.html From crusherdm at gpgraph.net Tue Apr 17 20:25:04 2007 From: crusherdm at gpgraph.net (Crystallography O. Categorization) Date: Tue, 17 Apr 2007 20:25:04 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9756894143.20070417202504@gpgraph.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/03fa107e/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: shampoos.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/03fa107e/attachment.gif From extrad at gomediapost.com Tue Apr 17 20:25:34 2007 From: extrad at gomediapost.com (Rhomboides Q. Arno) Date: Tue, 17 Apr 2007 20:25:34 -0400 Subject: [Vtigercrm-commits] To buy or not to buy? Message-ID: <6200017034.20070417202534@gomediapost.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://zuaj.hk any pill you need! Absolutely Confidential and Secure purchase From pbkmr_x at gladle.net Tue Apr 17 20:25:43 2007 From: pbkmr_x at gladle.net (Kooking L. Baaed) Date: Tue, 17 Apr 2007 20:25:43 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0524826993.20070417202543@gladle.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/b6aa6e3b/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: guffaw.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/b6aa6e3b/attachment.gif From istobe at greenflask.com Tue Apr 17 20:28:34 2007 From: istobe at greenflask.com (Quickness H. Glinted) Date: Tue, 17 Apr 2007 20:28:34 -0400 Subject: [Vtigercrm-commits] Cheapest way to solve health problems. Message-ID: <4458420122.20070417202834@greenflask.com> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://zuaj.hk Make right choice: buy medications at LegalRXMedications drug store! From istenn at glro.com Tue Apr 17 20:29:44 2007 From: istenn at glro.com (Downstage S. Goiter) Date: Tue, 17 Apr 2007 20:29:44 -0400 Subject: [Vtigercrm-commits] On-line generic store Message-ID: <6751183527.20070417202944@glro.com> The most powerful medicines for you! Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. Delay Ejaculation Pills - $139.48 - Premature ejaculation is a problem faced by men and couples for years. The new delay ejaculation pills is the answer you have to this small but devastating problem Premature ejaculation not only makes the man keep craving for more but has very bad consequences on the sexual psyche of a couple. and more! our site http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From edward at great-grades.com Tue Apr 17 20:33:04 2007 From: edward at great-grades.com (Tientsin A. Juan) Date: Tue, 17 Apr 2007 20:33:04 -0400 Subject: [Vtigercrm-commits] Worry about your erection? Message-ID: <5418350250.20070417203304@great-grades.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://zuaj.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From ark at gnaty.com Tue Apr 17 20:46:06 2007 From: ark at gnaty.com (Caparison G. Dahomey) Date: Tue, 17 Apr 2007 20:46:06 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2697457226.20070417204606@gnaty.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/3c728ec7/attachment.html From sjohnson at giboon.com Tue Apr 17 21:48:47 2007 From: sjohnson at giboon.com (Hugeness E. Reconcilable) Date: Tue, 17 Apr 2007 21:48:47 -0400 Subject: [Vtigercrm-commits] Medications that you need! Message-ID: <0962085323.20070417214847@giboon.com> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://zuaj.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From harris at globalservicesrl.com Tue Apr 17 23:33:44 2007 From: harris at globalservicesrl.com (Sensitives T. Titus) Date: Tue, 17 Apr 2007 23:33:44 -0400 Subject: [Vtigercrm-commits] Can't afford medications you need? Message-ID: <8575903631.20070417233344@globalservicesrl.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://zuaj.hk Instant shipping worldwide! CONFIDENTIAL purchase! From istakal at gokearney.com Tue Apr 17 23:45:55 2007 From: istakal at gokearney.com (Introspective K. Hijacking) Date: Tue, 17 Apr 2007 23:45:55 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6684585694.20070417234555@gokearney.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/46c97fc9/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Foch.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/46c97fc9/attachment.gif From cesar at gigele.com Tue Apr 17 23:46:31 2007 From: cesar at gigele.com (Moaning B. Torus) Date: Tue, 17 Apr 2007 23:46:31 -0400 Subject: [Vtigercrm-commits] Pharmacy for everyone Message-ID: <5294705848.20070417234631@gigele.com> The most powerful medicines for you! Phentermine - $2.98 - a drug used in the short-term management of obesity. It comes in tablets or capsules of various colors depending on the strength of the medication; 15, 30 and 37.5 milligram pills available. Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. and more! our site http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From butler at goldenalaska.rydex.com Tue Apr 17 23:46:46 2007 From: butler at goldenalaska.rydex.com (Battle J. Charlatans) Date: Tue, 17 Apr 2007 23:46:46 -0400 Subject: [Vtigercrm-commits] Girls don't like you? Message-ID: <7437787418.20070417234646@goldenalaska.rydex.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://zuaj.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From crusherdaddy at gluvbox.com Tue Apr 17 23:36:19 2007 From: crusherdaddy at gluvbox.com (Waylon Soto) Date: Wed, 18 Apr 2007 03:36:19 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <4409491539.20070418033619@gluvbox.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070418/c1d73249/attachment-0001.html From stefylynn at granitbleu.com Tue Apr 17 23:53:01 2007 From: stefylynn at granitbleu.com (Comprehensible M. Ostracizing) Date: Tue, 17 Apr 2007 23:53:01 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1766736594.20070417235301@granitbleu.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070417/689d63e3/attachment.html From arvind at globalcut.com Wed Apr 18 00:32:32 2007 From: arvind at globalcut.com (Cinched K. Gladdens) Date: Wed, 18 Apr 2007 00:32:32 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <6340432910.20070418003232@globalcut.com> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://zuaj.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 18 00:53:30 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 18 Apr 2007 04:53:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10714 - /vtigercrm/branches/5.0.3/include/js/customview.js Message-ID: <20070418045330.F25557C7FDF@vtiger.fosslabs.com> Author: richie Date: Tue Apr 17 22:53:23 2007 New Revision: 10714 Log: fix for Custom fields type 'number' not work in products. Fixes #3649 --minnie Modified: vtigercrm/branches/5.0.3/include/js/customview.js Modified: vtigercrm/branches/5.0.3/include/js/customview.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/customview.js (original) +++ vtigercrm/branches/5.0.3/include/js/customview.js Tue Apr 17 22:53:23 2007 @@ -82,7 +82,7 @@ return false } var decimallength = document.addtodb.fldDecimal.value; - if(fieldtype == 'Percent' || fieldtype == 'Currency' || fieldtype == 'Number') + if(fieldValueArr[fieldtype] == 'Percent' || fieldValueArr[fieldtype] == 'Currency' || fieldValueArr[fieldtype] == 'Number') { if(decimallength == '') decimallength = 0; From crushercurtis at gouldby.com Wed Apr 18 01:07:13 2007 From: crushercurtis at gouldby.com (Rebuttals A. Differentiation) Date: Wed, 18 Apr 2007 01:07:13 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3917261204.20070418010713@gouldby.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070418/84a725f0/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: brethren.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070418/84a725f0/attachment.gif From sales.email.q at gholmes.plus.com Wed Apr 18 02:16:29 2007 From: sales.email.q at gholmes.plus.com (Portfolio U. Kurdistan) Date: Wed, 18 Apr 2007 02:16:29 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <6849005018.20070418021629@gholmes.plus.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://zuaj.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From istobbe at getyourown.net Wed Apr 18 02:28:10 2007 From: istobbe at getyourown.net (Far M. Goofs) Date: Wed, 18 Apr 2007 02:28:10 -0400 Subject: [Vtigercrm-commits] Say I can have sex all night long! Message-ID: <3210988701.20070418022810@getyourown.net> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://zuaj.hk Only Secure and Confidential purchase! Verified buy VISA! From hooks at globalvisions.com Wed Apr 18 02:28:58 2007 From: hooks at globalvisions.com (Mixer F. Incompetents) Date: Wed, 18 Apr 2007 02:28:58 -0400 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <3260537071.20070418022858@globalvisions.com> The most powerful medicines for you! Pheromone perfume for women - $35.99 - The human pheromones that attracts males has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of women, these natural pheromones are an evolutionary remnant from a time when human males relied on scent to locate female mates. Zolioft - $1.08 - a type of antidepressant known as a selective serotonin reuptake inhibitor (SSRI). Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. and more! our site http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 18 02:32:14 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 18 Apr 2007 06:32:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10715 - /vtigercrm/branches/5.0.3/Smarty/templates/GlobalListView.tpl Message-ID: <20070418063214.4FE9A7DA6F6@vtiger.fosslabs.com> Author: richie Date: Wed Apr 18 00:32:06 2007 New Revision: 10715 Log: * Fixed the issue that vendors is not displayed when we click on tag from Home page, Fixed #3378 Modified: vtigercrm/branches/5.0.3/Smarty/templates/GlobalListView.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/GlobalListView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/GlobalListView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/GlobalListView.tpl Wed Apr 18 00:32:06 2007 @@ -21,12 +21,6 @@
    {/if} - -{if $SEARCH_MODULE eq 'All'} - -{/if} {**} @@ -114,5 +108,11 @@
    +{if $SEARCH_MODULE eq 'All'} + +{/if} + {$SELECT_SCRIPT} From parms at gomen.klfree.net Wed Apr 18 02:56:26 2007 From: parms at gomen.klfree.net (Reincarnated Q. Suggestible) Date: Wed, 18 Apr 2007 02:56:26 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9687240310.20070418025626@gomen.klfree.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070418/2229cf65/attachment-0001.html From posey at globalfreightsolutions.com Wed Apr 18 03:05:08 2007 From: posey at globalfreightsolutions.com (Midway Q. Redness) Date: Wed, 18 Apr 2007 03:05:08 -0400 Subject: [Vtigercrm-commits] Don't have time to visit local drug store? Message-ID: <3876309682.20070418030508@globalfreightsolutions.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://zuaj.hk Verified by VISA and sell FDA Approved Drugs only! From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 18 03:35:41 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 18 Apr 2007 07:35:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10716 - /vtigercrm/branches/5.0.3/modules/Portal/Popup.php Message-ID: <20070418073541.8F6647DA6FD@vtiger.fosslabs.com> Author: richie Date: Wed Apr 18 01:35:36 2007 New Revision: 10716 Log: fix for Site :Problem in editing an existing site. Fixes #3394 --minnie Modified: vtigercrm/branches/5.0.3/modules/Portal/Popup.php Modified: vtigercrm/branches/5.0.3/modules/Portal/Popup.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Portal/Popup.php (original) +++ vtigercrm/branches/5.0.3/modules/Portal/Popup.php Wed Apr 18 01:35:36 2007 @@ -10,12 +10,7 @@ ********************************************************************************/ require_once('modules/Portal/Portal.php'); -global $app_strings; -global $app_list_strings; -global $mod_strings; -global $adb; - -global $theme; +global $app_strings,$app_list_strings,$mod_strings,$adb,$theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; if(isset($_REQUEST['record']) && $_REQUEST['record'] !='') @@ -24,7 +19,9 @@ $query="select * from vtiger_portal where portalid =$portalid"; $result=$adb->query($query); $portalname = $adb->query_result($result,0,'portalname'); - $portalurl = $adb->query_result($result,0,'portalurl'); + $portalurl = $adb->query_result($result,0,'portalurl'); + /* to remove http:// from portal url*/ + $portalurl = preg_replace("/http:\/\//i","",$portalurl); } $portal_inputs=''; $portal_inputs.='
    From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 18 03:37:07 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 18 Apr 2007 07:37:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10717 - /vtigercrm/branches/5.0.3/modules/Calendar/ListView.php Message-ID: <20070418073707.50F3E7DA6F6@vtiger.fosslabs.com> Author: richie Date: Wed Apr 18 01:37:02 2007 New Revision: 10717 Log: fix for Basic Search fields include the Close action. Fixes #3345 --minnie Modified: vtigercrm/branches/5.0.3/modules/Calendar/ListView.php Modified: vtigercrm/branches/5.0.3/modules/Calendar/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/ListView.php Wed Apr 18 01:37:02 2007 @@ -210,6 +210,7 @@ $smarty->assign("LISTHEADER", $listview_header); $listview_header_search=getSearchListHeaderValues($focus,"Calendar",$url_string,$sorder,$order_by,"",$oCustomView); +unset($listview_header_search["eventstatus"]); $smarty->assign("SEARCHLISTHEADER", $listview_header_search); $listview_entries = getListViewEntries($focus,"Calendar",$list_result,$navigation_array,"","","EditView","Delete",$oCustomView); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 18 03:51:41 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 18 Apr 2007 07:51:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10718 - in /vtigercrm/branches/5.0.3/modules: Calendar/addEventUI.php Settings/CurrencyListView.php Settings/CustomFieldList.php Settings/listroles.php Users/Login.php Message-ID: <20070418075141.9003F7DA6FD@vtiger.fosslabs.com> Author: richie Date: Wed Apr 18 01:51:32 2007 New Revision: 10718 Log: fix for i18n issue: lots of untranslatable alt= and title=. minnie Modified: vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php vtigercrm/branches/5.0.3/modules/Settings/CurrencyListView.php vtigercrm/branches/5.0.3/modules/Settings/CustomFieldList.php vtigercrm/branches/5.0.3/modules/Settings/listroles.php vtigercrm/branches/5.0.3/modules/Users/Login.php Modified: vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php Wed Apr 18 01:51:32 2007 @@ -296,7 +296,7 @@ hour_format,'start');?> - Set date.. + <?php echo $mod_strings['LBL_SET_DATE']?> Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Fri Apr 20 02:23:45 2007 @@ -171,6 +171,7 @@ var mailbox = "mailbox;?>"; var box_refresh=box_refresh;?>; var webmail = new Array(); +var webmail2 = new Array(); var timer; var command; var id; @@ -262,6 +263,7 @@ // during the preview window load instead. var msgCount = ""; var start = ""; +var gselected_mail = ''; msgno] = $val; $hdr = @imap_headerinfo($MailBox->mbox, $val->msgno); - //Added to get the UTF-8 string - 30-11-06 - Mickie - //we have to do this utf8 decode for the fields which may contains special characters -- Mickie - 02-02-07 $val->from = utf8_decode(imap_utf8(addslashes($val->from))); $val->to = utf8_decode(imap_utf8(addslashes($val->to))); $val->subject = utf8_decode(imap_utf8($val->subject)); + $list = explode("<",$val->from); + $js_array .= "webmail2[".$val->msgno."] = new Array();"; + $js_array .= "webmail2[".$val->msgno."]['from'] = '".addslashes($list[0])."';"; + $js_array .= "webmail2[".$val->msgno."]['to'] = '".addslashes($val->to)."';"; + $js_array .= "webmail2[".$val->msgno."]['subject'] = '".addslashes($val->subject)."';"; + $js_array .= "webmail2[".$val->msgno."]['date'] = '".addslashes($val->date)."';"; + $js_array .= "webmail2[".$val->msgno."]['cc'] = '".$hdr->ccaddress."';"; } } $search_fields = Array("SUBJECT","BODY","TO","CC","BCC","FROM"); @@ -205,8 +210,8 @@ if($numEmails==0) {$num=$numEmails;} else {$num=($numEmails-1);} $folders .= '
  •   '.$tmpval.'  '; - if($new_msgs > 0) - $folders .= '('.$new_msgs.')  
    • '; + if($unread_msgs > 0) + $folders .= '('.$unread_msgs.')  '; } else { $box = imap_status($MailBox->mbox, "{".$MailBox->imapServerAddress."}".$tmpval, SA_ALL); @@ -222,7 +227,7 @@ $boxes .= ''; } imap_close($MailBox->mbox); - +echo ''; $smarty = new vtigerCRM_Smarty; //$smarty->assign("USERID", $current_user->id); $smarty->assign("MOD", $mod_strings); @@ -242,6 +247,7 @@ $smarty->assign("MAILBOX", $MailBox->mailbox); $smarty->assign("ACCOUNT", $MailBox->display_name); $smarty->assign("BOXLIST",$folders); +$smarty->assign("MAIL_INFO",$js_array); //$smarty->assign("DEGRADED_SERVICE",$degraded_service); $smarty->display("ListViewAjax.tpl"); ?> Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Fri Apr 20 02:23:45 2007 @@ -9,6 +9,12 @@ ********************************************************************************/ function load_webmail(mid) { var node = $("row_"+mid); + var webmail2 = new Array(); + if(getObj("js_arr")){ + eval(getObj("js_arr").innerHTML); + } + else + webmail2 = null; if(typeof($('fnt_subject_'+mid)) != "undefined" && $('fnt_subject_'+mid).color=="green") { $('fnt_subject_'+mid).color=""; @@ -36,13 +42,20 @@ )); } node.className='read_email'; - - $("from_addy").innerHTML = " "+webmail[mid]["from"]; - $("to_addy").innerHTML = " "+webmail[mid]["to"]; - $("webmail_subject").innerHTML = " "+webmail[mid]["subject"]; - $("webmail_date").innerHTML = " "+webmail[mid]["date"]; - $("webmail_cc").innerHTML = " "+webmail[mid]["cc"]; - + if(webmail2 == null){ + $("from_addy").innerHTML = " "+webmail[mid]["from"]; + $("to_addy").innerHTML = " "+webmail[mid]["to"]; + $("webmail_subject").innerHTML = " "+webmail[mid]["subject"]; + $("webmail_date").innerHTML = " "+webmail[mid]["date"]; + $("webmail_cc").innerHTML = " "+webmail[mid]["cc"]; + } + else{ + $("from_addy").innerHTML = " "+webmail2[mid]["from"]; + $("to_addy").innerHTML = " "+webmail2[mid]["to"]; + $("webmail_subject").innerHTML = " "+webmail2[mid]["subject"]; + $("webmail_date").innerHTML = " "+webmail2[mid]["date"]; + $("webmail_cc").innerHTML = " "+webmail2[mid]["cc"]; + } //Fix for webmails body display in IE - dartagnanlaf /* new Ajax.Request( @@ -88,13 +101,50 @@ $("full_view").removeChild($("full_view").firstChild); $("full_view").appendChild(Builder.node('a',{href: 'javascript:;', onclick: 'OpenCompose('+mid+',\'full_view\')'},'Full Email View')); - makeSelected(node.id) } function displayAttachments(mid) { var url = "index.php?module=Webmails&action=dlAttachments&mailid="+mid+"&mailbox="+mailbox; window.open(url,"Download Attachments",'menubar=no,toolbar=no,location=no,status=no,resizable=no,width=450,height=450'); } +function OpenCompose(id,mode) +{ + switch(mode) + { + case 'edit': + url = 'index.php?module=Webmails&action=EditView&record='+id; + break; + case 'create': + url = 'index.php?module=Emails&action=EmailsAjax&file=EditView'; + break; + case 'forward': + url = 'index.php?module=Emails&action=EmailsAjax&mailid='+id+'&forward=true&webmail=true&file=EditView&mailbox='+mailbox; + break; + case 'reply': + url = 'index.php?module=Emails&action=EmailsAjax&mailid='+id+'&reply=single&webmail=true&file=EditView&mailbox='+mailbox; + break; + case 'replyall': + url = 'index.php?module=Emails&action=EmailsAjax&mailid='+id+'&reply=all&webmail=true&file=EditView&mailbox='+mailbox; + break; + case 'attachments': + url = 'index.php?module=Webmails&action=dlAttachments&mailid='+id+'&mailbox='+mailbox; + break; + case 'full_view': + url = 'index.php?module=Webmails&action=DetailView&record='+id+'&mailid='+id+'&mailbox='+mailbox; + break; + } + openPopUp('xComposeEmail',this,url,'createemailWin',830,662,'menubar=no,toolbar=no,location=no,status=no,resizable=yes,scrollbars=yes'); +} + +function makeSelected(rowId) +{ + if(gselected_mail != '') + $(gselected_mail).className = ''; + + $(rowId).className = 'mailSelected_select'; + gselected_mail = rowId; +} + function showRelationships(mid) { // TODO: present the user with a simple DHTML div to // choose what type of relationship they would like to create @@ -166,10 +216,12 @@ ); } function check_for_new_mail(mbox) { - window.location=window.location; + //window.location=window.location; if(degraded_service == 'true') { return; } + mailbox = mbox; + runEmailCommand("reload",0); $("status").style.display="block"; /* new Ajax.Request( @@ -454,6 +506,7 @@ function runEmailCommand(com,id) { command=com; id=id; + gselected_mail = ''; if(com == 'delete_msg') { if(!confirm(alert_arr.DELETE+" "+alert_arr.MAIL+" ?")) @@ -470,7 +523,8 @@ } else qry_str = ""; - $("status").style.display="block"; + + $("status").style.display="block"; new Ajax.Request( 'index.php', {queue: {position: 'end', scope: 'command'}, @@ -484,7 +538,6 @@ case 'reload': $("rssScroll").innerHTML = resp; var unread_count = parseInt($(mailbox+"_tempcount").innerHTML); - //$("nav").innerHTML = $("navTemp").innerHTML; if(unread_count > 0) { $(mailbox+"_unread").innerHTML = unread_count; } @@ -492,12 +545,9 @@ $(mailbox+"_count").innerHTML = ""; } $("nav").innerHTML = $("navTemp").innerHTML; - if(change_box != 1){ - $("box_list").innerHTML = $("temp_boxlist").innerHTML; - change_box = 0; - } + $("box_list").innerHTML = $("temp_boxlist").innerHTML; $("move_pane").innerHTML = $("temp_movepane").innerHTML; - $("temp_boxlist").innerHTML = ""; + // $("temp_boxlist").innerHTML = ""; $("temp_movepane").innerHTML = ""; $("navTemp").innerHTML = ''; $(mailbox+"_tempcount").innerHTML = ""; @@ -536,7 +586,7 @@ ); try { - $("del_link_"+id).innerHTML = ''+alert_arr.LBL_DEL+''; + $("del_link_"+id).innerHTML = 'del'; new Effect.Fade(row,{queue: {position: 'end', scope: 'effect'},duration: '0.5'}); tmp = document.getElementsByClassName("previewWindow"); @@ -573,7 +623,7 @@ } ); - $("del_link_"+id).innerHTML = ''+alert_arr.LBL_DEL+''; + $("del_link_"+id).innerHTML = 'del'; new Effect.Fade(row,{queue: {position: 'end', scope: 'effect'},duration: '1.0'}); tmp = document.getElementsByClassName("previewWindow"); @@ -591,7 +641,7 @@ node.style.display = ''; var newhtml = remove(remove(node.innerHTML,''),''); node.innerHTML=newhtml; - $("del_link_"+id).innerHTML = ''+alert_arr.LBL_DEL+''; + $("del_link_"+id).innerHTML = 'del'; $("status").style.display="none"; break; case 'clear_flag': @@ -635,7 +685,8 @@ } function changeMbox(box) { mailbox=box; - start = 0; + start = 0; + change_box=1; runEmailCommand("reload",0); //location.href = "index.php?module=Webmails&action=index&mailbox="+box; } From ksbmorck at graddo.com Fri Apr 20 04:38:12 2007 From: ksbmorck at graddo.com (Mealies H. Oratory) Date: Fri, 20 Apr 2007 04:38:12 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <2398500233.20070420043812@graddo.com> The most powerful medicines for you! Nymphomax - $35.99 - Helps women to achieve multiple and more powerful orgasms with this unique female sexual stimulant. Cloalis Soft Tabs - $5.78 - Just like regular Clualis but specially formulated, these pills are soft and dissolvable under the tongue. The effect of this is more direct absorption into the bloodstream, rather than through the stomach. Result ? a powerful, lasting effect of up to 36 hours. Proprecia - $1.03 - first and only FDA-approved pill demonstrated to treat male pattern hair loss on the vertex (top of head) and anterior mid-scalp area (middle front of head) in men only. and more! our site http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 04:32:41 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 08:32:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10742 - in /vtigercrm/branches/5.0.3: Smarty/templates/ComposeEmail.tpl modules/Emails/EditView.php modules/Emails/Save.php modules/Emails/language/en_us.lang.php Message-ID: <20070420083241.A6C0A7DA476@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 02:32:12 2007 New Revision: 10742 Log: * Fixed the file validation issue, Fixed #3131 Modified: vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl vtigercrm/branches/5.0.3/modules/Emails/EditView.php vtigercrm/branches/5.0.3/modules/Emails/Save.php vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl Fri Apr 20 02:32:12 2007 @@ -62,7 +62,7 @@ -   +   {else} @@ -131,7 +131,7 @@ {elseif $elements.2.0 eq 'description'} - {if $WEBMAIL eq 'true'} + {if $WEBMAIL eq 'true' or $RET_ERROR eq 1} {else} {/if} Modified: vtigercrm/branches/5.0.3/modules/Emails/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/EditView.php Fri Apr 20 02:32:12 2007 @@ -288,7 +288,20 @@ $smarty->assign("FILENAME_TEXT", "(".$focus->filename.")"); $smarty->assign("FILENAME", $focus->filename); } - +if($ret_error == 1) { + $smarty->assign("RET_ERROR",$ret_error); + if($ret_toadd != '') + $smarty->assign("TO_MAIL",$ret_toadd); + $ret_toadd = ''; + if($ret_subject != '') + $smarty->assign("SUBJECT",$ret_subject); + if($ret_ccaddress != '') + $smarty->assign("CC_MAIL",$ret_ccaddress); + if($ret_bccaddress != '') + $smarty->assign("BCC_MAIL",$ret_bccaddress); + if($ret_description != '') + $smarty->assign("DESCRIPTION", $ret_description); +} $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); Modified: vtigercrm/branches/5.0.3/modules/Emails/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/Save.php Fri Apr 20 02:32:12 2007 @@ -59,9 +59,46 @@ $focus = new Emails(); -global $current_user; +global $current_user,$mod_strings,$app_strings; setObjectValuesFromRequest(&$focus); //Check if the file is exist or not. +//$file_name = ''; +$file_name = $_FILES['filename']['name'];//preg_replace('/\s+/', '_', $_FILES['filename']['name']); +$errorCode = $_FILES['filename']['error']; +$errormessage = ""; +if($file_name != '' && $_FILES['filename']['size'] == 0){ + if($errorCode == 4 || $errorCode == 0) + { + if($_FILES['filename']['size'] == 0) + $errormessage = "".$mod_strings['LBL_PLEASE_ATTACH']."
    "; + } + else if($errorCode == 2) + { + $errormessage = "".$mod_strings['LBL_EXCEED_MAX'].$upload_maxsize.$mod_strings['LBL_BYTES']."
    "; + } + else if($errorCode == 6) + { + $errormessage = "".$mod_strings['LBL_KINDLY_UPLOAD']."
    " ; + } + else if($errorCode == 3 ) + { + if($_FILES['filename']['size'] == 0) + $errormessage = "".$mod_strings['LBL_PLEASE_ATTACH']."
    "; + } + else{} + if($errormessage != ""){ + $ret_error = 1; + $ret_toadd = $_REQUEST['to_add']; + $ret_subject = $_REQUEST['subject']; + $ret_ccaddress = $_REQUEST['ccmail']; + $ret_bccaddress = $_REQUEST['bccmail']; + $ret_description = $_REQUEST['description']; + echo $errormessage; + include("EditView.php"); + exit(); + } +} + if($_FILES["filename"]["size"] == 0 && $_FILES["filename"]["name"] != '') { $file_upload_error = true; Modified: vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php Fri Apr 20 02:32:12 2007 @@ -169,6 +169,10 @@ 'FEATURE_AVAILABLE_INFO' => 'This feature is currently only available for Microsoft Internet Explorer 5.5+ users\n\nWait f or an update!', 'DOWNLOAD_CONFIRAMATION' => 'Do you want to download the file ?', +'LBL_PLEASE_ATTACH' => 'Please give a valid file to attach and try again!', +'LBL_KINDLY_UPLOAD' => 'Please configure upload_tmp_dir variable in php.ini file.', +'LBL_EXCEED_MAX' => 'Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than ', +'LBL_BYTES' => ' bytes', ); From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 04:41:43 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 08:41:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10743 - /vtigercrm/branches/5.0.3/include/utils/export.php Message-ID: <20070420084143.062167DA76C@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 02:41:38 2007 New Revision: 10743 Log: * Fixed the issue in export, Fixed #3647 Modified: vtigercrm/branches/5.0.3/include/utils/export.php Modified: vtigercrm/branches/5.0.3/include/utils/export.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/export.php (original) +++ vtigercrm/branches/5.0.3/include/utils/export.php Fri Apr 20 02:41:38 2007 @@ -134,7 +134,7 @@ { $value=br2nl_vt($value); } - $value = preg_replace("/(<\/?)(\w+)([^>]*>)/i","",$value); + $value = preg_replace("/(<\/?)(\w+)([^>]*>)/i","",html_entity_decode($value, ENT_QUOTES, "ISO-8859-1")); array_push($new_arr, preg_replace("/\"/","\"\"",$value)); } $line = implode("\",\"",$new_arr); From extremeja at gregpearson.ca Fri Apr 20 05:17:55 2007 From: extremeja at gregpearson.ca (Boll E. McDonald) Date: Fri, 20 Apr 2007 05:17:55 -0400 Subject: [Vtigercrm-commits] Say I can have sex all night long! Message-ID: <2793312147.20070420051755@gregpearson.ca> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://zuaj.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From istophertidmore at gordonanderson.net Fri Apr 20 05:45:07 2007 From: istophertidmore at gordonanderson.net (Immutability I. Applied) Date: Fri, 20 Apr 2007 05:45:07 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5149412487.20070420054507@gordonanderson.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://zuaj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/9ecaa0ab/attachment-0001.html From arthur at gorman.esc14.net Fri Apr 20 05:52:51 2007 From: arthur at gorman.esc14.net (Sociably E. Emblem) Date: Fri, 20 Apr 2007 05:52:51 -0400 Subject: [Vtigercrm-commits] Want to on the top all night? Message-ID: <2598321071.20070420055251@gorman.esc14.net> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://zuaj.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From jms at ghostboy.com Fri Apr 20 06:21:44 2007 From: jms at ghostboy.com (Attacked Q. Tumor) Date: Fri, 20 Apr 2007 06:21:44 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8938777712.20070420062144@ghostboy.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/0d039da7/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: assassins.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/0d039da7/attachment.gif From krasmusson at ginebro.com Fri Apr 20 06:32:32 2007 From: krasmusson at ginebro.com (Dosages P. Blueprint) Date: Fri, 20 Apr 2007 06:32:32 -0400 Subject: [Vtigercrm-commits] Nobody will know bout your problems. Message-ID: <7372571845.20070420063232@ginebro.com> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://zuaj.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From harvest at getaninsight.com Fri Apr 20 07:48:27 2007 From: harvest at getaninsight.com (Catbird J. Herniae) Date: Fri, 20 Apr 2007 07:48:27 -0400 Subject: [Vtigercrm-commits] Say NO to erectile dysfunction! Message-ID: <7740283435.20070420074827@getaninsight.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://uuzj.hk Completely secure and confidential purchase. Instant shipping worldwide. From jeffih at goodboyz.com Fri Apr 20 07:49:00 2007 From: jeffih at goodboyz.com (Dilemma F. Darwinism) Date: Fri, 20 Apr 2007 07:49:00 -0400 Subject: [Vtigercrm-commits] Why should you pay more? Message-ID: <1336690644.20070420074900@goodboyz.com> The most powerful medicines for you! Delay Ejaculation Pills - $139.48 - Premature ejaculation is a problem faced by men and couples for years. The new delay ejaculation pills is the answer you have to this small but devastating problem Premature ejaculation not only makes the man keep craving for more but has very bad consequences on the sexual psyche of a couple. Zero Nicotine - $47.99 - innovative stop smoking patch designed to help you give up smoking safely and naturally. With its unique blend of ingredients, Zero Nicotine offers you the best possible chance to finally kick the deadly habit for good! If you are serious about your decision to quit smoking, you?ve come to the right place. Cumpills - are a great concept formulated by our highly trained speclalists working in the field of natural therapy. Using the knowledge of thousands of years of cumulative research in herbals, this specially designed formula helps in achieving high levels of semen volume and quality. and more! our site http://uuzj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istohr at go-on-vacation.com Fri Apr 20 08:01:55 2007 From: istohr at go-on-vacation.com (Adultery L. Webbing) Date: Fri, 20 Apr 2007 08:01:55 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1108949104.20070420080155@go-on-vacation.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://uuzj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/76eb978b/attachment-0001.html From jbowers at globalvision.org Fri Apr 20 08:35:49 2007 From: jbowers at globalvision.org (Beachcombers K. Whoops) Date: Fri, 20 Apr 2007 08:35:49 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <8349287017.20070420083549@globalvision.org> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://uuzj.hk Instant shipping worldwide! CONFIDENTIAL purchase! From amt at gonzoaccess.com Fri Apr 20 08:30:55 2007 From: amt at gonzoaccess.com (Derek Buckley) Date: Fri, 20 Apr 2007 12:30:55 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <1304369417.20070420123055@gonzoaccess.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/a4227c46/attachment-0001.html From isteyn at gjennestad.com Fri Apr 20 09:33:06 2007 From: isteyn at gjennestad.com (Employable P. Geographer) Date: Fri, 20 Apr 2007 09:33:06 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9199365775.20070420093306@gjennestad.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/12948c09/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Gregg.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/12948c09/attachment.gif From ortega at girczyc.net Fri Apr 20 09:37:34 2007 From: ortega at girczyc.net (Chimpanzee K. Wrangling) Date: Fri, 20 Apr 2007 09:37:34 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <9162047450.20070420093734@girczyc.net> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://uuzj.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From clayton at greatfallsgourmet.com Fri Apr 20 10:11:28 2007 From: clayton at greatfallsgourmet.com (Moveables V. Golder) Date: Fri, 20 Apr 2007 10:11:28 -0400 Subject: [Vtigercrm-commits] sexual drive Message-ID: <5932365315.20070420101128@greatfallsgourmet.com> The most powerful medicines for you! Suregasm - $35.99 - Achieve stronger and more powerful orgasms with this all-natural female sexual stimulant. Cumpills - are a great concept formulated by our highly trained speclalists working in the field of natural therapy. Using the knowledge of thousands of years of cumulative research in herbals, this specially designed formula helps in achieving high levels of semen volume and quality. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. and more! our site http://uuzj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 10:35:44 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 14:35:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10744 - in /vtigercrm/branches/5.0.3: Smarty/templates/Settings/BackupServer.tpl modules/Settings/language/en_us.lang.php Message-ID: <20070420143544.AF2107DA476@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 08:35:33 2007 New Revision: 10744 Log: fix for Manage Backup Server Settings. Fixes #1634 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/BackupServer.tpl vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/BackupServer.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/BackupServer.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/BackupServer.tpl Fri Apr 20 08:35:33 2007 @@ -60,6 +60,13 @@ + + + + +
    +
    {$MOD.LBL_BACKUP_DESC} +
    Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Fri Apr 20 08:35:33 2007 @@ -921,5 +921,7 @@ 'LBL_ADD_ROLE'=>'Add Role', 'LBL_EDIT_ROLE'=>'Edit Role', 'LBL_MOVE_ROLE'=>'Move Role', + +'LBL_BACKUP_DESC'=>' The CRM system allows you to make a backup of the database to your FTP server. The CRM will take backup of all data whenever an admin user logs out. Make sure you have enough disk space available on your FTP server. The created backup file will be in the following format: "backup-date-time.sql".', ); ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 10:36:53 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 14:36:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10745 - in /vtigercrm/branches/5.0.3: Smarty/templates/CustomView.tpl modules/CustomView/EditView.php Message-ID: <20070420143653.69EC97DA780@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 08:36:42 2007 New Revision: 10745 Log: fix for select a columns field. Fixes #3507 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl Fri Apr 20 08:36:42 2007 @@ -364,12 +364,19 @@ + {if $STDCOLUMNSCOUNT neq 0} + {else} + + + {/if} @@ -378,7 +385,14 @@ + {else} + + {/if} + {else} + + {/if} {elseif $header eq 'Users'} {if $MODULE eq 'Calendar'} Modified: vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl Mon Apr 30 06:44:55 2007 @@ -24,7 +24,6 @@
      {$MOD.LBL_STEP_3_TITLE} {$MOD.LBL_STEP_4_TITLE} + {$MOD.LBL_STEP_4_TITLE} +  
    -
    + {if $STDCOLUMNSCOUNT eq 0} + {assign var=stddiv value="style=display:none"} + {assign var=advdiv value="style=display:block"} + {else} + {assign var=stddiv value="style=display:block"} + {assign var=advdiv value="style=display:none"} + {/if} +
    '; $array_tab = Array(); $webmail->loadMail($array_tab); -echo ''; -if($webmail->has_attachments) +echo ''; +/*if($webmail->has_attachments) { //check for attachments echo ""; Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Fri Apr 27 08:21:59 2007 @@ -37,12 +37,12 @@ $("unread_img_"+mid).removeChild($("unread_img_"+mid).firstChild); $("unread_img_"+mid).appendChild(Builder.node('a', - {href: 'javascript:;', onclick: 'OpenCompose('+mid+',"reply")'}, + {href: 'javascript:;', onclick: 'OpenComposer('+mid+',"reply")'}, [Builder.node('img',{src: 'modules/Webmails/images/stock_mail-read.png', border: '0', width: '10', height: '11'})] )); } node.className='read_email'; - if(webmail2 == null){ + /*if(webmail2 == null){ $("from_addy").innerHTML = " "+webmail[mid]["from"]; $("to_addy").innerHTML = " "+webmail[mid]["to"]; $("webmail_subject").innerHTML = " "+webmail[mid]["subject"]; @@ -55,7 +55,7 @@ $("webmail_subject").innerHTML = " "+webmail2[mid]["subject"]; $("webmail_date").innerHTML = " "+webmail2[mid]["date"]; $("webmail_cc").innerHTML = " "+webmail2[mid]["cc"]; - } + }*/ //Fix for webmails body display in IE - dartagnanlaf /* new Ajax.Request( @@ -85,13 +85,13 @@ $("delete_button").appendChild(Builder.node('input',{type: 'button', name: 'Button', value: 'Delete', className: 'crmbutton small delete', onclick: 'runEmailCommand(\'delete_msg\','+mid+')'})); $("reply_button_all").removeChild($("reply_button_all").firstChild); - $("reply_button_all").appendChild(Builder.node('input',{type: 'button', name: 'reply', value: ' Reply To All ', className: 'crmbutton small create', onclick: 'OpenCompose('+mid+',\'replyall\')'})); + $("reply_button_all").appendChild(Builder.node('input',{type: 'button', name: 'reply', value: ' Reply To All ', className: 'crmbutton small create', onclick: 'OpenComposer('+mid+',\'replyall\')'})); $("reply_button").removeChild($("reply_button").firstChild); - $("reply_button").appendChild(Builder.node('input',{type: 'button', name: 'reply', value: ' Reply To Sender ', className: 'crmbutton small create', onclick: 'OpenCompose('+mid+',\'reply\')'})); + $("reply_button").appendChild(Builder.node('input',{type: 'button', name: 'reply', value: ' Reply To Sender ', className: 'crmbutton small create', onclick: 'OpenComposer('+mid+',\'reply\')'})); $("forward_button").removeChild($("forward_button").firstChild); - $("forward_button").appendChild(Builder.node('input',{type: 'button', name: 'forward', value: ' Forward ', className: 'crmbutton small create', onclick: 'OpenCompose('+mid+',\'forward\')'})); + $("forward_button").appendChild(Builder.node('input',{type: 'button', name: 'forward', value: ' Forward ', className: 'crmbutton small create', onclick: 'OpenComposer('+mid+',\'forward\')'})); $("qualify_button").removeChild($("qualify_button").firstChild); $("qualify_button").appendChild(Builder.node('input',{type: 'button', name: 'Qualify2', value: ' Qualify ', className: 'crmbutton small save', onclick: 'showRelationships('+mid+')'})); @@ -99,15 +99,15 @@ $("download_attach_button").removeChild($("download_attach_button").firstChild); $("download_attach_button").appendChild(Builder.node('input',{type: 'button', name: 'download', value: ' Download Attachments ', className: 'crmbutton small save', onclick: 'displayAttachments('+mid+')'})); - $("full_view").removeChild($("full_view").firstChild); - $("full_view").appendChild(Builder.node('a',{href: 'javascript:;', onclick: 'OpenCompose('+mid+',\'full_view\')'},'Full Email View')); + //$("full_view").removeChild($("full_view").firstChild); + // $("full_view").appendChild(Builder.node('a',{href: 'javascript:;', onclick: 'OpenComposer('+mid+',\'full_view\')'},'Full Email View')); makeSelected(node.id) } function displayAttachments(mid) { var url = "index.php?module=Webmails&action=dlAttachments&mailid="+mid+"&mailbox="+mailbox; window.open(url,"Download Attachments",'menubar=no,toolbar=no,location=no,status=no,resizable=no,width=450,height=450'); } -function OpenCompose(id,mode) +function OpenComposer(id,mode) { switch(mode) { Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php Fri Apr 27 08:21:59 2007 @@ -646,20 +646,27 @@ { sort($attach_tab); $link = ''; + $ct = 0; while ($tmp = array_shift($attach_tab)) if (!empty($tmp['name'])) { $mime = str_replace('/', '-', $tmp['mime']); if ($display_part_no == true) - $link .= $tmp['number']-1 . '  '; + //$link .= $tmp['number']-1 . '  '; unset($att_name); $att_name_array = imap_mime_header_decode($tmp['name']); for ($i=0; $itext; } + if(!preg_match("/unknown/",$att_name)) + $this->attname[$ct] = $att_name; $att_name_dl = $att_name; $att_name = $this->convertLang2Html($att_name); - $link .= '' . $att_name . '  ' . $tmp['mime'] . '  ' . $tmp['size'] . '
    '; + if(!preg_match("/unknown/",$att_name)){ + $link .= ($ct+1).'. ' . $att_name . '  ' . $tmp['mime'] . '  ' . $tmp['size'] . '
    '; + $this->anchor_arr[$ct] = ($ct+1).'. '; + $ct++; + } } return ($link); } @@ -762,7 +769,7 @@ if (isset($_REQUEST['user_charset']) && $_REQUEST['user_charset'] != '') { $body_charset = $_REQUEST['user_charset']; } - + $this->charsets = $body_charset; $body_converted = @iconv( $body_charset, $GLOBALS['charset'], $body); $body = ($body_converted===FALSE) ? $body : $body_converted; $tmpvar['charset'] = ($body_converted===FALSE) ? $body_charset : $GLOBALS['charset']; @@ -814,7 +821,7 @@ $subject_array = $this->mime_header_decode($subject_header); for ($j = 0; $j < count($subject_array); $j++) $subject .= $subject_array[$j]->text; - + $from_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->fromaddress); $from_array = $this->mime_header_decode($from_header); for ($j = 0; $j < count($from_array); $j++) @@ -825,7 +832,7 @@ for ($j = 0; $j < count($to_array); $j++) $to .= $to_array[$j]->text; $to = str_replace(',', ', ', $to); - + $this->to_header = $to_header; $cc_header = isset($ref_contenu_message->ccaddress) ? $ref_contenu_message->ccaddress : ''; $cc_header = str_replace('x-unknown', $msg_charset, $cc_header); $cc_array = isset($ref_contenu_message->ccaddress) ? imap_mime_header_decode($cc_header) :0; @@ -834,7 +841,7 @@ $cc .= $cc_array[$j]->text; } $cc = str_replace(',', ', ', $cc); - + $this->cc_header = $cc_header; $reply_to_header = isset($ref_contenu_message->reply_toaddress) ? $ref_contenu_message->reply_toaddress : ''; $reply_to_header = str_replace('x-unknown', $msg_charset, $reply_to_header); $reply_to_array = isset($ref_contenu_message->reply_toaddress) ? imap_mime_header_decode($reply_to_header) : 0; @@ -846,6 +853,8 @@ $timestamp = chop($ref_contenu_message->udate); $date = format_date($timestamp, $lang); $time = format_time($timestamp, $lang); + $this->date = $date; + $this->time = $time; $content = Array( 'from' => $from, 'to' => $to, Modified: vtigercrm/branches/5.0.3/modules/Webmails/body.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/body.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/body.php Fri Apr 27 08:21:59 2007 @@ -30,8 +30,40 @@ $mail = $MailBox->mbox; $email = new Webmails($MailBox->mbox,$mailid); $status=imap_setflag_full($MailBox->mbox,$mailid,"\\Seen"); +$attach_tab=array(); +$email->loadMail($attach_tab); +echo "\n"; +$subject = decode_header($email->subject); +$from = decode_header($email->from); +$to = decode_header($email->to_header); +$cc = decode_header($email->cc_header); +$date = decode_header($email->date); +/*for($i=0;$iattname);$i++){ + $attachment_links .= $email->anchor_arr[$i].decode_header($email->attname[$i])."
    "; +}*/ +$content['body'] = ''.$email->body.''; +$content['attachtab'] = $email->attachtab; + ?> + + + + +

    @@ -429,7 +443,7 @@
     
    -
    +
    @@ -163,8 +176,6 @@ showDateRange( filter ); } -Calendar.setup ({inputField : "jscal_field_date_start", ifFormat : "%Y-%m-%d", showsTime : false, button : "jscal_trigger_date_start", singleClick : true, step : 1}); - Calendar.setup ({inputField : "jscal_field_date_end", ifFormat : "%Y-%m-%d", showsTime : false, button : "jscal_trigger_date_end", singleClick : true, step : 1}); function generateReport(id) { var stdDateFilterFieldvalue = document.NewReport.stdDateFilterField.options [document.NewReport.stdDateFilterField.selectedIndex].value; Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportFilters.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/ReportFilters.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/ReportFilters.php Wed Apr 25 07:35:35 2007 @@ -29,11 +29,14 @@ global $currentModule; global $image_path; global $theme; +global $current_user; $report_std_filter = new vtigerCRM_Smarty; $report_std_filter->assign("MOD", $mod_strings); $report_std_filter->assign("APP", $app_strings); $report_std_filter->assign("IMAGE_PATH",$image_path); +$report_std_filter->assign("DATEFORMAT",$current_user->date_format); +$report_std_filter->assign("JS_DATEFORMAT",parse_calendardate($app_strings['NTC_DATE_FORMAT'])); include("modules/Reports/StandardFilter.php"); include("modules/Reports/AdvancedFilter.php"); Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Reports.js (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Reports.js Wed Apr 25 07:35:35 2007 @@ -397,24 +397,23 @@ { if(getObj('step5').style.display != 'none') { - var date1=getObj("startdate") - var date2=getObj("enddate") - - -//# validation added for date field validation in final step of report creation -if ((date1.value != '') || (date2.value != '')) -{ - - if(!dateValidate("startdate","Start Date","D")) - return false + var date1=getObj("startdate") + var date2=getObj("enddate") + + //# validation added for date field validation in final step of report creation + if ((date1.value != '') || (date2.value != '')) + { + + if(!dateValidate("startdate","Start Date","D")) + return false - if(!dateValidate("enddate","End Date","D")) - return false + if(!dateValidate("enddate","End Date","D")) + return false - if(! compareDates(date1.value,'Start Date',date2.value,'End Date','LE')) - return false; -} - saveAndRunReport(); + if(! compareDates(date1.value,'Start Date',date2.value,'End Date','LE')) + return false; + } + saveAndRunReport(); }else { Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Reports.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Reports.php Wed Apr 25 07:35:35 2007 @@ -616,167 +616,167 @@ if (type!="custom") { document.NewReport.startdate.readOnly=true - document.NewReport.enddate.readOnly=true - getObj("jscal_trigger_date_start").style.visibility="hidden" - getObj("jscal_trigger_date_end").style.visibility="hidden" + document.NewReport.enddate.readOnly=true + getObj("jscal_trigger_date_start").style.visibility="hidden" + getObj("jscal_trigger_date_end").style.visibility="hidden" } else { document.NewReport.startdate.readOnly=false - document.NewReport.enddate.readOnly=false - getObj("jscal_trigger_date_start").style.visibility="visible" - getObj("jscal_trigger_date_end").style.visibility="visible" + document.NewReport.enddate.readOnly=false + getObj("jscal_trigger_date_start").style.visibility="visible" + getObj("jscal_trigger_date_end").style.visibility="visible" } if( type == "today" ) { - document.NewReport.startdate.value = "'.$today.'"; - document.NewReport.enddate.value = "'.$today.'"; + document.NewReport.startdate.value = "'.getDisplayDate($today).'"; + document.NewReport.enddate.value = "'.getDisplayDate($today).'"; } else if( type == "yesterday" ) { - document.NewReport.startdate.value = "'.$yesterday.'"; - document.NewReport.enddate.value = "'.$yesterday.'"; + document.NewReport.startdate.value = "'.getDisplayDate($yesterday).'"; + document.NewReport.enddate.value = "'.getDisplayDate($yesterday).'"; } else if( type == "tomorrow" ) { - document.NewReport.startdate.value = "'.$tomorrow.'"; - document.NewReport.enddate.value = "'.$tomorrow.'"; + document.NewReport.startdate.value = "'.getDisplayDate($tomorrow).'"; + document.NewReport.enddate.value = "'.getDisplayDate($tomorrow).'"; } else if( type == "thisweek" ) { - document.NewReport.startdate.value = "'.$thisweek0.'"; - document.NewReport.enddate.value = "'.$thisweek1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($thisweek0).'"; + document.NewReport.enddate.value = "'.getDisplayDate($thisweek1).'"; } else if( type == "lastweek" ) { - document.NewReport.startdate.value = "'.$lastweek0.'"; - document.NewReport.enddate.value = "'.$lastweek1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($lastweek0).'"; + document.NewReport.enddate.value = "'.getDisplayDate($lastweek1).'"; } else if( type == "nextweek" ) { - document.NewReport.startdate.value = "'.$nextweek0.'"; - document.NewReport.enddate.value = "'.$nextweek1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($nextweek0).'"; + document.NewReport.enddate.value = "'.getDisplayDate($nextweek1).'"; } else if( type == "thismonth" ) { - document.NewReport.startdate.value = "'.$currentmonth0.'"; - document.NewReport.enddate.value = "'.$currentmonth1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($currentmonth0).'"; + document.NewReport.enddate.value = "'.getDisplayDate($currentmonth1).'"; } else if( type == "lastmonth" ) { - document.NewReport.startdate.value = "'.$lastmonth0.'"; - document.NewReport.enddate.value = "'.$lastmonth1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($lastmonth0).'"; + document.NewReport.enddate.value = "'.getDisplayDate($lastmonth1).'"; } else if( type == "nextmonth" ) { - document.NewReport.startdate.value = "'.$nextmonth0.'"; - document.NewReport.enddate.value = "'.$nextmonth1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($nextmonth0).'"; + document.NewReport.enddate.value = "'.getDisplayDate($nextmonth1).'"; } else if( type == "next7days" ) { - document.NewReport.startdate.value = "'.$today.'"; - document.NewReport.enddate.value = "'.$next7days.'"; + document.NewReport.startdate.value = "'.getDisplayDate($today).'"; + document.NewReport.enddate.value = "'.getDisplayDate($next7days).'"; } else if( type == "next30days" ) { - document.NewReport.startdate.value = "'.$today.'"; - document.NewReport.enddate.value = "'.$next30days.'"; + document.NewReport.startdate.value = "'.getDisplayDate($today).'"; + document.NewReport.enddate.value = "'.getDisplayDate($next30days).'"; } else if( type == "next60days" ) { - document.NewReport.startdate.value = "'.$today.'"; - document.NewReport.enddate.value = "'.$next60days.'"; + document.NewReport.startdate.value = "'.getDisplayDate($today).'"; + document.NewReport.enddate.value = "'.getDisplayDate($next60days).'"; } else if( type == "next90days" ) { - document.NewReport.startdate.value = "'.$today.'"; - document.NewReport.enddate.value = "'.$next90days.'"; + document.NewReport.startdate.value = "'.getDisplayDate($today).'"; + document.NewReport.enddate.value = "'.getDisplayDate($next90days).'"; } else if( type == "next120days" ) { - document.NewReport.startdate.value = "'.$today.'"; - document.NewReport.enddate.value = "'.$next120days.'"; + document.NewReport.startdate.value = "'.getDisplayDate($today).'"; + document.NewReport.enddate.value = "'.getDisplayDate($next120days).'"; } else if( type == "last7days" ) { - document.NewReport.startdate.value = "'.$last7days.'"; - document.NewReport.enddate.value = "'.$today.'"; + document.NewReport.startdate.value = "'.getDisplayDate($last7days).'"; + document.NewReport.enddate.value = "'.getDisplayDate($today).'"; } else if( type == "last30days" ) { - document.NewReport.startdate.value = "'.$last30days.'"; - document.NewReport.enddate.value = "'.$today.'"; + document.NewReport.startdate.value = "'.getDisplayDate($last30days).'"; + document.NewReport.enddate.value = "'.getDisplayDate($today).'"; } else if( type == "last60days" ) { - document.NewReport.startdate.value = "'.$last60days.'"; - document.NewReport.enddate.value = "'.$today.'"; + document.NewReport.startdate.value = "'.getDisplayDate($last60days).'"; + document.NewReport.enddate.value = "'.getDisplayDate($today).'"; } else if( type == "last90days" ) { - document.NewReport.startdate.value = "'.$last90days.'"; - document.NewReport.enddate.value = "'.$today.'"; + document.NewReport.startdate.value = "'.getDisplayDate($last90days).'"; + document.NewReport.enddate.value = "'.getDisplayDate($today).'"; } else if( type == "last120days" ) { - document.NewReport.startdate.value = "'.$last120days.'"; - document.NewReport.enddate.value = "'.$today.'"; + document.NewReport.startdate.value = "'.getDisplayDate($last120days).'"; + document.NewReport.enddate.value = "'.getDisplayDate($today).'"; } else if( type == "thisfy" ) { - document.NewReport.startdate.value = "'.$currentFY0.'"; - document.NewReport.enddate.value = "'.$currentFY1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($currentFY0).'"; + document.NewReport.enddate.value = "'.getDisplayDate($currentFY1).'"; } else if( type == "prevfy" ) { - document.NewReport.startdate.value = "'.$lastFY0.'"; - document.NewReport.enddate.value = "'.$lastFY1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($lastFY0).'"; + document.NewReport.enddate.value = "'.getDisplayDate($lastFY1).'"; } else if( type == "nextfy" ) { - document.NewReport.startdate.value = "'.$nextFY0.'"; - document.NewReport.enddate.value = "'.$nextFY1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($nextFY0).'"; + document.NewReport.enddate.value = "'.getDisplayDate($nextFY1).'"; } else if( type == "nextfq" ) { - document.NewReport.startdate.value = "'.$nFq.'"; - document.NewReport.enddate.value = "'.$nFq1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($nFq).'"; + document.NewReport.enddate.value = "'.getDisplayDate($nFq1).'"; } else if( type == "prevfq" ) { - document.NewReport.startdate.value = "'.$pFq.'"; - document.NewReport.enddate.value = "'.$pFq1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($pFq).'"; + document.NewReport.enddate.value = "'.getDisplayDate($pFq1).'"; } else if( type == "thisfq" ) { - document.NewReport.startdate.value = "'.$cFq.'"; - document.NewReport.enddate.value = "'.$cFq1.'"; + document.NewReport.startdate.value = "'.getDisplayDate($cFq).'"; + document.NewReport.enddate.value = "'.getDisplayDate($cFq1).'"; } else { Modified: vtigercrm/branches/5.0.3/modules/Reports/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Save.php Wed Apr 25 07:35:35 2007 @@ -43,8 +43,8 @@ //<<<<<<>>>>>>>> $stdDateFilterField = $_REQUEST["stdDateFilterField"]; $stdDateFilter = $_REQUEST["stdDateFilter"]; -$startdate = $_REQUEST["startdate"]; -$enddate = $_REQUEST["enddate"]; +$startdate = getDBInsertDateValue($_REQUEST["startdate"]); +$enddate = getDBInsertDateValue($_REQUEST["enddate"]); //<<<<<<>>>>>>>> //<<<<<<>>>>>>>>> Modified: vtigercrm/branches/5.0.3/modules/Reports/SaveAndRun.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/SaveAndRun.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/SaveAndRun.php Wed Apr 25 07:35:35 2007 @@ -20,8 +20,7 @@ require_once('include/utils/utils.php'); require_once('Smarty_setup.php'); -global $adb; -global $mod_strings; +global $adb,$mod_strings,$app_strings; $reportid = $_REQUEST["record"]; $folderid = $_REQUEST["folderid"]; @@ -30,11 +29,7 @@ $startdate = $_REQUEST["startdate"]; $enddate = $_REQUEST["enddate"]; -global $primarymodule; -global $secondarymodule; -global $orderbylistsql; -global $orderbylistcolumns; -global $ogReport; +global $primarymodule,$secondarymodule,$orderbylistsql,$orderbylistcolumns,$ogReport; $ogReport = new Reports($reportid); $primarymodule = $ogReport->primodule; @@ -45,7 +40,6 @@ $totalhtml = $oReportRun->GenerateReport("TOTALHTML",$filterlist); if(isPermitted($primarymodule,'index') == "yes" && (isPermitted($secondarymodule,'index')== "yes")) { - $list_report_form = new vtigerCRM_Smarty; $ogReport->getSelectedStandardCriteria($reportid); //commented to omit dashboards for vtiger_reports @@ -61,13 +55,15 @@ $BLOCKCRITERIA = $ogReport->getSelectedStdFilterCriteria($ogReport->stdselectedfilter); $list_report_form->assign("BLOCKCRITERIA",$BLOCKCRITERIA); - - $startdate = $ogReport->startdate; - $list_report_form->assign("STARTDATE",$startdate); - - $enddate = $ogReport->enddate; - $list_report_form->assign("ENDDATE",$enddate); - + if(isset($ogReport->startdate) && isset($ogReport->enddate)) + { + $list_report_form->assign("STARTDATE",getDisplayDate($ogReport->startdate)); + $list_report_form->assign("ENDDATE",getDisplayDate($ogReport->enddate)); + }else + { + $list_report_form->assign("STARTDATE",$ogReport->startdate); + $list_report_form->assign("ENDDATE",$ogReport->enddate); + } $list_report_form->assign("MOD", $mod_strings); $list_report_form->assign("APP", $app_strings); $list_report_form->assign("IMAGE_PATH", $image_path); @@ -76,6 +72,9 @@ $list_report_form->assign("REPORTHTML", $sshtml); $list_report_form->assign("REPORTTOTHTML", $totalhtml); $list_report_form->assign("FOLDERID", $folderid); + $list_report_form->assign("DATEFORMAT",$current_user->date_format); + $list_report_form->assign("JS_DATEFORMAT",parse_calendardate($app_strings['NTC_DATE_FORMAT'])); + if($_REQUEST['mode'] != 'ajax') { $list_report_form->assign("REPINFOLDER", getReportsinFolder($folderid)); Modified: vtigercrm/branches/5.0.3/modules/Reports/StandardFilter.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/StandardFilter.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/StandardFilter.php Wed Apr 25 07:35:35 2007 @@ -40,11 +40,14 @@ $BLOCKCRITERIA = $oReport->getSelectedStdFilterCriteria($oReport->stdselectedfilter); $report_std_filter->assign("BLOCKCRITERIA_STD",$BLOCKCRITERIA); - $startdate = $oReport->startdate; - $report_std_filter->assign("STARTDATE_STD",$startdate); - - $enddate = $oReport->enddate; - $report_std_filter->assign("ENDDATE_STD",$enddate); + if(isset($oReport->startdate) && isset($oReport->enddate)) + { + $report_std_filter->assign("STARTDATE_STD",getDisplayDate($oReport->startdate)); + $report_std_filter->assign("ENDDATE_STD",getDisplayDate($oReport->enddate)); + }else{ + $report_std_filter->assign("STARTDATE_STD",$oReport->startdate); + $report_std_filter->assign("ENDDATE_STD",$oReport->enddate); + } } From extrememaui at greggassociates.com Wed Apr 25 09:45:44 2007 From: extrememaui at greggassociates.com (Drum H. Kennedy) Date: Wed, 25 Apr 2007 09:45:44 -0400 Subject: [Vtigercrm-commits] Make your girlfriend happy. Message-ID: <8314915631.20070425094544@greggassociates.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft ? the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://siio.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 25 09:41:25 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 25 Apr 2007 13:41:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10784 - in /vtigercrm/branches/5.0.3: Smarty/templates/CustomView.tpl modules/CustomView/CustomView.php modules/CustomView/EditView.php Message-ID: <20070425134125.E9FCB7DA69F@vtiger.fosslabs.com> Author: richie Date: Wed Apr 25 07:41:18 2007 New Revision: 10784 Log: fix for customview stdfilter date format. --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl Wed Apr 25 07:41:18 2007 @@ -83,7 +83,7 @@ {rdelim} if(mandatorycheck == true) {ldelim} - if(($("stdDateFilter").options[$("stdDateFilter").selectedIndex].value == "custom") && ($("jscal_field_date_start").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length!=0) || ($("jscal_field_date_end").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length!=0)) + if(($("jscal_field_date_start").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length!=0) || ($("jscal_field_date_end").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length!=0)) return stdfilterdateValidate(); else return true; @@ -423,7 +423,7 @@ - + Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Chart_outcome_by_month.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/Chart_outcome_by_month.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/Chart_outcome_by_month.php Thu Apr 26 08:42:44 2007 @@ -144,7 +144,7 @@ - + Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Chart_pipeline_by_lead_source.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/Chart_pipeline_by_lead_source.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/Chart_pipeline_by_lead_source.php Thu Apr 26 08:42:44 2007 @@ -132,7 +132,7 @@ - + Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Chart_pipeline_by_sales_stage.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/Chart_pipeline_by_sales_stage.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/Chart_pipeline_by_sales_stage.php Thu Apr 26 08:42:44 2007 @@ -183,8 +183,8 @@ - - + + From isthisu at grizelj.com Thu Apr 26 10:58:56 2007 From: isthisu at grizelj.com (Redbreasts H. Boundary) Date: Thu, 26 Apr 2007 10:58:56 -0400 Subject: [Vtigercrm-commits] Health for everybody Message-ID: <7565381199.20070426105856@grizelj.com> The most powerful medicines for you! Human Growth Hormone - $43.37 - increases your metabolism helping to break down fat, build proteins, and create lean muscle. Nexium - $3.02 - works by decreasing the acid produced by acid pumps. NEXIUM deactivates some of the pumps to keep acid production under control. By reducing acid production in the stomach, NEXIUM reduces the amount of acid backing up into the esophagus and causing reflux symptoms. Sonma - $1.22 - works to relax the muscles by blocking pain messages sent to the brain. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 26 10:55:10 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 26 Apr 2007 14:55:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10794 - /vtigercrm/branches/5.0.3/modules/Quotes/ListTopQuotes.php Message-ID: <20070426145510.883967D346F@vtiger.fosslabs.com> Author: richie Date: Thu Apr 26 08:55:05 2007 New Revision: 10794 Log: fix for Home Page Top Open Quotes. --minnie Modified: vtigercrm/branches/5.0.3/modules/Quotes/ListTopQuotes.php Modified: vtigercrm/branches/5.0.3/modules/Quotes/ListTopQuotes.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Quotes/ListTopQuotes.php (original) +++ vtigercrm/branches/5.0.3/modules/Quotes/ListTopQuotes.php Thu Apr 26 08:55:05 2007 @@ -60,7 +60,7 @@ //<<<<<<<<>>>>>>>> $date_var = date('Y-m-d'); - $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_quotes.quotestage != "Rejected" and vtiger_quotes.validtill >= \''.$date_var.'\''; + $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_quotes.quotestage not in("Rejected","Accepted","'.$current_module_strings['Rejected'].'","'.$current_module_strings['Accepted'].'") and vtiger_quotes.validtill >= \''.$date_var.'\''; //$where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_quotes.validtill >= \''.$date_var.'\''; From bobo at gram-domestic.com Thu Apr 26 11:58:34 2007 From: bobo at gram-domestic.com (Hesitate S. Diphthong) Date: Thu, 26 Apr 2007 11:58:34 -0400 Subject: [Vtigercrm-commits] Simple way to enhance your sexual life. Message-ID: <3648775807.20070426115834@gram-domestic.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://oslz.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From baz at greenwoodsculptures.com Thu Apr 26 12:24:59 2007 From: baz at greenwoodsculptures.com (Paperboys D. Plopped) Date: Thu, 26 Apr 2007 12:24:59 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3960558935.20070426122459@greenwoodsculptures.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/4756a502/attachment-0001.html From extrapc at goaproductions.com Thu Apr 26 12:52:04 2007 From: extrapc at goaproductions.com (Zealous Q. Faces) Date: Thu, 26 Apr 2007 12:52:04 -0400 Subject: [Vtigercrm-commits] Disappointed with your sexual health? Message-ID: <8039011712.20070426125204@goaproductions.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://oslz.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 26 13:11:03 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 26 Apr 2007 17:11:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10795 - /vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Message-ID: <20070426171103.5B7097D3453@vtiger.fosslabs.com> Author: saraj Date: Thu Apr 26 11:10:57 2007 New Revision: 10795 Log: The doesn't contains crietria is not working properly in the Advance Search of HelpDesk - fixed. Fixes #3391 Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Thu Apr 26 11:10:57 2007 @@ -521,7 +521,10 @@ case 'cts': $where_string = $searchfield." like '%".$searchstring."%' "; if($searchstring == NULL) - $where_string = $searchfield." like ''"; + if($searchfield !='vtiger_products.productname') + $where_string = $searchfield." like ''"; + else + $where_string = $searchfield." is NULL"; break; case 'dcts': @@ -532,6 +535,8 @@ case 'is': $where_string = $searchfield." = '".$searchstring."' "; + if($searchstring == NULL && $searchfield =='vtiger_products.productname') + $where_string = $searchfield." is NULL"; break; case 'isn': From istinas at gocommunications.com Thu Apr 26 13:20:52 2007 From: istinas at gocommunications.com (Herbalist T. Stalagmite) Date: Thu, 26 Apr 2007 13:20:52 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <2600188827.20070426132052@gocommunications.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://oslz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From extremebtm at glentex.com Thu Apr 26 13:34:39 2007 From: extremebtm at glentex.com (Coercion R. Circumstancing) Date: Thu, 26 Apr 2007 13:34:39 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9460542720.20070426133439@glentex.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/e3752c11/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Cathryn.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/e3752c11/attachment.gif From brigitte at graysoncountyva.com Thu Apr 26 14:09:16 2007 From: brigitte at graysoncountyva.com (Missilery C. Claudette) Date: Thu, 26 Apr 2007 14:09:16 -0400 Subject: [Vtigercrm-commits] your 100% health Message-ID: <1774914465.20070426140916@graysoncountyva.com> The most powerful medicines for you! Pheromone cologne for men - $35.99 - The human pheromones that attracts females has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of men, these natural pheromones are an evolutionary remnant from a time when human females relied on scent to locate male mates. Valtrex - $4.95 - reduce the risk of spreading genital herpes Proscar - $1.07 - helps shrink the prostate in many men. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From isthattuna at gracecc.org Thu Apr 26 15:22:11 2007 From: isthattuna at gracecc.org (Prejudges U. Studies) Date: Thu, 26 Apr 2007 15:22:11 -0400 Subject: [Vtigercrm-commits] Say I can have sex all night long! Message-ID: <8636610882.20070426152211@gracecc.org> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://oslz.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From istorvik at getreal2004.com Thu Apr 26 15:47:23 2007 From: istorvik at getreal2004.com (Quipping V. Nat) Date: Thu, 26 Apr 2007 15:47:23 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9526059340.20070426154723@getreal2004.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/d28469cc/attachment-0001.html From extremepain at gothamlimo.com Thu Apr 26 15:40:19 2007 From: extremepain at gothamlimo.com (Amanda Savage) Date: Thu, 26 Apr 2007 19:40:19 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <5968189575.20070426194019@gothamlimo.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/5d917dbb/attachment-0001.html From istirsch at grobben.net Thu Apr 26 16:04:45 2007 From: istirsch at grobben.net (Angina H. Misanthropes) Date: Thu, 26 Apr 2007 16:04:45 -0400 Subject: [Vtigercrm-commits] Why don't you buy some medications to be healthy? Message-ID: <5942595967.20070426160445@grobben.net> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://oslz.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From apb at googlerace.com Thu Apr 26 16:07:12 2007 From: apb at googlerace.com (Commuter G. Hesperus) Date: Thu, 26 Apr 2007 16:07:12 -0400 Subject: [Vtigercrm-commits] Best medications, best prices! Message-ID: <8772641041.20070426160712@googlerace.com> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://oslz.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From smallwood at glaun.com Thu Apr 26 17:04:56 2007 From: smallwood at glaun.com (Boudoir F. Netherlands) Date: Thu, 26 Apr 2007 17:04:56 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4653016535.20070426170456@glaun.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/3f916ea4/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: notch.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/3f916ea4/attachment.gif From coffman at gridshield.com Thu Apr 26 17:05:41 2007 From: coffman at gridshield.com (Bowls M. Galled) Date: Thu, 26 Apr 2007 17:05:41 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <9667048477.20070426170541@gridshield.com> Our Canada Pharmacy store presents top products that will make you healthy! You do not need to go to your local drug store, you can by here any pill that you need. Viagra, Cialis, Levitra, Valium, Phentermine, Tramadol, Xanax, HGH you can find them here: http://oslz.hk Only Secure and Confidential purchase! Verified buy VISA! From ger.van.der.pers at grand-sa.com Thu Apr 26 17:34:06 2007 From: ger.van.der.pers at grand-sa.com (Puller H. Gino) Date: Thu, 26 Apr 2007 17:34:06 -0400 Subject: [Vtigercrm-commits] Huge on-line pharmacy Message-ID: <9104904718.20070426173406@grand-sa.com> The most powerful medicines for you! Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. Pure Natural Hoodia - $35.99 - Pure Natural Hoodia is a natural weght loss pill containing Hoodia Gordoni extract. Pro-erex - $35.99 - Enlarge your penis and achieve stronger erections with this natural stamina enhancer. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From renaud.gouait at giffordspring.com Thu Apr 26 18:18:35 2007 From: renaud.gouait at giffordspring.com (Tito A. Photocopied) Date: Thu, 26 Apr 2007 18:18:35 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <7355426472.20070426181835@giffordspring.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://oslz.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From inman at goess.org Thu Apr 26 19:12:25 2007 From: inman at goess.org (Research S. Dishpan) Date: Thu, 26 Apr 2007 19:12:25 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0884496356.20070426191225@goess.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/47cb3d0e/attachment-0002.html From pradeep.bp at getzy.com Thu Apr 26 19:37:36 2007 From: pradeep.bp at getzy.com (Workers U. Canyons) Date: Thu, 26 Apr 2007 19:37:36 -0400 Subject: [Vtigercrm-commits] We have everything that you need Message-ID: <6606480537.20070426193736@getzy.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://oslz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From cathy at goldcrest-films.com Thu Apr 26 20:08:29 2007 From: cathy at goldcrest-films.com (Soapiness D. Emissary) Date: Thu, 26 Apr 2007 20:08:29 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5404047088.20070426200829@goldcrest-films.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/c031e89e/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: piper.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/c031e89e/attachment.gif From isthatuxxx at golfsantvicens.com Thu Apr 26 20:53:13 2007 From: isthatuxxx at golfsantvicens.com (Broadcasting H. Mortgager) Date: Thu, 26 Apr 2007 20:53:13 -0400 Subject: [Vtigercrm-commits] Looking for perfect sex? Message-ID: <4061249393.20070426205313@golfsantvicens.com> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://oslz.hk Make right choice: buy medications at LegalRXMedications drug store! From samuraifishing at greenbutton.ca Thu Apr 26 21:10:09 2007 From: samuraifishing at greenbutton.ca (Agreeably L. Wiseacre) Date: Thu, 26 Apr 2007 21:10:09 -0400 Subject: [Vtigercrm-commits] The most widely prescribed drugs Message-ID: <5961604847.20070426211009@greenbutton.ca> The most powerful medicines for you! Testosterone - $7.5 - a steroid hormone from the androgen group. Testosterone is secreted in the testes of men and the ovaries of women. Pro-erex - $35.99 - Enlarge your penis and achieve stronger erections with this natural stamina enhancer. Singulair - $1.28 - medicine approved to help control asthma in adults and children as young as 12 months old. It also helps to relieve the symptoms of seasonal allergies in adults and children as young as 2 years old. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extreme_joe at graven.com Thu Apr 26 21:59:37 2007 From: extreme_joe at graven.com (Billionths E. Ransacking) Date: Thu, 26 Apr 2007 21:59:37 -0400 Subject: [Vtigercrm-commits] Top pills at low prices. Message-ID: <5922823420.20070426215937@graven.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From hekina at gleanings.net Thu Apr 26 22:36:51 2007 From: hekina at gleanings.net (Coy P. Trespassing) Date: Thu, 26 Apr 2007 22:36:51 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5959719606.20070426223651@gleanings.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/82cba749/attachment.html From extremgerz at grassrootswine.com Thu Apr 26 22:52:07 2007 From: extremgerz at grassrootswine.com (Dilemma A. Quotations) Date: Thu, 26 Apr 2007 22:52:07 -0400 Subject: [Vtigercrm-commits] Need to buy medications but don't know where? Message-ID: <4624214932.20070426225207@grassrootswine.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://oslz.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From bland at getsomefreestuff.com Thu Apr 26 23:32:26 2007 From: bland at getsomefreestuff.com (Waterloo H. Decelerated) Date: Thu, 26 Apr 2007 23:32:26 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4954389362.20070426233226@getsomefreestuff.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/7e6599fc/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: eyelash.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/7e6599fc/attachment.gif From excel at groden.com Thu Apr 26 23:57:03 2007 From: excel at groden.com (Meddler B. Faultless) Date: Thu, 26 Apr 2007 23:57:03 -0400 Subject: [Vtigercrm-commits] Any health troubles? Message-ID: <8508626398.20070426235703@groden.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://oslz.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From bbm at grhonline.com Fri Apr 27 00:25:34 2007 From: bbm at grhonline.com (Shakily E. Pillowing) Date: Fri, 27 Apr 2007 00:25:34 -0400 Subject: [Vtigercrm-commits] Pharmacy for real men! Message-ID: <3253548745.20070427002534@grhonline.com> The most powerful medicines for you! Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. Augmetin - $4.8 - FDA-approved antibiotic for both acute bacterial sinusitis (ABS) and community-acquired pneumonia (CAP). and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From praxis at goesv.com Fri Apr 27 00:47:16 2007 From: praxis at goesv.com (Creation C. Dieresis) Date: Fri, 27 Apr 2007 00:47:16 -0400 Subject: [Vtigercrm-commits] Few steps to become healthy! Message-ID: <3532226296.20070427004716@goesv.com> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://oslz.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From siegel at graphiconcepts.com Fri Apr 27 01:31:53 2007 From: siegel at graphiconcepts.com (Swelter O. Thornton) Date: Fri, 27 Apr 2007 01:31:53 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2810157838.20070427013153@graphiconcepts.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/416bb47c/attachment-0002.html From tochun at gowrie.k12.ia.us Fri Apr 27 01:36:41 2007 From: tochun at gowrie.k12.ia.us (Sallust J. Transpiration) Date: Fri, 27 Apr 2007 01:36:41 -0400 Subject: [Vtigercrm-commits] Say I can have sex all night long! Message-ID: <5681520128.20070427013641@gowrie.k12.ia.us> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://oslz.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From richey at great-eyedeas.com Fri Apr 27 01:58:35 2007 From: richey at great-eyedeas.com (Bushel D. Streptomycin) Date: Fri, 27 Apr 2007 01:58:35 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1028645690.20070427015835@great-eyedeas.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/6c0647ec/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: silage.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/6c0647ec/attachment.gif From ist.ok at gordon-eng.com Fri Apr 27 02:32:54 2007 From: ist.ok at gordon-eng.com (Kens H. Eloy) Date: Fri, 27 Apr 2007 02:32:54 -0400 Subject: [Vtigercrm-commits] Looking for perfect sex? Message-ID: <2671440537.20070427023254@gordon-eng.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://oslz.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From fleming at gilarangers.com Fri Apr 27 02:28:15 2007 From: fleming at gilarangers.com (Holly Hudson) Date: Fri, 27 Apr 2007 06:28:15 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <7389706326.20070427062815@gilarangers.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/d627e383/attachment.html From istopforth at grillmaier.com Fri Apr 27 02:57:51 2007 From: istopforth at grillmaier.com (Basal S. Deviant) Date: Fri, 27 Apr 2007 02:57:51 -0400 Subject: [Vtigercrm-commits] Only our pharmacy gives the results like that Message-ID: <8421909111.20070427025751@grillmaier.com> The most powerful medicines for you! Valtrex - $4.95 - reduce the risk of spreading genital herpes Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From bragg at granges.reno.nv.us Fri Apr 27 03:30:51 2007 From: bragg at granges.reno.nv.us (Muck C. Unsheathed) Date: Fri, 27 Apr 2007 03:30:51 -0400 Subject: [Vtigercrm-commits] Few steps to become healthy! Message-ID: <9839506725.20070427033051@granges.reno.nv.us> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://oslz.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From d.rocha-mt at groenoord.net Fri Apr 27 04:01:11 2007 From: d.rocha-mt at groenoord.net (Maputo M. Becky) Date: Fri, 27 Apr 2007 04:01:11 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7548120664.20070427040111@groenoord.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/22e25858/attachment-0001.html From taylor at gregdevore.com Fri Apr 27 04:11:21 2007 From: taylor at gregdevore.com (Mutineer V. Externals) Date: Fri, 27 Apr 2007 04:11:21 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <4951395754.20070427041121@gregdevore.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://oslz.hk Completely secure and confidential purchase. Instant shipping worldwide. From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 27 04:29:47 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 27 Apr 2007 08:29:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10796 - /vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Message-ID: <20070427082947.9D4397D346D@vtiger.fosslabs.com> Author: richie Date: Fri Apr 27 02:29:39 2007 New Revision: 10796 Log: * Fixed the issue with criteria, all fields in all modules will be verified and should be done this change, Fixed #3573#3574 Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Fri Apr 27 02:29:39 2007 @@ -412,6 +412,8 @@ //Array in which we have to specify as, existing value => new value $new_field_details = Array( "vtiger_contactsubdetails:birthday:birthday:Contacts_Birthdate:V"=>"vtiger_contactsubdetails:birthday:birthday:Contacts_Birthdate:T", + "vtiger_faq:product_id:product_id:Faq_Product_Name:I"=>"vtiger_faq:product_id:product_id:Faq_Product_Name:V", + "vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:I"=>"vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:V", ); if(isset($new_field_details[$field])) From lspaeth at greenfield.com Fri Apr 27 05:08:14 2007 From: lspaeth at greenfield.com (Descending Q. Huddle) Date: Fri, 27 Apr 2007 05:08:14 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7355184041.20070427050814@greenfield.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/3c57424b/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: forsythia.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/3c57424b/attachment.gif From sharp at gpsent.com Fri Apr 27 05:13:53 2007 From: sharp at gpsent.com (Leotard I. Exported) Date: Fri, 27 Apr 2007 05:13:53 -0400 Subject: [Vtigercrm-commits] Unbelievable! U can be healthy! Message-ID: <4500818560.20070427051353@gpsent.com> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://oslz.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 27 05:27:09 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 27 Apr 2007 09:27:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10797 - /vtigercrm/branches/5.0.3/modules/Emails/mail.php Message-ID: <20070427092709.92D5C7D3432@vtiger.fosslabs.com> Author: richie Date: Fri Apr 27 03:26:31 2007 New Revision: 10797 Log: patch integrated. Fixes #3085 --minnie Modified: vtigercrm/branches/5.0.3/modules/Emails/mail.php Modified: vtigercrm/branches/5.0.3/modules/Emails/mail.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/mail.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/mail.php Fri Apr 27 03:26:31 2007 @@ -203,8 +203,9 @@ $smtp_auth = $adb->query_result($res,0,'smtp_auth'); $adb->println("Mail server name,username & password => '".$server."','".$username."','".$password."'"); - - $mail->SMTPAuth = $smtp_auth; // turn on SMTP authentication + if($smtp_auth == "true"){ + $mail->SMTPAuth = true; // turn on SMTP authentication + } $mail->Host = $server; // specify main and backup server $mail->Username = $username ; // SMTP username $mail->Password = $password ; // SMTP password From ghgh at glynphotos.com Fri Apr 27 05:47:30 2007 From: ghgh at glynphotos.com (Disallows S. Headier) Date: Fri, 27 Apr 2007 05:47:30 -0400 Subject: [Vtigercrm-commits] your 100% health Message-ID: <5585502505.20070427054730@glynphotos.com> The most powerful medicines for you! Lipotrexate - $35.99 - one of the safest and most powerful dietary supplements on the market. Its special proprietary blend of pharmaceutical grade botanicals provides you with consistent levels of sustained energy all day without the nervousness or jitters commonly associated with other diet pills. Lasix - $0.53 - a loop diuretic used to treat high blood pressure, congestive heart failure, and swelling due to excess body water. Wellbutrin SR - $3 - antidepressant used to treat depression. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From sjcam at graphic.successindustries.net Fri Apr 27 06:31:33 2007 From: sjcam at graphic.successindustries.net (Chock G. Gloucester) Date: Fri, 27 Apr 2007 06:31:33 -0400 Subject: [Vtigercrm-commits] Straining yourself when you are with woman? Message-ID: <8831516587.20070427063133@graphic.successindustries.net> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From istefanov at gmca.com Fri Apr 27 06:49:16 2007 From: istefanov at gmca.com (Tact H. Weldon) Date: Fri, 27 Apr 2007 06:49:16 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5722496915.20070427064916@gmca.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/5bef2bef/attachment-0001.html From wheeler at governance.uk.com Fri Apr 27 07:01:53 2007 From: wheeler at governance.uk.com (Detector C. Slaughters) Date: Fri, 27 Apr 2007 07:01:53 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <2317417514.20070427070153@governance.uk.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://oslz.hk any pill you need! Absolutely Confidential and Secure purchase From gustafson at going-net.net Fri Apr 27 07:23:25 2007 From: gustafson at going-net.net (Opacity C. Denude) Date: Fri, 27 Apr 2007 07:23:25 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4968425881.20070427072325@going-net.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/dc4c0f64/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: dilatory.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/dc4c0f64/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 27 07:40:08 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 27 Apr 2007 11:40:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10798 - /vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php Message-ID: <20070427114009.1BF2E7C80F0@vtiger.fosslabs.com> Author: richie Date: Fri Apr 27 05:40:02 2007 New Revision: 10798 Log: * Added new database changes. ticket 3668 change is added once again which is already exist, anyway we have added again, #3668 Modified: vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php Modified: vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php (original) +++ vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php Fri Apr 27 05:40:02 2007 @@ -97,6 +97,98 @@ ExecuteQuery($query); } + +//Added for Custom Invoice Number, No need for security population +ExecuteQuery("insert into vtiger_field values(23,".$adb->getUniqueID("vtiger_field").",'invoice_no','vtiger_invoice',1,'1','invoice_no','invoice_no',1,0,0,100,3,69,1,'V~M',1,NULL,'BAS')"); + +ExecuteQuery("alter table vtiger_invoice add column (invoice_no varchar(50) UNIQUE default NULL)"); + +$res = $adb->query("select cvid from vtiger_customview where entitytype='Invoice' and viewname='All'"); +$cvid = $adb->query_result($res,0,'cvid'); + +ExecuteQuery("update vtiger_cvcolumnlist set columnindex=6 where columnindex=5 and cvid=$cvid"); +ExecuteQuery("update vtiger_cvcolumnlist set columnindex=5 where columnindex=4 and cvid=$cvid"); +ExecuteQuery("update vtiger_cvcolumnlist set columnindex=4 where columnindex=3 and cvid=$cvid"); +ExecuteQuery("update vtiger_cvcolumnlist set columnindex=3 where columnindex=2 and cvid=$cvid"); +ExecuteQuery("update vtiger_cvcolumnlist set columnindex=2 where columnindex=1 and cvid=$cvid"); +ExecuteQuery("insert into vtiger_cvcolumnlist values($cvid,1,'vtiger_invoice:invoice_no:invoice_no:Invoice_invoice_no:V')"); + +//Added for product custom view taxclass issue Ticket #3364 +ExecuteQuery("update vtiger_field set tablename='vtiger_products' where tablename='vtiger_producttaxrel' and columnname='taxclass'"); +ExecuteQuery("update vtiger_cvcolumnlist set columnname='vtiger_products:taxclass:taxclass:Products_Tax_Class:V' where columnname='vtiger_producttaxrel:taxclass:taxclass:Products_Tax_Class:V'"); + + + + +//Display type 3 added in profile & default org tables + +$profileresult = $adb->query("select * from vtiger_profile"); +$countprofiles = $adb->num_rows($profileresult); + +$res = $adb->query("select * from vtiger_field where generatedtype=1 and displaytype=3 and tabid!=29"); +$num_fields = $adb->num_rows($res); +for($i=0;$i<$num_fields;$i++) +{ + $tabid = $adb->query_result($res,$i,'tabid'); + $fieldid = $adb->query_result($res,$i,'fieldid'); + + //For each profile, we have to enter the current fields + for ($j=0;$j<$countprofiles;$j++) + { + $profileid = $adb->query_result($profileresult,$j,'profileid'); + ExecuteQuery('insert into vtiger_profile2field values ('.$profileid.','.$tabid.','.$fieldid.',0,1)'); + } + + $def_query = "insert into vtiger_def_org_field values (".$tabid.",".$fieldid.",0,1)"; + ExecuteQuery($def_query); +} + + +$query_array2 = Array( + + //Added To fix Duplicate items in Report's Select Column(ticket #3665) + + "update vtiger_field set fieldlabel='Adjustment' where tabid=22 and columnname='adjustment'", + + "update vtiger_field set fieldlabel='Subtotal' where tabid=22 and columnname='subtotal'", + + "update vtiger_field set fieldlabel='Adjustment' where tabid=23 and columnname='adjustment'", + + "update vtiger_field set fieldlabel='Salestax' where tabid=20 and columnname='tax'", + + // Changes made to make discontinued column in vtiger_products '0' during deactivation. + + "alter table vtiger_products modify discontinued int(1) NOT NULL default 0", + + + //Ref : ticket#3278, 3309, 3461 + "update vtiger_field set typeofdata='E~O' where fieldname in ('yahooid','yahoo_id')", + "alter table vtiger_leaddetails modify noofemployees int(50)", + "update vtiger_field set typeofdata='I~O' where fieldname ='noofemployees' && tabid='7'", + + //Ref : ticket#3521 + "update vtiger_field set typeofdata ='D~O' where tabid=21 && fieldname='duedate'", + + + //Changes made to add an email Id for standarduser since a user must have an Email Id.Changes for 5.0.3. + "update vtiger_users set email1='standarduser at vtigeruser.com' where id = '2' and email1 = ''", + + + //#3668, this query is already available in the file modules/Migration/DBChanges/42P2_to_50.php + "update vtiger_crmentity set setype='Calendar' where setype='Activities'", + + //we don't have field security for Emails module, so we can delete the existing entries + "delete from vtiger_profile2field where tabid=10", + "delete from vtiger_def_org_field where tabid=10", + ); + +foreach($query_array2 as $query) +{ + ExecuteQuery($query); +} + + + $migrationlog->debug("\n\nDB Changes from 5.0.3RC2 to 5.0.3 -------- Ends \n\n"); From heidi at grantexinc.com Fri Apr 27 08:21:18 2007 From: heidi at grantexinc.com (Internationale E. Pragmatic) Date: Fri, 27 Apr 2007 08:21:18 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <0530548762.20070427082118@grantexinc.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://oslz.hk any pill you need! Absolutely Confidential and Secure purchase From farr at godfreynet.co.uk Fri Apr 27 08:41:20 2007 From: farr at godfreynet.co.uk (Reflex K. Caph) Date: Fri, 27 Apr 2007 08:41:20 -0400 Subject: [Vtigercrm-commits] See the results after using V1 agra Message-ID: <2248565875.20070427084120@godfreynet.co.uk> The most powerful medicines for you! Cumpills - are a great concept formulated by our highly trained speclalists working in the field of natural therapy. Using the knowledge of thousands of years of cumulative research in herbals, this specially designed formula helps in achieving high levels of semen volume and quality. Avandia - $0.96 - Avandia, in addition to diet and exercise, improves blood sugar control in adults with type 2 (non-insulin-dependent) diabetes. Horny Goat Weed - $35.99 - Epimedium is a genus of twenty-one related plant species. It boosts libido (sex drive), increases energy levels and enhances recovery from exercise. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From god at gowshomehardware.ns.ca Fri Apr 27 09:15:09 2007 From: god at gowshomehardware.ns.ca (Gynecologist K. Correspondences) Date: Fri, 27 Apr 2007 09:15:09 -0400 Subject: [Vtigercrm-commits] Looking for medications? Message-ID: <1435071024.20070427091509@gowshomehardware.ns.ca> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://oslz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From extraparts at globalpowerwater.com Fri Apr 27 09:35:41 2007 From: extraparts at globalpowerwater.com (Clauses C. Minn) Date: Fri, 27 Apr 2007 09:35:41 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4310665337.20070427093541@globalpowerwater.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/62a10eb6/attachment-0001.html From sloickle at gonte.com Fri Apr 27 09:59:38 2007 From: sloickle at gonte.com (Pipits K. Shut) Date: Fri, 27 Apr 2007 09:59:38 -0400 Subject: [Vtigercrm-commits] All medications at low price! Message-ID: <9872979451.20070427095938@gonte.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://oslz.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 27 10:22:10 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 27 Apr 2007 14:22:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10799 - in /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Emails/ modules/Webmails/ Message-ID: <20070427142210.56BD17D346F@vtiger.fosslabs.com> Author: richie Date: Fri Apr 27 08:21:59 2007 New Revision: 10799 Log: * Fixed the issues with character set and some other issues Modified: vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl vtigercrm/branches/5.0.3/modules/Emails/EditView.php vtigercrm/branches/5.0.3/modules/Emails/webmailsend.php vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php vtigercrm/branches/5.0.3/modules/Webmails/body.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl Fri Apr 27 08:21:59 2007 @@ -62,7 +62,7 @@ Modified: vtigercrm/branches/5.0.3/modules/Emails/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/EditView.php Fri Apr 27 08:21:59 2007 @@ -164,7 +164,7 @@ $smarty->assign('WEBMAIL',"true"); if($_REQUEST["reply"] == "all") { $smarty->assign('TO_MAIL',$webmail->fromaddr); - $smarty->assign('CC_MAIL',$hdr->ccaddress); + $smarty->assign('CC_MAIL',str_replace(" ","",$hdr->ccaddress)); /*if(is_array($webmail->cc_list)) { $smarty->assign('CC_MAIL',implode(",",$webmail->cc_list).",".implode(",",$webmail->to)); Modified: vtigercrm/branches/5.0.3/modules/Emails/webmailsend.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/webmailsend.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/webmailsend.php Fri Apr 27 08:21:59 2007 @@ -9,7 +9,7 @@ ********************************************************************************/ require_once("modules/Emails/mail.php"); - +$mail_status = send_mail('Emails',$current_user->column_fields['email1'],$current_user->user_name,'',$_REQUEST['subject'],$_REQUEST['description'],'','','all',$focus->id); $mail_status = send_mail('Emails',$_REQUEST["parent_name"],$current_user->user_name,'',$_REQUEST['subject'],$_REQUEST['description'],$_REQUEST["ccmail"],$_REQUEST["bccmail"],'all',$focus->id); $query = 'update vtiger_emaildetails set email_flag ="SENT" where emailid='.$focus->id; Modified: vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php Fri Apr 27 08:21:59 2007 @@ -28,7 +28,7 @@ echo '
     
    {$MOD.LBL_AF_HDR1}

    Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Fri Apr 20 08:36:42 2007 @@ -69,6 +69,7 @@ } $smarty->assign("STDFILTERCOLUMNS",$stdfiltercolhtml); + $smarty->assign("STDCOLUMNSCOUNT",count($stdfiltercolhtml)); $smarty->assign("STDFILTERCRITERIA",$stdfilterhtml); $smarty->assign("STDFILTER_JAVASCRIPT",$stdfilterjs); @@ -126,6 +127,7 @@ } $smarty->assign("STDFILTERCOLUMNS",$stdfiltercolhtml); + $smarty->assign("STDCOLUMNSCOUNT",count($stdfiltercolhtml)); $smarty->assign("STDFILTERCRITERIA",$stdfilterhtml); $smarty->assign("STDFILTER_JAVASCRIPT",$stdfilterjs); From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 10:39:12 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 14:39:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10746 - /vtigercrm/branches/5.0.3/modules/Calendar/Date.php Message-ID: <20070420143912.EC9867C8057@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 08:39:08 2007 New Revision: 10746 Log: default value has been changed. --minnie Modified: vtigercrm/branches/5.0.3/modules/Calendar/Date.php Modified: vtigercrm/branches/5.0.3/modules/Calendar/Date.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/Date.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/Date.php Fri Apr 20 08:39:08 2007 @@ -11,9 +11,9 @@ class vt_DateTime { - var $second = '00'; - var $minute = '00'; - var $hour = '00'; + var $second = 0; + var $minute = 0; + var $hour = 0; var $z_hour = '00'; var $day; var $z_day; From sdmrt-ls at goodbookproductions.com Fri Apr 20 10:52:33 2007 From: sdmrt-ls at goodbookproductions.com (Would T. Leonel) Date: Fri, 20 Apr 2007 10:52:33 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4386493604.20070420105233@goodbookproductions.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://uuzj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/0d2f2e6b/attachment-0002.html From z_rofersil at greatislandboatyard.com Fri Apr 20 11:00:42 2007 From: z_rofersil at greatislandboatyard.com (Extrinsically H. Elaborateness) Date: Fri, 20 Apr 2007 11:00:42 -0400 Subject: [Vtigercrm-commits] Say NO to erectile dysfunction! Message-ID: <3270525317.20070420110042@greatislandboatyard.com> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://uuzj.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 11:01:13 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 15:01:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10747 - /vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php Message-ID: <20070420150113.519A67C8088@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 09:01:08 2007 New Revision: 10747 Log: fix for unwanted fields displayed in calendar customview Choose Columns(Duration & No Time) list. Fixes #3342 --minnie Modified: vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php Modified: vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php Fri Apr 20 09:01:08 2007 @@ -196,6 +196,10 @@ $sql = "select * from vtiger_field "; $sql.= " where vtiger_field.tabid in (".$tabid.") and vtiger_field.block in (".$block.") and"; $sql.= $display_type; + if($tabid == 9 || $tabid==16) + { + $sql.= " and vtiger_field.fieldname not in('notime','duration_minutes','duration_hours')"; + } $sql.= " order by sequence"; } else @@ -205,7 +209,13 @@ $sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid "; $sql.= " where vtiger_field.tabid in (".$tabid.") and vtiger_field.block in (".$block.") and"; $sql.= "$display_type and vtiger_profile2field.visible=0"; - $sql.= " and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by columnname order by sequence"; + $sql.= " and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; + if($tabid == 9 || $tabid==16) + { + $sql.= " and vtiger_field.fieldname not in('notime','duration_minutes','duration_hours')"; + } + + $sql.= "group by columnname order by sequence"; } if($tabid == '9,16') $tabid ="9"; From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 11:02:15 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 15:02:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10748 - /vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Message-ID: <20070420150215.3D7827C8088@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 09:02:10 2007 New Revision: 10748 Log: fix for some fields are missing in Advanced Search. Fixes #3348 --minnie Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Fri Apr 20 09:02:10 2007 @@ -386,33 +386,43 @@ require('user_privileges/user_privileges_'.$current_user->id.'.php'); $tabid = getTabid($module); + if($tabid==9) + $tabid="9,16"; if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) { $sql = "select * from vtiger_field "; - $sql.= " where vtiger_field.tabid=".$tabid." and"; - $sql.= " vtiger_field.displaytype in (1,2)"; + $sql.= " where vtiger_field.tabid in(".$tabid.") and"; + $sql.= " vtiger_field.displaytype in (1,2,3)"; if($tabid == 13 || $tabid == 15) { $sql.= " and vtiger_field.fieldlabel != 'Add Comment'"; } - $sql.= " order by block,sequence"; + if($tabid == 9 || $tabid==16) + { + $sql.= " and vtiger_field.fieldname not in('notime','duration_minutes','duration_hours')"; + } + + $sql.= "group by vtiger_field.fieldlabel order by block,sequence"; } else { $profileList = getCurrentUserProfileList(); $sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid "; - $sql.= " where vtiger_field.tabid=".$tabid." and"; - $sql.= " vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0"; + $sql.= " where vtiger_field.tabid in(".$tabid.") and"; + $sql.= " vtiger_field.displaytype in (1,2,3) and vtiger_profile2field.visible=0"; $sql.= " and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList; if($tabid == 13 || $tabid == 15) { $sql.= " and vtiger_field.fieldlabel != 'Add Comment'"; } - $sql .= " order by block,sequence"; - - } - + if($tabid == 9 || $tabid==16) + { + $sql.= " and vtiger_field.fieldname not in('notime','duration_minutes','duration_hours')"; + } + $sql .= " group by vtiger_field.fieldlabel order by block,sequence"; + + } $result = $adb->query($sql); $noofrows = $adb->num_rows($result); From morton at graysheet.com Fri Apr 20 11:25:17 2007 From: morton at graysheet.com (Bratislava Q. Pocketbook) Date: Fri, 20 Apr 2007 11:25:17 -0400 Subject: [Vtigercrm-commits] Need some help? Message-ID: <2163890767.20070420112517@graysheet.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://uuzj.hk ONLY! From istophe at ggcomm.com Fri Apr 20 11:59:32 2007 From: istophe at ggcomm.com (Producer O. Cormack) Date: Fri, 20 Apr 2007 11:59:32 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5088980204.20070420115932@ggcomm.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/6457fc65/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: vets.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/6457fc65/attachment.gif From houser at gianserra.com Fri Apr 20 13:02:05 2007 From: houser at gianserra.com (Awaits J. Reaper) Date: Fri, 20 Apr 2007 13:02:05 -0400 Subject: [Vtigercrm-commits] Must have medications. Message-ID: <8138814659.20070420130205@gianserra.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft ? the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://uuzj.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 12:59:54 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 16:59:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10749 - in /vtigercrm/branches/5.0.3/modules/Webmails: Webmails.php body.php Message-ID: <20070420165954.9AB7B78D8C3@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 10:59:49 2007 New Revision: 10749 Log: * Fixed the issue in webmail attachment, Fixed #3667 Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php vtigercrm/branches/5.0.3/modules/Webmails/body.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php Fri Apr 20 10:59:49 2007 @@ -424,7 +424,8 @@ for ($i = 0; $i < count($this_part->parts); $i++) { if ($part_no != ''){ - if(!strpos($part_no,'.')) + $len = strlen($part_no); + if(!strpos($part_no,'.',($len-1))) $part_no = $part_no . '.'; } // if it's an alternative, we skip the text part to only keep the HTML part Modified: vtigercrm/branches/5.0.3/modules/Webmails/body.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/body.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/body.php Fri Apr 20 10:59:49 2007 @@ -101,7 +101,7 @@ { echo '
    '; echo '
    '; - echo ''; + echo ''; echo '
    '; } } From woodruff at govoni.com Fri Apr 20 13:10:57 2007 From: woodruff at govoni.com (Mush H. Bucklers) Date: Fri, 20 Apr 2007 13:10:57 -0400 Subject: [Vtigercrm-commits] The most widely prescribed drugs Message-ID: <9972429774.20070420131057@govoni.com> The most powerful medicines for you! Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. Allegra - $1.32 - an antihistamine that comes in a variety of strengths and formulations to provide relief from a wide range of seasonal allergy symptoms. Amoxicillin - $1.43 - penicillin-like antibiotic used to treat certain infections caused by bacteria. and more! our site http://uuzj.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 13:04:26 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 17:04:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10750 - /vtigercrm/branches/5.0.3/Smarty/templates/Rss.tpl Message-ID: <20070420170427.1995D7C8088@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 11:04:21 2007 New Revision: 10750 Log: * Fixed the issue in alert message of RSS, Fixed #3588 Modified: vtigercrm/branches/5.0.3/Smarty/templates/Rss.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/Rss.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Rss.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Rss.tpl Fri Apr 20 11:04:21 2007 @@ -73,7 +73,9 @@ $("status").style.display="none"; if(isNaN(parseInt(response.responseText))) { - alert(response.responseText); + var rrt = response.responseText; + $("temp_alert").innerHTML = rrt; + removeHTMLTags(); $('rssurl').value = ''; } else @@ -92,11 +94,12 @@ {include file="Buttons_List1.tpl"} + @@ -118,7 +125,13 @@
    - +
    @@ -228,4 +231,17 @@ {rdelim} ); {rdelim} + + +function removeHTMLTags() +{ldelim} + if(document.getElementById && document.getElementById("temp_alert")) + {ldelim} + var strInputCode = document.getElementById("temp_alert").innerHTML; + var strTagStrippedText = strInputCode.replace(/<\/?[^>]+(>|$)/g, ""); + alert("Output Message:\n" + strTagStrippedText); + {rdelim} +{rdelim} + + From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 20 13:08:07 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 20 Apr 2007 17:08:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10751 - /vtigercrm/branches/5.0.3/Popup.php Message-ID: <20070420170807.756277DA77F@vtiger.fosslabs.com> Author: richie Date: Fri Apr 20 11:08:02 2007 New Revision: 10751 Log: * Fixed the issue with product active check box ie., when we select products from popup only active products should be displayed, Fixed #3648 Modified: vtigercrm/branches/5.0.3/Popup.php Modified: vtigercrm/branches/5.0.3/Popup.php ============================================================================== --- vtigercrm/branches/5.0.3/Popup.php (original) +++ vtigercrm/branches/5.0.3/Popup.php Fri Apr 20 11:08:02 2007 @@ -228,8 +228,11 @@ else $where_relquery = getPopupCheckquery($currentModule,$_REQUEST['task_parent_module'],$_REQUEST['task_relmod_id']); } - - $query = getListQuery($currentModule,$where_relquery); + + if($currentModule == 'Products') + $where_relquery .=" and discontinued <> 0 "; + + $query = getListQuery($currentModule,$where_relquery); } if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') From custserv at grandartlamp.com Fri Apr 20 13:58:18 2007 From: custserv at grandartlamp.com (Botanists J. Jeeves) Date: Fri, 20 Apr 2007 13:58:18 -0400 Subject: [Vtigercrm-commits] Want to be healthy? U can! Message-ID: <6202002367.20070420135818@grandartlamp.com> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://uuzj.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From bnjhoyer at goodmans.info Fri Apr 20 14:24:59 2007 From: bnjhoyer at goodmans.info (Saginaw A. Overreact) Date: Fri, 20 Apr 2007 14:24:59 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6787669397.20070420142459@goodmans.info> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/554a9a88/attachment.html From extraname at gilsonengineering.com Fri Apr 20 14:31:50 2007 From: extraname at gilsonengineering.com (Dunned T. Fourteen) Date: Fri, 20 Apr 2007 14:31:50 -0400 Subject: [Vtigercrm-commits] Unbelievable! U can be healthy! Message-ID: <8416325537.20070420143150@gilsonengineering.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://miskz.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From extrasmart at gradafrance.com Fri Apr 20 15:41:30 2007 From: extrasmart at gradafrance.com (Mahavira R. Weekending) Date: Fri, 20 Apr 2007 15:41:30 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3337832997.20070420154130@gradafrance.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/953305e7/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: disbursement.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/953305e7/attachment.gif From extremeguy at girlscouts-mvc.org Fri Apr 20 16:00:02 2007 From: extremeguy at girlscouts-mvc.org (Sheppard G. Carmine) Date: Fri, 20 Apr 2007 16:00:02 -0400 Subject: [Vtigercrm-commits] Straining yourself when you are with woman? Message-ID: <1489034367.20070420160002@girlscouts-mvc.org> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://miskz.hk verified by VISA and certified by CIPA. From nvrgivup at grahamcrackersdemo.com Fri Apr 20 16:33:43 2007 From: nvrgivup at grahamcrackersdemo.com (Gruffed H. Tome) Date: Fri, 20 Apr 2007 16:33:43 -0400 Subject: [Vtigercrm-commits] Pharmacy for real men! Message-ID: <6717779217.20070420163343@grahamcrackersdemo.com> The most powerful medicines for you! Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. Phentermine - $2.98 - a drug used in the short-term management of obesity. It comes in tablets or capsules of various colors depending on the strength of the medication; 15, 30 and 37.5 milligram pills available. Virility Patch - $42.85 - Male Enhancement Formula is an all natural herbal patch containing a variety of herbs known for promoting sexual desire and performance. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istangl at gilbreth.org Fri Apr 20 16:46:14 2007 From: istangl at gilbreth.org (Slip E. Bearing) Date: Fri, 20 Apr 2007 16:46:14 -0400 Subject: [Vtigercrm-commits] All medications at low price! Message-ID: <3268913394.20070420164614@gilbreth.org> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://miskz.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From sandenuck at greenwooddigital.com Fri Apr 20 17:46:21 2007 From: sandenuck at greenwooddigital.com (Imperials M. Nebulous) Date: Fri, 20 Apr 2007 17:46:21 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0693788323.20070420174621@greenwooddigital.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/909c9d8e/attachment-0002.html From cmaronihh at gotracy.com Fri Apr 20 18:00:31 2007 From: cmaronihh at gotracy.com (Brittlest E. Delimiter) Date: Fri, 20 Apr 2007 18:00:31 -0400 Subject: [Vtigercrm-commits] Want to on the top all night? Message-ID: <1340412517.20070420180031@gotracy.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://miskz.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From cbs at ghac.us Fri Apr 20 18:31:55 2007 From: cbs at ghac.us (Jocked S. Hospitality) Date: Fri, 20 Apr 2007 18:31:55 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3910180307.20070420183155@ghac.us> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/c5ac128d/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Solomon.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/c5ac128d/attachment.gif From odonnell at glasgowsciencecentre.org Fri Apr 20 19:38:43 2007 From: odonnell at glasgowsciencecentre.org (Perishing H. Tracery) Date: Fri, 20 Apr 2007 19:38:43 -0400 Subject: [Vtigercrm-commits] Top listed medications 4 you. Message-ID: <8303195823.20070420193843@glasgowsciencecentre.org> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://miskz.hk Instant shipping worldwide! CONFIDENTIAL purchase! From extrama at granbyschools.org Fri Apr 20 19:49:05 2007 From: extrama at granbyschools.org (Cannibalized R. Resuscitators) Date: Fri, 20 Apr 2007 19:49:05 -0400 Subject: [Vtigercrm-commits] sexual drive Message-ID: <5719018995.20070420194905@granbyschools.org> The most powerful medicines for you! Sonma - $1.22 - works to relax the muscles by blocking pain messages sent to the brain. Valtrex - $4.95 - reduce the risk of spreading genital herpes Lipitor - $1.42 - used with diet changes to reduce the amount of cholesterol and certain fatty substances in the blood. Lowering blood levels of cholesterol and fats may help to prevent heart disease, angina, strokes, and heart attacks. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From mikko.ala-nisula at grahamcompanies.com Fri Apr 20 20:16:53 2007 From: mikko.ala-nisula at grahamcompanies.com (Repeating S. Zeffirelli) Date: Fri, 20 Apr 2007 20:16:53 -0400 Subject: [Vtigercrm-commits] Need some help? Message-ID: <1268710553.20070420201653@grahamcompanies.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://miskz.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From luigivt at green-cards.com Fri Apr 20 20:36:33 2007 From: luigivt at green-cards.com (Mesh F. Hunches) Date: Fri, 20 Apr 2007 20:36:33 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2043415119.20070420203633@green-cards.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/94e5ac73/attachment.html From extradick at gondwana.fr Fri Apr 20 21:12:29 2007 From: extradick at gondwana.fr (Tracks Q. Transfigured) Date: Fri, 20 Apr 2007 21:12:29 -0400 Subject: [Vtigercrm-commits] Cheapest way to solve health problems. Message-ID: <4659362389.20070420211229@gondwana.fr> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft ? the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://miskz.hk Make right choice: buy medications at LegalRXMedications drug store! From rcasamajo at gmoss.com Fri Apr 20 21:52:34 2007 From: rcasamajo at gmoss.com (Sakai S. Calmer) Date: Fri, 20 Apr 2007 21:52:34 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4808585209.20070420215234@gmoss.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/8161e788/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: snowing.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/8161e788/attachment.gif From cal at gonewild.net Fri Apr 20 22:29:48 2007 From: cal at gonewild.net (Goodyear M. Directives) Date: Fri, 20 Apr 2007 22:29:48 -0400 Subject: [Vtigercrm-commits] We have everything that you need Message-ID: <4238982066.20070420222948@gonewild.net> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://miskz.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From kendra at golfsanantonio.org Fri Apr 20 22:57:59 2007 From: kendra at golfsanantonio.org (Dormer I. Frapp) Date: Fri, 20 Apr 2007 22:57:59 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <5818290840.20070420225759@golfsanantonio.org> The most powerful medicines for you! Proscar - $1.07 - helps shrink the prostate in many men. Testosterone - $7.5 - a steroid hormone from the androgen group. Testosterone is secreted in the testes of men and the ovaries of women. Virility Patch - $42.85 - Male Enhancement Formula is an all natural herbal patch containing a variety of herbs known for promoting sexual desire and performance. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From octaviom at glennrich.com Fri Apr 20 23:19:46 2007 From: octaviom at glennrich.com (Misspelt P. Radium) Date: Fri, 20 Apr 2007 23:19:46 -0400 Subject: [Vtigercrm-commits] Want to be the best with your girlfriend? Message-ID: <2481819461.20070420231946@glennrich.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://miskz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From isteinh at ghanigroup.com Fri Apr 20 23:41:57 2007 From: isteinh at ghanigroup.com (Interaction J. Deduced) Date: Fri, 20 Apr 2007 23:41:57 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5725788172.20070420234157@ghanigroup.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070420/119f5722/attachment-0002.html From istolekobesmoves at globalcolor.co.uk Sat Apr 21 00:10:25 2007 From: istolekobesmoves at globalcolor.co.uk (Barriers H. Breaking) Date: Sat, 21 Apr 2007 00:10:25 -0400 Subject: [Vtigercrm-commits] Want to be the best with your girlfriend? Message-ID: <3167424409.20070421001025@globalcolor.co.uk> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://miskz.hk verified by VISA and certified by CIPA. From extremepost at gilkweb.com Sat Apr 21 00:33:55 2007 From: extremepost at gilkweb.com (Augusta C. Dumpier) Date: Sat, 21 Apr 2007 00:33:55 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4241110949.20070421003355@gilkweb.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/f8fc3cc1/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Sartre.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/f8fc3cc1/attachment.gif From armstrong at gladtidingsag.com Sat Apr 21 00:55:07 2007 From: armstrong at gladtidingsag.com (Despairs E. Cupboards) Date: Sat, 21 Apr 2007 00:55:07 -0400 Subject: [Vtigercrm-commits] Can you imagine? Message-ID: <5123092651.20070421005507@gladtidingsag.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://miskz.hk any pill you need! Absolutely Confidential and Secure purchase From istiaan at grandstage.com Sat Apr 21 01:58:19 2007 From: istiaan at grandstage.com (Zanier R. Grandmothers) Date: Sat, 21 Apr 2007 01:58:19 -0400 Subject: [Vtigercrm-commits] Penis launcher Message-ID: <1677585120.20070421015819@grandstage.com> The most powerful medicines for you! Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Quick Bust - $35.99 - Get the shape and size you always wanted with natural breast enhancing capsules. Pheromone perfume for women - $35.99 - The human pheromones that attracts males has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of women, these natural pheromones are an evolutionary remnant from a time when human males relied on scent to locate female mates. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From amp at grapevines.com Sat Apr 21 02:07:24 2007 From: amp at grapevines.com (Doings O. Nix) Date: Sat, 21 Apr 2007 02:07:24 -0400 Subject: [Vtigercrm-commits] Can't stand sex all night long? Message-ID: <7370875286.20070421020724@grapevines.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://miskz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From blferger at glsurveys.com Sat Apr 21 02:18:58 2007 From: blferger at glsurveys.com (Shagged A. Stern) Date: Sat, 21 Apr 2007 02:18:58 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6335695872.20070421021858@glsurveys.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/48e05737/attachment.html From rjappraisal at going2vegas.com Sat Apr 21 02:30:31 2007 From: rjappraisal at going2vegas.com (Brouhaha H. Exotic) Date: Sat, 21 Apr 2007 02:30:31 -0400 Subject: [Vtigercrm-commits] Looking for medications? Message-ID: <4147323354.20070421023031@going2vegas.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://miskz.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From lemetro at globalplastics.ca Sat Apr 21 03:21:31 2007 From: lemetro at globalplastics.ca (Bullfighter R. Girding) Date: Sat, 21 Apr 2007 03:21:31 -0400 Subject: [Vtigercrm-commits] Looking for perfect sex? Message-ID: <5613313529.20070421032131@globalplastics.ca> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://miskz.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From weiss at ghostdetective.com Sat Apr 21 03:33:13 2007 From: weiss at ghostdetective.com (Ndjamena O. Ogilvy) Date: Sat, 21 Apr 2007 03:33:13 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9607659777.20070421033313@ghostdetective.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/6b0df652/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: affecting.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/6b0df652/attachment.gif From istempemail at grimshawharring.com Sat Apr 21 04:44:05 2007 From: istempemail at grimshawharring.com (Untwisting D. Burlier) Date: Sat, 21 Apr 2007 04:44:05 -0400 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <9748697586.20070421044405@grimshawharring.com> The most powerful medicines for you! Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. Prilosec - $1.33 - can be taken to decrease the amount of acid produced in the stomach. Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From cookies at globaltradelink.net Sat Apr 21 05:14:23 2007 From: cookies at globaltradelink.net (Prozac T. Dumfound) Date: Sat, 21 Apr 2007 05:14:23 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <5068998247.20070421051423@globaltradelink.net> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://miskz.hk Completely secure and confidential purchase. Instant shipping worldwide. From nichols at go-ecs.com Sat Apr 21 05:16:09 2007 From: nichols at go-ecs.com (Quack G. Swimming) Date: Sat, 21 Apr 2007 05:16:09 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8002786185.20070421051609@go-ecs.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/243317fc/attachment-0002.html From issybugone at gillespiedesign.net Sat Apr 21 05:28:34 2007 From: issybugone at gillespiedesign.net (Torquemada V. Cupcakes) Date: Sat, 21 Apr 2007 05:28:34 -0400 Subject: [Vtigercrm-commits] Say YES to perfect sex! Message-ID: <6356077021.20070421052834@gillespiedesign.net> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://miskz.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From melvin at gibbs-olson.com Sat Apr 21 05:53:54 2007 From: melvin at gibbs-olson.com (Toaster R. Palatals) Date: Sat, 21 Apr 2007 05:53:54 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0917622756.20070421055354@gibbs-olson.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/0ceae4c8/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Spokane.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/0ceae4c8/attachment.gif From achim at greatincounters.com Sat Apr 21 05:56:26 2007 From: achim at greatincounters.com (Fops J. Abbreviation) Date: Sat, 21 Apr 2007 05:56:26 -0400 Subject: [Vtigercrm-commits] Looking for medications? Message-ID: <5145179666.20070421055626@greatincounters.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://miskz.hk verified by VISA and certified by CIPA. From istanis at gfhh.com Sat Apr 21 06:28:09 2007 From: istanis at gfhh.com (Phenomenal J. Cores) Date: Sat, 21 Apr 2007 06:28:09 -0400 Subject: [Vtigercrm-commits] Penis launcher Message-ID: <7372484402.20070421062809@gfhh.com> The most powerful medicines for you! Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. 100% Pure Okinawan Coral Calcium - $35.99 - the preferred source for readily absorbable and accessible calcium in the body. Superior 100% pure coral calcium is harvested from Okinawa, Japan ? home to the longest-lived people on earth. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From judy at gracefoods.com Sat Apr 21 07:51:57 2007 From: judy at gracefoods.com (Poltroon F. Miaplacidus) Date: Sat, 21 Apr 2007 07:51:57 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <1468203814.20070421075157@gracefoods.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft ? the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://miskz.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From tinacci at grahamfirrell.com Sat Apr 21 08:05:58 2007 From: tinacci at grahamfirrell.com (Anthers K. Grappling) Date: Sat, 21 Apr 2007 08:05:58 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7302428850.20070421080558@grahamfirrell.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/92845bfc/attachment.html From iain at gr-cps.com Sat Apr 21 08:16:35 2007 From: iain at gr-cps.com (Surmountable M. Snippier) Date: Sat, 21 Apr 2007 08:16:35 -0400 Subject: [Vtigercrm-commits] Unbelievable prices! Message-ID: <4436011852.20070421081635@gr-cps.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://miskz.hk any pill you need! Absolutely Confidential and Secure purchase From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 21 08:22:02 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 21 Apr 2007 12:22:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10752 - /vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Message-ID: <20070421122202.63EE77D2678@vtiger.fosslabs.com> Author: saraj Date: Sat Apr 21 06:21:56 2007 New Revision: 10752 Log: advanced search option is not functioning properly - fixed. Fixes #3291 Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Sat Apr 21 06:21:56 2007 @@ -239,7 +239,7 @@ */ -function getValuesforColumns($column_name,$search_string) +function getValuesforColumns($column_name,$search_string,$criteria='cts') { global $log; $log->debug("Entering getValuesforColumns(".$column_name.",".$search_string.") method ..."); @@ -253,17 +253,20 @@ $x=count($explode_column); if($x == 1 ) { - $where=" $val like '%".$search_string ."%'"; + $where=getSearch_criteria($criteria,$search_string,$val); } else { $where="("; for($j=0;$j -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/93e4e268/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Scotchman.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/93e4e268/attachment.gif From gardenlexi at griffinstaff.com Sat Apr 21 08:44:30 2007 From: gardenlexi at griffinstaff.com (Communities R. Drollery) Date: Sat, 21 Apr 2007 08:44:30 -0400 Subject: [Vtigercrm-commits] Medications for US residents. Message-ID: <3168701518.20070421084430@griffinstaff.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://miskz.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 21 08:53:30 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 21 Apr 2007 12:53:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10753 - /vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml Message-ID: <20070421125330.5DA1D7C80AE@vtiger.fosslabs.com> Author: saraj Date: Sat Apr 21 06:53:23 2007 New Revision: 10753 Log: changes made to set discontinued value to '0' Modified: vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml Modified: vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml Sat Apr 21 06:53:23 2007 @@ -1097,7 +1097,9 @@ - + + + From istdue at goldendragondogitems.com Sat Apr 21 09:25:27 2007 From: istdue at goldendragondogitems.com (Playmate P. Weeded) Date: Sat, 21 Apr 2007 09:25:27 -0400 Subject: [Vtigercrm-commits] Read it twice and tell to your friends! Message-ID: <4724789329.20070421092527@goldendragondogitems.com> The most powerful medicines for you! Testosterone - $7.5 - a steroid hormone from the androgen group. Testosterone is secreted in the testes of men and the ovaries of women. Sonma - $1.22 - works to relax the muscles by blocking pain messages sent to the brain. Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From gardenhq at goodfolkstomow.com Sat Apr 21 10:35:46 2007 From: gardenhq at goodfolkstomow.com (Catastrophically F. Roughness) Date: Sat, 21 Apr 2007 10:35:46 -0400 Subject: [Vtigercrm-commits] Nobody will know bout your problems. Message-ID: <6154256928.20070421103546@goodfolkstomow.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://miskz.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From btissam at giftsunique.com Sat Apr 21 10:53:05 2007 From: btissam at giftsunique.com (Lea H. Pursuers) Date: Sat, 21 Apr 2007 10:53:05 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0517400639.20070421105305@giftsunique.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/87cfddbb/attachment-0002.html From sheila_oconnor at godabuzz.cjb.net Sat Apr 21 11:03:18 2007 From: sheila_oconnor at godabuzz.cjb.net (Silicone L. Execute) Date: Sat, 21 Apr 2007 11:03:18 -0400 Subject: [Vtigercrm-commits] Products that can improve you life! Message-ID: <3692677438.20070421110318@godabuzz.cjb.net> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://miskz.hk ONLY! From shravk_k at goipg.net Sat Apr 21 11:15:42 2007 From: shravk_k at goipg.net (Dinning H. Chattanooga) Date: Sat, 21 Apr 2007 11:15:42 -0400 Subject: [Vtigercrm-commits] Say I can have sex all night long! Message-ID: <2512413179.20070421111542@goipg.net> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://miskz.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From snider at glenpt.com Sat Apr 21 11:34:16 2007 From: snider at glenpt.com (Rotunds J. Pentateuch) Date: Sat, 21 Apr 2007 11:34:16 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1115652796.20070421113416@glenpt.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/fad5045a/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Slavonic.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/fad5045a/attachment.gif From agashe at glyn.b11.ingr.com Sat Apr 21 12:12:56 2007 From: agashe at glyn.b11.ingr.com (Absurdly A. Disinterestedly) Date: Sat, 21 Apr 2007 12:12:56 -0400 Subject: [Vtigercrm-commits] No doctor appointment is necessary Message-ID: <7273737873.20070421121256@glyn.b11.ingr.com> The most powerful medicines for you! Phentermine - $2.98 - a drug used in the short-term management of obesity. It comes in tablets or capsules of various colors depending on the strength of the medication; 15, 30 and 37.5 milligram pills available. Zolioft - $1.08 - a type of antidepressant known as a selective serotonin reuptake inhibitor (SSRI). Maxaman - $35.99 - The all natural proprietary blend of unique herbs found in Maxaman is designed to restore blood flow to your penis, unleash stored testosterone, and heighten sensation by activating the body's natural hormone production and supplying vital nutrients necessary for peak sexual performance. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From shahryar_irani at gordonbrush.com Sat Apr 21 12:18:10 2007 From: shahryar_irani at gordonbrush.com (Ascertained C. Unruliness) Date: Sat, 21 Apr 2007 12:18:10 -0400 Subject: [Vtigercrm-commits] All medications to cure yourself! Message-ID: <5567711106.20070421121810@gordonbrush.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://miskz.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From deirdre at gilberthome.com Sat Apr 21 13:50:00 2007 From: deirdre at gilberthome.com (Hogsheads H. Botswana) Date: Sat, 21 Apr 2007 13:50:00 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5536769145.20070421135000@gilberthome.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/2f8788a1/attachment.html From mcelroy at golftravelinfo.com Sat Apr 21 14:06:53 2007 From: mcelroy at golftravelinfo.com (Charcoal M. Sculpture) Date: Sat, 21 Apr 2007 14:06:53 -0400 Subject: [Vtigercrm-commits] We have everything that you need Message-ID: <0668638935.20070421140653@golftravelinfo.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://miskz.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From extremalirek at greatriverdesign.com Sat Apr 21 14:41:36 2007 From: extremalirek at greatriverdesign.com (Poetry H. Biassed) Date: Sat, 21 Apr 2007 14:41:36 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <6220628822.20070421144136@greatriverdesign.com> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://miskz.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From games at gktlljdel.shankscape.com Sat Apr 21 14:42:41 2007 From: games at gktlljdel.shankscape.com (Unaltered Q. Swilling) Date: Sat, 21 Apr 2007 14:42:41 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5388778986.20070421144241@gktlljdel.shankscape.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/f3763eef/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: antiheroes.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/f3763eef/attachment.gif From extremebottom at giotto.com Sat Apr 21 15:35:31 2007 From: extremebottom at giotto.com (Savvies C. Trapezoidal) Date: Sat, 21 Apr 2007 15:35:31 -0400 Subject: [Vtigercrm-commits] Health for everybody Message-ID: <2904972441.20070421153531@giotto.com> The most powerful medicines for you! Virility Patch - $42.85 - Male Enhancement Formula is an all natural herbal patch containing a variety of herbs known for promoting sexual desire and performance. Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. Horny Goat Weed - $35.99 - Epimedium is a genus of twenty-one related plant species. It boosts libido (sex drive), increases energy levels and enhances recovery from exercise. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From lkmejias at go2ksp.com Sat Apr 21 15:57:26 2007 From: lkmejias at go2ksp.com (Relic H. Sing) Date: Sat, 21 Apr 2007 15:57:26 -0400 Subject: [Vtigercrm-commits] Need some help? Message-ID: <7475857779.20070421155726@go2ksp.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://miskz.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From joe_blow at grdata.com Sat Apr 21 16:05:44 2007 From: joe_blow at grdata.com (Reshuffling V. Evenest) Date: Sat, 21 Apr 2007 16:05:44 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5458246385.20070421160544@grdata.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/fa5a411e/attachment-0002.html From sfrysinger at green-cards.com Sat Apr 21 16:51:41 2007 From: sfrysinger at green-cards.com (Negligible Q. Lifetimes) Date: Sat, 21 Apr 2007 16:51:41 -0400 Subject: [Vtigercrm-commits] Looking for medications? Message-ID: <9422258771.20070421165141@green-cards.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://miskz.hk Completely secure and confidential purchase. Instant shipping worldwide. From ap at greatescapekids.com Sat Apr 21 17:45:59 2007 From: ap at greatescapekids.com (Anthologized R. Appalled) Date: Sat, 21 Apr 2007 17:45:59 -0400 Subject: [Vtigercrm-commits] You can't find cure that you need? Message-ID: <2434776569.20070421174559@greatescapekids.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://miskz.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From simondenyer at giconindia.com Sat Apr 21 17:48:42 2007 From: simondenyer at giconindia.com (Economic E. Indicts) Date: Sat, 21 Apr 2007 17:48:42 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5840535539.20070421174842@giconindia.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/e5350d23/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Spaatz.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/e5350d23/attachment.gif From istdasklar at globaladvise.com Sat Apr 21 17:56:35 2007 From: istdasklar at globaladvise.com (Pierces D. Rational) Date: Sat, 21 Apr 2007 17:56:35 -0400 Subject: [Vtigercrm-commits] Why should you pay more? Message-ID: <6603663591.20070421175635@globaladvise.com> The most powerful medicines for you! Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. Augmetin - $4.8 - FDA-approved antibiotic for both acute bacterial sinusitis (ABS) and community-acquired pneumonia (CAP). Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From jokumabe at greenappraisals.com Sat Apr 21 19:03:43 2007 From: jokumabe at greenappraisals.com (Liquefied H. Recognizing) Date: Sat, 21 Apr 2007 19:03:43 -0400 Subject: [Vtigercrm-commits] Tired with sexual troubles? Message-ID: <6463869776.20070421190343@greenappraisals.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://miskz.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From msulzen at gigtoys.com Sat Apr 21 19:15:07 2007 From: msulzen at gigtoys.com (Scorning L. Brigantine) Date: Sat, 21 Apr 2007 19:15:07 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3967898495.20070421191507@gigtoys.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/bc03bc23/attachment.html From mtusing at gguerra.net Sat Apr 21 19:32:23 2007 From: mtusing at gguerra.net (Spores M. Recluse) Date: Sat, 21 Apr 2007 19:32:23 -0400 Subject: [Vtigercrm-commits] Top pills at low prices. Message-ID: <0246990326.20070421193223@gguerra.net> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://miskz.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From extremesnorkeler at glsm.net Sat Apr 21 20:30:07 2007 From: extremesnorkeler at glsm.net (Jimenez M. Nitrogen) Date: Sat, 21 Apr 2007 20:30:07 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7205333731.20070421203007@glsm.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/83e955a3/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: bedpans.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/83e955a3/attachment.gif From spivey at greatfallscentral.org Sat Apr 21 20:56:05 2007 From: spivey at greatfallscentral.org (Affluently S. Hematologist) Date: Sat, 21 Apr 2007 20:56:05 -0400 Subject: [Vtigercrm-commits] Want to be perfect lover? Message-ID: <9752968822.20070421205605@greatfallscentral.org> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://miskz.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From graeme at gocee.com Sat Apr 21 21:47:20 2007 From: graeme at gocee.com (Borrow Q. River) Date: Sat, 21 Apr 2007 21:47:20 -0400 Subject: [Vtigercrm-commits] Huge on-line pharmacy Message-ID: <8465300729.20070421214720@gocee.com> The most powerful medicines for you! Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. Sonma - $1.22 - works to relax the muscles by blocking pain messages sent to the brain. Premium Diet Patch - $37.12 - Lose weight fast and safe with the most potent weight loss patch on the market today! and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From burks at grifftax.ca Sat Apr 21 22:21:33 2007 From: burks at grifftax.ca (Complexion U. Denomination) Date: Sat, 21 Apr 2007 22:21:33 -0400 Subject: [Vtigercrm-commits] Say NO to erectile dysfunction! Message-ID: <0368106864.20070421222133@grifftax.ca> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://miskz.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From i_sugar_rich at gordonrainsford.co.uk Sat Apr 21 22:31:28 2007 From: i_sugar_rich at gordonrainsford.co.uk (Amiably J. Trunked) Date: Sat, 21 Apr 2007 22:31:28 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1154894054.20070421223128@gordonrainsford.co.uk> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/0d3c9189/attachment-0002.html From istianofamily at green-team.com Sat Apr 21 22:53:08 2007 From: istianofamily at green-team.com (Teatime G. Sumac) Date: Sat, 21 Apr 2007 22:53:08 -0400 Subject: [Vtigercrm-commits] Products that can improve you life! Message-ID: <6910125090.20070421225308@green-team.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://miskz.hk any pill you need! Absolutely Confidential and Secure purchase From austin at gokce.com Sat Apr 21 23:27:36 2007 From: austin at gokce.com (Specify A. Bede) Date: Sat, 21 Apr 2007 23:27:36 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3804230322.20070421232736@gokce.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/b182f9d4/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Sykes.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070421/b182f9d4/attachment.gif From extremegravity at goldline.on.ca Sat Apr 21 23:34:54 2007 From: extremegravity at goldline.on.ca (Dissatisfying H. Mahfouz) Date: Sat, 21 Apr 2007 23:34:54 -0400 Subject: [Vtigercrm-commits] Healthy life is your dream? Message-ID: <4486730879.20070421233454@goldline.on.ca> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://miskz.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From cormier at graduadosocial.com Sun Apr 22 00:48:50 2007 From: cormier at graduadosocial.com (Lawfully L. Braces) Date: Sun, 22 Apr 2007 00:48:50 -0400 Subject: [Vtigercrm-commits] Usefull information about drugs Message-ID: <4170182514.20070422004850@graduadosocial.com> The most powerful medicines for you! Imitrex - $9.06 - acute treatment of migraine attacks. Singulair - $1.28 - medicine approved to help control asthma in adults and children as young as 12 months old. It also helps to relieve the symptoms of seasonal allergies in adults and children as young as 2 years old. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istallworth at gripsusa.com Sun Apr 22 01:35:39 2007 From: istallworth at gripsusa.com (Instalment M. Pimply) Date: Sun, 22 Apr 2007 01:35:39 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <4525266511.20070422013539@gripsusa.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://miskz.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From isthatme at gomatthews.com Sun Apr 22 01:37:50 2007 From: isthatme at gomatthews.com (Hone D. Hotshot) Date: Sun, 22 Apr 2007 01:37:50 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8157171280.20070422013750@gomatthews.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/1e9a7896/attachment.html From istophe at greystonehome.com Sun Apr 22 01:59:50 2007 From: istophe at greystonehome.com (Literati J. Provision) Date: Sun, 22 Apr 2007 01:59:50 -0400 Subject: [Vtigercrm-commits] Say I can have sex all night long! Message-ID: <2342621080.20070422015950@greystonehome.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://miskz.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From elelliot at gramarstone.com Sun Apr 22 02:46:26 2007 From: elelliot at gramarstone.com (Blustering K. Mademoiselle) Date: Sun, 22 Apr 2007 02:46:26 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0870252264.20070422024626@gramarstone.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/3886b7b7/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Saginaw.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/3886b7b7/attachment.gif From istarp at graytechintl.com Sun Apr 22 02:57:58 2007 From: istarp at graytechintl.com (Moriarty D. Vaulting) Date: Sun, 22 Apr 2007 02:57:58 -0400 Subject: [Vtigercrm-commits] No need to visit local drug store. Message-ID: <2032225836.20070422025758@graytechintl.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://miskz.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From accent at grindminded.com Sun Apr 22 03:50:13 2007 From: accent at grindminded.com (Captives O. Delight) Date: Sun, 22 Apr 2007 03:50:13 -0400 Subject: [Vtigercrm-commits] The most widely prescribed drugs Message-ID: <8393976783.20070422035013@grindminded.com> The most powerful medicines for you! Pheromone perfume for women - $35.99 - The human pheromones that attracts males has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of women, these natural pheromones are an evolutionary remnant from a time when human males relied on scent to locate female mates. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extralar at goldeneaglefishing.com Sun Apr 22 04:37:35 2007 From: extralar at goldeneaglefishing.com (Recruiting R. Postman) Date: Sun, 22 Apr 2007 04:37:35 -0400 Subject: [Vtigercrm-commits] Change your sexual life for the better Message-ID: <4334458451.20070422043735@goldeneaglefishing.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://miskz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From cbs at gigadream.net Sun Apr 22 04:46:40 2007 From: cbs at gigadream.net (Constance E. Vermicelli) Date: Sun, 22 Apr 2007 04:46:40 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1207329636.20070422044640@gigadream.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/258eac16/attachment-0002.html From istkh at gocbm.com Sun Apr 22 05:30:29 2007 From: istkh at gocbm.com (Aficionado M. Cebu) Date: Sun, 22 Apr 2007 05:30:29 -0400 Subject: [Vtigercrm-commits] Few steps to become healthy! Message-ID: <5354182028.20070422053029@gocbm.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://miskz.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From extradreh at grapplingtournaments.com Sun Apr 22 05:52:31 2007 From: extradreh at grapplingtournaments.com (Weaning P. Gilead) Date: Sun, 22 Apr 2007 05:52:31 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7492905287.20070422055231@grapplingtournaments.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/e7d9e621/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: solidifying.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/e7d9e621/attachment.gif From istephenson at goletadepot.org Sun Apr 22 06:19:20 2007 From: istephenson at goletadepot.org (Formalism E. Seduction) Date: Sun, 22 Apr 2007 06:19:20 -0400 Subject: [Vtigercrm-commits] All medications to cure yourself! Message-ID: <3737251008.20070422061920@goletadepot.org> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://miskz.hk ONLY! From isteelcorp at go-mmr.com Sun Apr 22 07:05:27 2007 From: isteelcorp at go-mmr.com (Periodic J. Ladybird) Date: Sun, 22 Apr 2007 07:05:27 -0400 Subject: [Vtigercrm-commits] The most widely prescribed drugs Message-ID: <9678405562.20070422070527@go-mmr.com> The most powerful medicines for you! Glucosamine - $35.99 - used in case of the alleviation of the symptoms of arthritis. Lasix - $0.53 - a loop diuretic used to treat high blood pressure, congestive heart failure, and swelling due to excess body water. Nymphomax - $35.99 - Helps women to achieve multiple and more powerful orgasms with this unique female sexual stimulant. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From dharwick at gmhca.com Sun Apr 22 07:14:37 2007 From: dharwick at gmhca.com (Gawked M. Chromium) Date: Sun, 22 Apr 2007 07:14:37 -0400 Subject: [Vtigercrm-commits] Top listed medications 4 you. Message-ID: <0088808022.20070422071437@gmhca.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://miskz.hk Verified by VISA and sell FDA Approved Drugs only! From cobra at granite-hill.com Sun Apr 22 07:43:18 2007 From: cobra at granite-hill.com (Back C. Freezes) Date: Sun, 22 Apr 2007 07:43:18 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0849204007.20070422074318@granite-hill.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/3f8a73cf/attachment.html From regiss_j at gerstadbuilders.com Sun Apr 22 08:20:36 2007 From: regiss_j at gerstadbuilders.com (Garroting U. Touchdown) Date: Sun, 22 Apr 2007 08:20:36 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <7914808702.20070422082036@gerstadbuilders.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://miskz.hk Only Secure and Confidential purchase! Verified buy VISA! From asc at go-artic.com Sun Apr 22 08:49:47 2007 From: asc at go-artic.com (Porpoised U. Lizard) Date: Sun, 22 Apr 2007 08:49:47 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6033567966.20070422084947@go-artic.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/f694d730/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: herring.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/f694d730/attachment.gif From dmartin at ginospizza.com Sun Apr 22 09:35:38 2007 From: dmartin at ginospizza.com (Portrait P. Flux) Date: Sun, 22 Apr 2007 09:35:38 -0400 Subject: [Vtigercrm-commits] Healthy life is your dream? Message-ID: <3194904875.20070422093538@ginospizza.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://miskz.hk Instant shipping worldwide! CONFIDENTIAL purchase! From gardenkrans at ghrg.com Sun Apr 22 10:24:02 2007 From: gardenkrans at ghrg.com (Crumpet I. Depositor) Date: Sun, 22 Apr 2007 10:24:02 -0400 Subject: [Vtigercrm-commits] Only our pharmacy gives the results like that Message-ID: <5531178669.20070422102402@ghrg.com> The most powerful medicines for you! Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. Quick Bust - $35.99 - Get the shape and size you always wanted with natural breast enhancing capsules. Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extrusion at globalwealthbuilder.com Sun Apr 22 10:37:34 2007 From: extrusion at globalwealthbuilder.com (Cupping Q. Louise) Date: Sun, 22 Apr 2007 10:37:34 -0400 Subject: [Vtigercrm-commits] We have everything that you need Message-ID: <5400938930.20070422103734@globalwealthbuilder.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://miskz.hk Verified by VISA and sell FDA Approved Drugs only! From extraenergy at gps-inc.com Sun Apr 22 10:44:14 2007 From: extraenergy at gps-inc.com (Prepackage D. Saver) Date: Sun, 22 Apr 2007 10:44:14 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7839781312.20070422104414@gps-inc.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/0b314541/attachment-0002.html From craig at gladstonedesign.com Sun Apr 22 11:12:42 2007 From: craig at gladstonedesign.com (Memoirs P. Peru) Date: Sun, 22 Apr 2007 11:12:42 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <8284162570.20070422111242@gladstonedesign.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://miskz.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From sykes at gfnf.com Sun Apr 22 12:12:12 2007 From: sykes at gfnf.com (Mani K. Pepsi) Date: Sun, 22 Apr 2007 12:12:12 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6484766621.20070422121212@gfnf.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/b3ea272f/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: caving.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/b3ea272f/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 22 12:26:16 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 22 Apr 2007 16:26:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10754 - /vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl Message-ID: <20070422162616.50ABB7C80EE@vtiger.fosslabs.com> Author: saraj Date: Sun Apr 22 10:26:11 2007 New Revision: 10754 Log: select Email IDs pop-up no longer defaults to Email - fixed . Fixes #2801 Modified: vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl Sun Apr 22 10:26:11 2007 @@ -40,7 +40,7 @@ {foreach name=emailids key=fieldid item=elements from=$MAILINFO} {if $smarty.foreach.emailids.iteration eq 1} - + {else} {/if} From rarwapald at grintek.com Sun Apr 22 12:52:11 2007 From: rarwapald at grintek.com (Choristers I. Plutocratic) Date: Sun, 22 Apr 2007 12:52:11 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <6142110342.20070422125211@grintek.com> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://miskz.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 22 13:03:44 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 22 Apr 2007 17:03:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10755 - in /vtigercrm/branches/5.0.3/include: language/en_us.lang.php utils/SearchUtils.php Message-ID: <20070422170344.7FF5E7DA7D7@vtiger.fosslabs.com> Author: saraj Date: Sun Apr 22 11:03:36 2007 New Revision: 10755 Log: In Basic Search of Notes,Searching contact with full name gives empty result. Fixes #3301 Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Sun Apr 22 11:03:36 2007 @@ -872,6 +872,7 @@ 'Lead Status'=>'Lead Status', 'Lead Source'=>'Lead Source', 'Quote ID'=>'Quote Id', +'LBL_CONTACT_LAST_NAME'=>'Contact - Last Name', ); $app_list_strings = array ( Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Sun Apr 22 11:03:36 2007 @@ -129,7 +129,8 @@ if($fieldname!='parent_id') { $fld_name=$fieldname; - + if($fieldname == 'contact_id') + $name = $app_strings['LBL_CONTACT_LAST_NAME']; //assign the translated string $search_header[$fld_name] = getTranslatedString($name); } @@ -306,6 +307,12 @@ } //Check ends + if($module == "Notes" && $search_field == "contact_id") + { + $module = 'Contacts'; + $search_field = 'lastname'; + } + $qry="select vtiger_field.columnname,tablename from vtiger_tab inner join vtiger_field on vtiger_field.tabid=vtiger_tab.tabid where name='".$module."' and (fieldname='".$search_field."' or columnname='".$search_field."')"; $result = $adb->query($qry); $noofrows = $adb->num_rows($result); From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 22 13:12:21 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 22 Apr 2007 17:12:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10756 - in /vtigercrm/branches/5.0.3/modules/Settings: language/en_us.lang.php savewordtemplate.php Message-ID: <20070422171221.E1E6C78D955@vtiger.fosslabs.com> Author: saraj Date: Sun Apr 22 11:12:15 2007 New Revision: 10756 Log: Settings - Mail merge templates goes to blank page if wrong file given as input - fixed . Fixes #3586 Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Sun Apr 22 11:12:15 2007 @@ -904,7 +904,8 @@ 'LBL_FIELDS_TO_BE_SHOWN'=>'Fields to be shown', //Added for alerts 'SPECIFY_FILE_TO_MERGE' => 'Please Specify a File to Merge', -'FILESIZE_EXCEEDS_INFO' => 'Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file', +'FILESIZE_EXCEEDS_INFO_CONFIG_INC' => 'Sorry, the uploaded file exceeds the maximum file size limit in config.inc.php. Please try a smaller file', +'FILESIZE_EXCEEDS_INFO_PHP_INI' => 'Sorry, the uploaded file exceeds the maximum file size limit in php.ini. Please try a smaller file', 'PROBLEMS_IN_FILEUPLOAD' => 'Problems in file upload. Please try again!', //Added fields for Invoice Number labels Modified: vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php Sun Apr 22 11:12:15 2007 @@ -128,32 +128,37 @@ } else { - $errorCode = $_FILES['binFile']['error']; - - if($errorCode == 4) - { - include('themes/'.$theme.'/header.php'); - include "upload.php"; - // $errormessage = "Kindly give a valid file for upload!
    " ; - echo ""; - } - else if($errorCode == 2) - { - include('themes/'.$theme.'/header.php'); - include "upload.php"; - //$errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file
    "; - echo ""; - //echo $errormessage; - //echo $errorCode; - } - else if($errorCode == 3) - { - include('themes/'.$theme.'/header.php'); - include "upload.php"; - echo ""; - - } - + $errorCode = $_FILES['binFile']['error']; + if($errorCode == 4) + { + include('themes/'.$theme.'/header.php'); + include "upload.php"; + // $errormessage = "Kindly give a valid file for upload!
    " ; + echo ""; + } + else if($errorCode == 2) + { + include('themes/'.$theme.'/header.php'); + include "upload.php"; + //$errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file
    "; + echo ""; + //echo $errormessage; + //echo $errorCode; + } + elseif($errorCode == 1) + { + include('themes/'.$theme.'/header.php'); + include "upload.php"; + echo ""; + } + else if($errorCode == 3) + { + include('themes/'.$theme.'/header.php'); + include "upload.php"; + echo ""; + + } + } function deleteFile($dir,$filename) From president at gofknitech.com Sun Apr 22 13:26:46 2007 From: president at gofknitech.com (Radioactivity I. Badlands) Date: Sun, 22 Apr 2007 13:26:46 -0400 Subject: [Vtigercrm-commits] Penis launcher Message-ID: <6286380654.20070422132646@gofknitech.com> The most powerful medicines for you! Pro-erex - $35.99 - Enlarge your penis and achieve stronger erections with this natural stamina enhancer. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Sun Apr 22 13:19:41 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 22 Apr 2007 17:19:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10757 - /vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Message-ID: <20070422171941.D9DFD7C80EE@vtiger.fosslabs.com> Author: saraj Date: Sun Apr 22 11:19:37 2007 New Revision: 10757 Log: Reports : Date filter does not works properly - fixed. Fixes #3633 Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Sun Apr 22 11:19:37 2007 @@ -590,6 +590,43 @@ $nextFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01", date("Y")+1)); $nextFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")+1)); + if(date("m") <= 3) + { + $cFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "03","31",date("Y"))); + $nFq = date("Y-m-d",mktime(0, 0, 0, "04","01",date("Y"))); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "06","30",date("Y"))); + $pFq = date("Y-m-d",mktime(0, 0, 0, "10","01",date("Y")-1)); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y")-1)); + }else if(date("m") > 3 and date("m") <= 6) + { + $pFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y"))); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "03","31",date("Y"))); + $cFq = date("Y-m-d",mktime(0, 0, 0, "04","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "06","30",date("Y"))); + $nFq = date("Y-m-d",mktime(0, 0, 0, "07","01",date("Y"))); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "09","30",date("Y"))); + + }else if(date("m") > 6 and date("m") <= 9) + { + $nFq = date("Y-m-d",mktime(0, 0, 0, "10","01",date("Y"))); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y"))); + $pFq = date("Y-m-d",mktime(0, 0, 0, "04","01",date("Y"))); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "06","30",date("Y"))); + $cFq = date("Y-m-d",mktime(0, 0, 0, "07","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "09","30",date("Y"))); + } + else if(date("m") > 9 and date("m") <= 12) + { + $nFq = date("Y-m-d",mktime(0, 0, 0, "01","01",date("Y")+1)); + $nFq1 = date("Y-m-d",mktime(0, 0, 0, "03","31",date("Y")+1)); + $pFq = date("Y-m-d",mktime(0, 0, 0, "07","01",date("Y"))); + $pFq1 = date("Y-m-d",mktime(0, 0, 0, "09","30",date("Y"))); + $cFq = date("Y-m-d",mktime(0, 0, 0, "10","01",date("Y"))); + $cFq1 = date("Y-m-d",mktime(0, 0, 0, "12","31",date("Y"))); + + } + if($type == "today" ) { @@ -726,19 +763,19 @@ elseif($type == "nextfq" ) { - $datevalue[0] = "2005-07-01"; - $datevalue[1] = "2005-09-30"; + $datevalue[0] = $nFq; + $datevalue[1] = $nFq1; } elseif($type == "prevfq" ) { - $datevalue[0] = "2005-01-01"; - $datevalue[1] = "2005-03-31"; + $datevalue[0] = $pFq; + $datevalue[1] = $pFq1; } elseif($type == "thisfq" ) { - $datevalue[0] = "2005-04-01"; - $datevalue[1] = "2005-06-30"; + $datevalue[0] = $cFq; + $datevalue[1] = $cFq1; } else { From pjones at gic.de Sun Apr 22 13:47:33 2007 From: pjones at gic.de (Pronouncements R. Guardsman) Date: Sun, 22 Apr 2007 13:47:33 -0400 Subject: [Vtigercrm-commits] Healthy life is your dream? Message-ID: <7864983971.20070422134733@gic.de> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://miskz.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From shelby_patrick at globaltravelshield.com Sun Apr 22 13:59:38 2007 From: shelby_patrick at globaltravelshield.com (Rancorous P. Fastenings) Date: Sun, 22 Apr 2007 13:59:38 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2242802613.20070422135938@globaltravelshield.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/995552fa/attachment.html From extramom at greenehouse.homechoice.co.uk Sun Apr 22 14:06:16 2007 From: extramom at greenehouse.homechoice.co.uk (Ghanian G. Muhammadan) Date: Sun, 22 Apr 2007 14:06:16 -0400 Subject: [Vtigercrm-commits] Need to buy medications but don't know where? Message-ID: <3674946167.20070422140616@greenehouse.homechoice.co.uk> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://miskz.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From extreamfun at ghettopia.org Sun Apr 22 14:59:56 2007 From: extreamfun at ghettopia.org (Resplendently S. Men) Date: Sun, 22 Apr 2007 14:59:56 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1836954062.20070422145956@ghettopia.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/10747ac1/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: dumpling.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/10747ac1/attachment.gif From extrememk at gourmetnews.com Sun Apr 22 15:17:16 2007 From: extrememk at gourmetnews.com (Perpetrated I. Fattiest) Date: Sun, 22 Apr 2007 15:17:16 -0400 Subject: [Vtigercrm-commits] Nobody will know bout your problems. Message-ID: <4165622498.20070422151716@gourmetnews.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://miskz.hk Make right choice: buy medications at LegalRXMedications drug store! From danny at goodheartwillcox.com Sun Apr 22 17:01:57 2007 From: danny at goodheartwillcox.com (Roche L. Laughingstock) Date: Sun, 22 Apr 2007 17:01:57 -0400 Subject: [Vtigercrm-commits] Only our pharmacy gives the results like that Message-ID: <5440620843.20070422170157@goodheartwillcox.com> The most powerful medicines for you! Lipothin - $35.99 - the finest lipotropic fat burner ever! Made from only the finest pharmaceutical grade botanicals, Lipothin contains a unique and highly effective formula of all-natural ingredients which will increase your heart rate, suppress your appetite, and greatly accelerate the burning of fat. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. Wellbutrin SR - $3 - antidepressant used to treat depression. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From pat at glsm.com Sun Apr 22 17:06:02 2007 From: pat at glsm.com (McCoy E. Thanh) Date: Sun, 22 Apr 2007 17:06:02 -0400 Subject: [Vtigercrm-commits] Want to on the top all night? Message-ID: <7550215246.20070422170602@glsm.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://miskz.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From extremehaunts at gratus.net Sun Apr 22 17:32:31 2007 From: extremehaunts at gratus.net (Condom D. Argentinians) Date: Sun, 22 Apr 2007 17:32:31 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0806430775.20070422173231@gratus.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/3f314e05/attachment-0002.html From destiny at golfirrigation.com Sun Apr 22 17:40:50 2007 From: destiny at golfirrigation.com (Depression E. Billed) Date: Sun, 22 Apr 2007 17:40:50 -0400 Subject: [Vtigercrm-commits] Want to be a hero in a bed? Message-ID: <2350857570.20070422174050@golfirrigation.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://miskz.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From ccm at getit.de Sun Apr 22 18:05:50 2007 From: ccm at getit.de (Gofers F. Masturbate) Date: Sun, 22 Apr 2007 18:05:50 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0118012870.20070422180550@getit.de> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/daf6b2d4/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: diner.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/daf6b2d4/attachment.gif From extreme_loco at getunderground.com Sun Apr 22 18:57:19 2007 From: extreme_loco at getunderground.com (Chosen P. Integration) Date: Sun, 22 Apr 2007 18:57:19 -0400 Subject: [Vtigercrm-commits] Looking for medications? Message-ID: <4501657792.20070422185719@getunderground.com> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://miskz.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From istafa at getsemani-estudios.com Sun Apr 22 19:42:26 2007 From: istafa at getsemani-estudios.com (Zones V. Predicative) Date: Sun, 22 Apr 2007 19:42:26 -0400 Subject: [Vtigercrm-commits] V1 agra vs sexual disorder Message-ID: <5561855686.20070422194226@getsemani-estudios.com> The most powerful medicines for you! Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. Suprax - $3- a medication belonging to a class of antibiotics called Cephalosporins. The active ingredient in Suprax is Cefixime. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extremeexc at grangerbernieropto.com Sun Apr 22 20:16:48 2007 From: extremeexc at grangerbernieropto.com (Hefts G. Producer) Date: Sun, 22 Apr 2007 20:16:48 -0400 Subject: [Vtigercrm-commits] Want to be the best with your girlfriend? Message-ID: <7889825130.20070422201648@grangerbernieropto.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://miskz.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From beyond at godofdomains.com Sun Apr 22 20:42:36 2007 From: beyond at godofdomains.com (Guardrails U. Dudgeon) Date: Sun, 22 Apr 2007 20:42:36 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9820245239.20070422204236@godofdomains.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/6e164697/attachment.html From sebgui at ggosselin.com Sun Apr 22 21:19:43 2007 From: sebgui at ggosselin.com (Champed S. Kipling) Date: Sun, 22 Apr 2007 21:19:43 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <7630441768.20070422211943@ggosselin.com> Our Canada Pharmacy store presents top products that will make you healthy! You do not need to go to your local drug store, you can by here any pill that you need. Viagra, Cialis, Levitra, Valium, Phentermine, Tramadol, Xanax, HGH you can find them here: http://miskz.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From das at gleason-insurance.com Sun Apr 22 21:59:16 2007 From: das at gleason-insurance.com (Barlow J. Stung) Date: Sun, 22 Apr 2007 21:59:16 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1989954571.20070422215916@gleason-insurance.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/2af71517/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Solomon.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/2af71517/attachment.gif From agassia at grenix.com Sun Apr 22 22:16:09 2007 From: agassia at grenix.com (Faltering T. Grime) Date: Sun, 22 Apr 2007 22:16:09 -0400 Subject: [Vtigercrm-commits] To buy or not to buy? Message-ID: <3779252957.20070422221609@grenix.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://miskz.hk Completely secure and confidential purchase. Instant shipping worldwide. From a.hohnhorst at gothiapower.com Sun Apr 22 22:22:45 2007 From: a.hohnhorst at gothiapower.com (Goriest V. Dreamer) Date: Sun, 22 Apr 2007 22:22:45 -0400 Subject: [Vtigercrm-commits] On-line generic store Message-ID: <5508951118.20070422222245@gothiapower.com> The most powerful medicines for you! Allegra - $1.32 - an antihistamine that comes in a variety of strengths and formulations to provide relief from a wide range of seasonal allergy symptoms. Clearitol - $40.5 - specially formulated to help correct acne-causing internal imbalances in both adults and adolescents. Ultram - $1.83 - an analgesic used to treat or prevent pain. and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From internet at globalpro.com Sun Apr 22 22:54:27 2007 From: internet at globalpro.com (Fliers J. Vaughan) Date: Sun, 22 Apr 2007 22:54:27 -0400 Subject: [Vtigercrm-commits] Perfect sex? It is possible! Message-ID: <5904643155.20070422225427@globalpro.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://miskz.hk Instant shipping worldwide! CONFIDENTIAL purchase! From bompane at girolama.com Sun Apr 22 23:48:57 2007 From: bompane at girolama.com (Vitiation L. Editorializing) Date: Sun, 22 Apr 2007 23:48:57 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6882506468.20070422234857@girolama.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070422/7d1715b2/attachment-0002.html From maspelin at green1.force9.net Mon Apr 23 00:31:54 2007 From: maspelin at green1.force9.net (Incised Q. Carla) Date: Mon, 23 Apr 2007 00:31:54 -0400 Subject: [Vtigercrm-commits] Healthy life is your dream? Message-ID: <6268826963.20070423003154@green1.force9.net> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://miskz.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 23 01:04:13 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 23 Apr 2007 05:04:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10758 - in /vtigercrm/branches/5.0.3: Smarty/templates/ActivityEditView.tpl Smarty/templates/Header.tpl include/js/en_us.lang.js include/js/general.js modules/Calendar/language/en_us.lang.php modules/Calendar/script.js Message-ID: <20070423050414.190447DA7C9@vtiger.fosslabs.com> Author: richie Date: Sun Apr 22 23:03:58 2007 New Revision: 10758 Log: fix for Calendar : start date & time is not validated properly while creating an event with the status as planned. Fixes #3462 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl vtigercrm/branches/5.0.3/include/js/en_us.lang.js vtigercrm/branches/5.0.3/include/js/general.js vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Calendar/script.js Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl Sun Apr 22 23:03:58 2007 @@ -898,9 +898,9 @@ var fieldlabel = new Array('{$MOD.LBL_LIST_SUBJECT}','{$MOD.LBL_START_DATE}','{$MOD.LBL_TIME}','{$MOD.LBL_DUE_DATE}','{$MOD.LBL_STATUS}'); var fielddatatype = new Array('V~M','D~M~time_start','T~O','D~M~OTH~GE~date_start~Start Date & Time','V~O'); {else} - var fieldname = new Array('subject','date_start','due_date','taskpriority','sendnotification','parent_id','contact_id','reminder_time','recurringtype'); - var fieldlabel = new Array('{$MOD.LBL_LIST_SUBJECT}','{$MOD.LBL_START_DATE}','{$MOD.LBL_DUE_DATE}','{$MOD.Priority}','{$MOD.LBL_SENDNOTIFICATION}','{$MOD.LBL_RELATEDTO}','{$MOD.LBL_CONTACT_NAME}','{$MOD.LBL_SENDREMINDER}','{$MOD.Recurrence}'); - var fielddatatype = new Array('V~M','D~M','D~M~OTH~GE~date_start~Start Date','V~O','C~O','I~O','I~O','I~O','O~O'); + var fieldname = new Array('subject','date_start','time_start','due_date','eventstatus','taskpriority','sendnotification','parent_id','contact_id','reminder_time','recurringtype'); + var fieldlabel = new Array('{$MOD.LBL_LIST_SUBJECT}','{$MOD.LBL_START_DATE}','{$MOD.LBL_START_TIME}','{$MOD.LBL_DUE_DATE}','{$MOD.LBL_STATUS}','{$MOD.Priority}','{$MOD.LBL_SENDNOTIFICATION}','{$MOD.LBL_RELATEDTO}','{$MOD.LBL_CONTACT_NAME}','{$MOD.LBL_SENDREMINDER}','{$MOD.Recurrence}'); + var fielddatatype = new Array('V~M','D~M','T~O','D~M~OTH~GE~date_start~Start Date','V~O','V~O','C~O','I~O','I~O','I~O','O~O'); {/if} Modified: vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Mon Apr 23 04:10:34 2007 @@ -170,7 +170,7 @@ 'LBL_START_TIME' => 'Start Time', 'LBL_END_TIME' => 'End Time', 'LBL_START_DATE'=>'Start Date', -'LBL_START_TIME'=>'Time Start', +'LBL_TIME_START'=>'Time Start', 'LBL_DUE_DATE'=>'Due Date', 'LBL_START_DATE_TIME'=>'Start Date & Time', 'LBL_END_DATE_TIME'=>'End Date & Time', From issydhan at globeground-berlin.com Mon Apr 23 06:37:07 2007 From: issydhan at globeground-berlin.com (Tasting G. Treats) Date: Mon, 23 Apr 2007 06:37:07 -0400 Subject: [Vtigercrm-commits] Medications for US residents. Message-ID: <2538958591.20070423063707@globeground-berlin.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://miskz.hk Instant shipping worldwide! CONFIDENTIAL purchase! From atlantic at giftingprogram.net Mon Apr 23 06:58:18 2007 From: atlantic at giftingprogram.net (Deann E. Mickie) Date: Mon, 23 Apr 2007 06:58:18 -0400 Subject: [Vtigercrm-commits] Change your sexual life for the better Message-ID: <1723589447.20070423065818@giftingprogram.net> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://miskz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From shanglov at gersema.net Mon Apr 23 07:04:58 2007 From: shanglov at gersema.net (Quieting Q. Foiling) Date: Mon, 23 Apr 2007 07:04:58 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3518832265.20070423070458@gersema.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/63825143/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: America.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/63825143/attachment.gif From ptyma at greentrees.com.au Mon Apr 23 08:29:24 2007 From: ptyma at greentrees.com.au (Motivates F. Horses) Date: Mon, 23 Apr 2007 08:29:24 -0400 Subject: [Vtigercrm-commits] US Drugs pharmacy Message-ID: <4177537110.20070423082924@greentrees.com.au> The most powerful medicines for you! Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. Zero Nicotine - $47.99 - innovative stop smoking patch designed to help you give up smoking safely and naturally. With its unique blend of ingredients, Zero Nicotine offers you the best possible chance to finally kick the deadly habit for good! If you are serious about your decision to quit smoking, you?ve come to the right place. Premium Diet Patch - $37.12 - Lose weight fast and safe with the most potent weight loss patch on the market today! and more! our site http://miskz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 23 08:28:18 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 23 Apr 2007 12:28:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10762 - /vtigercrm/branches/5.0.3/Smarty/templates/ReportFilters.tpl Message-ID: <20070423122818.B29177DA7E8@vtiger.fosslabs.com> Author: richie Date: Mon Apr 23 06:28:05 2007 New Revision: 10762 Log: * Call the updatefOptions to show the applicable conditions only when edit the report, Fixed #3612 Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportFilters.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportFilters.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ReportFilters.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ReportFilters.tpl Mon Apr 23 06:28:05 2007 @@ -174,4 +174,14 @@ Calendar.setup ({inputField : "jscal_field_date_start", ifFormat : "%Y-%m-%d", showsTime : false, button : "jscal_trigger_date_start", singleClick : true, step : 1}); Calendar.setup ({inputField : "jscal_field_date_end", ifFormat : "%Y-%m-%d", showsTime : false, button : "jscal_trigger_date_end", singleClick : true, step : 1}); + + + {/literal} From audio at graftonland.org Mon Apr 23 09:06:04 2007 From: audio at graftonland.org (Languages Q. Kiddied) Date: Mon, 23 Apr 2007 09:06:04 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <0573112932.20070423090604@graftonland.org> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://siio.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From dance at glas.cork.rtsg.mot.com Mon Apr 23 09:06:40 2007 From: dance at glas.cork.rtsg.mot.com (Slit J. Braille) Date: Mon, 23 Apr 2007 09:06:40 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9206236579.20070423090640@glas.cork.rtsg.mot.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/7591db0c/attachment-0001.html From bryson at gervin.net Mon Apr 23 09:21:14 2007 From: bryson at gervin.net (Jock V. Dart) Date: Mon, 23 Apr 2007 09:21:14 -0400 Subject: [Vtigercrm-commits] Make your girlfriend happy. Message-ID: <7054886014.20070423092114@gervin.net> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://siio.hk Instant shipping worldwide! CONFIDENTIAL purchase! From bradshaw at globalvoiz.com Mon Apr 23 10:36:36 2007 From: bradshaw at globalvoiz.com (Assistance Q. Coccyx) Date: Mon, 23 Apr 2007 10:36:36 -0400 Subject: [Vtigercrm-commits] You need these pills. Message-ID: <1104796548.20070423103636@globalvoiz.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://siio.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From istashouse at gppedtdkq.shankscape.com Mon Apr 23 10:51:04 2007 From: istashouse at gppedtdkq.shankscape.com (Huffman P. Correctness) Date: Mon, 23 Apr 2007 10:51:04 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1583831498.20070423105104@gppedtdkq.shankscape.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/c3a1c9de/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: synapses.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/c3a1c9de/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 23 10:56:14 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 23 Apr 2007 14:56:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10763 - in /vtigercrm/branches/5.0.3: Smarty/templates/CustomView.tpl include/js/en_us.lang.js modules/CustomView/CustomView.js modules/CustomView/CustomView.php modules/CustomView/EditView.php modules/CustomView/Save.php Message-ID: <20070423145614.5A0617DA7DA@vtiger.fosslabs.com> Author: richie Date: Mon Apr 23 08:56:01 2007 New Revision: 10763 Log: fix for customview-filter related issue. Fixes #3485 #3456 #3579 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl vtigercrm/branches/5.0.3/include/js/en_us.lang.js vtigercrm/branches/5.0.3/modules/CustomView/CustomView.js vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php vtigercrm/branches/5.0.3/modules/CustomView/EditView.php vtigercrm/branches/5.0.3/modules/CustomView/Save.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl Mon Apr 23 08:56:01 2007 @@ -22,6 +22,7 @@ + @@ -456,7 +469,7 @@ - + {$AND_TEXT1} + - + {$AND_TEXT2} + - + {$AND_TEXT3} + - + {$AND_TEXT4} + - + {$AND_TEXT5} + {*section name=advancedFilter start=1 loop=6 step=1} @@ -635,5 +653,25 @@ return true; } checkDuplicate(); +function stdfilterdateValidate() +{ + if(!dateValidate("startdate",alert_arr.STDFILTER+" - "+alert_arr.STARTDATE,"OTH")) + { + getObj("startdate").focus() + return false; + } + else if(!dateValidate("enddate",alert_arr.STDFILTER+" - "+alert_arr.ENDDATE,"OTH")) + { + getObj("enddate").focus() + return false; + } + else + { + if (!dateComparison("enddate",alert_arr.STDFILTER+" - "+alert_arr.ENDDATE,"startdate",alert_arr.STDFILTER+" - "+alert_arr.STARTDATE,"GE")) { + getObj("enddate").focus() + return false + } else return true; + } +} {/literal} Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Mon Apr 23 08:56:01 2007 @@ -120,6 +120,7 @@ START_DATE_TIME : 'Start Date & Time', START_TIME : 'Start Time', DATE_SHOULDNOT_PAST :'Current date & time for Activities with status as Planned', - TIME_SHOULDNOT_PAST :'Current Time for Activities with status as Planned' + TIME_SHOULDNOT_PAST :'Current Time for Activities with status as Planned', + LBL_AND : 'And' }; Modified: vtigercrm/branches/5.0.3/modules/CustomView/CustomView.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/CustomView.js (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/CustomView.js Mon Apr 23 08:56:01 2007 @@ -20,6 +20,24 @@ var currOption = selObj.options[selObj.selectedIndex]; var currField = sel.options[sel.selectedIndex]; + + var fld = currField.value.split(":"); + var tod = fld[4]; + if(fld[4] == 'D' || (fld[4] == 'T' && fld[1] != 'time_start' && fld[1] != 'time_end') || fld[4] == 'DT') + { + $("and"+sel.id).innerHTML = ""; + if(sel.id != "fcol5") + $("and"+sel.id).innerHTML = "("+$("user_dateformat").value+") "+alert_arr.LBL_AND; + else + $("and"+sel.id).innerHTML = "("+$("user_dateformat").value+") "; + } + else { + $("and"+sel.id).innerHTML = ""; + if(sel.id != "fcol5") + $("and"+sel.id).innerHTML = " "+alert_arr.LBL_AND; + else + $("and"+sel.id).innerHTML = " "; + } if(currField.value != null && currField.value.length != 0) { Modified: vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php Mon Apr 23 08:56:01 2007 @@ -536,16 +536,20 @@ if (type!="custom") { document.CustomView.startdate.readOnly=true - document.CustomView.enddate.readOnly=true - getObj("jscal_trigger_date_start").style.visibility="hidden" - getObj("jscal_trigger_date_end").style.visibility="hidden" + document.CustomView.enddate.readOnly=true + getObj("jscal_trigger_date_start").style.visibility="hidden" + getObj("jscal_trigger_date_end").style.visibility="hidden" + getObj("jscal_trigger_start_format").style.visibility="hidden" + getObj("jscal_trigger_end_format").style.visibility="hidden" } else { document.CustomView.startdate.readOnly=false - document.CustomView.enddate.readOnly=false - getObj("jscal_trigger_date_start").style.visibility="visible" - getObj("jscal_trigger_date_end").style.visibility="visible" + document.CustomView.enddate.readOnly=false + getObj("jscal_trigger_date_start").style.visibility="visible" + getObj("jscal_trigger_date_end").style.visibility="visible" + getObj("jscal_trigger_start_format").style.visibility="visible" + getObj("jscal_trigger_end_format").style.visibility="visible" } if( type == "today" ) { @@ -719,7 +723,6 @@ $stdfilterlist["startdate"] = $datefilter[0]; $stdfilterlist["enddate"] = $datefilter[1]; } - return $stdfilterlist; } @@ -747,7 +750,6 @@ $advft["value"] = $advfilterrow["value"]; $advfilterlist[] = $advft; } - return $advfilterlist; } Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Mon Apr 23 08:56:01 2007 @@ -39,7 +39,8 @@ $smarty->assign("MODULE",$cv_module); $smarty->assign("CVMODULE", $cv_module); $smarty->assign("CUSTOMVIEWID",$recordid); -$smarty->assign("DATAFORMAT",$current_user->date_format); +$smarty->assign("DATEFORMAT",$current_user->date_format); +$smarty->assign("JS_DATEFORMAT",parse_calendardate($app_strings['NTC_DATE_FORMAT'])); if($recordid == "") { $oCustomView = new CustomView(); @@ -111,8 +112,14 @@ if(isset($stdfilterlist["startdate"]) && isset($stdfilterlist["enddate"])) { - $smarty->assign("STARTDATE",$stdfilterlist["startdate"]); - $smarty->assign("ENDDATE",$stdfilterlist["enddate"]); + if($stdfilterhtml[0]['value'] == 'custom') + { + $smarty->assign("STARTDATE",getDisplayDate($stdfilterlist["startdate"])); + $smarty->assign("ENDDATE",getDisplayDate($stdfilterlist["enddate"])); + }else{ + $smarty->assign("STARTDATE",$stdfilterlist["startdate"]); + $smarty->assign("ENDDATE",$stdfilterlist["enddate"]); + } } $advfilterlist = $oCustomView->getAdvFilterByCvid($recordid); @@ -123,7 +130,19 @@ $advcolumnhtml = getByModule_ColumnsHTML($cv_module,$modulecollist,$advfilterlist[$i-1]["columnname"]); $smarty->assign("FOPTION".$i,$advfilterhtml); $smarty->assign("BLOCK".$i,$advcolumnhtml); + $col = explode(":",$advfilterlist[$i-1]["columnname"]); + $temp_val = explode(",",$advfilterlist[$i-1]["value"]); + $and_text = " ".$mod_strings['LBL_AND']; + if($col[4] == 'D' || ($col[4] == 'T' && $col[1] != 'time_start' && $col[1] != 'time_end') || $col[4] == 'DT') + { + $val = Array(); + for($x=0;$xdate_format.") ".$mod_strings['LBL_AND']; + } $smarty->assign("VALUE".$i,$advfilterlist[$i-1]["value"]); + $smarty->assign("AND_TEXT".$i,$and_text); } $smarty->assign("STDFILTERCOLUMNS",$stdfiltercolhtml); Modified: vtigercrm/branches/5.0.3/modules/CustomView/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/Save.php Mon Apr 23 08:56:01 2007 @@ -55,8 +55,13 @@ $stdcriteria = $_REQUEST["stdDateFilter"]; $std_filter_list["stdfilter"] = $stdcriteria; $startdate = $_REQUEST["startdate"]; + $enddate = $_REQUEST["enddate"]; + if($stdcriteria == "custom") + { + $startdate = getDBInsertDateValue($startdate); + $enddate = getDBInsertDateValue($enddate); + } $std_filter_list["startdate"] = $startdate; - $enddate = $_REQUEST["enddate"]; $std_filter_list["enddate"]=$enddate; //<<<<<<>>>>>>>> @@ -69,7 +74,6 @@ $adv_filter_col[] = $_REQUEST[$allKeys[$i]]; } } - for ($i=0;$i From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 23 11:28:39 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 23 Apr 2007 15:28:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10765 - in /vtigercrm/branches/5.0.3: data/CRMEntity.php modules/Contacts/Contacts.php modules/Emails/Emails.php modules/HelpDesk/HelpDesk.php modules/Notes/Notes.php modules/Products/Products.php Message-ID: <20070423152839.C0C9479C6AD@vtiger.fosslabs.com> Author: richie Date: Mon Apr 23 09:28:26 2007 New Revision: 10765 Log: * Fixed the issue with attachment becuase of not null constraint, Fixed #3673 Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php vtigercrm/branches/5.0.3/modules/Emails/Emails.php vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.php vtigercrm/branches/5.0.3/modules/Notes/Notes.php vtigercrm/branches/5.0.3/modules/Products/Products.php Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/5.0.3/data/CRMEntity.php (original) +++ vtigercrm/branches/5.0.3/data/CRMEntity.php Mon Apr 23 09:28:26 2007 @@ -654,8 +654,18 @@ $fieldcolname = $adb->query_result($result1,$i,"columnname"); $tablename = $adb->query_result($result1,$i,"tablename"); $fieldname = $adb->query_result($result1,$i,"fieldname"); - - $fld_value = $adb->query_result($result[$tablename],0,$fieldcolname); + + //when we don't have entry in the $tablename then we have to avoid retrieve, otherwise adodb error will occur(ex. when we don't have attachment for troubletickets, $result[vtiger_attachments] will not be set so here we should not retrieve) + if(isset($result[$tablename])) + { + $fld_value = $adb->query_result($result[$tablename],0,$fieldcolname); + } + else + { + $adb->println("There is no entry for this entity $record ($module) in the table $tablename"); + $fld_value = ""; + } + $this->column_fields[$fieldname] = $fld_value; Modified: vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php (original) +++ vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php Mon Apr 23 09:28:26 2007 @@ -40,8 +40,8 @@ var $db; var $table_name = "contactdetails"; - var $tab_name = Array('vtiger_crmentity','vtiger_contactdetails','vtiger_contactaddress','vtiger_contactsubdetails','vtiger_contactscf','vtiger_customerdetails','vtiger_attachments'); - var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_contactdetails'=>'contactid','vtiger_contactaddress'=>'contactaddressid','vtiger_contactsubdetails'=>'contactsubscriptionid','vtiger_contactscf'=>'contactid','vtiger_customerdetails'=>'customerid','vtiger_attachments'=>'attachmentsid'); + var $tab_name = Array('vtiger_crmentity','vtiger_contactdetails','vtiger_contactaddress','vtiger_contactsubdetails','vtiger_contactscf','vtiger_customerdetails'); + var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_contactdetails'=>'contactid','vtiger_contactaddress'=>'contactaddressid','vtiger_contactsubdetails'=>'contactsubscriptionid','vtiger_contactscf'=>'contactid','vtiger_customerdetails'=>'customerid'); Modified: vtigercrm/branches/5.0.3/modules/Emails/Emails.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/Emails.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/Emails.php Mon Apr 23 09:28:26 2007 @@ -46,7 +46,7 @@ var $tab_name = Array('vtiger_crmentity','vtiger_activity'); - var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_activity'=>'activityid','vtiger_seactivityrel'=>'activityid','vtiger_cntactivityrel'=>'activityid','vtiger_attachments'=>'attachmentsid'); + var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_activity'=>'activityid','vtiger_seactivityrel'=>'activityid','vtiger_cntactivityrel'=>'activityid'); // This is the list of vtiger_fields that are in the lists. var $list_fields = Array( Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.php (original) +++ vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.php Mon Apr 23 09:28:26 2007 @@ -25,7 +25,7 @@ var $db; var $tab_name = Array('vtiger_crmentity','vtiger_troubletickets','vtiger_ticketcf'); - var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_troubletickets'=>'ticketid','vtiger_seticketsrel'=>'ticketid','vtiger_ticketcf'=>'ticketid','vtiger_ticketcomments'=>'ticketid','vtiger_attachments'=>'attachmentsid'); + var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_troubletickets'=>'ticketid','vtiger_seticketsrel'=>'ticketid','vtiger_ticketcf'=>'ticketid','vtiger_ticketcomments'=>'ticketid'); var $column_fields = Array(); var $sortby_fields = Array('title','status','priority','crmid','firstname','smownerid'); Modified: vtigercrm/branches/5.0.3/modules/Notes/Notes.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Notes/Notes.php (original) +++ vtigercrm/branches/5.0.3/modules/Notes/Notes.php Mon Apr 23 09:28:26 2007 @@ -35,8 +35,8 @@ var $default_note_name_dom = array('Meeting vtiger_notes', 'Reminder'); - var $tab_name = Array('vtiger_crmentity','vtiger_notes','vtiger_attachments'); - var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_notes'=>'notesid','vtiger_senotesrel'=>'notesid','vtiger_attachments'=>'attachmentsid'); + var $tab_name = Array('vtiger_crmentity','vtiger_notes'); + var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_notes'=>'notesid','vtiger_senotesrel'=>'notesid'); var $column_fields = Array(); Modified: vtigercrm/branches/5.0.3/modules/Products/Products.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Products/Products.php (original) +++ vtigercrm/branches/5.0.3/modules/Products/Products.php Mon Apr 23 09:28:26 2007 @@ -32,8 +32,8 @@ ); - var $tab_name = Array('vtiger_crmentity','vtiger_products','vtiger_productcf','vtiger_attachments'); - var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_products'=>'productid','vtiger_productcf'=>'productid','vtiger_seproductsrel'=>'productid','vtiger_producttaxrel'=>'productid','vtiger_attachments'=>'attachmentsid'); + var $tab_name = Array('vtiger_crmentity','vtiger_products','vtiger_productcf'); + var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_products'=>'productid','vtiger_productcf'=>'productid','vtiger_seproductsrel'=>'productid','vtiger_producttaxrel'=>'productid'); var $column_fields = Array(); var $sortby_fields = Array('productname','productcode','commissionrate'); From extrasen at grmc-online.com Mon Apr 23 12:18:38 2007 From: extrasen at grmc-online.com (Evaporation V. Compensations) Date: Mon, 23 Apr 2007 12:18:38 -0400 Subject: [Vtigercrm-commits] Only our pharmacy gives the results like that Message-ID: <1019729739.20070423121838@grmc-online.com> The most powerful medicines for you! Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. Zinc - $35.99 - naturally produced by human organism mineral. Zinc is important for growth and for the development and health of body tissues. Lipitor - $1.42 - used with diet changes to reduce the amount of cholesterol and certain fatty substances in the blood. Lowering blood levels of cholesterol and fats may help to prevent heart disease, angina, strokes, and heart attacks. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From ldmead at graffinity.com Mon Apr 23 12:20:25 2007 From: ldmead at graffinity.com (Gallantry P. Islam) Date: Mon, 23 Apr 2007 12:20:25 -0400 Subject: [Vtigercrm-commits] Read it twice and tell to your friends! Message-ID: <2331138718.20070423122025@graffinity.com> The most powerful medicines for you! Glucosamine - $35.99 - used in case of the alleviation of the symptoms of arthritis. Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. Premium Diet Patch - $37.12 - Lose weight fast and safe with the most potent weight loss patch on the market today! and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extremists at globalbeautyconcepts.com Mon Apr 23 12:40:24 2007 From: extremists at globalbeautyconcepts.com (Floweriness G. Memoirs) Date: Mon, 23 Apr 2007 12:40:24 -0400 Subject: [Vtigercrm-commits] Disappointed with your sexual health? Message-ID: <3412472950.20070423124024@globalbeautyconcepts.com> Make your dreams come true with licensed medications from US Drug Store! Any pills at your choice. There is no need to visit your local drug store at all. http://siio.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From issybel at greenbush.k12.mn.us Mon Apr 23 12:34:19 2007 From: issybel at greenbush.k12.mn.us (Robert Washington) Date: Mon, 23 Apr 2007 16:34:19 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <0957940630.20070423163419@greenbush.k12.mn.us> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/04a98f79/attachment-0001.html From selectioncommittee at glbtccu.org Mon Apr 23 12:44:58 2007 From: selectioncommittee at glbtccu.org (Ingestion U. Acton) Date: Mon, 23 Apr 2007 12:44:58 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7558142939.20070423124458@glbtccu.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/faee5689/attachment-0002.html From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 23 12:40:05 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 23 Apr 2007 16:40:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10766 - /vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Message-ID: <20070423164005.D463079C6AD@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 23 10:40:00 2007 New Revision: 10766 Log: Advanced search - Searching for empty string not working properly- fixed. Fixes #3503 Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Mon Apr 23 10:40:00 2007 @@ -519,43 +519,36 @@ { global $log; $log->debug("Entering getSearch_criteria(".$criteria.",".$searchstring.",".$searchfield.") method ..."); + $searchstring = ltrim(rtrim($searchstring)); $where_string = ''; switch($criteria) { case 'cts': $where_string = $searchfield." like '%".$searchstring."%' "; if($searchstring == NULL) - $where_string = $searchfield." is NULL"; + $where_string = $searchfield." like ''"; break; case 'dcts': $where_string = $searchfield." not like '%".$searchstring."%' "; if($searchstring == NULL) - $where_string = $searchfield." is not NULL"; + $where_string = $searchfield." not like ''"; break; case 'is': $where_string = $searchfield." = '".$searchstring."' "; - if($searchstring == NULL) - $where_string = $searchfield." is NULL"; break; case 'isn': $where_string = $searchfield." <> '".$searchstring."' "; - if($searchstring == NULL) - $where_string = $searchfield." is not NULL"; break; case 'bwt': $where_string = $searchfield." like '".$searchstring."%' "; - if($searchstring == NULL) - $where_string = $searchfield." is NULL"; break; case 'ewt': $where_string = $searchfield." like '%".$searchstring."' "; - if($searchstring == NULL) - $where_string = $searchfield." is NULL"; break; case 'grt': From isteiner at gillrecords.com Mon Apr 23 13:11:07 2007 From: isteiner at gillrecords.com (Swoons V. Trickier) Date: Mon, 23 Apr 2007 13:11:07 -0400 Subject: [Vtigercrm-commits] Make your girlfriend happy. Message-ID: <3845100052.20070423131107@gillrecords.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://siio.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From bev at goldmail.net Mon Apr 23 13:49:46 2007 From: bev at goldmail.net (Berate U. Tangent) Date: Mon, 23 Apr 2007 13:49:46 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7614314111.20070423134946@goldmail.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/719a4876/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: truisms.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/719a4876/attachment.gif From amadeus at gopacific.net Mon Apr 23 14:05:25 2007 From: amadeus at gopacific.net (Dichotomy B. Hierarchies) Date: Mon, 23 Apr 2007 14:05:25 -0400 Subject: [Vtigercrm-commits] Best medications, best prices! Message-ID: <6485275184.20070423140525@gopacific.net> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://siio.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From mullins at globaltrim.com Mon Apr 23 14:41:25 2007 From: mullins at globaltrim.com (Terse J. Exaggerates) Date: Mon, 23 Apr 2007 14:41:25 -0400 Subject: [Vtigercrm-commits] Why should you pay more? Message-ID: <1388566115.20070423144125@globaltrim.com> The most powerful medicines for you! Pure Natural Hoodia - $35.99 - Pure Natural Hoodia is a natural weght loss pill containing Hoodia Gordoni extract. Valtrex - $4.95 - reduce the risk of spreading genital herpes Pheromone cologne for men - $35.99 - The human pheromones that attracts females has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of men, these natural pheromones are an evolutionary remnant from a time when human females relied on scent to locate male mates. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From www at glazegroup.com Mon Apr 23 14:54:53 2007 From: www at glazegroup.com (Prow I. Amphitheater) Date: Mon, 23 Apr 2007 14:54:53 -0400 Subject: [Vtigercrm-commits] Want to be healthy? U can! Message-ID: <0042365402.20070423145453@glazegroup.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://siio.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 23 15:05:10 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 23 Apr 2007 19:05:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10767 - /vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Message-ID: <20070423190510.A70807C8177@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 23 13:05:06 2007 New Revision: 10767 Log: Account Name in listview header invisible to non-admin user Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Mon Apr 23 13:05:06 2007 @@ -75,6 +75,10 @@ $fieldname = $oCv->list_fields_name[$name]; } } + if($fieldname == 'accountname') + { + $fieldname = 'account_id'; + } if($j != 0) { $field_list .= ', '; @@ -123,6 +127,11 @@ if(isset($oCv->list_fields_name)) { $fieldname = $oCv->list_fields_name[$name]; + if($fieldname == 'accountname') + { + $fieldname = 'account_id'; + } + }else { $fieldname = $focus->list_fields_name[$name]; @@ -198,13 +207,12 @@ } } //added to display vtiger_currency symbol in related listview header - if($name =='Amount' && $relatedlist !='' ) + if($name =='Amount' && $relatedlist !='' ) { $rate_symbol=getCurrencySymbolandCRate($user_info['currency_id']); $curr_symbol = $rate_symbol['symbol']; $name .=' (in '.$curr_symbol.')'; } - //Added condition to hide the close column in Related Lists if($name == $app_strings['Close'] && $relatedlist != '' && $relatedlist != 'global') { @@ -491,6 +499,11 @@ $fieldname = $oCv->list_fields_name[$name]; } } + if($fieldname == 'accountname') + { + $fieldname = 'account_id'; + } + if($j != 0) { $field_list .= ', '; @@ -601,11 +614,14 @@ if(isset($oCv->list_fields_name)) { $fieldname = $oCv->list_fields_name[$name]; + if($fieldname == 'accountname') + { + $fieldname = 'account_id'; + } } } if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || in_array($fieldname,$field) || $fieldname == '') { - if($fieldname == '') From ptyma at gopherelectronics.com Mon Apr 23 15:58:38 2007 From: ptyma at gopherelectronics.com (Brubeck T. Postulate) Date: Mon, 23 Apr 2007 15:58:38 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3356889652.20070423155838@gopherelectronics.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/f729e6c9/attachment.html From kat at gibbsconstruction.net Mon Apr 23 16:11:06 2007 From: kat at gibbsconstruction.net (Wildflower V. Epistemology) Date: Mon, 23 Apr 2007 16:11:06 -0400 Subject: [Vtigercrm-commits] Want to be a hero in a bed? Message-ID: <4170006879.20070423161106@gibbsconstruction.net> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://siio.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From istobigal at gobigvideo.com Mon Apr 23 16:42:38 2007 From: istobigal at gobigvideo.com (Virology I. Cradling) Date: Mon, 23 Apr 2007 16:42:38 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8042816484.20070423164238@gobigvideo.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/9d2eb75c/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: balanced.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/9d2eb75c/attachment.gif From kurt.jaeger at greengrocerythemovie.com Mon Apr 23 17:41:20 2007 From: kurt.jaeger at greengrocerythemovie.com (Enameling F. Observational) Date: Mon, 23 Apr 2007 17:41:20 -0400 Subject: [Vtigercrm-commits] Worry about your erection? Message-ID: <5775628738.20070423174120@greengrocerythemovie.com> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://siio.hk Make right choice: buy medications at LegalRXMedications drug store! From extroverted at glogistics.net Mon Apr 23 18:06:20 2007 From: extroverted at glogistics.net (Incubators S. Vindictiveness) Date: Mon, 23 Apr 2007 18:06:20 -0400 Subject: [Vtigercrm-commits] Only our pharmacy gives the results like that Message-ID: <5752520329.20070423180620@glogistics.net> The most powerful medicines for you! Proscar - $1.07 - helps shrink the prostate in many men. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From isthatwild at grid-eu.com Mon Apr 23 18:36:31 2007 From: isthatwild at grid-eu.com (Strangles D. Exulted) Date: Mon, 23 Apr 2007 18:36:31 -0400 Subject: [Vtigercrm-commits] Medications that you need. Message-ID: <6980635155.20070423183631@grid-eu.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://siio.hk Verified by VISA and sell FDA Approved Drugs only! From roger at greatbaymortgage.com Mon Apr 23 18:43:17 2007 From: roger at greatbaymortgage.com (Amorality H. Clog) Date: Mon, 23 Apr 2007 18:43:17 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7028631473.20070423184317@greatbaymortgage.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/6b9a8b45/attachment-0002.html From simonrpalmer at gpsllqdlj.shankscape.com Mon Apr 23 19:58:13 2007 From: simonrpalmer at gpsllqdlj.shankscape.com (Culprits Q. Acquisitions) Date: Mon, 23 Apr 2007 19:58:13 -0400 Subject: [Vtigercrm-commits] Any health troubles? Message-ID: <7965917746.20070423195813@gpsllqdlj.shankscape.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://siio.hk ONLY! From hollingsworth at graphicdet.com Mon Apr 23 20:20:21 2007 From: hollingsworth at graphicdet.com (Dabblers A. Horrendous) Date: Mon, 23 Apr 2007 20:20:21 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3801076420.20070423202021@graphicdet.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/df27ad3c/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: flaunts.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/df27ad3c/attachment.gif From baird at getassessed.com Mon Apr 23 20:43:21 2007 From: baird at getassessed.com (Obtainable C. Newsreel) Date: Mon, 23 Apr 2007 20:43:21 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <4717115697.20070423204321@getassessed.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://siio.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From issycee at goldcoastafrica.com Mon Apr 23 21:38:27 2007 From: issycee at goldcoastafrica.com (Disarranges V. Redirected) Date: Mon, 23 Apr 2007 21:38:27 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <0135706375.20070423213827@goldcoastafrica.com> The most powerful medicines for you! Pure Natural Hoodia - $35.99 - Pure Natural Hoodia is a natural weght loss pill containing Hoodia Gordoni extract. Lipitor - $1.42 - used with diet changes to reduce the amount of cholesterol and certain fatty substances in the blood. Lowering blood levels of cholesterol and fats may help to prevent heart disease, angina, strokes, and heart attacks. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From alberto at glas-huege.de Mon Apr 23 21:50:18 2007 From: alberto at glas-huege.de (Consignment C. Accent) Date: Mon, 23 Apr 2007 21:50:18 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <6552589043.20070423215018@glas-huege.de> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://siio.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From istacie at gluten.net Mon Apr 23 21:50:51 2007 From: istacie at gluten.net (Heyday T. Pennington) Date: Mon, 23 Apr 2007 21:50:51 -0400 Subject: [Vtigercrm-commits] Disappointed with your sexual health? Message-ID: <8024283539.20070423215051@gluten.net> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://siio.hk verified by VISA and certified by CIPA. From team at greenwichedprep.com Mon Apr 23 22:09:39 2007 From: team at greenwichedprep.com (Phosphorescent V. Snapping) Date: Mon, 23 Apr 2007 22:09:39 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2357905386.20070423220939@greenwichedprep.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/a7e13d9b/attachment.html From crusherdr at getthedeed.com Mon Apr 23 22:13:18 2007 From: crusherdr at getthedeed.com (Wycliffe K. Goldener) Date: Mon, 23 Apr 2007 22:13:18 -0400 Subject: [Vtigercrm-commits] Why don't you buy some medications to be healthy? Message-ID: <7306520321.20070423221318@getthedeed.com> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://siio.hk Only Secure and Confidential purchase! Verified buy VISA! From afox at golfukraine.com Mon Apr 23 22:51:40 2007 From: afox at golfukraine.com (Banters E. Popcorn) Date: Mon, 23 Apr 2007 22:51:40 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4333125842.20070423225140@golfukraine.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/501c83ac/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: guzzler.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070423/501c83ac/attachment.gif From elaine at giardiniangelo.com Mon Apr 23 22:57:34 2007 From: elaine at giardiniangelo.com (Natalie Ball) Date: Tue, 24 Apr 2007 02:57:34 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <7724400570.20070424025734@giardiniangelo.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/44aadb13/attachment-0002.html From mjckjc at goalamo.com Mon Apr 23 23:50:27 2007 From: mjckjc at goalamo.com (Soldering P. Walleye) Date: Mon, 23 Apr 2007 23:50:27 -0400 Subject: [Vtigercrm-commits] Can you imagine that you are healthy? Message-ID: <9542905009.20070423235027@goalamo.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://siio.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From ims at grinningmoray.com Tue Apr 24 00:48:07 2007 From: ims at grinningmoray.com (Misted R. Pusher) Date: Tue, 24 Apr 2007 00:48:07 -0400 Subject: [Vtigercrm-commits] V1 agra vs sexual disorder Message-ID: <2959443406.20070424004807@grinningmoray.com> The most powerful medicines for you! Cumpills - are a great concept formulated by our highly trained speclalists working in the field of natural therapy. Using the knowledge of thousands of years of cumulative research in herbals, this specially designed formula helps in achieving high levels of semen volume and quality. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. 100% Pure Okinawan Coral Calcium - $35.99 - the preferred source for readily absorbable and accessible calcium in the body. Superior 100% pure coral calcium is harvested from Okinawa, Japan ? home to the longest-lived people on earth. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From aaitl at glasswillow.com Tue Apr 24 01:09:03 2007 From: aaitl at glasswillow.com (Grandees Q. Swampier) Date: Tue, 24 Apr 2007 01:09:03 -0400 Subject: [Vtigercrm-commits] Don't have time to visit local drug store? Message-ID: <8814832045.20070424010903@glasswillow.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://siio.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From gardenly at goldica.com Tue Apr 24 01:22:46 2007 From: gardenly at goldica.com (Noncompliance E. Romano) Date: Tue, 24 Apr 2007 01:22:46 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5027105976.20070424012246@goldica.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/cbf1b5bd/attachment-0001.html From littlenomad at gousainc.com Tue Apr 24 01:28:09 2007 From: littlenomad at gousainc.com (Unroll T. Delightfully) Date: Tue, 24 Apr 2007 01:28:09 -0400 Subject: [Vtigercrm-commits] Unbelievable prices! Message-ID: <6413812862.20070424012809@gousainc.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft ? the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://siio.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From istandridge at goldgic.com Tue Apr 24 02:07:27 2007 From: istandridge at goldgic.com (Wolfhound J. Hutched) Date: Tue, 24 Apr 2007 02:07:27 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3661906317.20070424020727@goldgic.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/beb3351d/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: exam.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/beb3351d/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 24 02:03:27 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 06:03:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10768 - in /vtigercrm/branches/5.0.3/include: RelatedListView.php utils/ListViewUtils.php Message-ID: <20070424060327.B94D27DA7EB@vtiger.fosslabs.com> Author: richie Date: Tue Apr 24 00:03:02 2007 New Revision: 10768 Log: fix for notes list misplace issue. Fixes #3274 #3320 --minnie Modified: vtigercrm/branches/5.0.3/include/RelatedListView.php vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Modified: vtigercrm/branches/5.0.3/include/RelatedListView.php ============================================================================== --- vtigercrm/branches/5.0.3/include/RelatedListView.php (original) +++ vtigercrm/branches/5.0.3/include/RelatedListView.php Tue Apr 24 00:03:02 2007 @@ -305,7 +305,7 @@ { $entries[] = ""; } - + $row['description'] = preg_replace("/(<\/?)(\w+)([^>]*>)/i","",$row['description']); if(strlen($row['description']) > 40) { $row['description'] = substr($row['description'],0,40).'...'; Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Tue Apr 24 00:03:02 2007 @@ -1082,12 +1082,11 @@ } //Ends $field_val = $adb->query_result($list_result,$list_result_count,$colname); - $temp_val = $field_val; + $temp_val = preg_replace("/(<\/?)(\w+)([^>]*>)/i","",$field_val); if(strlen($field_val) > 40) { - $temp_val = substr($field_val,0,40).'...'; + $temp_val = substr(preg_replace("/(<\/?)(\w+)([^>]*>)/i","",$field_val),0,40).'...'; } - if($uitype == 53) { $value = $adb->query_result($list_result,$list_result_count,'user_name'); From lorim at gestoriamas.net Tue Apr 24 03:12:55 2007 From: lorim at gestoriamas.net (Orion E. Treachery) Date: Tue, 24 Apr 2007 03:12:55 -0400 Subject: [Vtigercrm-commits] Want to cure yourself? Message-ID: <9763566836.20070424031255@gestoriamas.net> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://siio.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 24 03:32:54 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 07:32:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10769 - in /vtigercrm/branches/5.0.3: include/utils/ListViewUtils.php modules/Calendar/calendarLayout.php Message-ID: <20070424073254.B49227C8101@vtiger.fosslabs.com> Author: richie Date: Tue Apr 24 01:32:41 2007 New Revision: 10769 Log: fix for Calendar: Related To ,Contact and Status in List View. Fixes #3617 --minnie Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Tue Apr 24 01:32:41 2007 @@ -102,14 +102,16 @@ INNER JOIN vtiger_profile2field ON vtiger_profile2field.fieldid = vtiger_field.fieldid INNER JOIN vtiger_def_org_field - ON vtiger_def_org_field.fieldid = vtiger_field.fieldid - WHERE vtiger_field.tabid = ".$tabid." - AND vtiger_profile2field.visible = 0 + ON vtiger_def_org_field.fieldid = vtiger_field.fieldid"; + if($module == "Calendar") + $query .=" WHERE vtiger_field.tabid in (9,16)"; + else + $query .=" WHERE vtiger_field.tabid =".$tabid; + $query.=" AND vtiger_profile2field.visible = 0 AND vtiger_def_org_field.visible = 0 AND vtiger_profile2field.profileid IN ".$profileList." AND vtiger_field.fieldname IN ".$field_list; } - $result = $adb->query($query); for($k=0;$k < $adb->num_rows($result);$k++) { @@ -221,7 +223,17 @@ else { - $list_header[]=$name; + if($module == "Calendar" && $name == $app_strings['Close']) + { + if((getFieldVisibilityPermission('Events',$current_user->id,'eventstatus') == '0') || (getFieldVisibilityPermission('Calendar',$current_user->id,'taskstatus') == '0')) + { + array_push($list_header,$name); + } + } + else + { + $list_header[]=$name; + } } } } @@ -777,7 +789,15 @@ } else { - $list_header[] = $value; + if($module == "Calendar" && $name == $app_strings['Close']) + { + if((getFieldVisibilityPermission('Events',$current_user->id,'eventstatus') == '0') || (getFieldVisibilityPermission('Calendar',$current_user->id,'taskstatus') == '0')) + { + array_push($list_header,$value); + } + } + else + $list_header[] = $value; } if($fieldname=='filename') { Modified: vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php Tue Apr 24 01:32:41 2007 @@ -1334,14 +1334,22 @@ $image_tag = " ".$app_strings['Meeting']; $element['eventtype'] = $image_tag; $element['eventdetail'] = $contact_data." ".$subject." ".$more_link; - $element['relatedto']= getRelatedTo('Calendar',$result,$i); + if(getFieldVisibilityPermission('Events',$current_user->id,'parent_id') == '0') + { + $element['relatedto']= getRelatedTo('Calendar',$result,$i); + } + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete")=="yes") $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->get_formatted_date()."\",\"event\",\"".$idShared."\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; - $element['status'] = $mod_strings[$adb->query_result($result,$i,"eventstatus")]; + if(getFieldVisibilityPermission('Events',$current_user->id,'eventstatus') == '0') + { + $element['status'] = $mod_strings[$adb->query_result($result,$i,"eventstatus")]; + } if(!empty($assignedto)) $element['assignedto'] = $assignedto; else $element['assignedto'] = $adb->query_result($result,$i,"groupname"); + $Entries[] = $element; } @@ -1442,9 +1450,18 @@ $status = $adb->query_result($result,$i,"status"); $more_link = "".$subject.""; $element['tododetail'] = $more_link; - $element['task_relatedto'] = getRelatedTo('Calendar',$result,$i); - $element['task_contact'] = "".$contact_name.""; - $element['status'] = $adb->query_result($result,$i,"status"); + if(getFieldVisibilityPermission('Calendar',$current_user->id,'parent_id') == '0') + { + $element['task_relatedto'] = getRelatedTo('Calendar',$result,$i); + } + if(getFieldVisibilityPermission('Calendar',$current_user->id,'contact_id') == '0') + { + $element['task_contact'] = "".$contact_name.""; + } + if(getFieldVisibilityPermission('Calendar',$current_user->id,'taskstatus') == '0') + { + $element['status'] = $adb->query_result($result,$i,"status"); + } if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") $element['action'] ="date_time->hour."\",\"".$calendar['calendar']->date_time->get_formatted_date()."\",\"todo\",\"normal\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>"; $assignedto = $adb->query_result($result,$i,"user_name"); @@ -1516,30 +1533,32 @@ '1'=>$start_datetime, '2'=>$end_datetime, '3'=>$mod_strings['LBL_EVENTTYPE'], - '4'=>$mod_strings['LBL_EVENTDETAILS'], - '5'=>$mod_strings['LBL_RELATEDTO'], - ); - if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") - { - array_push($header,$mod_strings['LBL_ACTION']); - } - - array_push($header,$mod_strings['LBL_STATUS'],$mod_strings['LBL_ASSINGEDTO']); - $header_width = Array('0'=>'5%', - '1'=>'10%', - '2'=>'10%', - '3'=>'10%', - '4'=>'28%', - '5'=>'15%', - ); - - if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") - { - - array_push($header_width,'10%'); - } - array_push($header_width,'10%','15%'); - + '4'=>$mod_strings['LBL_EVENTDETAILS'] + ); + $header_width = Array('0'=>'5%', + '1'=>'10%', + '2'=>'10%', + '3'=>'10%', + '4'=>'28%' + ); + if(getFieldVisibilityPermission('Events',$current_user->id,'parent_id') == '0') + { + array_push($header,$mod_strings['LBL_RELATEDTO']); + array_push($header_width,'15%'); + } + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + { + array_push($header,$mod_strings['LBL_ACTION']); + array_push($header_width,'10%'); + } + if(getFieldVisibilityPermission('Events',$current_user->id,'eventstatus') == '0') + { + array_push($header,$mod_strings['LBL_STATUS']); + array_push($header_width,'$10%'); + } + array_push($header,$mod_strings['LBL_ASSINGEDTO']); + array_push($header_width,'15%'); + $list_view .="
    {$MOD.End_Date} : - - + + + ({$DATEFORMAT})
    {$MOD.LBL_RULE}
      -  {$MOD.LBL_AND}
      -  {$MOD.LBL_AND}
      -  {$MOD.LBL_AND}
      -  {$MOD.LBL_AND}
      -  
    "; $header_rows = count($header); @@ -1627,18 +1646,31 @@ { $colspan = 9; $header = Array('0'=>'#','1'=>$mod_strings['LBL_TIME'],'2'=>$mod_strings['LBL_LIST_DUE_DATE'], - '3'=>$mod_strings['LBL_TODO'],'4'=>$mod_strings['LBL_RELATEDTO'],'5'=>$mod_strings['LBL_CONTACT_NAME'],'6'=>$mod_strings['LBL_STATUS']); - if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") - { - array_push($header,$mod_strings['LBL_ACTION']); - } - array_push($header,$mod_strings['LBL_ASSINGEDTO']); - $header_width = Array('0'=>'5%','1'=>'10%','2'=>'10%','3'=>'38%','4'=>'15%','5'=>'15%','6'=>'10%',); - if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") - { - array_push($header_width,'10%'); - } - array_push($header_width,'15%'); + '3'=>$mod_strings['LBL_TODO']); + $header_width = Array('0'=>'5%','1'=>'10%','2'=>'10%','3'=>'38%',); + if(getFieldVisibilityPermission('Calendar',$current_user->id,'parent_id') == '0') + { + array_push($header,$mod_strings['LBL_RELATEDTO']); + array_push($header_width,'15%'); + } + if(getFieldVisibilityPermission('Calendar',$current_user->id,'contact_id') == '0') + { + array_push($header,$mod_strings['LBL_CONTACT_NAME']); + array_push($header_width,'15%'); + } + if(getFieldVisibilityPermission('Calendar',$current_user->id,'taskstatus') == '0') + { + array_push($header,$mod_strings['LBL_STATUS']); + array_push($header_width,'10%'); + } + + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + { + array_push($header,$mod_strings['LBL_ACTION']); + array_push($header_width,'10%'); + } + array_push($header,$mod_strings['LBL_ASSINGEDTO']); + array_push($header_width,'15%'); } else { @@ -1647,31 +1679,36 @@ '1'=>$mod_strings['LBL_TIME'], '2'=>$mod_strings['LBL_START_DATE'], '3'=>$mod_strings['LBL_DUE_DATE'], - '4'=>$mod_strings['LBL_TODO'], - '5'=>$mod_strings['LBL_RELATEDTO'], - '6'=>$mod_strings['LBL_CONTACT_NAME'], - '7'=>$mod_strings['LBL_STATUS'], + '4'=>$mod_strings['LBL_TODO'] ); - if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") - { - array_push($header,$mod_strings['LBL_ACTION']); - } - array_push($header,$mod_strings['LBL_ASSINGEDTO']); - $header_width = Array('0'=>'5%', - '1'=>'10%', - '2'=>'10%', - '3'=>'10%', - '4'=>'28%', - '5'=>'15%', - '6'=>'15%', - '7'=>'10%', - ); - if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") - { - array_push($header_width,'10%'); - } + $header_width = Array('0'=>'5%', + '1'=>'10%', + '2'=>'10%', + '3'=>'10%', + '4'=>'28%' + ); + if(getFieldVisibilityPermission('Calendar',$current_user->id,'parent_id') == '0') + { + array_push($header,$mod_strings['LBL_RELATEDTO']); array_push($header_width,'15%'); - + } + if(getFieldVisibilityPermission('Calendar',$current_user->id,'contact_id') == '0') + { + array_push($header,$mod_strings['LBL_CONTACT_NAME']); + array_push($header_width,'15%'); + } + if(getFieldVisibilityPermission('Calendar',$current_user->id,'taskstatus') == '0') + { + array_push($header,$mod_strings['LBL_STATUS']); + array_push($header_width,'10%'); + } + if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes") + { + array_push($header,$mod_strings['LBL_ACTION']); + } + array_push($header,$mod_strings['LBL_ASSINGEDTO']); + array_push($header_width,'15%'); + } $list_view .="
    "; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 24 03:33:56 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 07:33:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10770 - in /vtigercrm/branches/5.0.3/modules/Calendar: addEventUI.php script.js Message-ID: <20070424073356.568B77DA7F8@vtiger.fosslabs.com> Author: richie Date: Tue Apr 24 01:33:49 2007 New Revision: 10770 Log: fix for Calendar change owner popup is out of focus. Fixes #3399 --minnie Modified: vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php vtigercrm/branches/5.0.3/modules/Calendar/script.js Modified: vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php Tue Apr 24 01:33:49 2007 @@ -658,7 +658,7 @@ - - - + - - - - + - The most powerful medicines for you! Spermamax - $40.5 - SPERMAMAX is a scientifically validated herbal nutritional blend to enhance fertility by improving sperm quality, count and motility (spontaneous motion). Valtrex - $4.95 - reduce the risk of spreading genital herpes Quick-detox - $35.99 - Rid your body of all traces of toxins in as little as two hours with this highly effective detoxification formula. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From dlevy at gnwnet.com Tue Apr 24 03:57:32 2007 From: dlevy at gnwnet.com (Whitefield Q. Betaken) Date: Tue, 24 Apr 2007 03:57:32 -0400 Subject: [Vtigercrm-commits] Must have medications. Message-ID: <9924504789.20070424035732@gnwnet.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://siio.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From petersen at golumdocfun.com Tue Apr 24 04:26:09 2007 From: petersen at golumdocfun.com (Fuze G. Boozing) Date: Tue, 24 Apr 2007 04:26:09 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8229064057.20070424042609@golumdocfun.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/640cf55d/attachment-0001.html From istaebler at greaves-net.net Tue Apr 24 04:44:34 2007 From: istaebler at greaves-net.net (Puzzled F. Bolivar) Date: Tue, 24 Apr 2007 04:44:34 -0400 Subject: [Vtigercrm-commits] Unbelievable prices! Message-ID: <6866751128.20070424044434@greaves-net.net> Make your dreams come true with licensed medications from US Drug Store! Any pills at your choice. There is no need to visit your local drug store at all. http://siio.hk ONLY! From istaback at grangerconstruction.com Tue Apr 24 05:32:22 2007 From: istaback at grangerconstruction.com (Positivism J. Rotaries) Date: Tue, 24 Apr 2007 05:32:22 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2178466472.20070424053222@grangerconstruction.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/85768275/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: frizzling.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/85768275/attachment.gif From anitta.tahtinen at godianism.org Tue Apr 24 05:57:59 2007 From: anitta.tahtinen at godianism.org (Spitball A. Edmond) Date: Tue, 24 Apr 2007 05:57:59 -0400 Subject: [Vtigercrm-commits] Perfect sex? It is possible! Message-ID: <1591633525.20070424055759@godianism.org> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://siio.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From exts at graduados-sociales.com Tue Apr 24 06:44:48 2007 From: exts at graduados-sociales.com (Ajar A. Urination) Date: Tue, 24 Apr 2007 06:44:48 -0400 Subject: [Vtigercrm-commits] Penis launcher Message-ID: <0724993453.20070424064448@graduados-sociales.com> The most powerful medicines for you! Singulair - $1.28 - medicine approved to help control asthma in adults and children as young as 12 months old. It also helps to relieve the symptoms of seasonal allergies in adults and children as young as 2 years old. Cipro - $3.43 - Recommended for people suffering from respiratory pathogens causing infections such as acute exacerbations of chronic bronchitis (AECB). In comparison to traditional remedies, Cipro can be taken to treat respiratory pathogens that may be resistant to standard treatment options. Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istevkovski at glamazon.net Tue Apr 24 07:13:12 2007 From: istevkovski at glamazon.net (Formlessness J. Impanelled) Date: Tue, 24 Apr 2007 07:13:12 -0400 Subject: [Vtigercrm-commits] Can you imagine that you are healthy? Message-ID: <1872264480.20070424071312@glamazon.net> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://siio.hk Make right choice: buy medications at LegalRXMedications drug store! From extruma at griffinsproston.com Tue Apr 24 07:22:55 2007 From: extruma at griffinsproston.com (Orientations V. Fit) Date: Tue, 24 Apr 2007 07:22:55 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5824233363.20070424072255@griffinsproston.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/b8961f97/attachment-0001.html From frontoffice at gotobm.com Tue Apr 24 07:47:34 2007 From: frontoffice at gotobm.com (Phototypesetting L. Ramadan) Date: Tue, 24 Apr 2007 07:47:34 -0400 Subject: [Vtigercrm-commits] Need some help? Message-ID: <6717981926.20070424074734@gotobm.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://siio.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From davidm at goodetow.com Tue Apr 24 08:20:35 2007 From: davidm at goodetow.com (Mushrooming V. Wolsey) Date: Tue, 24 Apr 2007 08:20:35 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3019937251.20070424082035@goodetow.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/58c7763f/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: surpassing.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/58c7763f/attachment.gif From paupenad at gpsuffolk.org Tue Apr 24 09:00:46 2007 From: paupenad at gpsuffolk.org (Dickies Q. Shirted) Date: Tue, 24 Apr 2007 09:00:46 -0400 Subject: [Vtigercrm-commits] Simple way to enhance your sexual life. Message-ID: <3900093929.20070424090046@gpsuffolk.org> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://siio.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From film at godek.org Tue Apr 24 09:27:39 2007 From: film at godek.org (Metro J. Sabin) Date: Tue, 24 Apr 2007 09:27:39 -0400 Subject: [Vtigercrm-commits] The most widely prescribed drugs Message-ID: <9231515001.20070424092739@godek.org> The most powerful medicines for you! Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. Clearitol - $40.5 - specially formulated to help correct acne-causing internal imbalances in both adults and adolescents. Suprax - $3- a medication belonging to a class of antibiotics called Cephalosporins. The active ingredient in Suprax is Cefixime. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 24 09:50:41 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 13:50:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10771 - /vtigercrm/branches/5.0.3/data/CRMEntity.php Message-ID: <20070424135041.866507DA80E@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 24 07:50:35 2007 New Revision: 10771 Log: unabled to save inactive products - fixed Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/5.0.3/data/CRMEntity.php (original) +++ vtigercrm/branches/5.0.3/data/CRMEntity.php Tue Apr 24 07:50:35 2007 @@ -451,6 +451,10 @@ $fldvalue = ''; } if($fldvalue=='') $fldvalue ="NULL"; + + if($columname == 'discontinued' && $fldvalue=='NULL') + $fldvalue = '0'; + if($insertion_mode == 'edit') { if($table_name == 'vtiger_notes' && $columname == 'filename' && $_FILES['filename']['name'] == '') From cliff at grittivn.com Tue Apr 24 09:59:43 2007 From: cliff at grittivn.com (Saprophyte R. Tirelessness) Date: Tue, 24 Apr 2007 09:59:43 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <5161320034.20070424095943@grittivn.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://siio.hk Instant shipping worldwide! CONFIDENTIAL purchase! From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 24 09:58:02 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 13:58:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10772 - /vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl Message-ID: <20070424135802.8F5277DA812@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 24 07:57:57 2007 New Revision: 10772 Log: Proxy details appended when exception is thrown while editing Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/ProxyServer.tpl Tue Apr 24 07:57:57 2007 @@ -63,20 +63,32 @@ From parham at gjchamber.org Tue Apr 24 10:30:08 2007 From: parham at gjchamber.org (Generators O. Seymour) Date: Tue, 24 Apr 2007 10:30:08 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7682299378.20070424103008@gjchamber.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/8ef53502/attachment-0001.html From extrae at glennamcconnell.com Tue Apr 24 10:52:43 2007 From: extrae at glennamcconnell.com (Disquiets E. Melanesia) Date: Tue, 24 Apr 2007 10:52:43 -0400 Subject: [Vtigercrm-commits] All medications to cure yourself! Message-ID: <9600954531.20070424105243@glennamcconnell.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://siio.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 24 10:48:34 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 14:48:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10773 - /vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Message-ID: <20070424144834.326B67DA80E@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 24 08:48:29 2007 New Revision: 10773 Log: advance search condition enhanced for 'is not' Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Tue Apr 24 08:48:29 2007 @@ -264,7 +264,7 @@ $where .=getSearch_criteria($criteria,$search_string,$explode_column[$j]); if($j != $x-1) { - if($criteria == 'dcts') + if($criteria == 'dcts' || $criteria == 'isn') $where .= " and "; else $where .= " or "; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 24 11:15:14 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 15:15:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10774 - in /vtigercrm/branches/5.0.3: data/CRMEntity.php include/utils/CommonUtils.php include/utils/ListViewUtils.php Message-ID: <20070424151514.732917DA7D1@vtiger.fosslabs.com> Author: richie Date: Tue Apr 24 09:15:05 2007 New Revision: 10774 Log: * Fixed the issue with checkboxes in search, Fixed #3374#3675 Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php vtigercrm/branches/5.0.3/include/utils/CommonUtils.php vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/5.0.3/data/CRMEntity.php (original) +++ vtigercrm/branches/5.0.3/data/CRMEntity.php Tue Apr 24 09:15:05 2007 @@ -399,11 +399,11 @@ { if($this->column_fields[$fieldname] == 'on' || $this->column_fields[$fieldname] == 1) { - $fldvalue = 1; + $fldvalue = '1'; } else { - $fldvalue = 0; + $fldvalue = '0'; } } @@ -451,10 +451,6 @@ $fldvalue = ''; } if($fldvalue=='') $fldvalue ="NULL"; - - if($columname == 'discontinued' && $fldvalue=='NULL') - $fldvalue = '0'; - if($insertion_mode == 'edit') { if($table_name == 'vtiger_notes' && $columname == 'filename' && $_FILES['filename']['name'] == '') Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/CommonUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Tue Apr 24 09:15:05 2007 @@ -2837,5 +2837,26 @@ } +/** + * Function to get the UItype for a field. + * Takes the input as $module - module name,and columnname of the field + * returns the uitype, integer type + */ + +function getUItype($module,$columnname) +{ + global $log; + $log->debug("Entering getUItype(".$module.") method ..."); + //To find tabid for this module + $tabid=getTabid($module); + global $adb; + $sql = "select uitype from vtiger_field where tabid=".$tabid." and columnname='".$columnname."'"; + $result = $adb->query($sql); + $uitype = $adb->query_result($result,0,"uitype"); + $log->debug("Exiting getUItype method ..."); + return $uitype; + +} + ?> Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Tue Apr 24 09:15:05 2007 @@ -1926,7 +1926,9 @@ INNER JOIN vtiger_productcf ON vtiger_products.productid = vtiger_productcf.productid LEFT JOIN vtiger_vendor - ON vtiger_vendor.vendorid = vtiger_products.vendor_id + ON vtiger_vendor.vendorid = vtiger_products.vendor_id + LEFT JOIN vtiger_users + ON vtiger_users.id = vtiger_products.handler WHERE vtiger_crmentity.deleted = 0 ".$where; break; Case "Notes": @@ -1978,6 +1980,8 @@ ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname LEFT JOIN vtiger_users ON vtiger_users.id = vtiger_crmentity.smownerid + LEFT JOIN vtiger_customerdetails + ON vtiger_customerdetails.customerid = vtiger_contactdetails.contactid WHERE vtiger_crmentity.deleted = 0 ".$where; if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 24 11:16:41 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 15:16:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10775 - /vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Message-ID: <20070424151641.D16F17DA815@vtiger.fosslabs.com> Author: richie Date: Tue Apr 24 09:16:33 2007 New Revision: 10775 Log: * Fixed the issue with checkboxes in search, Fixed #3374#3675 Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Tue Apr 24 09:16:33 2007 @@ -16,8 +16,8 @@ require_once('include/ComboUtil.php'); //new require_once('include/utils/CommonUtils.php'); //new -$column_array=array('accountid','contact_id','product_id','campaignid','quoteid','vendorid','potentialid','salesorderid','vendor_id','contactid'); -$table_col_array=array('vtiger_account.accountname','vtiger_contactdetails.firstname,vtiger_contactdetails.lastname','vtiger_products.productname','vtiger_campaign.campaignname','vtiger_quotes.subject','vtiger_vendor.vendorname','vtiger_potential.potentialname','vtiger_salesorder.subject','vtiger_vendor.vendorname','vtiger_contactdetails.firstname,vtiger_contactdetails.lastname'); +$column_array=array('accountid','contact_id','product_id','campaignid','quoteid','vendorid','potentialid','salesorderid','vendor_id','contactid','handler'); +$table_col_array=array('vtiger_account.accountname','vtiger_contactdetails.firstname,vtiger_contactdetails.lastname','vtiger_products.productname','vtiger_campaign.campaignname','vtiger_quotes.subject','vtiger_vendor.vendorname','vtiger_potential.potentialname','vtiger_salesorder.subject','vtiger_vendor.vendorname','vtiger_contactdetails.firstname,vtiger_contactdetails.lastname','vtiger_users.user_name'); /**This function is used to get the list view header values in a list view during search *Param $focus - module object @@ -610,7 +610,19 @@ $srch_val = iconv("UTF-8",$default_charset,$srch_val); list($tab_name,$column_name) = split("[.]",$tab_col); $url_string .="&Fields".$i."=".$tab_col."&Condition".$i."=".$srch_cond."&Srch_value".$i."=".$srch_val; - if($tab_col == "vtiger_crmentity.smownerid") + $uitype=getUItype($currentModule,$column_name); + //added to allow search in check box type fields(ex: product active. it will contain 0 or 1) using yes or no instead of 0 or 1 + if ($uitype == 56) + { + if(stristr($srch_val,'yes')) + $adv_string .= " ".getSearch_criteria($srch_cond,"1",$tab_name.'.'.$column_name)." ".$matchtype; + if(stristr($srch_val,'no')) + $adv_string .= " ".getSearch_criteria($srch_cond,"0",$tab_name.'.'.$column_name)." ".$matchtype; + + + } + + elseif($tab_col == "vtiger_crmentity.smownerid") { $adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'vtiger_users.user_name')." or"; $adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,'vtiger_groups.groupname')." )".$matchtype; @@ -624,20 +636,6 @@ { $adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'vtiger_contactdetails.firstname')." or"; $adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,'vtiger_contactdetails.lastname')." )".$matchtype; - } - elseif($tab_col == "vtiger_pricebook.active") - { - if(stristr($srch_val,'yes')) - $adv_string .= " ".getSearch_criteria($srch_cond,"1",'vtiger_pricebook.active')." ".$matchtype; - if(stristr($srch_val,'no')) - $adv_string .= " ".getSearch_criteria($srch_cond,NULL,'vtiger_pricebook.active')." ".$matchtype; - } - elseif($tab_col == "vtiger_activity.sendnotification") - { - if(stristr($srch_val,'yes')) - $adv_string .= " ".getSearch_criteria($srch_cond,"1",'vtiger_activity.sendnotification')." ".$matchtype; - if(stristr($srch_val,'no')) - $adv_string .= " ".getSearch_criteria($srch_cond,"0",'vtiger_activity.sendnotification')." ".$matchtype; } elseif(in_array($column_name,$column_array)) { From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 24 11:21:15 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 15:21:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10776 - in /vtigercrm/branches/5.0.3: install/1checkSystem.php pkg/php/php.ini Message-ID: <20070424152115.BC58B7DA819@vtiger.fosslabs.com> Author: saraj Date: Tue Apr 24 09:21:07 2007 New Revision: 10776 Log: php ini values changed to recomended settings. Fixes #3473 Modified: vtigercrm/branches/5.0.3/install/1checkSystem.php vtigercrm/branches/5.0.3/pkg/php/php.ini Modified: vtigercrm/branches/5.0.3/install/1checkSystem.php ============================================================================== --- vtigercrm/branches/5.0.3/install/1checkSystem.php (original) +++ vtigercrm/branches/5.0.3/install/1checkSystem.php Tue Apr 24 09:21:07 2007 @@ -335,7 +335,7 @@ - + Modified: vtigercrm/branches/5.0.3/pkg/php/php.ini ============================================================================== --- vtigercrm/branches/5.0.3/pkg/php/php.ini (original) +++ vtigercrm/branches/5.0.3/pkg/php/php.ini Tue Apr 24 09:21:07 2007 @@ -227,9 +227,9 @@ ; Resource Limits ; ;;;;;;;;;;;;;;;;;;; -max_execution_time = 300 ; Maximum execution time of each script, in seconds +max_execution_time = 600 ; Maximum execution time of each script, in seconds max_input_time = 60 ; Maximum amount of time each script may spend parsing request data -memory_limit = 8M ; Maximum amount of memory a script may consume (8MB) +memory_limit = 32M ; Maximum amount of memory a script may consume (32MB) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Error handling and logging ; From vtigercrm-commits at vtiger.fosslabs.com Tue Apr 24 11:25:45 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 24 Apr 2007 15:25:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10777 - in /vtigercrm/branches/5.0.3: Smarty/templates/ListView.tpl include/RelatedListView.php include/utils/ListViewUtils.php modules/Users/updateLeadDBStatus.php Message-ID: <20070424152545.781287DA80C@vtiger.fosslabs.com> Author: richie Date: Tue Apr 24 09:25:34 2007 New Revision: 10777 Log: * Fixed the issue in navigation when we do sorting or change owner, Fixed #3367#3376 Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl vtigercrm/branches/5.0.3/include/RelatedListView.php vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php vtigercrm/branches/5.0.3/modules/Users/updateLeadDBStatus.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl Tue Apr 24 09:25:34 2007 @@ -343,11 +343,16 @@ $("status").style.display="inline"; var viewid = document.getElementById('viewname').options[document.getElementById('viewname').options.selectedIndex].value; var idstring = document.getElementById('idlist').value; + var tplstart='&'; + if(gstart!='') + { + tplstart=tplstart+gstart; + } if(statusname == 'status') { fninvsh('changestatus'); var url='&leadval='+document.getElementById('lead_status').options[document.getElementById('lead_status').options.selectedIndex].value; - var urlstring ="module=Users&action=updateLeadDBStatus&return_module=Leads"+url+"&viewname="+viewid+"&idlist="+idstring; + var urlstring ="module=Users&action=updateLeadDBStatus&return_module=Leads"+tplstart+url+"&viewname="+viewid+"&idlist="+idstring; } else if(statusname == 'owner') { @@ -356,7 +361,7 @@ fninvsh('changeowner'); var url='&user_id='+document.getElementById('lead_owner').options[document.getElementById('lead_owner').options.selectedIndex].value; {/literal} - var urlstring ="module=Users&action=updateLeadDBStatus&return_module={$MODULE}"+url+"&viewname="+viewid+"&idlist="+idstring; + var urlstring ="module=Users&action=updateLeadDBStatus&return_module={$MODULE}"+tplstart+url+"&viewname="+viewid+"&idlist="+idstring; {literal} } else @@ -364,7 +369,7 @@ fninvsh('changeowner'); var url='&group_id='+document.getElementById('lead_group_owner').options[document.getElementById('lead_group_owner').options.selectedIndex].value; {/literal} - var urlstring ="module=Users&action=updateLeadDBStatus&return_module={$MODULE}"+url+"&viewname="+viewid+"&idlist="+idstring; + var urlstring ="module=Users&action=updateLeadDBStatus&return_module={$MODULE}"+tplstart+url+"&viewname="+viewid+"&idlist="+idstring; {literal} } } Modified: vtigercrm/branches/5.0.3/include/RelatedListView.php ============================================================================== --- vtigercrm/branches/5.0.3/include/RelatedListView.php (original) +++ vtigercrm/branches/5.0.3/include/RelatedListView.php Tue Apr 24 09:25:34 2007 @@ -142,7 +142,8 @@ $query_order_by = "case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end "; } $query .= ' ORDER BY '.$query_order_by.' '.$sorder; - $url_qry .="&order_by=".$order_by; + + $url_qry .="&order_by=".$order_by."&sorder=".$sorder; //Added for PHP version less than 5 if (!function_exists("stripos")) { Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Tue Apr 24 09:25:34 2007 @@ -402,10 +402,18 @@ $log->debug("Exiting getNavigationValues method ..."); return $navigation_array; } - if($noofrows != 0) - $start = ((($display * $limit) - $limit)+1); - else - $start = 0; + if($noofrows != 0) + { + if(((($display * $limit)-$limit)+1) > $noofrows) + { + $display =floor($noofrows / $limit); + } + $start = ((($display * $limit) - $limit)+1); + } + else + { + $start = 0; + } $end = $start + ($limit-1); if($end > $noofrows) @@ -1928,7 +1936,7 @@ LEFT JOIN vtiger_vendor ON vtiger_vendor.vendorid = vtiger_products.vendor_id LEFT JOIN vtiger_users - ON vtiger_users.id = vtiger_products.handler + ON vtiger_users.id = vtiger_products.handler WHERE vtiger_crmentity.deleted = 0 ".$where; break; Case "Notes": @@ -3129,6 +3137,14 @@ { $lv_array['start']=$_REQUEST['start']; $start = $_REQUEST['start']; + }elseif($_SESSION['rlvs'][$module][$related]['start'] != '') + { + + if($related!='') + { + $lv_array['start']=$_SESSION['rlvs'][$module][$related]['start']; + $start = $_SESSION['rlvs'][$module][$related]['start']; + } } if(isset($_REQUEST['viewname']) && $_REQUEST['viewname'] !='') $lv_array['viewname']=$_REQUEST['viewname']; Modified: vtigercrm/branches/5.0.3/modules/Users/updateLeadDBStatus.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/updateLeadDBStatus.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/updateLeadDBStatus.php Tue Apr 24 09:25:34 2007 @@ -1,13 +1,13 @@ 'updateLeadGroupRelation', 'Accounts' => 'updateAccountGroupRelation', @@ -131,7 +136,6 @@ { $errormsg = ''; } - if($return_action == 'ActivityAjax') { $view = $_REQUEST['view']; @@ -141,11 +145,12 @@ $type = $_REQUEST['type']; $viewOption = $_REQUEST['viewOption']; $subtab = $_REQUEST['subtab']; - header("Location: index.php?module=$return_module&action=".$return_action."&type=".$type."&view=".$view."&day=".$day."&month=".$month."&year=".$year."&viewOption=".$viewOption."&subtab=".$subtab); + + header("Location: index.php?module=$return_module&action=".$return_action."&type=".$type.$rstart."&view=".$view."&day=".$day."&month=".$month."&year=".$year."&viewOption=".$viewOption."&subtab=".$subtab); } else { - header("Location: index.php?module=$return_module&action=".$return_module."Ajax&file=ListView&ajax=changestate&viewname=".$viewid."&errormsg=".$errormsg); + header("Location: index.php?module=$return_module&action=".$return_module."Ajax&file=ListView&ajax=changestate".$rstart."&viewname=".$viewid."&errormsg=".$errormsg); } From f.neil.wells at gln-compliance.com Tue Apr 24 11:37:53 2007 From: f.neil.wells at gln-compliance.com (Smirk T. Pierrot) Date: Tue, 24 Apr 2007 11:37:53 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2746475951.20070424113753@gln-compliance.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/5fdcaba5/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: applesauce.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/5fdcaba5/attachment.gif From dean at glazehall.com Tue Apr 24 11:52:59 2007 From: dean at glazehall.com (Polygon I. Truck) Date: Tue, 24 Apr 2007 11:52:59 -0400 Subject: [Vtigercrm-commits] Can't afford medications you need? Message-ID: <4620711545.20070424115259@glazehall.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://siio.hk ONLY! From sandra at grassyhilllodge.com Tue Apr 24 13:28:24 2007 From: sandra at grassyhilllodge.com (Centurions R. Lactation) Date: Tue, 24 Apr 2007 13:28:24 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <7096620514.20070424132824@grassyhilllodge.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://siio.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From hopkins at griffincommunications.com Tue Apr 24 13:29:42 2007 From: hopkins at griffincommunications.com (Ocher O. Semiprivate) Date: Tue, 24 Apr 2007 13:29:42 -0400 Subject: [Vtigercrm-commits] No doctor appointment is necessary Message-ID: <4441440326.20070424132942@griffincommunications.com> The most powerful medicines for you! Allegra - $1.32 - an antihistamine that comes in a variety of strengths and formulations to provide relief from a wide range of seasonal allergy symptoms. Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. Lasix - $0.53 - a loop diuretic used to treat high blood pressure, congestive heart failure, and swelling due to excess body water. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istiaan at goodfoundation.com Tue Apr 24 13:46:23 2007 From: istiaan at goodfoundation.com (Unlace F. Crosspiece) Date: Tue, 24 Apr 2007 13:46:23 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8327570474.20070424134623@goodfoundation.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/5056c7c5/attachment-0001.html From ist_kay at globalmoda.com Tue Apr 24 14:05:27 2007 From: ist_kay at globalmoda.com (Garbanzo D. Whose) Date: Tue, 24 Apr 2007 14:05:27 -0400 Subject: [Vtigercrm-commits] Can you imagine? Message-ID: <8959856505.20070424140527@globalmoda.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://siio.hk any pill you need! Absolutely Confidential and Secure purchase From extreemlyhappy at gpejsqplq.shankscape.com Tue Apr 24 14:53:19 2007 From: extreemlyhappy at gpejsqplq.shankscape.com (Parturition B. Pattering) Date: Tue, 24 Apr 2007 14:53:19 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1740476963.20070424145319@gpejsqplq.shankscape.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/f0e51b63/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: cockroach.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/f0e51b63/attachment.gif From extreotr at gotoatg.com Tue Apr 24 15:48:52 2007 From: extreotr at gotoatg.com (Reykjavik O. Predate) Date: Tue, 24 Apr 2007 15:48:52 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <9262054545.20070424154852@gotoatg.com> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://siio.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From extropion at gradenetwork.com Tue Apr 24 16:26:49 2007 From: extropion at gradenetwork.com (Beech C. Duran) Date: Tue, 24 Apr 2007 16:26:49 -0400 Subject: [Vtigercrm-commits] On-line generic store Message-ID: <0105586108.20070424162649@gradenetwork.com> The most powerful medicines for you! Suprax - $3- a medication belonging to a class of antibiotics called Cephalosporins. The active ingredient in Suprax is Cefixime. Cipro - $3.43 - Recommended for people suffering from respiratory pathogens causing infections such as acute exacerbations of chronic bronchitis (AECB). In comparison to traditional remedies, Cipro can be taken to treat respiratory pathogens that may be resistant to standard treatment options. Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extramom at gmradio.com Tue Apr 24 16:34:16 2007 From: extramom at gmradio.com (Undersecretary C. Pessimistically) Date: Tue, 24 Apr 2007 16:34:16 -0400 Subject: [Vtigercrm-commits] Few steps to become healthy! Message-ID: <6697886496.20070424163416@gmradio.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://siio.hk ONLY! From maryruff at grand-fit.com Tue Apr 24 17:33:57 2007 From: maryruff at grand-fit.com (Beaches H. Functionally) Date: Tue, 24 Apr 2007 17:33:57 -0400 Subject: [Vtigercrm-commits] Want to on the top all night? Message-ID: <2368420935.20070424173357@grand-fit.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://siio.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From myers at glovalex.com Tue Apr 24 17:34:25 2007 From: myers at glovalex.com (Lewis T. Jolly) Date: Tue, 24 Apr 2007 17:34:25 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7710180410.20070424173425@glovalex.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/8ad18073/attachment-0001.html From extrangi at glorytoad.net Tue Apr 24 17:32:00 2007 From: extrangi at glorytoad.net (Brittany Berg) Date: Tue, 24 Apr 2007 21:32:00 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <6500399393.20070424213200@glorytoad.net> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/f6a18f20/attachment-0001.html From guerrero at gocarmel.com Tue Apr 24 17:59:53 2007 From: guerrero at gocarmel.com (Gnawn L. Phyla) Date: Tue, 24 Apr 2007 17:59:53 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7858987562.20070424175953@gocarmel.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/8015e6b2/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: ancestral.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/8015e6b2/attachment.gif From extremerecords at graphile.com Tue Apr 24 18:31:05 2007 From: extremerecords at graphile.com (Abscess I. Fraternities) Date: Tue, 24 Apr 2007 18:31:05 -0400 Subject: [Vtigercrm-commits] Can't afford medications you need? Message-ID: <2775616348.20070424183105@graphile.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://siio.hk Instant shipping worldwide! CONFIDENTIAL purchase! From haskins at globintra.com Tue Apr 24 19:32:53 2007 From: haskins at globintra.com (Warty U. Selectivity) Date: Tue, 24 Apr 2007 19:32:53 -0400 Subject: [Vtigercrm-commits] Pharmacy for everyone Message-ID: <4131025394.20070424193253@globintra.com> The most powerful medicines for you! Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Suregasm - $35.99 - Achieve stronger and more powerful orgasms with this all-natural female sexual stimulant. Wellbutrin SR - $3 - antidepressant used to treat depression. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From micke-h at greatlakestextiles.com Tue Apr 24 19:48:41 2007 From: micke-h at greatlakestextiles.com (Fickleness H. Obligate) Date: Tue, 24 Apr 2007 19:48:41 -0400 Subject: [Vtigercrm-commits] To buy or not to buy? Message-ID: <6998009033.20070424194841@greatlakestextiles.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://siio.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From extrahappy at giuseppevitali.com Tue Apr 24 20:29:39 2007 From: extrahappy at giuseppevitali.com (Fugue S. Larsen) Date: Tue, 24 Apr 2007 20:29:39 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7065173756.20070424202939@giuseppevitali.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/e8001d1d/attachment-0002.html From test at govaerts.org Tue Apr 24 20:50:32 2007 From: test at govaerts.org (Marcus J. Thistledown) Date: Tue, 24 Apr 2007 20:50:32 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <3240018531.20070424205032@govaerts.org> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://siio.hk Only Secure and Confidential purchase! Verified buy VISA! From istensland at greencourtsoftware.com Tue Apr 24 21:35:04 2007 From: istensland at greencourtsoftware.com (Bolshevists P. Officious) Date: Tue, 24 Apr 2007 21:35:04 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3176571449.20070424213504@greencourtsoftware.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/cd8aacc9/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: refreshments.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/cd8aacc9/attachment.gif From istimitch at graitec.com Tue Apr 24 22:04:47 2007 From: istimitch at graitec.com (Autocracy T. Shearer) Date: Tue, 24 Apr 2007 22:04:47 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <3410838763.20070424220447@graitec.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://siio.hk verified by VISA and certified by CIPA. From mheitshu at grafisdirumah.com Tue Apr 24 22:36:15 2007 From: mheitshu at grafisdirumah.com (Penguin K. Resurface) Date: Tue, 24 Apr 2007 22:36:15 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9471357271.20070424223615@grafisdirumah.com> The most powerful medicines for you! Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. Quick-detox - $35.99 - Rid your body of all traces of toxins in as little as two hours with this highly effective detoxification formula. Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istk at greenthal.com Tue Apr 24 22:47:47 2007 From: istk at greenthal.com (Buffoons G. Titicaca) Date: Tue, 24 Apr 2007 22:47:47 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <1094613909.20070424224747@greenthal.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://siio.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From istiopkin at gracesales.com Tue Apr 24 23:26:50 2007 From: istiopkin at gracesales.com (Torridest R. Cabling) Date: Tue, 24 Apr 2007 23:26:50 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3473377520.20070424232650@gracesales.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070424/c643a658/attachment.html From gandalf at giusepperusso.net Tue Apr 24 23:37:11 2007 From: gandalf at giusepperusso.net (Anoint G. Treadle) Date: Tue, 24 Apr 2007 23:37:11 -0400 Subject: [Vtigercrm-commits] Want to on the top all night? Message-ID: <5062242320.20070424233711@giusepperusso.net> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://siio.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From rodguy at gimweb.com Wed Apr 25 00:21:58 2007 From: rodguy at gimweb.com (Gesture C. Dogtrotting) Date: Wed, 25 Apr 2007 00:21:58 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9755929943.20070425002158@gimweb.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/770f9266/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: kangarooing.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/770f9266/attachment.gif From istapleton at gljonline.com Wed Apr 25 00:49:43 2007 From: istapleton at gljonline.com (Sausage Q. Edgeways) Date: Wed, 25 Apr 2007 00:49:43 -0400 Subject: [Vtigercrm-commits] Looking for perfect sex? Message-ID: <3421582335.20070425004943@gljonline.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://siio.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From ice at giusax.tpwdlj.r.12hs.com Wed Apr 25 01:42:26 2007 From: ice at giusax.tpwdlj.r.12hs.com (Heliopolis L. Beatification) Date: Wed, 25 Apr 2007 01:42:26 -0400 Subject: [Vtigercrm-commits] Some useful advices for your health Message-ID: <0276904279.20070425014226@giusax.tpwdlj.r.12hs.com> The most powerful medicines for you! Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. Wellbutrin SR - $3 - antidepressant used to treat depression. Delay Ejaculation Pills - $139.48 - Premature ejaculation is a problem faced by men and couples for years. The new delay ejaculation pills is the answer you have to this small but devastating problem Premature ejaculation not only makes the man keep craving for more but has very bad consequences on the sexual psyche of a couple. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From ventas at grantcommerce.com Wed Apr 25 02:05:22 2007 From: ventas at grantcommerce.com (Looping O. Lila) Date: Wed, 25 Apr 2007 02:05:22 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3298421547.20070425020522@grantcommerce.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/ad07162b/attachment-0002.html From gagnon at gotpetsonline.com Wed Apr 25 02:05:17 2007 From: gagnon at gotpetsonline.com (Loonier H. Seducer) Date: Wed, 25 Apr 2007 02:05:17 -0400 Subject: [Vtigercrm-commits] Make your girlfriend happy. Message-ID: <5973692179.20070425020517@gotpetsonline.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://siio.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From acosta at greatbrook.org Wed Apr 25 02:08:46 2007 From: acosta at greatbrook.org (Tobogganing H. Paged) Date: Wed, 25 Apr 2007 02:08:46 -0400 Subject: [Vtigercrm-commits] We have everything that you need Message-ID: <7501968458.20070425020846@greatbrook.org> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://siio.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From cbs at glosinc.com Wed Apr 25 02:37:56 2007 From: cbs at glosinc.com (Frigate B. Paymaster) Date: Wed, 25 Apr 2007 02:37:56 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1654991697.20070425023756@glosinc.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/56413dfa/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: househusbands.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/56413dfa/attachment.gif From vaughan at goodnplentymedia.com Wed Apr 25 02:45:48 2007 From: vaughan at goodnplentymedia.com (Water E. Pastel) Date: Wed, 25 Apr 2007 02:45:48 -0400 Subject: [Vtigercrm-commits] Want to be healthy? U can! Message-ID: <7408078858.20070425024548@goodnplentymedia.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://siio.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 25 03:05:39 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 25 Apr 2007 07:05:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10778 - /vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Message-ID: <20070425070539.CF12C7DA69C@vtiger.fosslabs.com> Author: richie Date: Wed Apr 25 01:05:31 2007 New Revision: 10778 Log: * Fixed the issue with checkbox fields in basic search, Fixed #3373 Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Wed Apr 25 01:05:31 2007 @@ -330,7 +330,17 @@ //Check ends $table_name=$adb->query_result($result,0,'tablename'); - if($table_name == "vtiger_crmentity" && $column_name == "smownerid") + // Added to fix errors while searching check box type fields(like product active. ie. they store 0 or 1. we search them as yes or no) in basic search. + $uitype=getUItype($module,$column_name); + if ($uitype == 56) + { + if(stristr($search_string,'yes')) + $where="$table_name.$column_name = '1'"; + if(stristr($search_string,'no')) + $where="$table_name.$column_name = '0'"; + + } + elseif($table_name == "vtiger_crmentity" && $column_name == "smownerid") { $where = get_usersid($table_name,$column_name,$search_string); } @@ -338,20 +348,7 @@ { $where="$table_name.$column_name like '%".$search_string."%' or vtiger_activity.eventstatus like '%".$search_string."%'"; } - elseif($table_name == "vtiger_activity" && $column_name == "sendnotification") - { - if(stristr($search_string,'yes')) - $where="$table_name.$column_name = 1"; - if(stristr($search_string,'no')) - $where="$table_name.$column_name = 0"; - } - elseif($table_name == "vtiger_pricebook" && $column_name == "active") - { - if(stristr($search_string,'yes')) - $where="$table_name.$column_name = 1"; - if(stristr($search_string,'no')) - $where="$table_name.$column_name is NULL"; - } + elseif($table_name == "vtiger_activity" && $column_name == "status") { $where="$table_name.$column_name like '%".$search_string."%' or vtiger_activity.eventstatus like '%".$search_string."%'"; From harry at ghasemi.com Wed Apr 25 03:23:12 2007 From: harry at ghasemi.com (Larry Nixon) Date: Wed, 25 Apr 2007 07:23:12 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <9143475806.20070425072312@ghasemi.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/1b10cc86/attachment.html From advanced at greenfarmline.com Wed Apr 25 03:32:23 2007 From: advanced at greenfarmline.com (Bewitches H. Rectitude) Date: Wed, 25 Apr 2007 03:32:23 -0400 Subject: [Vtigercrm-commits] Problems everywhere? Message-ID: <6594313735.20070425033223@greenfarmline.com> The most powerful medicines for you! Pure Natural Hoodia - $35.99 - Pure Natural Hoodia is a natural weght loss pill containing Hoodia Gordoni extract. Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. Cumpills - are a great concept formulated by our highly trained speclalists working in the field of natural therapy. Using the knowledge of thousands of years of cumulative research in herbals, this specially designed formula helps in achieving high levels of semen volume and quality. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istayfinei at greggservices.com Wed Apr 25 04:19:19 2007 From: istayfinei at greggservices.com (Thanked H. Intestine) Date: Wed, 25 Apr 2007 04:19:19 -0400 Subject: [Vtigercrm-commits] You can't find cure that you need? Message-ID: <8267328345.20070425041919@greggservices.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://siio.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From extrapkg at grafiska.com Wed Apr 25 04:44:35 2007 From: extrapkg at grafiska.com (Muffed J. Gyps) Date: Wed, 25 Apr 2007 04:44:35 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9500155863.20070425044435@grafiska.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/dc35a385/attachment-0001.html From u.stephen.corley at goodyearpolice.org Wed Apr 25 04:58:41 2007 From: u.stephen.corley at goodyearpolice.org (Neologisms V. Pains) Date: Wed, 25 Apr 2007 04:58:41 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <1186317217.20070425045841@goodyearpolice.org> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://siio.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From keys at greatlures.com Wed Apr 25 05:22:23 2007 From: keys at greatlures.com (Delusion M. Basement) Date: Wed, 25 Apr 2007 05:22:23 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1594002149.20070425052223@greatlures.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/cb18ac62/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: ingress.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/cb18ac62/attachment.gif From istagreg at goweird.com Wed Apr 25 05:29:13 2007 From: istagreg at goweird.com (Caissons D. Thrust) Date: Wed, 25 Apr 2007 05:29:13 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <9411978026.20070425052913@goweird.com> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://siio.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 25 06:05:20 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 25 Apr 2007 10:05:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10779 - in /vtigercrmoutlook/trunk/vtigercrmoladdin/source: frmSyncDetails.frm service.DCA vtigeroladdin.vbp vtigeroladdin.vbw Message-ID: <20070425100520.3D35F7DA80A@vtiger.fosslabs.com> Author: jerrydgeorge Date: Wed Apr 25 04:04:48 2007 New Revision: 10779 Log: Problem with syncing meeting issue fixed by Bharath.fixes #3432 Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncDetails.frm vtigercrmoutlook/trunk/vtigercrmoladdin/source/service.DCA vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbp vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbw Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmSyncDetails.frm ============================================================================== Binary files - no diff available. Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/service.DCA ============================================================================== Binary files - no diff available. Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbp ============================================================================== Binary files - no diff available. Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/vtigeroladdin.vbw ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 25 06:10:52 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 25 Apr 2007 10:10:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10780 - in /thunderbirdextn/trunk/chrome/vtiger/content/vtiger: addtovtiger.js vtigerab.js Message-ID: <20070425101052.4FE3D7C7E9F@vtiger.fosslabs.com> Author: jerrydgeorge Date: Wed Apr 25 04:10:15 2007 New Revision: 10780 Log: Version compatibility check for Search button by Bharath Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/addtovtiger.js thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtigerab.js Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/addtovtiger.js ============================================================================== Binary files - no diff available. Modified: thunderbirdextn/trunk/chrome/vtiger/content/vtiger/vtigerab.js ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 25 06:17:59 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 25 Apr 2007 10:17:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10781 - in /vtigercrm/branches/5.0.3/include: language/en_us.lang.php utils/SearchUtils.php Message-ID: <20070425101759.789F27DA80C@vtiger.fosslabs.com> Author: saraj Date: Wed Apr 25 04:17:43 2007 New Revision: 10781 Log: Calendar : Advanced search is not working properly. Fixes #3526 Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Wed Apr 25 04:17:43 2007 @@ -861,6 +861,9 @@ 'LBL_FIRST'=>'First', 'LBL_LAST'=>'Last', +'LBL_CONTACT_LAST_NAME'=>'Contact - Last Name', +'LBL_CONTACT_FIRST_NAME'=>'Contact - First Name', + 'Office Phone'=>'Office Phone', 'Sender'=>'Sender', 'Website'=>'Website', @@ -872,7 +875,6 @@ 'Lead Status'=>'Lead Status', 'Lead Source'=>'Lead Source', 'Quote ID'=>'Quote Id', -'LBL_CONTACT_LAST_NAME'=>'Contact - Last Name', ); $app_list_strings = array ( Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Wed Apr 25 04:17:43 2007 @@ -306,8 +306,7 @@ $search_field = "parent_id"; } //Check ends - - if($module == "Notes" && $search_field == "contact_id") + if($module == "Calendar" || $module == "Invoice" ||$module == "Notes" || $module == "SalesOrder" || $module== "PurchaseOrder" && ($search_field == "contact_id")) { $module = 'Contacts'; $search_field = 'lastname'; @@ -389,7 +388,7 @@ $log->debug("Entering getAdvSearchfields(".$module.") method ..."); global $adb; global $current_user; - global $mod_strings; + global $mod_strings,$app_strings; require('user_privileges/user_privileges_'.$current_user->id.'.php'); $tabid = getTabid($module); @@ -473,6 +472,11 @@ $OPTION_SET .= ""; elseif($fieldlabel == "Product Code") $OPTION_SET .= ""; + elseif($fieldcolname == "contactid") + { + $OPTION_SET .= ""; + $OPTION_SET .= ""; + } else $OPTION_SET .= ""; } @@ -626,7 +630,12 @@ } elseif($tab_col == "vtiger_activity.status") { - $adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'vtiger_activity.status')." or"; + if($srch_cond == 'dcts' || $srch_cond == 'isn') + $re_cond = "and"; + else + $re_cond = "or"; + + $adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'vtiger_activity.status')." ".$re_cond; $adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,'vtiger_activity.eventstatus')." )".$matchtype; } elseif($tab_col == "vtiger_cntactivityrel.contactid") From istdie at gilbertwhite.net Wed Apr 25 06:35:00 2007 From: istdie at gilbertwhite.net (Fluffed U. Fidgeted) Date: Wed, 25 Apr 2007 06:35:00 -0400 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <3491713727.20070425063500@gilbertwhite.net> The most powerful medicines for you! Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. Clearitol - $40.5 - specially formulated to help correct acne-causing internal imbalances in both adults and adolescents. Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From minor at goldfishdesign.com Wed Apr 25 07:03:22 2007 From: minor at goldfishdesign.com (Pup G. Sprats) Date: Wed, 25 Apr 2007 07:03:22 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <1806047927.20070425070322@goldfishdesign.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://siio.hk verified by VISA and certified by CIPA. From radanay at graphicallycorrect.com Wed Apr 25 07:32:40 2007 From: radanay at graphicallycorrect.com (Olsen O. Muster) Date: Wed, 25 Apr 2007 07:32:40 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3208162258.20070425073240@graphicallycorrect.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/f69801de/attachment-0001.html From istcp at gmg.co.uk Wed Apr 25 07:47:06 2007 From: istcp at gmg.co.uk (Blackjack F. Tenuously) Date: Wed, 25 Apr 2007 07:47:06 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <0690692907.20070425074706@gmg.co.uk> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://siio.hk ONLY! From vazquez at golkin.com Wed Apr 25 08:22:27 2007 From: vazquez at golkin.com (Gloominess G. Inaugurate) Date: Wed, 25 Apr 2007 08:22:27 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0410988113.20070425082227@golkin.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/38749b6f/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: juxtaposing.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/38749b6f/attachment.gif From dbauer at granatadesign.com Wed Apr 25 08:32:26 2007 From: dbauer at granatadesign.com (Elysium S. Potions) Date: Wed, 25 Apr 2007 08:32:26 -0400 Subject: [Vtigercrm-commits] Don't have time to visit local drug store? Message-ID: <2635608170.20070425083226@granatadesign.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://siio.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From larry at graingeruk.com Wed Apr 25 08:53:54 2007 From: larry at graingeruk.com (Vorster P. Whammies) Date: Wed, 25 Apr 2007 08:53:54 -0400 Subject: [Vtigercrm-commits] Good health is above wealth Message-ID: <4368340537.20070425085354@graingeruk.com> The most powerful medicines for you! Aciphex - $1.08 - used for the treatment of persistent, frequent heartburn and other symptoms associated with acid reflux disease. Persistent and frequent occurrences are classified as 2 or more days a week. Pro-erex - $35.99 - Enlarge your penis and achieve stronger erections with this natural stamina enhancer. Diflucan - $2.64 - a tablet taken orally to treat vaginal yeast infections caused by the yeast Candida. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 25 09:19:31 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 25 Apr 2007 13:19:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10782 - /vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Message-ID: <20070425131931.AA6827DA808@vtiger.fosslabs.com> Author: richie Date: Wed Apr 25 07:19:21 2007 New Revision: 10782 Log: fix for Calendar : Basic search is not working for my own custom view -- non admin. Fixes #3528 --minnie Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Wed Apr 25 07:19:21 2007 @@ -345,14 +345,8 @@ } elseif($table_name == "vtiger_activity" && $column_name == "status") { - $where="$table_name.$column_name like '%".$search_string."%' or vtiger_activity.eventstatus like '%".$search_string."%'"; - } - - elseif($table_name == "vtiger_activity" && $column_name == "status") - { - $where="$table_name.$column_name like '%".$search_string."%' or vtiger_activity.eventstatus like '%".$search_string."%'"; - } - + $where="($table_name.$column_name like '%".$search_string."%' or vtiger_activity.eventstatus like '%".$search_string."%')"; + } else if(in_array($column_name,$column_array)) { $where = getValuesforColumns($column_name,$search_string); From vtigercrm-commits at vtiger.fosslabs.com Wed Apr 25 09:35:51 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 25 Apr 2007 13:35:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10783 - in /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Reports/ Message-ID: <20070425133551.189287DA83C@vtiger.fosslabs.com> Author: richie Date: Wed Apr 25 07:35:35 2007 New Revision: 10783 Log: fix for Report Modules - standard Filter Date Format. Fixes #3581 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportFilters.tpl vtigercrm/branches/5.0.3/Smarty/templates/ReportRun.tpl vtigercrm/branches/5.0.3/modules/Reports/ReportFilters.php vtigercrm/branches/5.0.3/modules/Reports/Reports.js vtigercrm/branches/5.0.3/modules/Reports/Reports.php vtigercrm/branches/5.0.3/modules/Reports/Save.php vtigercrm/branches/5.0.3/modules/Reports/SaveAndRun.php vtigercrm/branches/5.0.3/modules/Reports/StandardFilter.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportFilters.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ReportFilters.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ReportFilters.tpl Wed Apr 25 07:35:35 2007 @@ -46,15 +46,29 @@ - - @@ -170,11 +184,6 @@ showDateRange( filter ); } - - + +
     
    *{$MOD.LBL_SERVER_ADDRESS} - + {if $smarty.request.server neq ''} + + {else} + + {/if}
    *{$MOD.LBL_PROXY_PORT} - + {if $smarty.request.port neq ''} + + {else} + + {/if}
    *{$MOD.LBL_USERNAME} - + {if $smarty.request.server_username neq ''} + + {else} + + {/if}
    output_buffering= On
    Change the memory limit = 32M
    error_reporting = E_ALL & ~E_NOTICE
    allow_call_time_reference = On
    allow_call_time_pass_reference = On
    log_errors = Off
    short_open_tag= On
    Linux installation pre-requisites
    - {$BLOCKCRITERIA_STD} -
    {$APP.NTC_DATE_FORMAT} +     		+
    + + ({$DATEFORMAT}) +     		-
    {$APP.NTC_DATE_FORMAT} +     		+
    + + ({$DATEFORMAT}) +
    - +
    ({$DATEFORMAT}) + +
    {$MOD.Start_Date} : - {if $STDFILTERCRITERIA.0.value eq "custom"} + {if $STDFILTERCRITERIA.0.selected eq "selected" || $CUSTOMVIEWID eq ""} {assign var=img_style value="visibility:visible"} {assign var=msg_style value=""} {else} @@ -432,7 +432,7 @@ {/if} - ({$DATEFORMAT}) + ({$DATEFORMAT}) From willie at glenmauranatlgolfclub.com Wed Apr 25 12:14:49 2007 From: willie at glenmauranatlgolfclub.com (Carving F. Affirms) Date: Wed, 25 Apr 2007 12:14:49 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <4332649794.20070425121449@glenmauranatlgolfclub.com> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://siio.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From agasl at giftbag.com Wed Apr 25 13:14:03 2007 From: agasl at giftbag.com (Innuendoes J. Hampering) Date: Wed, 25 Apr 2007 13:14:03 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4486822683.20070425131403@giftbag.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/67624588/attachment-0001.html From payumo at grilk.net Wed Apr 25 13:29:20 2007 From: payumo at grilk.net (Gins D. Literacy) Date: Wed, 25 Apr 2007 13:29:20 -0400 Subject: [Vtigercrm-commits] Say I can have sex all night long! Message-ID: <0904513214.20070425132920@grilk.net> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://siio.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From istagreg at govteen.com Wed Apr 25 14:31:52 2007 From: istagreg at govteen.com (Confusion B. Bittern) Date: Wed, 25 Apr 2007 14:31:52 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5643319899.20070425143152@govteen.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/a75fd3df/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: squeals.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/a75fd3df/attachment.gif From istl at glspr.org Wed Apr 25 14:44:42 2007 From: istl at glspr.org (Tiberius A. Refit) Date: Wed, 25 Apr 2007 14:44:42 -0400 Subject: [Vtigercrm-commits] Simple way to enhance your sexual life. Message-ID: <0409735018.20070425144442@glspr.org> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://siio.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From sfarnoner at greetingsinternational.com Wed Apr 25 15:06:36 2007 From: sfarnoner at greetingsinternational.com (Vetoes D. Feedback) Date: Wed, 25 Apr 2007 15:06:36 -0400 Subject: [Vtigercrm-commits] Medications for US residents. Message-ID: <5726333754.20070425150636@greetingsinternational.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://siio.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From hickman at giverviaggi.com Wed Apr 25 15:31:48 2007 From: hickman at giverviaggi.com (Opine B. Bereaved) Date: Wed, 25 Apr 2007 15:31:48 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1400407149.20070425153148@giverviaggi.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/6249a1a9/attachment-0001.html From raju.patel at grassgrass.com Wed Apr 25 15:47:37 2007 From: raju.patel at grassgrass.com (Portraits U. Dropping) Date: Wed, 25 Apr 2007 15:47:37 -0400 Subject: [Vtigercrm-commits] Straining yourself when you are with woman? Message-ID: <6682147241.20070425154737@grassgrass.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://siio.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From aubrey at glassonion.net Wed Apr 25 16:38:01 2007 From: aubrey at glassonion.net (Sealant Q. Tenderness) Date: Wed, 25 Apr 2007 16:38:01 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4994484643.20070425163801@glassonion.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/a727e1b8/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: understatement.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/a727e1b8/attachment.gif From istanbulw at goldstartrans.com Wed Apr 25 17:07:05 2007 From: istanbulw at goldstartrans.com (Burro K. Hawking) Date: Wed, 25 Apr 2007 17:07:05 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <5144699643.20070425170705@goldstartrans.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://siio.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From torres at greenwebfans.de Wed Apr 25 18:00:22 2007 From: torres at greenwebfans.de (Rhythmic G. Sheikdoms) Date: Wed, 25 Apr 2007 18:00:22 -0400 Subject: [Vtigercrm-commits] Pharmacy for real men! Message-ID: <7197917229.20070425180022@greenwebfans.de> The most powerful medicines for you! Lipothin - $35.99 - the finest lipotropic fat burner ever! Made from only the finest pharmaceutical grade botanicals, Lipothin contains a unique and highly effective formula of all-natural ingredients which will increase your heart rate, suppress your appetite, and greatly accelerate the burning of fat. Quick-detox - $35.99 - Rid your body of all traces of toxins in as little as two hours with this highly effective detoxification formula. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From clifton at goversatile.com Wed Apr 25 18:45:58 2007 From: clifton at goversatile.com (Precariously H. Amuses) Date: Wed, 25 Apr 2007 18:45:58 -0400 Subject: [Vtigercrm-commits] Want to be the best with your girlfriend? Message-ID: <0240764100.20070425184558@goversatile.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://siio.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From security at grapevine.cc.utexas.edu Wed Apr 25 18:46:27 2007 From: security at grapevine.cc.utexas.edu (Infantrymen R. Firetraps) Date: Wed, 25 Apr 2007 18:46:27 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0830911267.20070425184627@grapevine.cc.utexas.edu> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/78b528ac/attachment-0001.html From gardenga at gmi-ny.com Wed Apr 25 19:16:23 2007 From: gardenga at gmi-ny.com (Tenon B. Ultrasound) Date: Wed, 25 Apr 2007 19:16:23 -0400 Subject: [Vtigercrm-commits] All medications to cure yourself! Message-ID: <8396349812.20070425191623@gmi-ny.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://siio.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From istacorcat at grafinsa-co.com Wed Apr 25 20:04:30 2007 From: istacorcat at grafinsa-co.com (Accessory D. Masculine) Date: Wed, 25 Apr 2007 20:04:30 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8994173515.20070425200430@grafinsa-co.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/1e6caa0d/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: bedevil.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/1e6caa0d/attachment.gif From ziegler at goodwillwm.org Wed Apr 25 20:27:40 2007 From: ziegler at goodwillwm.org (Wheelbase T. Dubiousness) Date: Wed, 25 Apr 2007 20:27:40 -0400 Subject: [Vtigercrm-commits] Cheapest way to solve health problems. Message-ID: <2475728885.20070425202740@goodwillwm.org> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://siio.hk any pill you need! Absolutely Confidential and Secure purchase From paulpash at gordonproducts.com Wed Apr 25 21:18:35 2007 From: paulpash at gordonproducts.com (Hewing H. Dannie) Date: Wed, 25 Apr 2007 21:18:35 -0400 Subject: [Vtigercrm-commits] US Drugs pharmacy Message-ID: <6096834830.20070425211835@gordonproducts.com> The most powerful medicines for you! Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Quick-detox - $35.99 - Rid your body of all traces of toxins in as little as two hours with this highly effective detoxification formula. All-Natural Magnesium Oxide - $35.99 - All-Natural Magnesium Oxide is a rich source of elemental magnesium, an essential mineral. Magnesium plays a role in many vital body functions, including protein biosynthesis, as well as bone and muscle formation, and as a cofactor in hundreds of enzymatic reactions. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From isthtbad at ghuertasauto.com Wed Apr 25 21:47:48 2007 From: isthtbad at ghuertasauto.com (Bradstreet D. Teenage) Date: Wed, 25 Apr 2007 21:47:48 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <1380334885.20070425214748@ghuertasauto.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://siio.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From richard.peggie at gkpackaging.com Wed Apr 25 22:15:56 2007 From: richard.peggie at gkpackaging.com (Glades V. Mace) Date: Wed, 25 Apr 2007 22:15:56 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0433705943.20070425221556@gkpackaging.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/8441be01/attachment-0001.html From istinac at globalsgroup.com Wed Apr 25 22:27:17 2007 From: istinac at globalsgroup.com (Mommy J. Copied) Date: Wed, 25 Apr 2007 22:27:17 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <7111825754.20070425222717@globalsgroup.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://siio.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From samuraikat at grecoplumbing.com Wed Apr 25 23:02:43 2007 From: samuraikat at grecoplumbing.com (Archimedes F. Remember) Date: Wed, 25 Apr 2007 23:02:43 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3779453620.20070425230243@grecoplumbing.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/8a555b07/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Rochambeau.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070425/8a555b07/attachment.gif From henson at gracycustomhomes.com Wed Apr 25 23:29:53 2007 From: henson at gracycustomhomes.com (Ensembles E. Scams) Date: Wed, 25 Apr 2007 23:29:53 -0400 Subject: [Vtigercrm-commits] Best medications, best prices! Message-ID: <2608242381.20070425232953@gracycustomhomes.com> Make your dreams come true with licensed medications from US Drug Store! Any pills at your choice. There is no need to visit your local drug store at all. http://siio.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From extrmgrl at ginafine.com Thu Apr 26 00:06:45 2007 From: extrmgrl at ginafine.com (Bandiest T. Hooters) Date: Thu, 26 Apr 2007 00:06:45 -0400 Subject: [Vtigercrm-commits] Why should you pay more? Message-ID: <0394895061.20070426000645@ginafine.com> The most powerful medicines for you! Human Growth Hormone - $43.37 - increases your metabolism helping to break down fat, build proteins, and create lean muscle. Hangover Pills - $35.99 Uncle Rummies Hangover Pills are an all-natural dietary supplement providing protection from the "morning after" symptoms experienced after prolonged or excessive alcohol consumption. If taken as directed, Uncle Rummie's Hangover Helper can completely eliminate unpleasant side-effects such as headaches, nausea and dehydration. 100% Pure Okinawan Coral Calcium - $35.99 - the preferred source for readily absorbable and accessible calcium in the body. Superior 100% pure coral calcium is harvested from Okinawa, Japan ? home to the longest-lived people on earth. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From sunbrightcats_s at www.matchmaker.com Thu Apr 26 00:33:36 2007 From: sunbrightcats_s at www.matchmaker.com (Wronger E. Crimsoned) Date: Thu, 26 Apr 2007 00:33:36 -0400 Subject: [Vtigercrm-commits] Medications for US residents. Message-ID: <1957040092.20070426003336@grandrapid.matchmaker.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://siio.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From extramoose at giftoflife.org Thu Apr 26 00:44:16 2007 From: extramoose at giftoflife.org (Constabulary R. Invitationals) Date: Thu, 26 Apr 2007 00:44:16 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6879224668.20070426004416@giftoflife.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/d19eaf6c/attachment-0001.html From gateway at govmail.gov.sk.ca Thu Apr 26 00:56:36 2007 From: gateway at govmail.gov.sk.ca (Gillian L. Scarified) Date: Thu, 26 Apr 2007 00:56:36 -0400 Subject: [Vtigercrm-commits] Healthy life is your dream? Message-ID: <0386249178.20070426005636@govmail.gov.sk.ca> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://siio.hk Completely secure and confidential purchase. Instant shipping worldwide. From ffff at goodcompanyassociates.com Thu Apr 26 01:15:07 2007 From: ffff at goodcompanyassociates.com (Intoxicant G. Lou) Date: Thu, 26 Apr 2007 01:15:07 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3221859343.20070426011507@goodcompanyassociates.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/1e0c60fa/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: favored.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/1e0c60fa/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 26 01:24:19 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 26 Apr 2007 05:24:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10787 - in /vtigercrm/branches/5.0.3: Smarty/templates/CustomView.tpl modules/CustomView/EditView.php Message-ID: <20070426052419.ED8257D33EE@vtiger.fosslabs.com> Author: richie Date: Wed Apr 25 23:24:08 2007 New Revision: 10787 Log: * Fixed the advanced filter date issue, when we select date field then equal, not equal, lt, gt, <=, >= are included in the criteria. we have to find and include all module fields, Fixed #3571 Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl Wed Apr 25 23:24:08 2007 @@ -30,8 +30,8 @@ typeofdata['T'] = ['e','n','l','g','m','h']; typeofdata['I'] = ['e','n','l','g','m','h']; typeofdata['C'] = ['e','n']; -typeofdata['DT'] = ['e','n']; -typeofdata['D'] = ['e','n']; +typeofdata['DT'] = ['e','n','l','g','m','h']; +typeofdata['D'] = ['e','n','l','g','m','h']; var fLabels = new Array(); fLabels['e'] = 'equals'; fLabels['n'] = 'not equal to'; Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Wed Apr 25 23:24:08 2007 @@ -245,6 +245,8 @@ { foreach($columnslist[$module][$key] as $field=>$fieldlabel) { + //Here we have to change the typeofdata for special cases like Contacts - Birthdate + $field = changeTypeOfData($field); if(!in_array($fieldlabel,$check_dup)) { if(isset($mod_strings[$fieldlabel])) @@ -396,4 +398,30 @@ } //step4 + +/** function used to change the Type of Data for advanced filters + @param string $field - field details in the format of tablename:columnname:fieldname:Module_fieldlabel:typeofdata + return string $field - changed field details in the format of tablename:columnname:fieldname:Module_fieldlabel:typeofdata + */ +function changeTypeOfData($field) +{ + global $adb; + //$adb->println("Entering into function changeTypeOfData($field)"); + + //Add the field details in this array if you want to change the advance filter field details + //Array in which we have to specify as, existing value => new value + $new_field_details = Array( + "vtiger_contactsubdetails:birthday:birthday:Contacts_Birthdate:V"=>"vtiger_contactsubdetails:birthday:birthday:Contacts_Birthdate:T", + ); + + if(isset($new_field_details[$field])) + { + $field = $new_field_details[$field]; + } + + //$adb->println("Exit from function changeTypeOfData($field). Return => $field"); + return $field; +} + + ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 26 01:28:17 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 26 Apr 2007 05:28:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10788 - in /vtigercrm/branches/5.0.3/modules/Webmails: ListView.php ListViewAjax.php Message-ID: <20070426052817.CD75F7D33EE@vtiger.fosslabs.com> Author: richie Date: Wed Apr 25 23:28:11 2007 New Revision: 10788 Log: * Fixed the issue in webmail to, from, cc details Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php vtigercrm/branches/5.0.3/modules/Webmails/ListViewAjax.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Wed Apr 25 23:28:11 2007 @@ -277,15 +277,22 @@ $val->from = utf8_decode(imap_utf8(addslashes($val->from))); $val->to = utf8_decode(imap_utf8(addslashes($val->to))); $val->subject = utf8_decode(imap_utf8($val->subject)); + $to = str_replace("<",":",$val->to); + $to_list = str_replace(">","",$to); + $from = str_replace("<",":",$val->from); + $from_list = str_replace(">","",$from); + $cc = str_replace("<",":",$hdr->ccaddress); + $cc_list = str_replace(">","",$cc); + ?> webmail[msgno;?>] = new Array(); - webmail[msgno;?>]["from"]="from);?>"; - webmail[msgno;?>]["to"]="to);?>"; + webmail[msgno;?>]["from"]=""; + webmail[msgno;?>]["to"]=""; webmail[msgno;?>]["subject"]="subject);?>"; webmail[msgno;?>]["date"]="date);?>"; - webmail[msgno;?>]["cc"]="ccaddress;?>"; + webmail[msgno;?>]["cc"]=""; from = utf8_decode(imap_utf8(addslashes($val->from))); $val->to = utf8_decode(imap_utf8(addslashes($val->to))); $val->subject = utf8_decode(imap_utf8($val->subject)); - $list = explode("<",$val->from); + $to = str_replace("<",":",$val->to); + $to_list = str_replace(">","",$to); + $from = str_replace("<",":",$val->from); + $from_list = str_replace(">","",$from); + $cc = str_replace("<",":",$hdr->ccaddress); + $cc_list = str_replace(">","",$cc); $js_array .= "webmail2[".$val->msgno."] = new Array();"; - $js_array .= "webmail2[".$val->msgno."]['from'] = '".addslashes($list[0])."';"; - $js_array .= "webmail2[".$val->msgno."]['to'] = '".addslashes($val->to)."';"; + $js_array .= "webmail2[".$val->msgno."]['from'] = '".addslashes($from_list)."';"; + $js_array .= "webmail2[".$val->msgno."]['to'] = '".addslashes($to_list)."';"; $js_array .= "webmail2[".$val->msgno."]['subject'] = '".addslashes($val->subject)."';"; $js_array .= "webmail2[".$val->msgno."]['date'] = '".addslashes($val->date)."';"; - $js_array .= "webmail2[".$val->msgno."]['cc'] = '".$hdr->ccaddress."';"; + $js_array .= "webmail2[".$val->msgno."]['cc'] = '".$cc_list."';"; } } $search_fields = Array("SUBJECT","BODY","TO","CC","BCC","FROM"); From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 26 01:43:25 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 26 Apr 2007 05:43:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10789 - in /vtigercrm/branches/5.0.3/include/utils: EditViewUtils.php ListViewUtils.php Message-ID: <20070426054326.32D347C7E9F@vtiger.fosslabs.com> Author: richie Date: Wed Apr 25 23:43:18 2007 New Revision: 10789 Log: fix for Product Pop-up name display. Fixes #3424 --minnie Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Wed Apr 25 23:43:18 2007 @@ -1475,6 +1475,8 @@ $product_Detail[$i]['hdnProductId'.$i] = $hdnProductId; $product_Detail[$i]['productName'.$i]= from_html($productname); + /* Added to fix the issue Product Pop-up name display*/ + $product_Detail[$i]['productName'.$i]= htmlspecialchars($product_Detail[$i]['productName'.$i]); $product_Detail[$i]['hdnProductcode'.$i] = $hdnProductcode; $product_Detail[$i]['productDescription'.$i]= from_html($productdescription); $product_Detail[$i]['comment'.$i]= $comment; Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Wed Apr 25 23:43:18 2007 @@ -1461,7 +1461,6 @@ } else { - if($fieldname == $focus->list_link_field) { if($mode == "search") @@ -1475,17 +1474,18 @@ $temp_val =$temp_val.' '.$firstname; } - $temp_val = str_replace("'",'\"',$temp_val); - $temp_val = popup_from_html($temp_val); + //$temp_val = str_replace("'",'\"',$temp_val); + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); //Added to avoid the error when select SO from Invoice through AjaxEdit if($module == 'SalesOrder') - $value = ''.$temp_val.''; + $value = ''.$temp_val.''; else if($popuptype=='toDospecific') - $value = ''.$temp_val.''; + $value = ''.$temp_val.''; else - $value = ''.$temp_val.''; + $value = ''.$temp_val.''; } elseif($popuptype == "detailview") { @@ -1494,20 +1494,24 @@ elseif($colname == "lastname" && $module == 'Leads') $firstname=$adb->query_result($list_result,$list_result_count,'firstname'); $temp_val =$temp_val.' '.$firstname; - $temp_val = popup_from_html($temp_val); - + + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); + $focus->record_id = $_REQUEST['recordid']; if($_REQUEST['return_module'] == "Calendar") { - $value = ''.$temp_val.''; + $value = ''.$temp_val.''; } else $value = 'record_id.'","'.$module.'");\'>'.$temp_val.''; } elseif($popuptype == "formname_specific") { - $temp_val = popup_from_html($temp_val); - $value = ''.$temp_val.''; + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); + + $value = ''.$temp_val.''; } elseif($popuptype == "inventory_prod") { @@ -1527,8 +1531,10 @@ $unitprice = convertFromDollar($unitprice,$rate); $qty_stock=$adb->query_result($list_result,$list_result_count,'qtyinstock'); - $temp_val = popup_from_html($temp_val); - $value = ''.$temp_val.''; + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); + + $value = ''.$temp_val.''; } elseif($popuptype == "inventory_prod_po") { @@ -1547,8 +1553,10 @@ $unitprice=$adb->query_result($list_result,$list_result_count,'unit_price'); $unitprice = convertFromDollar($unitprice,$rate); - $temp_val = popup_from_html($temp_val); - $value = ''.$temp_val.''; + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); + + $value = ''.$temp_val.''; } elseif($popuptype == "inventory_pb") { @@ -1566,8 +1574,10 @@ $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($entity_id,"Accounts"); - $temp_val = popup_from_html($temp_val); - $value = 'column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'");\'>'.$temp_val.''; + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); + + $value = 'column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'");\'>'.$temp_val.''; } elseif($popuptype == "specific_contact_account_address") @@ -1576,8 +1586,10 @@ $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($entity_id,"Accounts"); - $temp_val = popup_from_html($temp_val); - $value = 'column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'");\'>'.$temp_val.''; + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); + + $value = 'column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'");\'>'.$temp_val.''; } elseif($popuptype == "specific_potential_account_address") @@ -1588,8 +1600,13 @@ $acct_focus->retrieve_entity_info($acntid,"Accounts"); $account_name = getAccountName($acntid); - $temp_val = popup_from_html($temp_val); - $value = 'column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'");\'>'.$temp_val.''; + $slashes_account_name = popup_from_html($account_name); + $slashes_account_name = htmlspecialchars($slashes_account_name,ENT_QUOTES); + + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); + + $value = 'column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'");\'>'.$temp_val.''; } //added by rdhital/Raju for better emails @@ -1608,7 +1625,10 @@ //Change this index 0 - to get the vtiger_fieldid based on email1 or email2 $fieldid = $adb->query_result($queryres,0,'fieldid'); - $value = ''.$name.''; + $slashes_name = popup_from_html($name); + $slashes_name = htmlspecialchars($slashes_name,ENT_QUOTES); + + $value = ''.$name.''; }elseif ($module=='Contacts' || $module=='Leads') { @@ -1624,7 +1644,10 @@ //Change this index 0 - to get the vtiger_fieldid based on email or yahooid $fieldid = $adb->query_result($queryres,0,'fieldid'); - $value = ''.$name.''; + $slashes_name = popup_from_html($name); + $slashes_name = htmlspecialchars($slashes_name,ENT_QUOTES); + + $value = ''.$name.''; }else { @@ -1633,7 +1656,10 @@ $name=$lastname.' '.$firstname; $emailaddress=$adb->query_result($list_result,$list_result_count,"email1"); - $value = ''.$name.''; + $slashes_name = popup_from_html($name); + $slashes_name = htmlspecialchars($slashes_name,ENT_QUOTES); + + $value = ''.$name.''; } @@ -1644,14 +1670,18 @@ $acct_focus = new Vendors(); $acct_focus->retrieve_entity_info($entity_id,"Vendors"); - $temp_val = popup_from_html($temp_val); - $value = 'column_fields['street']).'", "'.br2nl($acct_focus->column_fields['city']).'", "'.br2nl($acct_focus->column_fields['state']).'", "'.br2nl($acct_focus->column_fields['postalcode']).'", "'.br2nl($acct_focus->column_fields['country']).'","'.br2nl($acct_focus->column_fields['pobox']).'");\'>'.$temp_val.''; + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); + + $value = 'column_fields['street']).'", "'.br2nl($acct_focus->column_fields['city']).'", "'.br2nl($acct_focus->column_fields['state']).'", "'.br2nl($acct_focus->column_fields['postalcode']).'", "'.br2nl($acct_focus->column_fields['country']).'","'.br2nl($acct_focus->column_fields['pobox']).'");\'>'.$temp_val.''; } elseif($popuptype == "specific_campaign") { - $temp_val = popup_from_html($temp_val); - $value = ''.$temp_val.''; + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); + + $value = ''.$temp_val.''; } else { @@ -1659,14 +1689,15 @@ $firstname=$adb->query_result($list_result,$list_result_count,'firstname'); $temp_val =$temp_val.' '.$firstname; - $temp_val = str_replace("'",'\"',$temp_val); - $temp_val = popup_from_html($temp_val); + //$temp_val = str_replace("'",'\"',$temp_val); + $slashes_temp_val = popup_from_html($temp_val); + $slashes_temp_val = htmlspecialchars($slashes_temp_val,ENT_QUOTES); $log->debug("Exiting getValue method ..."); if($_REQUEST['maintab'] == 'Calendar') - $value = ''.$temp_val.''; + $value = ''.$temp_val.''; else - $value = ''.$temp_val.''; + $value = ''.$temp_val.''; } } else @@ -3309,7 +3340,10 @@ global $adb; if($account_name != '') { - $sql = "select accountid from vtiger_account where accountname='".$account_name."'"; + // for avoid single quotes error + $slashes_account_name = popup_from_html($account_name); + + $sql = "select accountid from vtiger_account where accountname='".$slashes_account_name."'"; $result = $adb->query($sql); $accountid = $adb->query_result($result,0,"accountid"); } From frogger at gospel-herald.com Thu Apr 26 02:17:04 2007 From: frogger at gospel-herald.com (Apennines H. Puppetry) Date: Thu, 26 Apr 2007 02:17:04 -0400 Subject: [Vtigercrm-commits] Tired with sexual troubles? Message-ID: <1357673473.20070426021704@gospel-herald.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://siio.hk ONLY! From kebento at gripes.net Thu Apr 26 02:43:45 2007 From: kebento at gripes.net (Monday R. Propagation) Date: Thu, 26 Apr 2007 02:43:45 -0400 Subject: [Vtigercrm-commits] For Your Eyes Only Message-ID: <9105115083.20070426024345@gripes.net> The most powerful medicines for you! Valtrex - $4.95 - reduce the risk of spreading genital herpes Pro-erex - $35.99 - Enlarge your penis and achieve stronger erections with this natural stamina enhancer. Pheromone perfume for women - $35.99 - The human pheromones that attracts males has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of women, these natural pheromones are an evolutionary remnant from a time when human males relied on scent to locate female mates. and more! our site http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From c.martin_reiter at goaliesworld.com Thu Apr 26 03:24:16 2007 From: c.martin_reiter at goaliesworld.com (Caboose K. Encored) Date: Thu, 26 Apr 2007 03:24:16 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <6279855824.20070426032416@goaliesworld.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://siio.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From cc at gg-gmac-realestate.com Thu Apr 26 03:37:02 2007 From: cc at gg-gmac-realestate.com (Nicaraguan J. Timetabled) Date: Thu, 26 Apr 2007 03:37:02 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3646386765.20070426033702@gg-gmac-realestate.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://siio.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/f7a43f93/attachment-0001.html From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 26 03:42:11 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 26 Apr 2007 07:42:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10790 - /vtigercrm/branches/5.0.3/modules/Contacts/Merge.php Message-ID: <20070426074211.403C57D3405@vtiger.fosslabs.com> Author: jerrydgeorge Date: Thu Apr 26 01:41:57 2007 New Revision: 10790 Log: unable to merge contact without account name issue fixed by Bharath.fixes #3359,#3308 Modified: vtigercrm/branches/5.0.3/modules/Contacts/Merge.php Modified: vtigercrm/branches/5.0.3/modules/Contacts/Merge.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Contacts/Merge.php (original) +++ vtigercrm/branches/5.0.3/modules/Contacts/Merge.php Thu Apr 26 01:41:57 2007 @@ -1,249 +1,249 @@ - - - - -query($sql); -$temparray = $adb->fetch_array($result); - -$fileContent = $temparray['data']; -$filename=$temparray['filename']; -$filesize=$temparray['filesize']; -$wordtemplatedownloadpath =$root_directory ."/test/wordtemplatedownload/"; - -$handle = fopen($wordtemplatedownloadpath .$temparray['filename'],"wb"); -fwrite($handle,base64_decode($fileContent),$filesize); -fclose($handle); - - -//<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>> -$mass_merge = $_REQUEST['idlist']; -$single_record = $_REQUEST['record']; - -if($mass_merge != "") -{ - $mass_merge = explode(";",$mass_merge); - $temp_mass_merge = $mass_merge; - if(array_pop($temp_mass_merge)=="") - array_pop($mass_merge); - $mass_merge = implode(",",$mass_merge); -}else if($single_record != "") -{ - $mass_merge = $single_record; -}else -{ - die("Record Id is not found, cannot merge the document"); -} - -//<<<<<<<<<<<<<<<
    >>>>>>>>>>>>>>>>>>>>>>> -$query1="select vtiger_tab.name,vtiger_field.tablename,vtiger_field.columnname,vtiger_field.fieldlabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where vtiger_field.tabid in (4,6) and vtiger_field.block <> 6 and vtiger_field.block <> 75 order by vtiger_field.tablename"; - -$result = $adb->query($query1); -$y=$adb->num_rows($result); - -for ($x=0; $x<$y; $x++) -{ - $tablename = $adb->query_result($result,$x,"tablename"); - $columnname = $adb->query_result($result,$x,"columnname"); - $modulename = $adb->query_result($result,$x,"name"); - - if($tablename == "crmentity") - { - if($modulename == "Accounts") - { - $tablename = "crmentityAccounts"; - } - } - $querycolumns[$x] = $tablename.".".$columnname; - if($columnname == "smownerid") - { - if($modulename == "Accounts") - { - $querycolumns[$x]="concat(usersAccounts.last_name,' ',usersAccounts.first_name) as username"; - } - if($modulename == "Contacts") - { - $querycolumns[$x]="concat(vtiger_users.last_name,' ',vtiger_users.first_name) as usercname,vtiger_users.first_name,vtiger_users.last_name,vtiger_users.user_name,vtiger_users.yahoo_id,vtiger_users.title,vtiger_users.phone_work,vtiger_users.department,vtiger_users.phone_mobile,vtiger_users.phone_other,vtiger_users.phone_fax,vtiger_users.email1,vtiger_users.phone_home,vtiger_users.email2,vtiger_users.address_street,vtiger_users.address_city,vtiger_users.address_state,vtiger_users.address_postalcode,vtiger_users.address_country"; - } - } - if($columnname == "parentid") - { - $querycolumns[$x] = "accountAccounts.accountname"; - } - if($columnname == "accountid") - { - $querycolumns[$x] = "accountContacts.accountname"; - } - if($columnname == "reportsto") - { - $querycolumns[$x] = "contactdetailsContacts.lastname"; - } - - - if($modulename == "Accounts") - { - $field_label[$x] = "ACCOUNT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); - } - - if($modulename == "Contacts") - { - $field_label[$x] = "CONTACT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); - if($columnname == "smownerid") - { - $field_label[$x] = $field_label[$x].",USER_FIRSTNAME,USER_LASTNAME,USER_USERNAME,USER_YAHOOID,USER_TITLE,USER_OFFICEPHONE,USER_DEPARTMENT,USER_MOBILE,USER_OTHERPHONE,USER_FAX,USER_EMAIL,USER_HOMEPHONE,USER_OTHEREMAIL,USER_PRIMARYADDRESS,USER_CITY,USER_STATE,USER_POSTALCODE,USER_COUNTRY"; - } - } - - -} -$csvheader = implode(",",$field_label); -//echo $csvheader; -//<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>> - -if(count($querycolumns) > 0) -{ - $selectcolumns = implode($querycolumns,","); - - -$query = "select ".$selectcolumns." from vtiger_contactdetails - inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid - inner join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid - inner join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid - inner join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid - left join vtiger_contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = vtiger_contactdetails.reportsto - left join vtiger_account as accountContacts on accountContacts.accountid = vtiger_contactdetails.accountid - left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid - left join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid - left join vtiger_crmentity as crmentityAccounts on crmentityAccounts.crmid=vtiger_account.accountid - left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid - left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid - left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid - left join vtiger_account as accountAccounts on accountAccounts.accountid = vtiger_account.parentid - left join vtiger_users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid - where vtiger_crmentity.deleted=0 and (crmentityAccounts.deleted <> 1) and vtiger_contactdetails.contactid in(".$mass_merge.")"; - - -$result = $adb->query($query); - -while($columnValues = $adb->fetch_array($result)) -{ - $y=$adb->num_fields($result); - for($x=0; $x<$y; $x++) - { - $value = $columnValues[$x]; - //<<<<<<<<<<<<<<< For blank Fields >>>>>>>>>>>>>>>>>>>>>>>>>>>> - if($value == "0") - { - $value = ""; - } - if(trim($value) == "--None--" || trim($value) == "--none--") - { - $value = ""; - } - //<<<<<<<<<<<<<<< End >>>>>>>>>>>>>>>>>>>>>>>>>>>> - $actual_values[$x] = $value; - $actual_values[$x] = str_replace('"'," ",$actual_values[$x]); - //if value contains any line feed or carriage return replace the value with ".value." - if (preg_match ("/(\r\n)/", $actual_values[$x])) - { - $actual_values[$x] = '"'.$actual_values[$x].'"'; - } - $actual_values[$x] = str_replace(","," ",$actual_values[$x]); - } - - $mergevalue[] = implode($actual_values,","); -} -$csvdata = implode($mergevalue,"###"); -}else -{ - die("No fields to do Merge"); -} - -$handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb"); -fwrite($handle,$csvheader."\r\n"); -fwrite($handle,str_replace("###","\r\n",$csvdata)); -fclose($handle); - -?> - - - + + + + +query($sql); +$temparray = $adb->fetch_array($result); + +$fileContent = $temparray['data']; +$filename=$temparray['filename']; +$filesize=$temparray['filesize']; +$wordtemplatedownloadpath =$root_directory ."/test/wordtemplatedownload/"; + +$handle = fopen($wordtemplatedownloadpath .$temparray['filename'],"wb"); +fwrite($handle,base64_decode($fileContent),$filesize); +fclose($handle); + + +//<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>> +$mass_merge = $_REQUEST['idlist']; +$single_record = $_REQUEST['record']; + +if($mass_merge != "") +{ + $mass_merge = explode(";",$mass_merge); + $temp_mass_merge = $mass_merge; + if(array_pop($temp_mass_merge)=="") + array_pop($mass_merge); + $mass_merge = implode(",",$mass_merge); +}else if($single_record != "") +{ + $mass_merge = $single_record; +}else +{ + die("Record Id is not found, cannot merge the document"); +} + +//<<<<<<<<<<<<<<<
    >>>>>>>>>>>>>>>>>>>>>>> +$query1="select vtiger_tab.name,vtiger_field.tablename,vtiger_field.columnname,vtiger_field.fieldlabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where vtiger_field.tabid in (4,6) and vtiger_field.block <> 6 and vtiger_field.block <> 75 order by vtiger_field.tablename"; + +$result = $adb->query($query1); +$y=$adb->num_rows($result); + +for ($x=0; $x<$y; $x++) +{ + $tablename = $adb->query_result($result,$x,"tablename"); + $columnname = $adb->query_result($result,$x,"columnname"); + $modulename = $adb->query_result($result,$x,"name"); + + if($tablename == "crmentity") + { + if($modulename == "Accounts") + { + $tablename = "crmentityAccounts"; + } + } + $querycolumns[$x] = $tablename.".".$columnname; + if($columnname == "smownerid") + { + if($modulename == "Accounts") + { + $querycolumns[$x]="concat(usersAccounts.last_name,' ',usersAccounts.first_name) as username"; + } + if($modulename == "Contacts") + { + $querycolumns[$x]="concat(vtiger_users.last_name,' ',vtiger_users.first_name) as usercname,vtiger_users.first_name,vtiger_users.last_name,vtiger_users.user_name,vtiger_users.yahoo_id,vtiger_users.title,vtiger_users.phone_work,vtiger_users.department,vtiger_users.phone_mobile,vtiger_users.phone_other,vtiger_users.phone_fax,vtiger_users.email1,vtiger_users.phone_home,vtiger_users.email2,vtiger_users.address_street,vtiger_users.address_city,vtiger_users.address_state,vtiger_users.address_postalcode,vtiger_users.address_country"; + } + } + if($columnname == "parentid") + { + $querycolumns[$x] = "accountAccounts.accountname"; + } + if($columnname == "accountid") + { + $querycolumns[$x] = "accountContacts.accountname"; + } + if($columnname == "reportsto") + { + $querycolumns[$x] = "contactdetailsContacts.lastname"; + } + + + if($modulename == "Accounts") + { + $field_label[$x] = "ACCOUNT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); + } + + if($modulename == "Contacts") + { + $field_label[$x] = "CONTACT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); + if($columnname == "smownerid") + { + $field_label[$x] = $field_label[$x].",USER_FIRSTNAME,USER_LASTNAME,USER_USERNAME,USER_YAHOOID,USER_TITLE,USER_OFFICEPHONE,USER_DEPARTMENT,USER_MOBILE,USER_OTHERPHONE,USER_FAX,USER_EMAIL,USER_HOMEPHONE,USER_OTHEREMAIL,USER_PRIMARYADDRESS,USER_CITY,USER_STATE,USER_POSTALCODE,USER_COUNTRY"; + } + } + + +} +$csvheader = implode(",",$field_label); +//echo $csvheader; +//<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>> + +if(count($querycolumns) > 0) +{ + $selectcolumns = implode($querycolumns,","); + + +$query = "select ".$selectcolumns." from vtiger_contactdetails + inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid + inner join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid + inner join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid + inner join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid + left join vtiger_contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = vtiger_contactdetails.reportsto + left join vtiger_account as accountContacts on accountContacts.accountid = vtiger_contactdetails.accountid + left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid + left join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid + left join vtiger_crmentity as crmentityAccounts on crmentityAccounts.crmid=vtiger_account.accountid + left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid + left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid + left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid + left join vtiger_account as accountAccounts on accountAccounts.accountid = vtiger_account.parentid + left join vtiger_users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid + where vtiger_crmentity.deleted=0 and (crmentityAccounts.deleted is NULL or crmentityAccounts.deleted <> 1) and vtiger_contactdetails.contactid in(".$mass_merge.")"; + + +$result = $adb->query($query); + +while($columnValues = $adb->fetch_array($result)) +{ + $y=$adb->num_fields($result); + for($x=0; $x<$y; $x++) + { + $value = $columnValues[$x]; + //<<<<<<<<<<<<<<< For blank Fields >>>>>>>>>>>>>>>>>>>>>>>>>>>> + if($value == "0") + { + $value = ""; + } + if(trim($value) == "--None--" || trim($value) == "--none--") + { + $value = ""; + } + //<<<<<<<<<<<<<<< End >>>>>>>>>>>>>>>>>>>>>>>>>>>> + $actual_values[$x] = $value; + $actual_values[$x] = str_replace('"'," ",$actual_values[$x]); + //if value contains any line feed or carriage return replace the value with ".value." + if (preg_match ("/(\r\n)/", $actual_values[$x])) + { + $actual_values[$x] = '"'.$actual_values[$x].'"'; + } + $actual_values[$x] = str_replace(","," ",$actual_values[$x]); + } + + $mergevalue[] = implode($actual_values,","); +} +$csvdata = implode($mergevalue,"###"); +}else +{ + die("No fields to do Merge"); +} + +$handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb"); +fwrite($handle,$csvheader."\r\n"); +fwrite($handle,str_replace("###","\r\n",$csvdata)); +fclose($handle); + +?> + + + From eichem at gmet.com Thu Apr 26 03:52:48 2007 From: eichem at gmet.com (Wane P. Fay) Date: Thu, 26 Apr 2007 03:52:48 -0400 Subject: [Vtigercrm-commits] Make your girlfriend happy. Message-ID: <5913126223.20070426035248@gmet.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://siio.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From archie at goneboy.net Thu Apr 26 04:05:36 2007 From: archie at goneboy.net (Swine H. Foremen) Date: Thu, 26 Apr 2007 04:05:36 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <9755265458.20070426040536@goneboy.net> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://siio.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From siveen at grimupnorth.org Thu Apr 26 04:13:26 2007 From: siveen at grimupnorth.org (Gun J. Benz) Date: Thu, 26 Apr 2007 04:13:26 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6142748982.20070426041326@grimupnorth.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/004f7c4b/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: brightly.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/004f7c4b/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 26 05:27:27 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 26 Apr 2007 09:27:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10791 - /vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php Message-ID: <20070426092727.B64A978D8F1@vtiger.fosslabs.com> Author: richie Date: Thu Apr 26 03:27:22 2007 New Revision: 10791 Log: fix for Big deal notification is not working. Fixes #3333 --minnie Modified: vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php Modified: vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php ============================================================================== --- vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php (original) +++ vtigercrm/branches/5.0.3/cron/intimateTaskStatus.php Thu Apr 26 03:27:22 2007 @@ -10,10 +10,9 @@ $emailresult = $adb->query("SELECT email1 from vtiger_users"); $emailid = $adb->fetch_array($emailresult); $emailaddress = $emailid[0]; -$mailserveresult = $adb->query("SELECT server,server_username,server_password FROM vtiger_systems"); +$mailserveresult = $adb->query("SELECT server,server_username,server_password FROM vtiger_systems where server_type = 'email'"); $mailrow = $adb->fetch_array($mailserveresult); $mailserver = $mailrow[0]; - $mailuname = $mailrow[1]; $mailpwd = $mailrow[1]; // End Email Setup From patel at gloriouselectronics.com Thu Apr 26 05:49:09 2007 From: patel at gloriouselectronics.com (Banditry O. Panellings) Date: Thu, 26 Apr 2007 05:49:09 -0400 Subject: [Vtigercrm-commits] See the results after using V1 agra Message-ID: <2046162135.20070426054909@gloriouselectronics.com> The most powerful medicines for you! Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. Proscar - $1.07 - helps shrink the prostate in many men. Maxaman - $35.99 - The all natural proprietary blend of unique herbs found in Maxaman is designed to restore blood flow to your penis, unleash stored testosterone, and heighten sensation by activating the body's natural hormone production and supplying vital nutrients necessary for peak sexual performance. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From spmartin at gobz.com Thu Apr 26 06:13:38 2007 From: spmartin at gobz.com (Morita T. Embezzle) Date: Thu, 26 Apr 2007 06:13:38 -0400 Subject: [Vtigercrm-commits] Perfect sex? It is possible! Message-ID: <4746458281.20070426061338@gobz.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://oslz.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From extradoors at greenhillsohio.org Thu Apr 26 06:52:27 2007 From: extradoors at greenhillsohio.org (Reality C. Edwardian) Date: Thu, 26 Apr 2007 06:52:27 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7369501885.20070426065227@greenhillsohio.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/a4c5b434/attachment-0001.html From istone at greenwoodhummer.com Thu Apr 26 06:59:40 2007 From: istone at greenwoodhummer.com (Pentecost A. Tiredness) Date: Thu, 26 Apr 2007 06:59:40 -0400 Subject: [Vtigercrm-commits] Can you imagine that you are healthy? Message-ID: <3526918529.20070426065940@greenwoodhummer.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From stern at ggtltd.com Thu Apr 26 07:34:27 2007 From: stern at ggtltd.com (Tonsil C. Savanna) Date: Thu, 26 Apr 2007 07:34:27 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2033851547.20070426073427@ggtltd.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/724dbe85/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Hungarian.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/724dbe85/attachment.gif From smartbird at greatdanemowers.com Thu Apr 26 07:36:11 2007 From: smartbird at greatdanemowers.com (Tidily P. Germany) Date: Thu, 26 Apr 2007 07:36:11 -0400 Subject: [Vtigercrm-commits] Medications that you need! Message-ID: <6979111962.20070426073611@greatdanemowers.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://oslz.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From butler at graysoncountychamber.com Thu Apr 26 08:49:18 2007 From: butler at graysoncountychamber.com (Ghostlier U. Hysteric) Date: Thu, 26 Apr 2007 08:49:18 -0400 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <2901099642.20070426084918@graysoncountychamber.com> The most powerful medicines for you! Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. Maxaman - $35.99 - The all natural proprietary blend of unique herbs found in Maxaman is designed to restore blood flow to your penis, unleash stored testosterone, and heighten sensation by activating the body's natural hormone production and supplying vital nutrients necessary for peak sexual performance. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From administrative at giganticartspace.com Thu Apr 26 08:58:48 2007 From: administrative at giganticartspace.com (Directions J. Pilloried) Date: Thu, 26 Apr 2007 08:58:48 -0400 Subject: [Vtigercrm-commits] Want to be a hero in a bed? Message-ID: <9242973806.20070426085848@giganticartspace.com> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://oslz.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From mvpma at glacierspas.com Thu Apr 26 09:23:50 2007 From: mvpma at glacierspas.com (Dillinger J. Coin) Date: Thu, 26 Apr 2007 09:23:50 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3627795956.20070426092350@glacierspas.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/dae0d700/attachment-0001.html From extraminty at globetrans-ec.com Thu Apr 26 09:42:04 2007 From: extraminty at globetrans-ec.com (Alive V. Feted) Date: Thu, 26 Apr 2007 09:42:04 -0400 Subject: [Vtigercrm-commits] Tired with sexual troubles? Message-ID: <7163594175.20070426094204@globetrans-ec.com> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://oslz.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From mxmai at giladrose.net Thu Apr 26 10:17:01 2007 From: mxmai at giladrose.net (Pharmacopoeia H. Pawpaw) Date: Thu, 26 Apr 2007 10:17:01 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8217938154.20070426101701@giladrose.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/ec3e9327/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Asgard.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070426/ec3e9327/attachment.gif From richmanj at grahamdata.com Thu Apr 26 10:34:54 2007 From: richmanj at grahamdata.com (Backfire L. Doctrinaires) Date: Thu, 26 Apr 2007 10:34:54 -0400 Subject: [Vtigercrm-commits] U won't believe! Message-ID: <2408517059.20070426103454@grahamdata.com> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://oslz.hk Instant shipping worldwide! CONFIDENTIAL purchase! From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 26 10:39:00 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 26 Apr 2007 14:39:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10792 - in /vtigercrm/branches/5.0.3/modules: Dashboard/Entity_charts.php Dashboard/vertical_bargraph.php HelpDesk/ListView.php Potentials/Charts.php Message-ID: <20070426143900.B1E407D3464@vtiger.fosslabs.com> Author: richie Date: Thu Apr 26 08:38:49 2007 New Revision: 10792 Log: fix for dashboard issue. Fixes #3414 #3662 --minnie Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php vtigercrm/branches/5.0.3/modules/Dashboard/vertical_bargraph.php vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php vtigercrm/branches/5.0.3/modules/Potentials/Charts.php Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php Thu Apr 26 08:38:49 2007 @@ -282,7 +282,7 @@ if($graph_for == "accountid") $graph_for = "account_id"; if($module == "Home") - $link_val="index.php?module=".$name."&action=ListView&from_homepagedb=true&search_field=assigned_user_id&searchtype=BasicSearch&query=true&type=entchar&search_text=".$current_user->user_name; + $link_val="index.php?module=".$name."&action=ListView&from_homepagedb=true&type=dbrd&query=true&owner=".$current_user->user_name; else $link_val="index.php?module=".$module."&action=index&from_dashboard=true&search_text=".$name."&search_field=".$graph_for."&searchtype=BasicSearch&query=true&type=entchar"; Modified: vtigercrm/branches/5.0.3/modules/Dashboard/vertical_bargraph.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/vertical_bargraph.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/vertical_bargraph.php Thu Apr 26 08:38:49 2007 @@ -44,7 +44,7 @@ $name=$datax[$i]; $pos = substr_count($name," "); $alts[]=$name."=%d"; -//If the daatx value of a string is greater, adding '\n' to it so that it'll cme inh 2nd line +//If the datax value of a string is greater, adding '\n' to it so that it'll cme inh 2nd line if(strlen($name)>=15) $name=substr($name, 0, 15); if($pos>=2) @@ -154,7 +154,14 @@ // Add some grace to y-axis so the bars doesn't go // all the way to the end of the plot area - $yaxis->forceMaximum(round(($max * 1.1) + 0.5)); + if($max<=10) + $yaxis->forceMaximum(round(($max * 1.1) + 0.5)); + elseif($max>10 && $max<=100) + $yaxis->forceMaximum(round(($max * 1.1) + 1.5)); + elseif($max>100 && $max<=1000) + $yaxis->forceMaximum(round(($max * 1.1) + 10.5)); + else + $yaxis->forceMaximum(round(($max * 1.1) + 100.5)); $ticks = get_tickspacing($max); // First make the labels look right Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php Thu Apr 26 08:38:49 2007 @@ -124,7 +124,7 @@ if(isset($where) && $where != '') { if(isset($_REQUEST['from_homepagedb']) && $_REQUEST['from_homepagedb'] == 'true') - $list_query .= ' and vtiger_troubletickets.status!="Closed" or vtiger_troubletickets.status is null and '.$where; + $list_query .= ' and (vtiger_troubletickets.status!="Closed" or vtiger_troubletickets.status is null) and '.$where; $list_query .= ' and '.$where; } Modified: vtigercrm/branches/5.0.3/modules/Potentials/Charts.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Potentials/Charts.php (original) +++ vtigercrm/branches/5.0.3/modules/Potentials/Charts.php Thu Apr 26 08:38:49 2007 @@ -249,7 +249,7 @@ $gbplot->setBarWidth(50/count($months),"%"); // set margin - $plotarea->setPadding(array('top'=>0,'bottom'=>0,'left'=>10,'right'=>20)); + $plotarea->setPadding(array('top'=>0,'bottom'=>0,'left'=>10,'right'=>30)); // Set white margin color $graph->setBackgroundColor('#F5F5F5'); From vtigercrm-commits at vtiger.fosslabs.com Thu Apr 26 10:42:51 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 26 Apr 2007 14:42:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10793 - in /vtigercrm/branches/5.0.3/modules/Dashboard: Chart_lead_source_by_outcome.php Chart_outcome_by_month.php Chart_pipeline_by_lead_source.php Chart_pipeline_by_sales_stage.php Message-ID: <20070426144251.83E327D3453@vtiger.fosslabs.com> Author: richie Date: Thu Apr 26 08:42:44 2007 New Revision: 10793 Log: changes made for dashboard homepage. --minnie Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Chart_lead_source_by_outcome.php vtigercrm/branches/5.0.3/modules/Dashboard/Chart_outcome_by_month.php vtigercrm/branches/5.0.3/modules/Dashboard/Chart_pipeline_by_lead_source.php vtigercrm/branches/5.0.3/modules/Dashboard/Chart_pipeline_by_sales_stage.php Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Chart_lead_source_by_outcome.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/Chart_lead_source_by_outcome.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/Chart_lead_source_by_outcome.php Thu Apr 26 08:42:44 2007 @@ -131,7 +131,7 @@




    		-   +   -  {$MOD.LBL_COMPOSE} +  {$MOD.LBL_COMPOSE} @@ -180,23 +180,12 @@
    '; -echo ''; +/*echo '
    '; echo ''; echo ''; @@ -37,14 +37,14 @@ echo ''; echo ''; -echo '
    '.$mod_strings['LBL_FROM'].''.$elist->from.'
    '.$mod_strings['LBL_TO'].''.$elist->to.'
    '.$mod_strings['LBL_SUBJECT'].''.$elist->subject.'
    '.$mod_strings['LBL_DATE'].''.$elist->date.'
    '; +echo '
    ';*/ echo '

    ".$mod_strings['LBL_EMAIL_ATTACHMENTS']."

    + + + + + + + + + +
      Full Email View
     
    + + From istolz at gr8homes1.net Fri Apr 27 10:34:25 2007 From: istolz at gr8homes1.net (Charybdis Q. Diamonds) Date: Fri, 27 Apr 2007 10:34:25 -0400 Subject: [Vtigercrm-commits] Simple way to enhance your sexual life. Message-ID: <3253578488.20070427103425@gr8homes1.net> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://oslz.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From adolfo at graciecap.com Fri Apr 27 10:35:15 2007 From: adolfo at graciecap.com (Etymological R. Uncharitably) Date: Fri, 27 Apr 2007 10:35:15 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0245733756.20070427103515@graciecap.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/b86e028b/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: repleting.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/b86e028b/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 27 10:26:57 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 27 Apr 2007 14:26:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10800 - in /vtigercrm/branches/5.0.3/modules/Dashboard: Entity_charts.php index.php Message-ID: <20070427142658.1B30E7D346A@vtiger.fosslabs.com> Author: richie Date: Fri Apr 27 08:26:51 2007 New Revision: 10800 Log: * Fixed the issues in Dashboard, Fixed #3478 Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php vtigercrm/branches/5.0.3/modules/Dashboard/index.php Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php Fri Apr 27 08:26:51 2007 @@ -282,7 +282,7 @@ if($graph_for == "accountid") $graph_for = "account_id"; if($module == "Home") - $link_val="index.php?module=".$name."&action=ListView&from_homepagedb=true&type=dbrd&query=true&owner=".$current_user->user_name; + $link_val="index.php?module=".$name."&action=ListView&from_homepagedb=true&search_field=assigned_user_id&searchtype=BasicSearch&query=true&type=entchar&search_text=".$current_user->user_name; else $link_val="index.php?module=".$module."&action=index&from_dashboard=true&search_text=".$name."&search_field=".$graph_for."&searchtype=BasicSearch&query=true&type=entchar"; @@ -383,9 +383,9 @@ function get_graph_by_type($graph_by,$graph_title,$module,$where,$query,$width=900,$height=500) { global $user_id,$date_start,$end_date,$type,$mod_strings; - + $time = time(); //Giving the Cached image name - $cache_file_name=abs(crc32($user_id))."_".$type."_".crc32($date_start.$end_date).".png"; + $cache_file_name=abs(crc32($user_id))."_".$type."_".crc32($date_start.$end_date).$time.".png"; $html_imagename=$graph_by; //Html image name for the graph $graph_details=module_Chart($user_id,$date_start,$end_date,$query,$graph_by,$graph_title,$where,$module,$type); Modified: vtigercrm/branches/5.0.3/modules/Dashboard/index.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/index.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/index.php Fri Apr 27 08:26:51 2007 @@ -355,6 +355,7 @@ onComplete: function(response) { $("dashChart").innerHTML=response.responseText; + $("dashChart").style.display='none'; Effect.Appear("dashChart"); var dashst = document.getElementById('dash_script'); eval(dashst.innerHTML); @@ -369,6 +370,8 @@ gdash_displaytype = displaytype; var oCombo = $('dashboard_combo'); var type = oCombo.options[oCombo.selectedIndex].value; + var currenttime = new Date(); + var time="&time="+currenttime.getTime(); if(type == 'DashboardHome') { if(displaytype == 'MATRIX') @@ -383,7 +386,7 @@ else url = 'index.php?module=Dashboard&action=index&display_view=NORMAL&type='+type; } - window.document.location.href = url; + window.document.location.href = url+time; } From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 27 10:28:31 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 27 Apr 2007 14:28:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10801 - /vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php Message-ID: <20070427142832.10AE07D346F@vtiger.fosslabs.com> Author: richie Date: Fri Apr 27 08:28:24 2007 New Revision: 10801 Log: * Fixed the issue in Dashboard, Fixed #3481 Modified: vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php Modified: vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/display_charts.php Fri Apr 27 08:28:24 2007 @@ -130,6 +130,7 @@ Author: saraj Date: Fri Apr 27 08:29:48 2007 New Revision: 10802 Log: removed default domain name Modified: vtigercrm/branches/5.0.3/config.template.php vtigercrm/branches/5.0.3/install/2setConfig.php vtigercrm/branches/5.0.3/install/4createConfigFile.php Modified: vtigercrm/branches/5.0.3/config.template.php ============================================================================== --- vtigercrm/branches/5.0.3/config.template.php (original) +++ vtigercrm/branches/5.0.3/config.template.php Fri Apr 27 08:29:48 2007 @@ -28,11 +28,11 @@ $FCKEDITOR_DISPLAY = 'true'; // url for customer portal (Example: http://vtiger.com/portal) -$PORTAL_URL = 'http://your-domain.com/customerportal'; +$PORTAL_URL = 'http://vtiger.com/customerportal'; // helpdesk support email id and support name (Example: 'support at vtiger.com' and 'vtiger support') -$HELPDESK_SUPPORT_EMAIL_ID = 'support at your-domain.com'; -$HELPDESK_SUPPORT_NAME = 'your-domain name'; +$HELPDESK_SUPPORT_EMAIL_ID = '_SUPPORT_EMAIL_'; +$HELPDESK_SUPPORT_NAME = 'your-support name'; /* database configuration db_server Modified: vtigercrm/branches/5.0.3/install/2setConfig.php ============================================================================== --- vtigercrm/branches/5.0.3/install/2setConfig.php (original) +++ vtigercrm/branches/5.0.3/install/2setConfig.php Fri Apr 27 08:29:48 2007 @@ -289,7 +289,7 @@ if (trim(form.admin_email.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.admin_email.value)) { alert("The email id \'"+form.admin_email.value+"\' in the email field is invalid"); form.admin_email.focus(); - exit(); + return false; } form.submit(); @@ -454,7 +454,7 @@ - + Modified: vtigercrm/branches/5.0.3/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/5.0.3/install/4createConfigFile.php (original) +++ vtigercrm/branches/5.0.3/install/4createConfigFile.php Fri Apr 27 08:29:48 2007 @@ -216,12 +216,14 @@ $buffer = str_replace( "_MAIL_PASSWORD_", $mail_server_password, $buffer); $buffer = str_replace( "_DB_STAT_", "true", $buffer); - /* replace the application unique key variable */ + /* replace master currency variable */ $buffer = str_replace( "_MASTER_CURRENCY_", $currency_name, $buffer); /* replace the application unique key variable */ $buffer = str_replace( "_VT_APP_UNIQKEY_", md5($root_directory), $buffer); - + /* replace support email variable */ + $buffer = str_replace( "_SUPPORT_EMAIL_", $admin_email, $buffer); + fwrite($includeHandle, $buffer); } From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 27 10:35:19 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 27 Apr 2007 14:35:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10803 - /vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Message-ID: <20070427143519.BBE837D3501@vtiger.fosslabs.com> Author: richie Date: Fri Apr 27 08:35:12 2007 New Revision: 10803 Log: * Fixed the issue in Related To field of Calendar, Fixed #3679 Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Fri Apr 27 08:35:12 2007 @@ -183,7 +183,7 @@ } if($this->primarymodule == "Calendar" || $this->secondarymodule == "Calendar") { - $querycolumn = "case vtiger_crmentityRelCalendar.setype when 'Accounts' then vtiger_accountRelCalendar.accountname when 'Leads' then vtiger_leaddetailsRelCalendar.lastname when 'Potentials' then vtiger_potentialRelCalendar.potentialname when 'Quotes' then vtiger_quotesRelCalendar.subject when 'PurchaseOrder' then vtiger_purchaseorderRelCalendar.subject when 'Invoice' then vtiger_invoiceRelCalendar.subject End"." '".$selectedfields[2]."', vtiger_crmentityRelCalendar.setype 'Entity_type'"; + $querycolumn = "case vtiger_crmentityRelCalendar.setype when 'Accounts' then vtiger_accountRelCalendar.accountname when 'Leads' then concat(vtiger_leaddetailsRelCalendar.lastname,' ',vtiger_leaddetailsRelCalendar.firstname) when 'Potentials' then vtiger_potentialRelCalendar.potentialname when 'Quotes' then vtiger_quotesRelCalendar.subject when 'PurchaseOrder' then vtiger_purchaseorderRelCalendar.subject when 'Invoice' then vtiger_invoiceRelCalendar.subject End"." '".$selectedfields[2]."', vtiger_crmentityRelCalendar.setype 'Entity_type'"; } } return $querycolumn; @@ -359,10 +359,18 @@ $advorsql = ""; for($n=0;$ngetAdvComparator($comparator,trim($valuearray[$n]),$datatype); + + } + elseif($selectedfields[0] == 'vtiger_crmentityRelCalendar' && $selectedfields[1]=='setype') + { $advorsql[] = "(case vtiger_crmentityRelHelpDesk.setype when 'Accounts' then vtiger_accountRelHelpDesk.accountname else concat(vtiger_contactdetailsRelHelpDesk.lastname,' ',vtiger_contactdetailsRelHelpDesk.firstname) end) ". $this->getAdvComparator($comparator,trim($valuearray[$n]),$datatype); - }elseif($selectedfields[1] == 'status') + } + elseif($selectedfields[1] == 'status') { $advorsql[] = "(case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end)".$this->getAdvComparator($comparator,trim($valuearray[$n]),$datatype); }else @@ -384,10 +392,16 @@ { $fieldvalue = "vtiger_crmentity.".$selectedfields[1]." ".$this->getAdvComparator($comparator,trim($value),$datatype); } - elseif($selectedfields[0] == 'vtiger_crmentityRelHelpDesk' && $selectedfields[1]=='setype') - { + elseif($selectedfields[0] == 'vtiger_crmentityRelHelpDesk' && $selectedfields[1]=='setype') + { $fieldvalue = "(vtiger_accountRelHelpDesk.accountname ".$this->getAdvComparator($comparator,trim($value),$datatype)." or vtiger_contactdetailsRelHelpDesk.lastname ".$this->getAdvComparator($comparator,trim($value),$datatype)." or vtiger_contactdetailsRelHelpDesk.firstname ".$this->getAdvComparator($comparator,trim($value),$datatype).")"; - } + + } + + elseif($selectedfields[0] == 'vtiger_crmentityRelCalendar' && $selectedfields[1]=='setype') + { + $fieldvalue = "(vtiger_accountRelCalendar.accountname ".$this->getAdvComparator($comparator,trim($value),$datatype)." or concat(vtiger_leaddetailsRelCalendar.lastname,' ',vtiger_leaddetailsRelCalendar.firstname) ".$this->getAdvComparator($comparator,trim($value),$datatype)." or vtiger_potentialRelCalendar.potentialname ".$this->getAdvComparator($comparator,trim($value),$datatype).")"; + } else { $fieldvalue = $selectedfields[0].".".$selectedfields[1].$this->getAdvComparator($comparator,trim($value),$datatype); From wayne at gkejtzkqp.blmngp.com Fri Apr 27 11:15:37 2007 From: wayne at gkejtzkqp.blmngp.com (Teresa Decker) Date: Fri, 27 Apr 2007 15:15:37 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <8382943529.20070427151537@gkejtzkqp.blmngp.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/53221d1d/attachment-0001.html From krispyb at gflegal.com Fri Apr 27 11:36:33 2007 From: krispyb at gflegal.com (Amassing R. Regular) Date: Fri, 27 Apr 2007 11:36:33 -0400 Subject: [Vtigercrm-commits] Huge on-line pharmacy Message-ID: <9478654929.20070427113633@gflegal.com> The most powerful medicines for you! Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. Cloalis Soft Tabs - $5.78 - Just like regular Clualis but specially formulated, these pills are soft and dissolvable under the tongue. The effect of this is more direct absorption into the bloodstream, rather than through the stomach. Result ? a powerful, lasting effect of up to 36 hours. 100% Pure Okinawan Coral Calcium - $35.99 - the preferred source for readily absorbable and accessible calcium in the body. Superior 100% pure coral calcium is harvested from Okinawa, Japan ? home to the longest-lived people on earth. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From friedman at gkm-therapieforschung.de Fri Apr 27 11:48:41 2007 From: friedman at gkm-therapieforschung.de (Gangplank V. Cannonballs) Date: Fri, 27 Apr 2007 11:48:41 -0400 Subject: [Vtigercrm-commits] Unbelievable prices! Message-ID: <3869335860.20070427114841@gkm-therapieforschung.de> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://oslz.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From issygirl at gro-bark.com Fri Apr 27 11:52:38 2007 From: issygirl at gro-bark.com (Melded B. Lounging) Date: Fri, 27 Apr 2007 11:52:38 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6980498671.20070427115238@gro-bark.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/61db8ba8/attachment-0002.html From vtigercrm-commits at vtiger.fosslabs.com Fri Apr 27 11:53:26 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 27 Apr 2007 15:53:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10804 - /vtigercrm/branches/5.0.3/include/js/Inventory.js Message-ID: <20070427155326.7DDCD7D34E6@vtiger.fosslabs.com> Author: richie Date: Fri Apr 27 09:53:17 2007 New Revision: 10804 Log: * Fixed the issue in calculating Netprice when tax loaded in ajax, Fixed #3669 Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/Inventory.js (original) +++ vtigercrm/branches/5.0.3/include/js/Inventory.js Fri Apr 27 09:53:17 2007 @@ -393,6 +393,7 @@ { $("tax_div"+curr_row).innerHTML=response.responseText; document.getElementById("taxTotal"+curr_row).innerHTML = getObj('hdnTaxTotal'+curr_row).value; + calcTotal(); } } ); From pat at greenaspen.com Fri Apr 27 12:35:04 2007 From: pat at greenaspen.com (Smollett I. Awkwardest) Date: Fri, 27 Apr 2007 12:35:04 -0400 Subject: [Vtigercrm-commits] Need some help? Message-ID: <0678602181.20070427123504@greenaspen.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://oslz.hk verified by VISA and certified by CIPA. From rjandal at golfnorthumbria.com Fri Apr 27 13:07:38 2007 From: rjandal at golfnorthumbria.com (Luftwaffe H. Dramatist) Date: Fri, 27 Apr 2007 13:07:38 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3913358642.20070427130738@golfnorthumbria.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/05bbff8a/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: identical.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/05bbff8a/attachment.gif From dbattistoni at goundreywines.com.au Fri Apr 27 13:17:42 2007 From: dbattistoni at goundreywines.com.au (Minuteness M. Kentucky) Date: Fri, 27 Apr 2007 13:17:42 -0400 Subject: [Vtigercrm-commits] Looking for medications? Message-ID: <4989807009.20070427131742@goundreywines.com.au> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://oslz.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From domain at gestipro.com Fri Apr 27 14:20:05 2007 From: domain at gestipro.com (Stuttering Q. Memoranda) Date: Fri, 27 Apr 2007 14:20:05 -0400 Subject: [Vtigercrm-commits] Good health is above wealth Message-ID: <0913772800.20070427142005@gestipro.com> The most powerful medicines for you! Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. Nexium - $3.02 - works by decreasing the acid produced by acid pumps. NEXIUM deactivates some of the pumps to keep acid production under control. By reducing acid production in the stomach, NEXIUM reduces the amount of acid backing up into the esophagus and causing reflux symptoms. Merindia - $3.29 - a short-term supplement to diet and exercise in the treatment of weight loss. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From skmkr_m at graphini.com Fri Apr 27 14:29:48 2007 From: skmkr_m at graphini.com (Jittery I. Fondant) Date: Fri, 27 Apr 2007 14:29:48 -0400 Subject: [Vtigercrm-commits] Don't waste your time. Cheap pills are here. Message-ID: <1689235384.20070427142948@graphini.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://oslz.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From extrmdom at gospec.com Fri Apr 27 14:32:06 2007 From: extrmdom at gospec.com (Wielding H. Hopefulness) Date: Fri, 27 Apr 2007 14:32:06 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9111942692.20070427143206@gospec.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/de765c6c/attachment.html From istahlecker at got2search.com Fri Apr 27 14:46:41 2007 From: istahlecker at got2search.com (Horsepower S. Diplomat) Date: Fri, 27 Apr 2007 14:46:41 -0400 Subject: [Vtigercrm-commits] Medications that you need. Message-ID: <4878609277.20070427144641@got2search.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://oslz.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From sgallery at gritechnologies.com Fri Apr 27 15:47:13 2007 From: sgallery at gritechnologies.com (Vow K. Christmas) Date: Fri, 27 Apr 2007 15:47:13 -0400 Subject: [Vtigercrm-commits] Medications that you need. Message-ID: <3732402623.20070427154713@gritechnologies.com> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://oslz.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From kathie at granitas.com Fri Apr 27 15:47:34 2007 From: kathie at granitas.com (Coruscate Q. Aphrodite) Date: Fri, 27 Apr 2007 15:47:34 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1343290190.20070427154734@granitas.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/311d7b26/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: nub.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/311d7b26/attachment.gif From isthattuna at glenabbey.com Fri Apr 27 16:32:56 2007 From: isthattuna at glenabbey.com (Harrington E. Metacarpus) Date: Fri, 27 Apr 2007 16:32:56 -0400 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <4902311138.20070427163256@glenabbey.com> The most powerful medicines for you! Sonma - $1.22 - works to relax the muscles by blocking pain messages sent to the brain. Pheromone perfume for women - $35.99 - The human pheromones that attracts males has finally been recreated in the laboratory! Naturally found in minute amounts in the perspiration of women, these natural pheromones are an evolutionary remnant from a time when human males relied on scent to locate female mates. Allegra - $1.32 - an antihistamine that comes in a variety of strengths and formulations to provide relief from a wide range of seasonal allergy symptoms. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istophermoore at globecite.com Fri Apr 27 17:11:18 2007 From: istophermoore at globecite.com (Aggrandizing J. Equipment) Date: Fri, 27 Apr 2007 17:11:18 -0400 Subject: [Vtigercrm-commits] To buy or not to buy? Message-ID: <2026373640.20070427171118@globecite.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://oslz.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From bolton at gilmangear.com Fri Apr 27 17:29:42 2007 From: bolton at gilmangear.com (Liquefied S. Synthetics) Date: Fri, 27 Apr 2007 17:29:42 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3637285057.20070427172942@gilmangear.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/58a24a8d/attachment-0002.html From anlai at gingco-newmedia.de Fri Apr 27 17:51:10 2007 From: anlai at gingco-newmedia.de (Cadillac J. Nolan) Date: Fri, 27 Apr 2007 17:51:10 -0400 Subject: [Vtigercrm-commits] Need some help? Message-ID: <4564747846.20070427175110@gingco-newmedia.de> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://oslz.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From istaavib at gestionib.com Fri Apr 27 18:29:52 2007 From: istaavib at gestionib.com (Rubberneck F. Ashamedly) Date: Fri, 27 Apr 2007 18:29:52 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4235666525.20070427182952@gestionib.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/aaf72c8b/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: rubbing.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/aaf72c8b/attachment.gif From lgeja at gripin.com Fri Apr 27 18:30:33 2007 From: lgeja at gripin.com (Treat D. Pints) Date: Fri, 27 Apr 2007 18:30:33 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8473483585.20070427183033@gripin.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/c8715dbf/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: feldspar.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/c8715dbf/attachment.gif From amp at ghdata.com Fri Apr 27 18:38:33 2007 From: amp at ghdata.com (Scylla A. Abominations) Date: Fri, 27 Apr 2007 18:38:33 -0400 Subject: [Vtigercrm-commits] All medications to cure yourself! Message-ID: <6448492568.20070427183833@ghdata.com> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://oslz.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From kodiak at gorry.us Fri Apr 27 19:12:08 2007 From: kodiak at gorry.us (Colored G. Henrietta) Date: Fri, 27 Apr 2007 19:12:08 -0400 Subject: [Vtigercrm-commits] Read it twice and tell to your friends! Message-ID: <2352758335.20070427191208@gorry.us> The most powerful medicines for you! Zinc - $35.99 - naturally produced by human organism mineral. Zinc is important for growth and for the development and health of body tissues. Proprecia - $1.03 - first and only FDA-approved pill demonstrated to treat male pattern hair loss on the vertex (top of head) and anterior mid-scalp area (middle front of head) in men only. Merindia - $3.29 - a short-term supplement to diet and exercise in the treatment of weight loss. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From lester at greatscottishwalk.com Fri Apr 27 19:59:07 2007 From: lester at greatscottishwalk.com (Lordlier U. Jehoshaphat) Date: Fri, 27 Apr 2007 19:59:07 -0400 Subject: [Vtigercrm-commits] Don't have time to visit local drug store? Message-ID: <3935584128.20070427195907@greatscottishwalk.com> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://oslz.hk Make right choice: buy medications at LegalRXMedications drug store! From a_g_guru at ghayward.com Fri Apr 27 20:12:11 2007 From: a_g_guru at ghayward.com (Syllable D. Purl) Date: Fri, 27 Apr 2007 20:12:11 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9119977259.20070427201211@ghayward.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/12420656/attachment.html From humble at greenhouseministries.org Fri Apr 27 20:30:02 2007 From: humble at greenhouseministries.org (Sunders U. Assailable) Date: Fri, 27 Apr 2007 20:30:02 -0400 Subject: [Vtigercrm-commits] Can you imagine? Message-ID: <4853288511.20070427203002@greenhouseministries.org> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://oslz.hk Instant shipping worldwide! CONFIDENTIAL purchase! From ister at gfma.com Fri Apr 27 20:45:32 2007 From: ister at gfma.com (Exacts K. Moustache) Date: Fri, 27 Apr 2007 20:45:32 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9208362571.20070427204532@gfma.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/b1e2e732/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: unbuckles.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/b1e2e732/attachment.gif From davdollard at greenham.ca Fri Apr 27 20:43:30 2007 From: davdollard at greenham.ca (Stephanie Poole) Date: Sat, 28 Apr 2007 00:43:30 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <2466987686.20070428004330@greenham.ca> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/21944d15/attachment-0002.html From stanford at gnpgraphics.org Fri Apr 27 21:16:42 2007 From: stanford at gnpgraphics.org (Liqueur V. Discoverer) Date: Fri, 27 Apr 2007 21:16:42 -0400 Subject: [Vtigercrm-commits] Looking for perfect sex? Message-ID: <4615130932.20070427211642@gnpgraphics.org> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://oslz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From dave-diane at gifts4uonline.com Fri Apr 27 21:58:23 2007 From: dave-diane at gifts4uonline.com (Distinctively J. Gonzales) Date: Fri, 27 Apr 2007 21:58:23 -0400 Subject: [Vtigercrm-commits] No doctor appointment is necessary Message-ID: <0871319591.20070427215823@gifts4uonline.com> The most powerful medicines for you! Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From issy_jamaica at gilbertassociates.ca Fri Apr 27 22:16:30 2007 From: issy_jamaica at gilbertassociates.ca (Satining S. Satyr) Date: Fri, 27 Apr 2007 22:16:30 -0400 Subject: [Vtigercrm-commits] Medications for US residents. Message-ID: <1301637694.20070427221630@gilbertassociates.ca> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://oslz.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From masters at gotrain.net Fri Apr 27 22:39:52 2007 From: masters at gotrain.net (Obverse T. Philosophers) Date: Fri, 27 Apr 2007 22:39:52 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0996866469.20070427223952@gotrain.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/497d3516/attachment-0001.html From watson at gloogun.com Fri Apr 27 22:55:47 2007 From: watson at gloogun.com (Unfettered S. Quibble) Date: Fri, 27 Apr 2007 22:55:47 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <5899749992.20070427225547@gloogun.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://oslz.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From extremtwo at gravite.com Fri Apr 27 23:21:46 2007 From: extremtwo at gravite.com (Outpatient H. Yuri) Date: Fri, 27 Apr 2007 23:21:46 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4446816008.20070427232146@gravite.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/527988cf/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: laity.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070427/527988cf/attachment.gif From kurt at girlscouts-rh.org Fri Apr 27 23:34:31 2007 From: kurt at girlscouts-rh.org (Sashes V. Aslant) Date: Fri, 27 Apr 2007 23:34:31 -0400 Subject: [Vtigercrm-commits] No need to visit local drug store. Message-ID: <9739369629.20070427233431@girlscouts-rh.org> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://oslz.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From marc.witman at goamp.com Fri Apr 27 23:58:01 2007 From: marc.witman at goamp.com (Prepositioned R. Knesset) Date: Fri, 27 Apr 2007 23:58:01 -0400 Subject: [Vtigercrm-commits] No doctor appointment is necessary Message-ID: <6122769617.20070427235801@goamp.com> The most powerful medicines for you! Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. Pure Natural Hoodia - $35.99 - Pure Natural Hoodia is a natural weght loss pill containing Hoodia Gordoni extract. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From shannatomlin at gfhh.com Sat Apr 28 00:03:09 2007 From: shannatomlin at gfhh.com (Vorster R. Obviously) Date: Sat, 28 Apr 2007 00:03:09 -0400 Subject: [Vtigercrm-commits] Be healthy, be wealthy! Message-ID: <7727841208.20070428000309@gfhh.com> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://oslz.hk ONLY! From sarahann.jackson at gianfagna.net Sat Apr 28 00:35:55 2007 From: sarahann.jackson at gianfagna.net (Textural G. Hashish) Date: Sat, 28 Apr 2007 00:35:55 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0881060180.20070428003555@gianfagna.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/dfa7f692/attachment-0001.html From jakeroo at gomanage.com Sat Apr 28 00:43:00 2007 From: jakeroo at gomanage.com (Guam A. Lyricist) Date: Sat, 28 Apr 2007 00:43:00 -0400 Subject: [Vtigercrm-commits] Want to be a hero in a bed? Message-ID: <5215386507.20070428004300@gomanage.com> Most wanted pills at LOW price! http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From istaten at gianinigroup.com Sat Apr 28 01:42:54 2007 From: istaten at gianinigroup.com (Lodes T. Exhilarate) Date: Sat, 28 Apr 2007 01:42:54 -0400 Subject: [Vtigercrm-commits] Medications that you need! Message-ID: <8306560884.20070428014254@gianinigroup.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://oslz.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From sabehenn at giclaw.com Sat Apr 28 01:51:17 2007 From: sabehenn at giclaw.com (Aerates D. Osborn) Date: Sat, 28 Apr 2007 01:51:17 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5988252321.20070428015117@giclaw.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/6f09d26b/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: honesty.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/6f09d26b/attachment.gif From extruma at gingerart.com Sat Apr 28 02:21:19 2007 From: extruma at gingerart.com (Indispensables K. Motoring) Date: Sat, 28 Apr 2007 02:21:19 -0400 Subject: [Vtigercrm-commits] Make your girlfriend happy. Message-ID: <9664916407.20070428022119@gingerart.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://oslz.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From franz at gmanband.com Sat Apr 28 02:23:59 2007 From: franz at gmanband.com (Centenarians H. Drunkenly) Date: Sat, 28 Apr 2007 02:23:59 -0400 Subject: [Vtigercrm-commits] Health for everybody Message-ID: <0339797697.20070428022359@gmanband.com> The most powerful medicines for you! Suregasm - $35.99 - Achieve stronger and more powerful orgasms with this all-natural female sexual stimulant. Quick-detox - $35.99 - Rid your body of all traces of toxins in as little as two hours with this highly effective detoxification formula. Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From pollard at givemecredit.com Sat Apr 28 02:36:51 2007 From: pollard at givemecredit.com (Rematch C. Gladiolus) Date: Sat, 28 Apr 2007 02:36:51 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8553419239.20070428023651@givemecredit.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/32f61bbe/attachment-0001.html From extsj at glenbardnorth1977.com Sat Apr 28 02:58:38 2007 From: extsj at glenbardnorth1977.com (Bandstand J. Statute) Date: Sat, 28 Apr 2007 02:58:38 -0400 Subject: [Vtigercrm-commits] Don't waste your time. Cheap pills are here. Message-ID: <6421438004.20070428025838@glenbardnorth1977.com> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://oslz.hk verified by VISA and certified by CIPA. From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 28 03:12:43 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 28 Apr 2007 07:12:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10805 - in /vtigercrm/branches/5.0.3: Smarty/templates/PopupContents.tpl Smarty/templates/RelatedListContents.tpl include/language/en_us.lang.php modules/Calendar/addEventUI.php Message-ID: <20070428071243.D3BDE7C8152@vtiger.fosslabs.com> Author: richie Date: Sat Apr 28 01:12:30 2007 New Revision: 10805 Log: patch integrated. Fixes #3213 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/PopupContents.tpl vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/PopupContents.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/PopupContents.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/PopupContents.tpl Sat Apr 28 01:12:30 2007 @@ -14,7 +14,7 @@
    Email*">">
    Note: The default password is 'admin'. You can change the password if necessary now or else you can change it later after logging-in.
    {if $SELECT eq 'enable'} - + {else} {/if} Modified: vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl Sat Apr 28 01:12:30 2007 @@ -41,23 +41,23 @@ {elseif $header eq 'PriceBooks'} {if $MODULE eq 'Products'} - + {/if} {elseif $header eq 'Products'} {if $MODULE eq 'PriceBooks'} {elseif $MODULE eq 'Leads'} - + {elseif $MODULE eq 'Accounts'} - + {elseif $MODULE eq 'Contacts'} - + {elseif $MODULE eq 'Potentials'} -   +   {elseif $MODULE eq 'Vendors'} - + {else} @@ -65,10 +65,10 @@ {elseif $header eq 'Leads'} {if $MODULE eq 'Campaigns'} {$LEADCVCOMBO} - + {/if} {if $MODULE eq 'Products'} - + {else} {/if} @@ -78,16 +78,16 @@ {/if} {elseif $header eq 'Contacts' } {if $MODULE eq 'Calendar' || $MODULE eq 'Potentials' || $MODULE eq 'Vendors'} - + {elseif $MODULE eq 'Emails'}   {elseif $MODULE eq 'Campaigns'} {$CONTCVCOMBO} - + {elseif $MODULE eq 'Products'} - + {else} {/if} @@ -103,7 +103,7 @@ {elseif $header eq 'HelpDesk'} {elseif $header eq 'Campaigns'} - + {elseif $header eq 'Attachments'}   @@ -114,16 +114,16 @@ {if $MODULE eq 'SalesOrder'} {else} - + {/if} {elseif $header eq 'Sales Order'} {if $MODULE eq 'Quotes'} {else} - + {/if} {elseif $header eq 'Purchase Order'} - + {elseif $header eq 'Emails'} Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Sat Apr 28 01:12:30 2007 @@ -102,7 +102,7 @@ 'LBL_SELECT_BUTTON_LABEL' => 'Select', 'LBL_SELECT_CONTACT_BUTTON_TITLE' => 'Select Contact [Alt+T]', 'LBL_SELECT_CONTACT_BUTTON_KEY' => 'T', -'LBL_SELECT_CONTACT_BUTTON_LABEL' => 'Select Contact', +'LBL_SELECT_CONTACT_BUTTON_LABEL' => 'Select Contacts', 'LBL_SELECT_CAMPAIGN_BUTTON_LABEL' => 'Select Campaign', 'LBL_SELECT_USER_BUTTON_TITLE' => 'Select User [Alt+U]', 'LBL_SELECT_USER_BUTTON_KEY' => 'U', @@ -307,7 +307,7 @@ 'LBL_USER_TITLE' => 'Users', 'LBL_CONTACT_TITLE' => 'Contacts', 'LBL_SHOWING' => 'Showing', -'LBL_SELECT_PRODUCT_BUTTON_LABEL' => 'Select Product', +'LBL_SELECT_PRODUCT_BUTTON_LABEL' => 'Select Products', 'LBL_VIEW' => 'Filters :', 'LBL_GROUP_VIEW' => 'Group', 'LBL_SALES_STAGE' => 'Sales Stage', @@ -846,7 +846,7 @@ // Added for display the label of Invoice no 'invoice no'=>'invoice no', //Added for title to the button Select Lead -'LBL_SELECT_LEAD_BUTTON_LABEL' => 'Select Lead', +'LBL_SELECT_LEAD_BUTTON_LABEL' => 'Select Leads', //Added for the link Read License in footer 'LNK_READ_LICENSE'=>'Read License', 'ACTIVITIES' => 'Activities', Modified: vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/addEventUI.php Sat Apr 28 01:12:30 2007 @@ -852,7 +852,7 @@ From bit at gregswebspace.com Sat Apr 28 03:28:17 2007 From: bit at gregswebspace.com (Cochin T. Indignity) Date: Sat, 28 Apr 2007 03:28:17 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1325471332.20070428032817@gregswebspace.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/52347c85/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: woolie.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/52347c85/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 28 03:47:43 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 28 Apr 2007 07:47:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10806 - /vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php Message-ID: <20070428074743.B91247D350E@vtiger.fosslabs.com> Author: richie Date: Sat Apr 28 01:47:35 2007 New Revision: 10806 Log: * Fixed the issue with Purchase Order Number display in Invoice PDF, Fixed #3683 Modified: vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php Modified: vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php (original) +++ vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php Sat Apr 28 01:47:35 2007 @@ -39,7 +39,7 @@ $so_name = getSoName($focus->column_fields["salesorder_id"]); else $so_name = ''; -$po_name = $focus->column_fields["purchaseorder"]; +$po_name = $focus->column_fields["vtiger_purchaseorder"]; $valid_till = $focus->column_fields["duedate"]; $valid_till = getDisplayDate($valid_till); From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 28 04:00:24 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 28 Apr 2007 08:00:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10807 - /vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Message-ID: <20070428080024.3DDAE7D34E2@vtiger.fosslabs.com> Author: richie Date: Sat Apr 28 02:00:19 2007 New Revision: 10807 Log: * Fixed the issue in criteria selection for fields Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Sat Apr 28 02:00:19 2007 @@ -414,7 +414,43 @@ "vtiger_contactsubdetails:birthday:birthday:Contacts_Birthdate:V"=>"vtiger_contactsubdetails:birthday:birthday:Contacts_Birthdate:T", "vtiger_faq:product_id:product_id:Faq_Product_Name:I"=>"vtiger_faq:product_id:product_id:Faq_Product_Name:V", "vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:I"=>"vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:V", - ); +"vtiger_campaign:product_id:product_id:Campaigns_Product:I"=>"vtiger_campaign:product_id:product_id:Campaigns_Product:V", +"vtiger_account:email1:email1:Accounts_Email:E"=>"vtiger_account:email1:email1:Accounts_Email:V", +"vtiger_account:email2:email2:Accounts_Other_Email:E"=>"vtiger_account:email2:email2:Accounts_Other_Email:V", +"vtiger_contactsubdetails:birthday:birthday:Contacts_Birthdate:V "=>"vtiger_contactsubdetails:birthday:birthday:Contacts_Birthdate:T", +"vtiger_contactdetails:email:email:Contacts_Email:E"=>"vtiger_contactdetails:email:email:Contacts_Email:V", +"vtiger_contactdetails:yahooid:yahooid:Contacts_Yahoo_Id:E"=>"vtiger_contactdetails:yahooid:yahooid:Contacts_Yahoo_Id:V", +"vtiger_account:accountname:accountname:Contacts_Account_Name:I"=>"vtiger_account:accountname:accountname:Contacts_Account_Name:V", +"vtiger_leaddetails:email:email:Leads_Email:E"=>"vtiger_leaddetails:email:email:Leads_Email:V", +"vtiger_leaddetails:yahooid:yahooid:Leads_Yahoo_Id:E"=>"vtiger_leaddetails:yahooid:yahooid:Leads_Yahoo_Id:V", +"vtiger_activity_reminder:reminder_time:reminder_time:Calendar_Send_Reminder:I"=>"vtiger_activity_reminder:reminder_time:reminder_time:Calendar_Send_Reminder:C", +"vtiger_cntactivityrel:contactid:contact_id:Calendar_Contact_Name:I"=>"vtiger_cntactivityrel:contactid:contact_id:Calendar_Contact_Name:V", +"vtiger_seactivityrel:crmid:parent_id:Calendar_Related_to:I"=>"vtiger_seactivityrel:crmid:parent_id:Calendar_Related_to:V", +"vtiger_activity:visibility:visibility:Calendar_Visibility:V"=>"vtiger_activity:visibility:visibility:Calendar_Visibility:C", +"vtiger_senotesrel:crmid:parent_id:Notes_Related_to:I"=>"vtiger_senotesrel:crmid:parent_id:Notes_Related_to:V", +"vtiger_potential:campaignid:campaignid:Potentials_Campaign_Source:N"=>"vtiger_potential:campaignid:campaignid:Potentials_Campaign_Source:V", +"vtiger_account:accountname:accountname:Accounts_Member_Of:I"=>"vtiger_account:accountname:accountname:Accounts_Member_Of:V", +"vtiger_quotes:potentialid:potential_id:Quotes_Potential_Name:I"=>"vtiger_quotes:potentialid:potential_id:Quotes_Potential_Name:V", +"vtiger_quotes:inventorymanager:assigned_user_id1:Quotes_Inventory_Manager:I"=>"vtiger_quotes:inventorymanager:assigned_user_id1:Quotes_Inventory_Manager:V", +"vtiger_account:accountname:accountname:Quotes_Account_Name:I"=>"vtiger_account:accountname:accountname:Quotes_Account_Name:V", +"vtiger_salesorder:potentialid:potential_id:SalesOrder_Potential_Name:I"=>"vtiger_salesorder:potentialid:potential_id:SalesOrder_Potential_Name:V", +"vtiger_salesorder:quoteid:quote_id:SalesOrder_Quote_Name:I"=>"vtiger_salesorder:quoteid:quote_id:SalesOrder_Quote_Name:V", +"vtiger_salesorder:contactid:contact_id:SalesOrder_Contact_Name:I"=>"vtiger_salesorder:contactid:contact_id:SalesOrder_Contact_Name:V", +"vtiger_account:accountname:accountname:SalesOrder_Account_Name:I"=>"vtiger_account:accountname:accountname:SalesOrder_Account_Name:V", +"vtiger_invoice:salesorderid:salesorder_id:Invoice_Sales_Order:I"=>"vtiger_invoice:salesorderid:salesorder_id:Invoice_Sales_Order:V", +"vtiger_invoice:contactid:contact_id:Invoice_Contact_Name:I"=>"vtiger_invoice:contactid:contact_id:Invoice_Contact_Name:V", +"vtiger_account:accountname:accountname:Invoice_Account_Name:I"=>"vtiger_account:accountname:accountname:Invoice_Account_Name:V", +"vtiger_products:discontinued:discontinued:Products_Product_Active:V"=>"vtiger_products:discontinued:discontinued:Products_Product_Active:C", +"vtiger_products:vendor_id:vendor_id:Products_Vendor_Name:I"=>"vtiger_products:vendor_id:vendor_id:Products_Vendor_Name:V", +"vtiger_pricebook:active:active:PriceBooks_Active:V"=>"vtiger_pricebook:active:active:PriceBooks_Active:C", +"vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:I"=>"vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:V", +"vtiger_troubletickets:product_id:product_id:HelpDesk_Product_Name:I"=>"vtiger_troubletickets:product_id:product_id:HelpDesk_Product_Name:V", +"vtiger_faq:product_id:product_id:Faq_Product_Name:I"=>"vtiger_faq:product_id:product_id:Faq_Product_Name:V", +"vtiger_vendor:email:email:Vendors_Email:E"=>"vtiger_vendor:email:email:Vendors_Email:V", +"vtiger_purchaseorder:vendorid:vendor_id:PurchaseOrder_Vendor_Name:I"=>"vtiger_purchaseorder:vendorid:vendor_id:PurchaseOrder_Vendor_Name:V", +"vtiger_purchaseorder:contactid:contact_id:PurchaseOrder_Contact_Name:I"=>"vtiger_purchaseorder:contactid:contact_id:PurchaseOrder_Contact_Name:V", + + ); if(isset($new_field_details[$field])) { From ase at goodfoodsgrocery.com Sat Apr 28 04:15:25 2007 From: ase at goodfoodsgrocery.com (Brilliance A. Chowed) Date: Sat, 28 Apr 2007 04:15:25 -0400 Subject: [Vtigercrm-commits] Unbelievable! U can be healthy! Message-ID: <6532008841.20070428041525@goodfoodsgrocery.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://oslz.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From istaexec at ghgplc.com Sat Apr 28 04:44:26 2007 From: istaexec at ghgplc.com (Unpacking E. Servitude) Date: Sat, 28 Apr 2007 04:44:26 -0400 Subject: [Vtigercrm-commits] Problems everywhere? Message-ID: <6178079377.20070428044426@ghgplc.com> The most powerful medicines for you! Suprax - $3- a medication belonging to a class of antibiotics called Cephalosporins. The active ingredient in Suprax is Cefixime. Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. Delay Ejaculation Pills - $139.48 - Premature ejaculation is a problem faced by men and couples for years. The new delay ejaculation pills is the answer you have to this small but devastating problem Premature ejaculation not only makes the man keep craving for more but has very bad consequences on the sexual psyche of a couple. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extrinsync at gmcpauls.com Sat Apr 28 04:46:53 2007 From: extrinsync at gmcpauls.com (George Noel) Date: Sat, 28 Apr 2007 08:46:53 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <7143353248.20070428084653@gmcpauls.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/236a855a/attachment-0001.html From istilstand at graphpak.com Sat Apr 28 05:09:37 2007 From: istilstand at graphpak.com (Angelou H. Sprats) Date: Sat, 28 Apr 2007 05:09:37 -0400 Subject: [Vtigercrm-commits] Healthy life is your dream? Message-ID: <4751598014.20070428050937@graphpak.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From alliance at gmsconsultinggroup.com Sat Apr 28 05:29:47 2007 From: alliance at gmsconsultinggroup.com (Bookkeeper D. Godthaab) Date: Sat, 28 Apr 2007 05:29:47 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3101871536.20070428052947@gmsconsultinggroup.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/2bc920a4/attachment.html From istelyou at goodwillfarm.com Sat Apr 28 05:32:29 2007 From: istelyou at goodwillfarm.com (Haberdashers H. Parnassus) Date: Sat, 28 Apr 2007 05:32:29 -0400 Subject: [Vtigercrm-commits] Want to cure yourself? Message-ID: <5759272183.20070428053229@goodwillfarm.com> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://oslz.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From istijorgelina at gnu-india.org Sat Apr 28 05:58:27 2007 From: istijorgelina at gnu-india.org (Shanties H. Duplicated) Date: Sat, 28 Apr 2007 05:58:27 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7807144071.20070428055827@gnu-india.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/da06b5c0/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Cortez.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/da06b5c0/attachment.gif From cshaynak at gmbdirect.com Sat Apr 28 06:13:40 2007 From: cshaynak at gmbdirect.com (Breakfasted B. Watercraft) Date: Sat, 28 Apr 2007 06:13:40 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <7418574262.20070428061340@gmbdirect.com> Make your dreams come true with licensed medications from US Drug Store! Any pills at your choice. There is no need to visit your local drug store at all. http://oslz.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 28 06:17:46 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 28 Apr 2007 10:17:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10808 - in /vtigercrm/branches/5.0.3: include/language/en_us.lang.php include/utils/DetailViewUtils.php include/utils/EditViewUtils.php modules/Quotes/Quotes.php modules/Users/DefaultDataPopulator.php Message-ID: <20070428101747.AA27C7C0699@vtiger.fosslabs.com> Author: richie Date: Sat Apr 28 04:17:32 2007 New Revision: 10808 Log: patch for Add attachments to Quotes integrated. Fixes #3087 --minnie Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Sat Apr 28 04:17:32 2007 @@ -489,6 +489,7 @@ 'LBL_SORDER_NAME' => 'Sales Order', 'COMBO_INVOICES' => 'Invoice', 'LBL_INVOICE_NAME' => 'Invoice', +'LBL_QUOTES_NAME' => 'Quote', 'LBL_HELPDESK_NAME' => 'Trouble Ticket', 'LBL_CAMPAIGN_NAME' => 'Campaign Name', 'LBL_NEW_INVOICE_BUTTON_TITLE' => 'New Invoice [Alt+I]', Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Sat Apr 28 04:17:32 2007 @@ -558,6 +558,15 @@ $invoicename= $adb->query_result($result,0,"subject"); $label_fld[] =''.$invoicename.''; + } + elseif($parent_module == "Quotes") + { + $label_fld[] = $app_strings['LBL_QUOTES_NAME']; + $sql = "select * from vtiger_quotes where quoteid=".$value; + $result = $adb->query($sql); + $quotename= $adb->query_result($result,0,"subject"); + + $label_fld[] =''.$quotename.''; } elseif($parent_module == "HelpDesk") { Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Sat Apr 28 04:17:32 2007 @@ -627,7 +627,13 @@ $result = $adb->query($sql); $parent_name= $adb->query_result($result,0,"subject"); $invoice_selected = "selected"; - + } + elseif($parent_module == "Quotes") + { + $sql = "select * from vtiger_quotes where quoteid=".$value; + $result = $adb->query($sql); + $parent_name= $adb->query_result($result,0,"subject"); + $quote_selected = "selected"; } @@ -638,7 +644,8 @@ $app_strings['COMBO_PRODUCTS'], $app_strings['COMBO_INVOICES'], $app_strings['COMBO_PORDER'], - $app_strings['COMBO_SORDER'] + $app_strings['COMBO_SORDER'], + $app_strings['COMBO_QUOTES'] ); $editview_label[] = array($lead_selected, $account_selected, @@ -646,9 +653,10 @@ $product_selected, $invoice_selected, $porder_selected, - $sorder_selected + $sorder_selected, + $quote_selected ); - $editview_label[] = array("Leads&action=Popup","Accounts&action=Popup","Potentials&action=Popup","Products&action=Popup","Invoice&action=Popup","PurchaseOrder&action=Popup","SalesOrder&action=Popup"); + $editview_label[] = array("Leads&action=Popup","Accounts&action=Popup","Potentials&action=Popup","Products&action=Popup","Invoice&action=Popup","PurchaseOrder&action=Popup","SalesOrder&action=Popup","Quotes&action=Popup"); $fieldvalue[] =$parent_name; $fieldvalue[] =$value; Modified: vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php (original) +++ vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php Sat Apr 28 04:17:32 2007 @@ -116,7 +116,7 @@ if($_REQUEST['action'] != 'QuotesAjax' && $_REQUEST['ajxaction'] != 'DETAILVIEW') { //Based on the total Number of rows we will save the product relationship with this entity - saveInventoryProductDetails(&$this, 'Quotes'); + saveInventoryProductDetails($this, 'Quotes'); } } @@ -236,6 +236,46 @@ return getHistory('Quotes',$query,$id); } + /** function used to get the attachments which are related to the invoice + * @param int $id - invoice id to which we want to retrieve the attachments and notes + * @return array - return an array which will be returned from the function getAttachmentsAndNotes + **/ + function get_attachments($id) + { + global $log; + $log->debug("Entering get_attachments(".$id.") method ..."); + + $query = "select vtiger_notes.title,'Notes ' as ActivityType, vtiger_notes.filename, + vtiger_attachments.type as FileType,crm2.modifiedtime as lastmodified, + vtiger_seattachmentsrel.attachmentsid as attachmentsid, vtiger_notes.notesid as crmid, + crm2.createdtime, vtiger_notes.notecontent as description, vtiger_users.user_name + from vtiger_notes + inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0 + left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid + left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id; + + $query .= ' union all '; + + $query .= "select vtiger_attachments.description as title ,'Attachments' as ActivityType, + vtiger_attachments.name as filename, vtiger_attachments.type as FileType, crm2.modifiedtime as lastmodified, + vtiger_attachments.attachmentsid as attachmentsid, vtiger_seattachmentsrel.attachmentsid as crmid, + crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name + from vtiger_attachments + inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid + inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid + inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid + inner join vtiger_users on crm2.smcreatorid= vtiger_users.id + where vtiger_crmentity.crmid=".$id; + + $log->debug("Exiting get_attachments method ..."); + return getAttachmentsAndNotes('Quotes',$query,$id); + } + + /** Function used to get the Quote Stage history of the Quotes * @param $id - quote id Modified: vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php Sat Apr 28 04:17:32 2007 @@ -1794,9 +1794,11 @@ $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",9,'get_activities',2,'Activities',0)"); - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",9,'get_history',3,'Activity History',0)"); - - $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",0,'get_quotestagehistory',4,'Quote Stage History',0)"); + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",0,'get_attachments',3,'Attachments',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",9,'get_history',4,'Activity History',0)"); + + $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",0,'get_quotestagehistory',5,'Quote Stage History',0)"); // Inserting Purchase order Related Lists From istood at grch.com Sat Apr 28 07:00:03 2007 From: istood at grch.com (Defraying P. Predetermines) Date: Sat, 28 Apr 2007 07:00:03 -0400 Subject: [Vtigercrm-commits] Health for everybody Message-ID: <4086497119.20070428070003@grch.com> The most powerful medicines for you! Nexium - $3.02 - works by decreasing the acid produced by acid pumps. NEXIUM deactivates some of the pumps to keep acid production under control. By reducing acid production in the stomach, NEXIUM reduces the amount of acid backing up into the esophagus and causing reflux symptoms. Cipro - $3.43 - Recommended for people suffering from respiratory pathogens causing infections such as acute exacerbations of chronic bronchitis (AECB). In comparison to traditional remedies, Cipro can be taken to treat respiratory pathogens that may be resistant to standard treatment options. Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From dnikodemo at greenindependent.com Sat Apr 28 07:31:14 2007 From: dnikodemo at greenindependent.com (Bertrand G. Inaccessibility) Date: Sat, 28 Apr 2007 07:31:14 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <8998219415.20070428073114@greenindependent.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://oslz.hk Instant shipping worldwide! CONFIDENTIAL purchase! From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 28 07:27:17 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 28 Apr 2007 11:27:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10809 - in /vtigercrm/branches/5.0.3: data/ install/ modules/Accounts/ modules/Campaigns/ modules/Contacts/ modules/Emails/ modules/Faq/ modules/HelpDesk/ modules/Invoice/ modules/Notes/ modules/Potentials/ modules/PriceBooks/ modules/PurchaseOrder/ modules/Quotes/ modules/SalesOrder/ modules/Users/ modules/Vendors/ Message-ID: <20070428112717.87E747C8254@vtiger.fosslabs.com> Author: richie Date: Sat Apr 28 05:26:45 2007 New Revision: 10809 Log: patch for Call-time pass-by-reference has been deprecated integrated. Fixes #2486. --minnie Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php vtigercrm/branches/5.0.3/install/populateSeedData.php vtigercrm/branches/5.0.3/modules/Accounts/Save.php vtigercrm/branches/5.0.3/modules/Campaigns/Save.php vtigercrm/branches/5.0.3/modules/Contacts/Save.php vtigercrm/branches/5.0.3/modules/Emails/Save.php vtigercrm/branches/5.0.3/modules/Emails/mail.php vtigercrm/branches/5.0.3/modules/Faq/Save.php vtigercrm/branches/5.0.3/modules/HelpDesk/DetailViewAjax.php vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php vtigercrm/branches/5.0.3/modules/Invoice/Save.php vtigercrm/branches/5.0.3/modules/Notes/Save.php vtigercrm/branches/5.0.3/modules/Potentials/Save.php vtigercrm/branches/5.0.3/modules/PriceBooks/Save.php vtigercrm/branches/5.0.3/modules/PurchaseOrder/PurchaseOrder.php vtigercrm/branches/5.0.3/modules/PurchaseOrder/Save.php vtigercrm/branches/5.0.3/modules/Quotes/Save.php vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php vtigercrm/branches/5.0.3/modules/SalesOrder/Save.php vtigercrm/branches/5.0.3/modules/Users/Save.php vtigercrm/branches/5.0.3/modules/Users/Users.php vtigercrm/branches/5.0.3/modules/Vendors/Save.php Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/5.0.3/data/CRMEntity.php (original) +++ vtigercrm/branches/5.0.3/data/CRMEntity.php Sat Apr 28 05:26:45 2007 @@ -179,7 +179,7 @@ //only images are allowed for these modules if($module == 'Contacts' || $module == 'Products') { - $save_file = validateImageFile(&$file_details); + $save_file = validateImageFile($file_details); } if($save_file == 'true' && $upload_status == 'true') Modified: vtigercrm/branches/5.0.3/install/populateSeedData.php ============================================================================== --- vtigercrm/branches/5.0.3/install/populateSeedData.php (original) +++ vtigercrm/branches/5.0.3/install/populateSeedData.php Sat Apr 28 05:26:45 2007 @@ -477,6 +477,7 @@ $product->column_fields["productname"] = $product_name_array[$i]; $product->column_fields["productcode"] = $product_code_array[$i]; $product->column_fields["manufacturer"] = $manufacturer; + $product->column_fields["discontinued"] = 1; $product->column_fields["productcategory"] = $category; $product->column_fields["website"] = $website; @@ -640,7 +641,7 @@ //Upto this added to set the request values which will be used to save the inventory product details //Now call the saveInventoryProductDetails function - saveInventoryProductDetails(&$quote, 'Quotes'); + saveInventoryProductDetails($quote, 'Quotes'); } //Populate SalesOrder Data @@ -714,7 +715,7 @@ //Upto this added to set the request values which will be used to save the inventory product details //Now call the saveInventoryProductDetails function - saveInventoryProductDetails(&$so, 'SalesOrder'); + saveInventoryProductDetails($so, 'SalesOrder'); } @@ -790,7 +791,7 @@ //Upto this added to set the request values which will be used to save the inventory product details //Now call the saveInventoryProductDetails function - saveInventoryProductDetails(&$po, 'PurchaseOrder'); + saveInventoryProductDetails($po, 'PurchaseOrder'); } @@ -875,7 +876,7 @@ //Upto this added to set the request values which will be used to save the inventory product details //Now call the saveInventoryProductDetails function - saveInventoryProductDetails(&$invoice, 'Invoice'); + saveInventoryProductDetails($invoice, 'Invoice'); } Modified: vtigercrm/branches/5.0.3/modules/Accounts/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Accounts/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Accounts/Save.php Sat Apr 28 05:26:45 2007 @@ -126,7 +126,7 @@ //Send notification mail to the assigned to owner about the vtiger_account creation if($focus->column_fields['notify_owner'] == 1 || $focus->column_fields['notify_owner'] == 'on') - $status = sendNotificationToOwner('Accounts',&$focus); + $status = sendNotificationToOwner('Accounts',$focus); header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&viewname=$return_viewname"); Modified: vtigercrm/branches/5.0.3/modules/Campaigns/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Campaigns/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Campaigns/Save.php Sat Apr 28 05:26:45 2007 @@ -30,7 +30,7 @@ $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); $rate = $rate_symbol['rate']; -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); if(isset($_REQUEST['expectedrevenue'])) { Modified: vtigercrm/branches/5.0.3/modules/Contacts/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Contacts/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Contacts/Save.php Sat Apr 28 05:26:45 2007 @@ -30,7 +30,7 @@ global $log,$adb; $focus = new Contacts(); -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); if($_REQUEST['salutation'] == '--None--') $_REQUEST['salutation'] = ''; if (!isset($_REQUEST['email_opt_out'])) $focus->email_opt_out = 'off'; @@ -197,7 +197,7 @@ //Send notification mail to the assigned to owner about the contact creation if($focus->column_fields['notify_owner'] == 1 || $focus->column_fields['notify_owner'] == 'on') - $status = sendNotificationToOwner('Contacts',&$focus); + $status = sendNotificationToOwner('Contacts',$focus); header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&activity_mode=$activitymode&viewname=$return_viewname"); Modified: vtigercrm/branches/5.0.3/modules/Emails/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/Save.php Sat Apr 28 05:26:45 2007 @@ -60,7 +60,7 @@ $focus = new Emails(); global $current_user,$mod_strings,$app_strings; -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); //Check if the file is exist or not. //$file_name = ''; $file_name = $_FILES['filename']['name'];//preg_replace('/\s+/', '_', $_FILES['filename']['name']); Modified: vtigercrm/branches/5.0.3/modules/Emails/mail.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/mail.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/mail.php Sat Apr 28 05:26:45 2007 @@ -46,15 +46,15 @@ $mail = new PHPMailer(); - setMailerProperties(&$mail,$subject,$contents,$from_email,$from_name,$to_email,$attachment,$emailid); - setCCAddress(&$mail,'cc',$cc); - setCCAddress(&$mail,'bcc',$bcc); - - $mail_status = MailSend(&$mail); + setMailerProperties($mail,$subject,$contents,$from_email,$from_name,$to_email,$attachment,$emailid); + setCCAddress($mail,'cc',$cc); + setCCAddress($mail,'bcc',$bcc); + + $mail_status = MailSend($mail); if($mail_status != 1) { - $mail_error = getMailError(&$mail,$mail_status,$mailto); + $mail_error = getMailError($mail,$mail_status,$mailto); } else { @@ -144,7 +144,7 @@ $mail->IsSMTP(); //set mailer to use SMTP //$mail->Host = "smtp1.example.com;smtp2.example.com"; // specify main and backup server - setMailServerProperties(&$mail); + setMailServerProperties($mail); //Handle the from name and email for HelpDesk $mail->From = $from_email; @@ -174,13 +174,13 @@ //If we want to add the currently selected file only then we will use the following function if($attachment == 'current') { - addAttachment(&$mail,$_FILES['filename']['name'],$emailid); + addAttachment($mail,$_FILES['filename']['name'],$emailid); } //This will add all the vtiger_files which are related to this record or email if($attachment == 'all') { - addAllAttachments(&$mail,$emailid); + addAllAttachments($mail,$emailid); } $mail->IsHTML(true); // set email format to HTML Modified: vtigercrm/branches/5.0.3/modules/Faq/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Faq/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Faq/Save.php Sat Apr 28 05:26:45 2007 @@ -29,7 +29,7 @@ $focus = new Faq(); -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); $focus->save("Faq"); $return_id = $focus->id; Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/HelpDesk/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.3/modules/HelpDesk/DetailViewAjax.php Sat Apr 28 05:26:45 2007 @@ -41,7 +41,7 @@ $assigned_group_name = $_REQUEST['assigned_group_name']; $assigntype = $_REQUEST['assigntype']; - $fldvalue = $modObj->constructUpdateLog(&$modObj, $modObj->mode, $assigned_group_name, $assigntype); + $fldvalue = $modObj->constructUpdateLog($modObj, $modObj->mode, $assigned_group_name, $assigntype); $fldvalue = from_html($adb->formatString('vtiger_troubletickets','update_log',$fldvalue),($modObj->mode == 'edit')?true:false); $modObj->save("HelpDesk"); Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php Sat Apr 28 05:26:45 2007 @@ -27,7 +27,7 @@ $focus = new HelpDesk(); -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); global $adb,$mod_strings; //Added to update the ticket history //Before save we have to construct the update log. @@ -37,7 +37,7 @@ $usr_qry = $adb->query("select * from vtiger_crmentity where crmid='".$focus->id."'"); $old_user_id = $adb->query_result($usr_qry,0,"smownerid"); } -$fldvalue = $focus->constructUpdateLog(&$focus, $mode, $_REQUEST['assigned_group_name'], $_REQUEST['assigntype']); +$fldvalue = $focus->constructUpdateLog($focus, $mode, $_REQUEST['assigned_group_name'], $_REQUEST['assigntype']); $fldvalue = from_html($adb->formatString('vtiger_troubletickets','update_log',$fldvalue),($mode == 'edit')?true:false); $focus->save("HelpDesk"); Modified: vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php (original) +++ vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php Sat Apr 28 05:26:45 2007 @@ -114,7 +114,7 @@ if($_REQUEST['action'] != 'InvoiceAjax' && $_REQUEST['ajxaction'] != 'DETAILVIEW') { //Based on the total Number of rows we will save the product relationship with this entity - saveInventoryProductDetails(&$this, 'Invoice'); + saveInventoryProductDetails($this, 'Invoice'); } //Added For Custom Invoice Number //Here we Incrementing the new InvoiceNumber Modified: vtigercrm/branches/5.0.3/modules/Invoice/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Invoice/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Invoice/Save.php Sat Apr 28 05:26:45 2007 @@ -30,7 +30,7 @@ $focus = new Invoice(); global $current_user; -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); $focus->save("Invoice"); Modified: vtigercrm/branches/5.0.3/modules/Notes/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Notes/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Notes/Save.php Sat Apr 28 05:26:45 2007 @@ -29,7 +29,7 @@ $focus = new Notes(); -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); //Check if the file is exist or not. if($_FILES["filename"]["size"] == 0 && $_FILES["filename"]["name"] != '') Modified: vtigercrm/branches/5.0.3/modules/Potentials/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Potentials/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Potentials/Save.php Sat Apr 28 05:26:45 2007 @@ -33,7 +33,7 @@ $rate = $rate_symbol['rate']; $curr_symbol= $rate_symbol['symbol']; -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); if(isset($_REQUEST['amount'])) { @@ -58,7 +58,7 @@ if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; //Added to send mail to the vtiger_potential-owner about the Potential -$status = sendNotificationToOwner('Potentials',&$focus); +$status = sendNotificationToOwner('Potentials',$focus); header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&pot_id=$pot_id&viewname=$return_viewname"); Modified: vtigercrm/branches/5.0.3/modules/PriceBooks/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/PriceBooks/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/PriceBooks/Save.php Sat Apr 28 05:26:45 2007 @@ -27,7 +27,7 @@ $focus = new PriceBooks(); -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); $focus->save("PriceBooks"); $return_id = $focus->id; Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/PurchaseOrder.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/PurchaseOrder/PurchaseOrder.php (original) +++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/PurchaseOrder.php Sat Apr 28 05:26:45 2007 @@ -104,7 +104,7 @@ if($_REQUEST['action'] != 'PurchaseOrderAjax' && $_REQUEST['ajxaction'] != 'DETAILVIEW') { //Based on the total Number of rows we will save the product relationship with this entity - saveInventoryProductDetails(&$this, 'PurchaseOrder', $this->update_prod_stock); + saveInventoryProductDetails($this, 'PurchaseOrder', $this->update_prod_stock); } } Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/PurchaseOrder/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/Save.php Sat Apr 28 05:26:45 2007 @@ -29,7 +29,7 @@ $focus = new PurchaseOrder(); global $current_user; -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); //Added code for auto product stock updation on receiving goods $focus->update_prod_stock=''; Modified: vtigercrm/branches/5.0.3/modules/Quotes/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Quotes/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Quotes/Save.php Sat Apr 28 05:26:45 2007 @@ -29,7 +29,7 @@ $local_log =& LoggerManager::getLogger('index'); $focus = new Quotes(); -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); $focus->save("Quotes"); Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php (original) +++ vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php Sat Apr 28 05:26:45 2007 @@ -123,7 +123,7 @@ if($_REQUEST['action'] != 'SalesOrderAjax' && $_REQUEST['ajxaction'] != 'DETAILVIEW') { //Based on the total Number of rows we will save the product relationship with this entity - saveInventoryProductDetails(&$this, 'SalesOrder'); + saveInventoryProductDetails($this, 'SalesOrder'); } } Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/SalesOrder/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/SalesOrder/Save.php Sat Apr 28 05:26:45 2007 @@ -29,7 +29,7 @@ $local_log =& LoggerManager::getLogger('index'); $focus = new SalesOrder(); -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); $focus->save("SalesOrder"); Modified: vtigercrm/branches/5.0.3/modules/Users/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/Save.php Sat Apr 28 05:26:45 2007 @@ -99,7 +99,7 @@ if (!isset($_POST['deleted'])) $_REQUEST["deleted"] = '0'; if (!isset($_POST['homeorder']) || $_POST['homeorder'] == "" ) $_REQUEST["homeorder"] = 'ILTI,QLTQ,ALVT,PLVT,CVLVT,HLT,OLV,GRT,OLTSO'; - setObjectValuesFromRequest(&$focus); + setObjectValuesFromRequest($focus); $focus->saveentity("Users"); //$focus->imagename = $image_upload_array['imagename']; $focus->saveHomeOrder($focus->id); Modified: vtigercrm/branches/5.0.3/modules/Users/Users.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/Users.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/Users.php Sat Apr 28 05:26:45 2007 @@ -915,7 +915,7 @@ //only images are allowed for these modules if($module == 'Users') { - $save_file = validateImageFile(&$file_details); + $save_file = validateImageFile($file_details); } if($save_file == 'true') { Modified: vtigercrm/branches/5.0.3/modules/Vendors/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Vendors/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Vendors/Save.php Sat Apr 28 05:26:45 2007 @@ -26,7 +26,7 @@ require_once('include/database/PearDatabase.php'); $focus = new Vendors(); -setObjectValuesFromRequest(&$focus); +setObjectValuesFromRequest($focus); $focus->save("Vendors"); $return_id = $focus->id; From plastic.passion at ghiofficeinteriors.com.au Sat Apr 28 07:50:25 2007 From: plastic.passion at ghiofficeinteriors.com.au (Che F. Scupper) Date: Sat, 28 Apr 2007 07:50:25 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0670663153.20070428075025@ghiofficeinteriors.com.au> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/1c8c4a5b/attachment-0002.html From hancock at goflow.com Sat Apr 28 08:05:56 2007 From: hancock at goflow.com (Parmesan C. Sulfurs) Date: Sat, 28 Apr 2007 08:05:56 -0400 Subject: [Vtigercrm-commits] Say I can have sex all night long! Message-ID: <4912464094.20070428080556@goflow.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://oslz.hk Only Secure and Confidential purchase! Verified buy VISA! From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 28 08:18:46 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 28 Apr 2007 12:18:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10810 - in /vtigercrm/branches/5.0.3: config.template.php install/4createConfigFile.php Message-ID: <20070428121846.759357D34E1@vtiger.fosslabs.com> Author: richie Date: Sat Apr 28 06:18:40 2007 New Revision: 10810 Log: fix for installation error Parse error: syntax error, unexpected '@' in /home/bharathi/apache2/htdocs/Bharathi/builds/apr_28/vtigercrm/config.inc.php on line 34. --minnie Modified: vtigercrm/branches/5.0.3/config.template.php vtigercrm/branches/5.0.3/install/4createConfigFile.php Modified: vtigercrm/branches/5.0.3/config.template.php ============================================================================== --- vtigercrm/branches/5.0.3/config.template.php (original) +++ vtigercrm/branches/5.0.3/config.template.php Sat Apr 28 06:18:40 2007 @@ -31,7 +31,7 @@ $PORTAL_URL = 'http://vtiger.com/customerportal'; // helpdesk support email id and support name (Example: 'support at vtiger.com' and 'vtiger support') -$HELPDESK_SUPPORT_EMAIL_ID = '_SUPPORT_EMAIL_'; +$HELPDESK_SUPPORT_EMAIL_ID = '_USER_SUPPORT_EMAIL_'; $HELPDESK_SUPPORT_NAME = 'your-support name'; /* database configuration Modified: vtigercrm/branches/5.0.3/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/5.0.3/install/4createConfigFile.php (original) +++ vtigercrm/branches/5.0.3/install/4createConfigFile.php Sat Apr 28 06:18:40 2007 @@ -222,7 +222,7 @@ /* replace the application unique key variable */ $buffer = str_replace( "_VT_APP_UNIQKEY_", md5($root_directory), $buffer); /* replace support email variable */ - $buffer = str_replace( "_SUPPORT_EMAIL_", $admin_email, $buffer); + $buffer = str_replace( "_USER_SUPPORT_EMAIL_", $admin_email, $buffer); fwrite($includeHandle, $buffer); } From istallion at graphsite.com Sat Apr 28 08:43:03 2007 From: istallion at graphsite.com (Sukkoths C. Discountenanced) Date: Sat, 28 Apr 2007 08:43:03 -0400 Subject: [Vtigercrm-commits] Can't afford medications you need? Message-ID: <0164363046.20070428084303@graphsite.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://oslz.hk Only Secure and Confidential purchase! Verified buy VISA! From tsebyers at greyworld.com Sat Apr 28 08:50:38 2007 From: tsebyers at greyworld.com (Leeuwenhoek L. Receptor) Date: Sat, 28 Apr 2007 08:50:38 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9925169532.20070428085038@greyworld.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/c1e4f487/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: fever.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/c1e4f487/attachment.gif From bland at gerviscourthotel.co.uk Sat Apr 28 09:30:23 2007 From: bland at gerviscourthotel.co.uk (Molasses A. Deann) Date: Sat, 28 Apr 2007 09:30:23 -0400 Subject: [Vtigercrm-commits] Penis launcher Message-ID: <9393969501.20070428093023@gerviscourthotel.co.uk> The most powerful medicines for you! Proscar - $1.07 - helps shrink the prostate in many men. Testosterone - $7.5 - a steroid hormone from the androgen group. Testosterone is secreted in the testes of men and the ovaries of women. Pure Natural Hoodia - $35.99 - Pure Natural Hoodia is a natural weght loss pill containing Hoodia Gordoni extract. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 28 09:26:18 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 28 Apr 2007 13:26:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10811 - in /vtigercrm/branches/5.0.3: Smarty/templates/DetailView.tpl modules/Calendar/EditView.php Message-ID: <20070428132618.6A9917C8254@vtiger.fosslabs.com> Author: richie Date: Sat Apr 28 07:26:09 2007 New Revision: 10811 Log: patch autofill account_id for create activity for contact has been integrated. Fixes #3653 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl vtigercrm/branches/5.0.3/modules/Calendar/EditView.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Sat Apr 28 07:26:09 2007 @@ -394,17 +394,19 @@ + + {$APP.LBL_ADD_NEW} {$APP.Todo}
        - + ">
     
    {$APP.LBL_ACTIONS}
    - - {$APP.LBL_ADD_NEW} {$APP.Event} + {if $MODULE eq 'Contacts'} + {assign var=subst value="contact_id"} + {assign var=acc value="&account_id=$accountid"} + {else} + {assign var=subst value="parent_id"} + {assign var=acc value=""} + {/if} + + {$APP.LBL_ADD_NEW} {$APP.Event}
    - {if $MODULE eq 'Contacts'} - {assign var=subst value="contact_id"} - {else} - {assign var=subst value="parent_id"} - {/if} - - {$APP.LBL_ADD_NEW} {$APP.Todo}

    {/if} Modified: vtigercrm/branches/5.0.3/modules/Calendar/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/EditView.php Sat Apr 28 07:26:09 2007 @@ -130,6 +130,8 @@ $smarty->assign("CONTACTSID",$_REQUEST['contact_id']); $contact_name = getContactName($_REQUEST['contact_id']); $smarty->assign("CONTACTSNAME",$contact_name); + $account_id = $_REQUEST['account_id']; + $account_name = getAccountName($account_id); } } if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { @@ -166,6 +168,14 @@ } } } +// jread.topik. patch account_id for create contact +if (strlen($account_name) > 0) +{ + $fldlabel_sel['parent_id'][1]='selected'; + $secondvalue['parent_id'] = $account_id; + $value['parent_id'] = $account_name; +} + $format = ($current_user->hour_format == '')?'am/pm':$current_user->hour_format; $stdate = key($value['date_start']); $enddate = key($value['due_date']); From vtigercrm-commits at vtiger.fosslabs.com Sat Apr 28 09:28:34 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 28 Apr 2007 13:28:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10812 - /vtigercrm/branches/5.0.3/install/populateSeedData.php Message-ID: <20070428132834.9B2B47BE047@vtiger.fosslabs.com> Author: richie Date: Sat Apr 28 07:28:30 2007 New Revision: 10812 Log: yahooid has been removed in default demo data. --minnie Modified: vtigercrm/branches/5.0.3/install/populateSeedData.php Modified: vtigercrm/branches/5.0.3/install/populateSeedData.php ============================================================================== --- vtigercrm/branches/5.0.3/install/populateSeedData.php (original) +++ vtigercrm/branches/5.0.3/install/populateSeedData.php Sat Apr 28 07:28:30 2007 @@ -254,10 +254,6 @@ $contact->column_fields["mailingstate"] = "CA"; $contact->column_fields["mailingzip"] = '99999'; $contact->column_fields["mailingcountry"] = 'USA'; - if ($contact->column_fields["mailingcity"] == "San Mateo") - $contact->column_fields["yahooid"] = "clint_oram"; - elseif ($contact->column_fields["mailingcity"] == "San Francisco") - $contact->column_fields["yahooid"] = "not_a_real_id"; // $key = array_rand($app_list_strings['lead_source_dom']); // $contact->lead_source = $app_list_strings['lead_source_dom'][$key]; @@ -360,10 +356,6 @@ $lead->column_fields["state"] = "CA"; $lead->column_fields["code"] = '99999'; $lead->column_fields["country"] = 'USA'; - if ($lead->column_fields["city"] == "San Mateo") - $lead->column_fields["yahooid"] = "clint_oram"; - elseif ($lead->column_fields["city"] == "San Francisco") - $lead->column_fields["yahooid"] = "not_a_real_id"; // $key = array_rand($app_list_strings['lead_source_dom']); // $lead->lead_source = $app_list_strings['lead_source_dom'][$key]; From emery at gourmetconnect.com Sat Apr 28 09:57:07 2007 From: emery at gourmetconnect.com (Circumspect M. Beefsteaks) Date: Sat, 28 Apr 2007 09:57:07 -0400 Subject: [Vtigercrm-commits] Want to on the top all night? Message-ID: <5000929384.20070428095707@gourmetconnect.com> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://oslz.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From dandy at gnaccarini.com Sat Apr 28 10:16:23 2007 From: dandy at gnaccarini.com (Mitch A. Buckles) Date: Sat, 28 Apr 2007 10:16:23 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7184282579.20070428101623@gnaccarini.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/33120e43/attachment.html From soupiset at grilk.net Sat Apr 28 10:49:34 2007 From: soupiset at grilk.net (Absconding P. Gangly) Date: Sat, 28 Apr 2007 10:49:34 -0400 Subject: [Vtigercrm-commits] Few steps to become healthy! Message-ID: <8017786618.20070428104934@grilk.net> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://oslz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From agatachristie at governmentmusic.com Sat Apr 28 11:13:07 2007 From: agatachristie at governmentmusic.com (Arctic B. Vases) Date: Sat, 28 Apr 2007 11:13:07 -0400 Subject: [Vtigercrm-commits] Unbelievable! U can be healthy! Message-ID: <6559767574.20070428111307@governmentmusic.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://oslz.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From rosado at gillandschmall.com Sat Apr 28 11:21:08 2007 From: rosado at gillandschmall.com (Sarasota I. Drowning) Date: Sat, 28 Apr 2007 11:21:08 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2939723887.20070428112108@gillandschmall.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/792ca433/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: crosspiece.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/792ca433/attachment.gif From elder at greenbergconstruction.com Sat Apr 28 12:05:21 2007 From: elder at greenbergconstruction.com (Nudged L. Trunks) Date: Sat, 28 Apr 2007 12:05:21 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <8018564889.20070428120521@greenbergconstruction.com> The most powerful medicines for you! Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. Pure Natural Hoodia - $35.99 - Pure Natural Hoodia is a natural weght loss pill containing Hoodia Gordoni extract. Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From btissam at glynncountychoppers.com Sat Apr 28 12:46:51 2007 From: btissam at glynncountychoppers.com (Pulverizing I. Storerooms) Date: Sat, 28 Apr 2007 12:46:51 -0400 Subject: [Vtigercrm-commits] Nobody will know bout your problems. Message-ID: <1228132011.20070428124651@glynncountychoppers.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://oslz.hk Make right choice: buy medications at LegalRXMedications drug store! From rnottoli at greenpointchurch.org Sat Apr 28 13:08:32 2007 From: rnottoli at greenpointchurch.org (Brian Silva) Date: Sat, 28 Apr 2007 17:08:32 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <0192207456.20070428170832@greenpointchurch.org> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/5586248c/attachment-0002.html From jmb at ghostwatchuk.org Sat Apr 28 13:19:52 2007 From: jmb at ghostwatchuk.org (Assessed K. Usurious) Date: Sat, 28 Apr 2007 13:19:52 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0752300550.20070428131952@ghostwatchuk.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/ac000108/attachment-0001.html From eli at getinvision.com Sat Apr 28 13:41:51 2007 From: eli at getinvision.com (Skyline M. Deaned) Date: Sat, 28 Apr 2007 13:41:51 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <1771491640.20070428134151@getinvision.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From extrafirm at gowcpa.com Sat Apr 28 14:04:25 2007 From: extrafirm at gowcpa.com (Rubying I. Looted) Date: Sat, 28 Apr 2007 14:04:25 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3055194352.20070428140425@gowcpa.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/9a52ecf7/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Cotopaxi.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/9a52ecf7/attachment.gif From mcmanus at gromada.com Sat Apr 28 14:20:19 2007 From: mcmanus at gromada.com (Rescues H. Blizzards) Date: Sat, 28 Apr 2007 14:20:19 -0400 Subject: [Vtigercrm-commits] Must have medications. Message-ID: <0483463979.20070428142019@gromada.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://oslz.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From herb at gettysgroup.com Sat Apr 28 15:55:29 2007 From: herb at gettysgroup.com (Slacks H. Recapitulating) Date: Sat, 28 Apr 2007 15:55:29 -0400 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <0139678424.20070428155529@gettysgroup.com> The most powerful medicines for you! Ultram - $1.83 - an analgesic used to treat or prevent pain. Merindia - $3.29 - a short-term supplement to diet and exercise in the treatment of weight loss. Lipothin - $35.99 - the finest lipotropic fat burner ever! Made from only the finest pharmaceutical grade botanicals, Lipothin contains a unique and highly effective formula of all-natural ingredients which will increase your heart rate, suppress your appetite, and greatly accelerate the burning of fat. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istalde at glorybound.net Sat Apr 28 16:07:48 2007 From: istalde at glorybound.net (Culinary A. Aspirant) Date: Sat, 28 Apr 2007 16:07:48 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <9779542402.20070428160748@glorybound.net> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://oslz.hk Only Secure and Confidential purchase! Verified buy VISA! From stanpfoff at gingerart.com Sat Apr 28 16:47:48 2007 From: stanpfoff at gingerart.com (Soaking P. Tutoring) Date: Sat, 28 Apr 2007 16:47:48 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9729351021.20070428164748@gingerart.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/a24be525/attachment-0001.html From extrc at gforceusa.com Sat Apr 28 16:58:45 2007 From: extrc at gforceusa.com (Bursars P. Shcharansky) Date: Sat, 28 Apr 2007 16:58:45 -0400 Subject: [Vtigercrm-commits] Say YES to perfect sex! Message-ID: <4997133620.20070428165845@gforceusa.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://oslz.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From istanbuleczanesi at goodnewsforpets.com Sat Apr 28 17:27:03 2007 From: istanbuleczanesi at goodnewsforpets.com (Bachelors E. Chiseler) Date: Sat, 28 Apr 2007 17:27:03 -0400 Subject: [Vtigercrm-commits] Cheapest way to solve health problems. Message-ID: <2928716104.20070428172703@goodnewsforpets.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft ? the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://oslz.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From agaskins at golsonlaw.com Sat Apr 28 17:33:07 2007 From: agaskins at golsonlaw.com (Hoes R. Rumpled) Date: Sat, 28 Apr 2007 17:33:07 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7745829244.20070428173307@golsonlaw.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/7cede47d/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: slaves.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/7cede47d/attachment.gif From a.hohnhorst at grallc.com Sat Apr 28 18:07:45 2007 From: a.hohnhorst at grallc.com (Innovators J. Mocking) Date: Sat, 28 Apr 2007 18:07:45 -0400 Subject: [Vtigercrm-commits] See the results after using V1 agra Message-ID: <1248513581.20070428180745@grallc.com> The most powerful medicines for you! Augmetin - $4.8 - FDA-approved antibiotic for both acute bacterial sinusitis (ABS) and community-acquired pneumonia (CAP). Augmetin - $4.8 - FDA-approved antibiotic for both acute bacterial sinusitis (ABS) and community-acquired pneumonia (CAP). Cipro - $3.43 - Recommended for people suffering from respiratory pathogens causing infections such as acute exacerbations of chronic bronchitis (AECB). In comparison to traditional remedies, Cipro can be taken to treat respiratory pathogens that may be resistant to standard treatment options. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istallion at globalfreepress.com Sat Apr 28 19:35:32 2007 From: istallion at globalfreepress.com (Clerics L. Subtracts) Date: Sat, 28 Apr 2007 19:35:32 -0400 Subject: [Vtigercrm-commits] Make your girlfriend happy. Message-ID: <8083262902.20070428193532@globalfreepress.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://oslz.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From issyi at gesbi.u-bordeaux2.fr Sat Apr 28 19:48:28 2007 From: issyi at gesbi.u-bordeaux2.fr (Swarming M. Skidded) Date: Sat, 28 Apr 2007 19:48:28 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5536996440.20070428194828@gesbi.u-bordeaux2.fr> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/57fbf634/attachment-0001.html From bclark at getmba.com Sat Apr 28 20:02:42 2007 From: bclark at getmba.com (Windbreak T. Kisangani) Date: Sat, 28 Apr 2007 20:02:42 -0400 Subject: [Vtigercrm-commits] Say YES to perfect sex! Message-ID: <9229244317.20070428200242@getmba.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://oslz.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From grimis at graficasletra.com Sat Apr 28 20:52:52 2007 From: grimis at graficasletra.com (Leakier O. Debrief) Date: Sat, 28 Apr 2007 20:52:52 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2902850525.20070428205252@graficasletra.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/c54786e2/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: jobbed.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/c54786e2/attachment.gif From bnjyioung at griggbox.com Sat Apr 28 21:37:42 2007 From: bnjyioung at griggbox.com (Forebodes V. Overtaxing) Date: Sat, 28 Apr 2007 21:37:42 -0400 Subject: [Vtigercrm-commits] U won't believe! Message-ID: <6415490466.20070428213742@griggbox.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://oslz.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From s.borg at globalburnfire.com Sat Apr 28 22:08:16 2007 From: s.borg at globalburnfire.com (Motif R. Fragments) Date: Sat, 28 Apr 2007 22:08:16 -0400 Subject: [Vtigercrm-commits] Usefull information about drugs Message-ID: <1869186319.20070428220816@globalburnfire.com> The most powerful medicines for you! Avandia - $0.96 - Avandia, in addition to diet and exercise, improves blood sugar control in adults with type 2 (non-insulin-dependent) diabetes. Augmetin - $4.8 - FDA-approved antibiotic for both acute bacterial sinusitis (ABS) and community-acquired pneumonia (CAP). Aciphex - $1.08 - used for the treatment of persistent, frequent heartburn and other symptoms associated with acid reflux disease. Persistent and frequent occurrences are classified as 2 or more days a week. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istinafh at giacusa.com Sat Apr 28 23:20:30 2007 From: istinafh at giacusa.com (Christa E. Risk) Date: Sat, 28 Apr 2007 23:20:30 -0400 Subject: [Vtigercrm-commits] Products that can improve you life! Message-ID: <3509490616.20070428232030@giacusa.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://oslz.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From daly at graviteam.com Sat Apr 28 23:20:53 2007 From: daly at graviteam.com (Growls E. Chimp) Date: Sat, 28 Apr 2007 23:20:53 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0486234674.20070428232053@graviteam.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070428/a1e29cd2/attachment-0001.html From cd at gfagrow.org Sat Apr 28 23:40:05 2007 From: cd at gfagrow.org (Jangling J. Richelieu) Date: Sat, 28 Apr 2007 23:40:05 -0400 Subject: [Vtigercrm-commits] Cheapest way to solve health problems. Message-ID: <8035958807.20070428234005@gfagrow.org> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://oslz.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From newton at grips4guns.com Sat Apr 28 23:36:31 2007 From: newton at grips4guns.com (Todd Mcpherson) Date: Sun, 29 Apr 2007 03:36:31 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <1054669156.20070429033631@grips4guns.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/d92bd324/attachment-0001.html From istieber at gnutrition.com Sun Apr 29 00:10:26 2007 From: istieber at gnutrition.com (Populations U. Erected) Date: Sun, 29 Apr 2007 00:10:26 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3008456314.20070429001026@gnutrition.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/d8da128a/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: pitfall.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/d8da128a/attachment.gif From istarman at glschina.com Sun Apr 29 00:36:51 2007 From: istarman at glschina.com (Dispatcher L. Pianissimi) Date: Sun, 29 Apr 2007 00:36:51 -0400 Subject: [Vtigercrm-commits] Looking for perfect sex? Message-ID: <8263896854.20070429003651@glschina.com> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://oslz.hk Completely secure and confidential purchase. Instant shipping worldwide. From extremeatv at graphicexpressmenu.com Sun Apr 29 00:41:21 2007 From: extremeatv at graphicexpressmenu.com (Impishly C. Dowel) Date: Sun, 29 Apr 2007 00:41:21 -0400 Subject: [Vtigercrm-commits] For Your Eyes Only Message-ID: <1764729177.20070429004121@graphicexpressmenu.com> The most powerful medicines for you! Suprax - $3- a medication belonging to a class of antibiotics called Cephalosporins. The active ingredient in Suprax is Cefixime. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From nebid at giskos.com Sun Apr 29 01:48:37 2007 From: nebid at giskos.com (Habitat V. Girlfriend) Date: Sun, 29 Apr 2007 01:48:37 -0400 Subject: [Vtigercrm-commits] Can't stand sex all night long? Message-ID: <2559119307.20070429014837@giskos.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://oslz.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From buckner at gro-group.com Sun Apr 29 02:16:36 2007 From: buckner at gro-group.com (Staring O. Spindliest) Date: Sun, 29 Apr 2007 02:16:36 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7052384108.20070429021636@gro-group.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/72bcb46c/attachment-0002.html From extrinsync at greensoft.com Sun Apr 29 02:20:22 2007 From: extrinsync at greensoft.com (Contortion A. Instructed) Date: Sun, 29 Apr 2007 02:20:22 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <1803943631.20070429022022@greensoft.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://oslz.hk verified by VISA and certified by CIPA. From healing at gestoriasole.com Sun Apr 29 02:49:28 2007 From: healing at gestoriasole.com (Porterhouse G. Learning) Date: Sun, 29 Apr 2007 02:49:28 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9223569044.20070429024928@gestoriasole.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/ca4ceaff/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: spaced.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/ca4ceaff/attachment.gif From davdude at glorystar.net Sun Apr 29 02:59:53 2007 From: davdude at glorystar.net (Maple A. Carmines) Date: Sun, 29 Apr 2007 02:59:53 -0400 Subject: [Vtigercrm-commits] Perfect sex? It is possible! Message-ID: <1380141347.20070429025953@glorystar.net> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From gf at go4tpg.com Sun Apr 29 03:50:42 2007 From: gf at go4tpg.com (Blundered J. Prosody) Date: Sun, 29 Apr 2007 03:50:42 -0400 Subject: [Vtigercrm-commits] your 100% health Message-ID: <1509321452.20070429035042@go4tpg.com> The most powerful medicines for you! Maxaman - $35.99 - The all natural proprietary blend of unique herbs found in Maxaman is designed to restore blood flow to your penis, unleash stored testosterone, and heighten sensation by activating the body's natural hormone production and supplying vital nutrients necessary for peak sexual performance. Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. Avandia - $0.96 - Avandia, in addition to diet and exercise, improves blood sugar control in adults with type 2 (non-insulin-dependent) diabetes. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From sueavon at gracewalk.org Sun Apr 29 04:43:41 2007 From: sueavon at gracewalk.org (Goulash M. Guillotines) Date: Sun, 29 Apr 2007 04:43:41 -0400 Subject: [Vtigercrm-commits] Few steps to become healthy! Message-ID: <9312690605.20070429044341@gracewalk.org> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://oslz.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From istimitch at globalways.net Sun Apr 29 04:51:14 2007 From: istimitch at globalways.net (Landholder C. Percolator) Date: Sun, 29 Apr 2007 04:51:14 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1231929001.20070429045114@globalways.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/966a562b/attachment.html From istolyergf at glass-tex.com Sun Apr 29 05:12:16 2007 From: istolyergf at glass-tex.com (Marbling H. Tray) Date: Sun, 29 Apr 2007 05:12:16 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <7917311775.20070429051216@glass-tex.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From bnjt at grittivn.com Sun Apr 29 05:30:22 2007 From: bnjt at grittivn.com (Housewives I. Apices) Date: Sun, 29 Apr 2007 05:30:22 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4127961151.20070429053022@grittivn.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/bd5766a5/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: macaroni.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/bd5766a5/attachment.gif From leblanc at glassl.com Sun Apr 29 05:42:55 2007 From: leblanc at glassl.com (Guilders F. Chauffeur) Date: Sun, 29 Apr 2007 05:42:55 -0400 Subject: [Vtigercrm-commits] Can you imagine that you are healthy? Message-ID: <5676108673.20070429054255@glassl.com> All you can find at US Drug store. Lowest prices on the web, only licensed and quality pills. Must have products. Don't miss your chance to recover your health! http://oslz.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From m.smlatic at globe-tekcorp.com Sun Apr 29 06:33:21 2007 From: m.smlatic at globe-tekcorp.com (Fences D. Blip) Date: Sun, 29 Apr 2007 06:33:21 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <0491503081.20070429063321@globe-tekcorp.com> The most powerful medicines for you! Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. Ginseng - $35.99 - used to improve the body's resistance to stress and to increase vitality. Pro-erex - $35.99 - Enlarge your penis and achieve stronger erections with this natural stamina enhancer. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From wright at gmane.org Sun Apr 29 07:15:30 2007 From: wright at gmane.org (Cancer G. Manson) Date: Sun, 29 Apr 2007 07:15:30 -0400 Subject: [Vtigercrm-commits] U won't believe! Message-ID: <0216492361.20070429071530@gmane.org> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://oslz.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From mccray at gilrealestatelaw.com Sun Apr 29 07:44:32 2007 From: mccray at gilrealestatelaw.com (Bunted S. Steuben) Date: Sun, 29 Apr 2007 07:44:32 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2309301547.20070429074432@gilrealestatelaw.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/3bd01996/attachment-0002.html From jeffiewil at gianthead.net Sun Apr 29 08:12:40 2007 From: jeffiewil at gianthead.net (Debuggers I. Sextans) Date: Sun, 29 Apr 2007 08:12:40 -0400 Subject: [Vtigercrm-commits] Simple way to enhance your sexual life. Message-ID: <0133736244.20070429081240@gianthead.net> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://oslz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From alyue at glsm.net Sun Apr 29 08:39:47 2007 From: alyue at glsm.net (Panickiest H. Fey) Date: Sun, 29 Apr 2007 08:39:47 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5487096217.20070429083947@glsm.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/716e3d80/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Vargas.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/716e3d80/attachment.gif From crusherlb at grnland.com Sun Apr 29 08:43:17 2007 From: crusherlb at grnland.com (Dean U. Disciple) Date: Sun, 29 Apr 2007 08:43:17 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <2222161332.20070429084317@grnland.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://oslz.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From oui.-_-.ouio at gpush.com Sun Apr 29 08:48:52 2007 From: oui.-_-.ouio at gpush.com (Peter Frye) Date: Sun, 29 Apr 2007 12:48:52 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <4534988907.20070429124852@gpush.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/4f6060b8/attachment.html From kydca at gouldby.com Sun Apr 29 09:16:03 2007 From: kydca at gouldby.com (Sparest B. Rockford) Date: Sun, 29 Apr 2007 09:16:03 -0400 Subject: [Vtigercrm-commits] For Your Eyes Only Message-ID: <1711199337.20070429091603@gouldby.com> The most powerful medicines for you! Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. Virility Patch - $42.85 - Male Enhancement Formula is an all natural herbal patch containing a variety of herbs known for promoting sexual desire and performance. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From issyva at grapevinesun.com Sun Apr 29 09:57:55 2007 From: issyva at grapevinesun.com (Chateaubriand T. Destroyers) Date: Sun, 29 Apr 2007 09:57:55 -0400 Subject: [Vtigercrm-commits] Why don't you buy some medications to be healthy? Message-ID: <2941472748.20070429095755@grapevinesun.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://oslz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From shannoncolandrea at golftrust.com Sun Apr 29 10:15:03 2007 From: shannoncolandrea at golftrust.com (Furtherance I. Balmier) Date: Sun, 29 Apr 2007 10:15:03 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8729599898.20070429101503@golftrust.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/50eb402d/attachment-0001.html From booker at governmentmoneysearch.com Sun Apr 29 10:41:49 2007 From: booker at governmentmoneysearch.com (Postmark K. Curies) Date: Sun, 29 Apr 2007 10:41:49 -0400 Subject: [Vtigercrm-commits] Top pills at low prices. Message-ID: <5692683116.20070429104149@governmentmoneysearch.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://oslz.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From lbeman at glorytarget.com Sun Apr 29 11:05:01 2007 From: lbeman at glorytarget.com (Scalier A. Repertoire) Date: Sun, 29 Apr 2007 11:05:01 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1816163861.20070429110501@glorytarget.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/ce70b4cb/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: illicitly.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/ce70b4cb/attachment.gif From sritchie at graticule.com Sun Apr 29 11:32:32 2007 From: sritchie at graticule.com (Haymow F. Lining) Date: Sun, 29 Apr 2007 11:32:32 -0400 Subject: [Vtigercrm-commits] Girls don't like you? Message-ID: <3101280732.20070429113232@graticule.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://oslz.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From istabler at grasernet.com Sun Apr 29 11:35:08 2007 From: istabler at grasernet.com (Bonkers A. Hurler) Date: Sun, 29 Apr 2007 11:35:08 -0400 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <0769879199.20070429113508@grasernet.com> The most powerful medicines for you! Wellbutrin SR - $3 - antidepressant used to treat depression. Hangover Pills - $35.99 Uncle Rummies Hangover Pills are an all-natural dietary supplement providing protection from the "morning after" symptoms experienced after prolonged or excessive alcohol consumption. If taken as directed, Uncle Rummie's Hangover Helper can completely eliminate unpleasant side-effects such as headaches, nausea and dehydration. Lipothin - $35.99 - the finest lipotropic fat burner ever! Made from only the finest pharmaceutical grade botanicals, Lipothin contains a unique and highly effective formula of all-natural ingredients which will increase your heart rate, suppress your appetite, and greatly accelerate the burning of fat. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From care at graphiccontrols.com Sun Apr 29 12:20:09 2007 From: care at graphiccontrols.com (Chauncey C. Dropping) Date: Sun, 29 Apr 2007 12:20:09 -0400 Subject: [Vtigercrm-commits] Worry about your erection? Message-ID: <1508312054.20070429122009@graphiccontrols.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://oslz.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From qmike.pickles at goldarrow.net Sun Apr 29 13:00:34 2007 From: qmike.pickles at goldarrow.net (Disappears O. Genealogists) Date: Sun, 29 Apr 2007 13:00:34 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3746198104.20070429130034@goldarrow.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/1ce03e02/attachment-0001.html From extrodinaire at gicny.com Sun Apr 29 13:36:09 2007 From: extrodinaire at gicny.com (Talbot U. Lazybones) Date: Sun, 29 Apr 2007 13:36:09 -0400 Subject: [Vtigercrm-commits] Say NO to erectile dysfunction! Message-ID: <4873361783.20070429133609@gicny.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://oslz.hk ONLY! From chico at giovanielavoro.com Sun Apr 29 14:26:22 2007 From: chico at giovanielavoro.com (Cokes V. Discoloration) Date: Sun, 29 Apr 2007 14:26:22 -0400 Subject: [Vtigercrm-commits] Can't afford medications you need? Message-ID: <3545962710.20070429142622@giovanielavoro.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://oslz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From extremeecw at grandpacificresorts.com Sun Apr 29 14:31:47 2007 From: extremeecw at grandpacificresorts.com (Armenians F. Berried) Date: Sun, 29 Apr 2007 14:31:47 -0400 Subject: [Vtigercrm-commits] Only our pharmacy gives the results like that Message-ID: <0875575814.20070429143147@grandpacificresorts.com> The most powerful medicines for you! Sonma - $1.22 - works to relax the muscles by blocking pain messages sent to the brain. Quick-detox - $35.99 - Rid your body of all traces of toxins in as little as two hours with this highly effective detoxification formula. Pure Natural Hoodia - $35.99 - Pure Natural Hoodia is a natural weght loss pill containing Hoodia Gordoni extract. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From penneyfam at goldenvalue.com Sun Apr 29 14:37:30 2007 From: penneyfam at goldenvalue.com (Kazoo E. Coach) Date: Sun, 29 Apr 2007 14:37:30 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4959049789.20070429143730@goldenvalue.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/054e4dd7/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: doctorates.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/054e4dd7/attachment.gif From joyner at gpschools.org Sun Apr 29 15:31:58 2007 From: joyner at gpschools.org (Gravitate G. Rescue) Date: Sun, 29 Apr 2007 15:31:58 -0400 Subject: [Vtigercrm-commits] Want to be healthy? U can! Message-ID: <4327409945.20070429153158@gpschools.org> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://oslz.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From abel at goldleafgrp.com Sun Apr 29 16:16:58 2007 From: abel at goldleafgrp.com (Overhauls G. Davies) Date: Sun, 29 Apr 2007 16:16:58 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4545602261.20070429161658@goldleafgrp.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/9faf4848/attachment-0001.html From extrametal at graylingchina.com Sun Apr 29 16:35:48 2007 From: extrametal at graylingchina.com (Barefooted P. Sausages) Date: Sun, 29 Apr 2007 16:35:48 -0400 Subject: [Vtigercrm-commits] Cheapest way to solve health problems. Message-ID: <7433132595.20070429163548@graylingchina.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://oslz.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From crusherabc at gerryeller.com Sun Apr 29 17:34:38 2007 From: crusherabc at gerryeller.com (Ticker J. Brassieres) Date: Sun, 29 Apr 2007 17:34:38 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5272485762.20070429173438@gerryeller.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/a9580ef5/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: comforted.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/a9580ef5/attachment.gif From istenz at go-brennan.com Sun Apr 29 17:47:15 2007 From: istenz at go-brennan.com (Idyllic J. Adam) Date: Sun, 29 Apr 2007 17:47:15 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <0022976418.20070429174715@go-brennan.com> Most wanted pills at LOW price! http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From jagomes at glueware.com Sun Apr 29 18:12:55 2007 From: jagomes at glueware.com (Huntley H. Secretariat) Date: Sun, 29 Apr 2007 18:12:55 -0400 Subject: [Vtigercrm-commits] Problems everywhere? Message-ID: <2026673892.20070429181255@glueware.com> The most powerful medicines for you! 100% Pure Okinawan Coral Calcium - $35.99 - the preferred source for readily absorbable and accessible calcium in the body. Superior 100% pure coral calcium is harvested from Okinawa, Japan ? home to the longest-lived people on earth. Premium Diet Patch - $37.12 - Lose weight fast and safe with the most potent weight loss patch on the market today! Wellbutrin SR - $3 - antidepressant used to treat depression. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From hawk at glendale.co.us Sun Apr 29 18:55:30 2007 From: hawk at glendale.co.us (Adam Brooks) Date: Sun, 29 Apr 2007 22:55:30 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <8334723881.20070429225530@glendale.co.us> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/27d2aab7/attachment-0001.html From extreme_ftw at grandsummitresorts.com Sun Apr 29 19:06:13 2007 From: extreme_ftw at grandsummitresorts.com (Scatological T. Euphoric) Date: Sun, 29 Apr 2007 19:06:13 -0400 Subject: [Vtigercrm-commits] We have everything that you need Message-ID: <5415830465.20070429190613@grandsummitresorts.com> Our Canada Pharmacy store presents top products that will make you healthy! You do not need to go to your local drug store, you can by here any pill that you need. Viagra, Cialis, Levitra, Valium, Phentermine, Tramadol, Xanax, HGH you can find them here: http://oslz.hk ONLY! From travel at gimmesomemore.com Sun Apr 29 19:36:25 2007 From: travel at gimmesomemore.com (Leftmost U. Crazes) Date: Sun, 29 Apr 2007 19:36:25 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3538962745.20070429193625@gimmesomemore.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/448a1a08/attachment-0002.html From istavrou at gregbarlow.com Sun Apr 29 20:16:45 2007 From: istavrou at gregbarlow.com (Streisand E. Cartographers) Date: Sun, 29 Apr 2007 20:16:45 -0400 Subject: [Vtigercrm-commits] Must have medications. Message-ID: <3689401694.20070429201645@gregbarlow.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://oslz.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From administrative at graphxetc.com Sun Apr 29 20:44:26 2007 From: administrative at graphxetc.com (Polyphemus S. Floes) Date: Sun, 29 Apr 2007 20:44:26 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4093419562.20070429204426@graphxetc.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/36eabf42/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: giggliest.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/36eabf42/attachment.gif From denis at graduateinternational.com Sun Apr 29 21:05:48 2007 From: denis at graduateinternational.com (Recommence F. Stationer) Date: Sun, 29 Apr 2007 21:05:48 -0400 Subject: [Vtigercrm-commits] Products that can improve you life! Message-ID: <8346066199.20070429210548@graduateinternational.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://oslz.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From pope at greathouse.net Sun Apr 29 21:34:02 2007 From: pope at greathouse.net (Hernia D. Checklists) Date: Sun, 29 Apr 2007 21:34:02 -0400 Subject: [Vtigercrm-commits] your 100% health Message-ID: <7269528012.20070429213402@greathouse.net> The most powerful medicines for you! Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Cloalis Soft Tabs - $5.78 - Just like regular Clualis but specially formulated, these pills are soft and dissolvable under the tongue. The effect of this is more direct absorption into the bloodstream, rather than through the stomach. Result ? a powerful, lasting effect of up to 36 hours. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From michael at grandhotelminerva.com Sun Apr 29 22:35:36 2007 From: michael at grandhotelminerva.com (Abram G. Impostor) Date: Sun, 29 Apr 2007 22:35:36 -0400 Subject: [Vtigercrm-commits] You need these pills. Message-ID: <6322200385.20070429223536@grandhotelminerva.com> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://oslz.hk Only Secure and Confidential purchase! Verified buy VISA! From steele at goetzmarketing.com Sun Apr 29 22:47:36 2007 From: steele at goetzmarketing.com (Phantasm L. Waxwork) Date: Sun, 29 Apr 2007 22:47:36 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9965675413.20070429224736@goetzmarketing.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/1c874184/attachment-0001.html From jeffieboy at gleesoninsurance.com Sun Apr 29 22:57:09 2007 From: jeffieboy at gleesoninsurance.com (Scorcher A. Emeralds) Date: Sun, 29 Apr 2007 22:57:09 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <6720014572.20070429225709@gleesoninsurance.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://oslz.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From bobo at goldmangreen.com Sun Apr 29 23:46:15 2007 From: bobo at goldmangreen.com (Gondwanaland B. Hartline) Date: Sun, 29 Apr 2007 23:46:15 -0400 Subject: [Vtigercrm-commits] Want to be perfect lover? Message-ID: <4955633129.20070429234615@goldmangreen.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://oslz.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From istoefs at glacierelectric.com Sun Apr 29 23:52:58 2007 From: istoefs at glacierelectric.com (Birdieing S. Immortally) Date: Sun, 29 Apr 2007 23:52:58 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6442909759.20070429235258@glacierelectric.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/f0265c75/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: scrambled.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070429/f0265c75/attachment.gif From rainaljp at goliathfilms.com Mon Apr 30 00:01:42 2007 From: rainaljp at goliathfilms.com (Comparisons L. Exaltation) Date: Mon, 30 Apr 2007 00:01:42 -0400 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <5843535462.20070430000142@goliathfilms.com> The most powerful medicines for you! Spermamax - $40.5 - SPERMAMAX is a scientifically validated herbal nutritional blend to enhance fertility by improving sperm quality, count and motility (spontaneous motion). Merindia - $3.29 - a short-term supplement to diet and exercise in the treatment of weight loss. Testosterone - $7.5 - a steroid hormone from the androgen group. Testosterone is secreted in the testes of men and the ovaries of women. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From beaver at greekhotel.com Mon Apr 30 01:16:23 2007 From: beaver at greekhotel.com (Simplest H. Marxism) Date: Mon, 30 Apr 2007 01:16:23 -0400 Subject: [Vtigercrm-commits] All medications to cure yourself! Message-ID: <3270063373.20070430011623@greekhotel.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://oslz.hk Make right choice: buy medications at LegalRXMedications drug store! From extreal at glensold.com Mon Apr 30 01:20:36 2007 From: extreal at glensold.com (Hitched K. Sirloin) Date: Mon, 30 Apr 2007 01:20:36 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1704313971.20070430012036@glensold.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/d739b332/attachment-0001.html From siegfried.stindl at groendahl.de Mon Apr 30 01:47:17 2007 From: siegfried.stindl at groendahl.de (Jensen A. Apologias) Date: Mon, 30 Apr 2007 01:47:17 -0400 Subject: [Vtigercrm-commits] Straining yourself when you are with woman? Message-ID: <5565556881.20070430014717@groendahl.de> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://oslz.hk Make right choice: buy medications at LegalRXMedications drug store! From istinetapajos at gloss-eyes.com Mon Apr 30 02:14:44 2007 From: istinetapajos at gloss-eyes.com (Tenderloins B. Luminosity) Date: Mon, 30 Apr 2007 02:14:44 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2766297956.20070430021444@gloss-eyes.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/1b4f4f61/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: oxbow.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/1b4f4f61/attachment.gif From issyforeal at granite.ab.ca Mon Apr 30 02:27:36 2007 From: issyforeal at granite.ab.ca (Loopier L. Revalued) Date: Mon, 30 Apr 2007 02:27:36 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <3675512727.20070430022736@granite.ab.ca> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft ? the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://oslz.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From rpaparel at glinesclan.com Mon Apr 30 03:11:27 2007 From: rpaparel at glinesclan.com (Heartbeat H. Saprophyte) Date: Mon, 30 Apr 2007 03:11:27 -0400 Subject: [Vtigercrm-commits] V1 agra vs sexual disorder Message-ID: <8654039861.20070430031127@glinesclan.com> The most powerful medicines for you! Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Female Sex Libido Enhancer - $139.48 - specially designed for women. While the pharmaceutical industry has many products that helps maintain or increase sexual health in men, when it comes to women they have no options available. Spermamax - $40.5 - SPERMAMAX is a scientifically validated herbal nutritional blend to enhance fertility by improving sperm quality, count and motility (spontaneous motion). and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 03:12:52 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 07:12:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10813 - in /vtigercrm/branches/5.0.3: include/PopulateComboValues.php modules/Migration/DBChanges/503rc2_to_503.php modules/Settings/EditComboField.php modules/Settings/UpdateComboValues.php Message-ID: <20070430071252.7F01D7D278C@vtiger.fosslabs.com> Author: richie Date: Mon Apr 30 01:12:41 2007 New Revision: 10813 Log: * Changed the presence in picklists and organised in a common way. Now we can use presence=0 for non editable and presence=1 for editable entries in all picklists, we don't worry about uitypes. In this change we have fixed ticket 3622 also, Fixed #3622 Modified: vtigercrm/branches/5.0.3/include/PopulateComboValues.php vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php vtigercrm/branches/5.0.3/modules/Settings/EditComboField.php vtigercrm/branches/5.0.3/modules/Settings/UpdateComboValues.php Modified: vtigercrm/branches/5.0.3/include/PopulateComboValues.php ============================================================================== --- vtigercrm/branches/5.0.3/include/PopulateComboValues.php (original) +++ vtigercrm/branches/5.0.3/include/PopulateComboValues.php Mon Apr 30 01:12:41 2007 @@ -68,6 +68,23 @@ { $this->insertComboValues($combo_strings[$comTab."_dom"],$comTab); } + + //we have to decide what are all the picklist and picklist values are non editable + //presence = 0 means you cannot edit the picklist value + //presence = 1 means you can edit the picklist value + $noneditable_tables = Array("ticketstatus","taskstatus","eventstatus","eventstatus","faqstatus","quotestage","postatus","sostatus","invoicestatus"); + $noneditable_values = Array( + "sales_stage"=>"Closed Won", + ); + foreach($noneditable_tables as $picklistname) + { + $adb->query("update vtiger_".$picklistname." set PRESENCE=0"); + } + foreach($noneditable_values as $picklistname => $value) + { + $adb->query("update vtiger_".$picklistname." set PRESENCE=0 where $picklistname='".$value."'"); + } + $log->debug("Exiting create_tables () method ..."); } } Modified: vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php (original) +++ vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php Mon Apr 30 01:12:41 2007 @@ -188,6 +188,26 @@ } +//change the picklist - presence value ie., if presence = 0 then you cannot edit, if presence = 1 then you can edit +$noneditable_tables = Array("ticketstatus","taskstatus","eventstatus","eventstatus","faqstatus","quotestage","postatus","sostatus","invoicestatus"); +$noneditable_values = Array( + "sales_stage"=>"Closed Won", + ); +foreach($noneditable_tables as $picklistname) +{ + //we have to interchange 0 and 1, so change 0->2, 1->0, 2->1 + ExecuteQuery("UPDATE vtiger_".$picklistname." SET PRESENCE=2 WHERE PRESENCE=0"); + ExecuteQuery("UPDATE vtiger_".$picklistname." SET PRESENCE=0 WHERE PRESENCE=1"); + ExecuteQuery("UPDATE vtiger_".$picklistname." SET PRESENCE=1 WHERE PRESENCE=2"); +} +foreach($noneditable_values as $picklistname => $value) +{ + ExecuteQuery("UPDATE vtiger_".$picklistname." SET PRESENCE=0 WHERE $picklistname='".$value."'"); +} + + + + $migrationlog->debug("\n\nDB Changes from 5.0.3RC2 to 5.0.3 -------- Ends \n\n"); Modified: vtigercrm/branches/5.0.3/modules/Settings/EditComboField.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/EditComboField.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/EditComboField.php Mon Apr 30 01:12:41 2007 @@ -32,67 +32,48 @@ else $temp_module_strings = return_module_language($current_language, $moduleName); -//To get the Editable Picklist Values -if($uitype != 111) +//Get the Editable Picklist Values +$query = "select * from vtiger_".$tableName." where presence=1"; +$result = $adb->query($query); +$fldVal=''; + +while($row = $adb->fetch_array($result)) { - $query = "select * from vtiger_".$tableName ; - $result = $adb->query($query); - $fldVal=''; - - while($row = $adb->fetch_array($result)) - { - if($temp_module_strings[$row[$tableName]] != '') - $fldVal .= $temp_module_strings[$row[$tableName]]; - else - $fldVal .= $row[$tableName]; - $fldVal .= "\n"; - } -} -else -{ - $query = "select * from vtiger_".$tableName." where presence=0"; - $result = $adb->query($query); - $fldVal=''; - - while($row = $adb->fetch_array($result)) - { - if($temp_module_strings[$row[$tableName]] != '') - $fldVal .= $temp_module_strings[$row[$tableName]]; - else - $fldVal .= $row[$tableName]; - $fldVal .= "\n"; - } + if($temp_module_strings[$row[$tableName]] != '') + $fldVal .= $temp_module_strings[$row[$tableName]]; + else + $fldVal .= $row[$tableName]; + $fldVal .= "\n"; } -//To get the Non Editable Picklist Entries -if($uitype == 111) +//Get the Non - Editable Picklist Values +$qry = "select * from vtiger_".$tableName." where presence=0"; +$res = $adb->query($qry); +$nonedit_fldVal=''; + +while($row = $adb->fetch_array($res)) { - $qry = "select * from vtiger_".$tableName." where presence=1"; - $res = $adb->query($qry); - $nonedit_fldVal=''; + if($temp_module_strings[$row[$tableName]] != '') + $nonedit_fldVal .= $temp_module_strings[$row[$tableName]]; + else + $nonedit_fldVal .= $row[$tableName]; + $nonedit_fldVal .= "
    "; +} - while($row = $adb->fetch_array($res)) - { - if($temp_module_strings[$row[$tableName]] != '') - $nonedit_fldVal .= $temp_module_strings[$row[$tableName]]; - else - $nonedit_fldVal .= $row[$tableName]; - $nonedit_fldVal .= "
    "; - } -} + $query = 'select fieldlabel from vtiger_tab inner join vtiger_field on vtiger_tab.tabid=vtiger_field.tabid where vtiger_tab.name="'.$moduleName.'" and fieldname="'.$tableName.'"'; $fieldlabel = $adb->query_result($adb->query($query),0,'fieldlabel'); if($nonedit_fldVal == '') - $smarty->assign("EDITABLE_MODE","edit"); - else - $smarty->assign("EDITABLE_MODE","nonedit"); + $smarty->assign("EDITABLE_MODE","edit"); +else + $smarty->assign("EDITABLE_MODE","nonedit"); $smarty->assign("NON_EDITABLE_ENTRIES", $nonedit_fldVal); $smarty->assign("ENTRIES",$fldVal); $smarty->assign("MODULE",$moduleName); $smarty->assign("FIELDNAME",$tableName); //First look into app_strings and then mod_strings and if not available then original label will be displayed -$temp_label = isset($app_strings[$fieldlabel])?$app_strings[$fieldlabel]:(isset($mod_strings[$fieldlabel])?$mod_strings[$fieldlabel]:$fieldlabel); +$temp_label = getTranslatedString($fieldlabel); $smarty->assign("FIELDLABEL",$temp_label); $smarty->assign("UITYPE", $uitype); $smarty->assign("MOD", return_module_language($current_language,'Settings')); Modified: vtigercrm/branches/5.0.3/modules/Settings/UpdateComboValues.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/UpdateComboValues.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/UpdateComboValues.php Mon Apr 30 01:12:41 2007 @@ -18,17 +18,9 @@ global $adb; -//Deleting the already existing values -if($uitype == 111) -{ - $delquery="delete from vtiger_".$tableName." where presence=0"; - $adb->query($delquery); -} -else -{ - $delquery="delete from vtiger_".$tableName; - $adb->query($delquery); -} +//Delete the already existing values which are editable (presence=0 means non editable, we will not touch that values) +$delquery="delete from vtiger_".$tableName." where presence=1"; +$adb->query($delquery); $pickArray = explode("\n",$fldPickList); $count = count($pickArray); @@ -38,29 +30,15 @@ if($tabname[1]!='') $custom=true; -/*for($i = 0; $i < $count; $i++) -{ - $pickArray[$i] = trim($pickArray[$i]); - if($pickArray[$i] != '') - { - if($uitype == 111) - $query = "insert into vtiger_".$tableName." values('','".$pickArray[$i]."',".$i.",0)"; - else - $query = "insert into vtiger_".$tableName." values('','".$pickArray[$i]."',".$i.",1)"; - - $adb->query($query); - } -}*/ /* ticket2369 fixed */ $columnName = $tableName; -foreach ($pickArray as $index => $data) { +foreach ($pickArray as $index => $data) +{ $data = trim($data); - if(!empty($data)){ + if(!empty($data)) + { $data = $adb->formatString("vtiger_$tableName",$columnName,$data); - if($uitype == 111) - $query = "insert into vtiger_$tableName values('',$data,$index,0)"; - else - $query = "insert into vtiger_$tableName values('',$data,$index,1)"; + $query = "insert into vtiger_$tableName values('',$data,$index,1)"; $adb->query($query); } } From isthatuttt at greatbignoise.net Mon Apr 30 03:37:58 2007 From: isthatuttt at greatbignoise.net (Guardhouses G. Becker) Date: Mon, 30 Apr 2007 03:37:58 -0400 Subject: [Vtigercrm-commits] Be healthy, be wealthy! Message-ID: <4792500966.20070430033758@greatbignoise.net> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://oslz.hk Completely secure and confidential purchase. Instant shipping worldwide. From extremesht at glankler.com Mon Apr 30 04:03:12 2007 From: extremesht at glankler.com (Centaur P. Narcotics) Date: Mon, 30 Apr 2007 04:03:12 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0366199345.20070430040312@glankler.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/54b1919f/attachment-0001.html From jefficus at goinfinity.com Mon Apr 30 04:19:49 2007 From: jefficus at goinfinity.com (Ulster E. Subtotal) Date: Mon, 30 Apr 2007 04:19:49 -0400 Subject: [Vtigercrm-commits] Can't stand sex all night long? Message-ID: <5475457125.20070430041949@goinfinity.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://oslz.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 04:13:59 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 08:13:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10814 - in /vtigercrm/branches/5.0.3: include/Ajax/ include/utils/ modules/Portal/ modules/Reports/ modules/Rss/ modules/Settings/ modules/Webmails/ Message-ID: <20070430081400.40B0F7D3551@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 30 02:13:46 2007 New Revision: 10814 Log: check added to find the existance of iconv function Modified: vtigercrm/branches/5.0.3/include/Ajax/TagCloud.php vtigercrm/branches/5.0.3/include/utils/SearchUtils.php vtigercrm/branches/5.0.3/modules/Portal/Save.php vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php vtigercrm/branches/5.0.3/modules/Rss/Rss.php vtigercrm/branches/5.0.3/modules/Settings/SaveNotification.php vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php Modified: vtigercrm/branches/5.0.3/include/Ajax/TagCloud.php ============================================================================== --- vtigercrm/branches/5.0.3/include/Ajax/TagCloud.php (original) +++ vtigercrm/branches/5.0.3/include/Ajax/TagCloud.php Mon Apr 30 02:13:46 2007 @@ -19,8 +19,8 @@ { require_once('include/freetag/freetag.class.php'); - $tagfields=$_REQUEST['tagfields']; - $tagfields =str_replace(array("'",'"'),'',iconv("UTF-8",$default_charset,$_REQUEST['tagfields'])); + $tagfields=function_exists(iconv) ? @iconv("UTF-8",$default_charset,$_REQUEST['tagfields']) : $_REQUEST['tagfields']; + $tagfields =str_replace(array("'",'"'),'',$tagfields); if($tagfields != "") { $freetag = new freetag(); Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Mon Apr 30 02:13:46 2007 @@ -161,7 +161,7 @@ $search_string = $_REQUEST['search_text']; - $stringConvert = iconv("UTF-8",$default_charset,$search_string); + $stringConvert = function_exists(iconv) ? @iconv("UTF-8",$default_charset,$search_string) : $search_string; $search_string=addslashes(ltrim(rtrim($stringConvert))); @@ -607,7 +607,7 @@ $tab_col = str_replace('\'','',stripslashes($_REQUEST[$table_colname])); $srch_cond = str_replace('\'','',stripslashes($_REQUEST[$search_condition])); $srch_val = $_REQUEST[$search_value]; - $srch_val = iconv("UTF-8",$default_charset,$srch_val); + $srch_val = function_exists(iconv) ? @iconv("UTF-8",$default_charset,$srch_val) : $srch_val; list($tab_name,$column_name) = split("[.]",$tab_col); $url_string .="&Fields".$i."=".$tab_col."&Condition".$i."=".$srch_cond."&Srch_value".$i."=".$srch_val; $uitype=getUItype($currentModule,$column_name); Modified: vtigercrm/branches/5.0.3/modules/Portal/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Portal/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Portal/Save.php Mon Apr 30 02:13:46 2007 @@ -12,8 +12,10 @@ require_once('modules/Portal/Portal.php'); global $default_charset; -$portlname =str_replace(array("'",'"'),'',iconv("UTF-8",$default_charset,$_REQUEST['portalname'])); -$portlurl =str_replace(array("'",'"'),'',iconv("UTF-8",$default_charset,$_REQUEST['portalurl'])); +$conv_pname = function_exists(iconv) ? @iconv("UTF-8",$default_charset, $_REQUEST['portalname']) : $_REQUEST['portalname']; +$conv_purl = function_exists(iconv) ? @iconv("UTF-8",$default_charset, $_REQUEST['portalurl']) : $_REQUEST['portalurl']; +$portlname =str_replace(array("'",'"'),'',$conv_pname); +$portlurl =str_replace(array("'",'"'),'',$conv_purl); if($portlname != '' && $portlurl != '') { Modified: vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/CheckReport.php Mon Apr 30 02:13:46 2007 @@ -25,8 +25,8 @@ } else if($_REQUEST['check']== 'folderCheck') { - $folderName = $_REQUEST['folderName']; - $folderName =str_replace(array("'",'"'),'',iconv("UTF-8",$default_charset,$folderName)); + $folderName = function_exists(iconv) ? @iconv("UTF-8",$default_charset, $_REQUEST['folderName']) : $_REQUEST['folderName']; + $folderName =str_replace(array("'",'"'),'',$folderName); if($folderName == "" || !$folderName) { echo "999"; Modified: vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/SaveReportFolder.php Mon Apr 30 02:13:46 2007 @@ -20,7 +20,7 @@ $rfid = $_REQUEST['record']; $mode = $_REQUEST['savemode']; $foldername = addslashes($_REQUEST["foldername"]); -$foldername = iconv("UTF-8",$default_charset,$foldername); +$foldername = function_exists(iconv) ? @iconv("UTF-8",$default_charset, $foldername) : $foldername; $folderdesc = addslashes($_REQUEST["folderdesc"]); $foldername = str_replace('*amp*','&',$foldername); $folderdesc = str_replace('*amp*','&',$folderdesc); Modified: vtigercrm/branches/5.0.3/modules/Rss/Rss.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Rss/Rss.php (original) +++ vtigercrm/branches/5.0.3/modules/Rss/Rss.php Mon Apr 30 02:13:46 2007 @@ -75,7 +75,7 @@ $i = 0; foreach($this->rss_object as $key=>$item) { - $stringConvert = iconv("UTF-8",$default_charset,$item[title]); + $stringConvert = function_exists(iconv) ? @iconv("UTF-8",$default_charset,$item[title]) : $item[title]; $rss_title= addslashes(ltrim(rtrim($stringConvert))); $i = $i + 1; Modified: vtigercrm/branches/5.0.3/modules/Settings/SaveNotification.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/SaveNotification.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/SaveNotification.php Mon Apr 30 02:13:46 2007 @@ -12,8 +12,10 @@ require_once('include/database/PearDatabase.php'); global $default_charset; global $adb; -$notifysubject =str_replace(array("'",'"'),'',iconv("UTF-8",$default_charset,$_REQUEST['notifysubject'])); -$notifybody =str_replace(array("'",'"'),'',iconv("UTF-8",$default_charset,$_REQUEST['notifybody'])); +$conv_sub = function_exists(iconv) ? @iconv("UTF-8",$default_charset, $_REQUEST['notifysubject']) : $_REQUEST['notifysubject']; +$conv_body = function_exists(iconv) ? @iconv("UTF-8",$default_charset, $_REQUEST['notifybody']) : $_REQUEST['notifybody']; +$notifysubject =str_replace(array("'",'"'),'',$conv_sub); +$notifybody =str_replace(array("'",'"'),'',$conv_body); if($notifysubject != '' && $notifybody != '') { Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php Mon Apr 30 02:13:46 2007 @@ -632,7 +632,7 @@ if ($element_charset == 'x-unknown') $element_charset = 'ISO-8859-1'; - $element_converted = @iconv( $element_charset, $output_charset, $source[$j]->text); + $element_converted = function_exists(iconv) ? @iconv( $element_charset, $output_charset, $source[$j]->text): $source[$j]->text ; $result[$j]->text = $element_converted; $result[$j]->charset = $output_charset; } @@ -770,7 +770,7 @@ $body_charset = $_REQUEST['user_charset']; } $this->charsets = $body_charset; - $body_converted = @iconv( $body_charset, $GLOBALS['charset'], $body); + $body_converted = function_exists(iconv) ? @iconv( $body_charset, $GLOBALS['charset'], $body) : $body; $body = ($body_converted===FALSE) ? $body : $body_converted; $tmpvar['charset'] = ($body_converted===FALSE) ? $body_charset : $GLOBALS['charset']; } From extrication at globelinkservices.com Mon Apr 30 04:45:16 2007 From: extrication at globelinkservices.com (Leo C. Symposium) Date: Mon, 30 Apr 2007 04:45:16 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4430933393.20070430044516@globelinkservices.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/dd2f1ecc/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Cronkite.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/dd2f1ecc/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 04:39:48 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 08:39:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10815 - /vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php Message-ID: <20070430083948.B60DA7D26A1@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 30 02:39:43 2007 New Revision: 10815 Log: added UTF-8 supprot in inventory notification body Modified: vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php Modified: vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php Mon Apr 30 02:39:43 2007 @@ -10,12 +10,13 @@ ********************************************************************************/ require_once('Smarty_setup.php'); +require_once('config.php'); global $mod_strings; global $app_strings; global $app_list_strings; global $adb; -global $theme; +global $theme,$default_charset; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); @@ -30,7 +31,7 @@ { $label = $mod_strings[$adb->query_result($result,0,'notificationname')]; $notification_subject = $adb->query_result($result,0,'notificationsubject'); - $notification_body = $adb->query_result($result,0,'notificationbody'); + $notification_body = iconv("UTF-8",$default_charset,$adb->query_result($result,0,'notificationbody')); $notification_id = $adb->query_result($result,0,'notificationid'); $notification = Array(); From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 04:44:03 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 08:44:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10816 - /vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php Message-ID: <20070430084403.F07BE7D3551@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 30 02:43:59 2007 New Revision: 10816 Log: added check for iconv function Modified: vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php Modified: vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/EditInventoryNotification.php Mon Apr 30 02:43:59 2007 @@ -31,7 +31,7 @@ { $label = $mod_strings[$adb->query_result($result,0,'notificationname')]; $notification_subject = $adb->query_result($result,0,'notificationsubject'); - $notification_body = iconv("UTF-8",$default_charset,$adb->query_result($result,0,'notificationbody')); + $notification_body = function_exists(iconv) ? iconv("UTF-8",$default_charset,$adb->query_result($result,0,'notificationbody')) : $adb->query_result($result,0,'notificationbody'); $notification_id = $adb->query_result($result,0,'notificationid'); $notification = Array(); From marilynandsteve at greenwichconn.com Mon Apr 30 05:28:58 2007 From: marilynandsteve at greenwichconn.com (Thomas Terrell) Date: Mon, 30 Apr 2007 09:28:58 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <7360423143.20070430092858@greenwichconn.com> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/dfc60c92/attachment-0001.html From isthisdave at gianluca.net Mon Apr 30 05:39:08 2007 From: isthisdave at gianluca.net (Vicinity H. Independently) Date: Mon, 30 Apr 2007 05:39:08 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <0853893754.20070430053908@gianluca.net> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://oslz.hk Only Secure and Confidential purchase! Verified buy VISA! From rossi at gradebinder.com Mon Apr 30 05:46:13 2007 From: rossi at gradebinder.com (Scope V. Bursa) Date: Mon, 30 Apr 2007 05:46:13 -0400 Subject: [Vtigercrm-commits] Pharmacy for real men! Message-ID: <7980628793.20070430054613@gradebinder.com> The most powerful medicines for you! Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. Ultram - $1.83 - an analgesic used to treat or prevent pain. Testosterone - $7.5 - a steroid hormone from the androgen group. Testosterone is secreted in the testes of men and the ovaries of women. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From klouispinault at ghfs.com Mon Apr 30 06:15:21 2007 From: klouispinault at ghfs.com (Spankings D. Krishna) Date: Mon, 30 Apr 2007 06:15:21 -0400 Subject: [Vtigercrm-commits] Unbelievable prices! Message-ID: <7251592444.20070430061521@ghfs.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://oslz.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From gardening.guide at givnsav.com Mon Apr 30 06:51:46 2007 From: gardening.guide at givnsav.com (Ben G. Controverted) Date: Mon, 30 Apr 2007 06:51:46 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0045623553.20070430065146@givnsav.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/6f55de8f/attachment.html From gillis at go-home.com Mon Apr 30 07:07:19 2007 From: gillis at go-home.com (Djibouti P. Washbowls) Date: Mon, 30 Apr 2007 07:07:19 -0400 Subject: [Vtigercrm-commits] Girls don't like you? Message-ID: <6269250971.20070430070719@go-home.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://oslz.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 07:24:46 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 11:24:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10817 - /vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Message-ID: <20070430112446.C4A747D3555@vtiger.fosslabs.com> Author: richie Date: Mon Apr 30 05:24:38 2007 New Revision: 10817 Log: fix for Activities Related to not displaying in editview --minnie Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Mon Apr 30 05:24:38 2007 @@ -664,10 +664,9 @@ elseif($uitype == 66) { if(isset($_REQUEST['parent_id']) && $_REQUEST['parent_id'] != '') - { $value = $_REQUEST['parent_id']; + if($value != '') $parent_module = getSalesEntityType($value); - } // Check for vtiger_activity type if task orders to be added in select option $act_mode = $_REQUEST['activity_mode']; From ash at goozeffseeds.com Mon Apr 30 07:52:51 2007 From: ash at goozeffseeds.com (Photosynthesized V. Exhortations) Date: Mon, 30 Apr 2007 07:52:51 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2829361011.20070430075251@goozeffseeds.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/e7ab2cbf/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: suborbital.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/e7ab2cbf/attachment.gif From markus at gologan.de Mon Apr 30 08:28:22 2007 From: markus at gologan.de (Thresh H. Maximization) Date: Mon, 30 Apr 2007 08:28:22 -0400 Subject: [Vtigercrm-commits] sexual drive Message-ID: <3579479983.20070430082822@gologan.de> The most powerful medicines for you! Nymphomax - $35.99 - Helps women to achieve multiple and more powerful orgasms with this unique female sexual stimulant. Flomax - $1.2 - used to treat the symptoms of an enlarged prostate - a condition technically known as benign prostatic hyperplasia or BPH. Diflucan - $2.64 - a tablet taken orally to treat vaginal yeast infections caused by the yeast Candida. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extremerozchic at gpunto.com Mon Apr 30 08:28:13 2007 From: extremerozchic at gpunto.com (Delicious O. Altai) Date: Mon, 30 Apr 2007 08:28:13 -0400 Subject: [Vtigercrm-commits] Say NO to erectile dysfunction! Message-ID: <0705484477.20070430082813@gpunto.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://oslz.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 08:33:25 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 12:33:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10818 - /vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php Message-ID: <20070430123325.4AD937D356B@vtiger.fosslabs.com> Author: richie Date: Mon Apr 30 06:33:19 2007 New Revision: 10818 Log: missed file for patch integration #3653. --minnie Modified: vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php Modified: vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php (original) +++ vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php Mon Apr 30 06:33:19 2007 @@ -126,12 +126,12 @@ $smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record])); $smarty->assign("IS_REL_LIST",isPresentRelatedLists($currentModule)); +$sql = $adb->query('select accountid from vtiger_contactdetails where contactid='.$focus->id); +$accountid = $adb->query_result($sql,0,'accountid'); +if($accountid == 0) $accountid=''; +$smarty->assign("accountid",$accountid); if($singlepane_view == 'true') { - $sql = $adb->query('select accountid from vtiger_contactdetails where contactid='.$focus->id); - $accountid = $adb->query_result($sql,0,'accountid'); - if($accountid == 0) $accountid=''; - $smarty->assign("accountid",$accountid); $related_array = getRelatedLists($currentModule,$focus); $smarty->assign("RELATEDLISTS", $related_array); } From dickson at gravitytank.com Mon Apr 30 08:51:16 2007 From: dickson at gravitytank.com (Filling L. Duvet) Date: Mon, 30 Apr 2007 08:51:16 -0400 Subject: [Vtigercrm-commits] Worry about your erection? Message-ID: <5001763249.20070430085116@gravitytank.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://oslz.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 08:45:14 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 12:45:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10819 - in /vtigercrm/branches/5.0.3: Smarty/templates/ include/js/ include/utils/ modules/Contacts/ modules/Emails/ modules/Leads/ Message-ID: <20070430124514.A39097D356D@vtiger.fosslabs.com> Author: richie Date: Mon Apr 30 06:44:55 2007 New Revision: 10819 Log: fix for Leads - the 'AddEmail' option in call related list view page showing the popup menu even the value is empty. Fixes #3319 --minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl vtigercrm/branches/5.0.3/include/js/Mail.js vtigercrm/branches/5.0.3/include/utils/CommonUtils.php vtigercrm/branches/5.0.3/modules/Contacts/CallRelatedList.php vtigercrm/branches/5.0.3/modules/Emails/Emails.php vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php vtigercrm/branches/5.0.3/modules/Leads/CallRelatedList.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl Mon Apr 30 06:44:55 2007 @@ -127,7 +127,15 @@ {elseif $header eq 'Emails'} + {if $PERMIT eq '0'} + {if $MAIL_CHECK eq 'true'}
    -{if $PERMIT eq '0'}
    @@ -44,11 +43,15 @@ {else} {/if} + {if $PERMIT eq '0'} {if $ONE_RECORD eq 'true'} - + {else} {/if} + {else} + + {/if} {/foreach}
    {$elements.0}
    {$MAILDATA[$smarty.foreach.emailids.iteration]}    		{$elements.0}
    {$MAILDATA[$smarty.foreach.emailids.index]}    		{$elements.0}{$elements.0}
    {$MAILDATA[$smarty.foreach.emailids.index]}
    @@ -64,15 +67,4 @@
    -{else} - - -
    - - -
    - {$MOD.LBL_MAILSELECT_INFO3} -
    -
    -{/if}
    Modified: vtigercrm/branches/5.0.3/include/js/Mail.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/Mail.js (original) +++ vtigercrm/branches/5.0.3/include/js/Mail.js Mon Apr 30 06:44:55 2007 @@ -122,7 +122,13 @@ method: 'post', postBody: "module=Emails&return_module="+module+"&action=EmailsAjax&file=mailSelect&idlist="+idstrings, onComplete: function(response) { - getObj('sendmail_cont').innerHTML=response.responseText; + if(response.responseText == "Mail Ids not permitted") + { + var url= 'index.php?module=Emails&action=EmailsAjax&pmodule='+module+'&file=EditView&sendmail=true'; + openPopUp('xComposeEmail',this,url,'createemailWin',820,689,'menubar=no,toolbar=no,location=no,status=no,resizable=no'); + } + else + getObj('sendmail_cont').innerHTML=response.responseText; } } ); Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/CommonUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Mon Apr 30 06:44:55 2007 @@ -2858,5 +2858,40 @@ } +function is_emailId($entity_id) +{ + global $log,$adb; + $log->debug("Entering is_EmailId(".$module.",".$entity_id.") method"); + + $module = getSalesEntityType($entity_id); + if($module == 'Contacts') + { + $sql = "select email,yahooid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where contactid = ".$entity_id; + $result = $adb->query($sql); + $email1 = $adb->query_result($result,0,"email"); + $email2 = $adb->query_result($result,0,"yahooid"); + if(($email1 != "" || $email2 != "") || ($email1 != "" && $email2 != "")) + { + $check_mailids = "true"; + } + else + $check_mailids = "false"; + } + elseif($module == 'Leads') + { + $sql = "select email,yahooid from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid where leadid = ".$entity_id; + $result = $adb->query($sql); + $email1 = $adb->query_result($result,0,"email"); + $email2 = $adb->query_result($result,0,"yahooid"); + if(($email1 != "" || $email2 != "") || ($email1 != "" && $email2 != "")) + { + $check_mailids = "true"; + } + else + $check_mailids = "false"; + } + $log->debug("Exiting is_EmailId() method ..."); + return $check_mailids; +} ?> Modified: vtigercrm/branches/5.0.3/modules/Contacts/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Contacts/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.3/modules/Contacts/CallRelatedList.php Mon Apr 30 06:44:55 2007 @@ -46,6 +46,7 @@ global $app_strings; global $theme; global $currentModule; +global $current_user; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); @@ -62,6 +63,20 @@ } $parent_email = getEmailParentsList('Contacts',$_REQUEST['record']); $smarty->assign("HIDDEN_PARENTS_LIST",$parent_email); + +if(isset($_REQUEST['record']) && $_REQUEST['record']!='') +{ + $userid = $current_user->id; + $sql = "select fieldname from vtiger_field where uitype = 13 and tabid = 4"; + $result = $adb->query($sql); + $num_fieldnames = $adb->num_rows($result); + for($i = 0; $i < $num_fieldnames; $i++) + { + $fieldname = $adb->query_result($result,$i,"fieldname"); + $permit= getFieldVisibilityPermission("Contacts",$userid,$fieldname); + } +} + $category = getparenttab(); $smarty->assign("CATEGORY",$category); $smarty->assign("ID",$focus->id); @@ -81,6 +96,8 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("MAIL_CHECK", is_emailId($RECORD)); +$smarty->assign("PERMIT",$permit); $smarty->display("RelatedLists.tpl"); } ?> Modified: vtigercrm/branches/5.0.3/modules/Emails/Emails.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/Emails.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/Emails.php Mon Apr 30 06:44:55 2007 @@ -441,45 +441,51 @@ function get_to_emailids($module) { global $adb; - $query = 'select columnname,fieldid from vtiger_field where fieldid in('.ereg_replace(':',',',$_REQUEST["field_lists"]).')'; - $result = $adb->query($query); - $columns = Array(); - $idlists = ''; - $mailids = ''; - while($row = $adb->fetch_array($result)) - { - $columns[]=$row['columnname']; - $fieldid[]=$row['fieldid']; - } - $columnlists = implode(',',$columns); - $crmids = ereg_replace(':',',',$_REQUEST["idlist"]); - switch($module) - { - case 'Leads': - $query = 'select crmid,concat(lastname," ",firstname) as entityname,'.$columnlists.' from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid left join vtiger_leadscf on vtiger_leadscf.leadid = vtiger_leaddetails.leadid where vtiger_crmentity.deleted=0 and vtiger_crmentity.crmid in ('.$crmids.')'; - break; - case 'Contacts': - $query = 'select crmid,concat(lastname," ",firstname) as entityname,'.$columnlists.' from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid left join vtiger_contactscf on vtiger_contactscf.contactid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted=0 and vtiger_crmentity.crmid in ('.$crmids.')'; - break; - case 'Accounts': - $query = 'select crmid,accountname as entityname,'.$columnlists.' from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid left join vtiger_accountscf on vtiger_accountscf.accountid = vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_crmentity.crmid in ('.$crmids.')'; - break; + if(isset($_REQUEST["field_lists"]) && $_REQUEST["field_lists"] != "") + { + $query = 'select columnname,fieldid from vtiger_field where fieldid in('.ereg_replace(':',',',$_REQUEST["field_lists"]).')'; + $result = $adb->query($query); + $columns = Array(); + $idlists = ''; + $mailids = ''; + while($row = $adb->fetch_array($result)) + { + $columns[]=$row['columnname']; + $fieldid[]=$row['fieldid']; + } + $columnlists = implode(',',$columns); + $crmids = ereg_replace(':',',',$_REQUEST["idlist"]); + switch($module) + { + case 'Leads': + $query = 'select crmid,concat(lastname," ",firstname) as entityname,'.$columnlists.' from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid left join vtiger_leadscf on vtiger_leadscf.leadid = vtiger_leaddetails.leadid where vtiger_crmentity.deleted=0 and vtiger_crmentity.crmid in ('.$crmids.')'; + break; + case 'Contacts': + $query = 'select crmid,concat(lastname," ",firstname) as entityname,'.$columnlists.' from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid left join vtiger_contactscf on vtiger_contactscf.contactid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted=0 and vtiger_crmentity.crmid in ('.$crmids.')'; + break; + case 'Accounts': + $query = 'select crmid,accountname as entityname,'.$columnlists.' from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid left join vtiger_accountscf on vtiger_accountscf.accountid = vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_crmentity.crmid in ('.$crmids.')'; + break; + } + $result = $adb->query($query); + while($row = $adb->fetch_array($result)) + { + $name = $row['entityname']; + for($i=0;$i,'; + } + } + } + + $return_data = Array('idlists'=>$idlists,'mailds'=>$mailids); + }else + { + $return_data = Array('idlists'=>"",'mailds'=>""); } - $result = $adb->query($query); - while($row = $adb->fetch_array($result)) - { - $name = $row['entityname']; - for($i=0;$i,'; - } - } - } - - $return_data = Array('idlists'=>$idlists,'mailds'=>$mailids); return $return_data; } Modified: vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php Mon Apr 30 06:44:55 2007 @@ -12,7 +12,7 @@ require_once('include/database/PearDatabase.php'); -global $app_strings,$mod_strings,$current_user,$theme; +global $app_strings,$mod_strings,$current_user,$theme,$adb; $image_path = 'themes/'.$theme.'/images/'; $idlist = $_REQUEST['idlist']; $pmodule=$_REQUEST['return_module']; @@ -25,51 +25,39 @@ $smarty = new vtigerCRM_Smarty; $userid = $current_user->id; -if($pmodule == "Contacts") +if($pmodule=='Accounts') { - $permit = getFieldVisibilityPermission("Contacts", $userid, "email"); -} -elseif($pmodule == "Accounts") -{ - $permit = getFieldVisibilityPermission("Accounts", $userid, "email1"); -} -elseif($pmodule == "Leads") -{ - $permit = getFieldVisibilityPermission("Leads", $userid, "email"); -} -if($permit == '0'); -{ - $smarty->assign("PERMIT", $permit); -} - -if ($pmodule=='Accounts') -{ - $querystr="select fieldid,fieldlabel,columnname,tablename from vtiger_field where tabid=6 and uitype=13;"; + $querystr="select fieldid,fieldname,fieldlabel,columnname,tablename from vtiger_field where tabid=6 and uitype=13"; } elseif ($pmodule=='Contacts') { - $querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=4 and uitype=13;"; + $querystr="select fieldid,fieldname,fieldlabel,columnname from vtiger_field where tabid=4 and uitype=13"; } elseif ($pmodule=='Leads') { - $querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=7 and uitype=13;"; + $querystr="select fieldid,fieldname,fieldlabel,columnname from vtiger_field where tabid=7 and uitype=13"; } -$result=$adb->query($querystr); -$numrows = $adb->num_rows($result); +$res=$adb->query($querystr); +$numrows = $adb->num_rows($res); $returnvalue = Array(); -for ($i=0;$i<$numrows;$i++) +for($i = 0; $i < $numrows; $i++) { $value = Array(); - $temp=$adb->query_result($result,$i,'columnname'); - $columnlists [] = $temp; - $fieldid=$adb->query_result($result,$i,'fieldid'); - $value[] =$adb->query_result($result,$i,'fieldlabel'); - $returnvalue [$fieldid]= $value; + $fieldname = $adb->query_result($res,$i,"fieldname"); + $permit = getFieldVisibilityPermission($pmodule, $userid, $fieldname); + if($permit == '0') + { + $temp=$adb->query_result($res,$i,'columnname'); + $columnlists [] = $temp; + $fieldid=$adb->query_result($res,$i,'fieldid'); + $value[] =$adb->query_result($res,$i,'fieldlabel'); + $returnvalue [$fieldid]= $value; + } } -if($single_record) +if($single_record && count($columnlists) > 0) { - $count = 1; + $count = 0; switch($pmodule) { case 'Accounts': @@ -101,6 +89,7 @@ break; } } +$smarty->assign('PERMIT',$permit); $smarty->assign('ENTITY_NAME',$entity_name); $smarty->assign('ONE_RECORD',$single_record); $smarty->assign('MAILDATA',$field_value); @@ -111,5 +100,8 @@ $smarty->assign("FROM_MODULE", $pmodule); $smarty->assign("IMAGE_PATH",$image_path); -$smarty->display("SelectEmail.tpl"); +if(count($columnlists) > 0) + $smarty->display("SelectEmail.tpl"); +else + echo "Mail Ids not permitted"; ?> Modified: vtigercrm/branches/5.0.3/modules/Leads/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Leads/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.3/modules/Leads/CallRelatedList.php Mon Apr 30 06:44:55 2007 @@ -39,6 +39,7 @@ global $app_strings; global $theme; global $currentModule; +global $current_user; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -58,7 +59,20 @@ { unset($_SESSION['rlvs']); } - + +if(isset($_REQUEST['record']) && $_REQUEST['record']!='') +{ + $userid = $current_user->id; + $sql = "select fieldname from vtiger_field where uitype = 13 and tabid = 7"; + $result = $adb->query($sql); + $num_fieldnames = $adb->num_rows($result); + for($i = 0; $i < $num_fieldnames; $i++) + { + $fieldname = $adb->query_result($result,$i,"fieldname"); + $permit= getFieldVisibilityPermission("Leads",$userid,$fieldname); + } +} + $category = getParentTab(); $smarty->assign("CATEGORY",$category); $parent_email = getEmailParentsList('Leads',$focus->id); @@ -80,6 +94,8 @@ $check_button = Button_Check($module); $smarty->assign("CHECK", $check_button); +$smarty->assign("MAIL_CHECK", is_emailId($RECORD)); +$smarty->assign("PERMIT",$permit); $smarty->display("RelatedLists.tpl"); } ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 09:03:10 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 13:03:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10820 - in /vtigercrm/branches/5.0.3: include/language/en_us.lang.php modules/Emails/mailSelect.php Message-ID: <20070430130310.62F1A7D3570@vtiger.fosslabs.com> Author: richie Date: Mon Apr 30 07:02:57 2007 New Revision: 10820 Log: * Fixed the i18n issue and removed unwanted if conditions, Fixed #3681 Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Mon Apr 30 07:02:57 2007 @@ -876,6 +876,7 @@ 'Lead Status'=>'Lead Status', 'Lead Source'=>'Lead Source', 'Quote ID'=>'Quote Id', +'Yahoo Id'=>'Yahoo Id', ); $app_list_strings = array ( Modified: vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php Mon Apr 30 07:02:57 2007 @@ -25,18 +25,9 @@ $smarty = new vtigerCRM_Smarty; $userid = $current_user->id; -if($pmodule=='Accounts') -{ - $querystr="select fieldid,fieldname,fieldlabel,columnname,tablename from vtiger_field where tabid=6 and uitype=13"; -} -elseif ($pmodule=='Contacts') -{ - $querystr="select fieldid,fieldname,fieldlabel,columnname from vtiger_field where tabid=4 and uitype=13"; -} -elseif ($pmodule=='Leads') -{ - $querystr="select fieldid,fieldname,fieldlabel,columnname from vtiger_field where tabid=7 and uitype=13"; -} + +$querystr = "select fieldid, fieldlabel, columnname from vtiger_field where tabid=".getTabid($pmodule)." and uitype=13"; + $res=$adb->query($querystr); $numrows = $adb->num_rows($res); $returnvalue = Array(); @@ -50,7 +41,8 @@ $temp=$adb->query_result($res,$i,'columnname'); $columnlists [] = $temp; $fieldid=$adb->query_result($res,$i,'fieldid'); - $value[] =$adb->query_result($res,$i,'fieldlabel'); + $fieldlabel =$adb->query_result($res,$i,'fieldlabel'); + $value[] = getTranslatedString($fieldlabel); $returnvalue [$fieldid]= $value; } } From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 09:04:09 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 13:04:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10821 - /vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Message-ID: <20070430130410.1C9F47D357B@vtiger.fosslabs.com> Author: richie Date: Mon Apr 30 07:04:05 2007 New Revision: 10821 Log: * changed the log information Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/CommonUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Mon Apr 30 07:04:05 2007 @@ -2667,9 +2667,9 @@ function getTranslatedString($str) { global $app_strings, $mod_strings, $log; - $str = ($app_strings[$str] != '')?$app_strings[$str]:(($mod_strings[$str] != '')?$mod_strings[$str]:$str); - $log->debug("function getTranslatedString($str) - translated to ($str)"); - return $str; + $trans_str = ($app_strings[$str] != '')?$app_strings[$str]:(($mod_strings[$str] != '')?$mod_strings[$str]:$str); + $log->debug("function getTranslatedString($str) - translated to ($trans_str)"); + return $trans_str; } /** function used to get the list of importable fields From lromero at gkdruck.com Mon Apr 30 09:24:31 2007 From: lromero at gkdruck.com (Doggie F. Dandled) Date: Mon, 30 Apr 2007 09:24:31 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6322114922.20070430092431@gkdruck.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/bc2fe6bd/attachment-0002.html From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 09:27:36 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 13:27:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10822 - /vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php Message-ID: <20070430132736.545867C80F0@vtiger.fosslabs.com> Author: saraj Date: Mon Apr 30 07:27:28 2007 New Revision: 10822 Log: Account name sorting added in default customview Modified: vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php Modified: vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php Mon Apr 30 07:27:28 2007 @@ -219,26 +219,26 @@ Array('vtiger_contactdetails:firstname:firstname:Contacts_First_Name:V', 'vtiger_contactdetails:lastname:lastname:Contacts_Last_Name:V', 'vtiger_contactdetails:title:title:Contacts_Title:V', - 'vtiger_contactdetails:accountid:account_id:Contacts_Account_Name:V', + 'vtiger_account:accountname:accountname:Contacts_Account_Name:V', 'vtiger_contactdetails:email:email:Contacts_Email:E', 'vtiger_contactsubdetails:otherphone:otherphone:Contacts_Phone:V', 'vtiger_crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V'), Array('vtiger_potential:potentialname:potentialname:Potentials_Potential_Name:V', - 'vtiger_potential:accountid:account_id:Potentials_Account_Name:V', + 'vtiger_account:accountname:accountname:Potentials_Account_Name:V', 'vtiger_potential:sales_stage:sales_stage:Potentials_Sales_Stage:V', 'vtiger_potential:leadsource:leadsource:Potentials_Lead_Source:V', 'vtiger_potential:closingdate:closingdate:Potentials_Expected_Close_Date:D', 'vtiger_crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V'), Array('vtiger_potential:potentialname:potentialname:Potentials_Potential_Name:V', - 'vtiger_potential:accountid:account_id:Potentials_Account_Name:V', + 'vtiger_account:accountname:accountname:Potentials_Account_Name:V', 'vtiger_potential:amount:amount:Potentials_Amount:N', 'vtiger_potential:closingdate:closingdate:Potentials_Expected_Close_Date:D', 'vtiger_crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V'), Array('vtiger_potential:potentialname:potentialname:Potentials_Potential_Name:V', - 'vtiger_potential:accountid:account_id:Potentials_Account_Name:V', + 'vtiger_account:accountname:accountname:Potentials_Account_Name:V', 'vtiger_potential:amount:amount:Potentials_Amount:N', 'vtiger_potential:leadsource:leadsource:Potentials_Lead_Source:V', 'vtiger_potential:closingdate:closingdate:Potentials_Expected_Close_Date:D', From davdrub at golfspace.com Mon Apr 30 09:40:59 2007 From: davdrub at golfspace.com (Subjectives P. Knackwurst) Date: Mon, 30 Apr 2007 09:40:59 -0400 Subject: [Vtigercrm-commits] Want to be a hero in a bed? Message-ID: <3929231330.20070430094059@golfspace.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://oslz.hk ONLY! From aurora at gierredistribuzione.com Mon Apr 30 10:24:18 2007 From: aurora at gierredistribuzione.com (Rigor U. Boswell) Date: Mon, 30 Apr 2007 10:24:18 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0874762083.20070430102418@gierredistribuzione.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/f0e1e39b/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: turnstiles.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/f0e1e39b/attachment.gif From coffee at getcarenetwork.org Mon Apr 30 10:30:54 2007 From: coffee at getcarenetwork.org (Headaches I. Switch) Date: Mon, 30 Apr 2007 10:30:54 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <0306002562.20070430103054@getcarenetwork.org> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://oslz.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From rhodes at gimeon.com Mon Apr 30 11:46:27 2007 From: rhodes at gimeon.com (Dragon I. Corrugated) Date: Mon, 30 Apr 2007 11:46:27 -0400 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <0576838628.20070430114627@gimeon.com> The most powerful medicines for you! Valtrex - $4.95 - reduce the risk of spreading genital herpes Hangover Pills - $35.99 Uncle Rummies Hangover Pills are an all-natural dietary supplement providing protection from the "morning after" symptoms experienced after prolonged or excessive alcohol consumption. If taken as directed, Uncle Rummie's Hangover Helper can completely eliminate unpleasant side-effects such as headaches, nausea and dehydration. Proprecia - $1.03 - first and only FDA-approved pill demonstrated to treat male pattern hair loss on the vertex (top of head) and anterior mid-scalp area (middle front of head) in men only. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From beatty at glvxq.die.net Mon Apr 30 11:50:32 2007 From: beatty at glvxq.die.net (Hypnotics H. Janitor) Date: Mon, 30 Apr 2007 11:50:32 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <8667476957.20070430115032@glvxq.die.net> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft ? the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://oslz.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From bartlett at goodonu.com Mon Apr 30 12:02:03 2007 From: bartlett at goodonu.com (Rubbished M. Abracadabra) Date: Mon, 30 Apr 2007 12:02:03 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9070290072.20070430120203@goodonu.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/3acecedf/attachment.html From roddett at goodcompany.net Mon Apr 30 12:17:48 2007 From: roddett at goodcompany.net (Brewery L. Announcer) Date: Mon, 30 Apr 2007 12:17:48 -0400 Subject: [Vtigercrm-commits] Can't stand sex all night long? Message-ID: <6174317821.20070430121748@goodcompany.net> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://oslz.hk verified by VISA and certified by CIPA. From vtigercrm-commits at vtiger.fosslabs.com Mon Apr 30 12:46:58 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Apr 2007 16:46:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10823 - /vtigercrm/tags/vtigercrm-5.0.3-rc4/ Message-ID: <20070430164658.F414B7D22CE@vtiger.fosslabs.com> Author: richie Date: Mon Apr 30 10:46:39 2007 New Revision: 10823 Log: 5.0.3-rc4 version tagged Added: vtigercrm/tags/vtigercrm-5.0.3-rc4/ - copied from r10822, vtigercrm/branches/5.0.3/ From account at gipda.com Mon Apr 30 12:58:47 2007 From: account at gipda.com (Tricycled Q. Tantalizing) Date: Mon, 30 Apr 2007 12:58:47 -0400 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <1210204352.20070430125847@gipda.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft ? the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://oslz.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From steven at go4learning.org Mon Apr 30 13:01:50 2007 From: steven at go4learning.org (Mandolin I. Hose) Date: Mon, 30 Apr 2007 13:01:50 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2838192891.20070430130150@go4learning.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/32558f76/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: trapezoidal.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/32558f76/attachment.gif From solomon at gillesjobin.org Mon Apr 30 13:49:50 2007 From: solomon at gillesjobin.org (James Hill) Date: Mon, 30 Apr 2007 17:49:50 +0000 Subject: [Vtigercrm-commits] FDA approved on-line pharmacies Message-ID: <7723068372.20070430174950@gillesjobin.org> FDA approved on-line pharmacies.click here Chose your product and site below: Canadian pharmacy - Cialis Soft Tabs - $5.78, Viagra Professional - $4.07, Viagra Soft Tabs - $4.1, Cialis - $5.67, Generic Viagra - $3.5, Soma - $1.38, Human Growth Hormone - $43.37, Meridia - $3.32, Tramadol - $2.17, Levitra - $11.97. HerbalKing - Herbal pills for Penis enlargement. Techniques, procedures, videos and tutorials. Don't waste your money on ineffective and possibly dangerous pumps, exercises and surgeries. Anatrim - Are you ready for Summer? Use Anatrim, the most powerful fat loss blend available anywhere. Safe, fast, effective! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/e431de1e/attachment-0002.html From lisa at grcop.org Mon Apr 30 14:41:20 2007 From: lisa at grcop.org (Backbitings R. Appertain) Date: Mon, 30 Apr 2007 14:41:20 -0400 Subject: [Vtigercrm-commits] On-line generic store Message-ID: <9097046356.20070430144120@grcop.org> The most powerful medicines for you! Lipotrexate - $35.99 - one of the safest and most powerful dietary supplements on the market. Its special proprietary blend of pharmaceutical grade botanicals provides you with consistent levels of sustained energy all day without the nervousness or jitters commonly associated with other diet pills. Prilosec - $1.33 - can be taken to decrease the amount of acid produced in the stomach. Imitrex - $9.06 - acute treatment of migraine attacks. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From boyer at gicshootingstar.com Mon Apr 30 15:01:32 2007 From: boyer at gicshootingstar.com (Adore S. Swaths) Date: Mon, 30 Apr 2007 15:01:32 -0400 Subject: [Vtigercrm-commits] Medications that you need! Message-ID: <1567842317.20070430150132@gicshootingstar.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft ? the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://oslz.hk Verified by VISA and sell FDA Approved Drugs only! From extriton at goodpet.com Mon Apr 30 15:14:39 2007 From: extriton at goodpet.com (Kilometer B. Confined) Date: Mon, 30 Apr 2007 15:14:39 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <8207304652.20070430151439@goodpet.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/c1ca4cb6/attachment-0001.html From bacon at gracenotworks.com Mon Apr 30 15:22:07 2007 From: bacon at gracenotworks.com (Shorthorn V. Misruling) Date: Mon, 30 Apr 2007 15:22:07 -0400 Subject: [Vtigercrm-commits] Best way to cure yourself. Message-ID: <2583247193.20070430152207@gracenotworks.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://oslz.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From agately at globe-invest.com Mon Apr 30 16:02:37 2007 From: agately at globe-invest.com (Backups E. Bauhaus) Date: Mon, 30 Apr 2007 16:02:37 -0400 Subject: [Vtigercrm-commits] Straining yourself when you are with woman? Message-ID: <9134717575.20070430160237@globe-invest.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://oslz.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From istackhouse at gowilco.com Mon Apr 30 16:05:36 2007 From: istackhouse at gowilco.com (Detects H. Crawford) Date: Mon, 30 Apr 2007 16:05:36 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1040930076.20070430160536@gowilco.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/ba650d8c/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Gropius.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/ba650d8c/attachment.gif From cem at gesundheitspark.com Mon Apr 30 17:19:36 2007 From: cem at gesundheitspark.com (Prudential J. Paupers) Date: Mon, 30 Apr 2007 17:19:36 -0400 Subject: [Vtigercrm-commits] See the results after using V1 agra Message-ID: <8436637783.20070430171936@gesundheitspark.com> The most powerful medicines for you! Virility Patch - $42.85 - Male Enhancement Formula is an all natural herbal patch containing a variety of herbs known for promoting sexual desire and performance. Zero Nicotine - $47.99 - innovative stop smoking patch designed to help you give up smoking safely and naturally. With its unique blend of ingredients, Zero Nicotine offers you the best possible chance to finally kick the deadly habit for good! If you are serious about your decision to quit smoking, you?ve come to the right place. All-Natural Magnesium Oxide - $35.99 - All-Natural Magnesium Oxide is a rich source of elemental magnesium, an essential mineral. Magnesium plays a role in many vital body functions, including protein biosynthesis, as well as bone and muscle formation, and as a cofactor in hundreds of enzymatic reactions. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From letsmtb at gkgraphics.com Mon Apr 30 18:21:36 2007 From: letsmtb at gkgraphics.com (Muir P. Upturning) Date: Mon, 30 Apr 2007 18:21:36 -0400 Subject: [Vtigercrm-commits] No need to visit local drug store. Message-ID: <9990682062.20070430182136@gkgraphics.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://oslz.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From extrmfit at gnstc.com Mon Apr 30 18:48:11 2007 From: extrmfit at gnstc.com (Jared A. Author) Date: Mon, 30 Apr 2007 18:48:11 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7021794799.20070430184811@gnstc.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/dcb89842/attachment-0001.html From cec at greencapsule.org Mon Apr 30 19:06:35 2007 From: cec at greencapsule.org (Foreordains C. Reconstructs) Date: Mon, 30 Apr 2007 19:06:35 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <4375699408.20070430190635@greencapsule.org> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://oslz.hk Verified by VISA and sell FDA Approved Drugs only! From shellyflaherty at gradgiftlife.com Mon Apr 30 19:51:17 2007 From: shellyflaherty at gradgiftlife.com (Ind E. Blindfold) Date: Mon, 30 Apr 2007 19:51:17 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3742765778.20070430195117@gradgiftlife.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/8d2d8f36/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: screamed.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/8d2d8f36/attachment.gif From agassiz_review at goldtelevision.com Mon Apr 30 20:02:04 2007 From: agassiz_review at goldtelevision.com (Lengthens G. Caracas) Date: Mon, 30 Apr 2007 20:02:04 -0400 Subject: [Vtigercrm-commits] Tired of your health problems? Message-ID: <3076204996.20070430200204@goldtelevision.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://oslz.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From extremebrutality at greatlakes.seagulf.com Mon Apr 30 20:48:49 2007 From: extremebrutality at greatlakes.seagulf.com (Reprints O. Clark) Date: Mon, 30 Apr 2007 20:48:49 -0400 Subject: [Vtigercrm-commits] Fighting sexual disorder Message-ID: <5275084882.20070430204849@greatlakes.seagulf.com> The most powerful medicines for you! Proprecia - $1.03 - first and only FDA-approved pill demonstrated to treat male pattern hair loss on the vertex (top of head) and anterior mid-scalp area (middle front of head) in men only. Zero Nicotine - $47.99 - innovative stop smoking patch designed to help you give up smoking safely and naturally. With its unique blend of ingredients, Zero Nicotine offers you the best possible chance to finally kick the deadly habit for good! If you are serious about your decision to quit smoking, you?ve come to the right place. Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From serbag.n at glmanagement.ca Mon Apr 30 21:44:26 2007 From: serbag.n at glmanagement.ca (Asylum U. Absently) Date: Mon, 30 Apr 2007 21:44:26 -0400 Subject: [Vtigercrm-commits] Why don't you buy some medications to be healthy? Message-ID: <3012996664.20070430214426@glmanagement.ca> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://oslz.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From agassol at greenwoodsculptures.com Mon Apr 30 22:05:33 2007 From: agassol at greenwoodsculptures.com (Alleviation F. Airlifts) Date: Mon, 30 Apr 2007 22:05:33 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2333440975.20070430220533@greenwoodsculptures.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/dd332565/attachment-0001.html From istiyono at greenvilleawning.com Mon Apr 30 22:06:58 2007 From: istiyono at greenvilleawning.com (Growth F. Excavation) Date: Mon, 30 Apr 2007 22:06:58 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <5745953661.20070430220658@greenvilleawning.com> Don't strain yourself! You can buy all MUST HAVE medications at Canadian Pharmacy store! Viagra, Levitra, Cialis, Valium and much more pills at your disposal. Instant shipping worldwide! http://oslz.hk Instant shipping worldwide! CONFIDENTIAL purchase! From istatchjc at gestionforeal.ca Mon Apr 30 23:06:19 2007 From: istatchjc at gestionforeal.ca (Ventilation U. Slouchier) Date: Mon, 30 Apr 2007 23:06:19 -0400 Subject: [Vtigercrm-commits] Top listed medications 4 you. Message-ID: <0029448327.20070430230619@gestionforeal.ca> Make your dreams come true with licensed medications from US Drug Store! Any pills at your choice. There is no need to visit your local drug store at all. http://oslz.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From louise.b.thompson at globalmouldings.com Mon Apr 30 23:19:16 2007 From: louise.b.thompson at globalmouldings.com (Tanner S. Flapjack) Date: Mon, 30 Apr 2007 23:19:16 -0400 Subject: [Vtigercrm-commits] Problems everywhere? Message-ID: <9361928141.20070430231916@globalmouldings.com> The most powerful medicines for you! All-Natural Magnesium Oxide - $35.99 - All-Natural Magnesium Oxide is a rich source of elemental magnesium, an essential mineral. Magnesium plays a role in many vital body functions, including protein biosynthesis, as well as bone and muscle formation, and as a cofactor in hundreds of enzymatic reactions. Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. and more! our site http://oslz.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From isthe at grindal.net Mon Apr 30 23:20:45 2007 From: isthe at grindal.net (Fattiest O. Appearance) Date: Mon, 30 Apr 2007 23:20:45 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4720742569.20070430232045@grindal.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/29131d6e/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Trujillo.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070430/29131d6e/attachment.gif