From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 3 00:20:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 03 Oct 2006 07:20:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9546 - in /vtigercrm/branches/5.0.1/themes: alphagrey/style.css woodspice/style.css Message-ID: <20061003072009.336CD787E0F@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Oct 3 01:19:52 2006 New Revision: 9546 Log: css trimed for alphagrey and wood spice Modified: vtigercrm/branches/5.0.1/themes/alphagrey/style.css vtigercrm/branches/5.0.1/themes/woodspice/style.css Modified: vtigercrm/branches/5.0.1/themes/alphagrey/style.css ============================================================================== --- vtigercrm/branches/5.0.1/themes/alphagrey/style.css (original) +++ vtigercrm/branches/5.0.1/themes/alphagrey/style.css Tue Oct 3 01:19:52 2006 @@ -109,7 +109,7 @@ -.level2text { +/*.level2text { font-family: Arial, Helvetica, sans-serif; font-size: 11px; @@ -130,7 +130,7 @@ text-decoration:underline; color:#555555; -} +}*/ .level2Bg { @@ -165,13 +165,6 @@ padding-top:5px; padding-bottom:5px; } - - -.tabLiner { - background:#999 url(images/moduleSelectorBg.gif) bottom repeat-x; - padding:0px; -} - .sep1 { background:#999999; } @@ -183,15 +176,10 @@ a { text-decoration:none; color:#000099; - - - } a:hover { text-decoration:underline; - - } .hdrLink { @@ -239,8 +227,6 @@ } .lvtBg { - - } .lvtHeaderText { @@ -319,16 +305,6 @@ border-bottom:2px solid #aaaaaa; padding-left:0px; } - -.rightAddInfo { - border-left:1px solid #a2a2a2; - border-right:1px solid #dddddd; - border-bottom:1px solid #dddddd; - border-top:1px solid #a2a2a2; - background-color:#fafafa; - padding:5px; -} - .dvtCellLabel, .cellLabel { background-color:#efefef; padding-right:10px; @@ -363,18 +339,6 @@ background-color:#fafafa; } - -.rightUpcomingActivitiesHeader{ - border-bottom:1px solid #dddddd; - padding:5px; - background-color:#ffffdd; -} - -.rightUpcomingActivitiesContent { - padding:5px; - background-color:#ffffef; -} - .detailedViewHeader{ border-bottom:2px solid #dadada; padding:5px; @@ -390,17 +354,6 @@ width:90%; background-color:#ffffff; } - -.detailedViewProdTextBox { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:85%; - background-color:#ffffff; -} - .detailedViewTextBoxOn { font-family: Arial, Helvetica, sans-serif; font-size: 11px; @@ -409,32 +362,6 @@ padding-left:5px; width:90%; background-color:#ffffdd; -} - -.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 ------------------------------------------- */ - -.moduleSearch { - border:1px solid #dddddd; - background-color:#ffffef; - -} - -.searchHdrBox { - - border-bottom:1px dashed #dddddd; } .advSearch { @@ -463,29 +390,6 @@ width:10px } -.searchNotFound { - border:2px solid #999999; - background-color:#fafafa; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #ff0000; - height:50px; - width:640px; -} - - -.loginTopBg { - background:url(images/loginTopBg.gif) repeat-x; -} - -.loginTopShade { - background:url(images/loginTopShade.gif) repeat-x; -} - -.loginBg{ - background:#448cEB url(images/loginBg.gif) repeat-x; -} - .textbox { border:1px solid #999999; background-color:#ffffff; @@ -495,31 +399,8 @@ padding:2px; } - -.loginBottomBg { - background:url(images/loginBottomBg.gif) repeat-x; -} - -.loginSignin { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - color: #448ceb; - font-weight:bold; -} - -.loginBillBoard { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color:#ffffff; -} - .mx { } - -.calTopBg { - background:url(images/calBg.gif) repeat-x; -} - .calListTable td{ border-bottom:1px solid #efefef; border-left:1px solid #efefef; @@ -528,18 +409,6 @@ width:100%; border:1px solid #999999; -} -.calDisplay { - border-left:1px solid #d0d0d0; - border-right:1px solid #d0d0d0; -} -.calBottomBg { - background:url(images/calBottomBg.gif) repeat-x; -} - -.calDayHourCell { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; } .calDayHour { border-top:1px solid #dddddd; @@ -548,35 +417,6 @@ border-right:1px solid #dddddd; background-color:#eaeaea; } -.calDiv { - overflow:auto; width:95%;height:200px;padding:0px;background-color:#fefefe; - border-top: 1px solid #bababa; - border-bottom: 1px solid #bababa; -} -.calColHdr{ - border-top:1px solid #fefefa; - border-left:1px solid #fefefa; - - border-right:1px solid #a9a9a9; - background-color:#f5f5f5; -} -.calHourCol { - border-top: 1px solid #fefefa; - border-left: 1px solid #fefefa; - border-right: 1px solid #9a9a9a; - border-bottom: 1px solid #9a9a9a; - background-color: #efefef; - height: 30px; - -} -.calHourOccupied { - background-color:#d9d9d9; - -} -.calListViewRow { - border-bottom:1px solid e1e1e1; -} - .calAddEvent { position:absolute; z-index:10000; @@ -585,105 +425,14 @@ top:150px; background-color:#ffffff; } - -.addEventHeader{ - border-bottom:2px dotted #cccccc; -} - -.addEventFooter{ - border-top:2px dotted #cccccc; - height:40px; -} - .addEventInnerBox { border:1px dotted #dadada; } - -.cellScheduled { - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSchHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSch{ - border:0px; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellNormalHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffff; - color:#7a7a7a; -} - .cellNormal { border:0px; background-color:#ffffff; } - -.calEventNormal { - border:1px solid #999999; - background-color:#99ffcc; - -} - -.calEventCritical { - border:1px solid #999999; - background-color:#FFCC33; -} -.tblPro1 { - -border:2px solid #dadada; - background-color:white; - -} - -.tblPro1IconCell { - border-right:1px solid #dadada; -} - -.tblPro1HeadingCell { - font-weight:bold; -color:#4a4a4a; -} - -.tblPro1ColHeader { - background-color:#dadada; - border-left:1px solid white; - border-right:1px solid #999999; - font-size: 11px; - line-height: 14px; - background-image:url(images/tblPro1ColBg.gif); -} - -.tblPro1DataCell { - border-bottom:1px solid #f5f5f5; - color:#5a5a5a; - font-size: 11px; - line-height: 14px; - -} - -.divEventToDo { -overflow:auto; -height:150px; -border:1px solid #dadada; - -} - .EventToDo{ } @@ -696,119 +445,6 @@ margin-right: 10px; margin-bottom: 15px; } - -.thumbnailcaption -{ font-size: 0.9em; padding-top: 0.2em ; } - -/* For Settings */ - -.lftMnuTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-color:#BBBBBB; - border-left:1px solid #666666; - border-right:1px solid #666666; - border-top:0px solid #666666; - border-collapse:collapse; - text-align:right; - padding-top:0px; - padding-left:5px; - padding-right:5px; - vertical-align:top; -} - -.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-decoration:none; - width:99%; -} - -.lftMnuHdr tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-align:left; - text-decoration:none; - height:25px; - padding-right:0px; - padding-left:0px; -} - -a.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; - vertical-align:middle; -} - -a.lftMnuHdr:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; -} - -a.lftSubMnu{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; -} - -a.lftSubMnu:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; - background-color:#CCCCCC; -} - .padTab{ padding-top:0px; padding-left:0px; @@ -817,26 +453,6 @@ vertical-align:top; } - -.controlTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - width:100%; - border:0px; -} - -.controlTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - vertical-align:bottom; -} - #company{ position:relative; width:100%; @@ -850,32 +466,9 @@ #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;} -#studioTab{position:relative;left:0px;top:0px;width:100%;display:none;} - -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} -.imgDoc{ - cursor:pointer; - border:0px; -} - #one{ position:relative; display:block; @@ -936,83 +529,12 @@ /*Added for Advance Seearch*/ -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} - -.imgDoc{ - cursor:pointer; - border:0px; -} -#slideMnu{ - background-color:#BBBBBB; - vertical-align:top; -} - #one{ position:relative; display:block; width:245px; } -.prdTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:100%; - border-left:0px solid #CCCCCC; - border-right:0px solid #CCCCCC; - border-collapse:collapse; -} - -.prdTab tr th{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - padding-left:5px; - background-color:#E5E5E5; - height:20px; - color:#000000; - font-weight:bold; - text-decoration:none; - border-bottom:1px solid #CCCCCC; -} - -.prdTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - border-bottom:1px solid #CCCCCC; - padding-left:5px; - color:#000000; - text-decoration:none; - font-weight:normal; - height:20px; -} - -.delTxt{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:underline; - font-weight:normal; - color:#000099; - cursor:pointer; -} /* Dashboard CSS */ a.dash_href{ @@ -1045,13 +567,6 @@ background-color:#bfbfbf; padding:5px; } - -.dash_shadow{ - background-image:url(images/dash_top_shadow.jpg); - background-repeat:repeat-x; - height:10px; -} - .dash_white{ background-color:#FFFFFF; padding:5px 10px 5px 10px; @@ -1068,15 +583,6 @@ color:#000000; padding-left:10px;padding-right:10px; } -.dashMatrixSeperator{ - border-left:2px dashed #dadada; - -} -.dashMatrixBottomLiner{ - border-bottom:2px dashed #dadada; - -} - .dash_switch{ cursor:pointer; width:26px; @@ -1125,56 +631,12 @@ background-repeat:repeat-x; position:top; } - -.dash_sel_top{ - background-image:url(images/dash_sel_top.jpg); - background-repeat:repeat-x; - height:5px; - background-position:left top; - font-size:0px; -} - -.dash_sel_btm{ - background-image:url(images/dash_sel_btm.jpg); - background-repeat:repeat-x; - height:4px; - background-position:left top; - font-size:0px; -} - -.dash_sel_left{ - background-color:#dadada; - border-left:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:200px; - text-align:left; - padding-left:5px; - font-size:11px; - font-weight:bold; - color:#000000; -} - -.dash_sel_right{ - background-color:#dadada; - border-right:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:25px; - padding-left:5px; - cursor:pointer; -} - + /* menu */ -#mnuSlide{ - position:absolute; - left:0px; - top:100px; -/* width:110px;*/ -} - -/* a.submenu{ + + + a.submenu{ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; padding-top:5px; @@ -1200,7 +662,7 @@ text-align:left; text-decoration:none; display:block; -} */ +} #mnuKey{ font-family:Verdana, Arial, Helvetica, sans-serif; @@ -1227,7 +689,7 @@ border-right:1px solid #CCCCCC; opacity:.9; display:none; -} +}*/ /* clock */ @@ -1308,11 +770,6 @@ /* Calculator */ -.calcBg { - /*background-color: #666;*//*BFC1B7*/ - background: url(images/cal_bg.gif); - border: 1px solid #009900; -} .calcResult { width: 100%; height: 25px; @@ -1441,22 +898,6 @@ padding:2px; } - -.frameHdr{ - height:32px; - background-image:url(images/rssframeHdr.gif); - background-repeat:repeat-x; - background-position:top left; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - text-align:left; - padding-left:5px; - color:#FFFF00; - vertical-align:middle; - border:0px solid #000000; -} - .forwardBg{ font-family:Arial, Helvetica, sans-serif; font-size:12px; @@ -1473,45 +914,6 @@ /* New Styles */ -.hometop{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:14px; - color:white; - text-decoration:none; - text-align:left; - padding-left:10px; - background-image:url(../images/hometop.gif); - background-position:top left; - background-repeat:repeat-x; - height:35px; - vertical-align:middle; -} - -.homeBtm{ - background-image:url(../images/HomeBtm.gif); - background-position:top left; - background-repeat:repeat-x; - height:29px; -} - -.imageTab{ - background-color:#F5F5F5; - border:0px solid #EBEBEB; - width:30px; - height:30px; - position:relative; - visibility:visible; -} - -a.imageTab:Hover{ - background-color:#BFBFFF; - border:0px solid #EBEBEB; - width:30px; - height:30px; - display:block; - opacity:.5; -} - .mnuTab{ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; @@ -1525,107 +927,6 @@ padding-left:5px; vertical-align:middle; } - -.mnuSel td{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - background-color:#EBEBEB; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuSel td:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#EBEBEB; -} - -.mnuUnSel td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - background-color:#D7D7D7; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuUnSel td:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#D7D7D7; -} - -.tabRht{ - background-image:url(../images/tabRht.gif); - background-position:top left; - background-repeat:repeat-y; - width:31px; -} - - -.frmSelect{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - border:1px #EBEBEB; -} - -#mnuSlide{ - position:absolute; - left:0px; - top:100px; - width:110px; -} - - -#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:#ECECEC; - border-right:1px solid #CCCCCC; - opacity:.8; -} - /* profile */ .prvPrfBigText { @@ -1645,58 +946,14 @@ border:1px solid #ebebeb; } -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - cursor:pointer; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - cursor:pointer; -} - .prvPrfTexture { background:url(images/prvPrfTexture1.gif); } -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; -} - .prvPrfHoverOn { background-color:#ffffef; } -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; -} - /* Organization */ .orgTab{ @@ -1730,56 +987,7 @@ border-right:1px solid #CCCCCC; } -.globTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - color:#000000; - border:1px solid #999999; - border-collapse:collapse; - width:100%; -} - -.globTab tr th{ - text-align:right; - background-color:#CCCCCC; - border-bottom:1px solid #999999; - border-right:2px solid #999999; - color:#000000; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-decoration:none; - font-weight:bold; - height:20px; - padding-right:5px; - -} - -.globTab tr td{ - text-align:left; - border:1px solid #CCCCCC; - color:#666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:none; - font-weight:normal; - padding-left:5px; - height:20px; -} - - /* Groups */ - -.groupul{ - margin:0px; - font-family:Arial, Helvetica, sans-serif; - font-weight:bold; - font-size:12px; - color:#000000; - text-decoration:underline; - text-align:left; -} - .groupli{ margin-left:20px; font-family:Arial, Helvetica, sans-serif; @@ -1837,35 +1045,6 @@ padding-bottom:3px; } -.classBtnSmall{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:9px; - 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; -} - -.classBtnDisable{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:10px; - background-color:#DBDBDB; - border-bottom:2px solid #CCCCCC; - border-right:2px solid #CCCCCC; - border-top:2px solid #F5F5F5; - border-left:2px solid #F5F5F5; - color:#666666; - text-align:center; - padding-top:3px; - padding-bottom:3px; -} .txtBox{ width:85%; @@ -1907,15 +1086,6 @@ font-family:Arial, Helvetica, sans-serif; font-size:11px; } - -#imLead{ - width:100%; - overflow:auto; - position:relative; - border:1px solid #666666; - height:175px; -} - .txtGreen{ color:green; } @@ -1926,16 +1096,6 @@ padding-top:2px; } /* MY PREFERENCES */ - -#chPhoto{ - position:relative; - display:none; - top:20px; - width:100%; - border:1px dashed #666666; - background-color:#FFFFEC; -} - /* CSS FOR REPORTS */ .reportHdr{ @@ -1971,7 +1131,7 @@ } -/* a.reportMnu{ + a.reportMnu{ font-size:11px; color:#0070BA; text-decoration:none; @@ -1993,20 +1153,8 @@ border-bottom:1px solid #E1E1E1; padding-left:20px; padding-top:3px; -} */ - -.reportGenarateTable{ - border-bottom:1px solid #6D6D6D; - border-left:1px solid #6D6D6D; - border-right:1px solid #6D6D6D; - border-top:0px solid #6D6D6D; - background-image:url(../images/report_bg.gif); - background-repeat:repeat-x; -} - -.reportGenarateTable tr td{ - padding:5px; -} +} + #Generate{ position:relative; width:100%; @@ -2014,16 +1162,9 @@ display:none; } -.lvtSel{ - font-weight:bold; -} - /* END OF REPORT */ - - - /* WEB MAIL */ -/* a.webMnu{ + a.webMnu{ font-size:11px; color:#0070BA; text-decoration:underline; @@ -2032,14 +1173,10 @@ font-size:11px; color:#0070BA; text-decoration:underline; -} */ - - +} /* END OF WEB MAIL */ - /* POPUP */ - -/* a.alpha{ + a.alpha{ font-size:11px; color:gray; text-decoration:none; @@ -2057,7 +1194,7 @@ padding-right:5px; border:1px dotted #CCCCCC; background-color:#FFFFCC; -} */ +} /* Home Page */ .MatrixLayer{ @@ -2090,7 +1227,7 @@ left:200px; top:100px; position:absolute; - z-index:10000001; + z-index:1000001; display:none; padding:10px; background:#ffffff url(images/layerPopUpBg.gif); @@ -2159,15 +1296,11 @@ } /* End Of All Menu */ - - - /* Calendar */ .calHdr{ background-image:url(images/mailSubHeaderBg.gif); background-repeat:repeat-x; background-position:left top; - } .calSel{ @@ -2187,13 +1320,6 @@ } - -.calSelTabMask { - background-color:#dfdfdf; - height:5px; - -} - .calInnerBorder { border-left:2px solid #a5a5a5; border-right:2px solid #a5a5a5; @@ -2207,10 +1333,6 @@ background:#fefefe url(images/layerPopupBg.gif); } -.calTopLeft { - border-left: 1px solid #a5a5a5; -} - .calTopRight { border-right: 1px solid #a5a5a5; } @@ -2221,33 +1343,6 @@ font-weight:normal; text-align:center; width:8%; -} - -.calTitle{ - background-position:right top; - background-repeat:no-repeat; - background-image:url(images/cal_title.jpg); - width:150px; -} - -.tabBorder{ - background-color:#EBEBEB; - border-bottom:1px solid #666666; - border-left:1px solid #666666; - border-right:1px solid #666666; - padding:10px; -} - -.eventLay{ - background-color:#a5a5a5; - position:relative; - left:0px; - top:0px; - width:100%; - visibility:visible; - padding:5px 5px 5px 5px; - display:block; - z-index:1000; } a.calMnu{ @@ -2270,9 +1365,9 @@ padding-top:3px; } -.bggray{ +/*.bggray{ background-color: #dfdfdf; -} +}*/ .bgwhite{ background-color: #FFFFFF; } @@ -2294,18 +1389,6 @@ display:none; } .style1 {color: #FF0000} - -#hrViewContent{ - width:100%; - height:150px; - overflow:auto; - position:relative; - border-top:1px solid #CCCCCC; - border-bottom:0px solid white; - border-left:0px solid white; - border-right:0px solid white; -} - .event{ background-color:#ddd; border:1px solid #999999; @@ -2321,11 +1404,6 @@ #hrView{ display:block; } - -#lstView{ - display:none; -} - .calendarNav{ font-size:12px; color:#FFFFFF; @@ -2337,7 +1415,6 @@ background-image:url(images/cal_nav.gif); background-repeat:repeat-x; } - #addEventDropDown{ position:absolute; display:none; @@ -2367,36 +1444,11 @@ top:150px; background-color:#ffffff; } - -#cal_popup{ - width:600px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; - position:absolute; - left:100px; - top:100px; -} - .outer{ border-bottom:1px solid #CCCCCC; border-left:1px solid #CCCCCC; border-right:1px solid #CCCCCC; } - -.outerBorder{ - border:1px solid #CCCCCC; - width:95%; -} - -.fieldHead{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - border:0px solid #CCCCCC; - padding:2px 5px 2px 5px; -} - .calTxt{ width:50%; border:1px solid #CCCCCC; @@ -2418,39 +1470,6 @@ /* End of Calendar */ /* Cal Year View */ -.month_table{ - border:2px solid #CCCCCC; - width:100%; - background-color:white; -} - -.month_table tr th{ - background-color:#E9E9E9; - color:#000000; - text-align:center; - border:1px dotted #CCCCCC; - height:20px; - width:14%; - font-weight:normal; -} - -.month_table tr td{ - border:1px dotted #CCCCCC; - color:#000000; - text-align:center; - height:20px; -} - -.cal_Hdr{ - background-image:url(images/cal_Hdr.gif); - background-repeat:repeat-x; - background-position:left top; - font-weight:bold; - color:#000000; - text-align:left; - border:0px solid #000000; -} - .eventDay{ background-color:#FF9966; font-weight:bold; @@ -2533,12 +1552,6 @@ padding: 4px; border-right: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD; -} -.rptTitle { - border-right: 1px solid #333; - border-bottom: 1px solid #333; - background: #2C527C; - color: #FFF; } .rptGrpHead { background: #FFF; @@ -2590,31 +1603,6 @@ /* Css for quick Create */ -.qcWindow { - background-color:white; - border:2px solid #999999; -} - -.qcHeader{ - background:url(images/qcBg.gif) repeat-x; - background-color:gray; - color:black; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 19px; - padding-left:10px; -} -.qcTextBox{ - border:1px solid #999999; - width:90%; -} -.qcTextArea{ - border:1px solid #999999; - width:90%; - height:70px; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; -} .qcTransport{ background-color:#dadada; @@ -2639,50 +1627,6 @@ /* MY SITES */ -.SiteSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_sel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:bold; - font-size:11px; - text-decoration:none; -} - -.SiteUnSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_unsel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; - cursor:pointer; -} - -.SiteHdr{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_hdr.jpg); - background-position:right bottom; - background-repeat:no-repeat; - height:33px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; -} .unread_email { font-weight:bold; } @@ -2707,13 +1651,6 @@ color: #000000; } -.adProgressBar { - border-style:solid; - border-width:2px; - border-color:blue; - -} - .h2 { font-size:18px; @@ -2725,19 +1662,6 @@ color:gray; } - -.hdeskComments { - - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 14px; - color: #999999; - border:0px; - background-color:#ffffef; - width:100%; - -} - ul { list-style:circle; line-height:20px; @@ -2746,14 +1670,6 @@ font-weight:normal; } - - -.branch { - list-style-image: url("secAdd.gif"); -} - - - .tagCloudTopBg { background-image: url(images/tagCloudBg.gif); background-repeat: repeat-x; @@ -2762,15 +1678,6 @@ .tagCloudDisplay { background-color:#e5e5e5; padding:5px; -} - - - -.heading1 { - font-family: Arial, Helvetica, sans-serif; - font-size: 19px; - line-height: 14px; - color: #000000; } .heading2 { @@ -2779,20 +1686,6 @@ line-height: 16px; font-weight:bold; color: #000000; -} - -.heading3 { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 14px; - color: #999999; -} - -.heading4 { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 14px; - color: #999999; } .settingsUI { @@ -2876,7 +1769,7 @@ font-weight:bold; } -/*.cellLabel { +.cellLabel { background-color:#eaebd9; border-top:1px solid #efefef; border-bottom:1px solid #dadada; @@ -2886,7 +1779,7 @@ .cellText { color:#333333; border-bottom:1px solid #dadada; -} */ +} .listTable{ border-left:1px solid #cccccc; @@ -2986,58 +1879,15 @@ .prvPrfOutline { border:1px solid #ebebeb; } - -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - -} - .prvPrfTexture { background:url(images/prvPrfTexture1.gif); -} -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; } .prvPrfHoverOn { background-color:#ffffef; } -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; -} - .cellBottomDotLine { border-bottom-width: 2px; border-bottom-style: dotted; @@ -3056,14 +1906,9 @@ border-bottom-color: #CCCCCC; } -.crmFormDropDown { -border-width:1px; -} + .thickBorder { border: 2px solid #999999; -} -.trackerBorder { - background-color:#ffffff; } .trackerHeading { background-color:#efefef; @@ -3080,20 +1925,11 @@ .crmTable { border:1px solid #dadada; } -.crmTableColHeading { - background-color:#CCCCCC; - border-left:1px solid #eaeaea; - border-top:1px solid #eaeaea; - border-right:1px solid #999999; - border-bottom:1px solid #999999; -} + .crmTableRow { border-bottom:1px dotted #dadada; border-right:1px dotted #dadada } - - - /* Inventory */ @@ -3121,24 +1957,6 @@ /* Inventory */ - - - -/* styles for RSS Display starts */ -.rssDisplay{ - background-color:#eaeaea; -} - - -/* styles for RSS Display ends */ - - - - - - - - /* Email Client Classes ++++++++++++++++++++++ */ .emailSelected{ @@ -3161,11 +1979,6 @@ background:#d9d9d9 url(images/mailSubHeaderBg.gif) repeat-x; padding:4px; } -.mailDetailsHeader { - border-top:2px dotted #999; - border-bottom:1px solid #ddd; -} - .mailClientWriteEmailHeader { font-family:arial, helvetica, sans-serif; font-size:20px; Modified: vtigercrm/branches/5.0.1/themes/woodspice/style.css ============================================================================== --- vtigercrm/branches/5.0.1/themes/woodspice/style.css (original) +++ vtigercrm/branches/5.0.1/themes/woodspice/style.css Tue Oct 3 01:19:52 2006 @@ -30,13 +30,6 @@ border-left:2px dotted #332211; padding:10px; } - - -.yellowBox { - background-color:#ffffE1; - border:1px solid #999999; -} - .genHeaderBig{ font-family: Arial, Helvetica, sans-serif; font-size: 16px; @@ -58,18 +51,9 @@ color: #000000; font-weight:bold; } - -.rssDisplayPanel { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 12px; - color: #ABABAB; -} - - .hdrNameBg { background:#ffffff url(images/primeTopBg.gif) repeat-x; - + } .hdrTabBg { @@ -144,43 +128,6 @@ padding-right:40px; } - -/*.level2text { - background:#bbbbbb url(images/level2Bg.gif) repeat-x; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:20px; - padding-right:20px; - padding-top:5px; - padding-bottom:5px; - font-weight:bold; - color:white; -}*/ - -.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:#e0dbb0 url(images/level2TabBg.gif) bottom repeat-x; font-family: Arial, Helvetica, sans-serif; @@ -206,11 +153,6 @@ padding-bottom:5px; } - -.tabLiner { - background:#9abffc url(images/moduleSelectorBg.gif) bottom repeat-x; - padding:0px; -} .sep1 { background:#999999; @@ -356,15 +298,6 @@ padding-left:0px; } -.rightAddInfo { - border-left:1px solid #a2a2a2; - border-right:1px solid #dddddd; - border-bottom:1px solid #dddddd; - border-top:1px solid #a2a2a2; - background-color:#fafafa; - padding:5px; -} - .dvtCellLabel, .cellLabel { background-color:#efefe2; padding-right:10px; @@ -396,17 +329,6 @@ padding:5px; background-color:#fafafa; -} - -.rightUpcomingActivitiesHeader{ - border-bottom:1px solid #ddddcc; - padding:5px; - background-color:#ffffdd; -} - -.rightUpcomingActivitiesContent { - padding:5px; - background-color:#ffffef; } .detailedViewHeader{ @@ -426,16 +348,6 @@ background-color:#ffffff; } -.detailedViewProdTextBox { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:85%; - background-color:#ffffff; -} - .detailedViewTextBoxOn { font-family: Arial, Helvetica, sans-serif; font-size: 11px; @@ -446,31 +358,9 @@ background-color:#ffffdd; } -.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 ------------------------------------------- */ -.moduleSearch { - border:1px solid #dddddd; - background-color:#ffffef; - -} - -.searchHdrBox { - - border-bottom:1px dashed #dddddd; -} .advSearch { padding:10px; @@ -498,28 +388,6 @@ width:10px } -.searchNotFound { - border:2px solid #ff3333; - background-color:#fafafa; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #ff0000; - height:50px; - width:640px; -} - - -.loginTopBg { - background:url(images/loginTopBg.gif) repeat-x; -} - -.loginTopShade { - background:url(images/loginTopShade.gif) repeat-x; -} - -.loginBg{ - background:#448cEB url(images/loginBg.gif) repeat-x; -} .textbox { border:1px solid #999999; @@ -531,28 +399,9 @@ } -.loginBottomBg { - background:url(images/loginBottomBg.gif) repeat-x; -} - -.loginSignin { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - color: #448ceb; - font-weight:bold; -} - -.loginBillBoard { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color:#ffffff; -} + .mx { -} - -.calTopBg { - background:url(images/calBg.gif) repeat-x; } .calListTable td{ @@ -564,18 +413,7 @@ border:1px solid #999999; } -.calDisplay { - border-left:1px solid #d0d0d0; - border-right:1px solid #d0d0d0; -} -.calBottomBg { - background:url(images/calBottomBg.gif) repeat-x; -} - -.calDayHourCell { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; -} + .calDayHour { border-top:1px solid #a8a591; border-left:1px solid #a8a591; @@ -583,34 +421,7 @@ border-right:1px solid #a8a591; background-color:#eae7da; } -.calDiv { - overflow:auto; width:95%;height:320px;padding:0px;background-color:#fefefe; - border-top: 1px solid #bababa; - border-bottom: 1px solid #bababa; -} -.calColHdr{ - border-top:1px solid #fefefa; - border-left:1px solid #fefefa; - - border-right:1px solid #a8a591; - background-color:#eae7da; -} -.calHourCol { - border-top: 1px solid #fefefa; - border-left: 1px solid #fefefa; - border-right: 1px solid #a8a591; - border-bottom: 1px solid #a8a591; - background-color: #eae7da; - height: 40px; - -} -.calHourOccupied { - background-color:#ffffbb; - -} -.calListViewRow { - border-bottom:1px solid eae3d1; -} + .calAddEvent { position:absolute; @@ -621,102 +432,17 @@ background-color:#ffffff; } -.addEventHeader{ - border-bottom:2px dotted #cccccc; -} - -.addEventFooter{ - border-top:2px dotted #cccccc; - height:40px; -} + .addEventInnerBox { border:1px dotted #dadada; } -.cellScheduled { - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSchHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSch{ - border:0px; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellNormalHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffff; - color:#7a7a7a; -} .cellNormal { border:0px; background-color:#ffffff; -} - -.calEventNormal { - border:1px solid #999999; - background-color:#99ffcc; - -} - -.calEventCritical { - border:1px solid #999999; - background-color:#FFCC33; -} -.tblPro1 { - -border:2px solid #dadada; - background-color:white; - -} - -.tblPro1IconCell { - border-right:1px solid #dadada; -} - -.tblPro1HeadingCell { - font-weight:bold; -color:#4a4a4a; -} - -.tblPro1ColHeader { - background-color:#dadada; - border-left:1px solid white; - border-right:1px solid #999999; - font-size: 11px; - line-height: 14px; - background-image:url(images/tblPro1ColBg.gif); -} - -.tblPro1DataCell { - border-bottom:1px solid #f5f5f5; - color:#5a5a5a; - font-size: 11px; - line-height: 14px; - -} - -.divEventToDo { -overflow:auto; -height:150px; -border:1px solid #dadada; - } .EventToDo{ @@ -732,118 +458,6 @@ margin-bottom: 15px; } -.thumbnailcaption -{ font-size: 0.9em; padding-top: 0.2em ; } - -/* For Settings */ - -.lftMnuTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-color:#BBBBBB; - border-left:1px solid #666666; - border-right:1px solid #666666; - border-top:0px solid #666666; - border-collapse:collapse; - text-align:right; - padding-top:0px; - padding-left:5px; - padding-right:5px; - vertical-align:top; -} - -.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-decoration:none; - width:99%; -} - -.lftMnuHdr tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-align:left; - text-decoration:none; - height:25px; - padding-right:0px; - padding-left:0px; -} - -a.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; - vertical-align:middle; -} - -a.lftMnuHdr:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; -} - -a.lftSubMnu{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; -} - -a.lftSubMnu:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; - background-color:#CCCCCC; -} - .padTab{ padding-top:0px; padding-left:0px; @@ -851,25 +465,6 @@ padding-bottom:0px; vertical-align:top; -} - -.controlTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - width:100%; - border:0px; -} - -.controlTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - vertical-align:bottom; } #company{ @@ -885,31 +480,12 @@ #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;} -#studioTab{position:relative;left:0px;top:0px;width:100%;display:none;} - -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} -.imgDoc{ - cursor:pointer; - border:0px; -} + #one{ position:relative; @@ -944,9 +520,7 @@ /* End of Settings */ -.bggray{ - background-color: #dfdfdf; -} + .bgwhite{ background-color: #FFFFFF; } @@ -969,92 +543,10 @@ display:none; } -/*Added for Advance Seearch*/ - -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} - -.imgDoc{ - cursor:pointer; - border:0px; -} -#slideMnu{ - background-color:#BBBBBB; - vertical-align:top; -} - #one{ position:relative; display:block; width:245px; -} - -.prdTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:100%; - border-left:0px solid #CCCCCC; - border-right:0px solid #CCCCCC; - border-collapse:collapse; -} - -.prdTab tr th{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - padding-left:5px; - background-color:#E5E5E5; - height:20px; - color:#000000; - font-weight:bold; - text-decoration:none; - border-bottom:1px solid #CCCCCC; -} - -.prdTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - border-bottom:1px solid #CCCCCC; - padding-left:5px; - color:#000000; - text-decoration:none; - font-weight:normal; - height:20px; -} - -.delTxt{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:underline; - font-weight:normal; - color:#000099; - cursor:pointer; -} - -/* Dashboard CSS */ -a.dash_href{ - display:block; - width:24px;height:24px; - vertical-align:middle; - margin-top:10px; } @@ -1081,11 +573,6 @@ padding:5px; } -.dash_shadow{ - background-image:url(images/dash_top_shadow.jpg); - background-repeat:repeat-x; - height:10px; -} .dash_white{ background-color:#FFFFFF; @@ -1103,14 +590,7 @@ color:#000000; padding-left:10px;padding-right:10px; } -.dashMatrixSeperator{ - border-left:2px dashed #dadada; - -} -.dashMatrixBottomLiner{ - border-bottom:2px dashed #dadada; - -} + .dash_switch{ cursor:pointer; @@ -1161,55 +641,12 @@ position:top; } -.dash_sel_top{ - background-image:url(images/dash_sel_top.jpg); - background-repeat:repeat-x; - height:5px; - background-position:left top; - font-size:0px; -} - -.dash_sel_btm{ - background-image:url(images/dash_sel_btm.jpg); - background-repeat:repeat-x; - height:4px; - background-position:left top; - font-size:0px; -} - -.dash_sel_left{ - background-color:#F9F7C9; - border-left:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:200px; - text-align:left; - padding-left:5px; - font-size:11px; - font-weight:bold; - color:#000000; -} - -.dash_sel_right{ - background-color:#F9F7C9; - border-right:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:25px; - padding-left:5px; - cursor:pointer; -} /* menu */ -#mnuSlide{ - position:absolute; - left:0px; - top:100px; -/* width:110px;*/ -} - -/* a.submenu{ + + + a.submenu{ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; padding-top:5px; @@ -1235,7 +672,7 @@ text-align:left; text-decoration:none; display:block; -} */ +} #mnuKey{ font-family:Verdana, Arial, Helvetica, sans-serif; @@ -1343,11 +780,7 @@ /* Calculator */ -.calcBg { - /*background-color: #666;*//*BFC1B7*/ - background: url(images/cal_bg.gif); - border: 1px solid #009900; -} + .calcResult { width: 100%; height: 25px; @@ -1477,21 +910,6 @@ } -.frameHdr{ - height:32px; - background-image:url(images/rssframeHdr.gif); - background-repeat:repeat-x; - background-position:top left; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - text-align:left; - padding-left:5px; - color:#FFFF00; - vertical-align:middle; - border:0px solid #000000; -} - .forwardBg{ font-family:Arial, Helvetica, sans-serif; font-size:12px; @@ -1508,44 +926,7 @@ /* New Styles */ -.hometop{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:14px; - color:white; - text-decoration:none; - text-align:left; - padding-left:10px; - background-image:url(../images/hometop.gif); - background-position:top left; - background-repeat:repeat-x; - height:35px; - vertical-align:middle; -} - -.homeBtm{ - background-image:url(../images/HomeBtm.gif); - background-position:top left; - background-repeat:repeat-x; - height:29px; -} - -.imageTab{ - background-color:#F5F5F5; - border:0px solid #EBEBEB; - width:30px; - height:30px; - position:relative; - visibility:visible; -} - -a.imageTab:Hover{ - background-color:#BFBFFF; - border:0px solid #EBEBEB; - width:30px; - height:30px; - display:block; - opacity:.5; -} + .mnuTab{ font-family:Verdana, Arial, Helvetica, sans-serif; @@ -1561,106 +942,6 @@ vertical-align:middle; } -.mnuSel td{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - background-color:#EBEBEB; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuSel td:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#EBEBEB; -} - -.mnuUnSel td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - background-color:#D7D7D7; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuUnSel td:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#D7D7D7; -} - -.tabRht{ - background-image:url(../images/tabRht.gif); - background-position:top left; - background-repeat:repeat-y; - width:31px; -} - - -.frmSelect{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - border:1px #EBEBEB; -} - -#mnuSlide{ - position:absolute; - left:0px; - top:100px; - width:110px; -} - - -#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:#ECECEC; - border-right:1px solid #CCCCCC; - opacity:.8; -} - /* profile */ .prvPrfBigText { @@ -1680,56 +961,16 @@ border:1px solid #ebebeb; } -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - cursor:pointer; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - cursor:pointer; -} + .prvPrfTexture { background:url(images/prvPrfTexture1.gif); } -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; -} .prvPrfHoverOn { background-color:#ffffef; -} -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; } /* Organization */ @@ -1765,55 +1006,9 @@ border-right:1px solid #CCCCCC; } -.globTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - color:#000000; - border:1px solid #999999; - border-collapse:collapse; - width:100%; -} - -.globTab tr th{ - text-align:right; - background-color:#CCCCCC; - border-bottom:1px solid #999999; - border-right:2px solid #999999; - color:#000000; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-decoration:none; - font-weight:bold; - height:20px; - padding-right:5px; - -} - -.globTab tr td{ - text-align:left; - border:1px solid #CCCCCC; - color:#666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:none; - font-weight:normal; - padding-left:5px; - height:20px; -} - /* Groups */ -.groupul{ - margin:0px; - font-family:Arial, Helvetica, sans-serif; - font-weight:bold; - font-size:12px; - color:#000000; - text-decoration:underline; - text-align:left; -} .groupli{ margin-left:20px; @@ -1872,36 +1067,6 @@ padding-bottom:3px; } -.classBtnSmall{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:9px; - 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; -} - -.classBtnDisable{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:10px; - background-color:#DBDBDB; - border-bottom:2px solid #CCCCCC; - border-right:2px solid #CCCCCC; - border-top:2px solid #F5F5F5; - border-left:2px solid #F5F5F5; - color:#666666; - text-align:center; - padding-top:3px; - padding-bottom:3px; -} - .txtBox{ width:85%; border:1px solid #666666; @@ -1943,13 +1108,6 @@ font-size:11px; } -#imLead{ - width:100%; - overflow:auto; - position:relative; - border:1px solid #666666; - height:175px; -} .txtGreen{ color:green; @@ -1962,14 +1120,6 @@ } /* MY PREFERENCES */ -#chPhoto{ - position:relative; - display:none; - top:20px; - width:100%; - border:1px dashed #666666; - background-color:#FFFFEC; -} /* CSS FOR REPORTS */ @@ -2006,7 +1156,7 @@ } -/* a.reportMnu{ +a.reportMnu{ font-size:11px; color:#0070BA; text-decoration:none; @@ -2028,20 +1178,8 @@ border-bottom:1px solid #E1E1E1; padding-left:20px; padding-top:3px; -} */ - -.reportGenarateTable{ - border-bottom:1px solid #6D6D6D; - border-left:1px solid #6D6D6D; - border-right:1px solid #6D6D6D; - border-top:0px solid #6D6D6D; - background-image:url(../images/report_bg.gif); - background-repeat:repeat-x; -} - -.reportGenarateTable tr td{ - padding:5px; -} +} + #Generate{ position:relative; width:100%; @@ -2049,16 +1187,13 @@ display:none; } -.lvtSel{ - font-weight:bold; -} - + /* END OF REPORT */ /* WEB MAIL */ -/* a.webMnu{ + a.webMnu{ font-size:11px; color:#0070BA; text-decoration:underline; @@ -2067,14 +1202,14 @@ font-size:11px; color:#0070BA; text-decoration:underline; -} */ +} /* END OF WEB MAIL */ /* POPUP */ -/* a.alpha{ + a.alpha{ font-size:11px; color:gray; text-decoration:none; @@ -2092,7 +1227,7 @@ padding-right:5px; border:1px dotted #CCCCCC; background-color:#FFFFCC; -} */ +} /* Home Page */ .MatrixLayer{ @@ -2125,7 +1260,7 @@ left:300px; top:100px; position:absolute; - z-index:10000001; + z-index:1000001; display:none; padding:10px; background:#ffffff url(images/layerPopUpBg.gif); @@ -2222,13 +1357,6 @@ } - -.calSelTabMask { - background-color:#D6D2AB; - height:5px; - -} - .calInnerBorder { border-left:1px solid #d6d2ab; border-right:1px solid #d6d2ab; @@ -2242,9 +1370,6 @@ background:#fefefe url(images/layerPopupBg.gif); } -.calTopLeft { - border-left: 1px solid #939271; -} .calTopRight { border-right: 1px solid #939271; @@ -2258,32 +1383,6 @@ width:8%; } -.calTitle{ - background-position:right top; - background-repeat:no-repeat; - background-image:url(images/cal_title.jpg); - width:150px; -} - -.tabBorder{ - background-color:#EBEBEB; - border-bottom:1px solid #666666; - border-left:1px solid #666666; - border-right:1px solid #666666; - padding:10px; -} - -.eventLay{ - background-color:#DBF3FD; - position:relative; - left:0px; - top:0px; - width:100%; - visibility:visible; - padding:5px 5px 5px 5px; - display:block; - z-index:1000; -} a.calMnu{ font-size:11px; @@ -2304,10 +1403,6 @@ padding-left:5px; padding-top:3px; } - -.bggray{ - background-color: #dfdfdf; -} .bgwhite{ background-color: #FFFFFF; } @@ -2329,17 +1424,6 @@ display:none; } .style1 {color: #FF0000} - -#hrViewContent{ - width:100%; - height:250px; - overflow:auto; - position:relative; - border-top:1px solid #CCCCCC; - border-bottom:0px solid white; - border-left:0px solid white; - border-right:0px solid white; -} .event{ background-color:#D3EAF0; @@ -2356,11 +1440,6 @@ #hrView{ display:block; } - -#lstView{ - display:none; -} - .calendarNav{ font-size:12px; color:#FFFFFF; @@ -2403,33 +1482,10 @@ background-color:#ffffff; } -#cal_popup{ - width:600px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; - position:absolute; - left:100px; - top:100px; -} - .outer{ border-bottom:1px solid #CCCCCC; border-left:1px solid #CCCCCC; border-right:1px solid #CCCCCC; -} - -.outerBorder{ - border:1px solid #CCCCCC; - width:95%; -} - -.fieldHead{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - border:0px solid #CCCCCC; - padding:2px 5px 2px 5px; } .calTxt{ @@ -2453,38 +1509,7 @@ /* End of Calendar */ /* Cal Year View */ -.month_table{ - border:2px solid #CCCCCC; - width:100%; - background-color:white; -} - -.month_table tr th{ - background-color:#E9E9E9; - color:#000000; - text-align:center; - border:1px dotted #CCCCCC; - height:20px; - width:14%; - font-weight:normal; -} - -.month_table tr td{ - border:1px dotted #CCCCCC; - color:#000000; - text-align:center; - height:20px; -} - -.cal_Hdr{ - background-image:url(images/cal_Hdr.gif); - background-repeat:repeat-x; - background-position:left top; - font-weight:bold; - color:#000000; - text-align:left; - border:0px solid #000000; -} + .eventDay{ background-color:#FF9966; @@ -2569,12 +1594,7 @@ border-right: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD; } -.rptTitle { - border-right: 1px solid #333; - border-bottom: 1px solid #333; - background: #2C527C; - color: #FFF; -} + .rptGrpHead { background: #FFF; border-bottom: 1px solid #FFF; @@ -2625,31 +1645,7 @@ /* Css for quick Create */ -.qcWindow { - background-color:white; - border:2px solid #999999; -} - -.qcHeader{ - background:url(images/qcBg.gif) repeat-x; - background-color:gray; - color:black; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 19px; - padding-left:10px; -} -.qcTextBox{ - border:1px solid #999999; - width:90%; -} -.qcTextArea{ - border:1px solid #999999; - width:90%; - height:70px; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; -} + .qcTransport{ background-color:#d3d2c1; @@ -2674,50 +1670,7 @@ /* MY SITES */ -.SiteSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_sel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:bold; - font-size:11px; - text-decoration:none; -} - -.SiteUnSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_unsel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; - cursor:pointer; -} - -.SiteHdr{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_hdr.jpg); - background-position:right bottom; - background-repeat:no-repeat; - height:33px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; -} + .unread_email { font-weight:bold; } @@ -2742,12 +1695,6 @@ color: #000000; } -.adProgressBar { - border-style:solid; - border-width:2px; - border-color:blue; - -} .h2 { @@ -2761,17 +1708,6 @@ color:gray; } -.hdeskComments { - - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 14px; - color: #999999; - border:0px; - background-color:#ffffef; - width:100%; - -} ul { list-style:circle; @@ -2783,9 +1719,6 @@ } -.branch { - list-style-image: url("secAdd.gif"); -} @@ -2801,12 +1734,7 @@ -.heading1 { - font-family: Arial, Helvetica, sans-serif; - font-size: 19px; - line-height: 14px; - color: #000000; -} + .heading2 { font-family: Arial, Helvetica, sans-serif; @@ -2816,19 +1744,7 @@ color: #000000; } -.heading3 { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 14px; - color: #999999; -} - -.heading4 { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 14px; - color: #999999; -} + .settingsUI { @@ -2909,7 +1825,7 @@ font-weight:bold; } -/*.cellLabel { +.cellLabel { background-color:#eaebd9; border-top:1px solid #efefef; border-bottom:1px solid #dadada; @@ -2919,7 +1835,7 @@ .cellText { color:#333333; border-bottom:1px solid #dadada; -} */ +} .listTable{ border-left:1px solid #cccccc; @@ -3019,56 +1935,19 @@ border:1px solid #ebebeb; } -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - -} + .prvPrfTexture { background:url(images/prvPrfTexture1.gif); } -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; -} + .prvPrfHoverOn { background-color:#ffffef; } -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; -} + .cellBottomDotLine { border-bottom-width: 2px; @@ -3088,15 +1967,11 @@ border-bottom-color: #CCCCCC; } -.crmFormDropDown { -border-width:1px; -} + .thickBorder { border: 2px solid #999999; } -.trackerBorder { - background-color:#ffffff; -} + .trackerHeading { background-color:#efefef; } @@ -3112,19 +1987,11 @@ .crmTable { border:1px solid #dadada; } -.crmTableColHeading { - background-color:#CCCCCC; - border-left:1px solid #eaeaea; - border-top:1px solid #eaeaea; - border-right:1px solid #999999; - border-bottom:1px solid #999999; -} + .crmTableRow { border-bottom:1px dotted #dadada; border-right:1px dotted #dadada } - - /* Inventory */ @@ -3153,24 +2020,6 @@ /* Inventory */ - - - -/* styles for RSS Display starts */ -.rssDisplay{ - background-color:#e8e3ca; -} - - -/* styles for RSS Display ends */ - - - - - - - - /* Email Client Classes ++++++++++++++++++++++ */ .emailSelected{ @@ -3192,10 +2041,7 @@ background:#e0dbb0 url(images/mailSubHeaderBg.gif) repeat-x; padding:4px; } -.mailDetailsHeader { - border-top:2px dotted #999; - border-bottom:1px solid #ddd; -} + .mailClientWriteEmailHeader{ font-family:arial, helvetica, sans-serif; From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 3 00:21:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 03 Oct 2006 07:21:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9547 - in /vtigercrm/branches/5.0.1: ./ cron/ modules/Calendar/ modules/Emails/ modules/Faq/ modules/Invoice/ modules/Leads/ modules/Portal/ modules/Products/ modules/PurchaseOrder/ modules/Rss/ modules/SalesOrder/ modules/Settings/ modules/Users/ modules/Vendors/ Message-ID: <20061003072114.55050787E0F@vtiger.fosslabs.com> Author: richie Date: Tue Oct 3 01:20:52 2006 New Revision: 9547 Log: * Changed the php short tag ie., changed the tag from Modified: vtigercrm/branches/5.0.1/modules/Invoice/Popup.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Invoice/Popup.php (original) +++ vtigercrm/branches/5.0.1/modules/Invoice/Popup.php Tue Oct 3 01:20:52 2006 @@ -1,4 +1,4 @@ - Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/Popup.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/Popup.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/Popup.php Tue Oct 3 01:20:52 2006 @@ -1,4 +1,4 @@ - Modified: vtigercrm/branches/5.0.1/modules/Rss/RssAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Rss/RssAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Rss/RssAjax.php Tue Oct 3 01:20:52 2006 @@ -1,4 +1,4 @@ - Modified: vtigercrm/branches/5.0.1/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/SalesOrder/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/SalesOrder/ListView.php Tue Oct 3 01:20:52 2006 @@ -1,4 +1,4 @@ - Modified: vtigercrm/branches/5.0.1/modules/Settings/SettingsAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Settings/SettingsAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Settings/SettingsAjax.php Tue Oct 3 01:20:52 2006 @@ -1,4 +1,4 @@ - From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 3 00:23:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 03 Oct 2006 07:23:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9548 - /vtigercrm/branches/5.0.1/include/language/en_us.lang.php Message-ID: <20061003072315.420D0787E44@vtiger.fosslabs.com> Author: richie Date: Tue Oct 3 01:23:12 2006 New Revision: 9548 Log: * Added language entry for Part Number Modified: vtigercrm/branches/5.0.1/include/language/en_us.lang.php Modified: vtigercrm/branches/5.0.1/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/include/language/en_us.lang.php Tue Oct 3 01:23:12 2006 @@ -1027,6 +1027,7 @@ //Record deleted message 'LBL_RECORD_DELETE'=>'The record you are trying to view has been deleted.', +'Part Number'=>'Part Number', ); From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 3 00:30:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 03 Oct 2006 07:30:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9549 - /vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php Message-ID: <20061003073037.D09E0787E44@vtiger.fosslabs.com> Author: richie Date: Tue Oct 3 01:30:32 2006 New Revision: 9549 Log: * Modified to fix the ticket 2202 ie., when we are in a module's Listview and enter global search, in the result for that corresponding module it only searches in the customview which we were looked in Modified: vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php Modified: vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php (original) +++ vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php Tue Oct 3 01:30:32 2006 @@ -80,83 +80,77 @@ { 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); + $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); - //Avoided the modules Faq and PriceBooks. we should remove this if when change the customview function - $oCustomView = ''; - if($module != 'Faq' && $module != 'PriceBooks') - { - //Added to get the default 'All' customview query + $listquery = getListQuery($module); + $oCustomView = ''; + $oCustomView = new CustomView($module); - $viewid = $oCustomView->getViewId($module); - - $listquery = $oCustomView->getModifiedCvListQuery($viewid,$listquery,$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]); + + 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]); } } @@ -182,7 +176,7 @@ { global $adb; - $query = "SELECT * FROM vtiger_field WHERE tabid = ".getTabid($module); + $query = "SELECT columnname, tablename FROM vtiger_field WHERE tabid = ".getTabid($module); $result = $adb->query($query); $noofrows = $adb->num_rows($result); @@ -197,7 +191,7 @@ { if($where != '') $where .= " OR "; - $where .= $tablename.".".$columnname." LIKE ".$adb->quote("%$search_val%"); + $where .= $tablename.".".$columnname." LIKE ".$adb->quote("%$search_val%"); } } From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 3 04:40:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 03 Oct 2006 11:40:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9550 - /vtigercrm/branches/5.0.1/modules/HelpDesk/Merge.php Message-ID: <20061003114050.615357700CF@vtiger.fosslabs.com> Author: richie Date: Tue Oct 3 05:40:46 2006 New Revision: 9550 Log: Issue during mail merge in trouble tickets fixed Modified: vtigercrm/branches/5.0.1/modules/HelpDesk/Merge.php Modified: vtigercrm/branches/5.0.1/modules/HelpDesk/Merge.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/HelpDesk/Merge.php (original) +++ vtigercrm/branches/5.0.1/modules/HelpDesk/Merge.php Tue Oct 3 05:40:46 2006 @@ -92,7 +92,7 @@ { $column_name = "productsRel.productname"; } - if($tablename == "crmentity") + if($tablename == "vtiger_crmentity") { if($modulename == "Contacts") { @@ -171,7 +171,7 @@ left join vtiger_products as productsRel on productsRel.productid = vtiger_troubletickets.product_id left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id left join vtiger_account on vtiger_account.accountid = vtiger_troubletickets.parent_id - left join vtiger_crmentity as _crmentityAccounts on crmentityAccounts.crmid = vtiger_account.accountid + left join vtiger_crmentity as crmentityAccounts on crmentityAccounts.crmid = vtiger_account.accountid left join vtiger_accountbillads on vtiger_accountbillads.accountaddressid = vtiger_account.accountid left join vtiger_accountshipads on vtiger_accountshipads.accountaddressid = vtiger_account.accountid left join vtiger_accountscf on vtiger_accountbillads.accountaddressid = vtiger_accountscf.accountid From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 3 07:22:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 03 Oct 2006 14:22:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9551 - in /vtigercrm/branches/5.0.1: Popup.php Smarty/templates/Popup.tpl Smarty/templates/RelatedListContents.tpl modules/Products/updateRelations.php Message-ID: <20061003142238.EC6DE787E87@vtiger.fosslabs.com> Author: richie Date: Tue Oct 3 08:22:32 2006 New Revision: 9551 Log: * Changes made to add the button Select Product in Vendor Related list Modified: vtigercrm/branches/5.0.1/Popup.php vtigercrm/branches/5.0.1/Smarty/templates/Popup.tpl vtigercrm/branches/5.0.1/Smarty/templates/RelatedListContents.tpl vtigercrm/branches/5.0.1/modules/Products/updateRelations.php Modified: vtigercrm/branches/5.0.1/Popup.php ============================================================================== --- vtigercrm/branches/5.0.1/Popup.php (original) +++ vtigercrm/branches/5.0.1/Popup.php Tue Oct 3 08:22:32 2006 @@ -195,6 +195,7 @@ } +$smarty->assign("RETURN_ACTION",$_REQUEST['return_action']); $theme_path="themes/".$theme."/"; Modified: vtigercrm/branches/5.0.1/Smarty/templates/Popup.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/Popup.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/Popup.tpl Tue Oct 3 08:22:32 2006 @@ -18,7 +18,7 @@ Modified: vtigercrm/branches/5.0.1/Smarty/templates/RelatedListContents.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/RelatedListContents.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/RelatedListContents.tpl Tue Oct 3 08:22:32 2006 @@ -37,15 +37,16 @@ {/if} {elseif $header eq 'Products'} {if $MODULE eq 'PriceBooks'} - + {elseif $MODULE eq 'Potentials'}   - + {elseif $MODULE eq 'Vendors'} + {else} - + {/if} {elseif $header eq 'Leads'} {if $MODULE eq 'Campaigns'} Modified: vtigercrm/branches/5.0.1/modules/Products/updateRelations.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/updateRelations.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/updateRelations.php Tue Oct 3 08:22:32 2006 @@ -12,11 +12,12 @@ require_once('include/database/PearDatabase.php'); global $adb; +//This if will be true, when we select product from vendor related list if($_REQUEST['destination_module']=='Products') { - if($_REQUEST['smodule']=='VENDOR') + if($_REQUEST['parid'] != '' && $_REQUEST['entityid'] != '') { - $sql = "update vtiger_products set vtiger_vendor_id=".$_REQUEST['parid']." where productid=".$_REQUEST['entityid']; + $sql = "update vtiger_products set vendor_id=".$_REQUEST['parid']." where productid=".$_REQUEST['entityid']; $adb->query($sql); } } @@ -29,8 +30,11 @@ } } +$return_action = 'DetailView'; +if($_REQUEST['return_action'] != '') + $return_action = $_REQUEST['return_action']; - header("Location:index.php?action=DetailView&module=Vendors&record=".$_REQUEST["parid"]); +header("Location:index.php?action=$return_action&module=Vendors&record=".$_REQUEST["parid"]); From vtigercrm-commits at vtiger.fosslabs.com Wed Oct 4 04:32:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 04 Oct 2006 11:32:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9552 - in /vtigercrm/branches/5.0.1/soap: firefoxtoolbar.php thunderbirdplugin.php vtigerolservice.php wordplugin.php Message-ID: <20061004113227.4A93C787E05@vtiger.fosslabs.com> Author: jerrydgeorge Date: Wed Oct 4 05:32:13 2006 New Revision: 9552 Log: Namaspace Url changed.Fixes # 2067. Modified: vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php vtigercrm/branches/5.0.1/soap/vtigerolservice.php vtigercrm/branches/5.0.1/soap/wordplugin.php Modified: vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php (original) +++ vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php Wed Oct 4 05:32:13 2006 @@ -16,7 +16,7 @@ $log = &LoggerManager::getLogger('firefoxlog'); -$NAMESPACE = 'http://www.vtiger.com/vtigercrm/'; +$NAMESPACE = 'http://www.vtiger.com/products/crm'; $server = new soap_server; $accessDenied = "You are not authorized for performing this action"; $server->configureWSDL('vtigersoap'); Modified: vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php (original) +++ vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php Wed Oct 4 05:32:13 2006 @@ -18,7 +18,7 @@ $log = &LoggerManager::getLogger('thunderbirdplugin'); $accessDenied = "You are not authorized for performing this action"; -$NAMESPACE = 'http://www.vtiger.com/vtigercrm/'; +$NAMESPACE = 'http://www.vtiger.com/products/crm'; $server = new soap_server; $server->configureWSDL('vtigersoap'); Modified: vtigercrm/branches/5.0.1/soap/vtigerolservice.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/vtigerolservice.php (original) +++ vtigercrm/branches/5.0.1/soap/vtigerolservice.php Wed Oct 4 05:32:13 2006 @@ -17,7 +17,7 @@ error_reporting(0); -$NAMESPACE = 'http://www.vtigercrm.com/vtigercrm'; +$NAMESPACE = 'http://www.vtiger.com/products/crm'; $server = new soap_server; Modified: vtigercrm/branches/5.0.1/soap/wordplugin.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/wordplugin.php (original) +++ vtigercrm/branches/5.0.1/soap/wordplugin.php Wed Oct 4 05:32:13 2006 @@ -17,7 +17,7 @@ $log = &LoggerManager::getLogger('wordplugin'); error_reporting(0); -$NAMESPACE = 'http://www.vtiger.com/vtigercrm/'; +$NAMESPACE = 'http://www.vtiger.com/products/crm'; $server = new soap_server; $accessDenied = "You are not permitted to perform this action"; $server->configureWSDL('vtigersoap'); From vtigercrm-commits at vtiger.fosslabs.com Wed Oct 4 04:35:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 04 Oct 2006 11:35:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9553 - /vtigercrm/branches/5.0.1/vtigerservice.php Message-ID: <20061004113517.AA29A787E9C@vtiger.fosslabs.com> Author: jerrydgeorge Date: Wed Oct 4 05:35:00 2006 New Revision: 9553 Log: Error_reporting set and link for wordplugin changed ,Fixes #2065,#2066. Modified: vtigercrm/branches/5.0.1/vtigerservice.php Modified: vtigercrm/branches/5.0.1/vtigerservice.php ============================================================================== --- vtigercrm/branches/5.0.1/vtigerservice.php (original) +++ vtigercrm/branches/5.0.1/vtigerservice.php Wed Oct 4 05:35:00 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ - +ini_set (error_reporting,E_ALL & ~E_NOTICE ); if(isset($_REQUEST['service'])) { if($_REQUEST['service'] == "outlook") @@ -44,11 +44,11 @@ { echo "

vtigerCRM Soap Services

"; echo "
  • vtigerCRM Outlook Plugin EndPoint URL -- Click here
  • "; - echo "
  • vtigerCRM Word Plugin EndPoint URL -- Click here
  • "; + echo "
  • vtigerCRM Word Plugin EndPoint URL -- Click here
  • "; echo "
  • vtigerCRM ThunderBird Extenstion EndPoint URL -- Click here
  • "; echo "
  • vtigerCRM Customer Portal EndPoint URL -- Click here
  • "; echo "
  • vtigerCRM WebForm EndPoint URL -- Click here
  • "; - echo "
  • vtigerCRM FireFox Extension EndPoint URL -- Click here
  • "; + echo "
  • vtigerCRM FireFox Extension EndPoint URL -- Click here
  • "; } From vtigercrm-commits at vtiger.fosslabs.com Wed Oct 4 05:03:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 04 Oct 2006 12:03:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9554 - /vtigercrm/branches/5.1_jens/ Message-ID: <20061004120333.F038B787E96@vtiger.fosslabs.com> Author: richie Date: Wed Oct 4 06:03:22 2006 New Revision: 9554 Log: Creating a branch for jens for 5.1 development Added: vtigercrm/branches/5.1_jens/ - copied from r9529, vtigercrm/trunk/ From vtigercrm-commits at vtiger.fosslabs.com Wed Oct 4 05:50:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 04 Oct 2006 12:50:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9555 - /vtigercrm/branches/5.0.1/data/SugarBean.php Message-ID: <20061004125036.E833E787E82@vtiger.fosslabs.com> Author: richie Date: Wed Oct 4 06:50:33 2006 New Revision: 9555 Log: * Removed the quotes for the date_entered and date_modified field values because single quotes will be added in the function adodb's formatString which throws error when we save import mapping Modified: vtigercrm/branches/5.0.1/data/SugarBean.php Modified: vtigercrm/branches/5.0.1/data/SugarBean.php ============================================================================== --- vtigercrm/branches/5.0.1/data/SugarBean.php (original) +++ vtigercrm/branches/5.0.1/data/SugarBean.php Wed Oct 4 06:50:33 2006 @@ -58,7 +58,7 @@ } //$this->date_modified = $this->db->formatDate(date('YmdHis')); - $this->date_modified = $this->db->formatDate(date('YmdHis')); + $this->date_modified = date('YmdHis'); if (isset($current_user)) $this->modified_user_id = $current_user->id; if($isUpdate) @@ -68,7 +68,7 @@ else { //$this->date_entered = $this->db->formatDate(date('YmdHis')); - $this->date_entered = $this->db->formatDate(date('YmdHis')); + $this->date_entered = date('YmdHis'); if($this->new_schema && $this->new_with_id == false) From vtigercrm-commits at vtiger.fosslabs.com Wed Oct 4 08:42:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 04 Oct 2006 15:42:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9556 - in /vtigercrm/branches/5.0.1: Smarty/templates/Settings.tpl Smarty/templates/Settings/TaxConfig.tpl modules/Contacts/language/en_us.lang.php modules/Contacts/vtchat.php modules/Settings/language/en_us.lang.php Message-ID: <20061004154240.290C4787EB5@vtiger.fosslabs.com> Author: richie Date: Wed Oct 4 09:42:04 2006 New Revision: 9556 Log: * Modified to fix the i18n issues Modified: vtigercrm/branches/5.0.1/Smarty/templates/Settings.tpl vtigercrm/branches/5.0.1/Smarty/templates/Settings/TaxConfig.tpl vtigercrm/branches/5.0.1/modules/Contacts/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/Contacts/vtchat.php vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php Modified: vtigercrm/branches/5.0.1/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/Settings.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/Settings.tpl Wed Oct 4 09:42:04 2006 @@ -22,7 +22,7 @@ - {$MOD.LBL_SETTINGS} +   Modified: vtigercrm/branches/5.0.1/Smarty/templates/Settings/TaxConfig.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/Settings/TaxConfig.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/Settings/TaxConfig.tpl Wed Oct 4 09:42:04 2006 @@ -86,7 +86,7 @@   {if $EDIT_MODE neq 'true'} - + {/if} Modified: vtigercrm/branches/5.0.1/modules/Contacts/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/language/en_us.lang.php Wed Oct 4 09:42:04 2006 @@ -225,6 +225,7 @@ 'Web Site'=>'Web Site', 'Word of mouth'=>'Word of mouth', 'Other'=>'Other', +'User List'=>'User List', ); Modified: vtigercrm/branches/5.0.1/modules/Contacts/vtchat.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/vtchat.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/vtchat.php Wed Oct 4 09:42:04 2006 @@ -74,7 +74,7 @@ - + Modified: vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php Wed Oct 4 09:42:04 2006 @@ -721,6 +721,7 @@ 'LBL_TYPEALERT_2'=>'data type. Kindly map the same data types.', 'LBL_ENABLE'=>'Enable', 'LBL_FAQ_FIELD_ACCESS'=>'Faq Field Access', +'LBL_ADD_TAX_BUTTON'=>'Add Tax', ); From vtigercrm-commits at vtiger.fosslabs.com Wed Oct 4 08:58:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 04 Oct 2006 15:58:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9557 - /vtigercrm/branches/5.0.1/Smarty/templates/Settings.tpl Message-ID: <20061004155859.0FEC2787EB5@vtiger.fosslabs.com> Author: richie Date: Wed Oct 4 09:58:48 2006 New Revision: 9557 Log: Inventory Terms and Condition moved to other section. Fixes #763 Modified: vtigercrm/branches/5.0.1/Smarty/templates/Settings.tpl Modified: vtigercrm/branches/5.0.1/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/Settings.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/Settings.tpl Wed Oct 4 09:58:48 2006 @@ -22,7 +22,7 @@ @@ -309,63 +309,6 @@
    User List
    -   + {$MOD.LBL_SETTINGS}
    - - - - - - - - - - - - - - - -
    {$MOD.INVENTORYTERMSANDCONDITIONS}{$MOD.LBL_INVENTORY_TANDC}
    {$MOD.LBL_INV_TANDC_DESCRIPTION}
    - - - - - - - - - - - - - -
      
     
    - - - - - - - - - - - - -
      
     
    - - - - - - - - - - - - -
      
     
    - @@ -536,20 +479,24 @@ {$MOD.LBL_MIGRATION_INFO} -   - - -   -   -   - - - - - - - + + + + + + + + + + +
    {$MOD.INVENTORYTERMSANDCONDITIONS}{$MOD.LBL_INVENTORY_TANDC}
    {$MOD.LBL_INV_TANDC_DESCRIPTION}
    + + + + + + From vtigercrm-commits at vtiger.fosslabs.com Thu Oct 5 02:47:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 05 Oct 2006 09:47:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9558 - in /vtigercrm/branches/5.0.1: Smarty/templates/CreateWordTemplate.tpl modules/Users/upload.php Message-ID: <20061005094709.6FCEF76FEAF@vtiger.fosslabs.com> Author: richie Date: Thu Oct 5 03:47:03 2006 New Revision: 9558 Log: * Modified to handle the hardcoded attachment size to be captured in config.inc.php file Modified: vtigercrm/branches/5.0.1/Smarty/templates/CreateWordTemplate.tpl vtigercrm/branches/5.0.1/modules/Users/upload.php Modified: vtigercrm/branches/5.0.1/Smarty/templates/CreateWordTemplate.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/CreateWordTemplate.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/CreateWordTemplate.tpl Thu Oct 5 03:47:03 2006 @@ -25,7 +25,7 @@
    - + Users Modified: vtigercrm/branches/5.0.1/modules/Users/upload.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/upload.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/upload.php Thu Oct 5 03:47:03 2006 @@ -19,6 +19,7 @@ global $mod_strings; global $app_list_strings; global $adb; +global $upload_maxsize; global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -44,6 +45,7 @@ $smarty->assign("APP", $app_strings); $smarty->assign("UMOD", $mod_strings); $smarty->assign("PARENTTAB", $_REQUEST['parenttab']); +$smarty->assign("MAX_FILE_SIZE", $upload_maxsize); $smarty->display('CreateWordTemplate.tpl'); From vtigercrm-commits at vtiger.fosslabs.com Thu Oct 5 04:48:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 05 Oct 2006 11:48:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9559 - /vtigercrm/branches/5.0.1/modules/Dashboard/HomepageDB.php Message-ID: <20061005114836.D9FC6787E4A@vtiger.fosslabs.com> Author: richie Date: Thu Oct 5 05:48:32 2006 New Revision: 9559 Log: changes made to fix the issue 2115 - Minnie Modified: vtigercrm/branches/5.0.1/modules/Dashboard/HomepageDB.php Modified: vtigercrm/branches/5.0.1/modules/Dashboard/HomepageDB.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Dashboard/HomepageDB.php (original) +++ vtigercrm/branches/5.0.1/modules/Dashboard/HomepageDB.php Thu Oct 5 05:48:32 2006 @@ -9,17 +9,10 @@ * ********************************************************************************/ require_once("modules/Dashboard/Entity_charts.php"); -/** - * Function to get Dashboard in homepage - * return the graph - $sHTML - */ + global $current_user,$user_id,$date_start,$end_date,$tmp_dir,$mod_strings; $type='recordsforuser'; - //require('user_privileges/user_privileges_'.$current_user->id.'.php'); - //if($is_admin) - // $homepagedb_query = "select vtiger_crmentity.* from vtiger_crmentity where vtiger_crmentity.setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder','SalesOrder','Activities','HelpDesk','Campaigns') and vtiger_crmentity.deleted=0"; - //else - $homepagedb_query = "select * from vtiger_crmentity se left join vtiger_leaddetails le on le.leadid=se.crmid left join vtiger_activity act on act.activityid=se.crmid where se.deleted=0 and (le.converted=0 or le.converted is null) and ((act.status!='Completed' and act.status!='Deferred') or act.status is null) and ((act.eventstatus!='Held' and act.eventstatus!='Not Held') or act.eventstatus is null) and setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder', 'SalesOrder','Calendar','HelpDesk','Campaigns') and se.deleted=0 and se.smownerid=".$current_user->id; + $homepagedb_query = "select * from vtiger_crmentity se left join vtiger_leaddetails le on le.leadid=se.crmid left join vtiger_troubletickets tt on tt.ticketid=se.crmid left join vtiger_activity act on act.activityid=se.crmid where se.deleted=0 and (le.converted=0 or le.converted is null) and (tt.status!='Closed' or tt.status is null) and ((act.status!='Completed' and act.status!='Deferred') or act.status is null) and ((act.eventstatus!='Held' and act.eventstatus!='Not Held') or act.eventstatus is null) and setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder', 'SalesOrder','Calendar','HelpDesk','Campaigns') and se.deleted=0 and se.smownerid=".$current_user->id; $graph_by="setype"; $graph_title=$mod_strings['recordsforuser'].' '.$current_user->user_name; $module="Home"; From vtigercrm-commits at vtiger.fosslabs.com Thu Oct 5 04:52:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 05 Oct 2006 11:52:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9560 - /vtigercrm/branches/5.0.1/modules/HelpDesk/ListView.php Message-ID: <20061005115206.B8F25787E4A@vtiger.fosslabs.com> Author: richie Date: Thu Oct 5 05:52:03 2006 New Revision: 9560 Log: changes made to fix the issue 2115 - Minnie Modified: vtigercrm/branches/5.0.1/modules/HelpDesk/ListView.php Modified: vtigercrm/branches/5.0.1/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/HelpDesk/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/HelpDesk/ListView.php Thu Oct 5 05:52:03 2006 @@ -122,6 +122,8 @@ 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 '.$where; } From vtigercrm-commits at vtiger.fosslabs.com Thu Oct 5 04:56:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 05 Oct 2006 11:56:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9561 - /vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl Message-ID: <20061005115649.0D900787E4A@vtiger.fosslabs.com> Author: richie Date: Thu Oct 5 05:56:46 2006 New Revision: 9561 Log: changes made to fix the issue 2207 - Minnie Modified: vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl Modified: vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl Thu Oct 5 05:56:46 2006 @@ -135,10 +135,10 @@ {assign var=style_group value='display:block'} {/if} -  User +  {$APP.LBL_USER} {if $secondvalue neq ''} -  Group +  {$APP.LBL_GROUP} {/if}   -   - {/if} - {if $DELETE eq 'permitted'} -   - {/if} + + + + + +
    + {if $EDIT_DUPLICATE eq 'permitted'} +   + {/if} + + {if $EDIT_DUPLICATE eq 'permitted'} +   + {/if} + {if $DELETE eq 'permitted'} +   + {/if} +
    - - - - + + + + Modified: vtigercrm/branches/5.0.1/modules/Settings/UpdateComboValues.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Settings/UpdateComboValues.php (original) +++ vtigercrm/branches/5.0.1/modules/Settings/UpdateComboValues.php Thu Oct 5 09:34:24 2006 @@ -12,6 +12,8 @@ $fld_module=$_REQUEST["fld_module"]; $tableName=$_REQUEST["table_name"]; $fldPickList = $_REQUEST['listarea']; +//changed by dingjianting on 2006-10-1 for picklist editor +$fldPickList = utf8RawUrlDecode($fldPickList); $uitype = $_REQUEST['uitype']; global $adb; From vtigercrm-commits at vtiger.fosslabs.com Thu Oct 5 11:53:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 05 Oct 2006 18:53:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9572 - in /vtigercrm/branches/5.0.1/modules: Accounts/ Campaigns/ Contacts/ Faq/ HelpDesk/ Invoice/ Leads/ Notes/ Potentials/ PriceBooks/ Products/ PurchaseOrder/ Quotes/ SalesOrder/ Users/ Vendors/ Message-ID: <20061005185321.C008E66ADA0@vtiger.fosslabs.com> Author: richie Date: Thu Oct 5 12:52:28 2006 New Revision: 9572 Log: UTF-8 support added. Fixes #2297 Modified: vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Faq/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/HelpDesk/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Invoice/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/SalesOrder/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php Modified: vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $acntObj = new Account(); Modified: vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Campaign(); Modified: vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $cntObj = new Contact(); Modified: vtigercrm/branches/5.0.1/modules/Faq/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Faq/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Faq/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Faq(); Modified: vtigercrm/branches/5.0.1/modules/HelpDesk/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/HelpDesk/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/HelpDesk/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { Modified: vtigercrm/branches/5.0.1/modules/Invoice/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Invoice/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Invoice/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { Modified: vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -21,7 +21,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $leadObj = new Lead(); Modified: vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Note(); Modified: vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Potential(); Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new PriceBook(); Modified: vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Product(); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Order(); Modified: vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Quote(); Modified: vtigercrm/branches/5.0.1/modules/SalesOrder/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/SalesOrder/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/SalesOrder/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new SalesOrder(); Modified: vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -21,7 +21,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $userObj = new User(); Modified: vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Vendor(); From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 00:11:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 07:11:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9573 - in /vtigercrm/branches/5.0.1/modules/Portal: Popup.php Portal.js Save.php Message-ID: <20061006071153.4E2646F7583@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 01:11:48 2006 New Revision: 9573 Log: * Modified to fix the http:// to add with the site given - ticket 2169 Modified: vtigercrm/branches/5.0.1/modules/Portal/Popup.php vtigercrm/branches/5.0.1/modules/Portal/Portal.js vtigercrm/branches/5.0.1/modules/Portal/Save.php Modified: vtigercrm/branches/5.0.1/modules/Portal/Popup.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Portal/Popup.php (original) +++ vtigercrm/branches/5.0.1/modules/Portal/Popup.php Fri Oct 6 01:11:48 2006 @@ -42,7 +42,7 @@ '.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_URL'] .' - + http:// '.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_NAME'] .' Modified: vtigercrm/branches/5.0.1/modules/Portal/Portal.js ============================================================================== --- vtigercrm/branches/5.0.1/modules/Portal/Portal.js (original) +++ vtigercrm/branches/5.0.1/modules/Portal/Portal.js Fri Oct 6 01:11:48 2006 @@ -90,3 +90,25 @@ 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.0.1/modules/Portal/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Portal/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Portal/Save.php Fri Oct 6 01:11:48 2006 @@ -13,10 +13,10 @@ if(isset($_REQUEST['record']) && $_REQUEST['record'] !='') { - $result=UpdatePortal($_REQUEST['portalname'],$_REQUEST['portalurl'],$_REQUEST['record']); + $result=UpdatePortal($_REQUEST['portalname'],"http://".$_REQUEST['portalurl'],$_REQUEST['record']); }else { - $result=SavePortal($_REQUEST['portalname'],$_REQUEST['portalurl']); + $result=SavePortal($_REQUEST['portalname'],"http://".$_REQUEST['portalurl']); } header("Location: index.php?action=PortalAjax&module=Portal&file=ListView&mode=ajax&datamode=manage"); ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 00:34:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 07:34:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9574 - /vtigercrm/branches/5.0.1/modules/Portal/Popup.php Message-ID: <20061006073405.C36487700B0@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 01:34:01 2006 New Revision: 9574 Log: * Added script function call in save onclick to remove http:// from the given URL Modified: vtigercrm/branches/5.0.1/modules/Portal/Popup.php Modified: vtigercrm/branches/5.0.1/modules/Portal/Popup.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Portal/Popup.php (original) +++ vtigercrm/branches/5.0.1/modules/Portal/Popup.php Fri Oct 6 01:34:01 2006 @@ -55,7 +55,7 @@ From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 01:43:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 08:43:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9575 - in /vtigercrm/branches/5.0.1/modules/Calendar: addEventUI.php language/en_us.lang.php Message-ID: <20061006084310.8510B7700B0@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 02:43:05 2006 New Revision: 9575 Log: * Modified for i18n Modified: vtigercrm/branches/5.0.1/modules/Calendar/addEventUI.php vtigercrm/branches/5.0.1/modules/Calendar/language/en_us.lang.php Modified: vtigercrm/branches/5.0.1/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Calendar/addEventUI.php (original) +++ vtigercrm/branches/5.0.1/modules/Calendar/addEventUI.php Fri Oct 6 02:43:05 2006 @@ -429,7 +429,7 @@ - days + hrs + minutes  +  
    -    +   
    Modified: vtigercrm/branches/5.0.1/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Calendar/language/en_us.lang.php Fri Oct 6 02:43:05 2006 @@ -403,6 +403,8 @@ 'High'=>'High', 'Medium'=>'Medium', 'Low'=>'Low', +'LBL_REMAINDER_DAY'=>'days', +'LBL_REMAINDER_HRS'=>'hrs', ); From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 05:59:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 12:59:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9576 - /vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php Message-ID: <20061006125922.07228787EFD@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 06:59:18 2006 New Revision: 9576 Log: Users->New Users throws a database error. Fixes #2278 Modified: vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php Modified: vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php Fri Oct 6 06:59:18 2006 @@ -1195,12 +1195,14 @@ elseif($uitype == 105) { $editview_label[]=$mod_strings[$fieldlabel]; - $query = "select attachments.path, attachments.name from contactdetails left join seattachmentsrel on seattachmentsrel.crmid=contactdetails.contactid inner join attachments on attachments.attachmentsid=seattachmentsrel.attachmentsid where contactdetails.imagename=attachments.name and contactid=".$col_fields['record_id']; - $result_image = $adb->query($query); - for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++) - { - $image_array[] = $adb->query_result($result_image,$image_iter,'name'); - $image_path_array[] = $adb->query_result($result_image,$image_iter,'path'); + if( isset( $col_fields['record_id']) && $col_fields['record_id'] != '') { + $query = "select vtiger_attachments.path, vtiger_attachments.name from vtiger_contactdetails left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_contactdetails.contactid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where vtiger_contactdetails.imagename=vtiger_attachments.name and contactid=".$col_fields['record_id']; + $result_image = $adb->query($query); + for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++) + { + $image_array[] = $adb->query_result($result_image,$image_iter,'name'); + $image_path_array[] = $adb->query_result($result_image,$image_iter,'path'); + } } if(is_array($image_array)) for($img_itr=0;$img_itr Author: richie Date: Fri Oct 6 08:29:00 2006 New Revision: 9577 Log: * Added file contains the functions which are used in Export records to CSV file Added: vtigercrm/branches/5.0.1/include/utils/ExportUtils.php From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 07:37:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 14:37:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9578 - in /vtigercrm/branches/5.0.1/modules: Accounts/Account.php Contacts/Contact.php Emails/Email.php Leads/Lead.php Notes/Note.php Potentials/Opportunity.php Products/Product.php Message-ID: <20061006143732.8A450787F08@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 08:37:21 2006 New Revision: 9578 Log: * Added security for the Export query so that the permitted fields and premitted records only can be export to CSV files Modified: vtigercrm/branches/5.0.1/modules/Accounts/Account.php vtigercrm/branches/5.0.1/modules/Contacts/Contact.php vtigercrm/branches/5.0.1/modules/Emails/Email.php vtigercrm/branches/5.0.1/modules/Leads/Lead.php vtigercrm/branches/5.0.1/modules/Notes/Note.php vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php vtigercrm/branches/5.0.1/modules/Products/Product.php Modified: vtigercrm/branches/5.0.1/modules/Accounts/Account.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/Account.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/Account.php Fri Oct 6 08:37:21 2006 @@ -670,64 +670,34 @@ function create_export_query(&$order_by, &$where) { global $log; + global $current_user; $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - if($this->checkIfCustomTableExists('vtiger_accountscf')) - { - - $query = $this->constructCustomQueryAddendum('vtiger_accountscf','Accounts') . " - vtiger_account.*, - ".$this->entity_table.".*, - vtiger_accountbillads.city AS billing_city, - vtiger_accountbillads.country AS billing_country, - vtiger_accountbillads.code AS billing_code, - vtiger_accountbillads.state AS billing_state, - vtiger_accountbillads.street AS billing_street, - vtiger_accountshipads.city AS shipping_city, - vtiger_accountshipads.country AS shipping_country, - vtiger_accountshipads.code AS shipping_code, - vtiger_accountshipads.state AS shipping_state, - vtiger_accountshipads.street AS shipping_street, - vtiger_users.user_name, - vtiger_users.status AS user_status - FROM ".$this->entity_table." + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Accounts", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list FROM ".$this->entity_table." INNER JOIN vtiger_account ON vtiger_crmentity.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 + LEFT JOIN vtiger_accountscf ON vtiger_accountscf.accountid = vtiger_account.accountid + LEFT JOIN vtiger_accountgrouprelation + ON vtiger_accountscf.accountid = vtiger_accountgrouprelation.accountid + LEFT JOIN vtiger_groups + ON vtiger_groups.groupname = vtiger_accountgrouprelation.groupname LEFT JOIN vtiger_users - ON vtiger_crmentity.smownerid = vtiger_users.id "; - - } - else - { - $query = "SELECT vtiger_account.*, - ".$this->entity_table.".*, - vtiger_accountbillads.city AS billing_city, - vtiger_accountbillads.country AS billing_country, - vtiger_accountbillads.code AS billing_code, - vtiger_accountbillads.state AS billing_state, - vtiger_accountbillads.street AS billing_street, - vtiger_accountshipads.city AS shipping_city, - vtiger_accountshipads.country AS shipping_country, - vtiger_accountshipads.code AS shipping_code, - vtiger_accountshipads.state AS shipping_state, - vtiger_accountshipads.street AS shipping_street, - vtiger_users.user_name, - vtiger_users.status AS user_status - FROM ".$this->entity_table." - INNER JOIN vtiger_account - ON vtiger_crmentity.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_users - ON vtiger_crmentity.smownerid = vtiger_users.id "; - } + ON vtiger_crmentity.smownerid = vtiger_users.id + LEFT JOIN vtiger_account vtiger_account2 + ON vtiger_account2.accountid = vtiger_account.parentid + ";//vtiger_account2 is added to get the Member of account + $where_auto = " vtiger_users.status = 'Active' AND vtiger_crmentity.deleted = 0 "; @@ -737,8 +707,18 @@ 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[6] == 3) + { + //Added security check to get the permitted records only + $query = $query." ".getListViewSecurityParameter("Accounts"); + } + if(!empty($order_by)) $query .= " ORDER BY $order_by"; + $log->debug("Exiting create_export_query method ..."); return $query; } Modified: vtigercrm/branches/5.0.1/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/Contact.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/Contact.php Fri Oct 6 08:37:21 2006 @@ -653,36 +653,43 @@ function create_export_query(&$order_by, &$where) { global $log; + global $current_user; $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - if($this->checkIfCustomTableExists('vtiger_contactscf')) - { - $query = $this->constructCustomQueryAddendum('vtiger_contactscf','Contacts') ." - vtiger_contactdetails.*, vtiger_contactaddress.*, - vtiger_account.accountname account_name, - vtiger_users.user_name assigned_user_name - 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_contactscf on vtiger_contactscf.contactid=vtiger_contactdetails.contactid - where vtiger_crmentity.deleted=0 and vtiger_users.status='Active' "; - } - else - { - $query = "SELECT - vtiger_contactdetails.*, vtiger_contactaddress.*, - vtiger_account.accountname account_name, - vtiger_users.user_name assigned_user_name + + 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->info("Export Query Constructed Successfully"); $log->debug("Exiting create_export_query method ..."); return $query; } Modified: vtigercrm/branches/5.0.1/modules/Emails/Email.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/Email.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/Email.php Fri Oct 6 08:37:21 2006 @@ -257,8 +257,50 @@ function create_export_query(&$order_by, &$where) { global $log; + global $current_user; $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - $query = 'SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_attachments.name as filename, vtiger_crmentity.description as email_content FROM vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_seattachmentsrel on vtiger_activity.activityid=vtiger_seattachmentsrel.crmid left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid where vtiger_activity.activitytype="Emails" and vtiger_crmentity.deleted=0'; + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Emails", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list FROM vtiger_activity + INNER JOIN vtiger_crmentity + ON vtiger_crmentity.crmid=vtiger_activity.activityid + LEFT JOIN vtiger_users + ON vtiger_users.id = vtiger_crmentity.smownerid + LEFT JOIN vtiger_seactivityrel + ON vtiger_seactivityrel.activityid = vtiger_activity.activityid + LEFT JOIN vtiger_contactdetails + ON vtiger_contactdetails.contactid = vtiger_seactivityrel.crmid + LEFT JOIN vtiger_cntactivityrel + ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid + AND vtiger_cntactivityrel.contactid = vtiger_cntactivityrel.contactid + 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_salesmanactivityrel + ON vtiger_salesmanactivityrel.activityid = vtiger_activity.activityid + LEFT JOIN vtiger_emaildetails + ON vtiger_emaildetails.emailid = vtiger_activity.activityid + LEFT JOIN vtiger_seattachmentsrel + ON vtiger_activity.activityid=vtiger_seattachmentsrel.crmid + LEFT JOIN vtiger_attachments + ON vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid + WHERE vtiger_activity.activitytype='Emails' AND 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) + { + $sec_parameter=getListViewSecurityParameter("Emails"); + $query .= $sec_parameter; + } $log->debug("Exiting create_export_query method ..."); return $query; Modified: vtigercrm/branches/5.0.1/modules/Leads/Lead.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/Lead.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/Lead.php Fri Oct 6 08:37:21 2006 @@ -138,38 +138,32 @@ function create_export_query(&$order_by, &$where) { global $log; + global $current_user; $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - if($this->checkIfCustomTableExists('vtiger_leadscf')) - { - - $query = $this->constructCustomQueryAddendum('vtiger_leadscf','Leads') . " - vtiger_leaddetails.*, ".$this->entity_table.".*, vtiger_leadsubdetails.*,vtiger_leadaddress.city city, vtiger_leadaddress.state state,vtiger_leadaddress.code code,vtiger_leadaddress.country country, vtiger_leadaddress.phone phone, vtiger_users.user_name, vtiger_users.status user_status - FROM ".$this->entity_table." + + 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_leadaddress - ON vtiger_leaddetails.leadid=vtiger_leadaddress.leadaddressid + ON vtiger_crmentity.crmid=vtiger_leaddetails.leadid LEFT JOIN vtiger_leadsubdetails - ON vtiger_leaddetails.leadid=vtiger_leadsubdetails.leadsubscriptionid + 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 + 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 "; - - } - else - { - $query = "SELECT - vtiger_leaddetails.*, ".$this->entity_table.".*, vtiger_leadsubdetails.*,vtiger_leadaddress.*,vtiger_users.user_name, vtiger_users.status user_status 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_users - ON vtiger_crmentity.smownerid = vtiger_users.id "; - } + ON vtiger_crmentity.smownerid = vtiger_users.id + "; + $where_auto = " vtiger_users.status='Active' AND vtiger_crmentity.deleted=0 AND vtiger_leaddetails.converted =0"; @@ -178,6 +172,15 @@ $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"; Modified: vtigercrm/branches/5.0.1/modules/Notes/Note.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/Note.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/Note.php Fri Oct 6 08:37:21 2006 @@ -89,12 +89,55 @@ { global $log; $log->debug("Entering create_export_query(".$order_by.",". $where.") method ..."); - $query = "SELECT - vtiger_notes.*, - vtiger_contactdetails.firstname, - vtiger_contactdetails.lastname - FROM vtiger_notes - LEFT JOIN vtiger_contactdetails ON vtiger_notes.contact_id=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_notes.notesid and vtiger_crmentity.deleted=0 "; + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Notes", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list FROM vtiger_notes + inner join vtiger_crmentity + on vtiger_crmentity.crmid=vtiger_notes.notesid + LEFT JOIN vtiger_senotesrel + ON vtiger_senotesrel.notesid = vtiger_notes.notesid + LEFT JOIN vtiger_contactdetails + ON vtiger_notes.contact_id=vtiger_contactdetails.contactid + + LEFT JOIN vtiger_crmentity vtiger_crmentityRelatedTo + ON vtiger_crmentityRelatedTo.crmid = vtiger_senotesrel.crmid + + LEFT JOIN vtiger_leaddetails vtiger_NoteRelatedToLead + ON vtiger_NoteRelatedToLead.leadid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_account vtiger_NoteRelatedToAccount + ON vtiger_NoteRelatedToAccount.accountid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_potential vtiger_NoteRelatedToPotential + ON vtiger_NoteRelatedToPotential.potentialid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_products vtiger_NoteRelatedToProduct + ON vtiger_NoteRelatedToProduct.productid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_invoice vtiger_NoteRelatedToInvoice + ON vtiger_NoteRelatedToInvoice.invoiceid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_purchaseorder vtiger_NoteRelatedToPO + ON vtiger_NoteRelatedToPO.purchaseorderid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_salesorder vtiger_NoteRelatedToSO + ON vtiger_NoteRelatedToSO.salesorderid = vtiger_senotesrel.crmid + + WHERE vtiger_crmentity.deleted=0 + + AND ((vtiger_senotesrel.crmid IS NULL + AND (vtiger_notes.contact_id = 0 + OR vtiger_notes.contact_id IS NULL)) + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Leads').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Accounts').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Potentials').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Products').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Invoice').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('PurchaseOrder').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('SalesOrder').") + OR vtiger_notes.contact_id IN (".getReadEntityIds('Contacts').")) + + "; + $log->debug("Exiting create_export_query method ..."); return $query; } Modified: vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php Fri Oct 6 08:37:21 2006 @@ -183,34 +183,37 @@ function create_export_query($order_by, $where) { global $log; + global $current_user; $log->debug("Entering create_export_query(".$order_by.",". $where.") method ..."); - if($this->checkIfCustomTableExists('vtiger_potentialscf')) - { - $query = $this->constructCustomQueryAddendum('vtiger_potentialscf','Potentials') ." - vtiger_potential.*, - vtiger_account.accountname account_name, - vtiger_users.user_name assigned_user_name - FROM vtiger_potential - INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid=vtiger_potential.potentialid - 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_users on vtiger_crmentity.smownerid=vtiger_users.id - where vtiger_crmentity.deleted=0 "; - } - else - { - $query = "SELECT - vtiger_potential.*, - vtiger_account.accountname account_name, - vtiger_users.user_name assigned_user_name - FROM vtiger_potential + 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; Modified: vtigercrm/branches/5.0.1/modules/Products/Product.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/Product.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/Product.php Fri Oct 6 08:37:21 2006 @@ -517,96 +517,54 @@ { global $log; $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - if($this->checkIfCustomTableExists('vtiger_productcf')) - { - - $query = $this->constructCustomQueryAddendum('vtiger_productcf','Products') ." - vtiger_products.productid AS productid, - vtiger_products.productname AS productname, - vtiger_products.productcode AS productcode, - vtiger_products.productcategory AS productcategory, - vtiger_products.manufacturer AS manufacturer, - vtiger_crmentity.description AS product_description, - vtiger_products.qty_per_unit AS qty_per_unit, - vtiger_products.unit_price AS unit_price, - vtiger_products.weight AS weight, - vtiger_products.pack_size AS pack_size, - DATE_FORMAT(vtiger_products.start_date, '%Y-%m-%d') AS start_date, - DATE_FORMAT(vtiger_products.expiry_date, '%Y-%m-%d') AS expiry_date, - vtiger_products.cost_factor AS cost_factor, - vtiger_products.commissionrate AS commissionrate, - vtiger_products.commissionmethod AS commissionmethod, - vtiger_products.discontinued AS discontinued, - vtiger_products.sales_start_date AS sales_start_date, - vtiger_products.sales_end_date AS sales_end_date, - vtiger_products.usageunit AS usageunit, - vtiger_products.serialno AS serialno, - vtiger_products.currency AS currency, - vtiger_products.reorderlevel AS reorderlevel, - vtiger_products.website AS website, - vtiger_products.taxclass AS taxclass, - vtiger_products.mfr_part_no AS mfr_part_no, - vtiger_products.vendor_part_no AS vendor_part_no, - vtiger_products.qtyinstock AS qtyinstock, - vtiger_products.productsheet AS productsheet, - vtiger_products.qtyindemand AS qtyindemand - FROM ".$this->entity_table." - INNER JOIN vtiger_products - ON vtiger_crmentity.crmid = vtiger_products.productid + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Products", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list FROM ".$this->table_name ." + 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_seproductsrel + ON vtiger_seproductsrel.productid = vtiger_products.productid + LEFT JOIN vtiger_producttaxrel + ON vtiger_producttaxrel.productid = vtiger_products.productid INNER JOIN vtiger_users - ON vtiger_users.id = vtiger_crmentity.smownerid - LEFT JOIN vtiger_productcf - ON vtiger_productcf.productid = vtiger_products.productid"; - - } - else - { - $query = "SELECT vtiger_products.productid AS productid, - vtiger_products.productname AS productname, - vtiger_products.productcode AS productcode, - vtiger_products.productcategory AS productcategory, - vtiger_products.manufacturer AS manufacturer, - vtiger_crmentity.description AS product_description, - vtiger_products.qty_per_unit AS qty_per_unit, - vtiger_products.unit_price AS unit_price, - vtiger_products.weight AS weight, - vtiger_products.pack_size AS pack_size, - DATE_FORMAT(vtiger_products.start_date, '%Y-%m-%d') AS start_date, - DATE_FORMAT(vtiger_products.expiry_date, '%Y-%m-%d') AS expiry_date, - vtiger_products.cost_factor AS cost_factor, - vtiger_products.commissionrate AS commissionrate, - vtiger_products.commissionmethod AS commissionmethod, - vtiger_products.discontinued AS discontinued, - vtiger_products.sales_start_date AS sales_start_date, - vtiger_products.sales_end_date AS sales_end_date, - vtiger_products.usageunit AS usageunit, - vtiger_products.serialno AS serialno, - vtiger_products.currency AS vtiger_currency, - vtiger_products.reorderlevel AS reorderlevel, - vtiger_products.website AS website, - vtiger_products.taxclass AS taxclass, - vtiger_products.mfr_part_no AS mfr_part_no, - vtiger_products.vendor_part_no AS vendor_part_no, - vtiger_products.qtyinstock AS qtyinstock, - vtiger_products.productsheet AS productsheet, - vtiger_products.qtyindemand AS qtyindemand - FROM ".$this->table_name ." - INNER JOIN vtiger_crmentity - ON vtiger_crmentity.crmid = vtiger_products.productid - INNER JOIN vtiger_users - ON vtiger_users.id=vtiger_crmentity.smownerid "; - - } + ON vtiger_users.id=vtiger_crmentity.smownerid + + LEFT JOIN vtiger_crmentity vtiger_crmentityRelatedTo + ON vtiger_crmentityRelatedTo.crmid = vtiger_seproductsrel.crmid + + LEFT JOIN vtiger_leaddetails vtiger_ProductRelatedToLead + ON vtiger_ProductRelatedToLead.leadid = vtiger_seproductsrel.crmid + LEFT JOIN vtiger_account vtiger_ProductRelatedToAccount + ON vtiger_ProductRelatedToAccount.accountid = vtiger_seproductsrel.crmid + LEFT JOIN vtiger_potential vtiger_ProductRelatedToPotential + ON vtiger_ProductRelatedToPotential.potentialid = vtiger_seproductsrel.crmid - $where_auto = " vtiger_users.status = 'Active' - AND vtiger_crmentity.deleted = 0 "; - - - - if($where != "") - $query .= " WHERE ($where) AND ".$where_auto; - else - $query .= " WHERE ".$where_auto; + LEFT JOIN vtiger_contactdetails + ON vtiger_contactdetails.contactid = vtiger_products.contactid + 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').")) + group by vtiger_products.productid + "; + //ProductRelatedToLead, Account and Potential tables are added to get the Related to field + + + if($where != "") + $query .= " AND ($where) "; if(!empty($order_by)) $query .= " ORDER BY $order_by"; From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 08:36:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 15:36:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9579 - in /vtigercrm/branches/5.0.1/modules: Accounts/ Campaigns/ Contacts/ HelpDesk/ Leads/ Notes/ Potentials/ PriceBooks/ Products/ Vendors/ Message-ID: <20061006153654.89D0476FF01@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 09:36:41 2006 New Revision: 9579 Log: * Modified the SINGLE_MOD value from app_strings to hardcoded value because this value displayed from language string in tpl file Modified: vtigercrm/branches/5.0.1/modules/Accounts/EditView.php vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php vtigercrm/branches/5.0.1/modules/Contacts/EditView.php vtigercrm/branches/5.0.1/modules/HelpDesk/EditView.php vtigercrm/branches/5.0.1/modules/Leads/EditView.php vtigercrm/branches/5.0.1/modules/Notes/EditView.php vtigercrm/branches/5.0.1/modules/Potentials/EditView.php vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php vtigercrm/branches/5.0.1/modules/Products/EditView.php vtigercrm/branches/5.0.1/modules/Vendors/EditView.php Modified: vtigercrm/branches/5.0.1/modules/Accounts/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/EditView.php Fri Oct 6 09:36:41 2006 @@ -95,7 +95,7 @@ $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",$app_strings['Account']); +$smarty->assign("SINGLE_MOD",'Account'); $smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']); $smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT'])); Modified: vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php Fri Oct 6 09:36:41 2006 @@ -47,7 +47,7 @@ $smarty->assign("OP_MODE",$disp_view); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Campaign']); +$smarty->assign("SINGLE_MOD",'Campaign'); $category = getParentTab(); Modified: vtigercrm/branches/5.0.1/modules/Contacts/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/EditView.php Fri Oct 6 09:36:41 2006 @@ -134,7 +134,7 @@ } $smarty->assign("ID", $focus->id); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Contact']); +$smarty->assign("SINGLE_MOD",'Contact'); if($focus->mode == 'edit') { Modified: vtigercrm/branches/5.0.1/modules/HelpDesk/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/HelpDesk/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/HelpDesk/EditView.php Fri Oct 6 09:36:41 2006 @@ -52,7 +52,7 @@ $smarty->assign("OP_MODE",$disp_view); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Ticket']); +$smarty->assign("SINGLE_MOD",'Ticket'); $category = getParentTab(); Modified: vtigercrm/branches/5.0.1/modules/Leads/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/EditView.php Fri Oct 6 09:36:41 2006 @@ -89,7 +89,7 @@ $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id()); $smarty->assign("ID", $focus->id); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Lead']); +$smarty->assign("SINGLE_MOD",'Lead'); $smarty->assign("HEADER", get_module_title("Leads", "{MOD.LBL_LEAD} ".$focus->firstname." ".$focus->lastname, true)); Modified: vtigercrm/branches/5.0.1/modules/Notes/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/EditView.php Fri Oct 6 09:36:41 2006 @@ -110,7 +110,7 @@ $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Note']); +$smarty->assign("SINGLE_MOD",'Note'); //Display the FCKEditor or not? -- configure $FCKEDITOR_DISPLAY in config.php $smarty->assign("FCKEDITOR_DISPLAY",$FCKEDITOR_DISPLAY); Modified: vtigercrm/branches/5.0.1/modules/Potentials/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/EditView.php Fri Oct 6 09:36:41 2006 @@ -119,7 +119,7 @@ $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",$app_strings['Potential']); +$smarty->assign("SINGLE_MOD",'Potential'); $tabid = getTabid("Potentials"); Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php Fri Oct 6 09:36:41 2006 @@ -50,7 +50,7 @@ $smarty->assign("OP_MODE",$disp_view); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['PriceBook']); +$smarty->assign("SINGLE_MOD",'PriceBook'); $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); Modified: vtigercrm/branches/5.0.1/modules/Products/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/EditView.php Fri Oct 6 09:36:41 2006 @@ -95,7 +95,7 @@ $smarty->assign("OP_MODE",$disp_view); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Product']); +$smarty->assign("SINGLE_MOD",'Product'); $smarty->assign("MOD", $mod_strings); Modified: vtigercrm/branches/5.0.1/modules/Vendors/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/EditView.php Fri Oct 6 09:36:41 2006 @@ -54,7 +54,7 @@ $smarty->assign("OP_MODE",$disp_view); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Vendor']); +$smarty->assign("SINGLE_MOD",'Vendor'); $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 08:53:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 15:53:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9580 - in /vtigercrm/branches/5.0.1/modules: Accounts/language/ Contacts/language/ CustomView/language/ Import/language/ Invoice/language/ Leads/language/ Products/language/ PurchaseOrder/language/ Quotes/language/ SalesOrder/language/ Vendors/language/ Message-ID: <20061006155357.5AF3476FF01@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 09:53:28 2006 New Revision: 9580 Log: * Modified all Po Box to PO Box Modified: vtigercrm/branches/5.0.1/modules/Accounts/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/Contacts/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/CustomView/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/Import/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/Invoice/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/Leads/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/Products/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/Quotes/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/SalesOrder/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/Vendors/language/en_us.lang.php Modified: vtigercrm/branches/5.0.1/modules/Accounts/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -144,8 +144,8 @@ 'Created Time'=>'Created Time', 'Modified Time'=>'Modified Time', 'Description'=>'Description', -'Shipping Po Box'=>'Shipping Po Box', -'Billing Po Box'=>'Billing Po Box', +'Shipping Po Box'=>'Shipping PO Box', +'Billing Po Box'=>'Billing PO Box', //Added after 4.2 patch 2 'Email Opt Out'=>'Email Opt Out', Modified: vtigercrm/branches/5.0.1/modules/Contacts/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -168,8 +168,8 @@ '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', +'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', Modified: vtigercrm/branches/5.0.1/modules/CustomView/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/CustomView/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/CustomView/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -141,8 +141,8 @@ 'Email Opt Out'=>'Email Opt Out', 'Billing Address'=>'Billing Address', 'Shipping Address'=>'Shipping Address', -'Shipping Po Box'=>'Shipping Po Box', -'Billing Po Box'=>'Billing Po Box', +'Shipping Po Box'=>'Shipping PO Box', +'Billing Po Box'=>'Billing PO Box', 'Billing City'=>'Billing City', 'Shipping City'=>'Shipping City', 'Billing State'=>'Billing State', @@ -163,8 +163,8 @@ 'Do Not Call'=>'Do Not Call', 'Mailing Street'=>'Mailing Street', 'Other Street'=>'Other Street', -'Mailing Po Box'=>'Mailing Po Box', -'Other Po Box'=>'Other Po Box', +'Mailing Po Box'=>'Mailing PO Box', +'Other Po Box'=>'Other PO Box', 'Mailing City'=>'Mailing City', 'Other City'=>'Other City', 'Mailing State'=>'Mailing State', Modified: vtigercrm/branches/5.0.1/modules/Import/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -242,13 +242,13 @@ ,"assistant"=>"Assistant" ,"assistantphone"=>"Assistant Phone" ,"mailingstreet"=>"Mailing Address Street" - ,"mailingpobox"=>"Mailing Address Po Box" + ,"mailingpobox"=>"Mailing Address PO Box" ,"mailingcity"=>"Mailing Address City" ,"mailingstate"=>"Mailing Address State" ,"mailingzip"=>"Mailing Address Postalcode" ,"mailingcountry"=>"Mailing Address Country" ,"otherstreet"=>"Other Address Street" - ,"otherpobox"=>"Other Address Po Box" + ,"otherpobox"=>"Other Address PO Box" ,"othercity"=>"Other Address City" ,"otherstate"=>"Other Address State" ,"otherzip"=>"Other Address Postalcode" @@ -279,7 +279,7 @@ //"billing_address_street_2"=>"Billing Address Street 2", //"billing_address_street_3"=>"Billing Address Street 3", //"billing_address_street_4"=>"Billing Address Street 4", - "bill_pobox"=>"Billing Address Po Box", + "bill_pobox"=>"Billing Address PO Box", "bill_city"=>"Billing Address City", "bill_state"=>"Billing Address State", "bill_code"=>"Billing Address Postalcode", @@ -288,7 +288,7 @@ //"shipping_address_street_2"=>"Shipping Address Street 2", //"shipping_address_street_3"=>"Shipping Address Street 3", //"shipping_address_street_4"=>"Shipping Address Street 4", - "ship_pobox"=>"Shipping Address Po Box", + "ship_pobox"=>"Shipping Address PO Box", "ship_city"=>"Shipping Address City", "ship_state"=>"Shipping Address State", "ship_code"=>"Shipping Address Postalcode", @@ -334,7 +334,7 @@ "assigned_user_id"=>"Assigned To", "yahooid"=>"Yahoo Id", "lane"=>"Street", - "pobox"=>"Po Box", + "pobox"=>"PO Box", "code"=>"Postal Code", "city"=>"City", "country"=>"Country", Modified: vtigercrm/branches/5.0.1/modules/Invoice/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Invoice/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Invoice/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -138,8 +138,8 @@ 'Billing State'=>'Billing State', 'Billing Code'=>'Billing Postal Code', 'Billing Country'=>'Billing Country', -'Billing Po Box'=>'Billing Po Box', -'Shipping Po Box'=>'Shipping Po Box', +'Billing Po Box'=>'Billing PO Box', +'Shipping Po Box'=>'Shipping PO Box', 'Shipping City'=>'Shipping City', 'Shipping State'=>'Shipping State', 'Shipping Code'=>'Shipping Postal Code', Modified: vtigercrm/branches/5.0.1/modules/Leads/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -153,7 +153,7 @@ 'Country'=>'Country', 'State'=>'State', 'Description'=>'Description', -'Po Box'=>'Po Box', +'Po Box'=>'PO Box', 'Campaign Source'=>'Campaign Source', //Added for CustomView 4.2 Release 'Name'=>'Name', Modified: vtigercrm/branches/5.0.1/modules/Products/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -140,7 +140,7 @@ 'Postal Code'=>'Postal Code', 'Country'=>'Country', 'Description'=>'Description', -'Po Box'=>'Po Box', +'Po Box'=>'PO Box', //Mapping for price book 'Price Book Name'=>'Price Book Name', Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -134,8 +134,8 @@ 'Billing State'=>'Billing State', 'Billing Code'=>'Billing Postal Code', 'Billing Country'=>'Billing Country', -'Billing Po Box'=>'Billing Po Box', -'Shipping Po Box'=>'Shipping Po Box', +'Billing Po Box'=>'Billing PO Box', +'Shipping Po Box'=>'Shipping PO Box', 'Shipping City'=>'Shipping City', 'Shipping State'=>'Shipping State', 'Shipping Code'=>'Shipping Postal Code', Modified: vtigercrm/branches/5.0.1/modules/Quotes/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -134,8 +134,8 @@ 'Billing State'=>'Billing State', 'Billing Code'=>'Billing Postal Code', 'Billing Country'=>'Billing Country', -'Billing Po Box'=>'Billing Po Box', -'Shipping Po Box'=>'Shipping Po Box', +'Billing Po Box'=>'Billing PO Box', +'Shipping Po Box'=>'Shipping PO Box', 'Shipping City'=>'Shipping City', 'Shipping State'=>'Shipping State', 'Shipping Code'=>'Shipping Postal Code', Modified: vtigercrm/branches/5.0.1/modules/SalesOrder/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/SalesOrder/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/SalesOrder/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -135,8 +135,8 @@ 'Billing State'=>'Billing State', 'Billing Code'=>'Billing Postal Code', 'Billing Country'=>'Billing Country', -'Billing Po Box'=>'Billing Po Box', -'Shipping Po Box'=>'Shipping Po Box', +'Billing Po Box'=>'Billing PO Box', +'Shipping Po Box'=>'Shipping PO Box', 'Shipping City'=>'Shipping City', 'Shipping State'=>'Shipping State', 'Shipping Code'=>'Shipping Postal Code', Modified: vtigercrm/branches/5.0.1/modules/Vendors/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -32,7 +32,7 @@ 'Postal Code'=>'Postal Code', 'Country'=>'Country', 'Description'=>'Description', -'Po Box'=>'Po Box', +'Po Box'=>'PO Box', 'Vendor'=>'Vendor', //Added for existing Picklist entries From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 09:08:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 16:08:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9581 - in /vtigercrm/branches/5.0.1/modules/Calendar: calendarLayout.php language/en_us.lang.php Message-ID: <20061006160821.A24E666A86F@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 10:08:15 2006 New Revision: 9581 Log: * Fixed the i18n issue - ticket 2267 Modified: vtigercrm/branches/5.0.1/modules/Calendar/calendarLayout.php vtigercrm/branches/5.0.1/modules/Calendar/language/en_us.lang.php Modified: vtigercrm/branches/5.0.1/modules/Calendar/calendarLayout.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Calendar/calendarLayout.php (original) +++ vtigercrm/branches/5.0.1/modules/Calendar/calendarLayout.php Fri Oct 6 10:08:15 2006 @@ -245,7 +245,7 @@ "; $tabhtml .= "view."".$header['calendar']->date_time->get_date_str()."&viewOption=".$viewBox."&subtab=".$subtab."&parenttab=".$category."\");' src='".$header['IMAGE_PATH']."btnL3Calendar.gif' alt='".$mod_strings['LBL_OPENCAL']."...' title='".$mod_strings['LBL_OPENCAL']."...' align='absmiddle' border='0'>"; $tabhtml .= "view."".$header['calendar']->date_time->get_date_str()."&viewOption=".$viewBox."&subtab=".$subtab."&parenttab=".$category."\");' src='".$header['IMAGE_PATH']."tbarSettings.gif' alt='".$mod_strings['LBL_SETTINGS']."' title='".$mod_strings['LBL_SETTINGS']."' align='absmiddle' border='0'>"; - $tabhtml .= "".$app_strings[Calendar].""; + $tabhtml .= "".$app_strings['Calendar'].""; $tabhtml .= ""; echo $tabhtml; $cal_log->debug("Exiting get_cal_header_tab() method..."); @@ -1137,7 +1137,7 @@ $eventlayer .= ' '.$subject.' - '.$action_str.'('.$user.' | '.$eventstatus.' | '.$priority.') + '.$action_str.'('.$user.' | '.$mod_strings[$eventstatus].' | '.$mod_strings[$priority].') '; @@ -1309,7 +1309,7 @@ global $log; $Entries = Array(); $category = getParentTab(); - global $adb,$current_user,$mod_strings,$cal_log; + global $adb,$current_user,$mod_strings,$app_strings,$cal_log; require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); $cal_log->debug("Entering getEventList() method..."); @@ -1398,16 +1398,16 @@ $more_link = "[".$mod_strings['LBL_MORE']."...]"; $type = $adb->query_result($result,$i,"activitytype"); if($type == 'Call') - $image_tag = " ".$type; + $image_tag = " ".$app_strings['Call']; if($type == 'Meeting') - $image_tag = " ".$type; + $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['status'] = $adb->query_result($result,$i,"eventstatus"); + $element['status'] = $mod_strings[$adb->query_result($result,$i,"eventstatus")]; $assignedto = $adb->query_result($result,$i,"user_name"); if(!empty($assignedto)) $element['assignedto'] = $assignedto; Modified: vtigercrm/branches/5.0.1/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Calendar/language/en_us.lang.php Fri Oct 6 10:08:15 2006 @@ -400,9 +400,6 @@ 'Not Started'=>'Not Started', 'In Progress'=>'In Progress', 'Pending Input'=>'Pending Input', -'High'=>'High', -'Medium'=>'Medium', -'Low'=>'Low', 'LBL_REMAINDER_DAY'=>'days', 'LBL_REMAINDER_HRS'=>'hrs', From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 09:57:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 16:57:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9582 - in /vtigercrm/branches/5.0.1: Smarty/templates/AddMailAccount.tpl modules/Settings/language/en_us.lang.php Message-ID: <20061006165706.24357787DE6@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 10:56:58 2006 New Revision: 9582 Log: Mail server name corrected . Fixes #2218 Modified: vtigercrm/branches/5.0.1/Smarty/templates/AddMailAccount.tpl vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php Modified: vtigercrm/branches/5.0.1/Smarty/templates/AddMailAccount.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/AddMailAccount.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/AddMailAccount.tpl Fri Oct 6 10:56:58 2006 @@ -1,168 +1,168 @@ -{**} - - - - - - - - -
    -
    - {$MOD.LBL_MY_MAIL_SERVER_DET}
    -

    - - - - - - - - - -
    - - - - - - + +
    - - - - - - - -
     {$MOD.LBL_MY_MAIL_SERVER_DET}  
    -
    - - - - - - + + +
    - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$MOD.LBL_EMAIL_ID}
    {$MOD.LBL_DISPLAY_NAME}{$MOD.LBL_NAME_EXAMPLE}
    {$APP.LBL_REQUIRED_SYMBOL} {$MOD.LBL_EMAIL_ADDRESS} {$MOD.LBL_EMAIL_EXAMPLE}
     
    {$MOD.LBL_MAIL_SERVER_SETTINGS}
    {$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_MAIL_SERVER_NAME} 
    {$APP.LBL_REQUIRED_SYMBOL}{$APP.LBL_LIST_USER_NAME} 
    {$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_LIST_PASSWORD} 
     
    {$MOD.LBL_MAIL_PROTOCOL} +{**} + + + + + + + + +
    +
    + {$MOD.LBL_MY_MAIL_SERVER_DET}
    +

    + + + + + + + + + +
    + + + + + + -
    + + + + + + + +
     {$MOD.LBL_MY_MAIL_SERVER_DET}  
    +
    + + + + + + - -
    + + + - - -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$MOD.LBL_EMAIL_ID}
    {$MOD.LBL_DISPLAY_NAME}{$MOD.LBL_NAME_EXAMPLE}
    {$APP.LBL_REQUIRED_SYMBOL} {$MOD.LBL_EMAIL_ADDRESS} {$MOD.LBL_EMAIL_EXAMPLE}
     
    {$MOD.LBL_INCOME_SERVER_SETTINGS}
    {$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_MAIL_SERVER_NAME} 
    {$APP.LBL_REQUIRED_SYMBOL}{$APP.LBL_LIST_USER_NAME} 
    {$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_LIST_PASSWORD} 
     
    {$MOD.LBL_MAIL_PROTOCOL} -  {$MOD.LBL_IMAP2} -  {$MOD.LBL_IMAP4} -  
    {$MOD.LBL_SSL_OPTIONS} -  {$MOD.LBL_NO_TLS} -   {$MOD.LBL_TLS}  
    {$MOD.LBL_CERT_VAL} -  {$MOD.LBL_VAL_SSL_CERT} -  {$MOD.LBL_DONOT_VAL_SSL_CERT} -  
    {$MOD.LBL_INT_MAILER} -  {$MOD.LBL_INT_MAILER_USE} -  {$MOD.LBL_INT_MAILER_NOUSE} -  
    {$MOD.LBL_REFRESH_TIMEOUT} - -  
    {$MOD.LBL_EMAILS_PER_PAGE} 
    {$MOD.LBL_MAIL_DISCLAIM}
     
    - -    -
     
    -
    -
    - -
    - -{$JAVASCRIPT} +  {$MOD.LBL_IMAP2} +  {$MOD.LBL_IMAP4} +
     
    {$MOD.LBL_SSL_OPTIONS} +  {$MOD.LBL_NO_TLS} +   {$MOD.LBL_TLS}  
    {$MOD.LBL_CERT_VAL} +  {$MOD.LBL_VAL_SSL_CERT} +  {$MOD.LBL_DONOT_VAL_SSL_CERT} +  
    {$MOD.LBL_INT_MAILER} +  {$MOD.LBL_INT_MAILER_USE} +  {$MOD.LBL_INT_MAILER_NOUSE} +  
    {$MOD.LBL_REFRESH_TIMEOUT} + +  
    {$MOD.LBL_EMAILS_PER_PAGE} 
    {$MOD.LBL_MAIL_DISCLAIM}
     
    + +    +
     
    +
    + + + + + + +{$JAVASCRIPT} Modified: vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php Fri Oct 6 10:56:58 2006 @@ -1,728 +1,729 @@ -'Settings', - -'LBL_MODULE_TITLE'=>'Settings: Home', - -'LBL_LIST_CONTACT_ROLE'=>'Role', - - - -'LBL_LIST_LAST_NAME'=>'Last Name', - -'LBL_FIRST_NAME'=>'First Name:', - -'LBL_LAST_NAME'=>'Last Name:', - -'LBL_PHONE'=>'Phone:', - -'LBL_EMAIL_ADDRESS'=>'Email', - -'LBL_TRANSCURR'=>'Transfer User currency to', - -'LBL_CURRDEL'=>'Currency to be Deleted', - -'LBL_NEW_FORM_TITLE'=>'New Contact', - -'LBL_NEW_CURRENCY'=>'New Currency', - -'LBL_VIEWING'=>'Viewing', - -'LBL_CURRENCY_NAME'=>'Currency Name', - -'LBL_CURRENCY_CODE'=>'Currency Code', - -'LBL_CURRENCY_SYMBOL'=>'Symbol', - -'LBL_CURRENCY_CRATE'=>'Conversion Rate', - -'LBL_CURRENCY_STATUS'=>'Status', - -'LBL_CURRENCY_TOOL'=>'Tools', - -'LBL_CURRENCY_LIST'=>'Currencies List', - - -'NTC_DELETE_CONFIRMATION'=>'Are you sure you want to delete this record?', - -'LEADCUSTOMFIELDS'=>'Lead Custom Fields', - -'ACCOUNTCUSTOMFIELDS'=>'Account Custom Fields', - -'CONTACTCUSTOMFIELDS'=>'Contact Custom Fields', - -'OPPORTUNITYCUSTOMFIELDS'=>'Potential Custom Fields', - -'HELPDESKCUSTOMFIELDS'=>'Helpdesk Custom Fields', - -'PRODUCTCUSTOMFIELDS'=>'Product Custom Fields', - -'VENDORCUSTOMFIELDS'=>'Vendor Custom Fields', - -'PRICEBOOKCUSTOMFIELDS'=>'PriceBook Custom Fields', - -'POCUSTOMFIELDS'=>'Purchase Order Custom Fields', -'SOCUSTOMFIELDS'=>'Sales Order Custom Fields', -'QUOTESCUSTOMFIELDS'=>'Quotes Custom Fields', -'INVOICECUSTOMFIELDS'=>'Invoice Custom Fields', - -'EDITLEADPICKLISTVALUES'=>'Edit Lead Picklist ', - -'EDITACCOUNTPICKLISTVALUES'=>'Edit Account Picklist ', - -'EDITCONTACTPICKLISTVALUES'=>'Edit Contact Picklist ', - -'EDITOPPORTUNITYPICKLISTVALUES'=>'Edit Potential Picklist ', - -'EDITHELPDESKPICKLISTVALUES'=>'Edit HelpDesk Picklist ', - -'EDITPRODUCTPICKLISTVALUES'=>'Edit Product Picklist ', - -'EDITEVENTPICKLISTVALUES'=>'Edit Event Picklist ', - -'EDITTASKPICKLISTVALUES'=>'Edit Task Picklist ', - -'EDITRSSPICKLISTVALUES'=>'Edit Rss Picklist', -'EDITVENDORPICKLISTVALUES'=>'Edit Vendor Picklist', -'EDITPBPICKLISTVALUES'=>'Edit PriceBook Picklist', -'EDITPOPICKLISTVALUES'=>'Edit Purchase Order Picklist', -'EDITSOPICKLISTVALUES'=>'Edit Sales Order Picklist', -'EDITQUOTEPICKLISTVALUES'=>'Edit Quote Picklist', -'EDITINVOICEPICKLISTVALUES'=>'Edit Invoice Picklist', - - -// Added for Release vtigerCRM 3.2 PATCH 1.0 - -//Settings/index.php - -'LBL_CUSTOM_FIELD_SETTINGS'=>'Custom Field Settings:', - -'LBL_PICKLIST_FIELD_SETTINGS'=>'Picklist Field Settings:', - - - -//SETTINGS/CustomFieldList.php,ComboFieldList.php,CreateCustomField.php - -'Leads'=>'Lead', - -'Accounts'=>'Account', - -'Contacts'=>'Contact', - -'Potentials'=>'Potential', - -'HelpDesk'=>'HelpDesk', - -'Products'=>'Product', - -'Events'=>'Event', - -'Activities'=>'Task', - - - - - -'CustomFields'=>' Custom Fields', - -'NewCustomField'=>'New Custom Field', - -'NewCustomFieldAltC'=>'New Custom Field [Alt+c]:', - -'FieldName'=>'Field Name', - -'FieldType'=>'Field Type', - -'FieldLabel'=>'Field Label', - -'Delete'=>'Del', - -'NEW'=>'New', - -'CUSTOMFIELD'=>'Custom Field', - -'LBL_CUSTOM_FIELDS'=>'Custom Fields', - -'LBL_ADD_FIELD'=>'Create Custom Field', - -'LBL_CUSTM_MSG'=>'allows you to ....', - -'PicklistFields'=>' Picklist Fields', - -'LBL_PICKLIST_EDITOR'=>'Picklist Editor', - -'Edit'=>'Edit', - -'LBL_EDIT_FIELD_TYPE'=>'Edit Field Type', - -//Settings/CustomField.html - -'LBL_PROVIDE_FIELD_INFORMATION'=>'Provide Field Information: ', - -'LBL_SELECT_FIELD_TYPE'=>'Select Field Type: ', - -'LBL_PROVIDE_FIELD_DETAILS'=>'Provide Field Details: ', - -'LBL_LABEL'=>'Label: ', - -'LBL_LENGTH'=>'Length: ', - -'LBL_DECIMAL_PLACES'=>'Decimal Places: ', - -'LBL_PICK_LIST_VALUES'=>'Pick list Values: ', - - - -//Settings/EditComboField.php - -'EditPickListValues'=>'Picklist Edit ', - - - -//Settings/EditField.html - -'LBL_FIELD_INFORMATION'=>'Field Information:', - -'Values'=>'Values', - -'EnterListOfValues'=>'Please enter the list of values below. Each value should be in its own line.', - - - -//Settings/fieldtypes.php - -'Text'=>'Text', - -'Number'=>'Number', - -'Percent'=>'Percent', - -'Currency'=>'Currency', - -'Date'=>'Date', - -'Email'=>'Email', - -'Phone'=>'Phone', - -'PickList'=>'Pick List', - -'LBL_MULTISELECT_COMBO'=>'Multi-Select Combo Box', - - - -//added for patch2 - -'USERGROUPLIST'=>'Groups', - -'EMAILTEMPLATES'=>'E-mail Templates', - -'WORDINTEGRATION'=>'Mail Merge Templates', - -'LBL_MAIL_MERGE'=>'Mail Merge', - -'NOTIFICATIONSCHEDULERS'=>'Notification Schedulers', -//currency status -'LBL_ACTIVE'=>'Active', - -'LBL_INACTIVE'=>'Inactive', - -'LBL_NOTIFICATION'=>'Notification', -'LBL_DESCRIPTION'=>'Description', -'LBL_TOOL'=>'Tool', - - -//Added fields for Title Informations -- after 4 Beta - -'LBL_EMAIL_CONFIG'=>'Outgoing Mail Server Configuration', - -'LBL_WORD_INTEGRATION'=>'Word Integration:', - -'LBL_GROUP_SETTINGS'=>'Group Settings:', - -'LBL_TEMPLATE_SETTINGS'=>'Template Settings:', - -'LBL_NOTIFICATION_SETTINGS'=>'Notification Settings:', - -'LBL_EMAIL_SETTINGS'=>'Email Settings:', - -'LBL_SECURITY_SETTINGS'=>'Security Settings:', - - - -//Added fields after RC1 - Release - -'LBL_MAIL_SERVER_INFO'=>'Outgoing Mail Server Information', - -'LBL_OUTGOING_MAIL_SERVER'=>'Server Name', - -'LBL_OUTGOING_MAIL_SERVER_LOGIN_USER_NAME'=>'Outgoing Mail Server Login User Name', - -'LBL_OUTGOING_MAIL_SERVER_PASSWORD'=>'Outgoing Mail Server Password', - -'LBL_MAIL_SERVER_SMTP'=>'Mail Server Settings (SMTP)', - -'LBL_BACKUP_SERVER_CONFIG'=>'Backup Server Configuration', - -'LBL_SERVER_ADDRESS'=>'Server Address', - -'LBL_FTP_SERVER_NAME'=>'FTP Server Name', - -'LBL_FTP_USER_NAME'=>'FTP User Name', - -'LBL_FTP_PASSWORD'=>'FTP Password', - -'LBL_FTP'=>'FTP', - -'LBL_SYSTEM_CONFIG'=>'System Configuration', -'LBL_SYSTEM_INFO'=>'System Details', -'LBL_PROXY_SETTINGS'=>'Proxy Server', -'LBL_AUDIT_TRAIL'=>'Audit Trails', -'LBL_ENABLE_AUDIT_TRAIL'=>'Enable Audit Trail', -'LBL_USER_AUDIT'=>'Select User', -'LBL_VIEW_AUDIT_TRAIL'=>'View Audit Trail', -'LBL_AUDIT_TRAIL_DESC'=>'Display Audit Trail of Users who access CRM', -'LBL_NO_DATA'=>'No Data', - -'LBL_CURRENCY_CONFIGURATION'=>'- Currency Information', - -'LBL_CURRENCY_CONFIG'=>'Currency Configuration', - -'LBL_CURRENCY_INFO'=>'Currency Information', - -'LBL_CURRENCY_TITLE'=>'Currency', - -'LBL_CURRENCY_SETTINGS'=>'Currencies', - -'LBL_YES'=>'yes', -'LBL_NO'=>'no', - -'LBL_USERNAME'=>'User Name', -'LBL_PASWRD'=>'Password', -'LBL_REQUIRES_AUTHENT'=>'Requires Authentication?', - -//Fields for Settings - -'LBL_USER_MANAGEMENT'=>'Users & Access Management', - -'LBL_USERS'=>'Users', - -'LBL_USERS_LIST'=>'Users List', -'LBL_GROUP_LIST'=>'Groups List', - -'LBL_CREATE_AND_MANAGE_USERS'=>'- Create and Manage Users (e.g., admin)', - -'LBL_ROLES'=>'Roles', - -'LBL_CREATE_AND_MANAGE_USER_ROLES'=>'- Create and Manage user roles (e.g., Administrator, Standard User, etc.)', - -'LBL_PROFILES'=>'Profiles', - -'LBL_PROFILES_LIST'=>'Profiles List', - -'LBL_CREATE_AND_MANAGE_USER_PROFILES'=>'- Create and Manage user profiles (e.g., CEO, Sales Manager, etc.)', - -'LBL_CREATE_AND_MANAGE_USER_GROUPS'=>'- Create and Manage user groups', - -'LBL_SHARING_ACCESS'=>'Sharing Access', - -'LBL_FIELDS_ACCESS'=>'Fields Access', - -'LBL_DEFAULT_ORGANIZATION_FIELDS'=>'Default Organization Fields Access', - -'LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS'=>' - Setting Default Field Access within the Organization', - -'LBL_SETTING_DEFAULT_SHARING_ACCESS'=>'- Setting Default Sharing Access within the Organization', - -'LBL_FIELD_ACCESSIBILITY'=>'Field Accessibility', - -'LBL_SETTING_FIELD_ACCESSIBILITY'=>' - Setting Field Accessibility for each profiles', -//<<<<<<<>>>>> -'LBL_FIELD_ORDERING_DESC'=>' - Edit Field Order', - -'LBL_FIELD_ORDERING'=>'Edit Field Blocks', -//<<<<<<<<<>>>>>>>>>>>> -'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_DELETE_DEMO_DATA'=>'Delete Demo Data', - -'LBL_DELETE_DEMO_DATA_INFO'=>'- Delete the Demo Data which is created at the time of installation', - - - -'LBL_STUDIO'=>'Studio', - -'LBL_CUSTOM_FIELD_SETTINGS'=>'Custom Field Settings', - -'LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS'=>'Manage your company-wide custom fields.', - -'LBL_SELECT_MODULE'=>'Select Module', - -'LBL_SELECT_CF_TEXT'=>'Select Module:', - - - -'LBL_PICKLIST_SETTINGS'=>'Picklist Settings', - -'LBL_EDIT_PICKLIST_VALUES'=>' - Edit values of Picklist fields', - -'LBL_EDIT'=>'Editing', - -'LBL_COMMUNICATION_TEMPLATES'=>'Communication Templates', - -'LBL_CREATE_EMAIL_TEMPLATES'=>'New Email Template', - -'LBL_UPLOAD_MSWORD_TEMPLATES'=>' - Upload MS Word Templates for Mail Merge', - -'LBL_SCHEDULE_EMAIL_NOTIFICATION'=>' - Schedule Email Notifications', - -'LBL_EXPAND_CLOSE_MENU'=>'Expand/Close Menu', - -'LBL_CONFIGURATION'=>'Configuration', - -'LBL_CONFIGURE_MAIL_SERVER'=>' - Configure Outgoing Mail Server', - -'LBL_BACKUP_SERVER_CONFIGURATION'=>'Backup Server Configuration', - -'LBL_BACKUP_SERVER_INFO'=>'Backup Server Information', - -'LBL_BACKUP_SERVER_SETTINGS'=>'Backup Server', - -'LBL_CONFIGURE_BACKUP_SERVER'=>' - Configure Backup Server', - -'LBL_SYSTEM_CONFIGURATION'=>' - System Configuration', - -'LBL_PROXY_SERVER_CONFIGURATION'=>'Proxy Server Configuration', - -'LBL_PROXY_SERVER_INFO'=>'Proxy Server Information', - -'LBL_PROXY_SERVER_SETTINGS'=>'Proxy Server', - -'LBL_CONFIGURE_PROXY_SERVER'=>' - Configure Proxy Server', - -'LBL_PROXY_PORT'=>'Port Number', - - - -//Field Types for custom fields - -'LBL_URL'=>'URL', - -'LBL_CHECK_BOX'=>'Checkbox', - - - -//PickList Settings - -'LBL_STANDARD_FIELDS'=>'Standard Fields', - -'LBL_LEAD_SOURCE'=>'Lead Source', - -'LBL_SALUTATION'=>'Salutation', - -'LBL_LEAD_STATUS'=>'Lead Status', - -'LBL_INDUSTRY'=>'Industry', - -'LBL_RATING'=>'Rating', - -'LBL_ACCOUNT_TYPE'=>'Account Type', - -'LBL_BUSINESS_TYPE'=>'Business Type', - -'LBL_CURRENCY_TYPE'=>'Currency Type', - -'LBL_SALES_STAGE'=>'Sales Stage', - -'LBL_PRIORITY'=>'Priority', - -'LBL_STATUS'=>'Status', - -'LBL_CATEGORY'=>'Ticket Category', - -'LBL_MANUFACTURER'=>'Manufacturer', - -'LBL_PRODUCT_CATEGORY'=>'Product Category', - -'LBL_RSS_CATEGORY'=>'Rss Category', - -//Added for Web based Email client integration (post 4.0.1 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_MAIL_SERVER_SETTINGS'=>'Outgoing 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_USAGEUNIT'=>'Usage Unit', -'LBL_GLACCT'=>'GL Account', -'LBL_QUOTE_STAGE'=>'Quote Stage', -'LBL_CARRIER'=>'Carrier', -'LBL_TAXCLASS'=>'Tax Class', -'LBL_MY_DETAILS'=>'My Details', -'LBL_MY_MAIL_SERVER_DET'=>'My Incoming Mail Server Details', -'LBL_EMAIL_ID'=>'Email ID', -'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'=>'Emails per Page', - -//Added for Organization Details (4.2 release) -'LBL_ORGANIZATION_NAME'=>'Company Name', -'LBL_ORGANIZATION_ADDRESS'=>'Address', -'LBL_ORGANIZATION_CITY'=>'City', -'LBL_ORGANIZATION_STATE'=>'State', -'LBL_ORGANIZATION_CODE'=>'Postal Code', -'LBL_ORGANIZATION_COUNTRY'=>'Country', -'LBL_ORGANIZATION_PHONE'=>'Phone', -'LBL_ORGANIZATION_FAX'=>'Fax', -'LBL_ORGANIZATION_WEBSITE'=>'Website', -'LBL_ORGANIZATION_DETAILS'=>'Company Information', -'LBL_SPECIFY_COMPANY_DETAILS'=>' - Specify Company Information', -'LBL_ORGANIZATION_LOGO'=>'Company Logo', -'LBL_UPLOAD'=>'Upload', -'LBL_FILENAME'=>'File Name', -'LBL_SETTINGS'=>'Settings', -'LBL_COMPANY_DETAILS'=>'Company Details', - -'LBL_SEVERITY'=>'Severity', -'LBL_FAQ_CATEGORY'=>'FAQ Category', -'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', -'INVENTORYNOTIFICATION'=>'Inventory Notifications', -'LBL_INVENTORY_NOTIFICATIONS'=>' - Edit Inventory Email Notifications', -'INVENTORYTERMSANDCONDITIONS'=>'Inventory : Terms & Conditions',//newly added for Inventory terms and conditions -'LBL_INVENTORY_TERMSANDCONDITIONS'=>' - Edit Terms & Conditions',//newly added -'LBL_TANDC_TEXT'=>'Terms & Conditions Text', -'LBL_INVENTORY_TANDC'=>'Inventory Terms & Conditions', - -'LBL_OTHER_SETTINGS'=>'Other Settings', -'LBL_SCROLL'=>'[Scroll to Top]', - -'LBL_INV_NOT_DESC'=>'The following is 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', -'Vendor'=>'Vendor', -'PriceBook'=>'PriceBook', -'Quotes'=>'Quote', -'PurchaseOrder'=>'Purchase Order', -'SalesOrder'=>'SalesOrder', -'Invoice'=>'Invoice', - -//For Custom Fields -'LBL_LEAD_MAP_CUSTOM_FIELD'=>'Mapping Lead Custom Fields', -'leadCustomFieldDescription'=>'Map each of your organizations lead custom fields to each of your custom account -,contact, or potential fields. These mappings will be used when you convert leads', -'LBL_MAPPING_INFO'=>'Mapping Information', -'LBL_ACCOUNT_FIELD'=>'Account Custom Field', -'LBL_CONTACT_FIELD'=>'Contact Custom Field', -'LBL_POTENTIAL_FIELD'=>'Potential Custom Field', -'CUSTOMFIELDMAPPING'=>'Custom Field Mapping', -'LBL_FIELD_MAPPING'=>'Field Mapping', -'LBL_LEAD_FIELD'=>'Lead Custom Field', -//After 4.2 GA -'LBL_TEXT_AREA'=>'Text Area', -//for Edit ordering the blocks -'NOTESCUSTOMFIELDS'=>'Notes Custom Fields', - -//Added fields after 4.2 ptach 2 -'LBL_ASSIGN_MODULE_OWNERS'=>'Assign Module Owners', -'LBL_MODULE_OWNERS'=>'Module Owners', -'LBL_ASSIGN_MODULE_OWNERS_INFO'=>' - Assign Owners for each modules', -'LBL_MODULE'=>'CRM Module', -'LBL_OWNER'=>'Assigned Owner', -'LBL_MIGRATION'=>'Migration Wizard', -'LBL_MIGRATION_INFO'=>'Migrate vtiger CRM data from Version 4.2.3 to 5.0.0', - -//Added for 5 GA - Description of Settings UI - -'LBL_USER_DESCRIPTION'=>'Manage users who can access vtiger CRM', -'LBL_ROLE_DESCRIPTION'=>'Set up hierarchy of roles and assign to the users', -'LBL_PROFILE_DESCRIPTION'=>'Manage user-specific modules access to different Roles', -'LBL_GROUP_DESCRIPTION'=>'Manage different types of teams based on roles, users, and profiles', -'LBL_SHARING_ACCESS_DESCRIPTION'=>'Manage module sharing rules & custom sharing rules', -'LBL_SHARING_FIELDS_DESCRIPTION'=>'Define global field-level access in each module', -'LBL_MODULE_OWNERS_DESCRIPTION'=>'Assign Customer Support owners to CRM module', -'LBL_ANNOUNCEMENT_DESCRIPTION'=>'Manage company wide announcements', -'LBL_CUSTOM_FIELDS_DESCRIPTION'=>'Manage different types of user-defined fields', -'LBL_PICKLIST_DESCRIPTION'=>'Customize Picklist values in each module', -'LBL_EMAIL_TEMPLATE_DESCRIPTION'=>'Manage templates for E-Mail module', -'LBL_MAIL_MERGE_DESCRIPTION'=>'Manage templates for Mail Merging', -'LBL_NOTIF_SCHED_DESCRIPTION'=>'Manage Notifications that will alert in case of important actions', -'LBL_INV_NOTIF_DESCRIPTION'=>'Change Settings of Inventory related Notifications', -'LBL_INV_TANDC_DESCRIPTION'=>'Specify Terms and Conditions for quotes, orders, and invoices', -'LBL_COMPANY_DESCRIPTION'=>'Specify business address of company', -'LBL_MAIL_SERVER_DESCRIPTION'=>'Configure Outgoing Mail Server details', -'LBL_BACKUP_SERVER_DESCRIPTION'=>'Specify database backup server details', -'LBL_CURRENCY_DESCRIPTION'=>'Manage international currencies and exchange rates', -'LBL_TAX_DESCRIPTION'=>'Manage taxes and the corresponding tax rates', -'LBL_SYSTEM_DESCRIPTION'=>'View vtiger CRM Server details', -'LBL_PROXY_DESCRIPTION'=>'Configure proxies to access RSS feeds through Internet', -'LBL_AUDIT_DESCRIPTION'=>'Display data opertions performed by users', -'LBL_TAX_DESC'=>'Manage different types of tax rates for taxes, such as Sales Tax, VAT etc.,', -'LBL_COMPANY_DESC'=>'Specify business address of your company', -'LBL_SELECT_LOGO'=>'Select new logo:', -'LBL_INVEN_TANDC_DESC'=>'Specify text for the Terms & Conditions section of Quotes, Orders, and Invoices modules', -'LBL_MAIL_SERVER_DESC'=>'Configure your Outgoing Mail Server details', -'LBL_BACKUP_SERVER_DESC'=>'Manage your Backup Server', -'LBL_MODULES_AND_OWNERS'=>'Modules & Owners', -'LBL_GROUP_DESC'=>'Manage different types of user groups within your organization', -'LBL_MAIL_MERGE_DESC'=>'Manage Mail Merge templates used in CRM modules', - - -//Added fields after 5.0 Alpha -'LBL_REQUIRE_SMTP_AUTHENTICATION'=>'Require SMTP Authentication?', -'LBL_ANNOUNCEMENT'=>'Announcements', -'LBL_SETTING_ANNOUNCEMENT'=>'Announcement', -'LBL_ANNOUNCE_TEXT'=>'Announcement Text', -'LBL_UPDATE_BUTTON'=>'Update', -'LBL_ANNOUNCEMENT_INFO'=>'Type the announcement text below, and click the Update button.', -'LBL_ANNOUNCEMENT_DESC'=>'Change the text that appears in the announcement display on top of each page', -'LBL_EMAIL_CONTENTS'=>'Email Contents', -'LBL_SUBJECT'=>'Subject', -'LBL_MESSAGE'=>'Message', -'LBL_PICKLIST_EDITOR'=>'Picklist Editor', -'LBL_PICKLIST_AVAIL'=>'Picklists Available in', -'LBL_PICKLIST_AVAILINFO1'=>'The picklists available in', -'LBL_PICKLIST_AVAILINFO2'=>'are shown below. Click Edit to modify the contents of the list.', -'LBL_EDIT_PICKLIST'=>'Edit Pick List', -'LBL_PICKLIST_SAVEINFO'=>'Type the entries one - by - one below and click the Save button to save the list.', -'LBL_SELECT_CRM_MODULE'=>'Select CRM Module', -'LBL_TAX_SETTINGS'=>'Tax Calculations', -'LBL_INVENTORY_TAX_CONFIG'=>'Inventory Tax Configuration', -'LBL_CUSTOM_MAPP_INFO'=>'Only in Leads module you can map the fields with Accounts, Contacts, and Potentials.', -'LBL_MAPPING_OTHER_MODULES'=>'Mapping with other Modules', -'LBL_CUSTOM_FILED_IN'=>'Custom Fields in ', -'LBL_ROLE_HIERARCHY_TREE'=>'Roles & Hierarchy Tree', -'LBL_EDIT_FIELD_MAPPING'=>'Editing Field Mapping', -'LBL_LOGIN_HISTORY_DETAILS'=>'User Login History', -'LBL_LOGIN_HISTORY_DESCRIPTION'=>'Display login history of users', -'LBL_NON_EDITABLE_PICKLIST_ENTRIES'=>'Non Editable Picklist Entries', - -//Added for Tax settings -'LBL_PRODUCT_TAX_SETTINGS'=>'Product & Service Taxes', -'LBL_SHIPPING_HANDLING_TAX_SETTINGS'=>'Shipping & Handling Taxes', -'LBL_PROXY_SERVER_DESC'=>'Configure proxies to access RSS feeds through Internet', - -'LBL_NEW_CURRENCTY'=>'New Currency', -'LBL_BASE_CURRENCY'=>'Base Currency - ', -'LBL_DELETE_CURRENCY'=>'Delete Currency', - -//Added for singlepane view in modules - -'LBL_DEFAULT_DETAIL_VIEW'=>'Default Detail View', -'LBL_DEFAULT_MODULE_VIEW'=>'Default Module View', -'LBL_DEFAULT_MODULE_VIEW_DESC'=>'Set Default Detail View for All Modules', -'LBL_ENABLE_SINGLEPANE_VIEW'=>'Enable Singlepane View', - -'LBL_CLEAR_DATA'=>'Clear Data', -'LBL_LENGTHALERT'=>'Sorry, you can cannot map fields with different character size. Kindly map the data with same or more character size.', -'LBL_DECIMALALERT'=>'Sorry, you can cannot map fields with different decimal places. Kindly map the data with same or more decimal places.', -'LBL_TYPEALERT_1'=>'Sorry, you cannot map the', -'LBL_WITH'=>'with', -'LBL_TYPEALERT_2'=>'data type. Kindly map the same data types.', -'LBL_ENABLE'=>'Enable', -'LBL_FAQ_FIELD_ACCESS'=>'Faq Field Access', -'LBL_ADD_TAX_BUTTON'=>'Add Tax', -); - - -?> +'Settings', + +'LBL_MODULE_TITLE'=>'Settings: Home', + +'LBL_LIST_CONTACT_ROLE'=>'Role', + + + +'LBL_LIST_LAST_NAME'=>'Last Name', + +'LBL_FIRST_NAME'=>'First Name:', + +'LBL_LAST_NAME'=>'Last Name:', + +'LBL_PHONE'=>'Phone:', + +'LBL_EMAIL_ADDRESS'=>'Email', + +'LBL_TRANSCURR'=>'Transfer User currency to', + +'LBL_CURRDEL'=>'Currency to be Deleted', + +'LBL_NEW_FORM_TITLE'=>'New Contact', + +'LBL_NEW_CURRENCY'=>'New Currency', + +'LBL_VIEWING'=>'Viewing', + +'LBL_CURRENCY_NAME'=>'Currency Name', + +'LBL_CURRENCY_CODE'=>'Currency Code', + +'LBL_CURRENCY_SYMBOL'=>'Symbol', + +'LBL_CURRENCY_CRATE'=>'Conversion Rate', + +'LBL_CURRENCY_STATUS'=>'Status', + +'LBL_CURRENCY_TOOL'=>'Tools', + +'LBL_CURRENCY_LIST'=>'Currencies List', + + +'NTC_DELETE_CONFIRMATION'=>'Are you sure you want to delete this record?', + +'LEADCUSTOMFIELDS'=>'Lead Custom Fields', + +'ACCOUNTCUSTOMFIELDS'=>'Account Custom Fields', + +'CONTACTCUSTOMFIELDS'=>'Contact Custom Fields', + +'OPPORTUNITYCUSTOMFIELDS'=>'Potential Custom Fields', + +'HELPDESKCUSTOMFIELDS'=>'Helpdesk Custom Fields', + +'PRODUCTCUSTOMFIELDS'=>'Product Custom Fields', + +'VENDORCUSTOMFIELDS'=>'Vendor Custom Fields', + +'PRICEBOOKCUSTOMFIELDS'=>'PriceBook Custom Fields', + +'POCUSTOMFIELDS'=>'Purchase Order Custom Fields', +'SOCUSTOMFIELDS'=>'Sales Order Custom Fields', +'QUOTESCUSTOMFIELDS'=>'Quotes Custom Fields', +'INVOICECUSTOMFIELDS'=>'Invoice Custom Fields', + +'EDITLEADPICKLISTVALUES'=>'Edit Lead Picklist ', + +'EDITACCOUNTPICKLISTVALUES'=>'Edit Account Picklist ', + +'EDITCONTACTPICKLISTVALUES'=>'Edit Contact Picklist ', + +'EDITOPPORTUNITYPICKLISTVALUES'=>'Edit Potential Picklist ', + +'EDITHELPDESKPICKLISTVALUES'=>'Edit HelpDesk Picklist ', + +'EDITPRODUCTPICKLISTVALUES'=>'Edit Product Picklist ', + +'EDITEVENTPICKLISTVALUES'=>'Edit Event Picklist ', + +'EDITTASKPICKLISTVALUES'=>'Edit Task Picklist ', + +'EDITRSSPICKLISTVALUES'=>'Edit Rss Picklist', +'EDITVENDORPICKLISTVALUES'=>'Edit Vendor Picklist', +'EDITPBPICKLISTVALUES'=>'Edit PriceBook Picklist', +'EDITPOPICKLISTVALUES'=>'Edit Purchase Order Picklist', +'EDITSOPICKLISTVALUES'=>'Edit Sales Order Picklist', +'EDITQUOTEPICKLISTVALUES'=>'Edit Quote Picklist', +'EDITINVOICEPICKLISTVALUES'=>'Edit Invoice Picklist', + + +// Added for Release vtigerCRM 3.2 PATCH 1.0 + +//Settings/index.php + +'LBL_CUSTOM_FIELD_SETTINGS'=>'Custom Field Settings:', + +'LBL_PICKLIST_FIELD_SETTINGS'=>'Picklist Field Settings:', + + + +//SETTINGS/CustomFieldList.php,ComboFieldList.php,CreateCustomField.php + +'Leads'=>'Lead', + +'Accounts'=>'Account', + +'Contacts'=>'Contact', + +'Potentials'=>'Potential', + +'HelpDesk'=>'HelpDesk', + +'Products'=>'Product', + +'Events'=>'Event', + +'Activities'=>'Task', + + + + + +'CustomFields'=>' Custom Fields', + +'NewCustomField'=>'New Custom Field', + +'NewCustomFieldAltC'=>'New Custom Field [Alt+c]:', + +'FieldName'=>'Field Name', + +'FieldType'=>'Field Type', + +'FieldLabel'=>'Field Label', + +'Delete'=>'Del', + +'NEW'=>'New', + +'CUSTOMFIELD'=>'Custom Field', + +'LBL_CUSTOM_FIELDS'=>'Custom Fields', + +'LBL_ADD_FIELD'=>'Create Custom Field', + +'LBL_CUSTM_MSG'=>'allows you to ....', + +'PicklistFields'=>' Picklist Fields', + +'LBL_PICKLIST_EDITOR'=>'Picklist Editor', + +'Edit'=>'Edit', + +'LBL_EDIT_FIELD_TYPE'=>'Edit Field Type', + +//Settings/CustomField.html + +'LBL_PROVIDE_FIELD_INFORMATION'=>'Provide Field Information: ', + +'LBL_SELECT_FIELD_TYPE'=>'Select Field Type: ', + +'LBL_PROVIDE_FIELD_DETAILS'=>'Provide Field Details: ', + +'LBL_LABEL'=>'Label: ', + +'LBL_LENGTH'=>'Length: ', + +'LBL_DECIMAL_PLACES'=>'Decimal Places: ', + +'LBL_PICK_LIST_VALUES'=>'Pick list Values: ', + + + +//Settings/EditComboField.php + +'EditPickListValues'=>'Picklist Edit ', + + + +//Settings/EditField.html + +'LBL_FIELD_INFORMATION'=>'Field Information:', + +'Values'=>'Values', + +'EnterListOfValues'=>'Please enter the list of values below. Each value should be in its own line.', + + + +//Settings/fieldtypes.php + +'Text'=>'Text', + +'Number'=>'Number', + +'Percent'=>'Percent', + +'Currency'=>'Currency', + +'Date'=>'Date', + +'Email'=>'Email', + +'Phone'=>'Phone', + +'PickList'=>'Pick List', + +'LBL_MULTISELECT_COMBO'=>'Multi-Select Combo Box', + + + +//added for patch2 + +'USERGROUPLIST'=>'Groups', + +'EMAILTEMPLATES'=>'E-mail Templates', + +'WORDINTEGRATION'=>'Mail Merge Templates', + +'LBL_MAIL_MERGE'=>'Mail Merge', + +'NOTIFICATIONSCHEDULERS'=>'Notification Schedulers', +//currency status +'LBL_ACTIVE'=>'Active', + +'LBL_INACTIVE'=>'Inactive', + +'LBL_NOTIFICATION'=>'Notification', +'LBL_DESCRIPTION'=>'Description', +'LBL_TOOL'=>'Tool', + + +//Added fields for Title Informations -- after 4 Beta + +'LBL_EMAIL_CONFIG'=>'Outgoing Mail Server Configuration', + +'LBL_WORD_INTEGRATION'=>'Word Integration:', + +'LBL_GROUP_SETTINGS'=>'Group Settings:', + +'LBL_TEMPLATE_SETTINGS'=>'Template Settings:', + +'LBL_NOTIFICATION_SETTINGS'=>'Notification Settings:', + +'LBL_EMAIL_SETTINGS'=>'Email Settings:', + +'LBL_SECURITY_SETTINGS'=>'Security Settings:', + + + +//Added fields after RC1 - Release + +'LBL_MAIL_SERVER_INFO'=>'Outgoing Mail Server Information', + +'LBL_OUTGOING_MAIL_SERVER'=>'Server Name', + +'LBL_OUTGOING_MAIL_SERVER_LOGIN_USER_NAME'=>'Outgoing Mail Server Login User Name', + +'LBL_OUTGOING_MAIL_SERVER_PASSWORD'=>'Outgoing Mail Server Password', + +'LBL_MAIL_SERVER_SMTP'=>'Mail Server Settings (SMTP)', + +'LBL_BACKUP_SERVER_CONFIG'=>'Backup Server Configuration', + +'LBL_SERVER_ADDRESS'=>'Server Address', + +'LBL_FTP_SERVER_NAME'=>'FTP Server Name', + +'LBL_FTP_USER_NAME'=>'FTP User Name', + +'LBL_FTP_PASSWORD'=>'FTP Password', + +'LBL_FTP'=>'FTP', + +'LBL_SYSTEM_CONFIG'=>'System Configuration', +'LBL_SYSTEM_INFO'=>'System Details', +'LBL_PROXY_SETTINGS'=>'Proxy Server', +'LBL_AUDIT_TRAIL'=>'Audit Trails', +'LBL_ENABLE_AUDIT_TRAIL'=>'Enable Audit Trail', +'LBL_USER_AUDIT'=>'Select User', +'LBL_VIEW_AUDIT_TRAIL'=>'View Audit Trail', +'LBL_AUDIT_TRAIL_DESC'=>'Display Audit Trail of Users who access CRM', +'LBL_NO_DATA'=>'No Data', + +'LBL_CURRENCY_CONFIGURATION'=>'- Currency Information', + +'LBL_CURRENCY_CONFIG'=>'Currency Configuration', + +'LBL_CURRENCY_INFO'=>'Currency Information', + +'LBL_CURRENCY_TITLE'=>'Currency', + +'LBL_CURRENCY_SETTINGS'=>'Currencies', + +'LBL_YES'=>'yes', +'LBL_NO'=>'no', + +'LBL_USERNAME'=>'User Name', +'LBL_PASWRD'=>'Password', +'LBL_REQUIRES_AUTHENT'=>'Requires Authentication?', + +//Fields for Settings + +'LBL_USER_MANAGEMENT'=>'Users & Access Management', + +'LBL_USERS'=>'Users', + +'LBL_USERS_LIST'=>'Users List', +'LBL_GROUP_LIST'=>'Groups List', + +'LBL_CREATE_AND_MANAGE_USERS'=>'- Create and Manage Users (e.g., admin)', + +'LBL_ROLES'=>'Roles', + +'LBL_CREATE_AND_MANAGE_USER_ROLES'=>'- Create and Manage user roles (e.g., Administrator, Standard User, etc.)', + +'LBL_PROFILES'=>'Profiles', + +'LBL_PROFILES_LIST'=>'Profiles List', + +'LBL_CREATE_AND_MANAGE_USER_PROFILES'=>'- Create and Manage user profiles (e.g., CEO, Sales Manager, etc.)', + +'LBL_CREATE_AND_MANAGE_USER_GROUPS'=>'- Create and Manage user groups', + +'LBL_SHARING_ACCESS'=>'Sharing Access', + +'LBL_FIELDS_ACCESS'=>'Fields Access', + +'LBL_DEFAULT_ORGANIZATION_FIELDS'=>'Default Organization Fields Access', + +'LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS'=>' - Setting Default Field Access within the Organization', + +'LBL_SETTING_DEFAULT_SHARING_ACCESS'=>'- Setting Default Sharing Access within the Organization', + +'LBL_FIELD_ACCESSIBILITY'=>'Field Accessibility', + +'LBL_SETTING_FIELD_ACCESSIBILITY'=>' - Setting Field Accessibility for each profiles', +//<<<<<<<>>>>> +'LBL_FIELD_ORDERING_DESC'=>' - Edit Field Order', + +'LBL_FIELD_ORDERING'=>'Edit Field Blocks', +//<<<<<<<<<>>>>>>>>>>>> +'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_DELETE_DEMO_DATA'=>'Delete Demo Data', + +'LBL_DELETE_DEMO_DATA_INFO'=>'- Delete the Demo Data which is created at the time of installation', + + + +'LBL_STUDIO'=>'Studio', + +'LBL_CUSTOM_FIELD_SETTINGS'=>'Custom Field Settings', + +'LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS'=>'Manage your company-wide custom fields.', + +'LBL_SELECT_MODULE'=>'Select Module', + +'LBL_SELECT_CF_TEXT'=>'Select Module:', + + + +'LBL_PICKLIST_SETTINGS'=>'Picklist Settings', + +'LBL_EDIT_PICKLIST_VALUES'=>' - Edit values of Picklist fields', + +'LBL_EDIT'=>'Editing', + +'LBL_COMMUNICATION_TEMPLATES'=>'Communication Templates', + +'LBL_CREATE_EMAIL_TEMPLATES'=>'New Email Template', + +'LBL_UPLOAD_MSWORD_TEMPLATES'=>' - Upload MS Word Templates for Mail Merge', + +'LBL_SCHEDULE_EMAIL_NOTIFICATION'=>' - Schedule Email Notifications', + +'LBL_EXPAND_CLOSE_MENU'=>'Expand/Close Menu', + +'LBL_CONFIGURATION'=>'Configuration', + +'LBL_CONFIGURE_MAIL_SERVER'=>' - Configure Outgoing Mail Server', + +'LBL_BACKUP_SERVER_CONFIGURATION'=>'Backup Server Configuration', + +'LBL_BACKUP_SERVER_INFO'=>'Backup Server Information', + +'LBL_BACKUP_SERVER_SETTINGS'=>'Backup Server', + +'LBL_CONFIGURE_BACKUP_SERVER'=>' - Configure Backup Server', + +'LBL_SYSTEM_CONFIGURATION'=>' - System Configuration', + +'LBL_PROXY_SERVER_CONFIGURATION'=>'Proxy Server Configuration', + +'LBL_PROXY_SERVER_INFO'=>'Proxy Server Information', + +'LBL_PROXY_SERVER_SETTINGS'=>'Proxy Server', + +'LBL_CONFIGURE_PROXY_SERVER'=>' - Configure Proxy Server', + +'LBL_PROXY_PORT'=>'Port Number', + + + +//Field Types for custom fields + +'LBL_URL'=>'URL', + +'LBL_CHECK_BOX'=>'Checkbox', + + + +//PickList Settings + +'LBL_STANDARD_FIELDS'=>'Standard Fields', + +'LBL_LEAD_SOURCE'=>'Lead Source', + +'LBL_SALUTATION'=>'Salutation', + +'LBL_LEAD_STATUS'=>'Lead Status', + +'LBL_INDUSTRY'=>'Industry', + +'LBL_RATING'=>'Rating', + +'LBL_ACCOUNT_TYPE'=>'Account Type', + +'LBL_BUSINESS_TYPE'=>'Business Type', + +'LBL_CURRENCY_TYPE'=>'Currency Type', + +'LBL_SALES_STAGE'=>'Sales Stage', + +'LBL_PRIORITY'=>'Priority', + +'LBL_STATUS'=>'Status', + +'LBL_CATEGORY'=>'Ticket Category', + +'LBL_MANUFACTURER'=>'Manufacturer', + +'LBL_PRODUCT_CATEGORY'=>'Product Category', + +'LBL_RSS_CATEGORY'=>'Rss Category', + +//Added for Web based Email client integration (post 4.0.1 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_MAIL_SERVER_SETTINGS'=>'Outgoing Server', +'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_USAGEUNIT'=>'Usage Unit', +'LBL_GLACCT'=>'GL Account', +'LBL_QUOTE_STAGE'=>'Quote Stage', +'LBL_CARRIER'=>'Carrier', +'LBL_TAXCLASS'=>'Tax Class', +'LBL_MY_DETAILS'=>'My Details', +'LBL_MY_MAIL_SERVER_DET'=>'My Incoming Mail Server Details', +'LBL_EMAIL_ID'=>'Email ID', +'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'=>'Emails per Page', + +//Added for Organization Details (4.2 release) +'LBL_ORGANIZATION_NAME'=>'Company Name', +'LBL_ORGANIZATION_ADDRESS'=>'Address', +'LBL_ORGANIZATION_CITY'=>'City', +'LBL_ORGANIZATION_STATE'=>'State', +'LBL_ORGANIZATION_CODE'=>'Postal Code', +'LBL_ORGANIZATION_COUNTRY'=>'Country', +'LBL_ORGANIZATION_PHONE'=>'Phone', +'LBL_ORGANIZATION_FAX'=>'Fax', +'LBL_ORGANIZATION_WEBSITE'=>'Website', +'LBL_ORGANIZATION_DETAILS'=>'Company Information', +'LBL_SPECIFY_COMPANY_DETAILS'=>' - Specify Company Information', +'LBL_ORGANIZATION_LOGO'=>'Company Logo', +'LBL_UPLOAD'=>'Upload', +'LBL_FILENAME'=>'File Name', +'LBL_SETTINGS'=>'Settings', +'LBL_COMPANY_DETAILS'=>'Company Details', + +'LBL_SEVERITY'=>'Severity', +'LBL_FAQ_CATEGORY'=>'FAQ Category', +'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', +'INVENTORYNOTIFICATION'=>'Inventory Notifications', +'LBL_INVENTORY_NOTIFICATIONS'=>' - Edit Inventory Email Notifications', +'INVENTORYTERMSANDCONDITIONS'=>'Inventory : Terms & Conditions',//newly added for Inventory terms and conditions +'LBL_INVENTORY_TERMSANDCONDITIONS'=>' - Edit Terms & Conditions',//newly added +'LBL_TANDC_TEXT'=>'Terms & Conditions Text', +'LBL_INVENTORY_TANDC'=>'Inventory Terms & Conditions', + +'LBL_OTHER_SETTINGS'=>'Other Settings', +'LBL_SCROLL'=>'[Scroll to Top]', + +'LBL_INV_NOT_DESC'=>'The following is 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', +'Vendor'=>'Vendor', +'PriceBook'=>'PriceBook', +'Quotes'=>'Quote', +'PurchaseOrder'=>'Purchase Order', +'SalesOrder'=>'SalesOrder', +'Invoice'=>'Invoice', + +//For Custom Fields +'LBL_LEAD_MAP_CUSTOM_FIELD'=>'Mapping Lead Custom Fields', +'leadCustomFieldDescription'=>'Map each of your organizations lead custom fields to each of your custom account +,contact, or potential fields. These mappings will be used when you convert leads', +'LBL_MAPPING_INFO'=>'Mapping Information', +'LBL_ACCOUNT_FIELD'=>'Account Custom Field', +'LBL_CONTACT_FIELD'=>'Contact Custom Field', +'LBL_POTENTIAL_FIELD'=>'Potential Custom Field', +'CUSTOMFIELDMAPPING'=>'Custom Field Mapping', +'LBL_FIELD_MAPPING'=>'Field Mapping', +'LBL_LEAD_FIELD'=>'Lead Custom Field', +//After 4.2 GA +'LBL_TEXT_AREA'=>'Text Area', +//for Edit ordering the blocks +'NOTESCUSTOMFIELDS'=>'Notes Custom Fields', + +//Added fields after 4.2 ptach 2 +'LBL_ASSIGN_MODULE_OWNERS'=>'Assign Module Owners', +'LBL_MODULE_OWNERS'=>'Module Owners', +'LBL_ASSIGN_MODULE_OWNERS_INFO'=>' - Assign Owners for each modules', +'LBL_MODULE'=>'CRM Module', +'LBL_OWNER'=>'Assigned Owner', +'LBL_MIGRATION'=>'Migration Wizard', +'LBL_MIGRATION_INFO'=>'Migrate vtiger CRM data from Version 4.2.3 to 5.0.0', + +//Added for 5 GA - Description of Settings UI + +'LBL_USER_DESCRIPTION'=>'Manage users who can access vtiger CRM', +'LBL_ROLE_DESCRIPTION'=>'Set up hierarchy of roles and assign to the users', +'LBL_PROFILE_DESCRIPTION'=>'Manage user-specific modules access to different Roles', +'LBL_GROUP_DESCRIPTION'=>'Manage different types of teams based on roles, users, and profiles', +'LBL_SHARING_ACCESS_DESCRIPTION'=>'Manage module sharing rules & custom sharing rules', +'LBL_SHARING_FIELDS_DESCRIPTION'=>'Define global field-level access in each module', +'LBL_MODULE_OWNERS_DESCRIPTION'=>'Assign Customer Support owners to CRM module', +'LBL_ANNOUNCEMENT_DESCRIPTION'=>'Manage company wide announcements', +'LBL_CUSTOM_FIELDS_DESCRIPTION'=>'Manage different types of user-defined fields', +'LBL_PICKLIST_DESCRIPTION'=>'Customize Picklist values in each module', +'LBL_EMAIL_TEMPLATE_DESCRIPTION'=>'Manage templates for E-Mail module', +'LBL_MAIL_MERGE_DESCRIPTION'=>'Manage templates for Mail Merging', +'LBL_NOTIF_SCHED_DESCRIPTION'=>'Manage Notifications that will alert in case of important actions', +'LBL_INV_NOTIF_DESCRIPTION'=>'Change Settings of Inventory related Notifications', +'LBL_INV_TANDC_DESCRIPTION'=>'Specify Terms and Conditions for quotes, orders, and invoices', +'LBL_COMPANY_DESCRIPTION'=>'Specify business address of company', +'LBL_MAIL_SERVER_DESCRIPTION'=>'Configure Outgoing Mail Server details', +'LBL_BACKUP_SERVER_DESCRIPTION'=>'Specify database backup server details', +'LBL_CURRENCY_DESCRIPTION'=>'Manage international currencies and exchange rates', +'LBL_TAX_DESCRIPTION'=>'Manage taxes and the corresponding tax rates', +'LBL_SYSTEM_DESCRIPTION'=>'View vtiger CRM Server details', +'LBL_PROXY_DESCRIPTION'=>'Configure proxies to access RSS feeds through Internet', +'LBL_AUDIT_DESCRIPTION'=>'Display data opertions performed by users', +'LBL_TAX_DESC'=>'Manage different types of tax rates for taxes, such as Sales Tax, VAT etc.,', +'LBL_COMPANY_DESC'=>'Specify business address of your company', +'LBL_SELECT_LOGO'=>'Select new logo:', +'LBL_INVEN_TANDC_DESC'=>'Specify text for the Terms & Conditions section of Quotes, Orders, and Invoices modules', +'LBL_MAIL_SERVER_DESC'=>'Configure your Outgoing Mail Server details', +'LBL_BACKUP_SERVER_DESC'=>'Manage your Backup Server', +'LBL_MODULES_AND_OWNERS'=>'Modules & Owners', +'LBL_GROUP_DESC'=>'Manage different types of user groups within your organization', +'LBL_MAIL_MERGE_DESC'=>'Manage Mail Merge templates used in CRM modules', + + +//Added fields after 5.0 Alpha +'LBL_REQUIRE_SMTP_AUTHENTICATION'=>'Require SMTP Authentication?', +'LBL_ANNOUNCEMENT'=>'Announcements', +'LBL_SETTING_ANNOUNCEMENT'=>'Announcement', +'LBL_ANNOUNCE_TEXT'=>'Announcement Text', +'LBL_UPDATE_BUTTON'=>'Update', +'LBL_ANNOUNCEMENT_INFO'=>'Type the announcement text below, and click the Update button.', +'LBL_ANNOUNCEMENT_DESC'=>'Change the text that appears in the announcement display on top of each page', +'LBL_EMAIL_CONTENTS'=>'Email Contents', +'LBL_SUBJECT'=>'Subject', +'LBL_MESSAGE'=>'Message', +'LBL_PICKLIST_EDITOR'=>'Picklist Editor', +'LBL_PICKLIST_AVAIL'=>'Picklists Available in', +'LBL_PICKLIST_AVAILINFO1'=>'The picklists available in', +'LBL_PICKLIST_AVAILINFO2'=>'are shown below. Click Edit to modify the contents of the list.', +'LBL_EDIT_PICKLIST'=>'Edit Pick List', +'LBL_PICKLIST_SAVEINFO'=>'Type the entries one - by - one below and click the Save button to save the list.', +'LBL_SELECT_CRM_MODULE'=>'Select CRM Module', +'LBL_TAX_SETTINGS'=>'Tax Calculations', +'LBL_INVENTORY_TAX_CONFIG'=>'Inventory Tax Configuration', +'LBL_CUSTOM_MAPP_INFO'=>'Only in Leads module you can map the fields with Accounts, Contacts, and Potentials.', +'LBL_MAPPING_OTHER_MODULES'=>'Mapping with other Modules', +'LBL_CUSTOM_FILED_IN'=>'Custom Fields in ', +'LBL_ROLE_HIERARCHY_TREE'=>'Roles & Hierarchy Tree', +'LBL_EDIT_FIELD_MAPPING'=>'Editing Field Mapping', +'LBL_LOGIN_HISTORY_DETAILS'=>'User Login History', +'LBL_LOGIN_HISTORY_DESCRIPTION'=>'Display login history of users', +'LBL_NON_EDITABLE_PICKLIST_ENTRIES'=>'Non Editable Picklist Entries', + +//Added for Tax settings +'LBL_PRODUCT_TAX_SETTINGS'=>'Product & Service Taxes', +'LBL_SHIPPING_HANDLING_TAX_SETTINGS'=>'Shipping & Handling Taxes', +'LBL_PROXY_SERVER_DESC'=>'Configure proxies to access RSS feeds through Internet', + +'LBL_NEW_CURRENCTY'=>'New Currency', +'LBL_BASE_CURRENCY'=>'Base Currency - ', +'LBL_DELETE_CURRENCY'=>'Delete Currency', + +//Added for singlepane view in modules + +'LBL_DEFAULT_DETAIL_VIEW'=>'Default Detail View', +'LBL_DEFAULT_MODULE_VIEW'=>'Default Module View', +'LBL_DEFAULT_MODULE_VIEW_DESC'=>'Set Default Detail View for All Modules', +'LBL_ENABLE_SINGLEPANE_VIEW'=>'Enable Singlepane View', + +'LBL_CLEAR_DATA'=>'Clear Data', +'LBL_LENGTHALERT'=>'Sorry, you can cannot map fields with different character size. Kindly map the data with same or more character size.', +'LBL_DECIMALALERT'=>'Sorry, you can cannot map fields with different decimal places. Kindly map the data with same or more decimal places.', +'LBL_TYPEALERT_1'=>'Sorry, you cannot map the', +'LBL_WITH'=>'with', +'LBL_TYPEALERT_2'=>'data type. Kindly map the same data types.', +'LBL_ENABLE'=>'Enable', +'LBL_FAQ_FIELD_ACCESS'=>'Faq Field Access', +'LBL_ADD_TAX_BUTTON'=>'Add Tax', +); + + +?> From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 11:39:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 18:39:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9583 - in /vtigercrm/branches/5.0.1/pkg/bin: startvTiger.bat startvTiger.sh stopvTiger.bat Message-ID: <20061006183951.15C2F787F10@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 12:39:45 2006 New Revision: 9583 Log: changed 5 to 501 Modified: vtigercrm/branches/5.0.1/pkg/bin/startvTiger.bat vtigercrm/branches/5.0.1/pkg/bin/startvTiger.sh vtigercrm/branches/5.0.1/pkg/bin/stopvTiger.bat Modified: vtigercrm/branches/5.0.1/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/branches/5.0.1/pkg/bin/startvTiger.bat (original) +++ vtigercrm/branches/5.0.1/pkg/bin/startvTiger.bat Fri Oct 6 12:39:45 2006 @@ -43,23 +43,23 @@ echo "" echo "making an attempt to kill any existing vtigercrm service" echo "" -bin\apache -k stop -n vtigercrm5 -bin\apache -k uninstall -n vtigercrm5 +bin\apache -k stop -n vtigercrm501 +bin\apache -k uninstall -n vtigercrm501 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 vtigercrm5 -bin\apache -k uninstall -n vtigercrm5 +bin\apache -k stop -n vtigercrm501 +bin\apache -k uninstall -n vtigercrm501 echo "" echo "" -echo "Installing vtigercrm5 apache service after sleeping for 10 seconds" +echo "Installing vtigercrm501 apache service after sleeping for 10 seconds" echo "" %SLEEP_STR% -n 10 127.0.0.1>nul -bin\apache -k install -n vtigercrm5 -f conf\httpd.conf +bin\apache -k install -n vtigercrm501 -f conf\httpd.conf echo "" -echo "Starting vtigercrm5 apache service" +echo "Starting vtigercrm501 apache service" echo "" -bin\apache -n vtigercrm5 -k start +bin\apache -n vtigercrm501 -k start IF ERRORLEVEL 1 goto stopservice goto checkmysql @@ -117,27 +117,27 @@ :checkdatabase echo "" -echo "check to see if vtigercrm5 database already exists" +echo "check to see if vtigercrm501 database already exists" echo "" -mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm5'" | "%WINDIR%\system32\find.exe" "vtigercrm5" > NUL +mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm501'" | "%WINDIR%\system32\find.exe" "vtigercrm501" > NUL IF ERRORLEVEL 1 goto dbnotexists echo "" -ECHO "vtigercrm5 database exists" +ECHO "vtigercrm501 database exists" echo "" goto end :dbnotexists echo "" -ECHO "vtigercrm5 database does not exist" +ECHO "vtigercrm501 database does not exist" echo "" echo %cd% echo "" -echo "Proceeding to create database vtigercrm5 and populate the same" +echo "Proceeding to create database vtigercrm501 and populate the same" echo "" -mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm5" +mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm501" echo "" -echo "vtigercrm5 database created" +echo "vtigercrm501 database created" echo "" goto end Modified: vtigercrm/branches/5.0.1/pkg/bin/startvTiger.sh ============================================================================== --- vtigercrm/branches/5.0.1/pkg/bin/startvTiger.sh (original) +++ vtigercrm/branches/5.0.1/pkg/bin/startvTiger.sh Fri Oct 6 12:39:45 2006 @@ -111,14 +111,14 @@ fi echo "" -echo "Checking if the vtigercrm5 database already exists" +echo "Checking if the vtigercrm501 database already exists" echo "" -echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm5 >/dev/null +echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm501 >/dev/null if [ $? -ne 0 ]; then echo "" - echo "Database vtigercrm5 does not exist. Creating database vtigercrm5" + echo "Database vtigercrm501 does not exist. Creating database vtigercrm501" echo "" - ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm5" + ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm501" fi host=`hostname` Modified: vtigercrm/branches/5.0.1/pkg/bin/stopvTiger.bat ============================================================================== --- vtigercrm/branches/5.0.1/pkg/bin/stopvTiger.bat (original) +++ vtigercrm/branches/5.0.1/pkg/bin/stopvTiger.bat Fri Oct 6 12:39:45 2006 @@ -32,13 +32,13 @@ cd /d %apache_dir% rem shut down apache echo "" -echo "stopping vtigercrm5 apache service" +echo "stopping vtigercrm501 apache service" echo "" -bin\apache -n vtigercrm5 -k stop +bin\apache -n vtigercrm501 -k stop echo "" -echo "uninstalling vtigercrm5 apache service" +echo "uninstalling vtigercrm501 apache service" echo "" -bin\apache -k uninstall -n vtigercrm5 +bin\apache -k uninstall -n vtigercrm501 rem .\bin\ShutdownApache.exe logs\httpd.pid goto StopMySQL From vtigercrm-commits at vtiger.fosslabs.com Sat Oct 7 05:13:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 07 Oct 2006 12:13:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9584 - in /vtigercrm/branches/5.0.1: data/CRMEntity.php include/utils/DetailViewUtils.php include/utils/EditViewUtils.php modules/Contacts/Save.php Message-ID: <20061007121353.85C096FDF4C@vtiger.fosslabs.com> Author: richie Date: Sat Oct 7 06:13:46 2006 New Revision: 9584 Log: * Modified to fix the issue 2098 ie., when we add attachemnt it shows in the image area Modified: vtigercrm/branches/5.0.1/data/CRMEntity.php vtigercrm/branches/5.0.1/include/utils/DetailViewUtils.php vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php vtigercrm/branches/5.0.1/modules/Contacts/Save.php Modified: vtigercrm/branches/5.0.1/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/5.0.1/data/CRMEntity.php (original) +++ vtigercrm/branches/5.0.1/data/CRMEntity.php Sat Oct 7 06:13:46 2006 @@ -263,7 +263,11 @@ //This is to added to store the existing attachment id of the contact where we should delete this when we give new image if($module == 'Contacts') - $old_attachmentid = $adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid=$id"),0,'attachmentsid'); + { + //if a image attached already then remove that otherwise do not delete the attachment + $query = "select vtiger_attachments.attachmentsid from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid inner join vtiger_contactdetails on vtiger_contactdetails.imagename=vtiger_attachments.name where vtiger_seattachmentsrel.crmid=$id"; + $old_attachmentid = $adb->query_result($adb->query($query),0,'attachmentsid'); + } foreach($_FILES as $fileindex => $files) { @@ -274,7 +278,7 @@ } //This is to handle the delete image for contacts - if($module == 'Contacts' && $file_saved) + if($module == 'Contacts' && $file_saved && $old_attachmentid != '') { $del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$old_attachmentid"); $del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$old_attachmentid"); @@ -384,11 +388,13 @@ $sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')'; $adb->query($sql3); + $log->debug("Exiting from uploadAndSaveFile($id,$module,$file_details) method. return true"); return true; } else { $log->debug("Skip the save attachment process."); + $log->debug("Exiting from uploadAndSaveFile($id,$module,$file_details) method. return false"); return false; } } Modified: vtigercrm/branches/5.0.1/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/DetailViewUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/DetailViewUtils.php Sat Oct 7 06:13:46 2006 @@ -304,7 +304,8 @@ { $imgpath = "test/contact/".$imagename; $label_fld[] =$mod_strings[$fieldlabel]; - $label_fld["cntimage"] ='
     '.$mod_strings[$fieldlabel]; + //This is used to show the contact image as a thumbnail near First Name field + //$label_fld["cntimage"] ='
     '.$mod_strings[$fieldlabel]; } else { @@ -462,7 +463,7 @@ if($tabid==4) { //$imgpath = getModuleFileStoragePath('Contacts').$col_fields[$fieldname]; - $sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid=".$col_fields['record_id']; + $sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid inner join vtiger_contactdetails on vtiger_contactdetails.imagename=vtiger_attachments.name where vtiger_seattachmentsrel.crmid=".$col_fields['record_id']; $image_res = $adb->query($sql); $image_id = $adb->query_result($image_res,0,'attachmentsid'); $image_path = $adb->query_result($image_res,0,'path'); Modified: vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php Sat Oct 7 06:13:46 2006 @@ -578,8 +578,8 @@ $query = 'select vtiger_attachments.path, vtiger_attachments.attachmentsid, vtiger_attachments.name from vtiger_products left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_products.productid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where productid='.$col_fields['record_id']; } else - { - $query = "select vtiger_attachments.path, vtiger_attachments.attachmentsid, vtiger_attachments.name from vtiger_contactdetails left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_contactdetails.contactid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where contactid=".$col_fields['record_id']; + { + $query = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid inner join vtiger_contactdetails on vtiger_contactdetails.imagename=vtiger_attachments.name where vtiger_seattachmentsrel.crmid=".$col_fields['record_id']; } $result_image = $adb->query($query); for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++) Modified: vtigercrm/branches/5.0.1/modules/Contacts/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/Save.php Sat Oct 7 06:13:46 2006 @@ -115,6 +115,11 @@ $focus->column_fields['imagename']=$image_name_val; $log->debug("Assign the Image name to the vtiger_field name "); } + +//if image added then we have to set that $_FILES['name'] in imagename field then only the image will be displayed +if($_FILES['imagename']['name'] != '') + $focus->column_fields['imagename'] = $_FILES['imagename']['name']; + //Saving the contact if($image_error=="false") { From vtigercrm-commits at vtiger.fosslabs.com Sat Oct 7 05:51:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 07 Oct 2006 12:51:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9585 - in /vtigercrm/branches/5.0.1/Smarty/templates: DisplayFields.tpl salesEditView.tpl Message-ID: <20061007125137.08C64787F25@vtiger.fosslabs.com> Author: jerrydgeorge Date: Sat Oct 7 06:51:00 2006 New Revision: 9585 Log: i18N issue has been fixed --Jeri,Fixes #2309 Modified: vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl vtigercrm/branches/5.0.1/Smarty/templates/salesEditView.tpl Modified: vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl Sat Oct 7 06:51:00 2006 @@ -51,7 +51,7 @@ {/if} {elseif $uitype eq 19 || $uitype eq 20} - {if $fldlabel eq 'Add Comment'} + {if $fldlabel eq $MOD.LBL_ADD_COMMENT} {assign var=fldvalue value=""} {/if} Modified: vtigercrm/branches/5.0.1/Smarty/templates/salesEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/salesEditView.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/salesEditView.tpl Sat Oct 7 06:51:00 2006 @@ -115,7 +115,7 @@ - {if $header eq 'Comments' || $header eq 'Comment Information'} + {if $header eq $MOD.LBL_COMMENTS || $header eq $MOD.LBL_COMMENT_INFORMATION}   From admin at eBay.com Sun Oct 8 16:06:48 2006 From: admin at eBay.com (eBay) Date: Sun, 8 Oct 2006 19:06:48 -0400 (EDT) Subject: [Vtigercrm-commits] Question about your item -- respond now Message-ID: <1160348808.42095.qmail@eBay.com> An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20061008/f09d1916/attachment.htm From vtigercrm-commits at vtiger.fosslabs.com Sun Oct 8 21:45:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 04:45:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9586 - /vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php Message-ID: <20061009044534.918E0787E80@vtiger.fosslabs.com> Author: richie Date: Sun Oct 8 22:45:30 2006 New Revision: 9586 Log: changes made to fix the convert lead issue and to avoid duplicate account creation during convertlead operation -- Minnie Modified: vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php Modified: vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php Sun Oct 8 22:45:30 2006 @@ -274,36 +274,51 @@ } -$crmid = $adb->getUniqueID("vtiger_crmentity"); - -//Saving Account - starts -$sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,createdtime,modifiedtime,deleted,description) values(".$crmid.",".$current_user_id.",".$assigned_user_id.",'Accounts',1,".$date_entered.",".$date_modified.",0,'".$row['description']."')"; -$adb->query($sql_crmentity); - -$sql_insert_account = "INSERT INTO vtiger_account (accountid,accountname,industry,annualrevenue,phone,fax,rating,email1,website,employees) VALUES (".$crmid.",'".addslashes($accountname)."','".$row["industry"] ."','" .$row["annualrevenue"] ."','" .$row["phone"] ."','".$row["fax"] ."','" .$row["rating"] ."','" .$row["email"] ."','" .$row["website"] ."','" .$row["noofemployees"] ."')"; -$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"]."')"; -$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"]."')"; -$adb->query($sql_insert_accountshipads); - -//Getting the custom vtiger_field values from leads and inserting into Accounts if the vtiger_field is mapped - Jaguar -$insert_value=$crmid; -$insert_column="accountid"; -$val= getInsertValues("Accounts",$insert_value); -if($val[0]!="") - $insert_column.=","; -if($val[1]!="") - $insert_value.=","; - -$insert_column.=$val[0]; -$insert_value.=$val[1]; -$sql_insert_accountcustomfield = "INSERT INTO vtiger_accountscf (".$insert_column.") VALUES (".$insert_value.")"; -$adb->query($sql_insert_accountcustomfield); -//Saving Account - ends + +/*Code integrated to avoid duplicate Account creation during ConvertLead Operation START-- by Bharathi*/ +$acc_query = "select vtiger_account.accountid from vtiger_account left join vtiger_crmentity on vtiger_account.accountid = vtiger_crmentity.crmid where vtiger_crmentity.deleted=0 and vtiger_account.accountname = '$accountname'"; +$acc_res = $adb->query($acc_query); +$acc_rows = $adb->num_rows($acc_res); +if($acc_rows != 0) + $crmid = $adb->query_result($acc_res,0,"accountid"); +else +{ + $crmid = $adb->getUniqueID("vtiger_crmentity"); + + //Saving Account - starts + $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,createdtime,modifiedtime,deleted,description) values(".$crmid.",".$current_user_id.",".$assigned_user_id.",'Accounts',1,".$date_entered.",".$date_modified.",0,'".$row['description']."')"; + $adb->query($sql_crmentity); + /* Modified by Minnie to fix the convertlead issue -- START*/ + if(isset($row["annualrevenue"]) && !empty($row["annualrevenue"])) $annualrevenue = $row["annualrevenue"]; + else $annualrevenue = 'null'; + if(isset($row["noofemployees"]) && !empty($row["noofemployees"])) $employees = $row["noofemployees"]; + else $employees = 'null'; + $sql_insert_account = "INSERT INTO vtiger_account (accountid,accountname,industry,annualrevenue,phone,fax,rating,email1,website,employees) VALUES (".$crmid.",'".addslashes($accountname)."','".$row["industry"] ."',".$annualrevenue.",'" .$row["phone"] ."','".$row["fax"] ."','" .$row["rating"] ."','" .$row["email"] ."','" .$row["website"] ."',".$employees.")"; + /* 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"]."')"; + $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"]."')"; + $adb->query($sql_insert_accountshipads); + + //Getting the custom vtiger_field values from leads and inserting into Accounts if the vtiger_field is mapped - Jaguar + $insert_value=$crmid; + $insert_column="accountid"; + $val= getInsertValues("Accounts",$insert_value); + if($val[0]!="") + $insert_column.=","; + if($val[1]!="") + $insert_value.=","; + + $insert_column.=$val[0]; + $insert_value.=$val[1]; + $sql_insert_accountcustomfield = "INSERT INTO vtiger_accountscf (".$insert_column.") VALUES (".$insert_value.")"; + $adb->query($sql_insert_accountcustomfield); + //Saving Account - ends +} +/*Code integrated to avoid duplicate Account creation during ConvertLead Operation END-- by Bharathi*/ $account_id=$crmid; getRelatedNotesAttachments($id,$crmid); //To Convert Related Notes & Attachments -Jaguar @@ -320,7 +335,7 @@ //Saving Contact - starts $crmcontactid = $adb->getUniqueID("vtiger_crmentity"); -$sql_crmentity1 = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,description,createdtime) values(".$crmcontactid.",".$current_user_id.",".$assigned_user_id.",'Contacts',0,0,'".$row['description']."',".$date_entered.")"; +$sql_crmentity1 = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,description,createdtime,modifiedtime) values(".$crmcontactid.",".$current_user_id.",".$assigned_user_id.",'Contacts',0,0,'".$row['description']."',".$date_entered.",".$date_modified.")"; $adb->query($sql_crmentity1); @@ -382,7 +397,7 @@ $oppid = $adb->getUniqueID("vtiger_crmentity"); - $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,".$date_entered.",'".$row['description']."')"; + $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,modifiedtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,".$date_entered.",".$date_modified.",'".$row['description']."')"; $adb->query($sql_crmentity); From vtigercrm-commits at vtiger.fosslabs.com Sun Oct 8 22:19:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 05:19:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9587 - /vtigercrm/branches/5.0.1/include/language/en_us.lang.php Message-ID: <20061009051950.5D988787F62@vtiger.fosslabs.com> Author: richie Date: Sun Oct 8 23:19:46 2006 New Revision: 9587 Log: changes made to fix the issue #2256 -Minnie Modified: vtigercrm/branches/5.0.1/include/language/en_us.lang.php Modified: vtigercrm/branches/5.0.1/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/include/language/en_us.lang.php Sun Oct 8 23:19:46 2006 @@ -620,8 +620,8 @@ 'LBL_CALCULATOR'=>'Calculator', -'LBL_CLOSE_WON' =>'Closed-Won', # 'Closed Won' -'LBL_CLOSE_LOST'=>'Closed-Lost', # 'Closed Lost' +'LBL_CLOSE_WON' =>'Closed Won', # 'Closed Won' +'LBL_CLOSE_LOST'=>'Closed Lost', # 'Closed Lost' 'LBL_USER'=>'User', From vtigercrm-commits at vtiger.fosslabs.com Sun Oct 8 22:40:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 05:40:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9588 - /vtigercrm/branches/5.0.1/modules/Settings/AddCustomFieldToDB.php Message-ID: <20061009054005.D426B787F3F@vtiger.fosslabs.com> Author: richie Date: Sun Oct 8 23:40:01 2006 New Revision: 9588 Log: new type Skype added for custom field --Minnie Modified: vtigercrm/branches/5.0.1/modules/Settings/AddCustomFieldToDB.php Modified: vtigercrm/branches/5.0.1/modules/Settings/AddCustomFieldToDB.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Settings/AddCustomFieldToDB.php (original) +++ vtigercrm/branches/5.0.1/modules/Settings/AddCustomFieldToDB.php Sun Oct 8 23:40:01 2006 @@ -225,6 +225,12 @@ $uitype = 33; $type = "X"; //adodb type $uichekdata='V~O'; + } + elseif($fldType == 'Skype') + { + $uitype = 85; + $type = "C(255)"; //adodb type + $uichekdata='V~O'; } // No Decimal Pleaces Handling From vtigercrm-commits at vtiger.fosslabs.com Sun Oct 8 22:49:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 05:49:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9589 - in /vtigercrm/branches/5.0.1: include/js/customview.js modules/Settings/CreateCustomField.php modules/Settings/language/en_us.lang.php Message-ID: <20061009054912.DF6E3787E80@vtiger.fosslabs.com> Author: richie Date: Sun Oct 8 23:49:05 2006 New Revision: 9589 Log: new type Skype added for custom field --Minnie Modified: vtigercrm/branches/5.0.1/include/js/customview.js vtigercrm/branches/5.0.1/modules/Settings/CreateCustomField.php vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php Modified: vtigercrm/branches/5.0.1/include/js/customview.js ============================================================================== --- vtigercrm/branches/5.0.1/include/js/customview.js (original) +++ vtigercrm/branches/5.0.1/include/js/customview.js Sun Oct 8 23:49:05 2006 @@ -120,8 +120,8 @@ } else return false } } -var fieldValueArr=new Array('Text','Number','Percent','Currency','Date','Email','Phone','Picklist','URL','Checkbox','TextArea','MultiSelectCombo'); -var fieldTypeArr=new Array('text','number','percent','currency','date','email','phone','picklist','url','checkbox','textarea','multiselectcombo'); +var fieldValueArr=new Array('Text','Number','Percent','Currency','Date','Email','Phone','Picklist','URL','Checkbox','TextArea','MultiSelectCombo','Skype'); +var fieldTypeArr=new Array('text','number','percent','currency','date','email','phone','picklist','url','checkbox','textarea','multiselectcombo','skype'); var currFieldIdx=0,totFieldType; var focusFieldType; @@ -175,7 +175,7 @@ lengthLayer.style.visibility="visible" decimalLayer.style.visibility="hidden" pickListLayer.style.visibility="hidden" - } else if (type=='date' || type=='email' || type=='phone' || type=='url' || type=='checkbox' || type=='textarea') { + } else if (type=='date' || type=='email' || type=='phone' || type=='url' || type=='checkbox' || type=='textarea' || type=='skype') { getObj("lengthdetails").style.visibility="hidden" decimalLayer.style.visibility="hidden" pickListLayer.style.visibility="hidden" Modified: vtigercrm/branches/5.0.1/modules/Settings/CreateCustomField.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Settings/CreateCustomField.php (original) +++ vtigercrm/branches/5.0.1/modules/Settings/CreateCustomField.php Sun Oct 8 23:49:05 2006 @@ -39,7 +39,8 @@ $image_path."url.gif", $image_path."checkbox.gif", $image_path."text.gif", - $image_path."cfpicklist.gif"); + $image_path."cfpicklist.gif", + $image_path."skype.gif"); $cftextcombo = Array($mod_strings['Text'], $mod_strings['Number'], @@ -52,7 +53,8 @@ $mod_strings['LBL_URL'], $mod_strings['LBL_CHECK_BOX'], $mod_strings['LBL_TEXT_AREA'], - $mod_strings['LBL_MULTISELECT_COMBO'] + $mod_strings['LBL_MULTISELECT_COMBO'], + $mod_strings['Skype'] ); $typeVal = Array( '0'=>'Text', @@ -64,7 +66,8 @@ '6'=>'Phone', '7'=>'Picklist', '8'=>'URL', - '11'=>'MultiSelectCombo'); + '11'=>'MultiSelectCombo', + '12'=>'Skype'); if(isset($fieldid) && $fieldid!='') { $mode='edit'; Modified: vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php Sun Oct 8 23:49:05 2006 @@ -252,6 +252,8 @@ 'PickList'=>'Pick List', 'LBL_MULTISELECT_COMBO'=>'Multi-Select Combo Box', + +'Skype'=>'Skype', From vtigercrm-commits at vtiger.fosslabs.com Sun Oct 8 23:15:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 06:15:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9590 - /vtigercrm/branches/5.0.1/include/CustomFieldUtil.php Message-ID: <20061009061531.24E98787F69@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 00:15:27 2006 New Revision: 9590 Log: new type named Skype added for custom field --Minnie Modified: vtigercrm/branches/5.0.1/include/CustomFieldUtil.php Modified: vtigercrm/branches/5.0.1/include/CustomFieldUtil.php ============================================================================== --- vtigercrm/branches/5.0.1/include/CustomFieldUtil.php (original) +++ vtigercrm/branches/5.0.1/include/CustomFieldUtil.php Mon Oct 9 00:15:27 2006 @@ -73,6 +73,10 @@ { $fldname = 'Multi-Select Combo Box'; } + elseif($uitype == 85) + { + $fldname = 'Skype'; + } $log->debug("Exiting getCustomFieldTypeName method ..."); return $fldname; } @@ -216,6 +220,10 @@ { $fieldtype = '11'; } + elseif($label == 'Skype') + { + $fieldtype = '12'; + } $log->debug("Exiting getFldTypeandLengthValue method ..."); return $fieldtype; } From vtigercrm-commits at vtiger.fosslabs.com Sun Oct 8 23:21:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 06:21:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9591 - /vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php Message-ID: <20061009062102.72980787F69@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 00:20:58 2006 New Revision: 9591 Log: changes made for event end time and for skype customfield integration Modified: vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php Modified: vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php Mon Oct 9 00:20:58 2006 @@ -106,7 +106,8 @@ } else { - $curr_time = date('H:i'); + $endtime = time() + (60 * 60); + $curr_time = date('H:i',$endtime); } } $fieldvalue[] = array($disp_value => $curr_time) ; @@ -152,6 +153,11 @@ $fieldvalue [] = $options; } elseif($uitype == 17) + { + $editview_label[]=$mod_strings[$fieldlabel]; + $fieldvalue [] = $value; + } + elseif($uitype == 85) //added for Skype by Minnie { $editview_label[]=$mod_strings[$fieldlabel]; $fieldvalue [] = $value; From vtigercrm-commits at vtiger.fosslabs.com Sun Oct 8 23:30:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 06:30:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9592 - /vtigercrm/branches/5.0.1/include/utils/DetailViewUtils.php Message-ID: <20061009063056.49BAF787F66@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 00:30:52 2006 New Revision: 9592 Log: changes made for skype customfield integration Modified: vtigercrm/branches/5.0.1/include/utils/DetailViewUtils.php Modified: vtigercrm/branches/5.0.1/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/DetailViewUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/DetailViewUtils.php Mon Oct 9 00:30:52 2006 @@ -933,6 +933,10 @@ $label_fld[] = ''.getRoleName($col_fields[$fieldname]).''; else $label_fld[] = getRoleName($col_fields[$fieldname]); + }elseif($uitype == 85) //Added for Skype by Minnie + { + $label_fld[] =$mod_strings[$fieldlabel]; + $label_fld[]= $col_fields[$fieldname]; } else { From vtigercrm-commits at vtiger.fosslabs.com Sun Oct 8 23:36:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 06:36:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9593 - in /vtigercrm/branches/5.0.1/Smarty/templates: DetailViewUI.tpl DisplayFields.tpl Message-ID: <20061009063646.A2B06787F66@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 00:36:42 2006 New Revision: 9593 Log: changes made for uitype 85-Skype --Minnie Modified: vtigercrm/branches/5.0.1/Smarty/templates/DetailViewUI.tpl vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl Modified: vtigercrm/branches/5.0.1/Smarty/templates/DetailViewUI.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/DetailViewUI.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/DetailViewUI.tpl Mon Oct 9 00:36:42 2006 @@ -117,6 +117,14 @@ {$APP.LBL_CANCEL_BUTTON_LABEL} + {elseif $keyid eq '85'} +  Skype{$keyval} + + {elseif $keyid eq '19' || $keyid eq '20'} {if $label eq $MOD.LBL_ADD_COMMENT} Modified: vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl Mon Oct 9 00:36:42 2006 @@ -274,6 +274,14 @@ + {elseif $uitype eq 85} + + {$fldlabel} + + + Skype + + {elseif $uitype eq 71 || $uitype eq 72} {if $uitype eq 72} From vtigercrm-commits at vtiger.fosslabs.com Sun Oct 8 23:38:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 06:38:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9594 - /vtigercrm/branches/5.0.1/include/js/dtlviewajax.js Message-ID: <20061009063826.BE6EC787F6F@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 00:38:22 2006 New Revision: 9594 Log: changes made for uitype 85-Skype --Minnie Modified: vtigercrm/branches/5.0.1/include/js/dtlviewajax.js Modified: vtigercrm/branches/5.0.1/include/js/dtlviewajax.js ============================================================================== --- vtigercrm/branches/5.0.1/include/js/dtlviewajax.js (original) +++ vtigercrm/branches/5.0.1/include/js/dtlviewajax.js Mon Oct 9 00:38:22 2006 @@ -216,7 +216,10 @@ }else if(uitype == '17') { getObj(dtlView).innerHTML = ""+tagValue+" "; - }else if(uitype == '53') + }else if(uitype == '85') + { + getObj(dtlView).innerHTML = ""+tagValue+" "; + }else if(uitype == '53') { var hdObj = getObj(hdTxt); if(typeof(document.DetailView.assigntype[0]) != 'undefined') From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 00:05:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 07:05:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9595 - /vtigercrm/branches/5.0.1/include/js/dtlviewajax.js Message-ID: <20061009070521.58AFC787F6F@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 01:05:17 2006 New Revision: 9595 Log: code contribution for multiselect combo box integrated --Minnie Modified: vtigercrm/branches/5.0.1/include/js/dtlviewajax.js Modified: vtigercrm/branches/5.0.1/include/js/dtlviewajax.js ============================================================================== --- vtigercrm/branches/5.0.1/include/js/dtlviewajax.js (original) +++ vtigercrm/branches/5.0.1/include/js/dtlviewajax.js Mon Oct 9 01:05:17 2006 @@ -314,6 +314,23 @@ } }else if(uitype == '33') { + /* Wordwrap a long list of multi-select combo box items at the + * item separator string */ + const DETAILVIEW_WORDWRAP_WIDTH = "70"; // must match value in DetailViewUI.tpl. + + var lineLength = 0; + for(var i=0; i < r.length; i++) { + lineLength += r[i].length + 2; // + 2 for item separator string + if(lineLength > DETAILVIEW_WORDWRAP_WIDTH && i > 0) { + lineLength = r[i].length + 2; // reset. + r[i] = '
     ' + r[i]; // prepend newline. + } + // Prevent a browser splitting multiword items: + r[i] = r[i].replace(/ /g, ' '); + } + /* Join items with item separator string (which must match string in DetailViewUI.tpl, + * EditViewUtils.php and CRMEntity.php)!! + */ getObj(dtlView).innerHTML = r.join(", "); }else { From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 00:09:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 07:09:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9596 - in /vtigercrm/branches/5.0.1/themes: alphagrey/images/skype.gif bluelagoon/images/skype.gif woodspice/images/skype.gif Message-ID: <20061009070941.CA1E8787F6F@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 01:09:32 2006 New Revision: 9596 Log: skype image added --Minnie Added: vtigercrm/branches/5.0.1/themes/alphagrey/images/skype.gif (with props) vtigercrm/branches/5.0.1/themes/bluelagoon/images/skype.gif (with props) vtigercrm/branches/5.0.1/themes/woodspice/images/skype.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 00:17:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 07:17:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9597 - /vtigercrm/branches/5.0.1/modules/Notes/Save.php Message-ID: <20061009071709.EF861787F74@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 01:17:06 2006 New Revision: 9597 Log: code given by DG has been integrated -- Minnie Modified: vtigercrm/branches/5.0.1/modules/Notes/Save.php Modified: vtigercrm/branches/5.0.1/modules/Notes/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/Save.php Mon Oct 9 01:17:06 2006 @@ -85,6 +85,30 @@ 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'] != '') From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 00:20:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 07:20:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9598 - /vtigercrm/branches/5.0.1/include/utils/CommonUtils.php Message-ID: <20061009072008.24B06787F74@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 01:20:03 2006 New Revision: 9598 Log: code given by DG has been integrated -- Minnie Modified: vtigercrm/branches/5.0.1/include/utils/CommonUtils.php Modified: vtigercrm/branches/5.0.1/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/CommonUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/CommonUtils.php Mon Oct 9 01:20:03 2006 @@ -600,9 +600,6 @@ /** * Get the username by giving the user id. This method expects the user id - * param $label_list - the array of strings to that contains the option list - * param $key_list - the array of strings to that contains the values list - * param $selected - the string which contains the default value */ function getUserName($userid) @@ -620,6 +617,29 @@ } $log->debug("Exiting getUserName method ..."); return $user_name; +} + +/** +* Get the user full name by giving the user id. This method expects the user id +* DG 30 Aug 2006 +*/ + +function getUserFullName($userid) +{ + global $log; + $log->debug("Entering getUserFullName(".$userid.") method ..."); + $log->info("in getUserFullName ".$userid); + global $adb; + if($userid != '') + { + $sql = "select first_name, last_name from vtiger_users where id=".$userid; + $result = $adb->query($sql); + $first_name = $adb->query_result($result,0,"first_name"); + $last_name = $adb->query_result($result,0,"last_name"); + $user_name = $first_name." ".$last_name; + } + $log->debug("Exiting getUserFullName method ..."); + return $user_name; } /** From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 00:41:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 07:41:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9599 - /vtigercrm/branches/5.0.1/modules/Migration/ModifyDatabase/42P2_to_50.php Message-ID: <20061009074157.6DF15787F81@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 01:41:53 2006 New Revision: 9599 Log: * Added changes to update activity end time based on start time and duration - hours and munutes Modified: vtigercrm/branches/5.0.1/modules/Migration/ModifyDatabase/42P2_to_50.php Modified: vtigercrm/branches/5.0.1/modules/Migration/ModifyDatabase/42P2_to_50.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Migration/ModifyDatabase/42P2_to_50.php (original) +++ vtigercrm/branches/5.0.1/modules/Migration/ModifyDatabase/42P2_to_50.php Mon Oct 9 01:41:53 2006 @@ -3405,7 +3405,7 @@ $taxres = $conn->query("select taxid from vtiger_inventorytaxinfo where taxlabel='".addslashes($taxlabel)."'"); $taxid = $conn->query_result($taxres,0,'taxid'); - $taxquery = "insert into vtiger_producttaxrel ($productid, \"$taxid\", '0.00')"; + $taxquery = "insert into vtiger_producttaxrel values($productid, \"$taxid\", '0.00')"; //Execute($taxquery); $conn->query($taxquery); } @@ -3555,6 +3555,7 @@ //changes made for CustomView and Reports - Activities changed to Calendar -- Starts //Added to change the entitytype from Activities to Calendar for customview +Execute("update vtiger_crmentity set setype='Calendar' where setype='Activities'"); Execute("update vtiger_customview set entitytype='Calendar' where entitytype='Activities'"); //Added to change the primarymodule from Activities to Calendar for Reports @@ -3722,6 +3723,48 @@ Execute("insert into vtiger_postatus values('','Received Shipment',$sortorderid,1)"); +//Added after 5.0 GA release +//CALCULATE Activity End Time (time_end) +//we have to calculate activity end time (time_end) based on start time (time_start) and duration (duration_hours, duration_minutes) +$sql = "select * from vtiger_activity"; +$result = $conn->query($sql); +$num_rows = $conn->num_rows($result); +for($i=0;$i<$num_rows;$i++) +{ + //First we have to retrieve the time_start, duration_hours and duration_minutes and form as a date with time + $activityid = $conn->query_result($result,$i,'activityid'); + $date_start = $conn->query_result($result,$i,'date_start'); + $time_start = $conn->query_result($result,$i,'time_start'); + $duration_hours = $conn->query_result($result,$i,'duration_hours'); + $duration_minutes = $conn->query_result($result,$i,'duration_minutes'); + + if($duration_hours != '' && $duration_minutes != '') + { + $date_details = explode("-",$date_start); + $start_year = $date_details[0]; + $start_month = $date_details[1]; + $start_date = $date_details[2]; + + $start_details = explode(":",$time_start); + $start_hour = $start_details[0]; + $start_minutes = $start_details[1]; + + $full_duration = "$duration_hours:$duration_minutes:00"; + + $start = date("Y-m-d H:i:s",mktime($start_hour, $start_minutes, 0, $start_month, $start_date, $start_year)); + $end = date("Y-m-d H:i:s",mktime($start_hour+$duration_hours, $start_minutes+$duration_minutes, 0, $start_month, $start_date, $start_year)); + + $end_details = explode(" ",$end); + $due_date = $end_details[0]; + + $end_time_details = explode(":",$end_details[1]); + $time_end = $end_time_details[0].":".$end_time_details[1]; + + $update_query = "update vtiger_activity set due_date=\"$due_date\", time_end=\"$time_end\" where activityid=$activityid"; + + $conn->query($update_query); + } +} From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 02:02:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 09:02:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9600 - in /vtigercrm/branches/5.0.1/install: 0welcome.php 2setConfig.php 4createConfigFile.php 5createTables.php Message-ID: <20061009090200.BB066787F84@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 03:01:54 2006 New Revision: 9600 Log: version changed from 5.0.0 to 5.0.1 Modified: vtigercrm/branches/5.0.1/install/0welcome.php vtigercrm/branches/5.0.1/install/2setConfig.php vtigercrm/branches/5.0.1/install/4createConfigFile.php vtigercrm/branches/5.0.1/install/5createTables.php Modified: vtigercrm/branches/5.0.1/install/0welcome.php ============================================================================== --- vtigercrm/branches/5.0.1/install/0welcome.php (original) +++ vtigercrm/branches/5.0.1/install/0welcome.php Mon Oct 9 03:01:54 2006 @@ -97,10 +97,10 @@ -

           This Configuration Wizard will create vtiger CRM 5.0.0 databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready. +

           This Configuration Wizard will create vtiger CRM 5.0.1 databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready.

    -

    - vtiger CRM 5.0.0 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.

    -

    vtiger CRM 5.0.0 will not work on mysql 4.0.x versions

    vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements
    +

    - vtiger CRM 5.0.1 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.

    +

    vtiger CRM 5.0.1 will not work on mysql 4.0.x versions

    vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements

    The installation wizard will guide you with the installation regardless of the setup you may have. Modified: vtigercrm/branches/5.0.1/install/2setConfig.php ============================================================================== --- vtigercrm/branches/5.0.1/install/2setConfig.php (original) +++ vtigercrm/branches/5.0.1/install/2setConfig.php Mon Oct 9 03:01:54 2006 @@ -99,7 +99,7 @@ elseif (isset($dbconfig['db_name']) && $dbconfig['db_name']!='_DBC_NAME_') $db_name = $dbconfig['db_name']; else - $db_name = 'vtigercrm5'; + $db_name = 'vtigercrm501'; !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; if (isset($_REQUEST['host_name'])) $host_name = $_REQUEST['host_name']; @@ -145,7 +145,7 @@ } else { !isset($_REQUEST['db_hostname']) ? $db_hostname = $hostname: $db_hostname = $_REQUEST['db_hostname']; - !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm5" : $db_name = $_REQUEST['db_name']; + !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm501" : $db_name = $_REQUEST['db_name']; !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; !isset($_REQUEST['host_name']) ? $host_name= $hostname : $host_name= $_REQUEST['host_name']; !isset($_REQUEST['site_URL']) ? $site_URL = $web_root : $site_URL = $_REQUEST['site_URL']; Modified: vtigercrm/branches/5.0.1/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/5.0.1/install/4createConfigFile.php (original) +++ vtigercrm/branches/5.0.1/install/4createConfigFile.php Mon Oct 9 03:01:54 2006 @@ -45,8 +45,8 @@ // vtiger CRM version number; do not edit! -$vtiger_version = "5.0.0"; -$release_date = "14 September 2006"; +$vtiger_version = "5.0.1"; +$release_date = "10 October 2006"; if (isset($_REQUEST['db_hostname'])) Modified: vtigercrm/branches/5.0.1/install/5createTables.php ============================================================================== --- vtigercrm/branches/5.0.1/install/5createTables.php (original) +++ vtigercrm/branches/5.0.1/install/5createTables.php Mon Oct 9 03:01:54 2006 @@ -120,10 +120,10 @@ ?> - +
    '; $field_name=$entity_id."_listprice"; - $list_body .= ''; + $list_body .= ''; $list_body .= ''; $list_body .= ''; - $list_body .= ''; + $list_body .= ''; $list_body .= ''; } - + } Modified: vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php Mon Oct 9 06:21:32 2006 @@ -46,6 +46,8 @@ { $list_query .= ' ORDER BY '.$order_by.' '.$sorder; } + +$list_query .= " group by vtiger_crmentity.crmid"; $list_result = $adb->query($list_query); $num_rows = $adb->num_rows($list_result); @@ -66,7 +68,7 @@ //Buttons Add To PriceBook and Cancel $other_text = '
    - vtigercrm-5.0.0 is all set to go! + vtigercrm-5.0.1 is all set to go!
      From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 02:17:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 09:17:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9601 - /vtigercrm/branches/5.0.1/vtigerversion.php Message-ID: <20061009091707.729BE787F88@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 03:17:02 2006 New Revision: 9601 Log: patch 1 for 5.0.0 Modified: vtigercrm/branches/5.0.1/vtigerversion.php Modified: vtigercrm/branches/5.0.1/vtigerversion.php ============================================================================== --- vtigercrm/branches/5.0.1/vtigerversion.php (original) +++ vtigercrm/branches/5.0.1/vtigerversion.php Mon Oct 9 03:17:02 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -$patch_version = ''; +$patch_version = '1'; $modified_database = ''; $vtiger_current_version = '5.0.0'; ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 04:28:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 11:28:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9602 - /vtigercrm/branches/5.0.1/modules/uploads/add2db.php Message-ID: <20061009112842.A2D45787EBB@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 05:28:39 2006 New Revision: 9602 Log: DG code contibution integrated --Minnie Modified: vtigercrm/branches/5.0.1/modules/uploads/add2db.php Modified: vtigercrm/branches/5.0.1/modules/uploads/add2db.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/uploads/add2db.php (original) +++ vtigercrm/branches/5.0.1/modules/uploads/add2db.php Mon Oct 9 05:28:39 2006 @@ -11,11 +11,14 @@ require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); +require_once('include/logging.php'); +global $log; global $current_user; $vtigerpath = $_SERVER['REQUEST_URI']; $vtigerpath = str_replace("/index.php?module=uploads&action=add2db", "", $vtigerpath); $crmid = $_REQUEST['return_id']; +$log->debug("DGDEBUG In add2db.php"); // Arbitrary File Upload Vulnerability fix - Philip $binFile = $_FILES['filename']['name']; @@ -53,6 +56,48 @@ $query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."',".$date_var.")"; $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']); + 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"); + $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); + $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"); + # 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); + if ($dg_size == $filesize) + { + # Yup, it is probably the same file + $associated_account = ''; + } + } + } + else + { + $associated_account = ''; + } + } + # 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); @@ -61,6 +106,17 @@ $sql1 = "insert into vtiger_seattachmentsrel values('"; $sql1 .= $crmid."','".$current_id."')"; $result = $adb->query($sql1); + + # Added by DG 26 Oct 2005 + # Attachments added to contacts are also added to their accounts + if ($associated_account) + { + $log->debug("DGDEBUG: 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); + } echo ''; } From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 04:57:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 11:57:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9603 - /vtigercrm/branches/5.0.1/Release_Notes.html Message-ID: <20061009115740.2C672787F85@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 05:57:30 2006 New Revision: 9603 Log: Release notes 5.0.1 Modified: vtigercrm/branches/5.0.1/Release_Notes.html Modified: vtigercrm/branches/5.0.1/Release_Notes.html ============================================================================== --- vtigercrm/branches/5.0.1/Release_Notes.html (original) +++ vtigercrm/branches/5.0.1/Release_Notes.html Mon Oct 9 05:57:30 2006 @@ -1,3711 +1,3787 @@ - -vtiger CRM 5 Beta: Release Notes - - - - - -

      -

      vtiger CRM 5.0.0: Release Notes

      -

      Date: Sep 14, 2006

      -

      Welcome to vtiger CRM!

      -

      vtiger CRM is an enterprise-ready open source CRM solution for managing sales, marketing, customer support and order management functions effectively. Before version 5 release, vtiger CRM has passed through more than 10 development cycles.

      -

      Table of Contents

      -
        -
      1. Summary
      2. -
      3. Features
      4. -
      5. Bug Fixes
      6. -
      7. Known Issues
      8. -
      -

      1. Summary

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. NoItemStatus
      1 Features -  
      2Product SizePlatform Independent - 6.1 MB
      -
      Windows (EXE) - 26 MB
      - Linux (BIN) - 40 MB
      3Database MigrationAvailable for migrating data from 4.2.3 , 4.2.4, or 5.0 RC to v5.0
      4Product Download Click Here
      5vtiger CRM - PHP Documentation URL: Click Here
      6Product Documentation

      Available at the Wiki

      -

      2. Features

      -
        -
      • AJAX based User Interface
      • -
      • Color Schemes
      • -
      • Enterprise-grade Security Management
      • -
      • Calendaring
      • -
      • Email Client
      • -
      • Customization
      • -
      • Reports & Dashboard
      • -
      • Order Management
      • -
      • Marketing Automation
      • -
      -

      For more details refer to: http://www.vtiger.com/products/crm/v5-release-notes.pdf

      -

      3. Bug Fixes

      -

      We have fixed about 200 issues after v5 RC release. For more details, kindly refer to the vtiger CRM Bug Tracker.

      -

      4. Known Issues

      -

      As on Sep 14, 2006 there are about 178 open issues. For more details, kindly refer to the vtiger CRM Bug Tracker:

      -
      -

      vtiger CRM 5.0 RC1: Release Notes

      -

      Date: Aug 14, 2006

      -

      vtiger CRM 5.0 RC1, is ready for the last-round of validation before GA release!

      -

      Last few days, we have worked hard to make vtiger CRM more user friendly, bug free, and ready for real-time deployment. We thank our community members who spent their valuable time & energy with us and making the RC release successful.

      -

      We have few bugs remained in our basket and there are some formalities need to be completed before announcing the public release for the real time deployments. In the meantime, kindly help us by reporting bugs that you might have encountered in RC release version. Your suggestions and feedback will definitely help us providing a smooth transition from v4.2.x to next the generation vtiger CRM.

      -

      Major changes in the current update are new "woodspice" theme, calendar enhancements, fully customizable tax calculations, and re-desigend post-installation configuration wizard. We have also fixed about 350 bugs after version 5 Beta 2 release.

      -

      IMPORTANT NOTES:

      -
        -
      • We strongly recommend CRM community NOT to USE vtiger CRM 5 RC1 for any deployments. In case you are looking for an immediate CRM solution for your business, please consider using the vtiger CRM 4.2.3 (latest stable version), which can be downloaded from vtiger.com.
      • -
      • Database migration script is provided for migrating data from v4.2.3 to v5 RC1 only for testing purpose. Hence users are strongly recommended to take a backup of the the v4.2.3 data before testing the migration scripts.
      • -
      • Database migration script is not provided for migrating data from v 5 Beta releases to v5 RC1. Hence users are strongly recommended to take a backup of the the v 5 Beta data before testing the migration script.
      • -
      -

      Appeal to Developers, Testers, Analysts, Writers, and real end users!

      -

      Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 RC1,

      -

      Step 1: Browse through Live Demo

      -

      Step 2: Download product from the vtiger.com and install in your favorite OS.

      -

      Step 3: Post your suggestions & comments at vtiger Discussions under : vtiger CRM 5.x category

      -

      Table of Contents

      -
        -
      1. Summary
      2. -
      3. Features
      4. -
      5. Bug Fixes
      6. -
      7. Known Issues
      8. -
      -

      1. Summary

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. NoItemStatus
      1 Features -

      10

      3Product SizePlatform Independent - 5.6 MB
      -
      Windows (EXE) - 26 MB
      - Linux (BIN) - 40 MB
      4Database MigrationAvailable only for the Testing Purpose. Data (Migration script from v4.2.3 to v5 RC1)
      5vtiger CRM - PHP Documentation URL: Click Here
      6Product Documentation

      Available at the Wiki

      -

      2. Features

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. No Feature
      1Customizable tax calculations for quotes, orders, and invoices.
      2Add new values to the Status field in Inventory, Potentials, and FAQ modules -.
      3PO, SO, Invoice - Status and Quote Stage history.
      4Manage product wise discounts and grand discount while generating quotes, orders, and invoices.
      5Manage individual or group taxes.
      6Adding same product more than once in line items list.
      7Attach documents to the tickets.
      8Add negative adjustments in quotes, orders, and invoices .
      9Enhancements in Live Chat tool.
      10Unsubscribe form in compliance with CAN Spam act.
      -

       

      - - - - - - -
      -

      Note:

      -

      Configuring Web services to update Publicly traded company profiles (With Ticker symbol in Accounts) In Account module, if ticker symbol is specified, company profile will be displayed on top of Edit view page. For this specify the server name, port number, user name and password has in class_http/class_http.php under <vtiger CRM Home> directory.

      -

      Line: 166

      -

      Assign values to the given variables: $server,$port,$user,$pwd

      -

      Bug Fixes

      -

      We have fixed about 350 issues after v5 Beta 2 release. For more details, kindly refer to the vtiger CRM Bug Tracker:

      -

      http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&group=owner&version=5.0.0&order=priority

      -

      4. Known Issues

      -

      As on Aug 13, 2006 there are about 100 open issues. For more details, kindly refer to the vtiger CRM Bug Tracker:

      -

      http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&status=assigned&status=reopened&group=owner&version=5.0.0&order=priority

      -
      -

      vtiger CRM 5.0 Beta 2: Release Notes

      -

      Date: July 05, 2006

      -

      vtiger CRM 5.0 Beta 2 release is ready for end-user community testing. The intent of this release is to showcase to the vtiger community, the significant changes made after v5 Beta release i.e., changes since May, 06'. The noteworthy features in v5 Beta 2 are New user interface for Settings module, Audit Trails as part of the security management, complete Web mail integration (including Outgoing and Incoming mail capability), edit custom fields, enhanced user interface for Calendar, optimized the database queries further for List Views function in all the modules, and others.

      -

      IMPORTANT NOTES:

      -
        -
      • We strongly recommend CRM community NOT to USE vtiger CRM 5 Beta 2 for any real-time deployments. In case you are looking for an immediate CRM solution for your business, please consider using the vtiger CRM 4.2.3 (latest stable version), which can be downloaded from vtiger.com.
      • -
      • vtiger CRM user interface can be best viewed in Mozilla/Firefox. We have some page loading page formatting issues in Internet Explorer, which will be fixed very soon.
      • -
      • JpGraph used for generating dashboards has been replaced by ImageGraph, a third party charting software.
      • -
      • Database migration script is provided for migrating data from v4.2.3 to v5 Beta 2 only for testing purpose. Hence users are strongly recommended to take a backup of the the v4.2.3 data before testing the migration script.
      • -
      • Database migration script is not provided for migrating data from v 5 Beta to v5 Beta 2. Hence users are strongly recommended to take a backup of the the v 5 Beta data before testing the migration script.
      • -
      -

      Appeal to Developers, Testers, Analysts, Writers, and real end users!

      -

      Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 Beta 2,

      -

      Step 1: Browse through Live Demo

      -

      Step 2: Download product from the vtiger.com and install in your favorite Operating System.

      -

      Step 3: Post your suggestions & comments at vtiger Discussions under : vtiger CRM 5.x category

      -

      Table of Contents

      -
        -
      1. Summary
      2. -
      3. Features
      4. -
      5. Bug Fixes
      6. -
      7. Known Issues
      8. -
      -

      1. Summary

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. NoItemStatus
      1 Features -

      12

      3Product SizePlatform Independent - 5.2 MB
      -
      Windows (EXE) - 26 MB
      - Linux (BIN) - 40 MB
      4Database MigrationAvailable only for the Testing Purpose. Data (Migration script from v4.2.3 to v5 Beta 2)
      5vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click Here
      6Product Documentation

      Available at the Wiki

      -

      2. Features

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. No Feature
      1Proxy Server configuration for accessing RSS feeds and information based on Ticker Symbol
      2Vertical bar chart in Home page
      3Security Management support for Emails module
      4Database table prefix support for a deploying vtiger CRM in other working databases
      5Audit Trial support for tracking all users system access details
      6Last 5 records visited
      7New User interface for Settings module
      8Print Report function
      9Email Detail View from Related List
      10Attach multiple documents to email message
      11Delete option for Tag cloud
      12AJAX based edit option for User details
      -

       

      - - - - - - -
      -

      Note:

      -

      Configuring Web services to update Publicly traded company profiles (With Ticker symbol in Accounts) In Account module, if ticker symbol is specified, company profile will be displayed on top of Edit view page. For this specify the server name, port number, user name and password has in class_http/class_http.php under <vtiger CRM Home> directory.

      -

      Line: 166

      -

      Assign values to the given variables: $server,$port,$user,$pwd

      -

      Bug Fixes

      -

      We have fixed about 1000 issues after v5 Beta release. For more details, kindly refer to the vtiger CRM Bug Tracker:

      -

      http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&group=owner&version=5.0.0&order=priority

      -

      4. Known Issues

      -

      As on July 5, 2006 there are about 100 open issues. For more details, kindly refer to the vtiger CRM Bug Tracker:

      -

      http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&status=assigned&status=reopened&group=owner&version=5.0.0&order=priority

      -
      -

      vtiger CRM 5.0 Beta: Release Notes

      -

      Date: May 31, 2006

      -

      vtiger CRM 5.0 Beta release is ready for end-user community testing. The intent of this release is to showcase to the vtiger community, the significant changes made after v5 Alpha 5 release i.e., changes since Apr , 06' . The noteworthy features in v5 Beta are complete Web mail integration (including Outgoing and Incoming mail capability), Office Plugin, Outlook Plugin, Customer Portal, Web-Forms, Firefox Toolbar, - - - edit custom fields, - -new user interface for Calendar, optimized the database queries for List Views function in all the modules, and others. In addition to this, we have  conducted performance testing for some of the modules using a popular Web Based Testing Software (AdventNet QEngine 6.0), which helped us to identify some of the bottlenecks in performance. We have also published the Performance Testing reports. We thank AdventNet for permitting us to make use of this interesting software and we gladly recommend it to everyone too, not because AdventNet allowed us to use it but because it is really good.

      -

      Note:

      -

      IMPORTANT NOTES:

      -
        -
      • We strongly recommend CRM community NOT to USE vtiger CRM 5 Beta for any real-time deployments. In case you are looking for an immediate CRM solution for your business, please consider using the vtiger CRM 4.2.3 (latest stable version), which can be downloaded from vtiger.com.
      • -
      • vtiger CRM user interface can be best viewed in Mozilla/Firefox. We have some page loading page formatting issues in Internet Explorer, which will be fixed very soon.
      • -
      • JpGraph used for generating dashboards has been replaced by ImageGraph, a third party charting software.
      • -
      • Database migration script is provided for migrating data from v4.2.3 to v5 Beta only for testing purpose. Hence users are strongly recommended to take a backup of the the v4.2.3 data before testing the migration script.
      • -
      -

      Appeal to Developers, Testers, Analysts, Writers, and real end users!

      -

      Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 Beta,

      -

      Step 1: Browse through Live Demo

      -

      Step 2: Download product from the vtiger.com and install in your favorite Operating System.

      -

      Step 3: Post your suggestions & comments at vtiger Discussions under : vtiger CRM 5.x category

      -

      Table of Contents

      -
        -
      1. Summary
      2. -
      3. Features
      4. -
      5. Known Issues
      6. -
      -

      1. Summary

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. NoItemStatus
      1 Features -

      28

      3Product SizePlatform Independent - 5.0 MB
      -
      Windows (EXE) - 26 MB
      - Linux (BIN) - 40 MB
      4Database MigrationAvailable only for the Testing Purpose. Data (Migration script from v4.2.3 to v5 Beta)
      5vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click Here
      6Product Documentation
      -

      2. Features

      - -
        -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S.NoFeature
      1Organization Hierarchy (Roles) can be defined using tree based structure
      2Recalculate sharing rules option is provided
      3Security Support for Campaigns module
      4Security Support for Ajax actions done
      5Role selection popup integrated.
      6Duplicate handling for Roles, Profiles and Groups done
      7Module and record-level security support for Create/Edit/Duplicate/Delete Mass Delete, Mass Change Owner, Mass Change Status functions
      8Security Support for Quick Create functions
      9Security Support for Lookup
      10Security Support for Settings module
      11Security Support for Convert Lead feature
      12Email Templates are fully functional with merge field value substitution for Leads, Contacts, Accounts, and Users Modules
      13Module and Record Level Security implemented for Mass Delete, Change Owner & Change Status Buttons across product
      14Internationalization of the product across all modules
      15Smarty templates are used for My Preferences / List Mail Server
      16Option to create Multi select combo-box in Custom Field
      17Option to edit custom fields
      18Calendar module is completely redesigned
      19List View, Detail View and Edit View queries are optimized for a better performance
      20New user interface for Currency Configuration and Custom Field Settings
      21New user interface for Convert Lead function
      22Log entry for all functions are incorporated
      23AJAXified New Email functionality
      24New user interface for Reports
      25New user interface for MySites
      26New user interface for Attachments
      27New RSS reader has been integrated for a better performance
      28Mass Change owner option in various modules
      29Inventory Revamped
      30Advanced and Basic Search UI changed
      31Automatic Tax Calculator Integrated
      32Pagination to the related list added
      33Migration support from 4.2.3 to 5.0 Beta Integrated
      -

       

      - - - - - - -
      -

      Note:

      -

      1. Configuring Web services to update Publicly traded company profiles (With Ticker symbol in Accounts) In Account module, if ticker symbol is specified, company profile will be displayed on top of Edit view page. For this specify the server name, port number, user name and password has in class_http/class_http.php under <vtiger CRM Home> directory.

      -

      Line: 166

      -

      Assign values to the given variables: $server,$port,$user,$pwd

      -

      3. Known Issues

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S.NoKnown Issue
      1While creating a new e-mail using the e-mail template, the values for the fields will not appear in the e-mail
      2Web mail has been moved from ajax/js to prototype framework
      3 Error are not handled properly in Web mail module
      4 Attachments will not work properly in Web mail module
      5 When deleting the groups, the ownership of the records that are owned by the group that is being deleted should be changed. This functionality is not handled in v5 Beta
      6 When the data of a group is shared with other users/groups, the  records owned by the sub groups users will be shared properly but the records owned by the sub-group will not be shared
      7 PHP 5 related exception while saving a ticket or potential
      8 Security support not done for New Emails Module
      9Security implementation in Custom View, Reports, Dashboards has some issues
      10 Detail View Ajax edit has security issues
      11 Security support for Calendar is not done
      12 Security is not implemented in import and export queries
      13 Home Page Security Support has issues
      14 Form Validation for Notes non-functional
      15 Events Scheduled after more than 1 hour gets displayed only at the start of the Hour - Calendar
      16 Navigation missing in mini calendar
      17 While editing the custom field, the field length and type are mismatched
      18 custom field create Pop UI is not proper in IE browser
      19 Send reminder will not work for To do
      20 In campaign related list we have shown the newly created contacts and leads. but in Contact and Lead related list we are not showing the campaign relationship. i.e.., in contact and lead related list there is no table for campaigns. whether we should show this relationship or is this the expected behavior?
      21 In the week calendar you can create event for any old day (even for year 2005). It is better to have a date validation.
      22 From a entity detail view, if we click on edit button then the edit view page shows. now there is one more tan more information. if i click on that tab it shows the related list now if we click on Entity information it goes to detail view instead of edit view
      23 If i add a to do it is not showing the to do list instead it is showing the Events
      24 Not able to delete template documents if there is not more that one
      25 All file types are allowed while uploading template documents
      26Multiple attachments is not supported in Emails
      27 Export to excel is not working in PHP5
      -
      -

      vtiger CRM 5.0 Alpha 5: Release Notes

      -

      Date: April 07, 2006

      -

      vtiger CRM 5.0 release is another release in v5 alpha release cycle, which is currently in active development phase. The intent of this release is to showcase to the vtiger community, the significant changes made after v5 Alpha 4 release i.e., changes since Mar 31, 06' . The noteworthy features in v5 Alpha 5 are new user interface for Company Information, Email templates, Company information, Outgoing mail server, Announcements, RSS, optimized the database queries for List Views function in all the modules, and others. In addition to this, we have  conducted performance testing for some of the modules using a popular Web Based Testing Software (AdventNet QEngine 6.0), which helped us to identify some of the bottlenecks in performance. We will publish the performance reports soon. We thank AdventNet for permitting us to make use of this interesting software and we gladly recommend it to everyone too, not because AdventNet allowed us to use it but because it is really good.

      -

      IMPORTANT NOTES:

      -
        -
      • We strongly recommend CRM community NOT to USE vtiger CRM 5 Alpha 5 for any real-time deployments. In case you are looking for an immediate CRM solution for your business, please consider using the vtiger CRM 4.2.3 (latest stable version), which can be downloaded from vtiger.com.
      • -
      • JpGraph used for generating dashboards has been replaced by ImageGraph, a third party charting software.
      • -
      • Database migration script is provided for migrating data from v4.2.3 to v5 Alpha 5 only for testing purpose. Hence users are strongly recommended to take a backup of the the v4.2.3 data before testing the migration script.
      • -
      -

      Appeal to Developers, Testers, Analysts, Writers, and real end users!

      -

      Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 Alpha 5,

      -

      Table of Contents

      -
        -
      1. Summary
      2. -
      3. Features
      4. -
      5. Bug Fixes
      6. -
      7. Known Issues
      8. -
      -

      1. Summary

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. NoItemStatus
      1 Features -

      15

      2Bug Fixes 2
      3Product SizePlatform Independent - 5.3 MB
      -
      Windows (EXE) - 26 MB
      - Linux (BIN) - 40 MB
      4Database MigrationAvailable only for the Testing Purpose. Data (Migration script from v4.2.3 to v5 alpha 5)
      5vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click Here
      6Product Documentation
      -

      2. Features

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. NoFeature
      1 Smarty template applied to Currency Configuration Feature
      2 List View feature database queries are optimized for all the modules
      3 PHP API documentation for some of the major functions
      4 New module called Marketing is added. Campaigns module is now part of Marketing primary module.
      5 AJAXified Notification Schedulers
      6 AJAXified Inventory Notifications
      7 AJAXified Picklist Settings
      8 AJAXified Assign Module Owners
      9 New UI for Integration of Mail Merge Templates
      10 New UI for Company Information
      11 New UI for Outgoing Mail Server
      12 New UI for Backup Server Configuration
      13 New UI for Terms and Conditions
      14 New UI for Announcements
      15 New UI for RSS module
      -

       

      - - - - - - -
      -

      Note:

      -

      1. Configuring Web services to update Publicly traded company profiles (With Ticker symbol in Accounts) In Account module, if ticker symbol is specified, company profile will be displayed on top of Edit view page. For this specify the server name, port number, user name and password has in class_http/class_http.php under <vtiger CRM Home> directory.

      -

      Line: 166

      -

      Assign values to the given variables: $server,$port,$user,$pwd

      -

      Bug Fixes

      - - - - - - - - - - - - - - - - - - -
      SL No. Ticket ID Description
      1 - There seems to be two "search in emails" icons on the email page
      2 - Quick create drop down menu enabled.
      -

      3. Known Issues

      -
        -
      • While creating a new e-mail using the e-mail template, the values for the fields will not appear in the e-mail
      • -
      • Webmail has been moved from ajax/js to prototype framework
      • -
      • Error are not handled properly in Webmail module
      • -
      • Attachments will not work properly in Webmail module
      • -
      • When deleting the groups, the ownership of the records that are owned by the group that is being deleted should be changed. This functionality is not handled in v5 Alpha 5
      • -
      • When the data of a group is shared with other users/groups, the  records owned by the sub groups users will be shared properly but the records owned by the sub-group will not be shared
      • -
      • PHP 5 related exception while saving a ticket or potential
      • -
      -
      -

      vtiger CRM 5.0 Alpha 4: Release Notes

      -

      Date: March 31, 2006

      -

      vtiger CRM 5.0 Alpha 4 release is currently in active development phase. The - intent of this release is to showcase to the vtiger community, the significant - changes made after v5 Alpha 3 release i.e., changes since Mar 21, 06' . The - noteworthy features in v5 Alpha 3 are create database for vtiger CRM online - through Configuration Wizard, edit custom fields,and so others. In addition, - we are also supporting much awaited PHP 5 and MySQL 5.1.x database. - Please note, the vtiger CRM 5 Alpha 4 will not work with MySQL 4.0.x.
      -

      -

      NOTE: We strongly recommend CRM community NOT to USE vtiger CRM 5 - Alpha 4 for real-time deployment. In case you are looking for an immediate - CRM solution for your business, please consider using the vtiger CRM 4.2.3 - (latest stable version), which can be downloaded from vtiger.com.

      -

      Appeal to Developers, Testers, Analysts, Writers, and end users! -

      -

      Jump-start to vtiger Public Discussions and post your valuable suggestions - & comments to help us deliver a world class open source CRM for you in another - few weeks time. It is very simple,

      -

      Table of Contents

      -
        -
      1. Summary
      2. -
      3. Features
      4. -
      -

      1. Summary

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. NoItemStatus
      1 Features -

      8

      -
      2 Product SizePlatform Independent - 8.3 MB
      -
      Windows (EXE) - 28 MB
      - Linux (BIN) - 43 MB
      3Database MigrationNot Available
      4vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click - Here
      5 Product DocumentationAvailable at the Wiki
      -

      2. Features

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. NoFeature
      1 Support for PHP5
      2 Support for MySQL 5
      3 Removed duplicate code base
      4 Removed junk methods in code base
      5Product API cleanup operation initiated
      6Optimized the product performance a bit by restricting the - database queries, used flat files to store commonly used data instead of - repeated database queries.
      7Create database for vtiger CRM online through Configuration - Wizard
      8Modify custom fields
      -

       

      - - - - - - -
      -

      Note:

      -

      1. Configuring Web services to update Publicly traded company profiles - (With Ticker symbol in Accounts) In Account module, if ticker symbol - is specified, company profile will be displayed on top of Edit view page. - For this specify the server name, port number, user name and password - has in class_http/class_http.php under <vtiger CRM Home> directory.

      -

      Line: 166

      -

      Assign values to the given variables: $server,$port,$user,$pwd

      -
      -

      3. Known Issues

      -
        -
      • Dashboards feature will not function in Alpha 4 because of PHP 5 support. - We are working with an alternative graphs package, which will be available - during next update.
      • -
      -
      -

      vtiger CRM 5.0 Alpha 3: Release Notes

      -

      Date: March 21, 2006

      -

      vtiger CRM 5.0 Alpha 3 release is currently in active development phase. The - intent of this release is to showcase to the vtiger community, the significant - changes made after v5 Alpha 2 release i.e., changes since Feb 28, 06' . The - noteworthy features in v5 Alpha 3 are enhanced user interface for Home page, - security scope for reports and dashboards, integration of AJAX based Chat application, - new user interface for System Administration, global search function for all - the modules, tag based grouping of the records, and so forth. In addition, we - are also supporting much awaited MySQL 5.0.19 and MySQL 4.1.x - database systems. Please note, the vtiger CRM 5 Alpha 3 will not work with MySQL - 4.0.x.
      -

      -

      NOTE: We strongly recommend CRM community NOT to USE vtiger CRM 5 - Alpha 3 for real-time deployment. In case you are looking for an immediate - CRM solution for your business, please consider using the vtiger CRM 4.2.3 - (latest stable version), which can be downloaded from vtiger.com.

      -

      Appeal to Developers, Testers, Analysts, Writers, and end users! -

      -

      Jump-start to vtiger Public Discussions and post your valuable suggestions - & comments to help us deliver a world class open source CRM for you in another - few weeks time. It is very simple,

      -

      Table of Contents

      -
        -
      1. Summary
      2. -
      3. Features
      4. -
      -

      1. Summary

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. NoItemStatus
      1 Features -

      23

      -
      2 Product SizePlatform Independent - 9.3 MB
      -
      Windows (EXE) - 26 MB
      - Linux (BIN) - 39 MB
      4 Database MigrationNot Available/Will Not be Available
      5 vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click - Here
      6 Product DocumentationAvailable at the Wiki
      8 Source Code LabelVTIGERCRM_5_ALPHA3
      -

      2. Features

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. NoFeature
      1 Sleek Home page user interface
      2 Demo data populated across the - modules
      3 Manage RSS feeds completely
      4 Manage frequently visited sites - in mySites module
      5Prototype, a third-party package - bundled with the product
      6Email Templates module redesigned -
      7Custom Views in all the modules - are redesigned using Smarty templates
      9Shared/Group Calendar with multiple - users
      10Slide show of the users' photos - in Users List View
      11Search records easily by tagging - a set of records
      12Newly designed Calculator and - Clock are integrated
      13Fade effect while accessing different - sub-tabs in User Detail View
      14Integrated AJAX based third-party - Chat application.
      15AJAXified Mass Delete function - in all the modules
      16AJAXified Custom View for all - modules
      17 AJAXified Change Owner and Change - Status functions in Leads module
      18Security Management User Interface - is completely redesigned
      19Advance search functions integrated - only for Leads module
      20Security feature enabled for - Reports and Dashbords Home Page
      21Global search for all the modules
      22MySQL 5.0.19 database support
      23Delete handling in security module
      -

       

      - - - - - - -
      -

      Note:

      -

      1. Configuring Web services to update Publicly traded company profiles - (With Ticker symbol in Accounts) In Account module, if ticker symbol - is specified, company profile will be displayed on top of Edit view page. - For this specify the server name, port number, user name and password - has in class_http/class_http.php under <vtiger CRM Home> directory.

      -

      Line: 166

      -

      Assign values to the given variables: $server,$port,$user,$pwd

      -

      2. Shoutbox feature has been phased out.

      -
      -
      -

      vtiger CRM 5.0 Alpha 2: Release Notes

      -

      Date: February 28, 2006

      -

      vtiger CRM 5.0 Alpha 2 release is currently in active development phase. The - intent of this release is to showcase to the vtiger community, the -significant changes made after v5 Alpha release ie changes since Jan -16, 06' . The noteworthy features in v5 Alpha 2 are Campaign management -for marketing folks, enhanced predefined dashboards, AJAXified myPortal -module, intuitive System Administration, integration of Web services to -update all your public listed customer/company profiles, view -multidimensional models for product catalog, latest news on company -updates, redesigned Customer Self-service portal,etc. In addition, we -are also supporting much awaited MySQL 4.1.x database system. Please note, the Alpha2 will not work with MySQL 4.0.x
      -

      -

      NOTE: We strongly recommend CRM community NOT to USE vtiger CRM 5 - Alpha 2 for real-time deployment. In case you are looking for an immediate - CRM solution for your business, please consider using the vtiger CRM 4.2.3 - (latest stable version), which can be downloaded from vtiger.com.

      -

      Appeal to Developers, Testers, Analysts, Writers, and end users! -

      -

      Jump-start to vtiger Public Discussions and post your valuable suggestions - & comments to help us deliver a world class open source CRM for you in another - few weeks time. It is very simple,

      -

      Step 1: Browse through Live Demo: http://vtiger.com/demo/alpha2

      -

      Step 2: Ready with LAMP/WAMP, Download product - from:

      -

      Step 3: Post your suggestions & comments at - vtiger Discussions under : vtiger - CRM 5.x category

      -

      Table of Contents

      -
        -
      1. Summary
      2. -
      3. Features
      4. -
      5. Bug Fixes
      6. -
      7. Known Issues
      8. -
      -

      1. Summary

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. NoItemStatus
      1 - Features -

      27

      -
      2 - Product SizeSource - 9.3 MB
      3 - Bug Fixes18
      4 - Database MigrationNot Available/Will Not be Available
      5 - vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. - URL: Click - Here
      6 - Product DocumentationAvailable at the Wiki
      7 - List of files modified between - alpha and alpha 2 -  
      8 - Source Code LabelVTIGERCRM_5_ALPHA2
      9 - Known Issues11
      -

      2. Features

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      Sl No. - Ticket IDDescription
      1-Enhanced Dashboards with more - than 20 charts
      2 - -Multiple currency support and - currency conversion through Web service integration
      3-Campaign Management module for - Marketing automation
      4 - -Update some of your publicly - traded accounts details online using Web services integration. Input only - the Ticker Symbol in Account page and update the other real-time data. (Refer - to Note)
      5 - -Stay-in-touch with your customers' - by uploading their photos.
      6 -   - Analyze your customers business - performance based on their Web traffic.
      7 - 779 - Show/Hide HTML Editor (FCKEditior).
      8 - 1000Send E-mail notification to assigned - users when potential is updated.
      9 - 1006 Send E-mail notification to other - users.
      10 - 736Show latest/new leads on a Home - page.
      11- Ajax-based multidimensional - product images upload.
      12 - - - Contact Images Scrolling in Contact - ListView
      13 - - - Ajax-based my Portal module - under Tools tab.
      14-In Home page, display the status - of modified records since last logout for users.
      15 - - - Tag Cloud - Integration - (http://tagcloud.com)
      16 - - - Company-wide Announcements configuration - from Settings.
      17 - - - Thumbnail view on Mouseover for - Contact images in List View.
      18 - - - Upload vtiger CRM - Users' photos.(Not Working)
      19 - - - Resize the users photos and create - thumbnails.(Not Working)
      20 - - - Attach multiple files in single - step.
      21 - - - FCK editor upgraded to the latest - version (v2.2).
      22 - - - Shout Box integration with vtiger - CRM Home page for vtiger users to chat online.
      23 - - - Tabbed approach of Detail View - information. Sections are spited to Basic & More for Leads, - Accounts, Contacts, Potentials & Product modules.
      24 - 445 - Addition of multiple - Contacts in Activities, Emails, Potentials, Vendors related lists.
      25 - - - Add New E-mail in Related List - of Leads & Contacts.
      26 - 502 Address Inheritance for Contacts.
      27 - - - Ajaxified detail view for all - modules.
      28-Separate Log Messages for Security - Management.
      -

       

      - - - - -
      -

      Note: Configuring Web services to update - Publicly traded company profiles (With Ticker symbol in Accounts) - - In Account module, if ticker symbol is specified, company profile will - be displayed on top of Edit view page. For this specify the server name, - port number, user name and password has in class_http/class_http.php under - <vtiger CRM Home> directory.

      -

      Line: 166

      -

      Assign values to the given variables: $server,$port,$user,$pwd

      -

       

      -
      -

      3. Bug Fixes

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      SL No. - Ticket ID - Description
      1 - 1058While creating customview for - salesorder return action is not redirected to Salesorder Listview.
      2 - 1070In activity related list,when - I click on "Activity Information" link,activity detailview is not displayed -
      3 - 1067minute combo box - of duration field is not displaying proper values
      4 - -In Popup SalesOrder and PurchaseOrder - "Hacking attempt" exception is thrown.
      5 - - - Adding New Event in Potential - Relatedlist will not be working
      6 - - - In Listview when a set of accounts - are selected and 'sendmail' button is clicked, finally in email editview - the addresses are populated both in To and cc field
      7 - 866Problem with ticket creation
      8 - 898 Attachment Error Message not - proper
      9 - 913 parent email id is not selected - when select a single contact or lead from listview-send mail
      10 - 1011Customer portal issue
      11 - 1034 export of accounts
      12 - 1077can not add email id in 'To' - field of email
      13 - 1088Ticket notification with wrong - signature
      14 - - - Create New User, Edit & Detail - View of the My Preference/Settings Smartified -
      15 - - - In create customview 'Choose - columns' the 'Event information' and 'Event Description' does'nt list
      16 - - - Security Support for Reports -
      17 - - - Activity Reminder Notification - email
      18 - 964 - Activities are not in start date - order and not configurable
      -

      4. Known Issues

      -
        -
      • Added the Product Details Block in the Inventory module of SalesOrder, PurchaseOrder, - Invoice & Quotes. But the functionality of the same is to be worked upon.. - This has to be done for create, edit & detail view.
      • -
      • Event created from calendar will not be displayed in the calendar
      • -
      • Some of the features in the Inventory management related modules will not - function properly. The Smarty templates are not applied fully.
      • -
      • In this release only one theme (blue) is supported. You cannot use the other - bundled themes.
      • -
      • Some of the Related List View functions may not work properly.
      • -
      • In the Basic search, Search by Alphabets, and some of the field Search like - Quote ID, Notes, Related To will not work.
      • -
      • Advance Search will not work in all the modules.
      • -
      • Calendar functionality is not functional, we are providing only the UI.
      • -
      • In home page pipeline and calendar will not be displayed.
      • -
      • Reports are not fully functional. You may experience some errors while working - with reports.
      • -
      • Quick create and global search are not supported.
      • -
      -

      5. List of Files Changed from V 5 alpha to V 5 alpha - 2

      -
        -
      • List of Changed files
      • -
      • Files Moved to Attic 
      • -
      -
      -

      vtiger CRM 5.0 Alpha 1: Release Notes

      -

      Date: January 16, 2006

      -

      vtiger CRM 5.0 Alpha release is only for the testing purpose. The -complete front-end architecture has been redesigned using the Smarty -Template Engine (http://www.smarty.php.net/download.php ) and some -of the features and bugs fixed in earlier versions may not work. Please -feel free to report bugs at:

      -

      http://bugs.vtiger.com

      -

      Table of Contents

      -
        -
      1. Summary
      2. -
      3. Features
      4. -
      5. Bug Fixes
      6. -
      7. Known Issues
      8. -
      -

      1. Summary

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. NoItemStatus
      1 - Features -

      3 -

      -
      2 - Product SizeWindows - 27.5 MB -Linux - 39 MB -Source - 9.8 MB
      3 - Bug Fixes103
      4 - Code Contributionshttp://www.vtiger.com/wiki/index.php/Vtiger_CRM_Code_Contributions -
      5 - Database Migration - Not Available
      6 - vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. -URL: http://prdownloads.sourceforge.net/vtigercrmvtiger_CRM_5_Alpha_PhpDocs.zip?download
      7Product DocumentationAvailable at the Wiki
      8Source Code LabelVTIGERCRM_5_ALPHA
      9 - Known Issues10
      -

      2. Features

      -
        -
      • UI interface has been redesigned based on Smarty template engine.
      • -
      • Bug fixes based on the Operation Consolidation list.
      • -
      • Security Management enhancements. For more detail refer to vtigercrm5_alpha_Security.html
      • -
      -

      3. Bug Fixes

      -

      Refer to the following links:

      - -

      4. Known Issues

      -
        -
      • Some of the features in the Inventory management related modules -will not function properly. The Smarty templates are not applied fully.
      • -
      • In this release only one theme (blue) is supported. You cannot -use the other bundled themes.
      • -
      • Some of the Related List View functions may not work properly.
      • -
      • In the Basic search, Search by Alphabets, and some of the field -Search like Quote ID, Notes, Related To will not work.
      • -
      • Advance Search will not work in all the modules.
      • -
      • Calendar functionality is not functional, we are providing only -the UI.
      • -
      • In home page pipeline and calendar will not be displayed.
      • -
      • Reports are not fully functional. You may experience some errors -while working with reports.
      • -
      • Some of the Popup window may not function properly.
      • -
      • Quick create and global search are not supported.
      • -
      • Problem in Search UI with IE browser
      • -
      -
      -

      vtiger CRM 4.5 : Development Version 3 - Release Notes

      -

      Date: November 23, 2005

      -

      Table of Contents

      -
        -
      1. Summary
      2. -
      3. Features
      4. -
      5. Bug Fixes
      6. -
      7. Known Issues
      8. -
      -

      1. Summary

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. NoItemStatus
      1 - Features -

      -8 -
      2 - Product SizeWindows - 30MB -Linux - 42MB
      3 - Bug Fixes29
      4 - Code Contributionshttp://www.vtiger.com/wiki/index.php/Vtiger_CRM_Code_Contributions -
      5 - Database Migration - Not Available. 
      6 - vtiger CRM - PHP DocumentationBundled with the Product (<vtiger CRM -Home>/vtigerCRM_docs directory)
      7Product DocumentationAvailable at the Wiki
      8Source Code LabelVTIGERCRM_4_5_M3
      9 - Known Issues4
      10 - List of Files Changed from V 4.5 Development 2 to -V 4.5 Development 3110
      11List of Files Changed from V 4.2 Development 1 to -V 4.5 Development 3277
      12List of Files Changed from V 4.2 Patch 2 to V 4.5 -Development 3190
      -

      Back -to Top

      -

      2. Features

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. No Ticket -ID - Subject
      1 -
      -
      -

      Progress bar display during the vtiger CRM database creation -in Installation wizard.

      -
      2 -
      -
      Default Organization Sharing in Security is modified -according to the new Security Schema. Migration support is also -provided for this feature.
      3588 - Suppress sending mail to account when a ticket is submitted.
      4 -
      -
      Product quantity in stock is automatically updated when -the  goods specified in the Purchase Order are received. - - Note: To update the product quantity in stock, users have -to change the Status drop-down list value to 'Received Shipment' -immediately after receiving the shipment.
      5
      -
      In Office Plug-in, fields from multiple modules (Accounts, -Contacts, Leads, HelpDesk, and Users) can be merged while creating mail -merge templates.
      6
      -
      In vtiger CRM create mail merge documents by merging fields -from multiple modules (Accounts,Contacts, Users)
      7
      -
      Provided support for User field in mail merge documents
      8
      -
      Mail merge all the records from a module by selecting "Select -All" checkbox in ListView of Accounts, Contacts, Leads, and HelpDesk -modules.
      - -

      3. Product Size

      - - - - - - - - - - - - - - - - - - -
      DistributionVersion 4.2 Build Size Version 4.5 Milestone 3 Build Size
      Windows (EXE)42 MB -

      -
      30 MB
      Linux (BIN)39 MB -

      -
      42 MB
      - -

      4. Bug Fixes

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. No Bug IDSubject
      1539In the Potential related list view the currency value should -be aligned right, and the currency symbol should be shown in the title -instead of in front of every value.
      2640 Issue in Pop-up New link
      3665
      -
       Check-all checkbox checks wrong checkboxes
      4761 Added dash after Potential Name when converting from -Lead
      5644 Start/End date options in Custom View
      6643Issue in Group Activities display in Home page
      7689utils.php call time pass reference error
      8770Checkbox fields are saved with null instead of 0 value.
      9570Missing information when converting Lead to Contact
      10754Date Format on Quotes, Invoices and Orders
      11511Custom view-  if lastname is selected the first -name and the last name are displayed
      12645Html tags are not shown properly in activity description
      13463Don't show "My group allocation" section if no group is -defined
      14849user belonging to more than 2 group .issue
      15820Product image editing error
      16831custom view error
      17695call time pass reference is corrected
      18484Tickets assigned to a group error
      19851Wrong picklist value in edit view
      20 Access to vtigercrm.log files restricted - -vulnerability fix.
      21
      -
      833
      -
      test mail can be sent to test -the e-mail function on configuring the mail server
      22
      -
      718
      -
      Signatures are double-spaced in -e-mails
      23
      -
      453
      -
      issue in vendor search
      24
      -
      564
      -
      Tickets assigned to Groups
      25
      -
      195
      -
      Email - admin mail is empty, -then cc in email is not going
      26
      -
      710
      -
      activity notifications -> -display further information
      27
      -
      504 New Contact -Account addressNew -Contact -Account address
      28259Office Integration account name -in address block
      29378Office Plugin field selection
      - -

      6. Known Issues

      - - - - - - - - - - - - - - - - - - - - - - - -
      S. No Subject
      1 -

      In user creation page, by default the Organization is -displayed in Role drop-down list field but there is no action -associated with the Organization value. Kindly select roles -other than Organization in the drop-down list.

      -
      2 -

      While sending mass e-mail from Leads/Contact/Accounts, -validation check will not be performed for the To field.

      -
      3 In Block rearrangement feature, If a field is -moved to an unused or new block, the field will not be displayed.
      4 In E-mail ListView, if mail is sent to multiple -recipients the entries will be displayed twice.
      -

       

      -
      -
      -

      vtiger CRM 4.5 : Development Version 2 - Release Notes

      -

      Date: November 16, 2005

      -

      Table of Contents

      -
        -
      1. Summary
      2. -
      3. Features
      4. -
      5. Product Size
      6. -
      7. Bug Fixes
      8. -
      9. Database Migration
      10. -
      11. Known Issues
      12. -
      13. List of Files Changed from V 4.5 -Development 1 to V 4.5 Development 2
      14. -
      15. List of Files Changed from V 4.2 Patch 2 -to V 4.5 Development 2
      16. -
      -

      1. Summary

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. NoItemStatus
      1Features3 -

      -
      2Product SizeWindows - 31MB
      -Linux - 41MB
      3Bug Fixes24
      4Code ContributionsNil
      5vtiger CRM - PHP DocumentationBundled with Product
      6Product DocumentationAvailable at Wiki
      7Source Code LabelVTIGERCRM_4_5_M2
      8List of Files Changed from V 4.5 Development 1 to -V 4.5 Development 2137
      9List of Files Changed from V 4.2 Patch 2 to V 4.5 -Development 2279
      -

      Back to Top

      -

      2. Features

      - - - - - - - - - - - - - - - - - - - -
      S. No Subject
      1 -

      Profile management module is revamped completely

      -
      2 -

      Display all the records that are assigned to users dynamically -in a scrollable format.

      -
      3Documentation for vtiger CRM - PHP libraries is -bundled with the product. (Present under vtigerCRM_docs directory)
      - -

      3. Product Size

      - - - - - - - - - - - - - - - - - - -
      DistributionVersion 4.2 Build Size Version 4.5 Milestone 2 Build Size
      Windows (EXE)42 MB -

      -
      31 MB -

      -
      Linux (BIN)39 MB -

      -
      41 MB
      - -

      4. Bug Fixes

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. No Bug IDSubject
      1810 -

      The close link in activities custom view returns to the -default view

      -
      2  -

      E-mail functions are restructured in the following mailing -functions:

      -
        -
      • Send E-mail to assigned to user, Lead, Contact and Account -in Emails module
      • -
      • Send notification to the assigned to user in Activities -module
      • -
      • Send Ticket details to the assigned to user and Parent in -HelpDesk
      • -
      • Send customer portal login details to the customer in -Contact module
      • -
      • Send mail about the portal ticket creation to the module -owner and the customer itself in Customer Portal
      • -
      -
      3768Lead Street text box restricted to 30 chars
      4486Not Held Meetings shown in Activities instead of -History
      5771Events with status "Not Held" appear still in -Activities instead of the history table
      6682Creating an event with status planned for past -time
      7629Select End date as today's date
      8635End date need not be mandatory if there start -date is mandatory
      9411New Event Creation
      10809Designation Should be converted into Title field -of Contact
      11725Field "Designation" does not seem to get carried -across to either the Account, Potential nor Contact entries.
      12777Converting a lead does not allow two decimal -places
      13700Events->Status is not displayed
      14446displaying product id instead of product name in -ticket list view
      15112Generated Reports topic change
      16359Spelling Error in Reports
      17369'Translation issue'
      18398quotation custom view
      19 Issue - Columns to Total in Reports
      20817table names PortalInfo and CustomerDetails should -be changed in lower case
      21818Added module in portal and the tickets should be -assigned to the owner of the module
      22819after saving the ticket control goes to list of -tickets instead of new ticket's detail view(in customerportal)
      23824E-mail title is missing in E-mail DetailView
      24 -

      -
      -

      -
      -
      nusoap version upgraded to 0.7.1 -

      -
      -
      -

        -

      -
      - -

      5. Database Migration

      -

      Database migration support is provided for the following versions: -

      -

      -
        -
      • From vtigerCRM 4.2 Patch2 to vtigerCRM Developer Version 2
      • -
      • From vtigerCRM Developer Version 1 to vtigerCRM Developer -Version 2
      • -
      -

      Database Migration Procedure:

      -
        -
      1. Download the attached Migration zip and extract to the -<vtigerCRM home> directory (Migration42p2_to_45dev2.zip)
      2. -
      3. Access the dev_index.php file through the browser.
      4. -
      5. Select the versions to migrate.
        -
      6. -
      - -

      6. Known Issues

      - - - - - - - - - - - - - - - - - - - - - - - -
      S. No Subject
      1 -

      In user creation page, by default the Organization is -displayed in Role drop-down list field but there is no action -associated with the Organization value. Kindly select roles -other than Organization in the drop-down list.

      -
      2 -

      While sending mass e-mail from Leads/Contact/Accounts, -validation check will not be performed for the To field.

      -
      3 In Block rearrangement feature, If a field is -moved to an unused or new block, the field will not be displayed.
      4 In E-mail ListView, if mail is sent to multiple -recipients the entries will be displayed twice.
      -
      -

      vtiger CRM 4.5 - Development Version 1 Release Notes -

      Date: November 9, 2005

      -

      -

      Summary:

      - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. NoItemTotalRemarks
      1Features1 
      2Bug Fixes50 
      3Code Contributions64 
      -

      Henceforth the Emails Send/Saved will be treated like mails in Send -items, of our regular mail client, if such emails, need to be resent, -the recipients to be selected again.

      -

      1. Features

      -

      Added BCC field in Emails

      -

      2. Bug Fixes

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. No Bug IDSubject
      1638Priority for Events
      2157Inventory Mgmt Related List Show All Details
      3433Search option missing in Popup Purchase order
      4454Issue in creating new note from product detail -view
      5384Activities not saving?
      6233Bug in invoice
      7220Some Bug in Vtiger 4.2 - Invoice
      8373No Title for description
      9256name in account's address information
      10693Select Contact option Not Available
      11205spelling error and There doesn't seem to be a way -to add a first nam
      12 Thunderbird plugin dialog has to be closed twice
      13 ThunderBird - window problem
      14 print option should open new page
      15 email,phone fields are not validated in contacts
      16 Problems with Thunderbird plugin
      17 Thunderbird Plugin: Error importing Contacts
      18  Thunderbird Extn count doesn't match
      19 Custom view - Mandatory check
      20 Product Custom view
      21744Terms & Conditions in Company Details as well -as in Edit View
      22692While exporting SalesOrder i got New column after -Quote Name.
      23688while generating reports if we select reports an -error message is displayed this issue has been fixed
      24686after integrating the code contributed by raju -the lead names are not displayed in the popup in email module
      25  Having status for events in Customview of -Activities-Customer request
      26284In populating the Demo data of leads,giving the -companyname
      27289In populating Demo data, giving the value for -assigned to
      28151Attachment contains footer of vitgerCRM and -javascript (I attached license_agreement.txt of vtigercrm, but i got in -other name and not in .txt format and content is mixed with -vtigerCRM Footer)
      29194Email Email,Webmail Tab is comming for all pages -in Email Module (While Editing email,still the listview tab -(Emails,Webmails) is comming. It should be like Email : ""Subject"")
      30440issue while creating new contact&account -through add business card
      31690Problem in Close Date and Last modified of the -list of Sales Stage History of the Potentials
      32694Date showing is incorrect in add business card -(when add new business card, there is date for appoinment where the -showing date is not in current user date format
      33158Pick list Custom field issue
      34370duplicate entry in list view
      35288Issue in Inventory Popups
      36347Error Message
      37358Filtering by Headers in Leads
      38342New users can'´t login
      39360System Configuration
      40145related module is empty
      41179Potential-activities
      42203Inventory RL
      43211There is no option to create a Potential for a -contact
      44212Create Quote from Contact
      45354Critical security vulnerability in multi-instance -installations / multiple instance login problem
      46670Propegate Account Address info into New Contact
      47681Bug in utils.php function getListViewEntries
      48754User_name instead of firstname lastname used as -sender in emails
      49773In custom views of Tickets the Ticket id is -missing. Its also not possible to filter by ticket id's.
      50763Misspelling in KeyMetrics
      -

      3. Code Contributions

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      S. No -

      -
      Forums -

      -

      Description
      1 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=1954 -

      -
      GUI -

      rearrange fields within blocks?

      -

      Drag and drop for the fields with different blocks

      -

      -
      2 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=2750 -

      -
      Appropriate -

      tabindex for edit fields.

      -

      One more column is added to the fields table to get the tab

      -

      -
      3 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=2368 -

      -
      Release Relations in -Contacts and Accounts
      4 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=2852 -

      -
      Change the status of -the activities in CustomViews from Activities module
      5 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=2031 -(PDF format)In -the PDF -

      report, to get the address

      -on the right side of the page.
      6 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=1689 -

      -
      LDAP and Active -Directory Support Patch
      7 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=2364 -

      -
      Description -

      visible for History and Notes in Acc/Cnts List view.

      -

      -
      8 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=2748 -

      -
      Make a note before -closing the activity in Home Page
      9 -

      -
      http://forums.vtiger.com/viewtopic.php?p=13502#13502 - Post subject: Bug -resolved (Ticket ID 773): TicketId for dropdown lists...
      10 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=1692Adding -

      priority to Events

      -- Feature
      11 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=2617PDF's output -formatting.
      12 -

      -
      -

      http://www.vtiger.com/discussions/viewtopic.php?t=1530

      -
      Revised Tracker
      13 -

      -
      http://forums.vtiger.com/viewtopic.php?p=13396#13396 - New pdf from matt
      14 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=1585Displaying the -meeting in the calendar, Present in 4.2GA
      15 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=2029Import and Export -Products
      16 -

      -
      -

      http://www.vtiger.com/discussions/viewtopic.php?t=2000

      -
      During -

      'Import', the person who is importing the CSV files -'user_name' in is

      -assigned  to 'Assigned to' field
      17 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=2139When creating a 'New -

      Product'  there was an error in javascript. This is -integrated in

      -patch1
      18 -

      -
      -

      http://www.vtiger.com/discussions/viewtopic.php?t=2196

      -
      The world clock -doesn't show 12pm correctly. It was showing 00pm
      19 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=2524Scroll bars are -added to the -

      'Related List' of Account and contacts for 'Attachments & -Notes'

      -and 'History'
      20 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=2431Search ny Ticket id -in HelpDesk
      21 -

      -
      -

      http://www.vtiger.com/discussions/viewtopic.php?t=2406

      -
      If you write a -

      long description in an activity, it takes off a lot of space -because the text field is one column wide only.

      -

      -With this fix, the descriptions are spaned over all columns,
      22 -

      -
      -

      http://www.vtiger.com/discussions/viewtopic.php?t=2324

      -
      This will move -

      the vTiger logo upwards and the tabs will start from the left -of the page. I've applied this all the themes

      -except 'blue' theme
      23 -

      -
      -

      -

      ttp://www.vtiger.com/discussions/viewtopic.php?t=2025 -

      -
      The date -

      format required is YYYY-mm-dd however the popup uses -mm-dd-YYYY,

      -

      A diffeent format. Upon trying to submit changes, a date error -(js

      -alert) pops up stating invalid month
      24 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=2744 -

      -
      All users in a -activity can view it in Calendar
      25 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=3105 -

      -
      Imporved Emailing -system with easy mass mail support- given by Raju -

      -
      26 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=3100 -

      -
      One color by user in -Calendar -

      -
      27 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=3149 -

      -
      Vtiger php -installer script multilanguage -

      -
      28 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=3143 -

      -
      Fun with Google Maps -

      -
      29 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=3045 -

      -
      Automatic Inventory -Updating -

      -
      30 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=2681 -

      -
      Helpdesk Navigation. -

      In helpdesk, the navigation below the list view.

      -

      -
      31 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=2005 -

      -
      Patches- activity -rows on Home tab, custom activity view fix -

      -
      32 -

      -
      http://www.vtiger.com/discussions/viewtopic.php?t=1770 -

      -
      Make -QuickActivityRegister have enddate(duedate) -

      To have an end date,when creating an activity from the -calendar

      -

      -
      33 -

      -
      http://forums.vtiger.com/viewtopic.php?p=13390#13390 - UI improvement: -Tabbed details and related lists
      34 -

      -
      http://forums.vtiger.com/viewtopic.php?t=3251 -

      -
      Improved pagination -in List View -

      -
      35 -

      -
      http://forums.vtiger.com/viewtopic.php?t=3359 -

      -
      Tickets sorted by -ticket id desc -

      -
      36 -

      -
      http://forums.vtiger.com/viewtopic.php?t=2482 -

      -
      First release of -Communications and Mass Mailing -

      -
      37 -

      -
      http://forums.vtiger.com/viewtopic.php?t=3105 -

      -
      Imporved Emailing -system with easy mass mail support -

      -
      38 -

      -
      http://forums.vtiger.com/viewtopic.php?t=3226 -

      -
      Full Telephony -Integration -

      -
      39 -

      -
      http://forums.vtiger.com/viewtopic.php?t=3342 -

      -
      Report Filters in -PDF And Excel exports -

      -
      40 -

      -
      http://forums.vtiger.com/viewtopic.php?t=3079 -

      -
      Export Activities -to Palm -

      -
      41 -

      -
      http://forums.vtiger.com/viewtopic.php?t=3376 -

      -
      custom invoice view -using custom fields fix (4.2 Patch 2) -

      -
      42 -

      -
      http://forums.vtiger.com/viewtopic.php?t=3367 -

      -
      contactserialize.php -fixes (4.2 Patch 2) -

      -
      43 -

      -
      http://forums.vtiger.com/viewtopic.php?t=1954 -

      -
      GUI rearrange -fields within blocks -

      -
      44 -

      -
      http://forums.vtiger.com/viewtopic.php?t=3390 -

      -
      Hierarchical rights -

      -
      45 -

      -
      http://forums.vtiger.com/viewtopic.php?t=3143 -

      -
      -

      Fun with Google Maps

      -
      46 -

      -
      http://forums.vtiger.com/viewtopic.php?t=3247 -

      -
      -

      Simple Drupal Integration

      -
      47 -

      -
      http://forums.vtiger.com/viewtopic.php?t=3290 -

      -
      -

      Expenses Module Integration

      -
      48 -

      -
      http://forums.vtiger.com/viewtopic.php?t=3548 -

      -
      Activities and Notes -fixes for 4.2 patch 2
      49 -

      -
      http://forums.vtiger.com/viewtopic.php?t=3545 -

      -
      Invoice & Quotes -layout fixes
      50 -

      -
      http://forums.vtiger.com/viewtopic.php?t=2597 -

      -
      -

      Postgres Support

      -
      51 -

      -
      http://sourceforge.net/mailarchive/forum.php?thread_id=8380546&forum_id=44763 -

      -
      -

      Patch for customer Portal- Michael

      -

      fixed some typos

      -
      52 -

      -
      http://sourceforge.net/mailarchive/forum.php?thread_id=8365518&forum_id=44763 -

      -
      -

      Patch for Install - Michael

      -* fixed some typos and invalid html -

      * additional permissions check - prevent

      -

      'My Pipeline' showing a permissions error on new install

      -
      53 -

      -
      http://sourceforge.net/mailarchive/forum.php?thread_id=8365518&forum_id=44763 -

      -
      -

      Patch for vtigercrm nusoap - Michael

      -The following patch upgrades the version of -

      nusoap library from 0.67 to

      -

      0.69.

      -

      -
      54 -

      -
      http://forums.vtiger.com/viewtopic.php?t=3053&highlight=stema -

      -
      Arrange emails by -sent date
      55 -

      -
      -

      -
      -
      Enchanced PDF in -Quotes
      56 -

      -
      http://forums.vtiger.com/viewtopic.php?t=3509&highlight=vip -

      -
      Change Home Page -Order
      57 -

      -
      Overlapping of -company logo and product name while exporting in Invoice -

      -
       
      58overlapping of -company logo and product name while exporting in Invoice  
      59Description visible -for History and Notes in Acc/Cnts List view. 
      60Change the status of -the activities in CustomViews from Activities module 
      61Invoice & Quotes -layout fixes 
      62Arranging the home -page contributed by Mike has been integrated (Bug ID: 291) 
      63Imporved Emailing -system with easy mass mail support(Raju) (Bug ID: 500) 
      64Displaying Emails by -Sent date order(Rcleeve)(Bug ID: 687 ) 
      65Arranging the blocks -in settings page(comes under a code contribution) (Bug ID: 648 )  
      -

      Known Issues

      -

      1) While creating a new user, by default 'Organisation' will be -set  as 'Role' to the user. Kindly change it to  your -specified role before saving, if 'Organisation' is set as role the -user, the will not be able to login to the application.

      -

      2) When sending mass mail form -Leads/Contact/Accounts, validation is not done in 'To' field.

      -

      -

      3) In Block Re-arrangement Feature, -If is a field is moved to a unused/new block, the field will not be -displayed.

      -

      -

      4) In Email Listview, if mail is -sent to mutiple recipients the entries will be displayed twice.

      - - + +vtiger CRM 5 Beta: Release Notes + + + + + +

      +

       

      +

      vtiger CRM 5.0.1: Release Notes

      +

      Date: Octoer 10, 2006

      +

      Hi All,

      +

      We are happy to bring out yet another release of vtiger CRM, with much more + capabilities, interesting code contributions and whole lot of Bug fixes..

      +

       

      +

      Table of Contents

      +
        +
      1. Summary
      2. +
      3. Features
      4. +
      5. Bug Fixes
      6. +
      7. Known Issues
      8. +
      +

      1. Summary

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. NoItemStatus
      1 Features 
      2Product SizePlatform Independent - 6.1 MB
      + Windows (EXE) - 26 MB
      + Linux (BIN) - 43 MB
      3Database MigrationAvailable for migrating data from 4.2.3 + , 4.2.4, or 5.0 RC to v5.0.1. No database changes from 5.0.0 to 5.0.1
      4Product Download Click + Here
      5vtiger CRM - PHP Documentation URL: Click + Here
      6Product Documentation +

      Available at the Wiki

      +
      +

      2. Features

      +
        +
      • UTF-8 Support
      • +
      +

      3. Bug Fixes

      +

      We have fixed about 71 issues after v5.0 Release and intergrated code contributions + from the community. Please refer our vtiger + CRM Bug Tracker.

      +

      4. Known Issues

      +

      We have about 121 issues to be fixed. You can refer our + vtiger CRM Bug Tracker for the details of these issues.

      +

       

      +

       

      +
      +

       

      +

      vtiger CRM 5.0.0: Release Notes

      +

      Date: Sep 14, 2006

      +

      Welcome to vtiger CRM!

      +

      vtiger CRM is an enterprise-ready open source CRM solution for managing sales, marketing, customer support and order management functions effectively. Before version 5 release, vtiger CRM has passed through more than 10 development cycles.

      +

      Table of Contents

      +
        +
      1. Summary
      2. +
      3. Features
      4. +
      5. Bug Fixes
      6. +
      7. Known Issues
      8. +
      +

      1. Summary

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. NoItemStatus
      1 Features  +
      2Product SizePlatform Independent - 6.1 MB
      +
      Windows (EXE) - 26 MB
      + Linux (BIN) - 40 MB
      3Database MigrationAvailable for migrating data from 4.2.3 , 4.2.4, or 5.0 RC to v5.0
      4Product Download Click Here
      5vtiger CRM - PHP Documentation URL: Click Here
      6Product Documentation

      Available at the Wiki

      +

      2. Features

      +
        +
      • AJAX based User Interface
      • +
      • Color Schemes
      • +
      • Enterprise-grade Security Management
      • +
      • Calendaring
      • +
      • Email Client
      • +
      • Customization
      • +
      • Reports & Dashboard
      • +
      • Order Management
      • +
      • Marketing Automation
      • +
      +

      For more details refer to: http://www.vtiger.com/products/crm/v5-release-notes.pdf

      +

      3. Bug Fixes

      +

      We have fixed about 200 issues after v5 RC release. For more details, kindly refer to the vtiger CRM Bug Tracker.

      +

      4. Known Issues

      +

      As on Sep 14, 2006 there are about 178 open issues. For more details, kindly refer to the vtiger CRM Bug Tracker:

      +
      +

      vtiger CRM 5.0 RC1: Release Notes

      +

      Date: Aug 14, 2006

      +

      vtiger CRM 5.0 RC1, is ready for the last-round of validation before GA release!

      +

      Last few days, we have worked hard to make vtiger CRM more user friendly, bug free, and ready for real-time deployment. We thank our community members who spent their valuable time & energy with us and making the RC release successful.

      +

      We have few bugs remained in our basket and there are some formalities need to be completed before announcing the public release for the real time deployments. In the meantime, kindly help us by reporting bugs that you might have encountered in RC release version. Your suggestions and feedback will definitely help us providing a smooth transition from v4.2.x to next the generation vtiger CRM.

      +

      Major changes in the current update are new "woodspice" theme, calendar enhancements, fully customizable tax calculations, and re-desigend post-installation configuration wizard. We have also fixed about 350 bugs after version 5 Beta 2 release.

      +

      IMPORTANT NOTES:

      +
        +
      • We strongly recommend CRM community NOT to USE vtiger CRM 5 RC1 for any deployments. In case you are looking for an immediate CRM solution for your business, please consider using the vtiger CRM 4.2.3 (latest stable version), which can be downloaded from vtiger.com.
      • +
      • Database migration script is provided for migrating data from v4.2.3 to v5 RC1 only for testing purpose. Hence users are strongly recommended to take a backup of the the v4.2.3 data before testing the migration scripts.
      • +
      • Database migration script is not provided for migrating data from v 5 Beta releases to v5 RC1. Hence users are strongly recommended to take a backup of the the v 5 Beta data before testing the migration script.
      • +
      +

      Appeal to Developers, Testers, Analysts, Writers, and real end users!

      +

      Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 RC1,

      +

      Step 1: Browse through Live Demo

      +

      Step 2: Download product from the vtiger.com and install in your favorite OS.

      +

      Step 3: Post your suggestions & comments at vtiger Discussions under : vtiger CRM 5.x category

      +

      Table of Contents

      +
        +
      1. Summary
      2. +
      3. Features
      4. +
      5. Bug Fixes
      6. +
      7. Known Issues
      8. +
      +

      1. Summary

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. NoItemStatus
      1 Features +

      10

      3Product SizePlatform Independent - 5.6 MB
      +
      Windows (EXE) - 26 MB
      + Linux (BIN) - 40 MB
      4Database MigrationAvailable only for the Testing Purpose. Data (Migration script from v4.2.3 to v5 RC1)
      5vtiger CRM - PHP Documentation URL: Click Here
      6Product Documentation

      Available at the Wiki

      +

      2. Features

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. No Feature
      1Customizable tax calculations for quotes, orders, and invoices.
      2Add new values to the Status field in Inventory, Potentials, and FAQ modules +.
      3PO, SO, Invoice - Status and Quote Stage history.
      4Manage product wise discounts and grand discount while generating quotes, orders, and invoices.
      5Manage individual or group taxes.
      6Adding same product more than once in line items list.
      7Attach documents to the tickets.
      8Add negative adjustments in quotes, orders, and invoices .
      9Enhancements in Live Chat tool.
      10Unsubscribe form in compliance with CAN Spam act.
      +

       

      + + + + + + +
      +

      Note:

      +

      Configuring Web services to update Publicly traded company profiles (With Ticker symbol in Accounts) In Account module, if ticker symbol is specified, company profile will be displayed on top of Edit view page. For this specify the server name, port number, user name and password has in class_http/class_http.php under <vtiger CRM Home> directory.

      +

      Line: 166

      +

      Assign values to the given variables: $server,$port,$user,$pwd

      +

      Bug Fixes

      +

      We have fixed about 350 issues after v5 Beta 2 release. For more details, kindly refer to the vtiger CRM Bug Tracker:

      +

      http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&group=owner&version=5.0.0&order=priority

      +

      4. Known Issues

      +

      As on Aug 13, 2006 there are about 100 open issues. For more details, kindly refer to the vtiger CRM Bug Tracker:

      +

      http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&status=assigned&status=reopened&group=owner&version=5.0.0&order=priority

      +
      +

      vtiger CRM 5.0 Beta 2: Release Notes

      +

      Date: July 05, 2006

      +

      vtiger CRM 5.0 Beta 2 release is ready for end-user community testing. The intent of this release is to showcase to the vtiger community, the significant changes made after v5 Beta release i.e., changes since May, 06'. The noteworthy features in v5 Beta 2 are New user interface for Settings module, Audit Trails as part of the security management, complete Web mail integration (including Outgoing and Incoming mail capability), edit custom fields, enhanced user interface for Calendar, optimized the database queries further for List Views function in all the modules, and others.

      +

      IMPORTANT NOTES:

      +
        +
      • We strongly recommend CRM community NOT to USE vtiger CRM 5 Beta 2 for any real-time deployments. In case you are looking for an immediate CRM solution for your business, please consider using the vtiger CRM 4.2.3 (latest stable version), which can be downloaded from vtiger.com.
      • +
      • vtiger CRM user interface can be best viewed in Mozilla/Firefox. We have some page loading page formatting issues in Internet Explorer, which will be fixed very soon.
      • +
      • JpGraph used for generating dashboards has been replaced by ImageGraph, a third party charting software.
      • +
      • Database migration script is provided for migrating data from v4.2.3 to v5 Beta 2 only for testing purpose. Hence users are strongly recommended to take a backup of the the v4.2.3 data before testing the migration script.
      • +
      • Database migration script is not provided for migrating data from v 5 Beta to v5 Beta 2. Hence users are strongly recommended to take a backup of the the v 5 Beta data before testing the migration script.
      • +
      +

      Appeal to Developers, Testers, Analysts, Writers, and real end users!

      +

      Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 Beta 2,

      +

      Step 1: Browse through Live Demo

      +

      Step 2: Download product from the vtiger.com and install in your favorite Operating System.

      +

      Step 3: Post your suggestions & comments at vtiger Discussions under : vtiger CRM 5.x category

      +

      Table of Contents

      +
        +
      1. Summary
      2. +
      3. Features
      4. +
      5. Bug Fixes
      6. +
      7. Known Issues
      8. +
      +

      1. Summary

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. NoItemStatus
      1 Features +

      12

      3Product SizePlatform Independent - 5.2 MB
      +
      Windows (EXE) - 26 MB
      + Linux (BIN) - 40 MB
      4Database MigrationAvailable only for the Testing Purpose. Data (Migration script from v4.2.3 to v5 Beta 2)
      5vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click Here
      6Product Documentation

      Available at the Wiki

      +

      2. Features

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. No Feature
      1Proxy Server configuration for accessing RSS feeds and information based on Ticker Symbol
      2Vertical bar chart in Home page
      3Security Management support for Emails module
      4Database table prefix support for a deploying vtiger CRM in other working databases
      5Audit Trial support for tracking all users system access details
      6Last 5 records visited
      7New User interface for Settings module
      8Print Report function
      9Email Detail View from Related List
      10Attach multiple documents to email message
      11Delete option for Tag cloud
      12AJAX based edit option for User details
      +

       

      + + + + + + +
      +

      Note:

      +

      Configuring Web services to update Publicly traded company profiles (With Ticker symbol in Accounts) In Account module, if ticker symbol is specified, company profile will be displayed on top of Edit view page. For this specify the server name, port number, user name and password has in class_http/class_http.php under <vtiger CRM Home> directory.

      +

      Line: 166

      +

      Assign values to the given variables: $server,$port,$user,$pwd

      +

      Bug Fixes

      +

      We have fixed about 1000 issues after v5 Beta release. For more details, kindly refer to the vtiger CRM Bug Tracker:

      +

      http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&group=owner&version=5.0.0&order=priority

      +

      4. Known Issues

      +

      As on July 5, 2006 there are about 100 open issues. For more details, kindly refer to the vtiger CRM Bug Tracker:

      +

      http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&status=assigned&status=reopened&group=owner&version=5.0.0&order=priority

      +
      +

      vtiger CRM 5.0 Beta: Release Notes

      +

      Date: May 31, 2006

      +

      vtiger CRM 5.0 Beta release is ready for end-user community testing. The intent of this release is to showcase to the vtiger community, the significant changes made after v5 Alpha 5 release i.e., changes since Apr , 06' . The noteworthy features in v5 Beta are complete Web mail integration (including Outgoing and Incoming mail capability), Office Plugin, Outlook Plugin, Customer Portal, Web-Forms, Firefox Toolbar, + + + edit custom fields, + +new user interface for Calendar, optimized the database queries for List Views function in all the modules, and others. In addition to this, we have  conducted performance testing for some of the modules using a popular Web Based Testing Software (AdventNet QEngine 6.0), which helped us to identify some of the bottlenecks in performance. We have also published the Performance Testing reports. We thank AdventNet for permitting us to make use of this interesting software and we gladly recommend it to everyone too, not because AdventNet allowed us to use it but because it is really good.

      +

      Note:

      +

      IMPORTANT NOTES:

      +
        +
      • We strongly recommend CRM community NOT to USE vtiger CRM 5 Beta for any real-time deployments. In case you are looking for an immediate CRM solution for your business, please consider using the vtiger CRM 4.2.3 (latest stable version), which can be downloaded from vtiger.com.
      • +
      • vtiger CRM user interface can be best viewed in Mozilla/Firefox. We have some page loading page formatting issues in Internet Explorer, which will be fixed very soon.
      • +
      • JpGraph used for generating dashboards has been replaced by ImageGraph, a third party charting software.
      • +
      • Database migration script is provided for migrating data from v4.2.3 to v5 Beta only for testing purpose. Hence users are strongly recommended to take a backup of the the v4.2.3 data before testing the migration script.
      • +
      +

      Appeal to Developers, Testers, Analysts, Writers, and real end users!

      +

      Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 Beta,

      +

      Step 1: Browse through Live Demo

      +

      Step 2: Download product from the vtiger.com and install in your favorite Operating System.

      +

      Step 3: Post your suggestions & comments at vtiger Discussions under : vtiger CRM 5.x category

      +

      Table of Contents

      +
        +
      1. Summary
      2. +
      3. Features
      4. +
      5. Known Issues
      6. +
      +

      1. Summary

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. NoItemStatus
      1 Features +

      28

      3Product SizePlatform Independent - 5.0 MB
      +
      Windows (EXE) - 26 MB
      + Linux (BIN) - 40 MB
      4Database MigrationAvailable only for the Testing Purpose. Data (Migration script from v4.2.3 to v5 Beta)
      5vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click Here
      6Product Documentation
      +

      2. Features

      + +
        +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S.NoFeature
      1Organization Hierarchy (Roles) can be defined using tree based structure
      2Recalculate sharing rules option is provided
      3Security Support for Campaigns module
      4Security Support for Ajax actions done
      5Role selection popup integrated.
      6Duplicate handling for Roles, Profiles and Groups done
      7Module and record-level security support for Create/Edit/Duplicate/Delete Mass Delete, Mass Change Owner, Mass Change Status functions
      8Security Support for Quick Create functions
      9Security Support for Lookup
      10Security Support for Settings module
      11Security Support for Convert Lead feature
      12Email Templates are fully functional with merge field value substitution for Leads, Contacts, Accounts, and Users Modules
      13Module and Record Level Security implemented for Mass Delete, Change Owner & Change Status Buttons across product
      14Internationalization of the product across all modules
      15Smarty templates are used for My Preferences / List Mail Server
      16Option to create Multi select combo-box in Custom Field
      17Option to edit custom fields
      18Calendar module is completely redesigned
      19List View, Detail View and Edit View queries are optimized for a better performance
      20New user interface for Currency Configuration and Custom Field Settings
      21New user interface for Convert Lead function
      22Log entry for all functions are incorporated
      23AJAXified New Email functionality
      24New user interface for Reports
      25New user interface for MySites
      26New user interface for Attachments
      27New RSS reader has been integrated for a better performance
      28Mass Change owner option in various modules
      29Inventory Revamped
      30Advanced and Basic Search UI changed
      31Automatic Tax Calculator Integrated
      32Pagination to the related list added
      33Migration support from 4.2.3 to 5.0 Beta Integrated
      +

       

      + + + + + + +
      +

      Note:

      +

      1. Configuring Web services to update Publicly traded company profiles (With Ticker symbol in Accounts) In Account module, if ticker symbol is specified, company profile will be displayed on top of Edit view page. For this specify the server name, port number, user name and password has in class_http/class_http.php under <vtiger CRM Home> directory.

      +

      Line: 166

      +

      Assign values to the given variables: $server,$port,$user,$pwd

      +

      3. Known Issues

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S.NoKnown Issue
      1While creating a new e-mail using the e-mail template, the values for the fields will not appear in the e-mail
      2Web mail has been moved from ajax/js to prototype framework
      3 Error are not handled properly in Web mail module
      4 Attachments will not work properly in Web mail module
      5 When deleting the groups, the ownership of the records that are owned by the group that is being deleted should be changed. This functionality is not handled in v5 Beta
      6 When the data of a group is shared with other users/groups, the  records owned by the sub groups users will be shared properly but the records owned by the sub-group will not be shared
      7 PHP 5 related exception while saving a ticket or potential
      8 Security support not done for New Emails Module
      9Security implementation in Custom View, Reports, Dashboards has some issues
      10 Detail View Ajax edit has security issues
      11 Security support for Calendar is not done
      12 Security is not implemented in import and export queries
      13 Home Page Security Support has issues
      14 Form Validation for Notes non-functional
      15 Events Scheduled after more than 1 hour gets displayed only at the start of the Hour - Calendar
      16 Navigation missing in mini calendar
      17 While editing the custom field, the field length and type are mismatched
      18 custom field create Pop UI is not proper in IE browser
      19 Send reminder will not work for To do
      20 In campaign related list we have shown the newly created contacts and leads. but in Contact and Lead related list we are not showing the campaign relationship. i.e.., in contact and lead related list there is no table for campaigns. whether we should show this relationship or is this the expected behavior?
      21 In the week calendar you can create event for any old day (even for year 2005). It is better to have a date validation.
      22 From a entity detail view, if we click on edit button then the edit view page shows. now there is one more tan more information. if i click on that tab it shows the related list now if we click on Entity information it goes to detail view instead of edit view
      23 If i add a to do it is not showing the to do list instead it is showing the Events
      24 Not able to delete template documents if there is not more that one
      25 All file types are allowed while uploading template documents
      26Multiple attachments is not supported in Emails
      27 Export to excel is not working in PHP5
      +
      +

      vtiger CRM 5.0 Alpha 5: Release Notes

      +

      Date: April 07, 2006

      +

      vtiger CRM 5.0 release is another release in v5 alpha release cycle, which is currently in active development phase. The intent of this release is to showcase to the vtiger community, the significant changes made after v5 Alpha 4 release i.e., changes since Mar 31, 06' . The noteworthy features in v5 Alpha 5 are new user interface for Company Information, Email templates, Company information, Outgoing mail server, Announcements, RSS, optimized the database queries for List Views function in all the modules, and others. In addition to this, we have  conducted performance testing for some of the modules using a popular Web Based Testing Software (AdventNet QEngine 6.0), which helped us to identify some of the bottlenecks in performance. We will publish the performance reports soon. We thank AdventNet for permitting us to make use of this interesting software and we gladly recommend it to everyone too, not because AdventNet allowed us to use it but because it is really good.

      +

      IMPORTANT NOTES:

      +
        +
      • We strongly recommend CRM community NOT to USE vtiger CRM 5 Alpha 5 for any real-time deployments. In case you are looking for an immediate CRM solution for your business, please consider using the vtiger CRM 4.2.3 (latest stable version), which can be downloaded from vtiger.com.
      • +
      • JpGraph used for generating dashboards has been replaced by ImageGraph, a third party charting software.
      • +
      • Database migration script is provided for migrating data from v4.2.3 to v5 Alpha 5 only for testing purpose. Hence users are strongly recommended to take a backup of the the v4.2.3 data before testing the migration script.
      • +
      +

      Appeal to Developers, Testers, Analysts, Writers, and real end users!

      +

      Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 Alpha 5,

      +

      Table of Contents

      +
        +
      1. Summary
      2. +
      3. Features
      4. +
      5. Bug Fixes
      6. +
      7. Known Issues
      8. +
      +

      1. Summary

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. NoItemStatus
      1 Features +

      15

      2Bug Fixes 2
      3Product SizePlatform Independent - 5.3 MB
      +
      Windows (EXE) - 26 MB
      + Linux (BIN) - 40 MB
      4Database MigrationAvailable only for the Testing Purpose. Data (Migration script from v4.2.3 to v5 alpha 5)
      5vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click Here
      6Product Documentation
      +

      2. Features

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. NoFeature
      1 Smarty template applied to Currency Configuration Feature
      2 List View feature database queries are optimized for all the modules
      3 PHP API documentation for some of the major functions
      4 New module called Marketing is added. Campaigns module is now part of Marketing primary module.
      5 AJAXified Notification Schedulers
      6 AJAXified Inventory Notifications
      7 AJAXified Picklist Settings
      8 AJAXified Assign Module Owners
      9 New UI for Integration of Mail Merge Templates
      10 New UI for Company Information
      11 New UI for Outgoing Mail Server
      12 New UI for Backup Server Configuration
      13 New UI for Terms and Conditions
      14 New UI for Announcements
      15 New UI for RSS module
      +

       

      + + + + + + +
      +

      Note:

      +

      1. Configuring Web services to update Publicly traded company profiles (With Ticker symbol in Accounts) In Account module, if ticker symbol is specified, company profile will be displayed on top of Edit view page. For this specify the server name, port number, user name and password has in class_http/class_http.php under <vtiger CRM Home> directory.

      +

      Line: 166

      +

      Assign values to the given variables: $server,$port,$user,$pwd

      +

      Bug Fixes

      + + + + + + + + + + + + + + + + + + +
      SL No. Ticket ID Description
      1 - There seems to be two "search in emails" icons on the email page
      2 - Quick create drop down menu enabled.
      +

      3. Known Issues

      +
        +
      • While creating a new e-mail using the e-mail template, the values for the fields will not appear in the e-mail
      • +
      • Webmail has been moved from ajax/js to prototype framework
      • +
      • Error are not handled properly in Webmail module
      • +
      • Attachments will not work properly in Webmail module
      • +
      • When deleting the groups, the ownership of the records that are owned by the group that is being deleted should be changed. This functionality is not handled in v5 Alpha 5
      • +
      • When the data of a group is shared with other users/groups, the  records owned by the sub groups users will be shared properly but the records owned by the sub-group will not be shared
      • +
      • PHP 5 related exception while saving a ticket or potential
      • +
      +
      +

      vtiger CRM 5.0 Alpha 4: Release Notes

      +

      Date: March 31, 2006

      +

      vtiger CRM 5.0 Alpha 4 release is currently in active development phase. The + intent of this release is to showcase to the vtiger community, the significant + changes made after v5 Alpha 3 release i.e., changes since Mar 21, 06' . The + noteworthy features in v5 Alpha 3 are create database for vtiger CRM online + through Configuration Wizard, edit custom fields,and so others. In addition, + we are also supporting much awaited PHP 5 and MySQL 5.1.x database. + Please note, the vtiger CRM 5 Alpha 4 will not work with MySQL 4.0.x.
      +

      +

      NOTE: We strongly recommend CRM community NOT to USE vtiger CRM 5 + Alpha 4 for real-time deployment. In case you are looking for an immediate + CRM solution for your business, please consider using the vtiger CRM 4.2.3 + (latest stable version), which can be downloaded from vtiger.com.

      +

      Appeal to Developers, Testers, Analysts, Writers, and end users! +

      +

      Jump-start to vtiger Public Discussions and post your valuable suggestions + & comments to help us deliver a world class open source CRM for you in another + few weeks time. It is very simple,

      +

      Table of Contents

      +
        +
      1. Summary
      2. +
      3. Features
      4. +
      +

      1. Summary

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. NoItemStatus
      1 Features +

      8

      +
      2 Product SizePlatform Independent - 8.3 MB
      +
      Windows (EXE) - 28 MB
      + Linux (BIN) - 43 MB
      3Database MigrationNot Available
      4vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click + Here
      5 Product DocumentationAvailable at the Wiki
      +

      2. Features

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. NoFeature
      1 Support for PHP5
      2 Support for MySQL 5
      3 Removed duplicate code base
      4 Removed junk methods in code base
      5Product API cleanup operation initiated
      6Optimized the product performance a bit by restricting the + database queries, used flat files to store commonly used data instead of + repeated database queries.
      7Create database for vtiger CRM online through Configuration + Wizard
      8Modify custom fields
      +

       

      + + + + + + +
      +

      Note:

      +

      1. Configuring Web services to update Publicly traded company profiles + (With Ticker symbol in Accounts) In Account module, if ticker symbol + is specified, company profile will be displayed on top of Edit view page. + For this specify the server name, port number, user name and password + has in class_http/class_http.php under <vtiger CRM Home> directory.

      +

      Line: 166

      +

      Assign values to the given variables: $server,$port,$user,$pwd

      +
      +

      3. Known Issues

      +
        +
      • Dashboards feature will not function in Alpha 4 because of PHP 5 support. + We are working with an alternative graphs package, which will be available + during next update.
      • +
      +
      +

      vtiger CRM 5.0 Alpha 3: Release Notes

      +

      Date: March 21, 2006

      +

      vtiger CRM 5.0 Alpha 3 release is currently in active development phase. The + intent of this release is to showcase to the vtiger community, the significant + changes made after v5 Alpha 2 release i.e., changes since Feb 28, 06' . The + noteworthy features in v5 Alpha 3 are enhanced user interface for Home page, + security scope for reports and dashboards, integration of AJAX based Chat application, + new user interface for System Administration, global search function for all + the modules, tag based grouping of the records, and so forth. In addition, we + are also supporting much awaited MySQL 5.0.19 and MySQL 4.1.x + database systems. Please note, the vtiger CRM 5 Alpha 3 will not work with MySQL + 4.0.x.
      +

      +

      NOTE: We strongly recommend CRM community NOT to USE vtiger CRM 5 + Alpha 3 for real-time deployment. In case you are looking for an immediate + CRM solution for your business, please consider using the vtiger CRM 4.2.3 + (latest stable version), which can be downloaded from vtiger.com.

      +

      Appeal to Developers, Testers, Analysts, Writers, and end users! +

      +

      Jump-start to vtiger Public Discussions and post your valuable suggestions + & comments to help us deliver a world class open source CRM for you in another + few weeks time. It is very simple,

      +

      Table of Contents

      +
        +
      1. Summary
      2. +
      3. Features
      4. +
      +

      1. Summary

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. NoItemStatus
      1 Features +

      23

      +
      2 Product SizePlatform Independent - 9.3 MB
      +
      Windows (EXE) - 26 MB
      + Linux (BIN) - 39 MB
      4 Database MigrationNot Available/Will Not be Available
      5 vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click + Here
      6 Product DocumentationAvailable at the Wiki
      8 Source Code LabelVTIGERCRM_5_ALPHA3
      +

      2. Features

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. NoFeature
      1 Sleek Home page user interface
      2 Demo data populated across the + modules
      3 Manage RSS feeds completely
      4 Manage frequently visited sites + in mySites module
      5Prototype, a third-party package + bundled with the product
      6Email Templates module redesigned +
      7Custom Views in all the modules + are redesigned using Smarty templates
      9Shared/Group Calendar with multiple + users
      10Slide show of the users' photos + in Users List View
      11Search records easily by tagging + a set of records
      12Newly designed Calculator and + Clock are integrated
      13Fade effect while accessing different + sub-tabs in User Detail View
      14Integrated AJAX based third-party + Chat application.
      15AJAXified Mass Delete function + in all the modules
      16AJAXified Custom View for all + modules
      17 AJAXified Change Owner and Change + Status functions in Leads module
      18Security Management User Interface + is completely redesigned
      19Advance search functions integrated + only for Leads module
      20Security feature enabled for + Reports and Dashbords Home Page
      21Global search for all the modules
      22MySQL 5.0.19 database support
      23Delete handling in security module
      +

       

      + + + + + + +
      +

      Note:

      +

      1. Configuring Web services to update Publicly traded company profiles + (With Ticker symbol in Accounts) In Account module, if ticker symbol + is specified, company profile will be displayed on top of Edit view page. + For this specify the server name, port number, user name and password + has in class_http/class_http.php under <vtiger CRM Home> directory.

      +

      Line: 166

      +

      Assign values to the given variables: $server,$port,$user,$pwd

      +

      2. Shoutbox feature has been phased out.

      +
      +
      +

      vtiger CRM 5.0 Alpha 2: Release Notes

      +

      Date: February 28, 2006

      +

      vtiger CRM 5.0 Alpha 2 release is currently in active development phase. The + intent of this release is to showcase to the vtiger community, the +significant changes made after v5 Alpha release ie changes since Jan +16, 06' . The noteworthy features in v5 Alpha 2 are Campaign management +for marketing folks, enhanced predefined dashboards, AJAXified myPortal +module, intuitive System Administration, integration of Web services to +update all your public listed customer/company profiles, view +multidimensional models for product catalog, latest news on company +updates, redesigned Customer Self-service portal,etc. In addition, we +are also supporting much awaited MySQL 4.1.x database system. Please note, the Alpha2 will not work with MySQL 4.0.x
      +

      +

      NOTE: We strongly recommend CRM community NOT to USE vtiger CRM 5 + Alpha 2 for real-time deployment. In case you are looking for an immediate + CRM solution for your business, please consider using the vtiger CRM 4.2.3 + (latest stable version), which can be downloaded from vtiger.com.

      +

      Appeal to Developers, Testers, Analysts, Writers, and end users! +

      +

      Jump-start to vtiger Public Discussions and post your valuable suggestions + & comments to help us deliver a world class open source CRM for you in another + few weeks time. It is very simple,

      +

      Step 1: Browse through Live Demo: http://vtiger.com/demo/alpha2

      +

      Step 2: Ready with LAMP/WAMP, Download product + from:

      +

      Step 3: Post your suggestions & comments at + vtiger Discussions under : vtiger + CRM 5.x category

      +

      Table of Contents

      +
        +
      1. Summary
      2. +
      3. Features
      4. +
      5. Bug Fixes
      6. +
      7. Known Issues
      8. +
      +

      1. Summary

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. NoItemStatus
      1 + Features +

      27

      +
      2 + Product SizeSource - 9.3 MB
      3 + Bug Fixes18
      4 + Database MigrationNot Available/Will Not be Available
      5 + vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. + URL: Click + Here
      6 + Product DocumentationAvailable at the Wiki
      7 + List of files modified between + alpha and alpha 2 +  
      8 + Source Code LabelVTIGERCRM_5_ALPHA2
      9 + Known Issues11
      +

      2. Features

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      Sl No. + Ticket IDDescription
      1-Enhanced Dashboards with more + than 20 charts
      2 + -Multiple currency support and + currency conversion through Web service integration
      3-Campaign Management module for + Marketing automation
      4 + -Update some of your publicly + traded accounts details online using Web services integration. Input only + the Ticker Symbol in Account page and update the other real-time data. (Refer + to Note)
      5 + -Stay-in-touch with your customers' + by uploading their photos.
      6 +   + Analyze your customers business + performance based on their Web traffic.
      7 + 779 + Show/Hide HTML Editor (FCKEditior).
      8 + 1000Send E-mail notification to assigned + users when potential is updated.
      9 + 1006 Send E-mail notification to other + users.
      10 + 736Show latest/new leads on a Home + page.
      11- Ajax-based multidimensional + product images upload.
      12 + - + Contact Images Scrolling in Contact + ListView
      13 + - + Ajax-based my Portal module + under Tools tab.
      14-In Home page, display the status + of modified records since last logout for users.
      15 + - + Tag Cloud - Integration + (http://tagcloud.com)
      16 + - + Company-wide Announcements configuration + from Settings.
      17 + - + Thumbnail view on Mouseover for + Contact images in List View.
      18 + - + Upload vtiger CRM + Users' photos.(Not Working)
      19 + - + Resize the users photos and create + thumbnails.(Not Working)
      20 + - + Attach multiple files in single + step.
      21 + - + FCK editor upgraded to the latest + version (v2.2).
      22 + - + Shout Box integration with vtiger + CRM Home page for vtiger users to chat online.
      23 + - + Tabbed approach of Detail View + information. Sections are spited to Basic & More for Leads, + Accounts, Contacts, Potentials & Product modules.
      24 + 445 + Addition of multiple + Contacts in Activities, Emails, Potentials, Vendors related lists.
      25 + - + Add New E-mail in Related List + of Leads & Contacts.
      26 + 502 Address Inheritance for Contacts.
      27 + - + Ajaxified detail view for all + modules.
      28-Separate Log Messages for Security + Management.
      +

       

      + + + + +
      +

      Note: Configuring Web services to update + Publicly traded company profiles (With Ticker symbol in Accounts) + + In Account module, if ticker symbol is specified, company profile will + be displayed on top of Edit view page. For this specify the server name, + port number, user name and password has in class_http/class_http.php under + <vtiger CRM Home> directory.

      +

      Line: 166

      +

      Assign values to the given variables: $server,$port,$user,$pwd

      +

       

      +
      +

      3. Bug Fixes

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      SL No. + Ticket ID + Description
      1 + 1058While creating customview for + salesorder return action is not redirected to Salesorder Listview.
      2 + 1070In activity related list,when + I click on "Activity Information" link,activity detailview is not displayed +
      3 + 1067minute combo box + of duration field is not displaying proper values
      4 + -In Popup SalesOrder and PurchaseOrder + "Hacking attempt" exception is thrown.
      5 + - + Adding New Event in Potential + Relatedlist will not be working
      6 + - + In Listview when a set of accounts + are selected and 'sendmail' button is clicked, finally in email editview + the addresses are populated both in To and cc field
      7 + 866Problem with ticket creation
      8 + 898 Attachment Error Message not + proper
      9 + 913 parent email id is not selected + when select a single contact or lead from listview-send mail
      10 + 1011Customer portal issue
      11 + 1034 export of accounts
      12 + 1077can not add email id in 'To' + field of email
      13 + 1088Ticket notification with wrong + signature
      14 + - + Create New User, Edit & Detail + View of the My Preference/Settings Smartified +
      15 + - + In create customview 'Choose + columns' the 'Event information' and 'Event Description' does'nt list
      16 + - + Security Support for Reports +
      17 + - + Activity Reminder Notification + email
      18 + 964 + Activities are not in start date + order and not configurable
      +

      4. Known Issues

      +
        +
      • Added the Product Details Block in the Inventory module of SalesOrder, PurchaseOrder, + Invoice & Quotes. But the functionality of the same is to be worked upon.. + This has to be done for create, edit & detail view.
      • +
      • Event created from calendar will not be displayed in the calendar
      • +
      • Some of the features in the Inventory management related modules will not + function properly. The Smarty templates are not applied fully.
      • +
      • In this release only one theme (blue) is supported. You cannot use the other + bundled themes.
      • +
      • Some of the Related List View functions may not work properly.
      • +
      • In the Basic search, Search by Alphabets, and some of the field Search like + Quote ID, Notes, Related To will not work.
      • +
      • Advance Search will not work in all the modules.
      • +
      • Calendar functionality is not functional, we are providing only the UI.
      • +
      • In home page pipeline and calendar will not be displayed.
      • +
      • Reports are not fully functional. You may experience some errors while working + with reports.
      • +
      • Quick create and global search are not supported.
      • +
      +

      5. List of Files Changed from V 5 alpha to V 5 alpha + 2

      +
        +
      • List of Changed files
      • +
      • Files Moved to Attic 
      • +
      +
      +

      vtiger CRM 5.0 Alpha 1: Release Notes

      +

      Date: January 16, 2006

      +

      vtiger CRM 5.0 Alpha release is only for the testing purpose. The +complete front-end architecture has been redesigned using the Smarty +Template Engine (http://www.smarty.php.net/download.php ) and some +of the features and bugs fixed in earlier versions may not work. Please +feel free to report bugs at:

      +

      http://bugs.vtiger.com

      +

      Table of Contents

      +
        +
      1. Summary
      2. +
      3. Features
      4. +
      5. Bug Fixes
      6. +
      7. Known Issues
      8. +
      +

      1. Summary

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. NoItemStatus
      1 + Features +

      3 +

      +
      2 + Product SizeWindows - 27.5 MB +Linux - 39 MB +Source - 9.8 MB
      3 + Bug Fixes103
      4 + Code Contributionshttp://www.vtiger.com/wiki/index.php/Vtiger_CRM_Code_Contributions +
      5 + Database Migration + Not Available
      6 + vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. +URL: http://prdownloads.sourceforge.net/vtigercrmvtiger_CRM_5_Alpha_PhpDocs.zip?download
      7Product DocumentationAvailable at the Wiki
      8Source Code LabelVTIGERCRM_5_ALPHA
      9 + Known Issues10
      +

      2. Features

      +
        +
      • UI interface has been redesigned based on Smarty template engine.
      • +
      • Bug fixes based on the Operation Consolidation list.
      • +
      • Security Management enhancements. For more detail refer to vtigercrm5_alpha_Security.html
      • +
      +

      3. Bug Fixes

      +

      Refer to the following links:

      + +

      4. Known Issues

      +
        +
      • Some of the features in the Inventory management related modules +will not function properly. The Smarty templates are not applied fully.
      • +
      • In this release only one theme (blue) is supported. You cannot +use the other bundled themes.
      • +
      • Some of the Related List View functions may not work properly.
      • +
      • In the Basic search, Search by Alphabets, and some of the field +Search like Quote ID, Notes, Related To will not work.
      • +
      • Advance Search will not work in all the modules.
      • +
      • Calendar functionality is not functional, we are providing only +the UI.
      • +
      • In home page pipeline and calendar will not be displayed.
      • +
      • Reports are not fully functional. You may experience some errors +while working with reports.
      • +
      • Some of the Popup window may not function properly.
      • +
      • Quick create and global search are not supported.
      • +
      • Problem in Search UI with IE browser
      • +
      +
      +

      vtiger CRM 4.5 : Development Version 3 - Release Notes

      +

      Date: November 23, 2005

      +

      Table of Contents

      +
        +
      1. Summary
      2. +
      3. Features
      4. +
      5. Bug Fixes
      6. +
      7. Known Issues
      8. +
      +

      1. Summary

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. NoItemStatus
      1 + Features +

      +8 +
      2 + Product SizeWindows - 30MB +Linux - 42MB
      3 + Bug Fixes29
      4 + Code Contributionshttp://www.vtiger.com/wiki/index.php/Vtiger_CRM_Code_Contributions +
      5 + Database Migration + Not Available. 
      6 + vtiger CRM - PHP DocumentationBundled with the Product (<vtiger CRM +Home>/vtigerCRM_docs directory)
      7Product DocumentationAvailable at the Wiki
      8Source Code LabelVTIGERCRM_4_5_M3
      9 + Known Issues4
      10 + List of Files Changed from V 4.5 Development 2 to +V 4.5 Development 3110
      11List of Files Changed from V 4.2 Development 1 to +V 4.5 Development 3277
      12List of Files Changed from V 4.2 Patch 2 to V 4.5 +Development 3190
      +

      Back +to Top

      +

      2. Features

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. No Ticket +ID + Subject
      1 +
      +
      +

      Progress bar display during the vtiger CRM database creation +in Installation wizard.

      +
      2 +
      +
      Default Organization Sharing in Security is modified +according to the new Security Schema. Migration support is also +provided for this feature.
      3588 + Suppress sending mail to account when a ticket is submitted.
      4 +
      +
      Product quantity in stock is automatically updated when +the  goods specified in the Purchase Order are received. + + Note: To update the product quantity in stock, users have +to change the Status drop-down list value to 'Received Shipment' +immediately after receiving the shipment.
      5
      +
      In Office Plug-in, fields from multiple modules (Accounts, +Contacts, Leads, HelpDesk, and Users) can be merged while creating mail +merge templates.
      6
      +
      In vtiger CRM create mail merge documents by merging fields +from multiple modules (Accounts,Contacts, Users)
      7
      +
      Provided support for User field in mail merge documents
      8
      +
      Mail merge all the records from a module by selecting "Select +All" checkbox in ListView of Accounts, Contacts, Leads, and HelpDesk +modules.
      + +

      3. Product Size

      + + + + + + + + + + + + + + + + + + +
      DistributionVersion 4.2 Build Size Version 4.5 Milestone 3 Build Size
      Windows (EXE)42 MB +

      +
      30 MB
      Linux (BIN)39 MB +

      +
      42 MB
      + +

      4. Bug Fixes

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. No Bug IDSubject
      1539In the Potential related list view the currency value should +be aligned right, and the currency symbol should be shown in the title +instead of in front of every value.
      2640 Issue in Pop-up New link
      3665
      +
       Check-all checkbox checks wrong checkboxes
      4761 Added dash after Potential Name when converting from +Lead
      5644 Start/End date options in Custom View
      6643Issue in Group Activities display in Home page
      7689utils.php call time pass reference error
      8770Checkbox fields are saved with null instead of 0 value.
      9570Missing information when converting Lead to Contact
      10754Date Format on Quotes, Invoices and Orders
      11511Custom view-  if lastname is selected the first +name and the last name are displayed
      12645Html tags are not shown properly in activity description
      13463Don't show "My group allocation" section if no group is +defined
      14849user belonging to more than 2 group .issue
      15820Product image editing error
      16831custom view error
      17695call time pass reference is corrected
      18484Tickets assigned to a group error
      19851Wrong picklist value in edit view
      20 Access to vtigercrm.log files restricted - +vulnerability fix.
      21
      +
      833
      +
      test mail can be sent to test +the e-mail function on configuring the mail server
      22
      +
      718
      +
      Signatures are double-spaced in +e-mails
      23
      +
      453
      +
      issue in vendor search
      24
      +
      564
      +
      Tickets assigned to Groups
      25
      +
      195
      +
      Email - admin mail is empty, +then cc in email is not going
      26
      +
      710
      +
      activity notifications -> +display further information
      27
      +
      504 New Contact -Account addressNew +Contact -Account address
      28259Office Integration account name +in address block
      29378Office Plugin field selection
      + +

      6. Known Issues

      + + + + + + + + + + + + + + + + + + + + + + + +
      S. No Subject
      1 +

      In user creation page, by default the Organization is +displayed in Role drop-down list field but there is no action +associated with the Organization value. Kindly select roles +other than Organization in the drop-down list.

      +
      2 +

      While sending mass e-mail from Leads/Contact/Accounts, +validation check will not be performed for the To field.

      +
      3 In Block rearrangement feature, If a field is +moved to an unused or new block, the field will not be displayed.
      4 In E-mail ListView, if mail is sent to multiple +recipients the entries will be displayed twice.
      +

       

      +
      +
      +

      vtiger CRM 4.5 : Development Version 2 - Release Notes

      +

      Date: November 16, 2005

      +

      Table of Contents

      +
        +
      1. Summary
      2. +
      3. Features
      4. +
      5. Product Size
      6. +
      7. Bug Fixes
      8. +
      9. Database Migration
      10. +
      11. Known Issues
      12. +
      13. List of Files Changed from V 4.5 +Development 1 to V 4.5 Development 2
      14. +
      15. List of Files Changed from V 4.2 Patch 2 +to V 4.5 Development 2
      16. +
      +

      1. Summary

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. NoItemStatus
      1Features3 +

      +
      2Product SizeWindows - 31MB
      +Linux - 41MB
      3Bug Fixes24
      4Code ContributionsNil
      5vtiger CRM - PHP DocumentationBundled with Product
      6Product DocumentationAvailable at Wiki
      7Source Code LabelVTIGERCRM_4_5_M2
      8List of Files Changed from V 4.5 Development 1 to +V 4.5 Development 2137
      9List of Files Changed from V 4.2 Patch 2 to V 4.5 +Development 2279
      +

      Back to Top

      +

      2. Features

      + + + + + + + + + + + + + + + + + + + +
      S. No Subject
      1 +

      Profile management module is revamped completely

      +
      2 +

      Display all the records that are assigned to users dynamically +in a scrollable format.

      +
      3Documentation for vtiger CRM - PHP libraries is +bundled with the product. (Present under vtigerCRM_docs directory)
      + +

      3. Product Size

      + + + + + + + + + + + + + + + + + + +
      DistributionVersion 4.2 Build Size Version 4.5 Milestone 2 Build Size
      Windows (EXE)42 MB +

      +
      31 MB +

      +
      Linux (BIN)39 MB +

      +
      41 MB
      + +

      4. Bug Fixes

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. No Bug IDSubject
      1810 +

      The close link in activities custom view returns to the +default view

      +
      2  +

      E-mail functions are restructured in the following mailing +functions:

      +
        +
      • Send E-mail to assigned to user, Lead, Contact and Account +in Emails module
      • +
      • Send notification to the assigned to user in Activities +module
      • +
      • Send Ticket details to the assigned to user and Parent in +HelpDesk
      • +
      • Send customer portal login details to the customer in +Contact module
      • +
      • Send mail about the portal ticket creation to the module +owner and the customer itself in Customer Portal
      • +
      +
      3768Lead Street text box restricted to 30 chars
      4486Not Held Meetings shown in Activities instead of +History
      5771Events with status "Not Held" appear still in +Activities instead of the history table
      6682Creating an event with status planned for past +time
      7629Select End date as today's date
      8635End date need not be mandatory if there start +date is mandatory
      9411New Event Creation
      10809Designation Should be converted into Title field +of Contact
      11725Field "Designation" does not seem to get carried +across to either the Account, Potential nor Contact entries.
      12777Converting a lead does not allow two decimal +places
      13700Events->Status is not displayed
      14446displaying product id instead of product name in +ticket list view
      15112Generated Reports topic change
      16359Spelling Error in Reports
      17369'Translation issue'
      18398quotation custom view
      19 Issue - Columns to Total in Reports
      20817table names PortalInfo and CustomerDetails should +be changed in lower case
      21818Added module in portal and the tickets should be +assigned to the owner of the module
      22819after saving the ticket control goes to list of +tickets instead of new ticket's detail view(in customerportal)
      23824E-mail title is missing in E-mail DetailView
      24 +

      +
      +

      +
      +
      nusoap version upgraded to 0.7.1 +

      +
      +
      +

        +

      +
      + +

      5. Database Migration

      +

      Database migration support is provided for the following versions: +

      +

      +
        +
      • From vtigerCRM 4.2 Patch2 to vtigerCRM Developer Version 2
      • +
      • From vtigerCRM Developer Version 1 to vtigerCRM Developer +Version 2
      • +
      +

      Database Migration Procedure:

      +
        +
      1. Download the attached Migration zip and extract to the +<vtigerCRM home> directory (Migration42p2_to_45dev2.zip)
      2. +
      3. Access the dev_index.php file through the browser.
      4. +
      5. Select the versions to migrate.
        +
      6. +
      + +

      6. Known Issues

      + + + + + + + + + + + + + + + + + + + + + + + +
      S. No Subject
      1 +

      In user creation page, by default the Organization is +displayed in Role drop-down list field but there is no action +associated with the Organization value. Kindly select roles +other than Organization in the drop-down list.

      +
      2 +

      While sending mass e-mail from Leads/Contact/Accounts, +validation check will not be performed for the To field.

      +
      3 In Block rearrangement feature, If a field is +moved to an unused or new block, the field will not be displayed.
      4 In E-mail ListView, if mail is sent to multiple +recipients the entries will be displayed twice.
      +
      +

      vtiger CRM 4.5 - Development Version 1 Release Notes +

      Date: November 9, 2005

      +

      +

      Summary:

      + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. NoItemTotalRemarks
      1Features1 
      2Bug Fixes50 
      3Code Contributions64 
      +

      Henceforth the Emails Send/Saved will be treated like mails in Send +items, of our regular mail client, if such emails, need to be resent, +the recipients to be selected again.

      +

      1. Features

      +

      Added BCC field in Emails

      +

      2. Bug Fixes

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. No Bug IDSubject
      1638Priority for Events
      2157Inventory Mgmt Related List Show All Details
      3433Search option missing in Popup Purchase order
      4454Issue in creating new note from product detail +view
      5384Activities not saving?
      6233Bug in invoice
      7220Some Bug in Vtiger 4.2 - Invoice
      8373No Title for description
      9256name in account's address information
      10693Select Contact option Not Available
      11205spelling error and There doesn't seem to be a way +to add a first nam
      12 Thunderbird plugin dialog has to be closed twice
      13 ThunderBird - window problem
      14 print option should open new page
      15 email,phone fields are not validated in contacts
      16 Problems with Thunderbird plugin
      17 Thunderbird Plugin: Error importing Contacts
      18  Thunderbird Extn count doesn't match
      19 Custom view - Mandatory check
      20 Product Custom view
      21744Terms & Conditions in Company Details as well +as in Edit View
      22692While exporting SalesOrder i got New column after +Quote Name.
      23688while generating reports if we select reports an +error message is displayed this issue has been fixed
      24686after integrating the code contributed by raju +the lead names are not displayed in the popup in email module
      25  Having status for events in Customview of +Activities-Customer request
      26284In populating the Demo data of leads,giving the +companyname
      27289In populating Demo data, giving the value for +assigned to
      28151Attachment contains footer of vitgerCRM and +javascript (I attached license_agreement.txt of vtigercrm, but i got in +other name and not in .txt format and content is mixed with +vtigerCRM Footer)
      29194Email Email,Webmail Tab is comming for all pages +in Email Module (While Editing email,still the listview tab +(Emails,Webmails) is comming. It should be like Email : ""Subject"")
      30440issue while creating new contact&account +through add business card
      31690Problem in Close Date and Last modified of the +list of Sales Stage History of the Potentials
      32694Date showing is incorrect in add business card +(when add new business card, there is date for appoinment where the +showing date is not in current user date format
      33158Pick list Custom field issue
      34370duplicate entry in list view
      35288Issue in Inventory Popups
      36347Error Message
      37358Filtering by Headers in Leads
      38342New users can'´t login
      39360System Configuration
      40145related module is empty
      41179Potential-activities
      42203Inventory RL
      43211There is no option to create a Potential for a +contact
      44212Create Quote from Contact
      45354Critical security vulnerability in multi-instance +installations / multiple instance login problem
      46670Propegate Account Address info into New Contact
      47681Bug in utils.php function getListViewEntries
      48754User_name instead of firstname lastname used as +sender in emails
      49773In custom views of Tickets the Ticket id is +missing. Its also not possible to filter by ticket id's.
      50763Misspelling in KeyMetrics
      +

      3. Code Contributions

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. No +

      +
      Forums +

      +

      Description
      1 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=1954 +

      +
      GUI +

      rearrange fields within blocks?

      +

      Drag and drop for the fields with different blocks

      +

      +
      2 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=2750 +

      +
      Appropriate +

      tabindex for edit fields.

      +

      One more column is added to the fields table to get the tab

      +

      +
      3 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=2368 +

      +
      Release Relations in +Contacts and Accounts
      4 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=2852 +

      +
      Change the status of +the activities in CustomViews from Activities module
      5 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=2031 +(PDF format)In +the PDF +

      report, to get the address

      +on the right side of the page.
      6 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=1689 +

      +
      LDAP and Active +Directory Support Patch
      7 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=2364 +

      +
      Description +

      visible for History and Notes in Acc/Cnts List view.

      +

      +
      8 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=2748 +

      +
      Make a note before +closing the activity in Home Page
      9 +

      +
      http://forums.vtiger.com/viewtopic.php?p=13502#13502 + Post subject: Bug +resolved (Ticket ID 773): TicketId for dropdown lists...
      10 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=1692Adding +

      priority to Events

      +- Feature
      11 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=2617PDF's output +formatting.
      12 +

      +
      +

      http://www.vtiger.com/discussions/viewtopic.php?t=1530

      +
      Revised Tracker
      13 +

      +
      http://forums.vtiger.com/viewtopic.php?p=13396#13396 + New pdf from matt
      14 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=1585Displaying the +meeting in the calendar, Present in 4.2GA
      15 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=2029Import and Export +Products
      16 +

      +
      +

      http://www.vtiger.com/discussions/viewtopic.php?t=2000

      +
      During +

      'Import', the person who is importing the CSV files +'user_name' in is

      +assigned  to 'Assigned to' field
      17 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=2139When creating a 'New +

      Product'  there was an error in javascript. This is +integrated in

      +patch1
      18 +

      +
      +

      http://www.vtiger.com/discussions/viewtopic.php?t=2196

      +
      The world clock +doesn't show 12pm correctly. It was showing 00pm
      19 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=2524Scroll bars are +added to the +

      'Related List' of Account and contacts for 'Attachments & +Notes'

      +and 'History'
      20 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=2431Search ny Ticket id +in HelpDesk
      21 +

      +
      +

      http://www.vtiger.com/discussions/viewtopic.php?t=2406

      +
      If you write a +

      long description in an activity, it takes off a lot of space +because the text field is one column wide only.

      +

      +With this fix, the descriptions are spaned over all columns,
      22 +

      +
      +

      http://www.vtiger.com/discussions/viewtopic.php?t=2324

      +
      This will move +

      the vTiger logo upwards and the tabs will start from the left +of the page. I've applied this all the themes

      +except 'blue' theme
      23 +

      +
      +

      +

      ttp://www.vtiger.com/discussions/viewtopic.php?t=2025 +

      +
      The date +

      format required is YYYY-mm-dd however the popup uses +mm-dd-YYYY,

      +

      A diffeent format. Upon trying to submit changes, a date error +(js

      +alert) pops up stating invalid month
      24 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=2744 +

      +
      All users in a +activity can view it in Calendar
      25 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=3105 +

      +
      Imporved Emailing +system with easy mass mail support- given by Raju +

      +
      26 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=3100 +

      +
      One color by user in +Calendar +

      +
      27 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=3149 +

      +
      Vtiger php +installer script multilanguage +

      +
      28 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=3143 +

      +
      Fun with Google Maps +

      +
      29 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=3045 +

      +
      Automatic Inventory +Updating +

      +
      30 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=2681 +

      +
      Helpdesk Navigation. +

      In helpdesk, the navigation below the list view.

      +

      +
      31 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=2005 +

      +
      Patches- activity +rows on Home tab, custom activity view fix +

      +
      32 +

      +
      http://www.vtiger.com/discussions/viewtopic.php?t=1770 +

      +
      Make +QuickActivityRegister have enddate(duedate) +

      To have an end date,when creating an activity from the +calendar

      +

      +
      33 +

      +
      http://forums.vtiger.com/viewtopic.php?p=13390#13390 + UI improvement: +Tabbed details and related lists
      34 +

      +
      http://forums.vtiger.com/viewtopic.php?t=3251 +

      +
      Improved pagination +in List View +

      +
      35 +

      +
      http://forums.vtiger.com/viewtopic.php?t=3359 +

      +
      Tickets sorted by +ticket id desc +

      +
      36 +

      +
      http://forums.vtiger.com/viewtopic.php?t=2482 +

      +
      First release of +Communications and Mass Mailing +

      +
      37 +

      +
      http://forums.vtiger.com/viewtopic.php?t=3105 +

      +
      Imporved Emailing +system with easy mass mail support +

      +
      38 +

      +
      http://forums.vtiger.com/viewtopic.php?t=3226 +

      +
      Full Telephony +Integration +

      +
      39 +

      +
      http://forums.vtiger.com/viewtopic.php?t=3342 +

      +
      Report Filters in +PDF And Excel exports +

      +
      40 +

      +
      http://forums.vtiger.com/viewtopic.php?t=3079 +

      +
      Export Activities +to Palm +

      +
      41 +

      +
      http://forums.vtiger.com/viewtopic.php?t=3376 +

      +
      custom invoice view +using custom fields fix (4.2 Patch 2) +

      +
      42 +

      +
      http://forums.vtiger.com/viewtopic.php?t=3367 +

      +
      contactserialize.php +fixes (4.2 Patch 2) +

      +
      43 +

      +
      http://forums.vtiger.com/viewtopic.php?t=1954 +

      +
      GUI rearrange +fields within blocks +

      +
      44 +

      +
      http://forums.vtiger.com/viewtopic.php?t=3390 +

      +
      Hierarchical rights +

      +
      45 +

      +
      http://forums.vtiger.com/viewtopic.php?t=3143 +

      +
      +

      Fun with Google Maps

      +
      46 +

      +
      http://forums.vtiger.com/viewtopic.php?t=3247 +

      +
      +

      Simple Drupal Integration

      +
      47 +

      +
      http://forums.vtiger.com/viewtopic.php?t=3290 +

      +
      +

      Expenses Module Integration

      +
      48 +

      +
      http://forums.vtiger.com/viewtopic.php?t=3548 +

      +
      Activities and Notes +fixes for 4.2 patch 2
      49 +

      +
      http://forums.vtiger.com/viewtopic.php?t=3545 +

      +
      Invoice & Quotes +layout fixes
      50 +

      +
      http://forums.vtiger.com/viewtopic.php?t=2597 +

      +
      +

      Postgres Support

      +
      51 +

      +
      http://sourceforge.net/mailarchive/forum.php?thread_id=8380546&forum_id=44763 +

      +
      +

      Patch for customer Portal- Michael

      +

      fixed some typos

      +
      52 +

      +
      http://sourceforge.net/mailarchive/forum.php?thread_id=8365518&forum_id=44763 +

      +
      +

      Patch for Install - Michael

      +* fixed some typos and invalid html +

      * additional permissions check - prevent

      +

      'My Pipeline' showing a permissions error on new install

      +
      53 +

      +
      http://sourceforge.net/mailarchive/forum.php?thread_id=8365518&forum_id=44763 +

      +
      +

      Patch for vtigercrm nusoap - Michael

      +The following patch upgrades the version of +

      nusoap library from 0.67 to

      +

      0.69.

      +

      +
      54 +

      +
      http://forums.vtiger.com/viewtopic.php?t=3053&highlight=stema +

      +
      Arrange emails by +sent date
      55 +

      +
      +

      +
      +
      Enchanced PDF in +Quotes
      56 +

      +
      http://forums.vtiger.com/viewtopic.php?t=3509&highlight=vip +

      +
      Change Home Page +Order
      57 +

      +
      Overlapping of +company logo and product name while exporting in Invoice +

      +
       
      58overlapping of +company logo and product name while exporting in Invoice  
      59Description visible +for History and Notes in Acc/Cnts List view. 
      60Change the status of +the activities in CustomViews from Activities module 
      61Invoice & Quotes +layout fixes 
      62Arranging the home +page contributed by Mike has been integrated (Bug ID: 291) 
      63Imporved Emailing +system with easy mass mail support(Raju) (Bug ID: 500) 
      64Displaying Emails by +Sent date order(Rcleeve)(Bug ID: 687 ) 
      65Arranging the blocks +in settings page(comes under a code contribution) (Bug ID: 648 )  
      +

      Known Issues

      +

      1) While creating a new user, by default 'Organisation' will be +set  as 'Role' to the user. Kindly change it to  your +specified role before saving, if 'Organisation' is set as role the +user, the will not be able to login to the application.

      +

      2) When sending mass mail form +Leads/Contact/Accounts, validation is not done in 'To' field.

      +

      +

      3) In Block Re-arrangement Feature, +If is a field is moved to a unused/new block, the field will not be +displayed.

      +

      +

      4) In Email Listview, if mail is +sent to mutiple recipients the entries will be displayed twice.

      + + From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 05:21:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 12:21:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9604 - in /vtigercrm/branches/5.0.1: Smarty/templates/ modules/PriceBooks/ modules/Products/ Message-ID: <20061009122141.DA1BA66ADCB@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 06:21:32 2006 New Revision: 9604 Log: * Modified to fix the issue 2110 Modified: vtigercrm/branches/5.0.1/Smarty/templates/AddProductToPriceBooks.tpl vtigercrm/branches/5.0.1/Smarty/templates/AddProductsToPriceBook.tpl vtigercrm/branches/5.0.1/modules/PriceBooks/PriceBook.js vtigercrm/branches/5.0.1/modules/Products/AddProductToPriceBooks.php vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php vtigercrm/branches/5.0.1/modules/Products/Product.js Modified: vtigercrm/branches/5.0.1/Smarty/templates/AddProductToPriceBooks.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/AddProductToPriceBooks.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/AddProductToPriceBooks.tpl Mon Oct 9 06:21:32 2006 @@ -108,11 +108,18 @@ {ldelim} var fieldname_array = new Array({$FIELD_NAME_ARRAY}); var unitprice,fieldname; + var id; + var fieldinfo; + var checkid; for(j=0; j @@ -113,13 +113,13 @@ { $list_body .= '
    '.$adb->query_result($list_result,$i,"bookname").''.$unit_price.'
    - + '; + $list_body .= ''; $list_body .= ''; $list_body .= ''; $list_body .= ''; - $list_body .= ''; + $list_body .= ''; } } Modified: vtigercrm/branches/5.0.1/modules/Products/Product.js ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/Product.js (original) +++ vtigercrm/branches/5.0.1/modules/Products/Product.js Mon Oct 9 06:21:32 2006 @@ -8,18 +8,16 @@ * ********************************************************************************/ document.write(" - -
      @@ -130,11 +132,11 @@ $unit_price = $adb->query_result($list_result,$i,"unit_price"); $field_name=$entity_id."_listprice"; - $list_body .= ''.$adb->query_result($list_result,$i,"productname").''.$adb->query_result($list_result,$i,"productcode").''.$unit_price.'
    - - - - - -
    -
    - {$MOD.LBL_MY_MAIL_SERVER_DET}
    -

    - - - - - - - - - -
    - - - - - - + +
    - - - - - - - -
     {$MOD.LBL_MY_MAIL_SERVER_DET}  
    -
    - - - - - - + + +
    - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$MOD.LBL_EMAIL_ID}
    {$MOD.LBL_DISPLAY_NAME}{$MOD.LBL_NAME_EXAMPLE}
    {$APP.LBL_REQUIRED_SYMBOL} {$MOD.LBL_EMAIL_ADDRESS} {$MOD.LBL_EMAIL_EXAMPLE}
     
    {$MOD.LBL_MAIL_SERVER_SETTINGS}
    {$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_MAIL_SERVER_NAME} 
    {$APP.LBL_REQUIRED_SYMBOL}{$APP.LBL_LIST_USER_NAME} 
    {$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_LIST_PASSWORD} 
     
    {$MOD.LBL_MAIL_PROTOCOL} +{**} + + + + + + + + +
    +
    + {$MOD.LBL_MY_MAIL_SERVER_DET}
    +

    + + + + + + + + + +
    + + + + + + -
    + + + + + + + +
     {$MOD.LBL_MY_MAIL_SERVER_DET}  
    +
    + + + + + + - -
    + + + - - -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$MOD.LBL_EMAIL_ID}
    {$MOD.LBL_DISPLAY_NAME}{$MOD.LBL_NAME_EXAMPLE}
    {$APP.LBL_REQUIRED_SYMBOL} {$MOD.LBL_EMAIL_ADDRESS} {$MOD.LBL_EMAIL_EXAMPLE}
     
    {$MOD.LBL_INCOME_SERVER_SETTINGS}
    {$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_MAIL_SERVER_NAME} 
    {$APP.LBL_REQUIRED_SYMBOL}{$APP.LBL_LIST_USER_NAME} 
    {$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_LIST_PASSWORD} 
     
    {$MOD.LBL_MAIL_PROTOCOL} -  {$MOD.LBL_IMAP2} -  {$MOD.LBL_IMAP4} -  
    {$MOD.LBL_SSL_OPTIONS} -  {$MOD.LBL_NO_TLS} -   {$MOD.LBL_TLS}  
    {$MOD.LBL_CERT_VAL} -  {$MOD.LBL_VAL_SSL_CERT} -  {$MOD.LBL_DONOT_VAL_SSL_CERT} -  
    {$MOD.LBL_INT_MAILER} -  {$MOD.LBL_INT_MAILER_USE} -  {$MOD.LBL_INT_MAILER_NOUSE} -  
    {$MOD.LBL_REFRESH_TIMEOUT} - -  
    {$MOD.LBL_EMAILS_PER_PAGE} 
    {$MOD.LBL_MAIL_DISCLAIM}
     
    - -    -
     
    -
    -
    - -
    - -{$JAVASCRIPT} +  {$MOD.LBL_IMAP2} +  {$MOD.LBL_IMAP4} +
     
    {$MOD.LBL_SSL_OPTIONS} +  {$MOD.LBL_NO_TLS} +   {$MOD.LBL_TLS}  
    {$MOD.LBL_CERT_VAL} +  {$MOD.LBL_VAL_SSL_CERT} +  {$MOD.LBL_DONOT_VAL_SSL_CERT} +  
    {$MOD.LBL_INT_MAILER} +  {$MOD.LBL_INT_MAILER_USE} +  {$MOD.LBL_INT_MAILER_NOUSE} +  
    {$MOD.LBL_REFRESH_TIMEOUT} + +  
    {$MOD.LBL_EMAILS_PER_PAGE} 
    {$MOD.LBL_MAIL_DISCLAIM}
     
    + +    +
     
    +
    + + + + + + +{$JAVASCRIPT} Modified: vtigercrm/trunk/Smarty/templates/AddProductToPriceBooks.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/AddProductToPriceBooks.tpl (original) +++ vtigercrm/trunk/Smarty/templates/AddProductToPriceBooks.tpl Tue Oct 10 10:02:43 2006 @@ -108,11 +108,18 @@ {ldelim} var fieldname_array = new Array({$FIELD_NAME_ARRAY}); var unitprice,fieldname; + var id; + var fieldinfo; + var checkid; for(j=0; j - + Users Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Tue Oct 10 10:02:43 2006 @@ -117,6 +117,14 @@ {$APP.LBL_CANCEL_BUTTON_LABEL} + {elseif $keyid eq '85'} +  Skype{$keyval} +

    + {elseif $keyid eq '19' || $keyid eq '20'} {if $label eq $MOD.LBL_ADD_COMMENT} Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Tue Oct 10 10:02:43 2006 @@ -51,7 +51,7 @@ {/if} {elseif $uitype eq 19 || $uitype eq 20} - {if $fldlabel eq 'Add Comment'} + {if $fldlabel eq $MOD.LBL_ADD_COMMENT} {assign var=fldvalue value=""} {/if} @@ -135,10 +135,10 @@ {assign var=style_group value='display:block'} {/if} -  User +  {$APP.LBL_USER} {if $secondvalue neq ''} -  Group +  {$APP.LBL_GROUP} {/if} + + {elseif $uitype eq 85} + + {$fldlabel} + + + Skype + {elseif $uitype eq 71 || $uitype eq 72} Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl Tue Oct 10 10:02:43 2006 @@ -111,15 +111,25 @@ {include file='DetailViewHidden.tpl'} {strip} - + + {elseif $MODULE eq 'Potentials'}   - + {elseif $MODULE eq 'Vendors'} + {else} - + {/if} {elseif $header eq 'Leads'} {if $MODULE eq 'Campaigns'} Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Tue Oct 10 10:02:43 2006 @@ -110,12 +110,7 @@ {/if} - {if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'} - - {else} - - {/if} - + {if $smarty.request.action eq 'OrganizationConfig' || $smarty.request.action eq 'EditCompanyDetails' || $smarty.request.action eq 'add2db'} @@ -179,6 +174,13 @@ {/if} + + {if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'} + + {else} + + {/if} +
    - {if $EDIT_DUPLICATE eq 'permitted'} -   -   - {/if} - {if $DELETE eq 'permitted'} -   - {/if} + + + + + +
    + {if $EDIT_DUPLICATE eq 'permitted'} +   + {/if} + + {if $EDIT_DUPLICATE eq 'permitted'} +   + {/if} + {if $DELETE eq 'permitted'} +   + {/if} +
    *} + Modified: vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl Tue Oct 10 10:02:43 2006 @@ -37,15 +37,16 @@ {/if} {elseif $header eq 'Products'} {if $MODULE eq 'PriceBooks'} -
    {$MOD.INVENTORYNOTIFICATION}
    {$MOD.LBL_INVENTORY_TANDC}
    {$MOD.LBL_INVENTORY_TANDC}
    {$MOD.LBL_OTHER_SETTINGS}
    {$MOD.LBL_MIGRATION}
    {$MOD.LBL_INVENTORY_TANDC}
    {$MOD.LBL_INVENTORY_TANDC}
    Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Tue Oct 10 10:02:43 2006 @@ -311,63 +311,6 @@ - - - - - - - - - - - - - -
    {$MOD.INVENTORYTERMSANDCONDITIONS}{$MOD.LBL_INVENTORY_TANDC}
    {$MOD.LBL_INV_TANDC_DESCRIPTION}
    - - - - - - - - - - - - - -
      
     
    - - - - - - - - - - - - -
      
     
    - - - - - - - - - - - - -
      
     
    - - - @@ -536,20 +479,24 @@ {$MOD.LBL_MIGRATION_INFO} -   - - -   -   -   - - - - - - - + + + + + + + + + + +
    {$MOD.INVENTORYTERMSANDCONDITIONS}{$MOD.LBL_INVENTORY_TANDC}
    {$MOD.LBL_INV_TANDC_DESCRIPTION}
    + + + + + + Modified: vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Tue Oct 10 10:02:43 2006 @@ -217,8 +217,33 @@ } ); } + function picklist_validate(mode,fieldname,module,uitype) { + + //alert(trim($("picklist_values").value)); + + var pick_arr=new Array(); + pick_arr=trim($("picklist_values").value).split('\n'); + var len=pick_arr.length; + for(i=0;i  {if $EDIT_MODE neq 'true'} - + {/if} Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Tue Oct 10 10:02:43 2006 @@ -115,7 +115,7 @@ - {if $header eq 'Comments' || $header eq 'Comment Information'} + {if $header eq $MOD.LBL_COMMENTS || $header eq $MOD.LBL_COMMENT_INFORMATION}   Modified: vtigercrm/trunk/connection.php ============================================================================== --- vtigercrm/trunk/connection.php (original) +++ vtigercrm/trunk/connection.php Tue Oct 10 10:02:43 2006 @@ -1,4 +1,4 @@ -query_result($adb->query("select * from vtiger_seattachmentsrel where crmid=$id"),0,'attachmentsid'); + { + //if a image attached already then remove that otherwise do not delete the attachment + $query = "select vtiger_attachments.attachmentsid from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid inner join vtiger_contactdetails on vtiger_contactdetails.imagename=vtiger_attachments.name where vtiger_seattachmentsrel.crmid=$id"; + $old_attachmentid = $adb->query_result($adb->query($query),0,'attachmentsid'); + } foreach($_FILES as $fileindex => $files) { @@ -274,7 +278,7 @@ } //This is to handle the delete image for contacts - if($module == 'Contacts' && $file_saved) + if($module == 'Contacts' && $file_saved && $old_attachmentid != '') { $del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$old_attachmentid"); $del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$old_attachmentid"); @@ -384,11 +388,13 @@ $sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')'; $adb->query($sql3); + $log->debug("Exiting from uploadAndSaveFile($id,$module,$file_details) method. return true"); return true; } else { $log->debug("Skip the save attachment process."); + $log->debug("Exiting from uploadAndSaveFile($id,$module,$file_details) method. return false"); return false; } } Modified: vtigercrm/trunk/data/SugarBean.php ============================================================================== --- vtigercrm/trunk/data/SugarBean.php (original) +++ vtigercrm/trunk/data/SugarBean.php Tue Oct 10 10:02:43 2006 @@ -58,7 +58,7 @@ } //$this->date_modified = $this->db->formatDate(date('YmdHis')); - $this->date_modified = $this->db->formatDate(date('YmdHis')); + $this->date_modified = date('YmdHis'); if (isset($current_user)) $this->modified_user_id = $current_user->id; if($isUpdate) @@ -68,7 +68,7 @@ else { //$this->date_entered = $this->db->formatDate(date('YmdHis')); - $this->date_entered = $this->db->formatDate(date('YmdHis')); + $this->date_entered = date('YmdHis'); if($this->new_schema && $this->new_with_id == false) Modified: vtigercrm/trunk/include/CustomFieldUtil.php ============================================================================== --- vtigercrm/trunk/include/CustomFieldUtil.php (original) +++ vtigercrm/trunk/include/CustomFieldUtil.php Tue Oct 10 10:02:43 2006 @@ -73,6 +73,10 @@ { $fldname = 'Multi-Select Combo Box'; } + elseif($uitype == 85) + { + $fldname = 'Skype'; + } $log->debug("Exiting getCustomFieldTypeName method ..."); return $fldname; } @@ -216,6 +220,10 @@ { $fieldtype = '11'; } + elseif($label == 'Skype') + { + $fieldtype = '12'; + } $log->debug("Exiting getFldTypeandLengthValue method ..."); return $fieldtype; } Modified: vtigercrm/trunk/include/js/customview.js ============================================================================== --- vtigercrm/trunk/include/js/customview.js (original) +++ vtigercrm/trunk/include/js/customview.js Tue Oct 10 10:02:43 2006 @@ -120,8 +120,8 @@ } else return false } } -var fieldValueArr=new Array('Text','Number','Percent','Currency','Date','Email','Phone','Picklist','URL','Checkbox','TextArea','MultiSelectCombo'); -var fieldTypeArr=new Array('text','number','percent','currency','date','email','phone','picklist','url','checkbox','textarea','multiselectcombo'); +var fieldValueArr=new Array('Text','Number','Percent','Currency','Date','Email','Phone','Picklist','URL','Checkbox','TextArea','MultiSelectCombo','Skype'); +var fieldTypeArr=new Array('text','number','percent','currency','date','email','phone','picklist','url','checkbox','textarea','multiselectcombo','skype'); var currFieldIdx=0,totFieldType; var focusFieldType; @@ -175,7 +175,7 @@ lengthLayer.style.visibility="visible" decimalLayer.style.visibility="hidden" pickListLayer.style.visibility="hidden" - } else if (type=='date' || type=='email' || type=='phone' || type=='url' || type=='checkbox' || type=='textarea') { + } else if (type=='date' || type=='email' || type=='phone' || type=='url' || type=='checkbox' || type=='textarea' || type=='skype') { getObj("lengthdetails").style.visibility="hidden" decimalLayer.style.visibility="hidden" pickListLayer.style.visibility="hidden" Modified: vtigercrm/trunk/include/js/dtlviewajax.js ============================================================================== --- vtigercrm/trunk/include/js/dtlviewajax.js (original) +++ vtigercrm/trunk/include/js/dtlviewajax.js Tue Oct 10 10:02:43 2006 @@ -216,7 +216,10 @@ }else if(uitype == '17') { getObj(dtlView).innerHTML = ""+tagValue+" "; - }else if(uitype == '53') + }else if(uitype == '85') + { + getObj(dtlView).innerHTML = ""+tagValue+" "; + }else if(uitype == '53') { var hdObj = getObj(hdTxt); if(typeof(document.DetailView.assigntype[0]) != 'undefined') @@ -311,6 +314,23 @@ } }else if(uitype == '33') { + /* Wordwrap a long list of multi-select combo box items at the + * item separator string */ + const DETAILVIEW_WORDWRAP_WIDTH = "70"; // must match value in DetailViewUI.tpl. + + var lineLength = 0; + for(var i=0; i < r.length; i++) { + lineLength += r[i].length + 2; // + 2 for item separator string + if(lineLength > DETAILVIEW_WORDWRAP_WIDTH && i > 0) { + lineLength = r[i].length + 2; // reset. + r[i] = '
     ' + r[i]; // prepend newline. + } + // Prevent a browser splitting multiword items: + r[i] = r[i].replace(/ /g, ' '); + } + /* Join items with item separator string (which must match string in DetailViewUI.tpl, + * EditViewUtils.php and CRMEntity.php)!! + */ getObj(dtlView).innerHTML = r.join(", "); }else { Modified: vtigercrm/trunk/include/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/include/language/en_us.lang.php (original) +++ vtigercrm/trunk/include/language/en_us.lang.php Tue Oct 10 10:02:43 2006 @@ -620,8 +620,8 @@ 'LBL_CALCULATOR'=>'Calculator', -'LBL_CLOSE_WON' =>'Closed-Won', # 'Closed Won' -'LBL_CLOSE_LOST'=>'Closed-Lost', # 'Closed Lost' +'LBL_CLOSE_WON' =>'Closed Won', # 'Closed Won' +'LBL_CLOSE_LOST'=>'Closed Lost', # 'Closed Lost' 'LBL_USER'=>'User', @@ -1027,6 +1027,7 @@ //Record deleted message 'LBL_RECORD_DELETE'=>'The record you are trying to view has been deleted.', +'Part Number'=>'Part Number', ); Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Tue Oct 10 10:02:43 2006 @@ -600,9 +600,6 @@ /** * Get the username by giving the user id. This method expects the user id - * param $label_list - the array of strings to that contains the option list - * param $key_list - the array of strings to that contains the values list - * param $selected - the string which contains the default value */ function getUserName($userid) @@ -620,6 +617,29 @@ } $log->debug("Exiting getUserName method ..."); return $user_name; +} + +/** +* Get the user full name by giving the user id. This method expects the user id +* DG 30 Aug 2006 +*/ + +function getUserFullName($userid) +{ + global $log; + $log->debug("Entering getUserFullName(".$userid.") method ..."); + $log->info("in getUserFullName ".$userid); + global $adb; + if($userid != '') + { + $sql = "select first_name, last_name from vtiger_users where id=".$userid; + $result = $adb->query($sql); + $first_name = $adb->query_result($result,0,"first_name"); + $last_name = $adb->query_result($result,0,"last_name"); + $user_name = $first_name." ".$last_name; + } + $log->debug("Exiting getUserFullName method ..."); + return $user_name; } /** @@ -2430,6 +2450,13 @@ case 'Contacts': if(is_array($fields["contacts"])) { + //Checking for salutation type and checking the table column to be queried + $key = array_search('salutationtype',$fields["contacts"]); + if(isset($key) && $key !='') + { + $fields["contacts"][$key]='salutation'; + } + $columnfields = implode(',',$fields["contacts"]); $query = 'select '.$columnfields.' from vtiger_contactdetails where contactid='.$id; $result = $adb->query($query); @@ -2443,6 +2470,12 @@ case 'Leads': if(is_array($fields["leads"])) { + //Checking for salutation type and checking the table column to be queried + $key = array_search('salutationtype',$fields["contacts"]); + if(isset($key) && $key !='') + { + $fields["contacts"][$key]='salutation'; + } $columnfields = implode(',',$fields["leads"]); $query = 'select '.$columnfields.' from vtiger_leaddetails where leadid='.$id; $result = $adb->query($query); Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DetailViewUtils.php (original) +++ vtigercrm/trunk/include/utils/DetailViewUtils.php Tue Oct 10 10:02:43 2006 @@ -304,7 +304,8 @@ { $imgpath = "test/contact/".$imagename; $label_fld[] =$mod_strings[$fieldlabel]; - $label_fld["cntimage"] ='
     '.$mod_strings[$fieldlabel]; + //This is used to show the contact image as a thumbnail near First Name field + //$label_fld["cntimage"] ='
     '.$mod_strings[$fieldlabel]; } else { @@ -462,7 +463,7 @@ if($tabid==4) { //$imgpath = getModuleFileStoragePath('Contacts').$col_fields[$fieldname]; - $sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid=".$col_fields['record_id']; + $sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid inner join vtiger_contactdetails on vtiger_contactdetails.imagename=vtiger_attachments.name where vtiger_seattachmentsrel.crmid=".$col_fields['record_id']; $image_res = $adb->query($sql); $image_id = $adb->query_result($image_res,0,'attachmentsid'); $image_path = $adb->query_result($image_res,0,'path'); @@ -932,6 +933,10 @@ $label_fld[] = ''.getRoleName($col_fields[$fieldname]).''; else $label_fld[] = getRoleName($col_fields[$fieldname]); + }elseif($uitype == 85) //Added for Skype by Minnie + { + $label_fld[] =$mod_strings[$fieldlabel]; + $label_fld[]= $col_fields[$fieldname]; } else { Modified: vtigercrm/trunk/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/EditViewUtils.php (original) +++ vtigercrm/trunk/include/utils/EditViewUtils.php Tue Oct 10 10:02:43 2006 @@ -106,7 +106,8 @@ } else { - $curr_time = date('H:i'); + $endtime = time() + (60 * 60); + $curr_time = date('H:i',$endtime); } } $fieldvalue[] = array($disp_value => $curr_time) ; @@ -152,6 +153,11 @@ $fieldvalue [] = $options; } elseif($uitype == 17) + { + $editview_label[]=$mod_strings[$fieldlabel]; + $fieldvalue [] = $value; + } + elseif($uitype == 85) //added for Skype by Minnie { $editview_label[]=$mod_strings[$fieldlabel]; $fieldvalue [] = $value; @@ -578,8 +584,8 @@ $query = 'select vtiger_attachments.path, vtiger_attachments.attachmentsid, vtiger_attachments.name from vtiger_products left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_products.productid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where productid='.$col_fields['record_id']; } else - { - $query = "select vtiger_attachments.path, vtiger_attachments.attachmentsid, vtiger_attachments.name from vtiger_contactdetails left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_contactdetails.contactid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where contactid=".$col_fields['record_id']; + { + $query = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid inner join vtiger_contactdetails on vtiger_contactdetails.imagename=vtiger_attachments.name where vtiger_seattachmentsrel.crmid=".$col_fields['record_id']; } $result_image = $adb->query($query); for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++) @@ -1195,12 +1201,14 @@ elseif($uitype == 105) { $editview_label[]=$mod_strings[$fieldlabel]; - $query = "select attachments.path, attachments.name from contactdetails left join seattachmentsrel on seattachmentsrel.crmid=contactdetails.contactid inner join attachments on attachments.attachmentsid=seattachmentsrel.attachmentsid where contactdetails.imagename=attachments.name and contactid=".$col_fields['record_id']; - $result_image = $adb->query($query); - for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++) - { - $image_array[] = $adb->query_result($result_image,$image_iter,'name'); - $image_path_array[] = $adb->query_result($result_image,$image_iter,'path'); + if( isset( $col_fields['record_id']) && $col_fields['record_id'] != '') { + $query = "select vtiger_attachments.path, vtiger_attachments.name from vtiger_contactdetails left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_contactdetails.contactid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where vtiger_contactdetails.imagename=vtiger_attachments.name and contactid=".$col_fields['record_id']; + $result_image = $adb->query($query); + for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++) + { + $image_array[] = $adb->query_result($result_image,$image_iter,'name'); + $image_path_array[] = $adb->query_result($result_image,$image_iter,'path'); + } } if(is_array($image_array)) for($img_itr=0;$img_itrdebug("Entering into function saveInventoryProductDetails($focus, $module)."); @@ -507,6 +507,18 @@ if($module == 'PurchaseOrder' && $update_prod_stock == 'true') { addToProductStock($prod_id,$qty); + } + if($module == 'SalesOrder') + { + if($updateStockAndDemand == 'true') + { + deductFromProductStock($prod_id,$qty); + deductFromProductDemand($prod_id,$qty); + } + if($updateDemand == 'true') + { + addToProductDemand($prod_id,$qty); + } } $query ="insert into vtiger_inventoryproductrel(id, productid, sequence_no, quantity, listprice, comment) values($focus->id, $prod_id , $prod_seq, $qty, $listprice, '$comment')"; Modified: vtigercrm/trunk/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/ListViewUtils.php (original) +++ vtigercrm/trunk/include/utils/ListViewUtils.php Tue Oct 10 10:02:43 2006 @@ -2079,6 +2079,8 @@ ON vtiger_crmentity.crmid = vtiger_campaign.campaignid LEFT JOIN vtiger_campaigngrouprelation ON vtiger_campaign.campaignid = vtiger_campaigngrouprelation.campaignid + INNER JOIN vtiger_campaignscf + ON vtiger_campaignscf.campaignid = vtiger_campaignscf.campaignid LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_campaigngrouprelation.groupname LEFT JOIN vtiger_users Modified: vtigercrm/trunk/include/utils/utils.php ============================================================================== --- vtigercrm/trunk/include/utils/utils.php (original) +++ vtigercrm/trunk/include/utils/utils.php Tue Oct 10 10:02:43 2006 @@ -837,7 +837,8 @@ $log->debug("Entering to_html(".$string.",".$encode.") method ..."); global $toHtml; if($encode && is_string($string)){//$string = htmlentities($string, ENT_QUOTES); - $string = str_replace(array_keys($toHtml), array_values($toHtml), $string); + if (is_array($toHtml)) + $string = str_replace(array_keys($toHtml), array_values($toHtml), $string); } $log->debug("Exiting to_html method ..."); return $string; @@ -2104,6 +2105,59 @@ $log->debug("Exiting addToProductStock method ..."); } + +/** This Function adds the specified product quantity to the Product Quantity in Demand in the Warehouse + * @param int $productId - ProductId + * @param int $qty - Quantity to be added + */ +function addToProductDemand($productId,$qty) +{ + global $log; + $log->debug("Entering addToProductDemand(".$productId.",".$qty.") method ..."); + global $adb; + $qtyInStck=getProductQtyInDemand($productId); + $updQty=$qtyInStck + $qty; + $sql = "UPDATE vtiger_products set qtyindemand=$updQty where productid=".$productId; + $adb->query($sql); + $log->debug("Exiting addToProductDemand method ..."); + +} + +/** This Function subtract the specified product quantity to the Product Quantity in Stock in the Warehouse + * @param int $productId - ProductId + * @param int $qty - Quantity to be subtracted + */ +function deductFromProductStock($productId,$qty) +{ + global $log; + $log->debug("Entering deductFromProductStock(".$productId.",".$qty.") method ..."); + global $adb; + $qtyInStck=getProductQtyInStock($productId); + $updQty=$qtyInStck - $qty; + $sql = "UPDATE vtiger_products set qtyinstock=$updQty where productid=".$productId; + $adb->query($sql); + $log->debug("Exiting deductFromProductStock method ..."); + +} + +/** This Function subtract the specified product quantity to the Product Quantity in Demand in the Warehouse + * @param int $productId - ProductId + * @param int $qty - Quantity to be subtract + */ +function deductFromProductDemand($productId,$qty) +{ + global $log; + $log->debug("Entering deductFromProductDemand(".$productId.",".$qty.") method ..."); + global $adb; + $qtyInStck=getProductQtyInDemand($productId); + $updQty=$qtyInStck - $qty; + $sql = "UPDATE vtiger_products set qtyindemand=$updQty where productid=".$productId; + $adb->query($sql); + $log->debug("Exiting deductFromProductDemand method ..."); + +} + + /** This Function returns the current product quantity in stock. * The following is the input parameter for the function: * $product_id --> ProductId, Type:Integer @@ -2121,6 +2175,23 @@ } + +/** This Function returns the current product quantity in demand. + * @param int $product_id - ProductId + * @return int $qtyInDemand - Quantity in Demand of a product + */ +function getProductQtyInDemand($product_id) +{ + global $log; + $log->debug("Entering getProductQtyInDemand(".$product_id.") method ..."); + global $adb; + $query1 = "select qtyindemand from vtiger_products where productid=".$product_id; + $result = $adb->query($query1); + $qtyInDemand = $adb->query_result($result,0,"qtyindemand"); + $log->debug("Exiting getProductQtyInDemand method ..."); + return $qtyInDemand; +} + /** Function to seperate the Date and Time * This function accepts a sting with date and time and * returns an array of two elements.The first element @@ -2617,4 +2688,40 @@ global $current_user,$adb; return $adb->query_result($adb->query("select int_mailer from vtiger_mail_accounts where user_id='".$current_user->id."'"),0,"int_mailer"); } + +/** +* the function is like unescape in javascript +* added by dingjianting on 2006-10-1 for picklist editor +*/ +function utf8RawUrlDecode ($source) { + $decodedStr = ""; + $pos = 0; + $len = strlen ($source); + while ($pos < $len) { + $charAt = substr ($source, $pos, 1); + if ($charAt == '%') { + $pos++; + $charAt = substr ($source, $pos, 1); + if ($charAt == 'u') { + // we got a unicode character + $pos++; + $unicodeHexVal = substr ($source, $pos, 4); + $unicode = hexdec ($unicodeHexVal); + $entity = "&#". $unicode . ';'; + $decodedStr .= utf8_encode ($entity); + $pos += 4; + } + else { + // we have an escaped ascii character + $hexVal = substr ($source, $pos, 2); + $decodedStr .= chr (hexdec ($hexVal)); + $pos += 2; + } + } else { + $decodedStr .= $charAt; + $pos++; + } + } + return $decodedStr; +} ?> Modified: vtigercrm/trunk/install/0welcome.php ============================================================================== --- vtigercrm/trunk/install/0welcome.php (original) +++ vtigercrm/trunk/install/0welcome.php Tue Oct 10 10:02:43 2006 @@ -97,10 +97,10 @@ -

           This Configuration Wizard will create vtiger CRM 5.0.0 databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready. +

           This Configuration Wizard will create vtiger CRM 5.0.1 databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready.

    -

    - vtiger CRM 5.0.0 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.

    -

    vtiger CRM 5.0.0 will not work on mysql 4.0.x versions

    vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements
    +

    - vtiger CRM 5.0.1 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.

    +

    vtiger CRM 5.0.1 will not work on mysql 4.0.x versions

    vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements

    The installation wizard will guide you with the installation regardless of the setup you may have. Modified: vtigercrm/trunk/install/2setConfig.php ============================================================================== --- vtigercrm/trunk/install/2setConfig.php (original) +++ vtigercrm/trunk/install/2setConfig.php Tue Oct 10 10:02:43 2006 @@ -99,7 +99,7 @@ elseif (isset($dbconfig['db_name']) && $dbconfig['db_name']!='_DBC_NAME_') $db_name = $dbconfig['db_name']; else - $db_name = 'vtigercrm5'; + $db_name = 'vtigercrm501'; !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; if (isset($_REQUEST['host_name'])) $host_name = $_REQUEST['host_name']; @@ -145,7 +145,7 @@ } else { !isset($_REQUEST['db_hostname']) ? $db_hostname = $hostname: $db_hostname = $_REQUEST['db_hostname']; - !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm5" : $db_name = $_REQUEST['db_name']; + !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm501" : $db_name = $_REQUEST['db_name']; !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; !isset($_REQUEST['host_name']) ? $host_name= $hostname : $host_name= $_REQUEST['host_name']; !isset($_REQUEST['site_URL']) ? $site_URL = $web_root : $site_URL = $_REQUEST['site_URL']; Modified: vtigercrm/trunk/install/4createConfigFile.php ============================================================================== --- vtigercrm/trunk/install/4createConfigFile.php (original) +++ vtigercrm/trunk/install/4createConfigFile.php Tue Oct 10 10:02:43 2006 @@ -45,8 +45,8 @@ // vtiger CRM version number; do not edit! -$vtiger_version = "5.0.0"; -$release_date = "14 September 2006"; +$vtiger_version = "5.0.1"; +$release_date = "10 October 2006"; if (isset($_REQUEST['db_hostname'])) Modified: vtigercrm/trunk/install/5createTables.php ============================================================================== --- vtigercrm/trunk/install/5createTables.php (original) +++ vtigercrm/trunk/install/5createTables.php Tue Oct 10 10:02:43 2006 @@ -120,10 +120,10 @@ ?> - +
    - vtigercrm-5.0.0 is all set to go! + vtigercrm-5.0.1 is all set to go!
      Modified: vtigercrm/trunk/jscalendar/calendar.js ============================================================================== --- vtigercrm/trunk/jscalendar/calendar.js (original) +++ vtigercrm/trunk/jscalendar/calendar.js Tue Oct 10 10:02:43 2006 @@ -1703,7 +1703,9 @@ return str; }; +if ( Date.prototype.__msh_oldSetFullYear == null ) { Date.prototype.__msh_oldSetFullYear = Date.prototype.setFullYear; +} Date.prototype.setFullYear = function(y) { var d = new Date(this); d.__msh_oldSetFullYear(y); Modified: vtigercrm/trunk/modules/Accounts/Account.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/Account.php (original) +++ vtigercrm/trunk/modules/Accounts/Account.php Tue Oct 10 10:02:43 2006 @@ -670,64 +670,34 @@ function create_export_query(&$order_by, &$where) { global $log; + global $current_user; $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - if($this->checkIfCustomTableExists('vtiger_accountscf')) - { - - $query = $this->constructCustomQueryAddendum('vtiger_accountscf','Accounts') . " - vtiger_account.*, - ".$this->entity_table.".*, - vtiger_accountbillads.city AS billing_city, - vtiger_accountbillads.country AS billing_country, - vtiger_accountbillads.code AS billing_code, - vtiger_accountbillads.state AS billing_state, - vtiger_accountbillads.street AS billing_street, - vtiger_accountshipads.city AS shipping_city, - vtiger_accountshipads.country AS shipping_country, - vtiger_accountshipads.code AS shipping_code, - vtiger_accountshipads.state AS shipping_state, - vtiger_accountshipads.street AS shipping_street, - vtiger_users.user_name, - vtiger_users.status AS user_status - FROM ".$this->entity_table." + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Accounts", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list FROM ".$this->entity_table." INNER JOIN vtiger_account ON vtiger_crmentity.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 + LEFT JOIN vtiger_accountscf ON vtiger_accountscf.accountid = vtiger_account.accountid + LEFT JOIN vtiger_accountgrouprelation + ON vtiger_accountscf.accountid = vtiger_accountgrouprelation.accountid + LEFT JOIN vtiger_groups + ON vtiger_groups.groupname = vtiger_accountgrouprelation.groupname LEFT JOIN vtiger_users - ON vtiger_crmentity.smownerid = vtiger_users.id "; - - } - else - { - $query = "SELECT vtiger_account.*, - ".$this->entity_table.".*, - vtiger_accountbillads.city AS billing_city, - vtiger_accountbillads.country AS billing_country, - vtiger_accountbillads.code AS billing_code, - vtiger_accountbillads.state AS billing_state, - vtiger_accountbillads.street AS billing_street, - vtiger_accountshipads.city AS shipping_city, - vtiger_accountshipads.country AS shipping_country, - vtiger_accountshipads.code AS shipping_code, - vtiger_accountshipads.state AS shipping_state, - vtiger_accountshipads.street AS shipping_street, - vtiger_users.user_name, - vtiger_users.status AS user_status - FROM ".$this->entity_table." - INNER JOIN vtiger_account - ON vtiger_crmentity.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_users - ON vtiger_crmentity.smownerid = vtiger_users.id "; - } + ON vtiger_crmentity.smownerid = vtiger_users.id + LEFT JOIN vtiger_account vtiger_account2 + ON vtiger_account2.accountid = vtiger_account.parentid + ";//vtiger_account2 is added to get the Member of account + $where_auto = " vtiger_users.status = 'Active' AND vtiger_crmentity.deleted = 0 "; @@ -737,8 +707,18 @@ 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[6] == 3) + { + //Added security check to get the permitted records only + $query = $query." ".getListViewSecurityParameter("Accounts"); + } + if(!empty($order_by)) $query .= " ORDER BY $order_by"; + $log->debug("Exiting create_export_query method ..."); return $query; } Modified: vtigercrm/trunk/modules/Accounts/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Accounts/DetailViewAjax.php Tue Oct 10 10:02:43 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $acntObj = new Account(); Modified: vtigercrm/trunk/modules/Accounts/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/EditView.php (original) +++ vtigercrm/trunk/modules/Accounts/EditView.php Tue Oct 10 10:02:43 2006 @@ -95,7 +95,7 @@ $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",$app_strings['Account']); +$smarty->assign("SINGLE_MOD",'Account'); $smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']); $smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT'])); Modified: vtigercrm/trunk/modules/Accounts/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Accounts/language/en_us.lang.php Tue Oct 10 10:02:43 2006 @@ -144,8 +144,8 @@ 'Created Time'=>'Created Time', 'Modified Time'=>'Modified Time', 'Description'=>'Description', -'Shipping Po Box'=>'Shipping Po Box', -'Billing Po Box'=>'Billing Po Box', +'Shipping Po Box'=>'Shipping PO Box', +'Billing Po Box'=>'Billing PO Box', //Added after 4.2 patch 2 'Email Opt Out'=>'Email Opt Out', Modified: vtigercrm/trunk/modules/Calendar/CalendarCommon.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/CalendarCommon.php (original) +++ vtigercrm/trunk/modules/Calendar/CalendarCommon.php Tue Oct 10 10:02:43 2006 @@ -182,6 +182,7 @@ function getTimeCombo($format,$bimode,$hour='',$min='',$fmt='') { $combo = ''; + $min = $min - ($min%5); if($format == 'am/pm') { $combo .= ''; Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/addEventUI.php (original) +++ vtigercrm/trunk/modules/Calendar/addEventUI.php Tue Oct 10 10:02:43 2006 @@ -177,9 +177,9 @@ - + -
    - - + - + +
    +
    hour_format,'start');?>
    - Set date.. +
    + Set date.. - - - + + + + @@ -74,7 +74,7 @@ - + Modified: vtigercrm/trunk/modules/CustomView/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/CustomView/language/en_us.lang.php Tue Oct 10 10:02:43 2006 @@ -141,8 +141,8 @@ 'Email Opt Out'=>'Email Opt Out', 'Billing Address'=>'Billing Address', 'Shipping Address'=>'Shipping Address', -'Shipping Po Box'=>'Shipping Po Box', -'Billing Po Box'=>'Billing Po Box', +'Shipping Po Box'=>'Shipping PO Box', +'Billing Po Box'=>'Billing PO Box', 'Billing City'=>'Billing City', 'Shipping City'=>'Shipping City', 'Billing State'=>'Billing State', @@ -163,8 +163,8 @@ 'Do Not Call'=>'Do Not Call', 'Mailing Street'=>'Mailing Street', 'Other Street'=>'Other Street', -'Mailing Po Box'=>'Mailing Po Box', -'Other Po Box'=>'Other Po Box', +'Mailing Po Box'=>'Mailing PO Box', +'Other Po Box'=>'Other PO Box', 'Mailing City'=>'Mailing City', 'Other City'=>'Other City', 'Mailing State'=>'Mailing State', Modified: vtigercrm/trunk/modules/Dashboard/HomepageDB.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/HomepageDB.php (original) +++ vtigercrm/trunk/modules/Dashboard/HomepageDB.php Tue Oct 10 10:02:43 2006 @@ -9,17 +9,10 @@ * ********************************************************************************/ require_once("modules/Dashboard/Entity_charts.php"); -/** - * Function to get Dashboard in homepage - * return the graph - $sHTML - */ + global $current_user,$user_id,$date_start,$end_date,$tmp_dir,$mod_strings; $type='recordsforuser'; - //require('user_privileges/user_privileges_'.$current_user->id.'.php'); - //if($is_admin) - // $homepagedb_query = "select vtiger_crmentity.* from vtiger_crmentity where vtiger_crmentity.setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder','SalesOrder','Activities','HelpDesk','Campaigns') and vtiger_crmentity.deleted=0"; - //else - $homepagedb_query = "select * from vtiger_crmentity se left join vtiger_leaddetails le on le.leadid=se.crmid left join vtiger_activity act on act.activityid=se.crmid where se.deleted=0 and (le.converted=0 or le.converted is null) and ((act.status!='Completed' and act.status!='Deferred') or act.status is null) and ((act.eventstatus!='Held' and act.eventstatus!='Not Held') or act.eventstatus is null) and setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder', 'SalesOrder','Calendar','HelpDesk','Campaigns') and se.deleted=0 and se.smownerid=".$current_user->id; + $homepagedb_query = "select * from vtiger_crmentity se left join vtiger_leaddetails le on le.leadid=se.crmid left join vtiger_troubletickets tt on tt.ticketid=se.crmid left join vtiger_activity act on act.activityid=se.crmid where se.deleted=0 and (le.converted=0 or le.converted is null) and (tt.status!='Closed' or tt.status is null) and ((act.status!='Completed' and act.status!='Deferred') or act.status is null) and ((act.eventstatus!='Held' and act.eventstatus!='Not Held') or act.eventstatus is null) and setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder', 'SalesOrder','Calendar','HelpDesk','Campaigns') and se.deleted=0 and se.smownerid=".$current_user->id; $graph_by="setype"; $graph_title=$mod_strings['recordsforuser'].' '.$current_user->user_name; $module="Home"; Modified: vtigercrm/trunk/modules/Emails/Email.php ============================================================================== --- vtigercrm/trunk/modules/Emails/Email.php (original) +++ vtigercrm/trunk/modules/Emails/Email.php Tue Oct 10 10:02:43 2006 @@ -257,8 +257,50 @@ function create_export_query(&$order_by, &$where) { global $log; + global $current_user; $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - $query = 'SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_attachments.name as filename, vtiger_crmentity.description as email_content FROM vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_seattachmentsrel on vtiger_activity.activityid=vtiger_seattachmentsrel.crmid left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid where vtiger_activity.activitytype="Emails" and vtiger_crmentity.deleted=0'; + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Emails", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list FROM vtiger_activity + INNER JOIN vtiger_crmentity + ON vtiger_crmentity.crmid=vtiger_activity.activityid + LEFT JOIN vtiger_users + ON vtiger_users.id = vtiger_crmentity.smownerid + LEFT JOIN vtiger_seactivityrel + ON vtiger_seactivityrel.activityid = vtiger_activity.activityid + LEFT JOIN vtiger_contactdetails + ON vtiger_contactdetails.contactid = vtiger_seactivityrel.crmid + LEFT JOIN vtiger_cntactivityrel + ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid + AND vtiger_cntactivityrel.contactid = vtiger_cntactivityrel.contactid + 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_salesmanactivityrel + ON vtiger_salesmanactivityrel.activityid = vtiger_activity.activityid + LEFT JOIN vtiger_emaildetails + ON vtiger_emaildetails.emailid = vtiger_activity.activityid + LEFT JOIN vtiger_seattachmentsrel + ON vtiger_activity.activityid=vtiger_seattachmentsrel.crmid + LEFT JOIN vtiger_attachments + ON vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid + WHERE vtiger_activity.activitytype='Emails' AND 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) + { + $sec_parameter=getListViewSecurityParameter("Emails"); + $query .= $sec_parameter; + } $log->debug("Exiting create_export_query method ..."); return $query; Modified: vtigercrm/trunk/modules/Emails/gotodownload.php ============================================================================== --- vtigercrm/trunk/modules/Emails/gotodownload.php (original) +++ vtigercrm/trunk/modules/Emails/gotodownload.php Tue Oct 10 10:02:43 2006 @@ -1,4 +1,4 @@ - Modified: vtigercrm/trunk/modules/HelpDesk/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/HelpDesk/DetailViewAjax.php Tue Oct 10 10:02:43 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { Modified: vtigercrm/trunk/modules/HelpDesk/EditView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/EditView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/EditView.php Tue Oct 10 10:02:43 2006 @@ -52,7 +52,7 @@ $smarty->assign("OP_MODE",$disp_view); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Ticket']); +$smarty->assign("SINGLE_MOD",'Ticket'); $category = getParentTab(); Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Tue Oct 10 10:02:43 2006 @@ -122,6 +122,8 @@ 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 '.$where; } Modified: vtigercrm/trunk/modules/HelpDesk/Merge.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/Merge.php (original) +++ vtigercrm/trunk/modules/HelpDesk/Merge.php Tue Oct 10 10:02:43 2006 @@ -92,7 +92,7 @@ { $column_name = "productsRel.productname"; } - if($tablename == "crmentity") + if($tablename == "vtiger_crmentity") { if($modulename == "Contacts") { @@ -171,7 +171,7 @@ left join vtiger_products as productsRel on productsRel.productid = vtiger_troubletickets.product_id left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id left join vtiger_account on vtiger_account.accountid = vtiger_troubletickets.parent_id - left join vtiger_crmentity as _crmentityAccounts on crmentityAccounts.crmid = vtiger_account.accountid + left join vtiger_crmentity as crmentityAccounts on crmentityAccounts.crmid = vtiger_account.accountid left join vtiger_accountbillads on vtiger_accountbillads.accountaddressid = vtiger_account.accountid left join vtiger_accountshipads on vtiger_accountshipads.accountaddressid = vtiger_account.accountid left join vtiger_accountscf on vtiger_accountbillads.accountaddressid = vtiger_accountscf.accountid Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php ============================================================================== --- vtigercrm/trunk/modules/Home/UnifiedSearch.php (original) +++ vtigercrm/trunk/modules/Home/UnifiedSearch.php Tue Oct 10 10:02:43 2006 @@ -80,83 +80,77 @@ { 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); + $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); - //Avoided the modules Faq and PriceBooks. we should remove this if when change the customview function - $oCustomView = ''; - if($module != 'Faq' && $module != 'PriceBooks') - { - //Added to get the default 'All' customview query + $listquery = getListQuery($module); + $oCustomView = ''; + $oCustomView = new CustomView($module); - $viewid = $oCustomView->getViewId($module); - - $listquery = $oCustomView->getModifiedCvListQuery($viewid,$listquery,$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]); + + 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]); } } @@ -182,7 +176,7 @@ { global $adb; - $query = "SELECT * FROM vtiger_field WHERE tabid = ".getTabid($module); + $query = "SELECT columnname, tablename FROM vtiger_field WHERE tabid = ".getTabid($module); $result = $adb->query($query); $noofrows = $adb->num_rows($result); @@ -197,7 +191,7 @@ { if($where != '') $where .= " OR "; - $where .= $tablename.".".$columnname." LIKE ".$adb->quote("%$search_val%"); + $where .= $tablename.".".$columnname." LIKE ".$adb->quote("%$search_val%"); } } Modified: vtigercrm/trunk/modules/Import/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Import/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Import/language/en_us.lang.php Tue Oct 10 10:02:43 2006 @@ -242,13 +242,13 @@ ,"assistant"=>"Assistant" ,"assistantphone"=>"Assistant Phone" ,"mailingstreet"=>"Mailing Address Street" - ,"mailingpobox"=>"Mailing Address Po Box" + ,"mailingpobox"=>"Mailing Address PO Box" ,"mailingcity"=>"Mailing Address City" ,"mailingstate"=>"Mailing Address State" ,"mailingzip"=>"Mailing Address Postalcode" ,"mailingcountry"=>"Mailing Address Country" ,"otherstreet"=>"Other Address Street" - ,"otherpobox"=>"Other Address Po Box" + ,"otherpobox"=>"Other Address PO Box" ,"othercity"=>"Other Address City" ,"otherstate"=>"Other Address State" ,"otherzip"=>"Other Address Postalcode" @@ -279,7 +279,7 @@ //"billing_address_street_2"=>"Billing Address Street 2", //"billing_address_street_3"=>"Billing Address Street 3", //"billing_address_street_4"=>"Billing Address Street 4", - "bill_pobox"=>"Billing Address Po Box", + "bill_pobox"=>"Billing Address PO Box", "bill_city"=>"Billing Address City", "bill_state"=>"Billing Address State", "bill_code"=>"Billing Address Postalcode", @@ -288,7 +288,7 @@ //"shipping_address_street_2"=>"Shipping Address Street 2", //"shipping_address_street_3"=>"Shipping Address Street 3", //"shipping_address_street_4"=>"Shipping Address Street 4", - "ship_pobox"=>"Shipping Address Po Box", + "ship_pobox"=>"Shipping Address PO Box", "ship_city"=>"Shipping Address City", "ship_state"=>"Shipping Address State", "ship_code"=>"Shipping Address Postalcode", @@ -334,7 +334,7 @@ "assigned_user_id"=>"Assigned To", "yahooid"=>"Yahoo Id", "lane"=>"Street", - "pobox"=>"Po Box", + "pobox"=>"PO Box", "code"=>"Postal Code", "city"=>"City", "country"=>"Country", Modified: vtigercrm/trunk/modules/Invoice/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Invoice/DetailViewAjax.php Tue Oct 10 10:02:43 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { Modified: vtigercrm/trunk/modules/Invoice/Popup.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Popup.php (original) +++ vtigercrm/trunk/modules/Invoice/Popup.php Tue Oct 10 10:02:43 2006 @@ -1,4 +1,4 @@ -'Billing State', 'Billing Code'=>'Billing Postal Code', 'Billing Country'=>'Billing Country', -'Billing Po Box'=>'Billing Po Box', -'Shipping Po Box'=>'Shipping Po Box', +'Billing Po Box'=>'Billing PO Box', +'Shipping Po Box'=>'Shipping PO Box', 'Shipping City'=>'Shipping City', 'Shipping State'=>'Shipping State', 'Shipping Code'=>'Shipping Postal Code', Modified: vtigercrm/trunk/modules/Leads/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Leads/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Leads/DetailViewAjax.php Tue Oct 10 10:02:43 2006 @@ -1,4 +1,5 @@ -assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id()); $smarty->assign("ID", $focus->id); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Lead']); +$smarty->assign("SINGLE_MOD",'Lead'); $smarty->assign("HEADER", get_module_title("Leads", "{MOD.LBL_LEAD} ".$focus->firstname." ".$focus->lastname, true)); Modified: vtigercrm/trunk/modules/Leads/Lead.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Lead.php (original) +++ vtigercrm/trunk/modules/Leads/Lead.php Tue Oct 10 10:02:43 2006 @@ -138,38 +138,32 @@ function create_export_query(&$order_by, &$where) { global $log; + global $current_user; $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - if($this->checkIfCustomTableExists('vtiger_leadscf')) - { - - $query = $this->constructCustomQueryAddendum('vtiger_leadscf','Leads') . " - vtiger_leaddetails.*, ".$this->entity_table.".*, vtiger_leadsubdetails.*,vtiger_leadaddress.city city, vtiger_leadaddress.state state,vtiger_leadaddress.code code,vtiger_leadaddress.country country, vtiger_leadaddress.phone phone, vtiger_users.user_name, vtiger_users.status user_status - FROM ".$this->entity_table." + + 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_leadaddress - ON vtiger_leaddetails.leadid=vtiger_leadaddress.leadaddressid + ON vtiger_crmentity.crmid=vtiger_leaddetails.leadid LEFT JOIN vtiger_leadsubdetails - ON vtiger_leaddetails.leadid=vtiger_leadsubdetails.leadsubscriptionid + 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 + 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 "; - - } - else - { - $query = "SELECT - vtiger_leaddetails.*, ".$this->entity_table.".*, vtiger_leadsubdetails.*,vtiger_leadaddress.*,vtiger_users.user_name, vtiger_users.status user_status 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_users - ON vtiger_crmentity.smownerid = vtiger_users.id "; - } + ON vtiger_crmentity.smownerid = vtiger_users.id + "; + $where_auto = " vtiger_users.status='Active' AND vtiger_crmentity.deleted=0 AND vtiger_leaddetails.converted =0"; @@ -178,6 +172,15 @@ $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"; Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Tue Oct 10 10:02:43 2006 @@ -274,36 +274,51 @@ } -$crmid = $adb->getUniqueID("vtiger_crmentity"); - -//Saving Account - starts -$sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,createdtime,modifiedtime,deleted,description) values(".$crmid.",".$current_user_id.",".$assigned_user_id.",'Accounts',1,".$date_entered.",".$date_modified.",0,'".$row['description']."')"; -$adb->query($sql_crmentity); - -$sql_insert_account = "INSERT INTO vtiger_account (accountid,accountname,industry,annualrevenue,phone,fax,rating,email1,website,employees) VALUES (".$crmid.",'".addslashes($accountname)."','".$row["industry"] ."','" .$row["annualrevenue"] ."','" .$row["phone"] ."','".$row["fax"] ."','" .$row["rating"] ."','" .$row["email"] ."','" .$row["website"] ."','" .$row["noofemployees"] ."')"; -$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"]."')"; -$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"]."')"; -$adb->query($sql_insert_accountshipads); - -//Getting the custom vtiger_field values from leads and inserting into Accounts if the vtiger_field is mapped - Jaguar -$insert_value=$crmid; -$insert_column="accountid"; -$val= getInsertValues("Accounts",$insert_value); -if($val[0]!="") - $insert_column.=","; -if($val[1]!="") - $insert_value.=","; - -$insert_column.=$val[0]; -$insert_value.=$val[1]; -$sql_insert_accountcustomfield = "INSERT INTO vtiger_accountscf (".$insert_column.") VALUES (".$insert_value.")"; -$adb->query($sql_insert_accountcustomfield); -//Saving Account - ends + +/*Code integrated to avoid duplicate Account creation during ConvertLead Operation START-- by Bharathi*/ +$acc_query = "select vtiger_account.accountid from vtiger_account left join vtiger_crmentity on vtiger_account.accountid = vtiger_crmentity.crmid where vtiger_crmentity.deleted=0 and vtiger_account.accountname = '$accountname'"; +$acc_res = $adb->query($acc_query); +$acc_rows = $adb->num_rows($acc_res); +if($acc_rows != 0) + $crmid = $adb->query_result($acc_res,0,"accountid"); +else +{ + $crmid = $adb->getUniqueID("vtiger_crmentity"); + + //Saving Account - starts + $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,createdtime,modifiedtime,deleted,description) values(".$crmid.",".$current_user_id.",".$assigned_user_id.",'Accounts',1,".$date_entered.",".$date_modified.",0,'".$row['description']."')"; + $adb->query($sql_crmentity); + /* Modified by Minnie to fix the convertlead issue -- START*/ + if(isset($row["annualrevenue"]) && !empty($row["annualrevenue"])) $annualrevenue = $row["annualrevenue"]; + else $annualrevenue = 'null'; + if(isset($row["noofemployees"]) && !empty($row["noofemployees"])) $employees = $row["noofemployees"]; + else $employees = 'null'; + $sql_insert_account = "INSERT INTO vtiger_account (accountid,accountname,industry,annualrevenue,phone,fax,rating,email1,website,employees) VALUES (".$crmid.",'".addslashes($accountname)."','".$row["industry"] ."',".$annualrevenue.",'" .$row["phone"] ."','".$row["fax"] ."','" .$row["rating"] ."','" .$row["email"] ."','" .$row["website"] ."',".$employees.")"; + /* 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"]."')"; + $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"]."')"; + $adb->query($sql_insert_accountshipads); + + //Getting the custom vtiger_field values from leads and inserting into Accounts if the vtiger_field is mapped - Jaguar + $insert_value=$crmid; + $insert_column="accountid"; + $val= getInsertValues("Accounts",$insert_value); + if($val[0]!="") + $insert_column.=","; + if($val[1]!="") + $insert_value.=","; + + $insert_column.=$val[0]; + $insert_value.=$val[1]; + $sql_insert_accountcustomfield = "INSERT INTO vtiger_accountscf (".$insert_column.") VALUES (".$insert_value.")"; + $adb->query($sql_insert_accountcustomfield); + //Saving Account - ends +} +/*Code integrated to avoid duplicate Account creation during ConvertLead Operation END-- by Bharathi*/ $account_id=$crmid; getRelatedNotesAttachments($id,$crmid); //To Convert Related Notes & Attachments -Jaguar @@ -320,7 +335,7 @@ //Saving Contact - starts $crmcontactid = $adb->getUniqueID("vtiger_crmentity"); -$sql_crmentity1 = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,description,createdtime) values(".$crmcontactid.",".$current_user_id.",".$assigned_user_id.",'Contacts',0,0,'".$row['description']."',".$date_entered.")"; +$sql_crmentity1 = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,description,createdtime,modifiedtime) values(".$crmcontactid.",".$current_user_id.",".$assigned_user_id.",'Contacts',0,0,'".$row['description']."',".$date_entered.",".$date_modified.")"; $adb->query($sql_crmentity1); @@ -382,7 +397,7 @@ $oppid = $adb->getUniqueID("vtiger_crmentity"); - $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,".$date_entered.",'".$row['description']."')"; + $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,modifiedtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,".$date_entered.",".$date_modified.",'".$row['description']."')"; $adb->query($sql_crmentity); Modified: vtigercrm/trunk/modules/Leads/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Leads/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Leads/language/en_us.lang.php Tue Oct 10 10:02:43 2006 @@ -153,7 +153,7 @@ 'Country'=>'Country', 'State'=>'State', 'Description'=>'Description', -'Po Box'=>'Po Box', +'Po Box'=>'PO Box', 'Campaign Source'=>'Campaign Source', //Added for CustomView 4.2 Release 'Name'=>'Name', Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php Tue Oct 10 10:02:43 2006 @@ -3405,7 +3405,7 @@ $taxres = $conn->query("select taxid from vtiger_inventorytaxinfo where taxlabel='".addslashes($taxlabel)."'"); $taxid = $conn->query_result($taxres,0,'taxid'); - $taxquery = "insert into vtiger_producttaxrel ($productid, \"$taxid\", '0.00')"; + $taxquery = "insert into vtiger_producttaxrel values($productid, \"$taxid\", '0.00')"; //Execute($taxquery); $conn->query($taxquery); } @@ -3555,6 +3555,7 @@ //changes made for CustomView and Reports - Activities changed to Calendar -- Starts //Added to change the entitytype from Activities to Calendar for customview +Execute("update vtiger_crmentity set setype='Calendar' where setype='Activities'"); Execute("update vtiger_customview set entitytype='Calendar' where entitytype='Activities'"); //Added to change the primarymodule from Activities to Calendar for Reports @@ -3722,6 +3723,48 @@ Execute("insert into vtiger_postatus values('','Received Shipment',$sortorderid,1)"); +//Added after 5.0 GA release +//CALCULATE Activity End Time (time_end) +//we have to calculate activity end time (time_end) based on start time (time_start) and duration (duration_hours, duration_minutes) +$sql = "select * from vtiger_activity"; +$result = $conn->query($sql); +$num_rows = $conn->num_rows($result); +for($i=0;$i<$num_rows;$i++) +{ + //First we have to retrieve the time_start, duration_hours and duration_minutes and form as a date with time + $activityid = $conn->query_result($result,$i,'activityid'); + $date_start = $conn->query_result($result,$i,'date_start'); + $time_start = $conn->query_result($result,$i,'time_start'); + $duration_hours = $conn->query_result($result,$i,'duration_hours'); + $duration_minutes = $conn->query_result($result,$i,'duration_minutes'); + + if($duration_hours != '' && $duration_minutes != '') + { + $date_details = explode("-",$date_start); + $start_year = $date_details[0]; + $start_month = $date_details[1]; + $start_date = $date_details[2]; + + $start_details = explode(":",$time_start); + $start_hour = $start_details[0]; + $start_minutes = $start_details[1]; + + $full_duration = "$duration_hours:$duration_minutes:00"; + + $start = date("Y-m-d H:i:s",mktime($start_hour, $start_minutes, 0, $start_month, $start_date, $start_year)); + $end = date("Y-m-d H:i:s",mktime($start_hour+$duration_hours, $start_minutes+$duration_minutes, 0, $start_month, $start_date, $start_year)); + + $end_details = explode(" ",$end); + $due_date = $end_details[0]; + + $end_time_details = explode(":",$end_details[1]); + $time_end = $end_time_details[0].":".$end_time_details[1]; + + $update_query = "update vtiger_activity set due_date=\"$due_date\", time_end=\"$time_end\" where activityid=$activityid"; + + $conn->query($update_query); + } +} Modified: vtigercrm/trunk/modules/Notes/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Notes/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Notes/DetailViewAjax.php Tue Oct 10 10:02:43 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Note(); Modified: vtigercrm/trunk/modules/Notes/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Notes/EditView.php (original) +++ vtigercrm/trunk/modules/Notes/EditView.php Tue Oct 10 10:02:43 2006 @@ -110,7 +110,7 @@ $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Note']); +$smarty->assign("SINGLE_MOD",'Note'); //Display the FCKEditor or not? -- configure $FCKEDITOR_DISPLAY in config.php $smarty->assign("FCKEDITOR_DISPLAY",$FCKEDITOR_DISPLAY); Modified: vtigercrm/trunk/modules/Notes/Note.php ============================================================================== --- vtigercrm/trunk/modules/Notes/Note.php (original) +++ vtigercrm/trunk/modules/Notes/Note.php Tue Oct 10 10:02:43 2006 @@ -89,12 +89,55 @@ { global $log; $log->debug("Entering create_export_query(".$order_by.",". $where.") method ..."); - $query = "SELECT - vtiger_notes.*, - vtiger_contactdetails.firstname, - vtiger_contactdetails.lastname - FROM vtiger_notes - LEFT JOIN vtiger_contactdetails ON vtiger_notes.contact_id=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_notes.notesid and vtiger_crmentity.deleted=0 "; + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Notes", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list FROM vtiger_notes + inner join vtiger_crmentity + on vtiger_crmentity.crmid=vtiger_notes.notesid + LEFT JOIN vtiger_senotesrel + ON vtiger_senotesrel.notesid = vtiger_notes.notesid + LEFT JOIN vtiger_contactdetails + ON vtiger_notes.contact_id=vtiger_contactdetails.contactid + + LEFT JOIN vtiger_crmentity vtiger_crmentityRelatedTo + ON vtiger_crmentityRelatedTo.crmid = vtiger_senotesrel.crmid + + LEFT JOIN vtiger_leaddetails vtiger_NoteRelatedToLead + ON vtiger_NoteRelatedToLead.leadid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_account vtiger_NoteRelatedToAccount + ON vtiger_NoteRelatedToAccount.accountid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_potential vtiger_NoteRelatedToPotential + ON vtiger_NoteRelatedToPotential.potentialid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_products vtiger_NoteRelatedToProduct + ON vtiger_NoteRelatedToProduct.productid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_invoice vtiger_NoteRelatedToInvoice + ON vtiger_NoteRelatedToInvoice.invoiceid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_purchaseorder vtiger_NoteRelatedToPO + ON vtiger_NoteRelatedToPO.purchaseorderid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_salesorder vtiger_NoteRelatedToSO + ON vtiger_NoteRelatedToSO.salesorderid = vtiger_senotesrel.crmid + + WHERE vtiger_crmentity.deleted=0 + + AND ((vtiger_senotesrel.crmid IS NULL + AND (vtiger_notes.contact_id = 0 + OR vtiger_notes.contact_id IS NULL)) + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Leads').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Accounts').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Potentials').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Products').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Invoice').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('PurchaseOrder').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('SalesOrder').") + OR vtiger_notes.contact_id IN (".getReadEntityIds('Contacts').")) + + "; + $log->debug("Exiting create_export_query method ..."); return $query; } Modified: vtigercrm/trunk/modules/Notes/Save.php ============================================================================== --- vtigercrm/trunk/modules/Notes/Save.php (original) +++ vtigercrm/trunk/modules/Notes/Save.php Tue Oct 10 10:02:43 2006 @@ -85,6 +85,30 @@ 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'] != '') Modified: vtigercrm/trunk/modules/Portal/Popup.php ============================================================================== --- vtigercrm/trunk/modules/Portal/Popup.php (original) +++ vtigercrm/trunk/modules/Portal/Popup.php Tue Oct 10 10:02:43 2006 @@ -1,4 +1,4 @@ - - + @@ -55,7 +55,7 @@
    User List
    '.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_URL'] .' http://
    '.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_NAME'] .'
    Modified: vtigercrm/trunk/modules/Portal/Portal.js ============================================================================== --- vtigercrm/trunk/modules/Portal/Portal.js (original) +++ vtigercrm/trunk/modules/Portal/Portal.js Tue Oct 10 10:02:43 2006 @@ -90,3 +90,25 @@ 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/trunk/modules/Portal/Portal.php ============================================================================== --- vtigercrm/trunk/modules/Portal/Portal.php (original) +++ vtigercrm/trunk/modules/Portal/Portal.php Tue Oct 10 10:02:43 2006 @@ -1,4 +1,4 @@ - Modified: vtigercrm/trunk/modules/Potentials/Charts.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/Charts.php (original) +++ vtigercrm/trunk/modules/Potentials/Charts.php Tue Oct 10 10:02:43 2006 @@ -1124,7 +1124,7 @@ $imagemap = $canvas->getImageMap(); $graph =& Image_Graph::factory('graph', $canvas); - $font =& $graph->addNew('font', calculate_font_name('en_en')); + $font =& $graph->addNew('font', calculate_font_name($lang_crm)); // set the font size to 11 pixels $font->setSize(8); $font->setColor($font_color); Modified: vtigercrm/trunk/modules/Potentials/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Potentials/DetailViewAjax.php Tue Oct 10 10:02:43 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Potential(); Modified: vtigercrm/trunk/modules/Potentials/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/EditView.php (original) +++ vtigercrm/trunk/modules/Potentials/EditView.php Tue Oct 10 10:02:43 2006 @@ -119,7 +119,7 @@ $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",$app_strings['Potential']); +$smarty->assign("SINGLE_MOD",'Potential'); $tabid = getTabid("Potentials"); Modified: vtigercrm/trunk/modules/Potentials/Opportunity.js ============================================================================== --- vtigercrm/trunk/modules/Potentials/Opportunity.js (original) +++ vtigercrm/trunk/modules/Potentials/Opportunity.js Tue Oct 10 10:02:43 2006 @@ -45,7 +45,7 @@ } function set_return_todo(product_id, product_name) { - window.opener.document.createTodo.parent_name.value = product_name; - window.opener.document.createTodo.parent_id.value = product_id; + window.opener.document.createTodo.task_parent_name.value = product_name; + window.opener.document.createTodo.task_parent_id.value = product_id; } Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/Opportunity.php (original) +++ vtigercrm/trunk/modules/Potentials/Opportunity.php Tue Oct 10 10:02:43 2006 @@ -183,34 +183,37 @@ function create_export_query($order_by, $where) { global $log; + global $current_user; $log->debug("Entering create_export_query(".$order_by.",". $where.") method ..."); - if($this->checkIfCustomTableExists('vtiger_potentialscf')) - { - $query = $this->constructCustomQueryAddendum('vtiger_potentialscf','Potentials') ." - vtiger_potential.*, - vtiger_account.accountname account_name, - vtiger_users.user_name assigned_user_name - FROM vtiger_potential - INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid=vtiger_potential.potentialid - 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_users on vtiger_crmentity.smownerid=vtiger_users.id - where vtiger_crmentity.deleted=0 "; - } - else - { - $query = "SELECT - vtiger_potential.*, - vtiger_account.accountname account_name, - vtiger_users.user_name assigned_user_name - FROM vtiger_potential + 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; Modified: vtigercrm/trunk/modules/PriceBooks/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/PriceBooks/DetailViewAjax.php Tue Oct 10 10:02:43 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new PriceBook(); Modified: vtigercrm/trunk/modules/PriceBooks/EditView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/EditView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/EditView.php Tue Oct 10 10:02:43 2006 @@ -50,7 +50,7 @@ $smarty->assign("OP_MODE",$disp_view); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['PriceBook']); +$smarty->assign("SINGLE_MOD",'PriceBook'); $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.js ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/PriceBook.js (original) +++ vtigercrm/trunk/modules/PriceBooks/PriceBook.js Tue Oct 10 10:02:43 2006 @@ -103,16 +103,15 @@ document.addToPB.action="index.php?module=Products&action=addPbProductRelToDB&return_module=Products&return_action=AddProductsToPriceBook" } -function updateListPrice(unitprice,fieldname) +function updateListPrice(unitprice,fieldname,oSelect) { - var elem=document.addToPB.elements; - var i; - for(i=0; i @@ -113,13 +113,13 @@ { $list_body .= ''; $field_name=$entity_id."_listprice"; - $list_body .= ''; + $list_body .= ''; $list_body .= ''; $list_body .= ''; - $list_body .= ''; + $list_body .= ''; $list_body .= ''; } - + } Modified: vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php ============================================================================== --- vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php (original) +++ vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php Tue Oct 10 10:02:43 2006 @@ -1,4 +1,4 @@ -query($list_query); $num_rows = $adb->num_rows($list_result); @@ -66,7 +68,7 @@ //Buttons Add To PriceBook and Cancel $other_text = '
    -    +   
    '.$adb->query_result($list_result,$i,"bookname").''.$unit_price.'
    - + '; + $list_body .= ''; $list_body .= ''; $list_body .= ''; $list_body .= ''; - $list_body .= ''; + $list_body .= ''; } } Modified: vtigercrm/trunk/modules/Products/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Products/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Products/DetailViewAjax.php Tue Oct 10 10:02:43 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Product(); Modified: vtigercrm/trunk/modules/Products/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Products/EditView.php (original) +++ vtigercrm/trunk/modules/Products/EditView.php Tue Oct 10 10:02:43 2006 @@ -95,7 +95,7 @@ $smarty->assign("OP_MODE",$disp_view); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Product']); +$smarty->assign("SINGLE_MOD",'Product'); $smarty->assign("MOD", $mod_strings); Modified: vtigercrm/trunk/modules/Products/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Products/ListView.php (original) +++ vtigercrm/trunk/modules/Products/ListView.php Tue Oct 10 10:02:43 2006 @@ -1,4 +1,4 @@ - Modified: vtigercrm/trunk/modules/Products/Product.js ============================================================================== --- vtigercrm/trunk/modules/Products/Product.js (original) +++ vtigercrm/trunk/modules/Products/Product.js Tue Oct 10 10:02:43 2006 @@ -8,18 +8,16 @@ * ********************************************************************************/ document.write("'; } Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/trunk/pkg/bin/startvTiger.bat (original) +++ vtigercrm/trunk/pkg/bin/startvTiger.bat Tue Oct 10 10:02:43 2006 @@ -43,23 +43,23 @@ echo "" echo "making an attempt to kill any existing vtigercrm service" echo "" -bin\apache -k stop -n vtigercrm5 -bin\apache -k uninstall -n vtigercrm5 +bin\apache -k stop -n vtigercrm501 +bin\apache -k uninstall -n vtigercrm501 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 vtigercrm5 -bin\apache -k uninstall -n vtigercrm5 +bin\apache -k stop -n vtigercrm501 +bin\apache -k uninstall -n vtigercrm501 echo "" echo "" -echo "Installing vtigercrm5 apache service after sleeping for 10 seconds" +echo "Installing vtigercrm501 apache service after sleeping for 10 seconds" echo "" %SLEEP_STR% -n 10 127.0.0.1>nul -bin\apache -k install -n vtigercrm5 -f conf\httpd.conf +bin\apache -k install -n vtigercrm501 -f conf\httpd.conf echo "" -echo "Starting vtigercrm5 apache service" +echo "Starting vtigercrm501 apache service" echo "" -bin\apache -n vtigercrm5 -k start +bin\apache -n vtigercrm501 -k start IF ERRORLEVEL 1 goto stopservice goto checkmysql @@ -117,27 +117,27 @@ :checkdatabase echo "" -echo "check to see if vtigercrm5 database already exists" +echo "check to see if vtigercrm501 database already exists" echo "" -mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm5'" | "%WINDIR%\system32\find.exe" "vtigercrm5" > NUL +mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm501'" | "%WINDIR%\system32\find.exe" "vtigercrm501" > NUL IF ERRORLEVEL 1 goto dbnotexists echo "" -ECHO "vtigercrm5 database exists" +ECHO "vtigercrm501 database exists" echo "" goto end :dbnotexists echo "" -ECHO "vtigercrm5 database does not exist" +ECHO "vtigercrm501 database does not exist" echo "" echo %cd% echo "" -echo "Proceeding to create database vtigercrm5 and populate the same" +echo "Proceeding to create database vtigercrm501 and populate the same" echo "" -mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm5" +mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm501" echo "" -echo "vtigercrm5 database created" +echo "vtigercrm501 database created" echo "" goto end Modified: vtigercrm/trunk/pkg/bin/startvTiger.sh ============================================================================== --- vtigercrm/trunk/pkg/bin/startvTiger.sh (original) +++ vtigercrm/trunk/pkg/bin/startvTiger.sh Tue Oct 10 10:02:43 2006 @@ -111,14 +111,14 @@ fi echo "" -echo "Checking if the vtigercrm5 database already exists" +echo "Checking if the vtigercrm501 database already exists" echo "" -echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm5 >/dev/null +echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm501 >/dev/null if [ $? -ne 0 ]; then echo "" - echo "Database vtigercrm5 does not exist. Creating database vtigercrm5" + echo "Database vtigercrm501 does not exist. Creating database vtigercrm501" echo "" - ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm5" + ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm501" fi host=`hostname` Modified: vtigercrm/trunk/pkg/bin/stopvTiger.bat ============================================================================== --- vtigercrm/trunk/pkg/bin/stopvTiger.bat (original) +++ vtigercrm/trunk/pkg/bin/stopvTiger.bat Tue Oct 10 10:02:43 2006 @@ -32,13 +32,13 @@ cd /d %apache_dir% rem shut down apache echo "" -echo "stopping vtigercrm5 apache service" +echo "stopping vtigercrm501 apache service" echo "" -bin\apache -n vtigercrm5 -k stop +bin\apache -n vtigercrm501 -k stop echo "" -echo "uninstalling vtigercrm5 apache service" +echo "uninstalling vtigercrm501 apache service" echo "" -bin\apache -k uninstall -n vtigercrm5 +bin\apache -k uninstall -n vtigercrm501 rem .\bin\ShutdownApache.exe logs\httpd.pid goto StopMySQL Modified: vtigercrm/trunk/soap/firefoxtoolbar.php ============================================================================== --- vtigercrm/trunk/soap/firefoxtoolbar.php (original) +++ vtigercrm/trunk/soap/firefoxtoolbar.php Tue Oct 10 10:02:43 2006 @@ -16,7 +16,7 @@ $log = &LoggerManager::getLogger('firefoxlog'); -$NAMESPACE = 'http://www.vtiger.com/vtigercrm/'; +$NAMESPACE = 'http://www.vtiger.com/products/crm'; $server = new soap_server; $accessDenied = "You are not authorized for performing this action"; $server->configureWSDL('vtigersoap'); Modified: vtigercrm/trunk/soap/thunderbirdplugin.php ============================================================================== --- vtigercrm/trunk/soap/thunderbirdplugin.php (original) +++ vtigercrm/trunk/soap/thunderbirdplugin.php Tue Oct 10 10:02:43 2006 @@ -18,7 +18,7 @@ $log = &LoggerManager::getLogger('thunderbirdplugin'); $accessDenied = "You are not authorized for performing this action"; -$NAMESPACE = 'http://www.vtiger.com/vtigercrm/'; +$NAMESPACE = 'http://www.vtiger.com/products/crm'; $server = new soap_server; $server->configureWSDL('vtigersoap'); @@ -46,7 +46,7 @@ array('username'=>'xsd:string'), array('return'=>'tns:contactdetails'), $NAMESPACE); - + $server->register( 'CheckContactPerm',array('user_name'=>'xsd:string'),array('return'=>'xsd:string'),$NAMESPACE); @@ -55,24 +55,24 @@ $server->register( 'AddContact', - array('user_name'=>'xsd:string', - 'first_name'=>'xsd:string', - 'last_name'=>'xsd:string', + 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', + '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_state'=>'xsd:string', + 'alt_address_postalcode'=>'xsd:string', 'alt_address_country'=>'xsd:string', 'office_phone'=>'xsd:string', 'home_phone'=>'xsd:string', @@ -82,13 +82,41 @@ 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); - + $NAMESPACE); + $server->wsdl->addComplexType( 'contactdetail', 'complexType', @@ -97,7 +125,7 @@ '', array( 'id' => array('name'=>'id','type'=>'xsd:string'), - 'firstname' => array('name'=>'firstname','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'), @@ -141,18 +169,18 @@ ), 'tns:contactdetail' ); - + function SearchContactsByEmail($username,$emailaddress) { require_once('modules/Contacts/Contact.php'); - + $seed_contact = new Contact(); $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) { @@ -164,21 +192,21 @@ "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/User.php'); require_once('modules/Emails/Email.php'); - + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($user_name); - + $email = new Email(); //$log->debug($msgdtls['contactid']); $emailbody = str_replace("'", "''", $email_body); @@ -189,7 +217,7 @@ $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->column_fields[activitytype] = 'Emails'; $email->plugin_save = true; $email->save("Emails"); @@ -208,7 +236,7 @@ return $email->id; } - + function GetContacts($username) { global $adb; @@ -235,9 +263,9 @@ $namelist = explode(" ", $contact["lastname"]); if(isset($namelist)) { - if(count($namelist) >= 2) + if(count($namelist) >= 2) { - $contact["lastname"] = $namelist[count($namelist)-1]; + $contact["lastname"] = $namelist[count($namelist)-1]; for($i=0; $i $contact["email"], "jobtitle" => $contact["title"], "department" => $contact["department"], - "accountname" => $contact["accountname"], + "accountname" => $contact["accountname"], "officephone" => $contact["phone"], "homephone" => $contact["homephone"], - "otherphone" => $contact["otherphone"], + "otherphone" => $contact["otherphone"], "fax" => $contact["fax"], "mobile" => $contact["mobile"], "asstname" => $contact["assistant"], - "asstphone" => $contact["assistantphone"], + "asstphone" => $contact["assistantphone"], "reportsto" => $contact["reports_to_name"], "mailingstreet" => $contact["mailingstreet"], "mailingcity" => $contact["mailingcity"], "mailingstate" => $contact["mailingstate"], "mailingzip" => $contact["mailingzip"], - "mailingcountry" => $contact["mailingcountry"], + "mailingcountry" => $contact["mailingcountry"], "otherstreet" => $contact["otherstreet"], "othercity" => $contact["othercity"], "otherstate" => $contact["otherstate"], "otherzip" => $contact["otherzip"], "othercountry" => $contact["othercountry"], "description" => "", - "category" => "", + "category" => "", ); } //to remove an erroneous compiler warning @@ -317,13 +345,13 @@ { $row = $db->fetchByAssoc($result, 0); //mysql_close(); - return $row["accountid"]; + return $row["accountid"]; } else { $row = $db->fetchByAssoc($result, 0); //mysql_close(); - return $row["accountid"]; + return $row["accountid"]; } } @@ -334,14 +362,14 @@ global $current_user; require_once('modules/Users/User.php'); require_once('modules/Contacts/Contact.php'); - + $seed_user = new User(); $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"; @@ -355,7 +383,7 @@ { $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); } - + $contact = new Contact(); $contact->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $first_name : ""; $contact->column_fields[lastname]=in_array('lastname',$permitted_lists) ? $last_name : ""; @@ -372,18 +400,78 @@ $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[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[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; + $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/User.php'); + require_once('modules/Leads/Lead.php'); + + $seed_user = new User(); + $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 Lead(); + $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) @@ -417,7 +505,7 @@ function end_session($user_name) { - return "Success"; + return "Success"; } function CheckContactPerm($user_name) @@ -454,6 +542,6 @@ } } -$server->service($HTTP_RAW_POST_DATA); -exit(); +$server->service($HTTP_RAW_POST_DATA); +exit(); ?> Modified: vtigercrm/trunk/soap/vtigerolservice.php ============================================================================== --- vtigercrm/trunk/soap/vtigerolservice.php (original) +++ vtigercrm/trunk/soap/vtigerolservice.php Tue Oct 10 10:02:43 2006 @@ -17,7 +17,7 @@ error_reporting(0); -$NAMESPACE = 'http://www.vtigercrm.com/vtigercrm'; +$NAMESPACE = 'http://www.vtiger.com/products/crm'; $server = new soap_server; Modified: vtigercrm/trunk/soap/wordplugin.php ============================================================================== --- vtigercrm/trunk/soap/wordplugin.php (original) +++ vtigercrm/trunk/soap/wordplugin.php Tue Oct 10 10:02:43 2006 @@ -17,7 +17,7 @@ $log = &LoggerManager::getLogger('wordplugin'); error_reporting(0); -$NAMESPACE = 'http://www.vtiger.com/vtigercrm/'; +$NAMESPACE = 'http://www.vtiger.com/products/crm'; $server = new soap_server; $accessDenied = "You are not permitted to perform this action"; $server->configureWSDL('vtigersoap'); Modified: vtigercrm/trunk/themes/alphagrey/images/aboutUS.jpg ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/themes/alphagrey/style.css ============================================================================== --- vtigercrm/trunk/themes/alphagrey/style.css (original) +++ vtigercrm/trunk/themes/alphagrey/style.css Tue Oct 10 10:02:43 2006 @@ -109,7 +109,7 @@ -.level2text { +/*.level2text { font-family: Arial, Helvetica, sans-serif; font-size: 11px; @@ -130,7 +130,7 @@ text-decoration:underline; color:#555555; -} +}*/ .level2Bg { @@ -165,13 +165,6 @@ padding-top:5px; padding-bottom:5px; } - - -.tabLiner { - background:#999 url(images/moduleSelectorBg.gif) bottom repeat-x; - padding:0px; -} - .sep1 { background:#999999; } @@ -183,15 +176,10 @@ a { text-decoration:none; color:#000099; - - - } a:hover { text-decoration:underline; - - } .hdrLink { @@ -239,8 +227,6 @@ } .lvtBg { - - } .lvtHeaderText { @@ -319,16 +305,6 @@ border-bottom:2px solid #aaaaaa; padding-left:0px; } - -.rightAddInfo { - border-left:1px solid #a2a2a2; - border-right:1px solid #dddddd; - border-bottom:1px solid #dddddd; - border-top:1px solid #a2a2a2; - background-color:#fafafa; - padding:5px; -} - .dvtCellLabel, .cellLabel { background-color:#efefef; padding-right:10px; @@ -363,18 +339,6 @@ background-color:#fafafa; } - -.rightUpcomingActivitiesHeader{ - border-bottom:1px solid #dddddd; - padding:5px; - background-color:#ffffdd; -} - -.rightUpcomingActivitiesContent { - padding:5px; - background-color:#ffffef; -} - .detailedViewHeader{ border-bottom:2px solid #dadada; padding:5px; @@ -390,17 +354,6 @@ width:90%; background-color:#ffffff; } - -.detailedViewProdTextBox { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:85%; - background-color:#ffffff; -} - .detailedViewTextBoxOn { font-family: Arial, Helvetica, sans-serif; font-size: 11px; @@ -409,32 +362,6 @@ padding-left:5px; width:90%; background-color:#ffffdd; -} - -.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 ------------------------------------------- */ - -.moduleSearch { - border:1px solid #dddddd; - background-color:#ffffef; - -} - -.searchHdrBox { - - border-bottom:1px dashed #dddddd; } .advSearch { @@ -463,29 +390,6 @@ width:10px } -.searchNotFound { - border:2px solid #999999; - background-color:#fafafa; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #ff0000; - height:50px; - width:640px; -} - - -.loginTopBg { - background:url(images/loginTopBg.gif) repeat-x; -} - -.loginTopShade { - background:url(images/loginTopShade.gif) repeat-x; -} - -.loginBg{ - background:#448cEB url(images/loginBg.gif) repeat-x; -} - .textbox { border:1px solid #999999; background-color:#ffffff; @@ -495,31 +399,8 @@ padding:2px; } - -.loginBottomBg { - background:url(images/loginBottomBg.gif) repeat-x; -} - -.loginSignin { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - color: #448ceb; - font-weight:bold; -} - -.loginBillBoard { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color:#ffffff; -} - .mx { } - -.calTopBg { - background:url(images/calBg.gif) repeat-x; -} - .calListTable td{ border-bottom:1px solid #efefef; border-left:1px solid #efefef; @@ -528,18 +409,6 @@ width:100%; border:1px solid #999999; -} -.calDisplay { - border-left:1px solid #d0d0d0; - border-right:1px solid #d0d0d0; -} -.calBottomBg { - background:url(images/calBottomBg.gif) repeat-x; -} - -.calDayHourCell { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; } .calDayHour { border-top:1px solid #dddddd; @@ -548,35 +417,6 @@ border-right:1px solid #dddddd; background-color:#eaeaea; } -.calDiv { - overflow:auto; width:95%;height:200px;padding:0px;background-color:#fefefe; - border-top: 1px solid #bababa; - border-bottom: 1px solid #bababa; -} -.calColHdr{ - border-top:1px solid #fefefa; - border-left:1px solid #fefefa; - - border-right:1px solid #a9a9a9; - background-color:#f5f5f5; -} -.calHourCol { - border-top: 1px solid #fefefa; - border-left: 1px solid #fefefa; - border-right: 1px solid #9a9a9a; - border-bottom: 1px solid #9a9a9a; - background-color: #efefef; - height: 30px; - -} -.calHourOccupied { - background-color:#d9d9d9; - -} -.calListViewRow { - border-bottom:1px solid e1e1e1; -} - .calAddEvent { position:absolute; z-index:10000; @@ -585,105 +425,14 @@ top:150px; background-color:#ffffff; } - -.addEventHeader{ - border-bottom:2px dotted #cccccc; -} - -.addEventFooter{ - border-top:2px dotted #cccccc; - height:40px; -} - .addEventInnerBox { border:1px dotted #dadada; } - -.cellScheduled { - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSchHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSch{ - border:0px; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellNormalHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffff; - color:#7a7a7a; -} - .cellNormal { border:0px; background-color:#ffffff; } - -.calEventNormal { - border:1px solid #999999; - background-color:#99ffcc; - -} - -.calEventCritical { - border:1px solid #999999; - background-color:#FFCC33; -} -.tblPro1 { - -border:2px solid #dadada; - background-color:white; - -} - -.tblPro1IconCell { - border-right:1px solid #dadada; -} - -.tblPro1HeadingCell { - font-weight:bold; -color:#4a4a4a; -} - -.tblPro1ColHeader { - background-color:#dadada; - border-left:1px solid white; - border-right:1px solid #999999; - font-size: 11px; - line-height: 14px; - background-image:url(images/tblPro1ColBg.gif); -} - -.tblPro1DataCell { - border-bottom:1px solid #f5f5f5; - color:#5a5a5a; - font-size: 11px; - line-height: 14px; - -} - -.divEventToDo { -overflow:auto; -height:150px; -border:1px solid #dadada; - -} - .EventToDo{ } @@ -696,119 +445,6 @@ margin-right: 10px; margin-bottom: 15px; } - -.thumbnailcaption -{ font-size: 0.9em; padding-top: 0.2em ; } - -/* For Settings */ - -.lftMnuTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-color:#BBBBBB; - border-left:1px solid #666666; - border-right:1px solid #666666; - border-top:0px solid #666666; - border-collapse:collapse; - text-align:right; - padding-top:0px; - padding-left:5px; - padding-right:5px; - vertical-align:top; -} - -.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-decoration:none; - width:99%; -} - -.lftMnuHdr tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-align:left; - text-decoration:none; - height:25px; - padding-right:0px; - padding-left:0px; -} - -a.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; - vertical-align:middle; -} - -a.lftMnuHdr:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; -} - -a.lftSubMnu{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; -} - -a.lftSubMnu:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; - background-color:#CCCCCC; -} - .padTab{ padding-top:0px; padding-left:0px; @@ -817,26 +453,6 @@ vertical-align:top; } - -.controlTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - width:100%; - border:0px; -} - -.controlTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - vertical-align:bottom; -} - #company{ position:relative; width:100%; @@ -850,32 +466,9 @@ #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;} -#studioTab{position:relative;left:0px;top:0px;width:100%;display:none;} - -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} -.imgDoc{ - cursor:pointer; - border:0px; -} - #one{ position:relative; display:block; @@ -936,83 +529,12 @@ /*Added for Advance Seearch*/ -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} - -.imgDoc{ - cursor:pointer; - border:0px; -} -#slideMnu{ - background-color:#BBBBBB; - vertical-align:top; -} - #one{ position:relative; display:block; width:245px; } -.prdTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:100%; - border-left:0px solid #CCCCCC; - border-right:0px solid #CCCCCC; - border-collapse:collapse; -} - -.prdTab tr th{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - padding-left:5px; - background-color:#E5E5E5; - height:20px; - color:#000000; - font-weight:bold; - text-decoration:none; - border-bottom:1px solid #CCCCCC; -} - -.prdTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - border-bottom:1px solid #CCCCCC; - padding-left:5px; - color:#000000; - text-decoration:none; - font-weight:normal; - height:20px; -} - -.delTxt{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:underline; - font-weight:normal; - color:#000099; - cursor:pointer; -} /* Dashboard CSS */ a.dash_href{ @@ -1045,13 +567,6 @@ background-color:#bfbfbf; padding:5px; } - -.dash_shadow{ - background-image:url(images/dash_top_shadow.jpg); - background-repeat:repeat-x; - height:10px; -} - .dash_white{ background-color:#FFFFFF; padding:5px 10px 5px 10px; @@ -1068,15 +583,6 @@ color:#000000; padding-left:10px;padding-right:10px; } -.dashMatrixSeperator{ - border-left:2px dashed #dadada; - -} -.dashMatrixBottomLiner{ - border-bottom:2px dashed #dadada; - -} - .dash_switch{ cursor:pointer; width:26px; @@ -1125,56 +631,12 @@ background-repeat:repeat-x; position:top; } - -.dash_sel_top{ - background-image:url(images/dash_sel_top.jpg); - background-repeat:repeat-x; - height:5px; - background-position:left top; - font-size:0px; -} - -.dash_sel_btm{ - background-image:url(images/dash_sel_btm.jpg); - background-repeat:repeat-x; - height:4px; - background-position:left top; - font-size:0px; -} - -.dash_sel_left{ - background-color:#dadada; - border-left:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:200px; - text-align:left; - padding-left:5px; - font-size:11px; - font-weight:bold; - color:#000000; -} - -.dash_sel_right{ - background-color:#dadada; - border-right:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:25px; - padding-left:5px; - cursor:pointer; -} - + /* menu */ -#mnuSlide{ - position:absolute; - left:0px; - top:100px; -/* width:110px;*/ -} - -/* a.submenu{ + + + a.submenu{ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; padding-top:5px; @@ -1200,7 +662,7 @@ text-align:left; text-decoration:none; display:block; -} */ +} #mnuKey{ font-family:Verdana, Arial, Helvetica, sans-serif; @@ -1227,7 +689,7 @@ border-right:1px solid #CCCCCC; opacity:.9; display:none; -} +}*/ /* clock */ @@ -1308,11 +770,6 @@ /* Calculator */ -.calcBg { - /*background-color: #666;*//*BFC1B7*/ - background: url(images/cal_bg.gif); - border: 1px solid #009900; -} .calcResult { width: 100%; height: 25px; @@ -1441,22 +898,6 @@ padding:2px; } - -.frameHdr{ - height:32px; - background-image:url(images/rssframeHdr.gif); - background-repeat:repeat-x; - background-position:top left; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - text-align:left; - padding-left:5px; - color:#FFFF00; - vertical-align:middle; - border:0px solid #000000; -} - .forwardBg{ font-family:Arial, Helvetica, sans-serif; font-size:12px; @@ -1473,45 +914,6 @@ /* New Styles */ -.hometop{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:14px; - color:white; - text-decoration:none; - text-align:left; - padding-left:10px; - background-image:url(../images/hometop.gif); - background-position:top left; - background-repeat:repeat-x; - height:35px; - vertical-align:middle; -} - -.homeBtm{ - background-image:url(../images/HomeBtm.gif); - background-position:top left; - background-repeat:repeat-x; - height:29px; -} - -.imageTab{ - background-color:#F5F5F5; - border:0px solid #EBEBEB; - width:30px; - height:30px; - position:relative; - visibility:visible; -} - -a.imageTab:Hover{ - background-color:#BFBFFF; - border:0px solid #EBEBEB; - width:30px; - height:30px; - display:block; - opacity:.5; -} - .mnuTab{ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; @@ -1525,107 +927,6 @@ padding-left:5px; vertical-align:middle; } - -.mnuSel td{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - background-color:#EBEBEB; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuSel td:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#EBEBEB; -} - -.mnuUnSel td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - background-color:#D7D7D7; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuUnSel td:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#D7D7D7; -} - -.tabRht{ - background-image:url(../images/tabRht.gif); - background-position:top left; - background-repeat:repeat-y; - width:31px; -} - - -.frmSelect{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - border:1px #EBEBEB; -} - -#mnuSlide{ - position:absolute; - left:0px; - top:100px; - width:110px; -} - - -#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:#ECECEC; - border-right:1px solid #CCCCCC; - opacity:.8; -} - /* profile */ .prvPrfBigText { @@ -1645,58 +946,14 @@ border:1px solid #ebebeb; } -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - cursor:pointer; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - cursor:pointer; -} - .prvPrfTexture { background:url(images/prvPrfTexture1.gif); } -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; -} - .prvPrfHoverOn { background-color:#ffffef; } -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; -} - /* Organization */ .orgTab{ @@ -1730,56 +987,7 @@ border-right:1px solid #CCCCCC; } -.globTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - color:#000000; - border:1px solid #999999; - border-collapse:collapse; - width:100%; -} - -.globTab tr th{ - text-align:right; - background-color:#CCCCCC; - border-bottom:1px solid #999999; - border-right:2px solid #999999; - color:#000000; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-decoration:none; - font-weight:bold; - height:20px; - padding-right:5px; - -} - -.globTab tr td{ - text-align:left; - border:1px solid #CCCCCC; - color:#666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:none; - font-weight:normal; - padding-left:5px; - height:20px; -} - - /* Groups */ - -.groupul{ - margin:0px; - font-family:Arial, Helvetica, sans-serif; - font-weight:bold; - font-size:12px; - color:#000000; - text-decoration:underline; - text-align:left; -} - .groupli{ margin-left:20px; font-family:Arial, Helvetica, sans-serif; @@ -1837,35 +1045,6 @@ padding-bottom:3px; } -.classBtnSmall{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:9px; - 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; -} - -.classBtnDisable{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:10px; - background-color:#DBDBDB; - border-bottom:2px solid #CCCCCC; - border-right:2px solid #CCCCCC; - border-top:2px solid #F5F5F5; - border-left:2px solid #F5F5F5; - color:#666666; - text-align:center; - padding-top:3px; - padding-bottom:3px; -} .txtBox{ width:85%; @@ -1907,15 +1086,6 @@ font-family:Arial, Helvetica, sans-serif; font-size:11px; } - -#imLead{ - width:100%; - overflow:auto; - position:relative; - border:1px solid #666666; - height:175px; -} - .txtGreen{ color:green; } @@ -1926,16 +1096,6 @@ padding-top:2px; } /* MY PREFERENCES */ - -#chPhoto{ - position:relative; - display:none; - top:20px; - width:100%; - border:1px dashed #666666; - background-color:#FFFFEC; -} - /* CSS FOR REPORTS */ .reportHdr{ @@ -1971,7 +1131,7 @@ } -/* a.reportMnu{ + a.reportMnu{ font-size:11px; color:#0070BA; text-decoration:none; @@ -1993,20 +1153,8 @@ border-bottom:1px solid #E1E1E1; padding-left:20px; padding-top:3px; -} */ - -.reportGenarateTable{ - border-bottom:1px solid #6D6D6D; - border-left:1px solid #6D6D6D; - border-right:1px solid #6D6D6D; - border-top:0px solid #6D6D6D; - background-image:url(../images/report_bg.gif); - background-repeat:repeat-x; -} - -.reportGenarateTable tr td{ - padding:5px; -} +} + #Generate{ position:relative; width:100%; @@ -2014,16 +1162,9 @@ display:none; } -.lvtSel{ - font-weight:bold; -} - /* END OF REPORT */ - - - /* WEB MAIL */ -/* a.webMnu{ + a.webMnu{ font-size:11px; color:#0070BA; text-decoration:underline; @@ -2032,14 +1173,10 @@ font-size:11px; color:#0070BA; text-decoration:underline; -} */ - - +} /* END OF WEB MAIL */ - /* POPUP */ - -/* a.alpha{ + a.alpha{ font-size:11px; color:gray; text-decoration:none; @@ -2057,7 +1194,7 @@ padding-right:5px; border:1px dotted #CCCCCC; background-color:#FFFFCC; -} */ +} /* Home Page */ .MatrixLayer{ @@ -2159,15 +1296,11 @@ } /* End Of All Menu */ - - - /* Calendar */ .calHdr{ background-image:url(images/mailSubHeaderBg.gif); background-repeat:repeat-x; background-position:left top; - } .calSel{ @@ -2187,13 +1320,6 @@ } - -.calSelTabMask { - background-color:#dfdfdf; - height:5px; - -} - .calInnerBorder { border-left:2px solid #a5a5a5; border-right:2px solid #a5a5a5; @@ -2207,10 +1333,6 @@ background:#fefefe url(images/layerPopupBg.gif); } -.calTopLeft { - border-left: 1px solid #a5a5a5; -} - .calTopRight { border-right: 1px solid #a5a5a5; } @@ -2221,33 +1343,6 @@ font-weight:normal; text-align:center; width:8%; -} - -.calTitle{ - background-position:right top; - background-repeat:no-repeat; - background-image:url(images/cal_title.jpg); - width:150px; -} - -.tabBorder{ - background-color:#EBEBEB; - border-bottom:1px solid #666666; - border-left:1px solid #666666; - border-right:1px solid #666666; - padding:10px; -} - -.eventLay{ - background-color:#a5a5a5; - position:relative; - left:0px; - top:0px; - width:100%; - visibility:visible; - padding:5px 5px 5px 5px; - display:block; - z-index:1000; } a.calMnu{ @@ -2270,9 +1365,9 @@ padding-top:3px; } -.bggray{ +/*.bggray{ background-color: #dfdfdf; -} +}*/ .bgwhite{ background-color: #FFFFFF; } @@ -2294,18 +1389,6 @@ display:none; } .style1 {color: #FF0000} - -#hrViewContent{ - width:100%; - height:150px; - overflow:auto; - position:relative; - border-top:1px solid #CCCCCC; - border-bottom:0px solid white; - border-left:0px solid white; - border-right:0px solid white; -} - .event{ background-color:#ddd; border:1px solid #999999; @@ -2321,11 +1404,6 @@ #hrView{ display:block; } - -#lstView{ - display:none; -} - .calendarNav{ font-size:12px; color:#FFFFFF; @@ -2337,7 +1415,6 @@ background-image:url(images/cal_nav.gif); background-repeat:repeat-x; } - #addEventDropDown{ position:absolute; display:none; @@ -2367,36 +1444,11 @@ top:150px; background-color:#ffffff; } - -#cal_popup{ - width:600px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; - position:absolute; - left:100px; - top:100px; -} - .outer{ border-bottom:1px solid #CCCCCC; border-left:1px solid #CCCCCC; border-right:1px solid #CCCCCC; } - -.outerBorder{ - border:1px solid #CCCCCC; - width:95%; -} - -.fieldHead{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - border:0px solid #CCCCCC; - padding:2px 5px 2px 5px; -} - .calTxt{ width:50%; border:1px solid #CCCCCC; @@ -2418,39 +1470,6 @@ /* End of Calendar */ /* Cal Year View */ -.month_table{ - border:2px solid #CCCCCC; - width:100%; - background-color:white; -} - -.month_table tr th{ - background-color:#E9E9E9; - color:#000000; - text-align:center; - border:1px dotted #CCCCCC; - height:20px; - width:14%; - font-weight:normal; -} - -.month_table tr td{ - border:1px dotted #CCCCCC; - color:#000000; - text-align:center; - height:20px; -} - -.cal_Hdr{ - background-image:url(images/cal_Hdr.gif); - background-repeat:repeat-x; - background-position:left top; - font-weight:bold; - color:#000000; - text-align:left; - border:0px solid #000000; -} - .eventDay{ background-color:#FF9966; font-weight:bold; @@ -2533,12 +1552,6 @@ padding: 4px; border-right: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD; -} -.rptTitle { - border-right: 1px solid #333; - border-bottom: 1px solid #333; - background: #2C527C; - color: #FFF; } .rptGrpHead { background: #FFF; @@ -2590,31 +1603,6 @@ /* Css for quick Create */ -.qcWindow { - background-color:white; - border:2px solid #999999; -} - -.qcHeader{ - background:url(images/qcBg.gif) repeat-x; - background-color:gray; - color:black; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 19px; - padding-left:10px; -} -.qcTextBox{ - border:1px solid #999999; - width:90%; -} -.qcTextArea{ - border:1px solid #999999; - width:90%; - height:70px; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; -} .qcTransport{ background-color:#dadada; @@ -2639,50 +1627,6 @@ /* MY SITES */ -.SiteSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_sel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:bold; - font-size:11px; - text-decoration:none; -} - -.SiteUnSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_unsel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; - cursor:pointer; -} - -.SiteHdr{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_hdr.jpg); - background-position:right bottom; - background-repeat:no-repeat; - height:33px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; -} .unread_email { font-weight:bold; } @@ -2707,13 +1651,6 @@ color: #000000; } -.adProgressBar { - border-style:solid; - border-width:2px; - border-color:blue; - -} - .h2 { font-size:18px; @@ -2725,19 +1662,6 @@ color:gray; } - -.hdeskComments { - - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 14px; - color: #999999; - border:0px; - background-color:#ffffef; - width:100%; - -} - ul { list-style:circle; line-height:20px; @@ -2746,14 +1670,6 @@ font-weight:normal; } - - -.branch { - list-style-image: url("secAdd.gif"); -} - - - .tagCloudTopBg { background-image: url(images/tagCloudBg.gif); background-repeat: repeat-x; @@ -2762,15 +1678,6 @@ .tagCloudDisplay { background-color:#e5e5e5; padding:5px; -} - - - -.heading1 { - font-family: Arial, Helvetica, sans-serif; - font-size: 19px; - line-height: 14px; - color: #000000; } .heading2 { @@ -2779,20 +1686,6 @@ line-height: 16px; font-weight:bold; color: #000000; -} - -.heading3 { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 14px; - color: #999999; -} - -.heading4 { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 14px; - color: #999999; } .settingsUI { @@ -2876,7 +1769,7 @@ font-weight:bold; } -/*.cellLabel { +.cellLabel { background-color:#eaebd9; border-top:1px solid #efefef; border-bottom:1px solid #dadada; @@ -2886,7 +1779,7 @@ .cellText { color:#333333; border-bottom:1px solid #dadada; -} */ +} .listTable{ border-left:1px solid #cccccc; @@ -2986,58 +1879,15 @@ .prvPrfOutline { border:1px solid #ebebeb; } - -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - -} - .prvPrfTexture { background:url(images/prvPrfTexture1.gif); -} -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; } .prvPrfHoverOn { background-color:#ffffef; } -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; -} - .cellBottomDotLine { border-bottom-width: 2px; border-bottom-style: dotted; @@ -3056,14 +1906,9 @@ border-bottom-color: #CCCCCC; } -.crmFormDropDown { -border-width:1px; -} + .thickBorder { border: 2px solid #999999; -} -.trackerBorder { - background-color:#ffffff; } .trackerHeading { background-color:#efefef; @@ -3080,20 +1925,11 @@ .crmTable { border:1px solid #dadada; } -.crmTableColHeading { - background-color:#CCCCCC; - border-left:1px solid #eaeaea; - border-top:1px solid #eaeaea; - border-right:1px solid #999999; - border-bottom:1px solid #999999; -} + .crmTableRow { border-bottom:1px dotted #dadada; border-right:1px dotted #dadada } - - - /* Inventory */ @@ -3121,24 +1957,6 @@ /* Inventory */ - - - -/* styles for RSS Display starts */ -.rssDisplay{ - background-color:#eaeaea; -} - - -/* styles for RSS Display ends */ - - - - - - - - /* Email Client Classes ++++++++++++++++++++++ */ .emailSelected{ @@ -3161,11 +1979,6 @@ background:#d9d9d9 url(images/mailSubHeaderBg.gif) repeat-x; padding:4px; } -.mailDetailsHeader { - border-top:2px dotted #999; - border-bottom:1px solid #ddd; -} - .mailClientWriteEmailHeader { font-family:arial, helvetica, sans-serif; font-size:20px; Modified: vtigercrm/trunk/themes/bluelagoon/images/aboutUS.jpg ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/themes/bluelagoon/style.css ============================================================================== --- vtigercrm/trunk/themes/bluelagoon/style.css (original) +++ vtigercrm/trunk/themes/bluelagoon/style.css Tue Oct 10 10:02:43 2006 @@ -166,13 +166,6 @@ padding-top:5px; padding-bottom:5px; } - - -.tabLiner { - background:#9abffc url(images/moduleSelectorBg.gif) bottom repeat-x; - padding:0px; -} - .sep1 { background:#999999; } @@ -184,15 +177,10 @@ a { text-decoration:none; color:#3344bb; - - - } a:hover { text-decoration:underline; - - } .hdrLink { @@ -240,8 +228,6 @@ } .lvtBg { - - } .lvtHeaderText { @@ -321,15 +307,6 @@ padding-left:0px; } -.rightAddInfo { - border-left:1px solid #a2a2a2; - border-right:1px solid #dddddd; - border-bottom:1px solid #dddddd; - border-top:1px solid #a2a2a2; - background-color:#fafafa; - padding:5px; -} - .dvtCellLabel, .cellLabel { background-color:#f5f5ff; padding-right:10px; @@ -364,22 +341,10 @@ } -.rightUpcomingActivitiesHeader{ - border-bottom:1px solid #ddddcc; - padding:5px; - background-color:#ffffdd; -} - -.rightUpcomingActivitiesContent { - padding:5px; - background-color:#ffffef; -} - .detailedViewHeader{ border-bottom:2px solid #4F94CD; padding:5px; background-color:#afdbff; - } .detailedViewTextBox { @@ -392,16 +357,6 @@ background-color:#ffffff; } -.detailedViewProdTextBox { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:85%; - background-color:#ffffff; -} - .detailedViewTextBoxOn { font-family: Arial, Helvetica, sans-serif; font-size: 11px; @@ -410,32 +365,6 @@ padding-left:5px; width:90%; background-color:#ffffdd; -} - -.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 ------------------------------------------- */ - -.moduleSearch { - border:1px solid #dddddd; - background-color:#ffffef; - -} - -.searchHdrBox { - - border-bottom:1px dashed #dddddd; } .advSearch { @@ -464,29 +393,6 @@ width:10px } -.searchNotFound { - border:2px solid #ff3333; - background-color:#fafafa; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #ff0000; - height:50px; - width:640px; -} - - -.loginTopBg { - background:url(images/loginTopBg.gif) repeat-x; -} - -.loginTopShade { - background:url(images/loginTopShade.gif) repeat-x; -} - -.loginBg{ - background:#448cEB url(images/loginBg.gif) repeat-x; -} - .textbox { border:1px solid #999999; background-color:#ffffff; @@ -497,28 +403,8 @@ } -.loginBottomBg { - background:url(images/loginBottomBg.gif) repeat-x; -} - -.loginSignin { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - color: #448ceb; - font-weight:bold; -} - -.loginBillBoard { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color:#ffffff; -} .mx { -} - -.calTopBg { - background:url(images/calBg.gif) repeat-x; } .calListTable td{ @@ -530,52 +416,13 @@ border:1px solid #999999; } -.calDisplay { - border-left:1px solid #d0d0d0; - border-right:1px solid #d0d0d0; -} -.calBottomBg { - background:url(images/calBottomBg.gif) repeat-x; -} - -.calDayHourCell { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; -} + .calDayHour { border-top:1px solid #c5d5ff; border-left:1px solid #c5d5ff; border-bottom:1px solid #c5d5ff; border-right:1px solid #c5d5ff; background-color:#eae7da; -} -.calDiv { - overflow:auto; width:95%;height:200px;padding:0px;background-color:#fefefe; - border-top: 1px solid #bababa; - border-bottom: 1px solid #bababa; -} -.calColHdr{ - border-top:1px solid #fefefa; - border-left:1px solid #fefefa; - - border-right:1px solid #a8a591; - background-color:#eae7da; -} -.calHourCol { - border-top: 1px solid #fefefa; - border-left: 1px solid #fefefa; - border-right: 1px solid #a8a591; - border-bottom: 1px solid #a8a591; - background-color: #eae7da; - height: 30px; - -} -.calHourOccupied { - background-color:#ffffbb; - -} -.calListViewRow { - border-bottom:1px solid eae3d1; } .calAddEvent { @@ -586,108 +433,17 @@ top:150px; background-color:#ffffff; } - -.addEventHeader{ - border-bottom:2px dotted #cccccc; -} - -.addEventFooter{ - border-top:2px dotted #cccccc; - height:40px; -} - .addEventInnerBox { border:1px dotted #dadada; } -.cellScheduled { - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSchHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSch{ - border:0px; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellNormalHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffff; - color:#7a7a7a; -} .cellNormal { border:0px; background-color:#ffffff; } -.calEventNormal { - border:1px solid #999999; - background-color:#99ffcc; - -} - -.calEventCritical { - border:1px solid #999999; - background-color:#FFCC33; -} -.tblPro1 { - -border:2px solid #dadada; - background-color:white; - -} - -.tblPro1IconCell { - border-right:1px solid #dadada; -} - -.tblPro1HeadingCell { - font-weight:bold; -color:#4a4a4a; -} - -.tblPro1ColHeader { - background-color:#dadada; - border-left:1px solid white; - border-right:1px solid #999999; - font-size: 11px; - line-height: 14px; - background-image:url(images/tblPro1ColBg.gif); -} - -.tblPro1DataCell { - border-bottom:1px solid #f5f5f5; - color:#5a5a5a; - font-size: 11px; - line-height: 14px; - -} - -.divEventToDo { -overflow:auto; -height:150px; -border:1px solid #dadada; - -} - -.EventToDo{ - -} .thumbnail{ background-color:#ffffff; @@ -698,117 +454,6 @@ margin-bottom: 15px; } -.thumbnailcaption -{ font-size: 0.9em; padding-top: 0.2em ; } - -/* For Settings */ - -.lftMnuTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-color:#BBBBBB; - border-left:1px solid #666666; - border-right:1px solid #666666; - border-top:0px solid #666666; - border-collapse:collapse; - text-align:right; - padding-top:0px; - padding-left:5px; - padding-right:5px; - vertical-align:top; -} - -.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-decoration:none; - width:99%; -} - -.lftMnuHdr tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-align:left; - text-decoration:none; - height:25px; - padding-right:0px; - padding-left:0px; -} - -a.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; - vertical-align:middle; -} - -a.lftMnuHdr:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; -} - -a.lftSubMnu{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; -} - -a.lftSubMnu:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; - background-color:#CCCCCC; -} .padTab{ padding-top:0px; @@ -818,26 +463,6 @@ vertical-align:top; } - -.controlTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - width:100%; - border:0px; -} - -.controlTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - vertical-align:bottom; -} - #company{ position:relative; width:100%; @@ -851,32 +476,11 @@ #user{position:relative;left:0px;top:0px;width:100%;display:block;} -#studio{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;} -#studioTab{position:relative;left:0px;top:0px;width:100%;display:none;} - -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} -.imgDoc{ - cursor:pointer; - border:0px; -} - #one{ position:relative; display:block; @@ -910,9 +514,6 @@ /* End of Settings */ -.bggray{ - background-color: #dfdfdf; -} .bgwhite{ background-color: #FFFFFF; } @@ -937,82 +538,11 @@ /*Added for Advance Seearch*/ -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} - -.imgDoc{ - cursor:pointer; - border:0px; -} -#slideMnu{ - background-color:#BBBBBB; - vertical-align:top; -} #one{ position:relative; display:block; width:245px; -} - -.prdTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:100%; - border-left:0px solid #CCCCCC; - border-right:0px solid #CCCCCC; - border-collapse:collapse; -} - -.prdTab tr th{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - padding-left:5px; - background-color:#E5E5E5; - height:20px; - color:#000000; - font-weight:bold; - text-decoration:none; - border-bottom:1px solid #CCCCCC; -} - -.prdTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - border-bottom:1px solid #CCCCCC; - padding-left:5px; - color:#000000; - text-decoration:none; - font-weight:normal; - height:20px; -} - -.delTxt{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:underline; - font-weight:normal; - color:#000099; - cursor:pointer; } /* Dashboard CSS */ @@ -1022,15 +552,12 @@ 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; @@ -1047,11 +574,6 @@ padding:5px; } -.dash_shadow{ - background-image:url(images/dash_top_shadow.jpg); - background-repeat:repeat-x; - height:10px; -} .dash_white{ background-color:#FFFFFF; @@ -1069,15 +591,6 @@ color:#000000; padding-left:10px;padding-right:10px; } -.dashMatrixSeperator{ - border-left:2px dashed #dadada; - -} -.dashMatrixBottomLiner{ - border-bottom:2px dashed #dadada; - -} - .dash_switch{ cursor:pointer; width:26px; @@ -1127,108 +640,6 @@ position:top; } -.dash_sel_top{ - background-image:url(images/dash_sel_top.jpg); - background-repeat:repeat-x; - height:5px; - background-position:left top; - font-size:0px; -} - -.dash_sel_btm{ - background-image:url(images/dash_sel_btm.jpg); - background-repeat:repeat-x; - height:4px; - background-position:left top; - font-size:0px; -} - -.dash_sel_left{ - background-color:#F9F7C9; - border-left:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:200px; - text-align:left; - padding-left:5px; - font-size:11px; - font-weight:bold; - color:#000000; -} - -.dash_sel_right{ - background-color:#F9F7C9; - border-right:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:25px; - padding-left:5px; - cursor:pointer; -} - -/* menu */ - -#mnuSlide{ - position:absolute; - left:0px; - top:100px; -/* width:110px;*/ -} - -/* 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 */ @@ -1309,11 +720,6 @@ /* Calculator */ -.calcBg { - /*background-color: #666;*//*BFC1B7*/ - background: url(images/cal_bg.gif); - border: 1px solid #009900; -} .calcResult { width: 100%; height: 25px; @@ -1367,6 +773,7 @@ width:25px; /*background-color: #CCC;*/ } + #calc{ position:absolute; left:100px; @@ -1443,20 +850,6 @@ } -.frameHdr{ - height:32px; - background-image:url(images/rssframeHdr.gif); - background-repeat:repeat-x; - background-position:top left; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - text-align:left; - padding-left:5px; - color:#FFFF00; - vertical-align:middle; - border:0px solid #000000; -} .forwardBg{ font-family:Arial, Helvetica, sans-serif; @@ -1474,45 +867,6 @@ /* New Styles */ -.hometop{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:14px; - color:white; - text-decoration:none; - text-align:left; - padding-left:10px; - background-image:url(../images/hometop.gif); - background-position:top left; - background-repeat:repeat-x; - height:35px; - vertical-align:middle; -} - -.homeBtm{ - background-image:url(../images/HomeBtm.gif); - background-position:top left; - background-repeat:repeat-x; - height:29px; -} - -.imageTab{ - background-color:#F5F5F5; - border:0px solid #EBEBEB; - width:30px; - height:30px; - position:relative; - visibility:visible; -} - -a.imageTab:Hover{ - background-color:#BFBFFF; - border:0px solid #EBEBEB; - width:30px; - height:30px; - display:block; - opacity:.5; -} - .mnuTab{ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; @@ -1527,106 +881,6 @@ vertical-align:middle; } -.mnuSel td{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - background-color:#EBEBEB; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuSel td:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#EBEBEB; -} - -.mnuUnSel td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - background-color:#D7D7D7; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuUnSel td:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#D7D7D7; -} - -.tabRht{ - background-image:url(../images/tabRht.gif); - background-position:top left; - background-repeat:repeat-y; - width:31px; -} - - -.frmSelect{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - border:1px #EBEBEB; -} - -#mnuSlide{ - position:absolute; - left:0px; - top:100px; - width:110px; -} - - -#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:#ECECEC; - border-right:1px solid #CCCCCC; - opacity:.8; -} - /* profile */ .prvPrfBigText { @@ -1646,56 +900,13 @@ border:1px solid #ebebeb; } -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - cursor:pointer; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - cursor:pointer; -} - .prvPrfTexture { background:url(images/prvPrfTexture1.gif); } -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; -} - .prvPrfHoverOn { background-color:#ffffef; -} -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; } /* Organization */ @@ -1731,55 +942,6 @@ border-right:1px solid #CCCCCC; } -.globTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - color:#000000; - border:1px solid #999999; - border-collapse:collapse; - width:100%; -} - -.globTab tr th{ - text-align:right; - background-color:#CCCCCC; - border-bottom:1px solid #999999; - border-right:2px solid #999999; - color:#000000; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-decoration:none; - font-weight:bold; - height:20px; - padding-right:5px; - -} - -.globTab tr td{ - text-align:left; - border:1px solid #CCCCCC; - color:#666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:none; - font-weight:normal; - padding-left:5px; - height:20px; -} - - -/* Groups */ - -.groupul{ - margin:0px; - font-family:Arial, Helvetica, sans-serif; - font-weight:bold; - font-size:12px; - color:#000000; - text-decoration:underline; - text-align:left; -} .groupli{ margin-left:20px; @@ -1838,35 +1000,6 @@ padding-bottom:3px; } -.classBtnSmall{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:9px; - 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; -} - -.classBtnDisable{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:10px; - background-color:#DBDBDB; - border-bottom:2px solid #CCCCCC; - border-right:2px solid #CCCCCC; - border-top:2px solid #F5F5F5; - border-left:2px solid #F5F5F5; - color:#666666; - text-align:center; - padding-top:3px; - padding-bottom:3px; -} .txtBox{ width:85%; @@ -1909,13 +1042,6 @@ font-size:11px; } -#imLead{ - width:100%; - overflow:auto; - position:relative; - border:1px solid #666666; - height:175px; -} .txtGreen{ color:green; @@ -1928,14 +1054,6 @@ } /* MY PREFERENCES */ -#chPhoto{ - position:relative; - display:none; - top:20px; - width:100%; - border:1px dashed #666666; - background-color:#FFFFEC; -} /* CSS FOR REPORTS */ @@ -1972,7 +1090,7 @@ } -/* a.reportMnu{ +a.reportMnu{ font-size:11px; color:#0070BA; text-decoration:none; @@ -1994,37 +1112,17 @@ border-bottom:1px solid #E1E1E1; padding-left:20px; padding-top:3px; -} */ - -.reportGenarateTable{ - border-bottom:1px solid #6D6D6D; - border-left:1px solid #6D6D6D; - border-right:1px solid #6D6D6D; - border-top:0px solid #6D6D6D; - background-image:url(../images/report_bg.gif); - background-repeat:repeat-x; -} - -.reportGenarateTable tr td{ - padding:5px; -} +} + #Generate{ position:relative; width:100%; text-align:center; display:none; } - -.lvtSel{ - font-weight:bold; -} - /* END OF REPORT */ - - - /* WEB MAIL */ -/* a.webMnu{ +a.webMnu{ font-size:11px; color:#0070BA; text-decoration:underline; @@ -2033,14 +1131,14 @@ font-size:11px; color:#0070BA; text-decoration:underline; -} */ +} /* END OF WEB MAIL */ /* POPUP */ -/* a.alpha{ + a.alpha{ font-size:11px; color:gray; text-decoration:none; @@ -2058,7 +1156,7 @@ padding-right:5px; border:1px dotted #CCCCCC; background-color:#FFFFCC; -} */ +} /* Home Page */ .MatrixLayer{ @@ -2189,12 +1287,6 @@ } -.calSelTabMask { - background-color:#D6D2AB; - height:5px; - -} - .calInnerBorder { border-left:2px solid #A5B5EE; border-right:2px solid #A5B5EE; @@ -2208,15 +1300,9 @@ background:#fefefe url(images/layerPopupBg.gif); } -.calTopLeft { - border-left: 1px solid #A5B5EE; -} - .calTopRight { border-right: 1px solid #A5B5EE; } - - .calUnSel{ color:#000000; font-weight:normal; @@ -2224,32 +1310,6 @@ width:8%; } -.calTitle{ - background-position:right top; - background-repeat:no-repeat; - background-image:url(images/cal_title.jpg); - width:150px; -} - -.tabBorder{ - background-color:#EBEBEB; - border-bottom:1px solid #666666; - border-left:1px solid #666666; - border-right:1px solid #666666; - padding:10px; -} - -.eventLay{ - background-color:#DBF3FD; - position:relative; - left:0px; - top:0px; - width:100%; - visibility:visible; - padding:5px 5px 5px 5px; - display:block; - z-index:1000; -} a.calMnu{ font-size:11px; @@ -2271,9 +1331,6 @@ padding-top:3px; } -.bggray{ - background-color: #dfdfdf; -} .bgwhite{ background-color: #FFFFFF; } @@ -2296,16 +1353,6 @@ } .style1 {color: #FF0000} -#hrViewContent{ - width:100%; - height:150px; - overflow:auto; - position:relative; - border-top:1px solid #CCCCCC; - border-bottom:0px solid white; - border-left:0px solid white; - border-right:0px solid white; -} .event{ background-color:#D3EAF0; @@ -2323,9 +1370,6 @@ display:block; } -#lstView{ - display:none; -} .calendarNav{ font-size:12px; @@ -2369,15 +1413,6 @@ background-color:#ffffff; } -#cal_popup{ - width:600px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; - position:absolute; - left:100px; - top:100px; -} .outer{ border-bottom:1px solid #CCCCCC; @@ -2385,18 +1420,6 @@ border-right:1px solid #CCCCCC; } -.outerBorder{ - border:1px solid #CCCCCC; - width:95%; -} - -.fieldHead{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - border:0px solid #CCCCCC; - padding:2px 5px 2px 5px; -} .calTxt{ width:50%; @@ -2419,39 +1442,6 @@ /* End of Calendar */ /* Cal Year View */ -.month_table{ - border:2px solid #CCCCCC; - width:100%; - background-color:white; -} - -.month_table tr th{ - background-color:#E9E9E9; - color:#000000; - text-align:center; - border:1px dotted #CCCCCC; - height:20px; - width:14%; - font-weight:normal; -} - -.month_table tr td{ - border:1px dotted #CCCCCC; - color:#000000; - text-align:center; - height:20px; -} - -.cal_Hdr{ - background-image:url(images/cal_Hdr.gif); - background-repeat:repeat-x; - background-position:left top; - font-weight:bold; - color:#000000; - text-align:left; - border:0px solid #000000; -} - .eventDay{ background-color:#FF9966; font-weight:bold; @@ -2534,12 +1524,6 @@ padding: 4px; border-right: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD; -} -.rptTitle { - border-right: 1px solid #333; - border-bottom: 1px solid #333; - background: #2C527C; - color: #FFF; } .rptGrpHead { background: #FFF; @@ -2591,31 +1575,6 @@ /* Css for quick Create */ -.qcWindow { - background-color:white; - border:2px solid #999999; -} - -.qcHeader{ - background:url(images/qcBg.gif) repeat-x; - background-color:gray; - color:black; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 19px; - padding-left:10px; -} -.qcTextBox{ - border:1px solid #999999; - width:90%; -} -.qcTextArea{ - border:1px solid #999999; - width:90%; - height:70px; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; -} .qcTransport{ background-color:#d5d6ff; @@ -2640,50 +1599,6 @@ /* MY SITES */ -.SiteSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_sel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:bold; - font-size:11px; - text-decoration:none; -} - -.SiteUnSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_unsel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; - cursor:pointer; -} - -.SiteHdr{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_hdr.jpg); - background-position:right bottom; - background-repeat:no-repeat; - height:33px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; -} .unread_email { font-weight:bold; } @@ -2708,12 +1623,6 @@ color: #000000; } -.adProgressBar { - border-style:solid; - border-width:2px; - border-color:blue; - -} .h2 { @@ -2727,17 +1636,6 @@ color:gray; } -.hdeskComments { - - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 14px; - color: #999999; - border:0px; - background-color:#ffffef; - width:100%; - -} ul { list-style:circle; @@ -2747,14 +1645,6 @@ font-weight:normal; } - - -.branch { - list-style-image: url("secAdd.gif"); -} - - - .tagCloudTopBg { background-image: url(images/tagCloudBg.gif); background-repeat: repeat-x; @@ -2764,16 +1654,6 @@ background-color:#fff; padding:5px; } - - - -.heading1 { - font-family: Arial, Helvetica, sans-serif; - font-size: 19px; - line-height: 14px; - color: #000000; -} - .heading2 { font-family: Arial, Helvetica, sans-serif; font-size: 16px; @@ -2781,30 +1661,13 @@ font-weight:bold; color: #000000; } - -.heading3 { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 14px; - color: #999999; -} - -.heading4 { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 14px; - color: #999999; -} - .settingsUI { text-align:left; background-color:#fff; background-image:url(images/layerPopupBg.gif); border:2px solid #aaaaff; - -} - +} .settingsTabHeader { text-align:left; @@ -2881,7 +1744,7 @@ font-weight:bold; } -/*.cellLabel { +.cellLabel { background-color:#eaebd9; border-top:1px solid #efefef; border-bottom:1px solid #dadada; @@ -2891,7 +1754,7 @@ .cellText { color:#333333; border-bottom:1px solid #dadada; -} */ +} .listTable{ border-left:1px solid #cccccc; @@ -2992,55 +1855,16 @@ border:1px solid #ebebeb; } -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - -} + .prvPrfTexture { background:url(images/prvPrfTexture1.gif); -} -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; } .prvPrfHoverOn { background-color:#ffffef; -} -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; } .cellBottomDotLine { @@ -3061,14 +1885,8 @@ border-bottom-color: #CCCCCC; } -.crmFormDropDown { -border-width:1px; -} .thickBorder { border: 2px solid #999999; -} -.trackerBorder { - background-color:#ffffff; } .trackerHeading { background-color:#efefef; @@ -3085,21 +1903,10 @@ .crmTable { border:1px solid #dadada; } -.crmTableColHeading { - background-color:#CCCCCC; - border-left:1px solid #eaeaea; - border-top:1px solid #eaeaea; - border-right:1px solid #999999; - border-bottom:1px solid #999999; -} .crmTableRow { border-bottom:1px dotted #dadada; border-right:1px dotted #dadada } - - - - /* Inventory */ .lineOnTop { @@ -3130,9 +1937,9 @@ /* styles for RSS Display starts */ -.rssDisplay{ +/*.rssDisplay{ background-color:#e8e3ca; -} +}*/ /* styles for RSS Display ends */ @@ -3165,10 +1972,6 @@ .mailSubHeader { background:#b4b8ff url(images/mailSubHeaderBg.gif) repeat-x; padding:4px; -} -.mailDetailsHeader { - border-top:2px dotted #999; - border-bottom:1px solid #ddd; } .mailClientWriteEmailHeader { Modified: vtigercrm/trunk/themes/woodspice/images/aboutUS.jpg ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/themes/woodspice/style.css ============================================================================== --- vtigercrm/trunk/themes/woodspice/style.css (original) +++ vtigercrm/trunk/themes/woodspice/style.css Tue Oct 10 10:02:43 2006 @@ -30,13 +30,6 @@ border-left:2px dotted #332211; padding:10px; } - - -.yellowBox { - background-color:#ffffE1; - border:1px solid #999999; -} - .genHeaderBig{ font-family: Arial, Helvetica, sans-serif; font-size: 16px; @@ -58,18 +51,9 @@ color: #000000; font-weight:bold; } - -.rssDisplayPanel { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 12px; - color: #ABABAB; -} - - .hdrNameBg { background:#ffffff url(images/primeTopBg.gif) repeat-x; - + } .hdrTabBg { @@ -144,43 +128,6 @@ padding-right:40px; } - -/*.level2text { - background:#bbbbbb url(images/level2Bg.gif) repeat-x; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:20px; - padding-right:20px; - padding-top:5px; - padding-bottom:5px; - font-weight:bold; - color:white; -}*/ - -.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:#e0dbb0 url(images/level2TabBg.gif) bottom repeat-x; font-family: Arial, Helvetica, sans-serif; @@ -206,11 +153,6 @@ padding-bottom:5px; } - -.tabLiner { - background:#9abffc url(images/moduleSelectorBg.gif) bottom repeat-x; - padding:0px; -} .sep1 { background:#999999; @@ -356,15 +298,6 @@ padding-left:0px; } -.rightAddInfo { - border-left:1px solid #a2a2a2; - border-right:1px solid #dddddd; - border-bottom:1px solid #dddddd; - border-top:1px solid #a2a2a2; - background-color:#fafafa; - padding:5px; -} - .dvtCellLabel, .cellLabel { background-color:#efefe2; padding-right:10px; @@ -396,17 +329,6 @@ padding:5px; background-color:#fafafa; -} - -.rightUpcomingActivitiesHeader{ - border-bottom:1px solid #ddddcc; - padding:5px; - background-color:#ffffdd; -} - -.rightUpcomingActivitiesContent { - padding:5px; - background-color:#ffffef; } .detailedViewHeader{ @@ -426,16 +348,6 @@ background-color:#ffffff; } -.detailedViewProdTextBox { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:85%; - background-color:#ffffff; -} - .detailedViewTextBoxOn { font-family: Arial, Helvetica, sans-serif; font-size: 11px; @@ -446,31 +358,9 @@ background-color:#ffffdd; } -.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 ------------------------------------------- */ -.moduleSearch { - border:1px solid #dddddd; - background-color:#ffffef; - -} - -.searchHdrBox { - - border-bottom:1px dashed #dddddd; -} .advSearch { padding:10px; @@ -498,28 +388,6 @@ width:10px } -.searchNotFound { - border:2px solid #ff3333; - background-color:#fafafa; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #ff0000; - height:50px; - width:640px; -} - - -.loginTopBg { - background:url(images/loginTopBg.gif) repeat-x; -} - -.loginTopShade { - background:url(images/loginTopShade.gif) repeat-x; -} - -.loginBg{ - background:#448cEB url(images/loginBg.gif) repeat-x; -} .textbox { border:1px solid #999999; @@ -531,28 +399,9 @@ } -.loginBottomBg { - background:url(images/loginBottomBg.gif) repeat-x; -} - -.loginSignin { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - color: #448ceb; - font-weight:bold; -} - -.loginBillBoard { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color:#ffffff; -} + .mx { -} - -.calTopBg { - background:url(images/calBg.gif) repeat-x; } .calListTable td{ @@ -564,18 +413,7 @@ border:1px solid #999999; } -.calDisplay { - border-left:1px solid #d0d0d0; - border-right:1px solid #d0d0d0; -} -.calBottomBg { - background:url(images/calBottomBg.gif) repeat-x; -} - -.calDayHourCell { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; -} + .calDayHour { border-top:1px solid #a8a591; border-left:1px solid #a8a591; @@ -583,34 +421,7 @@ border-right:1px solid #a8a591; background-color:#eae7da; } -.calDiv { - overflow:auto; width:95%;height:320px;padding:0px;background-color:#fefefe; - border-top: 1px solid #bababa; - border-bottom: 1px solid #bababa; -} -.calColHdr{ - border-top:1px solid #fefefa; - border-left:1px solid #fefefa; - - border-right:1px solid #a8a591; - background-color:#eae7da; -} -.calHourCol { - border-top: 1px solid #fefefa; - border-left: 1px solid #fefefa; - border-right: 1px solid #a8a591; - border-bottom: 1px solid #a8a591; - background-color: #eae7da; - height: 40px; - -} -.calHourOccupied { - background-color:#ffffbb; - -} -.calListViewRow { - border-bottom:1px solid eae3d1; -} + .calAddEvent { position:absolute; @@ -621,102 +432,17 @@ background-color:#ffffff; } -.addEventHeader{ - border-bottom:2px dotted #cccccc; -} - -.addEventFooter{ - border-top:2px dotted #cccccc; - height:40px; -} + .addEventInnerBox { border:1px dotted #dadada; } -.cellScheduled { - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSchHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSch{ - border:0px; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellNormalHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffff; - color:#7a7a7a; -} .cellNormal { border:0px; background-color:#ffffff; -} - -.calEventNormal { - border:1px solid #999999; - background-color:#99ffcc; - -} - -.calEventCritical { - border:1px solid #999999; - background-color:#FFCC33; -} -.tblPro1 { - -border:2px solid #dadada; - background-color:white; - -} - -.tblPro1IconCell { - border-right:1px solid #dadada; -} - -.tblPro1HeadingCell { - font-weight:bold; -color:#4a4a4a; -} - -.tblPro1ColHeader { - background-color:#dadada; - border-left:1px solid white; - border-right:1px solid #999999; - font-size: 11px; - line-height: 14px; - background-image:url(images/tblPro1ColBg.gif); -} - -.tblPro1DataCell { - border-bottom:1px solid #f5f5f5; - color:#5a5a5a; - font-size: 11px; - line-height: 14px; - -} - -.divEventToDo { -overflow:auto; -height:150px; -border:1px solid #dadada; - } .EventToDo{ @@ -732,118 +458,6 @@ margin-bottom: 15px; } -.thumbnailcaption -{ font-size: 0.9em; padding-top: 0.2em ; } - -/* For Settings */ - -.lftMnuTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-color:#BBBBBB; - border-left:1px solid #666666; - border-right:1px solid #666666; - border-top:0px solid #666666; - border-collapse:collapse; - text-align:right; - padding-top:0px; - padding-left:5px; - padding-right:5px; - vertical-align:top; -} - -.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-decoration:none; - width:99%; -} - -.lftMnuHdr tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-align:left; - text-decoration:none; - height:25px; - padding-right:0px; - padding-left:0px; -} - -a.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; - vertical-align:middle; -} - -a.lftMnuHdr:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; -} - -a.lftSubMnu{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; -} - -a.lftSubMnu:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; - background-color:#CCCCCC; -} - .padTab{ padding-top:0px; padding-left:0px; @@ -851,25 +465,6 @@ padding-bottom:0px; vertical-align:top; -} - -.controlTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - width:100%; - border:0px; -} - -.controlTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - vertical-align:bottom; } #company{ @@ -885,31 +480,12 @@ #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;} -#studioTab{position:relative;left:0px;top:0px;width:100%;display:none;} - -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} -.imgDoc{ - cursor:pointer; - border:0px; -} + #one{ position:relative; @@ -944,9 +520,7 @@ /* End of Settings */ -.bggray{ - background-color: #dfdfdf; -} + .bgwhite{ background-color: #FFFFFF; } @@ -969,92 +543,10 @@ display:none; } -/*Added for Advance Seearch*/ - -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} - -.imgDoc{ - cursor:pointer; - border:0px; -} -#slideMnu{ - background-color:#BBBBBB; - vertical-align:top; -} - #one{ position:relative; display:block; width:245px; -} - -.prdTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:100%; - border-left:0px solid #CCCCCC; - border-right:0px solid #CCCCCC; - border-collapse:collapse; -} - -.prdTab tr th{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - padding-left:5px; - background-color:#E5E5E5; - height:20px; - color:#000000; - font-weight:bold; - text-decoration:none; - border-bottom:1px solid #CCCCCC; -} - -.prdTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - border-bottom:1px solid #CCCCCC; - padding-left:5px; - color:#000000; - text-decoration:none; - font-weight:normal; - height:20px; -} - -.delTxt{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:underline; - font-weight:normal; - color:#000099; - cursor:pointer; -} - -/* Dashboard CSS */ -a.dash_href{ - display:block; - width:24px;height:24px; - vertical-align:middle; - margin-top:10px; } @@ -1081,11 +573,6 @@ padding:5px; } -.dash_shadow{ - background-image:url(images/dash_top_shadow.jpg); - background-repeat:repeat-x; - height:10px; -} .dash_white{ background-color:#FFFFFF; @@ -1103,14 +590,7 @@ color:#000000; padding-left:10px;padding-right:10px; } -.dashMatrixSeperator{ - border-left:2px dashed #dadada; - -} -.dashMatrixBottomLiner{ - border-bottom:2px dashed #dadada; - -} + .dash_switch{ cursor:pointer; @@ -1161,55 +641,12 @@ position:top; } -.dash_sel_top{ - background-image:url(images/dash_sel_top.jpg); - background-repeat:repeat-x; - height:5px; - background-position:left top; - font-size:0px; -} - -.dash_sel_btm{ - background-image:url(images/dash_sel_btm.jpg); - background-repeat:repeat-x; - height:4px; - background-position:left top; - font-size:0px; -} - -.dash_sel_left{ - background-color:#F9F7C9; - border-left:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:200px; - text-align:left; - padding-left:5px; - font-size:11px; - font-weight:bold; - color:#000000; -} - -.dash_sel_right{ - background-color:#F9F7C9; - border-right:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:25px; - padding-left:5px; - cursor:pointer; -} /* menu */ -#mnuSlide{ - position:absolute; - left:0px; - top:100px; -/* width:110px;*/ -} - -/* a.submenu{ + + + a.submenu{ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; padding-top:5px; @@ -1235,7 +672,7 @@ text-align:left; text-decoration:none; display:block; -} */ +} #mnuKey{ font-family:Verdana, Arial, Helvetica, sans-serif; @@ -1343,11 +780,7 @@ /* Calculator */ -.calcBg { - /*background-color: #666;*//*BFC1B7*/ - background: url(images/cal_bg.gif); - border: 1px solid #009900; -} + .calcResult { width: 100%; height: 25px; @@ -1477,21 +910,6 @@ } -.frameHdr{ - height:32px; - background-image:url(images/rssframeHdr.gif); - background-repeat:repeat-x; - background-position:top left; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - text-align:left; - padding-left:5px; - color:#FFFF00; - vertical-align:middle; - border:0px solid #000000; -} - .forwardBg{ font-family:Arial, Helvetica, sans-serif; font-size:12px; @@ -1508,44 +926,7 @@ /* New Styles */ -.hometop{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:14px; - color:white; - text-decoration:none; - text-align:left; - padding-left:10px; - background-image:url(../images/hometop.gif); - background-position:top left; - background-repeat:repeat-x; - height:35px; - vertical-align:middle; -} - -.homeBtm{ - background-image:url(../images/HomeBtm.gif); - background-position:top left; - background-repeat:repeat-x; - height:29px; -} - -.imageTab{ - background-color:#F5F5F5; - border:0px solid #EBEBEB; - width:30px; - height:30px; - position:relative; - visibility:visible; -} - -a.imageTab:Hover{ - background-color:#BFBFFF; - border:0px solid #EBEBEB; - width:30px; - height:30px; - display:block; - opacity:.5; -} + .mnuTab{ font-family:Verdana, Arial, Helvetica, sans-serif; @@ -1561,106 +942,6 @@ vertical-align:middle; } -.mnuSel td{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - background-color:#EBEBEB; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuSel td:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#EBEBEB; -} - -.mnuUnSel td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - background-color:#D7D7D7; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuUnSel td:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#D7D7D7; -} - -.tabRht{ - background-image:url(../images/tabRht.gif); - background-position:top left; - background-repeat:repeat-y; - width:31px; -} - - -.frmSelect{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - border:1px #EBEBEB; -} - -#mnuSlide{ - position:absolute; - left:0px; - top:100px; - width:110px; -} - - -#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:#ECECEC; - border-right:1px solid #CCCCCC; - opacity:.8; -} - /* profile */ .prvPrfBigText { @@ -1680,56 +961,16 @@ border:1px solid #ebebeb; } -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - cursor:pointer; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - cursor:pointer; -} + .prvPrfTexture { background:url(images/prvPrfTexture1.gif); } -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; -} .prvPrfHoverOn { background-color:#ffffef; -} -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; } /* Organization */ @@ -1765,55 +1006,9 @@ border-right:1px solid #CCCCCC; } -.globTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - color:#000000; - border:1px solid #999999; - border-collapse:collapse; - width:100%; -} - -.globTab tr th{ - text-align:right; - background-color:#CCCCCC; - border-bottom:1px solid #999999; - border-right:2px solid #999999; - color:#000000; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-decoration:none; - font-weight:bold; - height:20px; - padding-right:5px; - -} - -.globTab tr td{ - text-align:left; - border:1px solid #CCCCCC; - color:#666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:none; - font-weight:normal; - padding-left:5px; - height:20px; -} - /* Groups */ -.groupul{ - margin:0px; - font-family:Arial, Helvetica, sans-serif; - font-weight:bold; - font-size:12px; - color:#000000; - text-decoration:underline; - text-align:left; -} .groupli{ margin-left:20px; @@ -1872,36 +1067,6 @@ padding-bottom:3px; } -.classBtnSmall{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:9px; - 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; -} - -.classBtnDisable{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:10px; - background-color:#DBDBDB; - border-bottom:2px solid #CCCCCC; - border-right:2px solid #CCCCCC; - border-top:2px solid #F5F5F5; - border-left:2px solid #F5F5F5; - color:#666666; - text-align:center; - padding-top:3px; - padding-bottom:3px; -} - .txtBox{ width:85%; border:1px solid #666666; @@ -1943,13 +1108,6 @@ font-size:11px; } -#imLead{ - width:100%; - overflow:auto; - position:relative; - border:1px solid #666666; - height:175px; -} .txtGreen{ color:green; @@ -1962,14 +1120,6 @@ } /* MY PREFERENCES */ -#chPhoto{ - position:relative; - display:none; - top:20px; - width:100%; - border:1px dashed #666666; - background-color:#FFFFEC; -} /* CSS FOR REPORTS */ @@ -2006,7 +1156,7 @@ } -/* a.reportMnu{ +a.reportMnu{ font-size:11px; color:#0070BA; text-decoration:none; @@ -2028,20 +1178,8 @@ border-bottom:1px solid #E1E1E1; padding-left:20px; padding-top:3px; -} */ - -.reportGenarateTable{ - border-bottom:1px solid #6D6D6D; - border-left:1px solid #6D6D6D; - border-right:1px solid #6D6D6D; - border-top:0px solid #6D6D6D; - background-image:url(../images/report_bg.gif); - background-repeat:repeat-x; -} - -.reportGenarateTable tr td{ - padding:5px; -} +} + #Generate{ position:relative; width:100%; @@ -2049,16 +1187,13 @@ display:none; } -.lvtSel{ - font-weight:bold; -} - + /* END OF REPORT */ /* WEB MAIL */ -/* a.webMnu{ + a.webMnu{ font-size:11px; color:#0070BA; text-decoration:underline; @@ -2067,14 +1202,14 @@ font-size:11px; color:#0070BA; text-decoration:underline; -} */ +} /* END OF WEB MAIL */ /* POPUP */ -/* a.alpha{ + a.alpha{ font-size:11px; color:gray; text-decoration:none; @@ -2092,7 +1227,7 @@ padding-right:5px; border:1px dotted #CCCCCC; background-color:#FFFFCC; -} */ +} /* Home Page */ .MatrixLayer{ @@ -2222,13 +1357,6 @@ } - -.calSelTabMask { - background-color:#D6D2AB; - height:5px; - -} - .calInnerBorder { border-left:1px solid #d6d2ab; border-right:1px solid #d6d2ab; @@ -2242,9 +1370,6 @@ background:#fefefe url(images/layerPopupBg.gif); } -.calTopLeft { - border-left: 1px solid #939271; -} .calTopRight { border-right: 1px solid #939271; @@ -2258,32 +1383,6 @@ width:8%; } -.calTitle{ - background-position:right top; - background-repeat:no-repeat; - background-image:url(images/cal_title.jpg); - width:150px; -} - -.tabBorder{ - background-color:#EBEBEB; - border-bottom:1px solid #666666; - border-left:1px solid #666666; - border-right:1px solid #666666; - padding:10px; -} - -.eventLay{ - background-color:#DBF3FD; - position:relative; - left:0px; - top:0px; - width:100%; - visibility:visible; - padding:5px 5px 5px 5px; - display:block; - z-index:1000; -} a.calMnu{ font-size:11px; @@ -2304,10 +1403,6 @@ padding-left:5px; padding-top:3px; } - -.bggray{ - background-color: #dfdfdf; -} .bgwhite{ background-color: #FFFFFF; } @@ -2329,17 +1424,6 @@ display:none; } .style1 {color: #FF0000} - -#hrViewContent{ - width:100%; - height:250px; - overflow:auto; - position:relative; - border-top:1px solid #CCCCCC; - border-bottom:0px solid white; - border-left:0px solid white; - border-right:0px solid white; -} .event{ background-color:#D3EAF0; @@ -2356,11 +1440,6 @@ #hrView{ display:block; } - -#lstView{ - display:none; -} - .calendarNav{ font-size:12px; color:#FFFFFF; @@ -2403,33 +1482,10 @@ background-color:#ffffff; } -#cal_popup{ - width:600px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; - position:absolute; - left:100px; - top:100px; -} - .outer{ border-bottom:1px solid #CCCCCC; border-left:1px solid #CCCCCC; border-right:1px solid #CCCCCC; -} - -.outerBorder{ - border:1px solid #CCCCCC; - width:95%; -} - -.fieldHead{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - border:0px solid #CCCCCC; - padding:2px 5px 2px 5px; } .calTxt{ @@ -2453,38 +1509,7 @@ /* End of Calendar */ /* Cal Year View */ -.month_table{ - border:2px solid #CCCCCC; - width:100%; - background-color:white; -} - -.month_table tr th{ - background-color:#E9E9E9; - color:#000000; - text-align:center; - border:1px dotted #CCCCCC; - height:20px; - width:14%; - font-weight:normal; -} - -.month_table tr td{ - border:1px dotted #CCCCCC; - color:#000000; - text-align:center; - height:20px; -} - -.cal_Hdr{ - background-image:url(images/cal_Hdr.gif); - background-repeat:repeat-x; - background-position:left top; - font-weight:bold; - color:#000000; - text-align:left; - border:0px solid #000000; -} + .eventDay{ background-color:#FF9966; @@ -2569,12 +1594,7 @@ border-right: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD; } -.rptTitle { - border-right: 1px solid #333; - border-bottom: 1px solid #333; - background: #2C527C; - color: #FFF; -} + .rptGrpHead { background: #FFF; border-bottom: 1px solid #FFF; @@ -2625,31 +1645,7 @@ /* Css for quick Create */ -.qcWindow { - background-color:white; - border:2px solid #999999; -} - -.qcHeader{ - background:url(images/qcBg.gif) repeat-x; - background-color:gray; - color:black; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 19px; - padding-left:10px; -} -.qcTextBox{ - border:1px solid #999999; - width:90%; -} -.qcTextArea{ - border:1px solid #999999; - width:90%; - height:70px; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; -} + .qcTransport{ background-color:#d3d2c1; @@ -2674,50 +1670,7 @@ /* MY SITES */ -.SiteSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_sel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:bold; - font-size:11px; - text-decoration:none; -} - -.SiteUnSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_unsel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; - cursor:pointer; -} - -.SiteHdr{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_hdr.jpg); - background-position:right bottom; - background-repeat:no-repeat; - height:33px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; -} + .unread_email { font-weight:bold; } @@ -2742,12 +1695,6 @@ color: #000000; } -.adProgressBar { - border-style:solid; - border-width:2px; - border-color:blue; - -} .h2 { @@ -2761,17 +1708,6 @@ color:gray; } -.hdeskComments { - - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 14px; - color: #999999; - border:0px; - background-color:#ffffef; - width:100%; - -} ul { list-style:circle; @@ -2783,9 +1719,6 @@ } -.branch { - list-style-image: url("secAdd.gif"); -} @@ -2801,12 +1734,7 @@ -.heading1 { - font-family: Arial, Helvetica, sans-serif; - font-size: 19px; - line-height: 14px; - color: #000000; -} + .heading2 { font-family: Arial, Helvetica, sans-serif; @@ -2816,19 +1744,7 @@ color: #000000; } -.heading3 { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 14px; - color: #999999; -} - -.heading4 { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 14px; - color: #999999; -} + .settingsUI { @@ -2909,7 +1825,7 @@ font-weight:bold; } -/*.cellLabel { +.cellLabel { background-color:#eaebd9; border-top:1px solid #efefef; border-bottom:1px solid #dadada; @@ -2919,7 +1835,7 @@ .cellText { color:#333333; border-bottom:1px solid #dadada; -} */ +} .listTable{ border-left:1px solid #cccccc; @@ -3019,56 +1935,19 @@ border:1px solid #ebebeb; } -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - -} + .prvPrfTexture { background:url(images/prvPrfTexture1.gif); } -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; -} + .prvPrfHoverOn { background-color:#ffffef; } -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; -} + .cellBottomDotLine { border-bottom-width: 2px; @@ -3088,15 +1967,11 @@ border-bottom-color: #CCCCCC; } -.crmFormDropDown { -border-width:1px; -} + .thickBorder { border: 2px solid #999999; } -.trackerBorder { - background-color:#ffffff; -} + .trackerHeading { background-color:#efefef; } @@ -3112,19 +1987,11 @@ .crmTable { border:1px solid #dadada; } -.crmTableColHeading { - background-color:#CCCCCC; - border-left:1px solid #eaeaea; - border-top:1px solid #eaeaea; - border-right:1px solid #999999; - border-bottom:1px solid #999999; -} + .crmTableRow { border-bottom:1px dotted #dadada; border-right:1px dotted #dadada } - - /* Inventory */ @@ -3153,24 +2020,6 @@ /* Inventory */ - - - -/* styles for RSS Display starts */ -.rssDisplay{ - background-color:#e8e3ca; -} - - -/* styles for RSS Display ends */ - - - - - - - - /* Email Client Classes ++++++++++++++++++++++ */ .emailSelected{ @@ -3192,10 +2041,7 @@ background:#e0dbb0 url(images/mailSubHeaderBg.gif) repeat-x; padding:4px; } -.mailDetailsHeader { - border-top:2px dotted #999; - border-bottom:1px solid #ddd; -} + .mailClientWriteEmailHeader{ font-family:arial, helvetica, sans-serif; Modified: vtigercrm/trunk/vtigerservice.php ============================================================================== --- vtigercrm/trunk/vtigerservice.php (original) +++ vtigercrm/trunk/vtigerservice.php Tue Oct 10 10:02:43 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ - +ini_set (error_reporting,E_ALL & ~E_NOTICE ); if(isset($_REQUEST['service'])) { if($_REQUEST['service'] == "outlook") @@ -44,11 +44,11 @@ { echo "

    vtigerCRM Soap Services

    "; echo "
  • vtigerCRM Outlook Plugin EndPoint URL -- Click here
  • "; - echo "
  • vtigerCRM Word Plugin EndPoint URL -- Click here
  • "; + echo "
  • vtigerCRM Word Plugin EndPoint URL -- Click here
  • "; echo "
  • vtigerCRM ThunderBird Extenstion EndPoint URL -- Click here
  • "; echo "
  • vtigerCRM Customer Portal EndPoint URL -- Click here
  • "; echo "
  • vtigerCRM WebForm EndPoint URL -- Click here
  • "; - echo "
  • vtigerCRM FireFox Extension EndPoint URL -- Click here
  • "; + echo "
  • vtigerCRM FireFox Extension EndPoint URL -- Click here
  • "; } Modified: vtigercrm/trunk/vtigerversion.php ============================================================================== --- vtigercrm/trunk/vtigerversion.php (original) +++ vtigercrm/trunk/vtigerversion.php Tue Oct 10 10:02:43 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -$patch_version = ''; +$patch_version = '1'; $modified_database = ''; $vtiger_current_version = '5.0.0'; ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Oct 11 06:47:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 11 Oct 2006 13:47:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9624 - /vtigercrm/tags/vtigercrm-5.0.1/ Message-ID: <20061011134755.419986FDF53@vtiger.fosslabs.com> Author: richie Date: Wed Oct 11 07:47:51 2006 New Revision: 9624 Log: tag removed Removed: vtigercrm/tags/vtigercrm-5.0.1/ From vtigercrm-commits at vtiger.fosslabs.com Wed Oct 11 07:59:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 11 Oct 2006 14:59:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9625 - /vtigercrm/tags/vtigercrm-5.0.1/ Message-ID: <20061011145917.7767E787FEB@vtiger.fosslabs.com> Author: richie Date: Wed Oct 11 08:59:12 2006 New Revision: 9625 Log: 5.0.1 version tagged Added: vtigercrm/tags/vtigercrm-5.0.1/ - copied from r9624, vtigercrm/trunk/ From vtigercrm-commits at vtiger.fosslabs.com Wed Oct 11 08:31:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 11 Oct 2006 15:31:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9626 - /vtigercrm/branches/5.0.2/ Message-ID: <20061011153120.EAA136D4958@vtiger.fosslabs.com> Author: richie Date: Wed Oct 11 09:31:09 2006 New Revision: 9626 Log: Creating a branch for 5.0.2 Added: vtigercrm/branches/5.0.2/ - copied from r9625, vtigercrm/trunk/ From vtigercrm-commits at vtiger.fosslabs.com Sun Oct 15 23:48:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 06:48:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9627 - in /vtigercrm/branches/5.0.1: ./ include/utils/ install/ modules/Accounts/ modules/Calendar/ modules/Campaigns/ modules/Contacts/ modules/Emails/ modules/Home/ modules/Import/ modules/Invoice/ modules/Leads/ modules/Notes/ modules/Potentials/ modules/PriceBooks/ modules/Products/ modules/PurchaseOrder/ modules/Quotes/ modules/SalesOrder/ modules/Users/ modules/Vendors/ modules/Webmails/ soap/ Message-ID: <20061016064859.9A592787FC0@vtiger.fosslabs.com> Author: richie Date: Mon Oct 16 00:46:06 2006 New Revision: 9627 Log: module name ,File name ,Class name made unique Modified: vtigercrm/branches/5.0.1/Popup.php vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php vtigercrm/branches/5.0.1/include/utils/ListViewUtils.php vtigercrm/branches/5.0.1/include/utils/export.php vtigercrm/branches/5.0.1/include/utils/utils.php vtigercrm/branches/5.0.1/index.php vtigercrm/branches/5.0.1/install/5createTables.inc.php vtigercrm/branches/5.0.1/install/populateSeedData.php vtigercrm/branches/5.0.1/modules/Accounts/Account.php vtigercrm/branches/5.0.1/modules/Accounts/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Accounts/Delete.php vtigercrm/branches/5.0.1/modules/Accounts/DetailView.php vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Accounts/EditView.php vtigercrm/branches/5.0.1/modules/Accounts/HeadLines.php vtigercrm/branches/5.0.1/modules/Accounts/ListView.php vtigercrm/branches/5.0.1/modules/Accounts/ListViewTop.php vtigercrm/branches/5.0.1/modules/Accounts/Save.php vtigercrm/branches/5.0.1/modules/Accounts/Tickerdetail.php vtigercrm/branches/5.0.1/modules/Calendar/Activity.php vtigercrm/branches/5.0.1/modules/Calendar/RenderRelatedListUI.php vtigercrm/branches/5.0.1/modules/Campaigns/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Campaigns/Campaign.php vtigercrm/branches/5.0.1/modules/Campaigns/Delete.php vtigercrm/branches/5.0.1/modules/Campaigns/DetailView.php vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php vtigercrm/branches/5.0.1/modules/Campaigns/ListView.php vtigercrm/branches/5.0.1/modules/Campaigns/Save.php vtigercrm/branches/5.0.1/modules/Contacts/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Contacts/Contact.php vtigercrm/branches/5.0.1/modules/Contacts/Delete.php vtigercrm/branches/5.0.1/modules/Contacts/DetailView.php vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Contacts/EditView.php vtigercrm/branches/5.0.1/modules/Contacts/ListView.php vtigercrm/branches/5.0.1/modules/Contacts/Save.php vtigercrm/branches/5.0.1/modules/Emails/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Emails/ChooseEmail.php vtigercrm/branches/5.0.1/modules/Emails/Delete.php vtigercrm/branches/5.0.1/modules/Emails/DetailView.php vtigercrm/branches/5.0.1/modules/Emails/EditView.php vtigercrm/branches/5.0.1/modules/Emails/Email.php vtigercrm/branches/5.0.1/modules/Emails/EmailsAjax.php vtigercrm/branches/5.0.1/modules/Emails/ListView.php vtigercrm/branches/5.0.1/modules/Emails/Save.php vtigercrm/branches/5.0.1/modules/Emails/mailsend.php vtigercrm/branches/5.0.1/modules/Emails/sendmail.php vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php vtigercrm/branches/5.0.1/modules/Import/ImportAccount.php vtigercrm/branches/5.0.1/modules/Import/ImportContact.php vtigercrm/branches/5.0.1/modules/Import/ImportLead.php vtigercrm/branches/5.0.1/modules/Import/ImportOpportunity.php vtigercrm/branches/5.0.1/modules/Import/ImportProduct.php vtigercrm/branches/5.0.1/modules/Import/ImportStep2.php vtigercrm/branches/5.0.1/modules/Import/ImportSteplast.php vtigercrm/branches/5.0.1/modules/Invoice/EditView.php vtigercrm/branches/5.0.1/modules/Leads/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Leads/Delete.php vtigercrm/branches/5.0.1/modules/Leads/DetailView.php vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Leads/EditView.php vtigercrm/branches/5.0.1/modules/Leads/Lead.php vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php vtigercrm/branches/5.0.1/modules/Leads/ListView.php vtigercrm/branches/5.0.1/modules/Leads/Save.php vtigercrm/branches/5.0.1/modules/Leads/result.php vtigercrm/branches/5.0.1/modules/Notes/Delete.php vtigercrm/branches/5.0.1/modules/Notes/DetailView.php vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Notes/EditView.php vtigercrm/branches/5.0.1/modules/Notes/ListView.php vtigercrm/branches/5.0.1/modules/Notes/Note.php vtigercrm/branches/5.0.1/modules/Notes/Save.php vtigercrm/branches/5.0.1/modules/Potentials/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Potentials/Charts.php vtigercrm/branches/5.0.1/modules/Potentials/Delete.php vtigercrm/branches/5.0.1/modules/Potentials/DetailView.php vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Potentials/EditView.php vtigercrm/branches/5.0.1/modules/Potentials/ListView.php vtigercrm/branches/5.0.1/modules/Potentials/ListViewTop.php vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php vtigercrm/branches/5.0.1/modules/Potentials/Save.php vtigercrm/branches/5.0.1/modules/PriceBooks/CallRelatedList.php vtigercrm/branches/5.0.1/modules/PriceBooks/Delete.php vtigercrm/branches/5.0.1/modules/PriceBooks/DetailView.php vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php vtigercrm/branches/5.0.1/modules/PriceBooks/ListView.php vtigercrm/branches/5.0.1/modules/PriceBooks/PriceBook.php vtigercrm/branches/5.0.1/modules/PriceBooks/Save.php vtigercrm/branches/5.0.1/modules/Products/AddProductToPriceBooks.php vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php vtigercrm/branches/5.0.1/modules/Products/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Products/Delete.php vtigercrm/branches/5.0.1/modules/Products/DetailView.php vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Products/EditView.php vtigercrm/branches/5.0.1/modules/Products/ListView.php vtigercrm/branches/5.0.1/modules/Products/Product.php vtigercrm/branches/5.0.1/modules/Products/Save.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/CallRelatedList.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/CreatePDF.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/Delete.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailView.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/EditView.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListTopPurchaseOrder.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListView.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/PurchaseOrder.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/Save.php vtigercrm/branches/5.0.1/modules/Quotes/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Quotes/CreatePDF.php vtigercrm/branches/5.0.1/modules/Quotes/Delete.php vtigercrm/branches/5.0.1/modules/Quotes/DetailView.php vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Quotes/EditView.php vtigercrm/branches/5.0.1/modules/Quotes/ListTopQuotes.php vtigercrm/branches/5.0.1/modules/Quotes/ListView.php vtigercrm/branches/5.0.1/modules/Quotes/Quote.php vtigercrm/branches/5.0.1/modules/Quotes/Save.php vtigercrm/branches/5.0.1/modules/SalesOrder/EditView.php vtigercrm/branches/5.0.1/modules/Users/Authenticate.php vtigercrm/branches/5.0.1/modules/Users/ChangePassword.php vtigercrm/branches/5.0.1/modules/Users/CreateUserPrivilegeFile.php vtigercrm/branches/5.0.1/modules/Users/DetailView.php vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Users/EditView.php vtigercrm/branches/5.0.1/modules/Users/ListLoginHistory.php vtigercrm/branches/5.0.1/modules/Users/ListView.php vtigercrm/branches/5.0.1/modules/Users/Logout.php vtigercrm/branches/5.0.1/modules/Users/Save.php vtigercrm/branches/5.0.1/modules/Users/ShowAuditTrail.php vtigercrm/branches/5.0.1/modules/Users/ShowHistory.php vtigercrm/branches/5.0.1/modules/Users/User.php vtigercrm/branches/5.0.1/modules/Users/massChangeStatus.php vtigercrm/branches/5.0.1/modules/Users/populatetemplate.php vtigercrm/branches/5.0.1/modules/Vendors/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Vendors/Delete.php vtigercrm/branches/5.0.1/modules/Vendors/DetailView.php vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Vendors/EditView.php vtigercrm/branches/5.0.1/modules/Vendors/ListView.php vtigercrm/branches/5.0.1/modules/Vendors/Save.php vtigercrm/branches/5.0.1/modules/Vendors/Vendor.php vtigercrm/branches/5.0.1/modules/Webmails/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Webmails/Save.php vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php vtigercrm/branches/5.0.1/soap/vtigerolservice.php vtigercrm/branches/5.0.1/soap/webforms.php vtigercrm/branches/5.0.1/soap/wordplugin.php Modified: vtigercrm/branches/5.0.1/Popup.php ============================================================================== --- vtigercrm/branches/5.0.1/Popup.php (original) +++ vtigercrm/branches/5.0.1/Popup.php Mon Oct 16 00:46:06 2006 @@ -33,8 +33,8 @@ switch($currentModule) { case 'Contacts': - require_once("modules/$currentModule/Contact.php"); - $focus = new Contact(); + require_once("modules/$currentModule/Contacts.php"); + $focus = new Contacts(); $log = LoggerManager::getLogger('contact_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom'); $comboFieldArray = getComboArray($comboFieldNames); @@ -47,8 +47,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","",""); break; case 'Campaigns': - require_once("modules/$currentModule/Campaign.php"); - $focus = new Campaign(); + require_once("modules/$currentModule/Campaigns.php"); + $focus = new Campaigns(); $log = LoggerManager::getLogger('campaign_list'); $comboFieldNames = Array('campaignstatus'=>'campaignstatus_dom', 'campaigntype'=>'campaigntype_dom'); @@ -60,8 +60,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','campaignname','true','basic',$popuptype,"","",""); break; case 'Accounts': - require_once("modules/$currentModule/Account.php"); - $focus = new Account(); + require_once("modules/$currentModule/Accounts.php"); + $focus = new Accounts(); $log = LoggerManager::getLogger('account_list'); $comboFieldNames = Array('accounttype'=>'account_type_dom' ,'industry'=>'industry_dom'); @@ -74,8 +74,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','accountname','true','basic',$popuptype,"","",""); break; case 'Leads': - require_once("modules/$currentModule/Lead.php"); - $focus = new Lead(); + require_once("modules/$currentModule/Leads.php"); + $focus = new Leads(); $log = LoggerManager::getLogger('contact_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom' ,'leadstatus'=>'leadstatus_dom' @@ -91,8 +91,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","",""); break; case 'Potentials': - require_once("modules/$currentModule/Opportunity.php"); - $focus = new Potential(); + require_once("modules/$currentModule/Potentials.php"); + $focus = new Potentials(); $log = LoggerManager::getLogger('potential_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom' ,'opportunity_type'=>'opportunity_type_dom' @@ -104,8 +104,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','potentialname','true','basic',$popuptype,"","",""); break; case 'Quotes': - require_once("modules/$currentModule/Quote.php"); - $focus = new Quote(); + require_once("modules/$currentModule/Quotes.php"); + $focus = new Quotes(); $log = LoggerManager::getLogger('quotes_list'); $comboFieldNames = Array('quotestage'=>'quotestage_dom'); $comboFieldArray = getComboArray($comboFieldNames); @@ -121,8 +121,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','subject','true','basic',$popuptype,"","",""); break; case 'Products': - require_once("modules/$currentModule/Product.php"); - $focus = new Product(); + require_once("modules/$currentModule/Products.php"); + $focus = new Products(); $smarty->assign("SINGLE_MOD",'Product'); if(isset($_REQUEST['curr_row'])) { @@ -135,8 +135,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','productname','true','basic',$popuptype,"","",""); break; case 'Vendors': - require_once("modules/$currentModule/Vendor.php"); - $focus = new Vendor(); + require_once("modules/$currentModule/Vendors.php"); + $focus = new Vendors(); $smarty->assign("SINGLE_MOD",'Vendor'); $alphabetical = AlphabeticalSearch($currentModule,'Popup','vendorname','true','basic',$popuptype,"","",""); break; @@ -150,15 +150,15 @@ break; case 'PurchaseOrder': require_once("modules/$currentModule/PurchaseOrder.php"); - $focus = new Order(); + $focus = new PurchaseOrder(); $smarty->assign("SINGLE_MOD",'PurchaseOrder'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); $alphabetical = AlphabeticalSearch($currentModule,'Popup','subject','true','basic',$popuptype,"","",""); break; case 'PriceBooks': - require_once("modules/$currentModule/PriceBook.php"); - $focus = new PriceBook(); + require_once("modules/$currentModule/PriceBooks.php"); + $focus = new PriceBooks(); $smarty->assign("SINGLE_MOD",'PriceBook'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); @@ -175,8 +175,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','bookname','true','basic',$popuptype,"","",""); break; case 'Users': - require_once("modules/$currentModule/User.php"); - $focus = new User(); + require_once("modules/$currentModule/Users.php"); + $focus = new Users(); $smarty->assign("SINGLE_MOD",'Users'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); Modified: vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php Mon Oct 16 00:46:06 2006 @@ -863,15 +863,15 @@ $nemail=count($realid); if ($pmodule=='Accounts'){ - require_once('modules/Accounts/Account.php'); - $myfocus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $myfocus = new Accounts(); $myfocus->retrieve_entity_info($entityid,"Accounts"); $fullname=br2nl($myfocus->column_fields['accountname']); $account_selected = 'selected'; } elseif ($pmodule=='Contacts'){ - require_once('modules/Contacts/Contact.php'); - $myfocus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $myfocus = new Contacts(); $myfocus->retrieve_entity_info($entityid,"Contacts"); $fname=br2nl($myfocus->column_fields['firstname']); $lname=br2nl($myfocus->column_fields['lastname']); @@ -879,8 +879,8 @@ $contact_selected = 'selected'; } elseif ($pmodule=='Leads'){ - require_once('modules/Leads/Lead.php'); - $myfocus = new Lead(); + require_once('modules/Leads/Leads.php'); + $myfocus = new Leads(); $myfocus->retrieve_entity_info($entityid,"Leads"); $fname=br2nl($myfocus->column_fields['firstname']); $lname=br2nl($myfocus->column_fields['lastname']); Modified: vtigercrm/branches/5.0.1/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/ListViewUtils.php Mon Oct 16 00:46:06 2006 @@ -1385,8 +1385,8 @@ } elseif($popuptype == "specific_account_address") { - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($entity_id,"Accounts"); $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']).'"); window.close()\'>'.$temp_val.''; @@ -1394,8 +1394,8 @@ } elseif($popuptype == "specific_contact_account_address") { - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($entity_id,"Accounts"); $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']).'"); window.close()\'>'.$temp_val.''; @@ -1405,8 +1405,8 @@ elseif($popuptype == "specific_potential_account_address") { $acntid = $adb->query_result($list_result,$list_result_count,"accountid"); - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($acntid,"Accounts"); $account_name = getAccountName($acntid); @@ -1461,8 +1461,8 @@ } elseif($popuptype == "specific_vendor_address") { - require_once('modules/Vendors/Vendor.php'); - $acct_focus = new Vendor(); + require_once('modules/Vendors/Vendors.php'); + $acct_focus = new Vendors(); $acct_focus->retrieve_entity_info($entity_id,"Vendors"); $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']).'"); window.close()\'>'.$temp_val.''; Modified: vtigercrm/branches/5.0.1/include/utils/export.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/export.php (original) +++ vtigercrm/branches/5.0.1/include/utils/export.php Mon Oct 16 00:46:06 2006 @@ -20,23 +20,23 @@ require_once('config.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Leads/Lead.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Leads/Leads.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Emails/Emails.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Users/User.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Users/Users.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/UserInfoUtil.php'); global $allow_exports; session_start(); -$current_user = new User(); +$current_user = new Users(); if(isset($_SESSION['authenticated_user_id'])) { Modified: vtigercrm/branches/5.0.1/include/utils/utils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/utils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/utils.php Mon Oct 16 00:46:06 2006 @@ -2048,9 +2048,9 @@ $log->debug("Entering getEmailParentsList(".$module.",".$id.") method ..."); global $adb; if($module == 'Contacts') - $focus = new Contact(); + $focus = new Contacts(); if($module == 'Leads') - $focus = new Lead(); + $focus = new Leads(); $focus->retrieve_entity_info($id,$module); $fieldid = 0; Modified: vtigercrm/branches/5.0.1/index.php ============================================================================== --- vtigercrm/branches/5.0.1/index.php (original) +++ vtigercrm/branches/5.0.1/index.php Mon Oct 16 00:46:06 2006 @@ -101,7 +101,7 @@ set_default_config($default_config_values); require_once('include/logging.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); global $currentModule; @@ -352,7 +352,7 @@ $lang_crm = (isset($_SESSION['authenticated_user_language'])) ? $_SESSION['authenticated_user_language'] : ""; $GLOBALS['request_string'] = "&module=$module&action=$action&record=$record&lang_crm=$lang_crm"; -$current_user = new User(); +$current_user = new Users(); if($use_current_login) { @@ -432,90 +432,22 @@ // Use the record to track the viewing. // todo - Have a record of modules and thier primary object names. //Getting the actual module - $actualModule = $currentModule; switch($currentModule) { - case 'Leads': - require_once("modules/$currentModule/Lead.php"); - $focus = new Lead(); - break; - case 'Contacts': - require_once("modules/$currentModule/Contact.php"); - $focus = new Contact(); - break; - case 'Accounts': - require_once("modules/$currentModule/Account.php"); - $focus = new Account(); - break; - case 'Potentials': - require_once("modules/$currentModule/Opportunity.php"); - $focus = new Potential(); - break; case 'Calendar': require_once("modules/$currentModule/Activity.php"); $focus = new Activity(); break; - case 'Notes': - require_once("modules/$currentModule/Note.php"); - $focus = new Note(); - break; - case 'Emails': - require_once("modules/$currentModule/Email.php"); - $focus = new Email(); - break; - case 'Users': - require_once("modules/$currentModule/User.php"); - $focus = new User(); - break; - case 'Products': - require_once("modules/$currentModule/Product.php"); - $focus = new Product(); - break; - case 'Vendors': - require_once("modules/$currentModule/Vendor.php"); - $focus = new Vendor(); - $actualModule = 'Vendors'; - break; - case 'PriceBooks': - require_once("modules/$currentModule/PriceBook.php"); - $focus = new PriceBook(); - $actualModule = 'PriceBooks'; - break; - case 'HelpDesk': - require_once("modules/$currentModule/HelpDesk.php"); - $focus = new HelpDesk(); - break; - case 'Faq': - require_once("modules/$currentModule/Faq.php"); - $focus = new Faq(); - break; - case 'Quotes': - require_once("modules/$currentModule/Quote.php"); - $focus = new Quote(); - break; - case 'PurchaseOrder': - require_once("modules/$currentModule/PurchaseOrder.php"); - $focus = new Order(); - break; - case 'SalesOrder': - require_once("modules/$currentModule/SalesOrder.php"); - $focus = new SalesOrder(); - break; - - case 'Invoice': - require_once("modules/$currentModule/Invoice.php"); - $focus = new Invoice(); - break; - case 'Campaigns': - require_once("modules/$currentModule/Campaign.php"); - $focus = new Campaign(); + default: + require_once("modules/$currentModule/$currentModule.php"); + $focus = new $currentModule(); break; } if(isset($_REQUEST['record']) && $_REQUEST['record']!='' && $_REQUEST["module"] != "Webmails") { // Only track a viewing if the record was retrieved. - $focus->track_view($current_user->id, $actualModule,$_REQUEST['record']); + $focus->track_view($current_user->id, $currentModule,$_REQUEST['record']); } } Modified: vtigercrm/branches/5.0.1/install/5createTables.inc.php ============================================================================== --- vtigercrm/branches/5.0.1/install/5createTables.inc.php (original) +++ vtigercrm/branches/5.0.1/install/5createTables.inc.php Mon Oct 16 00:46:06 2006 @@ -22,14 +22,14 @@ require_once('config.php'); require_once('include/database/PearDatabase.php'); require_once('include/logging.php'); -require_once('modules/Leads/Lead.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Leads/Leads.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Users/User.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Users/Users.php'); require_once('modules/Import/ImportMap.php'); require_once('modules/Import/UsersLastImport.php'); require_once('modules/Users/LoginHistory.php'); @@ -66,7 +66,7 @@ global $default_user_is_admin; // create default admin user - $user = new User(); + $user = new Users(); $user->column_fields["last_name"] = 'Administrator'; $user->column_fields["user_name"] = 'admin'; $user->column_fields["status"] = 'Active'; @@ -122,7 +122,7 @@ //Creating the Standard User - $user = new User(); + $user = new Users(); $user->column_fields["last_name"] = 'StandardUser'; $user->column_fields["user_name"] = 'standarduser'; $user->column_fields["is_admin"] = 'off'; Modified: vtigercrm/branches/5.0.1/install/populateSeedData.php ============================================================================== --- vtigercrm/branches/5.0.1/install/populateSeedData.php (original) +++ vtigercrm/branches/5.0.1/install/populateSeedData.php Mon Oct 16 00:46:06 2006 @@ -19,29 +19,29 @@ require_once('config.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('modules/Contacts/contactSeedData.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Campaigns/Campaign.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); require_once('include/language/en_us.lang.php'); require_once('include/ComboStrings.php'); require_once('include/ComboUtil.php'); -require_once('modules/Products/Product.php'); -require_once('modules/PriceBooks/PriceBook.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Products/Products.php'); +require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/Vendors/Vendors.php'); require_once('modules/Faq/Faq.php'); require_once('modules/HelpDesk/HelpDesk.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Quotes/Quotes.php'); require_once('modules/SalesOrder/SalesOrder.php'); require_once('modules/PurchaseOrder/PurchaseOrder.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/InventoryUtils.php'); //Included to save inventory related products in demo data global $first_name_array; @@ -113,7 +113,7 @@ } // Look up the user id for the assigned user -$seed_user = new User(); +$seed_user = new Users(); //$adb->println("PSD assignname=".$assigned_user_name); @@ -121,7 +121,7 @@ global $current_user; -$current_user = new User(); +$current_user = new Users(); $result = $current_user->retrieve_entity_info($assigned_user_id,'Users'); $tagkey = 1; @@ -147,7 +147,7 @@ $account_name = $company_name_array[$i]; // Create new accounts. - $account = new Account(); + $account = new Accounts(); $account->column_fields["accountname"] = $account_name; $account->column_fields["phone"] = create_phone_number(); $account->column_fields["assigned_user_id"] = $assigned_user_id; @@ -196,7 +196,7 @@ //Create new opportunities - $opp = new Potential(); + $opp = new Potentials(); $opp->column_fields["assigned_user_id"] = $assigned_user_id; $opp->column_fields["potentialname"] = $account_name." - 1000 units"; @@ -235,7 +235,7 @@ for($i=0; $i<10; $i++) { - $contact = new Contact(); + $contact = new Contacts(); $contact->column_fields["firstname"] = ucfirst(strtolower($first_name_array[$i])); $contact->column_fields["lastname"] = ucfirst(strtolower($last_name_array[$i])); $contact->column_fields["assigned_user_id"] = $assigned_user_id; @@ -327,7 +327,7 @@ $company_count=0; for($i=0; $i<10; $i++) { - $lead = new Lead(); + $lead = new Leads(); $lead->column_fields["firstname"] = ucfirst(strtolower($first_name_array[$i])); $lead->column_fields["lastname"] = ucfirst(strtolower($last_name_array[$i])); @@ -404,7 +404,7 @@ //Populating Vendor Data for($i=0; $i<10; $i++) { - $vendor = new Vendor(); + $vendor = new Vendors(); $vendor->column_fields["vendorname"] = ucfirst(strtolower($first_name_array[$i])); $vendor->column_fields["phone"] = create_phone_number(); $vendor->column_fields["email"] = strtolower($vendor->column_fields["vendorname"])."@company.com"; @@ -442,7 +442,7 @@ .jpeg###","product7.jpeg###product8.jpeg###product9.jpeg###product10.jpeg###"); for($i=0; $i<10; $i++) { - $product = new Product(); + $product = new Products(); if($i>4) { $parent_key = array_rand($opportunity_ids); @@ -579,7 +579,7 @@ $validtill_array = array ("2006-09-21", "2006-10-29", "2006-12-11", "2006-10-09", "2006-11-18"); for($i=0;$i<5;$i++) { - $quote = new Quote(); + $quote = new Quotes(); $quote->column_fields["assigned_user_id"] = $assigned_user_id; $account_key = array_rand($account_ids); @@ -730,7 +730,7 @@ for($i=0;$i<5;$i++) { - $po = new Order(); + $po = new PurchaseOrder(); $po->column_fields["assigned_user_id"] = $assigned_user_id; $vendor_key = array_rand($vendor_ids); @@ -896,7 +896,7 @@ for($i=0;$i<5;$i++) { - $email = new Email(); + $email = new Emails(); $email->column_fields["assigned_user_id"] = $assigned_user_id; @@ -923,7 +923,7 @@ //$num_array = array(0,1,2,3,4); for($i=0;$i<12;$i++) { - $pricebook = new PriceBook(); + $pricebook = new PriceBooks(); $rand = array_rand($num_array); $pricebook->column_fields["bookname"] = $PB_array[$i]; @@ -940,7 +940,7 @@ for($i=0;$i<7;$i++) { - $notes = new Note(); + $notes = new Notes(); $rand = array_rand($num_array); $contact_key = array_rand($contact_ids); @@ -1118,7 +1118,7 @@ //$expected_response = Array(null,null,null); for($i=0;$icolumn_fields["campaignname"] = $campaign_name; $campaign->column_fields["campaigntype"] = $campaign_type_array[$i]; Modified: vtigercrm/branches/5.0.1/modules/Accounts/Account.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/Account.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/Account.php Mon Oct 16 00:46:06 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Accounts/Account.php,v 1.53 2005/04/28 08:06:45 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Accounts/Accounts.php,v 1.53 2005/04/28 08:06:45 rank Exp $ * Description: Defines the Account SugarBean Account entity with the necessary * methods and variables. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. @@ -26,11 +26,11 @@ require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -96,7 +96,7 @@ var $default_order_by = 'accountname'; var $default_sort_order = 'ASC'; - function Account() { + function Accounts() { $this->log =LoggerManager::getLogger('account'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Accounts'); @@ -147,7 +147,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $mod_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; if(isPermitted("Contacts",1,"") == 'yes') @@ -191,7 +191,7 @@ $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; - $focus = new Potential(); + $focus = new Potentials(); $button = ''; if(isPermitted("Potentials",1,"") == 'yes') @@ -388,9 +388,9 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quote.php'); - - $focus = new Quote(); + require_once('modules/Quotes/Quotes.php'); + + $focus = new Quotes(); $button = ''; if(isPermitted("Quotes",1,"") == 'yes') @@ -627,10 +627,10 @@ { global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Product.php'); + require_once('modules/Products/Products.php'); global $app_strings; - $focus = new Product(); + $focus = new Products(); $button = ''; Modified: vtigercrm/branches/5.0.1/modules/Accounts/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -22,7 +22,7 @@ } else { -$focus = new Account(); +$focus = new Accounts(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Accounts/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/Delete.php Mon Oct 16 00:46:06 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Account(); +$focus = new Accounts(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Accounts/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/DetailView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ global $app_list_strings; global $log, $currentModule, $singlepane_view; -$focus = new Account(); +$focus = new Accounts(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Accounts"); $focus->id = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $acntObj = new Account(); + $acntObj = new Accounts(); $acntObj->retrieve_entity_info($crmid,"Accounts"); $acntObj->column_fields[$fieldname] = $fieldvalue; if($fieldname == 'annual_revenue')//annual revenue converted to dollar value while saving Modified: vtigercrm/branches/5.0.1/modules/Accounts/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/EditView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -31,7 +31,7 @@ global $app_strings,$mod_strings,$currentModule,$theme; $smarty=new vtigerCRM_Smarty; -$focus = new Account(); +$focus = new Accounts(); if(isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Accounts/HeadLines.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/HeadLines.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/HeadLines.php Mon Oct 16 00:46:06 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -include("modules/Accounts/Account.php"); +include("modules/Accounts/Accounts.php"); include("getCompanyProfile.php"); $variable = $_REQUEST['tickersymbol']; $url = "http://finance.yahoo.com/q?s=".$variable; Modified: vtigercrm/branches/5.0.1/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/ListView.php Mon Oct 16 00:46:06 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -43,7 +43,7 @@ $url_string = ''; -$focus = new Account(); +$focus = new Accounts(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Accounts/ListViewTop.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/ListViewTop.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/ListViewTop.php Mon Oct 16 00:46:06 2006 @@ -28,7 +28,7 @@ $log = LoggerManager::getLogger('top accounts_list'); $log->debug("Entering getTopAccounts() method ..."); require_once("data/Tracker.php"); - require_once('modules/Potentials/Opportunity.php'); + require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); global $app_strings; Modified: vtigercrm/branches/5.0.1/modules/Accounts/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/Save.php Mon Oct 16 00:46:06 2006 @@ -21,14 +21,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/logging.php'); //require_once('database/DatabaseConnection.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); global $log; -$focus = new Account(); +$focus = new Accounts(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/Accounts/Tickerdetail.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/Tickerdetail.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/Tickerdetail.php Mon Oct 16 00:46:06 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once("modules/Accounts/Account.php"); +require_once("modules/Accounts/Accounts.php"); require_once("getCompanyProfile.php"); $variable = $_REQUEST['tickersymbol']; $url = "http://moneycentral.msn.com/investor/research/profile.asp?Symbol=".trim($variable); Modified: vtigercrm/branches/5.0.1/modules/Calendar/Activity.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Calendar/Activity.php (original) +++ vtigercrm/branches/5.0.1/modules/Calendar/Activity.php Mon Oct 16 00:46:06 2006 @@ -154,7 +154,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; @@ -177,7 +177,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new User(); + $focus = new Users(); $button = ''; @@ -395,8 +395,8 @@ global $log,$adb; $log->debug("Entering get_tasksforol(".$username.") method ..."); global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -447,8 +447,8 @@ global $log,$adb; $log->debug("Entering get_calendarsforol(".$user_name.") method ..."); global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); Modified: vtigercrm/branches/5.0.1/modules/Calendar/RenderRelatedListUI.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Calendar/RenderRelatedListUI.php (original) +++ vtigercrm/branches/5.0.1/modules/Calendar/RenderRelatedListUI.php Mon Oct 16 00:46:06 2006 @@ -10,8 +10,8 @@ ********************************************************************************/ require_once('include/RelatedListView.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/UserInfoUtil.php'); // functions added for group calendar -Jaguar Modified: vtigercrm/branches/5.0.1/modules/Campaigns/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Campaigns/Campaign.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 @@ -23,7 +23,7 @@ } else { -$focus = new Campaign(); +$focus = new Campaigns(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Campaigns/Campaign.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/Campaign.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/Campaign.php Mon Oct 16 00:46:06 2006 @@ -18,8 +18,8 @@ require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); require_once('include/utils/utils.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Leads/Leads.php'); require_once('user_privileges/default_module_view.php'); class Campaign extends CRMEntity { @@ -66,7 +66,7 @@ 'Campaign Type'=>'campaigntype', ); - function Campaign() + function Campaigns() { $this->log =LoggerManager::getLogger('campaign'); $this->db = new PearDatabase(); @@ -120,7 +120,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $mod_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; if($singlepane_view == 'true') @@ -145,7 +145,7 @@ $log->debug("Entering get_leads(".$id.") method ..."); global $mod_strings; - $focus = new Lead(); + $focus = new Leads(); $button = ''; if($singlepane_view == 'true') @@ -169,7 +169,7 @@ $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; - $focus = new Potential(); + $focus = new Potentials(); $button = ''; if($singlepane_view == 'true') Modified: vtigercrm/branches/5.0.1/modules/Campaigns/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/Delete.php Mon Oct 16 00:46:06 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('ticket_delete'); -$focus = new Campaign(); +$focus = new Campaigns(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/DetailView.php Mon Oct 16 00:46:06 2006 @@ -11,12 +11,12 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Campaigns/Campaign.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'); -$focus = new Campaign(); +$focus = new Campaigns(); if(isset($_REQUEST['record']) && $_REQUEST['record']!= null ) { Modified: vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Campaign(); + $modObj = new Campaigns(); $modObj->retrieve_entity_info($crmid,"Campaigns"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php Mon Oct 16 00:46:06 2006 @@ -11,12 +11,12 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once('include/utils/utils.php'); -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$currentModule,$theme; -$focus = new Campaign(); +$focus = new Campaigns(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] !='') Modified: vtigercrm/branches/5.0.1/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/ListView.php Mon Oct 16 00:46:06 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once("data/Tracker.php"); @@ -28,7 +28,7 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; -$focus = new Campaign(); +$focus = new Campaigns(); $category = getParentTab(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Campaigns/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/Save.php Mon Oct 16 00:46:06 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new Campaign(); +$focus = new Campaigns(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/Contacts/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout @@ -22,7 +22,7 @@ } else { -$focus = new Contact(); +$focus = new Contacts(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/Contact.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/Contact.php Mon Oct 16 00:46:06 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Contacts/Contact.php,v 1.70 2005/04/27 11:21:49 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Contacts/Contacts.php,v 1.70 2005/04/27 11:21:49 rank Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -25,11 +25,11 @@ require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); require_once('include/utils/utils.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Campaigns/Campaign.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); require_once('modules/HelpDesk/HelpDesk.php'); require_once('user_privileges/default_module_view.php'); @@ -125,7 +125,7 @@ var $default_order_by = 'lastname'; var $default_sort_order = 'ASC'; - function Contact() { + function Contacts() { $this->log = LoggerManager::getLogger('contact'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Contacts'); @@ -334,7 +334,7 @@ $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; - $focus = new Potential(); + $focus = new Potentials(); $button = ''; if(isPermitted("Potentials",1,"") == 'yes') @@ -486,8 +486,8 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quote.php'); - $focus = new Quote(); + require_once('modules/Quotes/Quotes.php'); + $focus = new Quotes(); $button = ''; if(isPermitted("Quotes",1,"") == 'yes') @@ -540,8 +540,8 @@ global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); global $app_strings; - require_once('modules/Products/Product.php'); - $focus = new Product(); + require_once('modules/Products/Products.php'); + $focus = new Products(); $button = ''; if(isPermitted("Products",1,"") == 'yes') @@ -570,7 +570,7 @@ $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new Order(); + $focus = new PurchaseOrder(); $button = ''; @@ -600,7 +600,7 @@ $log->debug("Entering get_emails(".$id.") method ..."); global $mod_strings; - $focus = new Email(); + $focus = new Emails(); $button = ''; @@ -631,7 +631,7 @@ $log->debug("Entering get_campaigns(".$id.") method ..."); global $mod_strings; - $focus = new Campaign(); + $focus = new Campaigns(); if($singlepane_view == 'true') $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; else @@ -735,8 +735,8 @@ { global $log; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -775,8 +775,8 @@ { global $log,$adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); Modified: vtigercrm/branches/5.0.1/modules/Contacts/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/Delete.php Mon Oct 16 00:46:06 2006 @@ -17,13 +17,13 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Contact(); +$focus = new Contacts(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Contacts/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/DetailView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -33,7 +33,7 @@ global $app_strings; global $currentModule, $singlepane_view; -$focus = new Contact(); +$focus = new Contacts(); if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $cntObj = new Contact(); + $cntObj = new Contacts(); $cntObj->retrieve_entity_info($crmid,"Contacts"); $cntObj->column_fields[$fieldname] = $fieldvalue; $cntObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Contacts/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/EditView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -39,7 +39,7 @@ $image_error=isset($_REQUEST['image_error'])?$_REQUEST['image_error']:"false"; //end -$focus = new Contact(); +$focus = new Contacts(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) @@ -68,9 +68,9 @@ if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']=='') { - require_once('modules/Accounts/Account.php'); + require_once('modules/Accounts/Accounts.php'); $focus->column_fields['account_id'] = $_REQUEST['account_id']; - $acct_focus = new Account(); + $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']; Modified: vtigercrm/branches/5.0.1/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/ListView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -39,7 +39,7 @@ global $currentModule,$theme; -$focus = new Contact(); +$focus = new Contacts(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Contacts/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/Save.php Mon Oct 16 00:46:06 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once("modules/Emails/mail.php"); @@ -51,7 +51,7 @@ $local_log =& LoggerManager::getLogger('index'); global $log,$adb; -$focus = new Contact(); +$focus = new Contacts(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/Emails/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -11,10 +11,10 @@ require_once('Smarty_setup.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); -$focus = new Email(); +$focus = new Emails(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Emails/ChooseEmail.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/ChooseEmail.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/ChooseEmail.php Mon Oct 16 00:46:06 2006 @@ -29,20 +29,20 @@ if ($pmodule=='Accounts') { - require_once('modules/Accounts/Account.php'); - $myfocus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $myfocus = new Accounts(); $myfocus->retrieve_entity_info($entityid,"Accounts"); } elseif ($pmodule=='Contacts') { - require_once('modules/Contacts/Contact.php'); - $myfocus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $myfocus = new Contacts(); $myfocus->retrieve_entity_info($entityid,"Contacts"); } elseif ($pmodule=='Leads') { - require_once('modules/Leads/Lead.php'); - $myfocus = new Lead(); + require_once('modules/Leads/Leads.php'); + $myfocus = new Leads(); $myfocus->retrieve_entity_info($entityid,"Leads"); } ?> Modified: vtigercrm/branches/5.0.1/modules/Emails/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/Delete.php Mon Oct 16 00:46:06 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('email_delete'); -$focus = new Email(); +$focus = new Emails(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the email."); Modified: vtigercrm/branches/5.0.1/modules/Emails/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/DetailView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/upload_file.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ global $mod_strings; global $currentModule; -$focus = new Email(); +$focus = new Emails(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record'])) Modified: vtigercrm/branches/5.0.1/modules/Emails/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/EditView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/FormValidationUtil.php'); @@ -34,7 +34,7 @@ global $current_user; global $currentModule; -$focus = new Email(); +$focus = new Emails(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['upload_error'] == true) Modified: vtigercrm/branches/5.0.1/modules/Emails/Email.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/Email.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/Email.php Mon Oct 16 00:46:06 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Email.php,v 1.41 2005/04/28 08:11:21 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Emails.php,v 1.41 2005/04/28 08:11:21 rank Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -25,10 +25,10 @@ require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Users/User.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Users/Users.php'); // Email is used to store customer information. class Email extends CRMEntity { @@ -78,9 +78,9 @@ /** This function will set the columnfields for Email module */ - function Email() { + function Emails() { $this->log = LoggerManager::getLogger('email'); - $this->log->debug("Entering Email() method ..."); + $this->log->debug("Entering Emails() method ..."); $this->log = LoggerManager::getLogger('email'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Emails'); @@ -101,7 +101,7 @@ global $mod_strings; global $app_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; $returnset = '&return_module=Emails&return_action=CallRelatedList&return_id='.$id; Modified: vtigercrm/branches/5.0.1/modules/Emails/EmailsAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/EmailsAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/EmailsAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = $_REQUEST["fieldValue"]; if($crmid != "") { - $modObj = new Email(); + $modObj = new Emails(); $modObj->retrieve_entity_info($crmid,"Emails"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Emails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/ListView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/utils/utils.php'); @@ -42,7 +42,7 @@ $url_string = ''; // assigning http url string -$focus = new Email(); +$focus = new Emails(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Emails/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/Save.php Mon Oct 16 00:46:06 2006 @@ -51,13 +51,13 @@ $mailbox = 'INBOX'; } -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Email(); +$focus = new Emails(); global $current_user; setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/Emails/mailsend.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/mailsend.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/mailsend.php Mon Oct 16 00:46:06 2006 @@ -124,20 +124,20 @@ $fresult=$adb->query($myquery); if ($pmodule=='Contacts') { - require_once('modules/Contacts/Contact.php'); - $myfocus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $myfocus = new Contacts(); $myfocus->retrieve_entity_info($mycrmid,"Contacts"); } elseif ($pmodule=='Accounts') { - require_once('modules/Accounts/Account.php'); - $myfocus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $myfocus = new Accounts(); $myfocus->retrieve_entity_info($mycrmid,"Accounts"); } elseif ($pmodule=='Leads') { - require_once('modules/Leads/Lead.php'); - $myfocus = new Lead(); + require_once('modules/Leads/Leads.php'); + $myfocus = new Leads(); $myfocus->retrieve_entity_info($mycrmid,"Leads"); } $fldname=$adb->query_result($fresult,0,"columnname"); Modified: vtigercrm/branches/5.0.1/modules/Emails/sendmail.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/sendmail.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/sendmail.php Mon Oct 16 00:46:06 2006 @@ -18,7 +18,7 @@ * @copyright 2001 - 2003 Brent R. Matzelle */ -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/logging.php'); require("modules/Emails/class.phpmailer.php"); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php (original) +++ vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php Mon Oct 16 00:46:06 2006 @@ -21,18 +21,18 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Leads/Leads.php'); require_once('modules/Faq/Faq.php'); -require_once('modules/Vendors/Vendor.php'); -require_once('modules/PriceBooks/PriceBook.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Vendors/Vendors.php'); +require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/Quotes/Quotes.php'); require_once('modules/PurchaseOrder/PurchaseOrder.php'); require_once('modules/SalesOrder/SalesOrder.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('modules/Home/language/en_us.lang.php'); require_once('include/database/PearDatabase.php'); require_once('modules/CustomView/CustomView.php'); Modified: vtigercrm/branches/5.0.1/modules/Import/ImportAccount.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportAccount.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportAccount.php Mon Oct 16 00:46:06 2006 @@ -22,11 +22,11 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/ComboUtil.php'); // Account is used to store vtiger_account information. Modified: vtigercrm/branches/5.0.1/modules/Import/ImportContact.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportContact.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportContact.php Mon Oct 16 00:46:06 2006 @@ -18,7 +18,7 @@ ********************************************************************************/ include_once('config.php'); require_once('include/logging.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('modules/Import/UsersLastImport.php'); require_once('include/database/PearDatabase.php'); require_once('include/ComboUtil.php'); @@ -169,7 +169,7 @@ $arr = array(); // check if it already exists - $focus = new Account(); + $focus = new Accounts(); $query = ''; Modified: vtigercrm/branches/5.0.1/modules/Import/ImportLead.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportLead.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportLead.php Mon Oct 16 00:46:06 2006 @@ -26,13 +26,13 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/ComboUtil.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); class ImportLead extends Lead { Modified: vtigercrm/branches/5.0.1/modules/Import/ImportOpportunity.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportOpportunity.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportOpportunity.php Mon Oct 16 00:46:06 2006 @@ -22,11 +22,11 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/ComboUtil.php'); // Get _dom arrays from Database @@ -131,7 +131,7 @@ $arr = array(); // check if it already exists - $focus = new Account(); + $focus = new Accounts(); $query = ''; Modified: vtigercrm/branches/5.0.1/modules/Import/ImportProduct.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportProduct.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportProduct.php Mon Oct 16 00:46:06 2006 @@ -26,14 +26,14 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Products/Products.php'); require_once('include/ComboUtil.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); class ImportProduct extends Product { Modified: vtigercrm/branches/5.0.1/modules/Import/ImportStep2.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportStep2.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportStep2.php Mon Oct 16 00:46:06 2006 @@ -250,27 +250,27 @@ if($_REQUEST['module']=='Accounts') { $tablename='account'; - $focus1=new Account(); + $focus1=new Accounts(); } if($_REQUEST['module']=='Contacts') { $tablename='contactdetails'; - $focus1=new Contact(); + $focus1=new Contacts(); } if($_REQUEST['module']=='Leads') { $tablename='leaddetails'; - $focus1=new Lead(); + $focus1=new Leads(); } if($_REQUEST['module']=='Potentials') { $tablename='potential'; - $focus1=new Potential(); + $focus1=new Potentials(); } if($_REQUEST['module']=='Products') { $tablename='products'; - $focus1=new Product(); + $focus1=new Products(); } Modified: vtigercrm/branches/5.0.1/modules/Import/ImportSteplast.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportSteplast.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportSteplast.php Mon Oct 16 00:46:06 2006 @@ -26,7 +26,7 @@ require_once('modules/Import/UsersLastImport.php'); require_once('modules/Import/parse_utils.php'); require_once('include/ListView/ListView.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/utils/utils.php'); global $mod_strings; Modified: vtigercrm/branches/5.0.1/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Invoice/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Invoice/EditView.php Mon Oct 16 00:46:06 2006 @@ -23,9 +23,9 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('modules/SalesOrder/SalesOrder.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -43,7 +43,7 @@ if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoinvoice') { $quoteid = $_REQUEST['record']; - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToInvoice($focus,$quote_focus,$quoteid); @@ -179,7 +179,7 @@ } if(isset($_REQUEST['opportunity_id']) && $_REQUEST['opportunity_id'] !='') { - $potfocus = new Potential(); + $potfocus = new Potentials(); $potfocus->column_fields['potential_id'] = $_REQUEST['opportunity_id']; $associated_prod = getAssociatedProducts("Potentials",$potfocus,$potfocus->column_fields['potential_id']); @@ -194,8 +194,8 @@ if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && ($_REQUEST['record']=='' || $_REQUEST['convertmode'] == "potentoinvoice")){ - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/branches/5.0.1/modules/Leads/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -22,7 +22,7 @@ } else { -$focus = new Lead(); +$focus = new Leads(); $MODULE = $_REQUEST['module']; $RECORD = $_REQUEST['record']; $currentmodule = $_REQUEST['module']; Modified: vtigercrm/branches/5.0.1/modules/Leads/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/Delete.php Mon Oct 16 00:46:06 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('lead_delete'); -$focus = new Lead(); +$focus = new Leads(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Leads/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/DetailView.php Mon Oct 16 00:46:06 2006 @@ -14,7 +14,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/database/PearDatabase.php'); require_once('include/CustomFieldUtil.php'); require_once('include/utils/utils.php'); @@ -25,7 +25,7 @@ global $app_strings; global $currentModule, $singlepane_view; global $log; -$focus = new Lead(); +$focus = new Leads(); if(isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -24,7 +24,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $leadObj = new Lead(); + $leadObj = new Leads(); $leadObj->retrieve_entity_info($crmid,"Leads"); $leadObj->column_fields[$fieldname] = $fieldvalue; $leadObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Leads/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/EditView.php Mon Oct 16 00:46:06 2006 @@ -14,7 +14,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/database/PearDatabase.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); @@ -23,7 +23,7 @@ global $mod_strings,$app_strings,$theme,$currentModule; -$focus = new Lead(); +$focus = new Leads(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Leads/Lead.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/Lead.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/Lead.php Mon Oct 16 00:46:06 2006 @@ -19,9 +19,9 @@ require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Campaigns/Campaign.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -84,9 +84,9 @@ var $default_order_by = 'lastname'; var $default_sort_order = 'ASC'; - function Lead() { + function Leads() { $this->log = LoggerManager::getLogger('lead'); - $this->log->debug("Entering Lead() method ..."); + $this->log->debug("Entering Leads() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Leads'); $this->log->debug("Exiting Lead method ..."); @@ -230,7 +230,7 @@ global $log, $singlepane_view; $log->debug("Entering get_campaigns(".$id.") method ..."); global $mod_strings; - $focus = new Campaign(); + $focus = new Campaigns(); $button = ''; if($singlepane_view == 'true') @@ -258,7 +258,7 @@ global $mod_strings; require_once('include/RelatedListView.php'); - $focus = new Email(); + $focus = new Emails(); $button = ''; @@ -358,11 +358,11 @@ { global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Product.php'); + require_once('modules/Products/Products.php'); global $mod_strings; global $app_strings; - $focus = new Product(); + $focus = new Products(); $button = ''; Modified: vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); //Getting the Parameters from the ConvertLead Form $id = $_REQUEST["record"]; @@ -39,7 +39,7 @@ $potential_name = $check_unit[0]; //Retrieve info from all the vtiger_tables related to leads -$focus = new Lead(); +$focus = new Leads(); $focus->retrieve_entity_info($id,"Leads"); //get all the lead related columns Modified: vtigercrm/branches/5.0.1/modules/Leads/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/ListView.php Mon Oct 16 00:46:06 2006 @@ -19,7 +19,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -49,7 +49,7 @@ $url_string = ''; // assigning http url string -$focus = new Lead(); +$focus = new Leads(); $smarty = new vtigerCRM_Smarty; $other_text=Array(); Modified: vtigercrm/branches/5.0.1/modules/Leads/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/Save.php Mon Oct 16 00:46:06 2006 @@ -13,14 +13,14 @@ * Contributor(s): ______________________________________. ********************************************************************************/ -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/UserInfoUtil.php'); $local_log =& LoggerManager::getLogger('index'); global $log,$adb; -$focus = new Lead(); +$focus = new Leads(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/Leads/result.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/result.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/result.php Mon Oct 16 00:46:06 2006 @@ -12,7 +12,7 @@ require_once('include/utils/utils.php'); require_once 'Excel/reader.php'; -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/database/PearDatabase.php'); $data = new Spreadsheet_Excel_Reader(); Modified: vtigercrm/branches/5.0.1/modules/Notes/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/Delete.php Mon Oct 16 00:46:06 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('note_delete'); -$focus = new Note(); +$focus = new Notes(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the note."); Modified: vtigercrm/branches/5.0.1/modules/Notes/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/DetailView.php Mon Oct 16 00:46:06 2006 @@ -22,14 +22,14 @@ require_once('data/Tracker.php'); require_once('Smarty_setup.php'); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/upload_file.php'); require_once('include/utils/utils.php'); global $app_strings; global $mod_strings; global $currentModule; -$focus = new Note(); +$focus = new Notes(); if(isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Notes"); Modified: vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Note(); + $modObj = new Notes(); $modObj->retrieve_entity_info($crmid,"Notes"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Notes/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/EditView.php Mon Oct 16 00:46:06 2006 @@ -22,12 +22,12 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/utils/utils.php'); global $app_strings,$app_list_strings,$mod_strings,$theme,$currentModule; -$focus = new Note(); +$focus = new Notes(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['upload_error'] == true) Modified: vtigercrm/branches/5.0.1/modules/Notes/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/ListView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -66,7 +66,7 @@ $url_string = ''; // assigning http url string -$focus = new Note(); +$focus = new Notes(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Notes/Note.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/Note.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/Note.php Mon Oct 16 00:46:06 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Notes/Note.php,v 1.15 2005/03/15 10:01:08 shaw Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Notes/Notes.php,v 1.15 2005/03/15 10:01:08 shaw Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -70,9 +70,9 @@ var $default_order_by = 'modifiedtime'; var $default_sort_order = 'ASC'; - function Note() { + function Notes() { $this->log = LoggerManager::getLogger('notes'); - $this->log->debug("Entering Note() method ..."); + $this->log->debug("Entering Notes() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Notes'); $this->log->debug("Exiting Note method ..."); Modified: vtigercrm/branches/5.0.1/modules/Notes/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/Save.php Mon Oct 16 00:46:06 2006 @@ -21,13 +21,13 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/logging.php'); require_once('include/upload_file.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Note(); +$focus = new Notes(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/Potentials/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ } else { -$focus = new Potential(); +$focus = new Potentials(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/Potentials/Charts.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/Charts.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/Charts.php Mon Oct 16 00:46:06 2006 @@ -19,7 +19,7 @@ require_once('config.php'); require_once('include/logging.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('Image/Graph.php'); require_once('include/utils/utils.php'); require_once('include/utils/GraphUtils.php'); @@ -102,7 +102,7 @@ //Now do the db queries //query for opportunity data that matches $datay and $user - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -441,7 +441,7 @@ //Now do the db queries //query for opportunity data that matches $datay and $user - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -779,7 +779,7 @@ //Now do the db queries //query for opportunity data that matches $datax and $user - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -1057,7 +1057,7 @@ $where .= ")"; } - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by lead source data Modified: vtigercrm/branches/5.0.1/modules/Potentials/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/Delete.php Mon Oct 16 00:46:06 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Potential(); +$focus = new Potentials(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the opportunity."); Modified: vtigercrm/branches/5.0.1/modules/Potentials/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/DetailView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/CustomFieldUtil.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -31,7 +31,7 @@ global $app_strings; global $currentModule, $singlepane_view; -$focus = new Potential(); +$focus = new Potentials(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Potential(); + $modObj = new Potentials(); $modObj->retrieve_entity_info($crmid,"Potentials"); $modObj->column_fields[$fieldname] = $fieldvalue; $_REQUEST[$fieldname] = $fieldvalue; Modified: vtigercrm/branches/5.0.1/modules/Potentials/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/EditView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -30,7 +30,7 @@ global $app_strings; global $mod_strings; global $currentModule; -$focus = new Potential(); +$focus = new Potentials(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/branches/5.0.1/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/ListView.php Mon Oct 16 00:46:06 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -38,7 +38,7 @@ $url_string = ''; // assigning http url string -$focus = new Potential(); +$focus = new Potentials(); $smarty = new vtigerCRM_Smarty(); $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Potentials/ListViewTop.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/ListViewTop.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/ListViewTop.php Mon Oct 16 00:46:06 2006 @@ -28,7 +28,7 @@ $log = LoggerManager::getLogger('top opportunity_list'); $log->debug("Entering getTopPotentials() method ..."); require_once("data/Tracker.php"); - require_once('modules/Potentials/Opportunity.php'); + require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); Modified: vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php Mon Oct 16 00:46:06 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Potentials/Opportunity.php,v 1.65 2005/04/28 08:08:27 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Potentials/Potentials.php,v 1.65 2005/04/28 08:08:27 rank Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -25,10 +25,10 @@ require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -96,7 +96,7 @@ var $default_order_by = 'potentialname'; var $default_sort_order = 'ASC'; - function Potential() { + function Potentials() { $this->log = LoggerManager::getLogger('potential'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Potentials'); @@ -233,7 +233,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; @@ -294,10 +294,10 @@ { global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Product.php'); + require_once('modules/Products/Products.php'); global $app_strings; - $focus = new Product(); + $focus = new Products(); $button = ''; @@ -446,10 +446,10 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quote.php'); + require_once('modules/Quotes/Quotes.php'); if($this->column_fields['account_id']!='') - $focus = new Quote(); + $focus = new Quotes(); $button = ''; if(isPermitted("Quotes",1,"") == 'yes') Modified: vtigercrm/branches/5.0.1/modules/Potentials/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/Save.php Mon Oct 16 00:46:06 2006 @@ -20,13 +20,13 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Potential(); +$focus = new Potentials(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -22,7 +22,7 @@ { global $currentModule; -$focus = new PriceBook(); +$focus = new PriceBooks(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/Delete.php Mon Oct 16 00:46:06 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new PriceBook(); +$focus = new PriceBooks(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/DetailView.php Mon Oct 16 00:46:06 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new PriceBook(); +$focus = new PriceBooks(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new PriceBook(); + $modObj = new PriceBooks(); $modObj->retrieve_entity_info($crmid,"PriceBooks"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php Mon Oct 16 00:46:06 2006 @@ -11,12 +11,12 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$theme,$currentModule; -$focus = new PriceBook(); +$focus = new PriceBooks(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/ListView.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/ListView/ListView.php'); require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); @@ -33,7 +33,7 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$focus = new PriceBook(); +$focus = new PriceBooks(); $other_text=Array(); if(!$_SESSION['lvs'][$currentModule]) Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/PriceBook.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/PriceBook.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/PriceBook.php Mon Oct 16 00:46:06 2006 @@ -51,9 +51,9 @@ /** Constructor which will set the column_fields in this object */ - function PriceBook() { + function PriceBooks() { $this->log =LoggerManager::getLogger('pricebook'); - $this->log->debug("Entering PriceBook() method ..."); + $this->log->debug("Entering PriceBooks() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('PriceBooks'); $this->log->debug("Exiting PriceBook method ..."); @@ -98,8 +98,8 @@ global $log,$singlepane_view; $log->debug("Entering get_pricebook_products(".$id.") method ..."); global $app_strings; - require_once('modules/Products/Product.php'); - $focus = new Product(); + require_once('modules/Products/Products.php'); + $focus = new Products(); $button = ''; Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/Save.php Mon Oct 16 00:46:06 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new PriceBook(); +$focus = new PriceBooks(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/Products/AddProductToPriceBooks.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/AddProductToPriceBooks.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/AddProductToPriceBooks.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/utils/utils.php'); require_once('include/ComboUtil.php'); @@ -30,7 +30,7 @@ $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$focus = new PriceBook(); +$focus = new PriceBooks(); //Retreive the list of PriceBooks $list_query = getListQuery("PriceBooks"); Modified: vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/utils.php'); require_once('include/utils/utils.php'); require_once('include/ComboUtil.php'); @@ -29,7 +29,7 @@ $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$focus = new Product(); +$focus = new Products(); if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; Modified: vtigercrm/branches/5.0.1/modules/Products/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -21,7 +21,7 @@ } else { -$focus = new Product(); +$focus = new Products(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) Modified: vtigercrm/branches/5.0.1/modules/Products/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/Delete.php Mon Oct 16 00:46:06 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new Product(); +$focus = new Products(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Products/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/DetailView.php Mon Oct 16 00:46:06 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new Product(); +$focus = new Products(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { //Display the error message Modified: vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/database/PearDatabase.php'); global $adb,$current_user; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Product(); + $modObj = new Products(); $modObj->retrieve_entity_info($crmid,"Products"); $modObj->column_fields[$fieldname] = $fieldvalue; if($fieldname == 'unit_price')//unit price converted to dollar value while saving Modified: vtigercrm/branches/5.0.1/modules/Products/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/EditView.php Mon Oct 16 00:46:06 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/FormValidationUtil.php'); global $app_strings; @@ -28,7 +28,7 @@ -$focus = new Product(); +$focus = new Products(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['record']!="") Modified: vtigercrm/branches/5.0.1/modules/Products/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/ListView.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/ListView/ListView.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -56,7 +56,7 @@ } $url_string = '&smodule=PRODUCTS'; // assigning http url string -$focus = new Product(); +$focus = new Products(); //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> $sorder = $focus->getSortOrder(); Modified: vtigercrm/branches/5.0.1/modules/Products/Product.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/Product.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/Product.php Mon Oct 16 00:46:06 2006 @@ -72,9 +72,9 @@ /** Constructor which will set the column_fields in this object */ - function Product() { + function Products() { $this->log =LoggerManager::getLogger('product'); - $this->log->debug("Entering Product() method ..."); + $this->log->debug("Entering Products() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Products'); $this->log->debug("Exiting Product method ..."); @@ -301,8 +301,8 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quote.php'); - $focus = new Quote(); + require_once('modules/Quotes/Quotes.php'); + $focus = new Quotes(); $button = ''; if($singlepane_view == 'true') @@ -345,7 +345,7 @@ $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new Order(); + $focus = new PurchaseOrder(); $button = ''; @@ -466,8 +466,8 @@ global $log,$singlepane_view; $log->debug("Entering get_product_pricebooks(".$id.") method ..."); global $mod_strings; - require_once('modules/PriceBooks/PriceBook.php'); - $focus = new PriceBook(); + require_once('modules/PriceBooks/PriceBooks.php'); + $focus = new PriceBooks(); $button = ''; if($singlepane_view == 'true') $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; Modified: vtigercrm/branches/5.0.1/modules/Products/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/Save.php Mon Oct 16 00:46:06 2006 @@ -21,14 +21,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); global $log,$current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); $rate = $rate_symbol['rate']; -$focus = new Product(); +$focus = new Products(); if(isset($_REQUEST['record'])) { $focus->id = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -21,7 +21,7 @@ } else { -$focus = new Order(); +$focus = new PurchaseOrder(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/CreatePDF.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/CreatePDF.php Mon Oct 16 00:46:06 2006 @@ -26,7 +26,7 @@ $id = $_REQUEST['record']; //retreiving the vtiger_invoice info -$focus = new Order(); +$focus = new PurchaseOrder(); $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); $vendor_name = getVendorName($focus->column_fields[vendor_id]); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/Delete.php Mon Oct 16 00:46:06 2006 @@ -24,7 +24,7 @@ require_once('include/logging.php'); $log = LoggerManager::getLogger('order_delete'); -$focus = new Order(); +$focus = new PurchaseOrder(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailView.php Mon Oct 16 00:46:06 2006 @@ -29,7 +29,7 @@ require_once('user_privileges/default_module_view.php'); global $mod_strings,$app_strings,$theme,$currentModule,$singlepane_view; -$focus = new Order(); +$focus = new PurchaseOrder(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Order(); + $modObj = new PurchaseOrder(); $modObj->retrieve_entity_info($crmid,"PurchaseOrder"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/EditView.php Mon Oct 16 00:46:06 2006 @@ -31,7 +31,7 @@ global $app_strings,$mod_strings,$log,$theme,$currentModule; -$focus = new Order(); +$focus = new PurchaseOrder(); $smarty = new vtigerCRM_Smarty(); global $current_user; $currencyid=fetchCurrency($current_user->id); @@ -60,8 +60,8 @@ // Get vtiger_vendor address if vtiger_vendorid is given if(isset($_REQUEST['vendor_id']) && $_REQUEST['vendor_id']!='' && $_REQUEST['record']==''){ - require_once('modules/Vendors/Vendor.php'); - $vend_focus = new Vendor(); + require_once('modules/Vendors/Vendors.php'); + $vend_focus = new Vendors(); $vend_focus->retrieve_entity_info($_REQUEST['vendor_id'],"Vendors"); $focus->column_fields['bill_city']=$vend_focus->column_fields['city']; Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListTopPurchaseOrder.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListTopPurchaseOrder.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListTopPurchaseOrder.php Mon Oct 16 00:46:06 2006 @@ -47,7 +47,7 @@ $viewid = "0"; } } - $focus = new Order(); + $focus = new PurchaseOrder(); $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListView.php Mon Oct 16 00:46:06 2006 @@ -35,7 +35,7 @@ $url_string = '&smodule=PO'; -$focus = new Order(); +$focus = new PurchaseOrder(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/PurchaseOrder.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/PurchaseOrder.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/PurchaseOrder.php Mon Oct 16 00:46:06 2006 @@ -30,7 +30,7 @@ require_once('user_privileges/default_module_view.php'); // Account is used to store vtiger_account information. -class Order extends CRMEntity { +class PurchaseOrder extends CRMEntity { var $log; var $db; @@ -94,7 +94,7 @@ * 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. */ - function Order() { + function PurchaseOrder() { $this->log =LoggerManager::getLogger('PurchaseOrder'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('PurchaseOrder'); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/Save.php Mon Oct 16 00:46:06 2006 @@ -27,7 +27,7 @@ $local_log =& LoggerManager::getLogger('index'); -$focus = new Order(); +$focus = new PurchaseOrder(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/Quotes/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ } else { -$focus = new Quote(); +$focus = new Quotes(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Quotes/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/CreatePDF.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/CreatePDF.php Mon Oct 16 00:46:06 2006 @@ -11,7 +11,7 @@ require_once('include/fpdf/pdf.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/database/PearDatabase.php'); global $adb,$app_strings; @@ -25,7 +25,7 @@ global $products_per_page; $products_per_page="6"; -$focus = new Quote(); +$focus = new Quotes(); $focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); $account_name = getAccountName($focus->column_fields[account_id]); Modified: vtigercrm/branches/5.0.1/modules/Quotes/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/Delete.php Mon Oct 16 00:46:06 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('quote_delete'); -$focus = new Quote(); +$focus = new Quotes(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Quotes/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/DetailView.php Mon Oct 16 00:46:06 2006 @@ -22,13 +22,13 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); global $mod_strings,$app_strings,$currentModule,$theme,$singlepane_view; -$focus = new Quote(); +$focus = new Quotes(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); Modified: vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Quote(); + $modObj = new Quotes(); $modObj->retrieve_entity_info($crmid,"Quotes"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Quotes/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/EditView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ $log->debug("Inside Quote EditView"); -$focus = new Quote(); +$focus = new Quotes(); $smarty = new vtigerCRM_Smarty; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); @@ -70,8 +70,8 @@ // Get Account address if vtiger_account is given if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']==''){ - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/branches/5.0.1/modules/Quotes/ListTopQuotes.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/ListTopQuotes.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/ListTopQuotes.php Mon Oct 16 00:46:06 2006 @@ -19,7 +19,7 @@ function getTopQuotes() { require_once("data/Tracker.php"); - require_once('modules/Quotes/Quote.php'); + require_once('modules/Quotes/Quotes.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); require_once('include/database/PearDatabase.php'); @@ -51,7 +51,7 @@ $viewid = "0"; } } - $focus = new Quote(); + $focus = new Quotes(); $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; Modified: vtigercrm/branches/5.0.1/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/ListView.php Mon Oct 16 00:46:06 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -33,7 +33,7 @@ $url_string = ''; -$focus = new Quote(); +$focus = new Quotes(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Quotes/Quote.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/Quote.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/Quote.php Mon Oct 16 00:46:06 2006 @@ -101,7 +101,7 @@ /** Constructor which will set the column_fields in this object */ - function Quote() { + function Quotes() { $this->log =LoggerManager::getLogger('quote'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Quotes'); Modified: vtigercrm/branches/5.0.1/modules/Quotes/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/Save.php Mon Oct 16 00:46:06 2006 @@ -21,7 +21,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); include("modules/Emails/mail.php"); @@ -34,7 +34,7 @@ $rate = $rate_symbol['rate']; $log->debug("Inside Quote Save"); -$focus = new Quote(); +$focus = new Quotes(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/SalesOrder/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/SalesOrder/EditView.php Mon Oct 16 00:46:06 2006 @@ -23,7 +23,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/SalesOrder/SalesOrder.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -44,7 +44,7 @@ if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoso') { $quoteid = $_REQUEST['record']; - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -80,7 +80,7 @@ $quoteid = $focus->column_fields['quote_id']; $smarty->assign("QUOTE_ID", $focus->column_fields['quote_id']); - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -118,7 +118,7 @@ $focus->column_fields['duedate'] = getDBInsertDateValue($curr_due_date); } $quoteid = $focus->column_fields['quote_id']; - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -161,8 +161,8 @@ // Get Account address if vtiger_account is given if(isset($_REQUEST['account_id']) && $_REQUEST['record']=='' && $_REQUEST['account_id'] != ''){ - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/branches/5.0.1/modules/Users/Authenticate.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/Authenticate.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/Authenticate.php Mon Oct 16 00:46:06 2006 @@ -20,14 +20,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('modules/Users/CreateUserPrivilegeFile.php'); require_once('include/logging.php'); require_once('user_privileges/audit_trail.php'); global $mod_strings; -$focus = new User(); +$focus = new Users(); // Add in defensive code here. $focus->column_fields["user_name"] = to_html($_REQUEST['user_name']); Modified: vtigercrm/branches/5.0.1/modules/Users/ChangePassword.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ChangePassword.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ChangePassword.php Mon Oct 16 00:46:06 2006 @@ -23,7 +23,7 @@ // The popup_picker.html file is used for generating a list from which to find and choose one instance. global $theme; -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); Modified: vtigercrm/branches/5.0.1/modules/Users/CreateUserPrivilegeFile.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/CreateUserPrivilegeFile.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/CreateUserPrivilegeFile.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('config.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/utils/utils.php'); require_once('include/utils/GetUserGroups.php'); @@ -32,7 +32,7 @@ $newbuf .="retrieve_entity_info($userid,"Users"); $userInfo=Array(); $user_focus->column_fields["id"] = ''; @@ -120,7 +120,7 @@ $newbuf .="retrieve_entity_info($userid,"Users"); if($user_focus->is_admin == 'on') { Modified: vtigercrm/branches/5.0.1/modules/Users/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/DetailView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/utils/utils.php'); require_once('include/utils/CommonUtils.php'); require_once('include/utils/UserInfoUtil.php'); @@ -37,7 +37,7 @@ global $app_strings; global $mod_strings; -$focus = new User(); +$focus = new Users(); if(!empty($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],'Users'); Modified: vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -24,7 +24,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $userObj = new User(); + $userObj = new Users(); $userObj->retrieve_entity_info($crmid,"Users"); $userObj->column_fields[$fieldname] = $fieldvalue; $userObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Users/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/EditView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/utils/UserInfoUtil.php'); require_once('modules/Users/Forms.php'); require_once('include/database/PearDatabase.php'); @@ -36,7 +36,7 @@ $smarty=new vtigerCRM_Smarty; -$focus = new User(); +$focus = new Users(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $smarty->assign("ID",$_REQUEST['record']); Modified: vtigercrm/branches/5.0.1/modules/Users/ListLoginHistory.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ListLoginHistory.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ListLoginHistory.php Mon Oct 16 00:46:06 2006 @@ -12,7 +12,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/branches/5.0.1/modules/Users/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ListView.php Mon Oct 16 00:46:06 2006 @@ -24,7 +24,7 @@ global $current_language; $mod_strings = return_module_language($current_language,'Users'); $category = getParentTab(); -$focus = new User(); +$focus = new Users(); $smarty = new vtigerCRM_Smarty; $no_of_users=UserCount(); //Retreiving the start value from request Modified: vtigercrm/branches/5.0.1/modules/Users/Logout.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/Logout.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/Logout.php Mon Oct 16 00:46:06 2006 @@ -20,7 +20,7 @@ require_once('include/logging.php'); require_once('database/DatabaseConnection.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('config.php'); require_once('include/db_backup/backup.php'); require_once('include/db_backup/ftp.php'); Modified: vtigercrm/branches/5.0.1/modules/Users/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/Save.php Mon Oct 16 00:46:06 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/logging.php'); require_once('include/utils/UserInfoUtil.php'); $log =& LoggerManager::getLogger('index'); @@ -46,7 +46,7 @@ if (isset($_POST['record']) && !is_admin($current_user) && $_POST['record'] != $current_user->id) echo ("Unauthorized access to user administration."); elseif (!isset($_POST['record']) && !is_admin($current_user)) echo ("Unauthorized access to user administration."); -$focus = new User(); +$focus = new Users(); if(isset($_REQUEST["record"]) && $_REQUEST["record"] != '') { $focus->mode='edit'; Modified: vtigercrm/branches/5.0.1/modules/Users/ShowAuditTrail.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ShowAuditTrail.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ShowAuditTrail.php Mon Oct 16 00:46:06 2006 @@ -12,7 +12,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/AuditTrail.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/branches/5.0.1/modules/Users/ShowHistory.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ShowHistory.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ShowHistory.php Mon Oct 16 00:46:06 2006 @@ -12,11 +12,11 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -#require_once('modules/Users/User.php'); +#require_once('modules/Users/Users.php'); require_once('include/utils/utils.php'); global $app_strings; Modified: vtigercrm/branches/5.0.1/modules/Users/User.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/User.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/User.php Mon Oct 16 00:46:06 2006 @@ -21,7 +21,7 @@ ********************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/User.php,v 1.10 2005/04/19 14:40:48 ray Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/Users.php,v 1.10 2005/04/19 14:40:48 ray Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -33,7 +33,7 @@ require_once('data/CRMEntity.php'); require_once('include/utils/UserInfoUtil.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('data/Tracker.php'); // User is used to store customer information. @@ -155,11 +155,11 @@ * */ - function User() { + function Users() { $this->log = LoggerManager::getLogger('user'); - $this->log->debug("Entering User() method ..."); + $this->log->debug("Entering Users() method ..."); $this->db = new PearDatabase(); - $this->log->debug("Exiting User() method ..."); + $this->log->debug("Exiting Users() method ..."); } Modified: vtigercrm/branches/5.0.1/modules/Users/massChangeStatus.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/massChangeStatus.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/massChangeStatus.php Mon Oct 16 00:46:06 2006 @@ -15,12 +15,12 @@ require_once('include/ComboUtil.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); global $app_list_strings; global $app_strings; global $current_user; -$focus = new Lead(); +$focus = new Leads(); $idlist = $_POST['idlist']; //echo $idlist; Modified: vtigercrm/branches/5.0.1/modules/Users/populatetemplate.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/populatetemplate.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/populatetemplate.php Mon Oct 16 00:46:06 2006 @@ -10,9 +10,9 @@ ********************************************************************************/ //query the specific vtiger_table and then get the data and write the data here require_once('include/database/PearDatabase.php'); -include_once('modules/Contacts/Contact.php'); -include_once('modules/Leads/Lead.php'); -include_once('modules/Users/User.php'); +include_once('modules/Contacts/Contacts.php'); +include_once('modules/Leads/Leads.php'); +include_once('modules/Users/Users.php'); global $log; //download the template file and store it in some specific location @@ -60,11 +60,11 @@ //get the module if($module == 'leads') { - $focus = new Lead(); + $focus = new Leads(); } else { - $focus = new Contact(); + $focus = new Contacts(); } $focus->retrieve_entity_info($recordid,$module); Modified: vtigercrm/branches/5.0.1/modules/Vendors/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ else { global $currentModule; -$focus = new Vendor(); +$focus = new Vendors(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/Vendors/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/Delete.php Mon Oct 16 00:46:06 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new Vendor(); +$focus = new Vendors(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Vendors/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/DetailView.php Mon Oct 16 00:46:06 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new Vendor(); +$focus = new Vendors(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Vendor(); + $modObj = new Vendors(); $modObj->retrieve_entity_info($crmid,"Vendors"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Vendors/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/EditView.php Mon Oct 16 00:46:06 2006 @@ -11,12 +11,12 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$theme,$currentModule; -$focus = new Vendor(); +$focus = new Vendors(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/branches/5.0.1/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/ListView.php Mon Oct 16 00:46:06 2006 @@ -11,7 +11,7 @@ require_once('include/database/PearDatabase.php'); require_once('include/database/Postgres8.php'); require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/ListView/ListView.php'); require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); @@ -32,7 +32,7 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$focus = new Vendor(); +$focus = new Vendors(); $other_text = Array(); if(!$_SESSION['lvs'][$currentModule]) Modified: vtigercrm/branches/5.0.1/modules/Vendors/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/Save.php Mon Oct 16 00:46:06 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new Vendor(); +$focus = new Vendors(); setObjectValuesFromRequest(&$focus); $focus->save("Vendors"); Modified: vtigercrm/branches/5.0.1/modules/Vendors/Vendor.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/Vendor.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/Vendor.php Mon Oct 16 00:46:06 2006 @@ -58,9 +58,9 @@ /** Constructor which will set the column_fields in this object */ - function Vendor() { + function Vendors() { $this->log =LoggerManager::getLogger('vendor'); - $this->log->debug("Entering Vendor() method ..."); + $this->log->debug("Entering Vendors() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Vendors'); $this->log->debug("Exiting Vendor method ..."); @@ -75,8 +75,8 @@ global $log,$singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); global $app_strings; - require_once('modules/Products/Product.php'); - $focus = new Product(); + require_once('modules/Products/Products.php'); + $focus = new Products(); $button = ''; @@ -100,7 +100,7 @@ $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new Order(); + $focus = new PurchaseOrder(); $button = ''; @@ -123,8 +123,8 @@ global $log,$singlepane_view; $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - require_once('modules/Contacts/Contact.php'); - $focus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $focus = new Contacts(); $button = ''; if($singlepane_view == 'true') Modified: vtigercrm/branches/5.0.1/modules/Webmails/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Webmails/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Webmails/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -11,7 +11,7 @@ global $current_user; require_once('Smarty_setup.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once('data/Tracker.php'); Modified: vtigercrm/branches/5.0.1/modules/Webmails/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Webmails/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Webmails/Save.php Mon Oct 16 00:46:06 2006 @@ -9,7 +9,7 @@ * ********************************************************************************/ -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('modules/Webmails/Webmail.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); @@ -20,7 +20,7 @@ global $current_user; $local_log =& LoggerManager::getLogger('index'); -$focus = new Email(); +$focus = new Emails(); $to_address = explode(";",$_REQUEST['to_list']); $cc_address = explode(";",$_REQUEST['cc_list']); @@ -61,8 +61,8 @@ 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/Contact.php'); - $contact_focus = new 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"); Modified: vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php (original) +++ vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php Mon Oct 16 00:46:06 2006 @@ -175,8 +175,8 @@ function CheckLeadPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -193,8 +193,8 @@ function CheckContactPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -211,8 +211,8 @@ function CheckAccountPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -229,8 +229,8 @@ function CheckTicketPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -247,8 +247,8 @@ function CheckVendorPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -265,8 +265,8 @@ function CheckProductPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -283,8 +283,8 @@ function CheckNotePermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -301,8 +301,8 @@ function CheckSitePermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -319,8 +319,8 @@ function CheckRssPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -340,8 +340,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -365,11 +365,11 @@ function LogintoVtigerCRM($user_name,$password) { global $log; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); $return_access = "FALSE"; - $objuser = new User(); + $objuser = new Users(); if($password != "") { @@ -397,8 +397,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -436,15 +436,15 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Note.php"); - - $focus = new Note(); + require_once("modules/Notes/Notes.php"); + + $focus = new Notes(); if(isPermitted("Notes","EditView") == "yes") { $focus->column_fields['notes_title'] = $subject; @@ -473,17 +473,17 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Product.php"); + require_once("modules/Products/Products.php"); if(isPermitted("Products","EditView") == "yes") { - $focus = new Product(); + $focus = new Products(); $focus->column_fields['productname'] = $productname; $focus->column_fields['productcode'] = $code; $focus->column_fields['website'] = $website; @@ -508,16 +508,16 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Vendor.php"); + require_once("modules/Vendors/Vendors.php"); if(isPermitted("Vendors","EditView" ) == "yes") { - $focus = new Vendor(); + $focus = new Vendors(); $focus->column_fields['vendorname'] = $vendorname; $focus->column_fields['email'] = $email; $focus->column_fields['phone'] = $phone; @@ -547,8 +547,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -591,15 +591,15 @@ 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/User.php"); - $seed_user=new 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/Account.php"); + require_once("modules/Accounts/Accounts.php"); if(isPermitted("Accounts","EditView") == "yes") { - $account=new Account(); + $account=new Accounts(); $account->column_fields['accountname']=$accountname; $account->column_fields['email1']=$email; $account->column_fields['phone']=$phone; @@ -642,15 +642,15 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Lead.php"); - - $focus = new Lead(); + require_once("modules/Leads/Leads.php"); + + $focus = new Leads(); if(isPermitted("Leads","EditView") == "yes") { $focus->column_fields['lastname'] = $lastname; @@ -689,16 +689,16 @@ { global $adb,$log; global $current_user; - require_once('modules/Users/User.php'); - $seed_user = new 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/Contact.php'); + require_once('modules/Contacts/Contacts.php'); if(isPermitted("Contacts","EditView") == "yes") { - $contact = new Contact(); + $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 Modified: vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php (original) +++ vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php Mon Oct 16 00:46:06 2006 @@ -13,7 +13,7 @@ require_once('include/logging.php'); require_once('include/nusoap/nusoap.php'); require_once('include/database/PearDatabase.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); $log = &LoggerManager::getLogger('thunderbirdplugin'); @@ -173,9 +173,9 @@ function SearchContactsByEmail($username,$emailaddress) { - require_once('modules/Contacts/Contact.php'); - - $seed_contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); $output_list = Array(); $response = $seed_contact->get_searchbyemailid($username,$emailaddress); @@ -201,13 +201,13 @@ function track_email($user_name, $contact_ids, $date_sent, $email_subject, $email_body) { global $adb; - require_once('modules/Users/User.php'); - require_once('modules/Emails/Email.php'); - - $seed_user = new User(); + 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 Email(); + $email = new Emails(); //$log->debug($msgdtls['contactid']); $emailbody = str_replace("'", "''", $email_body); $emailsubject = str_replace("'", "''",$email_subject); @@ -241,9 +241,9 @@ { global $adb; global $log; - require_once('modules/Contacts/Contact.php'); - - $seed_contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); $output_list = Array(); $query = $seed_contact->get_contactsforol($username); @@ -332,8 +332,8 @@ $rows_count = $db->getRowCount($result); if($rows_count==0) { - require_once('modules/Accounts/Account.php'); - $account = new Account(); + 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"); @@ -360,10 +360,10 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new 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"); @@ -384,7 +384,7 @@ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); } - $contact = new Contact(); + $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") : ""; @@ -418,10 +418,10 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Leads/Lead.php'); - - $seed_user = new 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"); @@ -442,7 +442,7 @@ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); } - $Lead = new Lead(); + $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") : ""; @@ -478,8 +478,8 @@ { global $adb,$log; $return_access = 'failure'; - require_once('modules/Users/User.php'); - $objuser = new User(); + require_once('modules/Users/Users.php'); + $objuser = new Users(); if($password != "" && $user_name != '') { $objuser->column_fields['user_name'] = $user_name; @@ -511,8 +511,8 @@ function CheckContactPerm($user_name) { global $current_user; - require_once('modules/Users/User.php'); - $seed_user = new 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"); @@ -528,8 +528,8 @@ function CheckContactViewPerm($user_name) { global $current_user,$log; - require_once('modules/Users/User.php'); - $seed_user = new 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"); Modified: vtigercrm/branches/5.0.1/soap/vtigerolservice.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/vtigerolservice.php (original) +++ vtigercrm/branches/5.0.1/soap/vtigerolservice.php Mon Oct 16 00:46:06 2006 @@ -280,9 +280,9 @@ function SearchContactsByEmail($username,$emailaddress) { - require_once('modules/Contacts/Contact.php'); + require_once('modules/Contacts/Contacts.php'); - $seed_contact = new Contact(); + $seed_contact = new Contacts(); $output_list = Array(); $response = $seed_contact->get_searchbyemailid($username,$emailaddress); @@ -308,17 +308,17 @@ function AddMessageToContact($username,$contactid,$msgdtls) { global $adb; - require_once('modules/Users/User.php'); - require_once('modules/Emails/Email.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Emails/Emails.php'); + + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); foreach($msgdtls as $msgdtl) { if(isset($msgdtl)) { - $email = new Email(); + $email = new Emails(); //$log->debug($msgdtls['contactid']); $email_body = str_replace("'", "''", $msgdtl['body']); $email_subject = str_replace("'", "''",$msgdtl['subject']); @@ -356,11 +356,11 @@ function LoginToVtiger($userid,$password) { global $adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); $return_access = "FALSE"; - $objuser = new User(); + $objuser = new Users(); if($password != "") { @@ -385,8 +385,8 @@ function CheckEmailPermission($username) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -403,8 +403,8 @@ function CheckContactPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -421,8 +421,8 @@ function CheckActivityPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -439,12 +439,12 @@ function AddEmailAttachment($emailid,$filedata,$filename,$filesize,$filetype,$username) { global $adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('include/utils/utils.php'); $date_var = date('YmdHis'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $crmid = $adb->getUniqueID("vtiger_crmentity"); @@ -483,9 +483,9 @@ function GetContacts($username) { global $adb; - require_once('modules/Contacts/Contact.php'); - - $seed_contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); $output_list = Array(); $query = $seed_contact->get_contactsforol($username); @@ -564,15 +564,15 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.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"); - $contact = new Contact(); + $contact = new Contacts(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -646,15 +646,15 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.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"); - $contact = new Contact(); + $contact = new Contacts(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -727,15 +727,15 @@ function DeleteContacts($username,$crmid) { global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.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"); - $contact = new Contact(); + $contact = new Contacts(); $contact->id = $crmid; $contact->mark_deleted($contact->id); @@ -760,8 +760,8 @@ $rows_count = $db->getRowCount($result); if($rows_count==0) { - require_once('modules/Accounts/Account.php'); - $account = new Account(); + 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"); @@ -856,10 +856,10 @@ function AddTasks($username,$taskdtls) { global $current_user,$adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -937,10 +937,10 @@ function UpdateTasks($username,$taskdtls) { global $current_user,$adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1022,10 +1022,10 @@ function DeleteTasks($username,$crmid) { global $current_user; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1091,10 +1091,10 @@ function AddClndr($username,$clndrdtls) { global $current_user,$adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1159,10 +1159,10 @@ { global $current_user; global $adb,$log; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1228,10 +1228,10 @@ function DeleteClndr($username,$crmid) { global $current_user; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); Modified: vtigercrm/branches/5.0.1/soap/webforms.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/webforms.php (original) +++ vtigercrm/branches/5.0.1/soap/webforms.php Mon Oct 16 00:46:06 2006 @@ -82,8 +82,8 @@ $assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id'); } - require_once("modules/Leads/Lead.php"); - $focus = new Lead(); + require_once("modules/Leads/Leads.php"); + $focus = new Leads(); $focus->column_fields['lastname'] = $lastname; $focus->column_fields['email'] = $email; $focus->column_fields['phone'] = $phone; @@ -126,8 +126,8 @@ $assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id'); } - require_once('modules/Contacts/Contact.php'); - $focus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $focus = new Contacts(); $focus->column_fields['firstname'] = $first_name; $focus->column_fields['lastname'] = $last_name; Modified: vtigercrm/branches/5.0.1/soap/wordplugin.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/wordplugin.php (original) +++ vtigercrm/branches/5.0.1/soap/wordplugin.php Mon Oct 16 00:46:06 2006 @@ -215,8 +215,8 @@ function get_tickets_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -237,15 +237,15 @@ function get_contacts_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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","index") == "yes") { - require_once('modules/Contacts/Contact.php'); - $contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $contact = new Contacts(); $log->debug($contact->getColumnNames()); return $contact->getColumnNames(); } @@ -261,15 +261,15 @@ function get_accounts_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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("Accounts","index") == "yes") { - require_once('modules/Accounts/Account.php'); - $account = new Account(); + require_once('modules/Accounts/Accounts.php'); + $account = new Accounts(); $log->debug($account->getColumnNames_Acnt()); return $account->getColumnNames_Acnt(); } @@ -285,16 +285,16 @@ function get_leads_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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("Leads","index") == "yes") { - require_once('modules/Leads/Lead.php'); - $lead = new Lead(); + require_once('modules/Leads/Leads.php'); + $lead = new Leads(); $log->debug($lead->getColumnNames_Lead()); return $lead->getColumnNames_Lead(); } @@ -309,12 +309,12 @@ function get_user_columns($user_name, $password) { global $current_user; - require_once('modules/Users/User.php'); - $seed_user=new 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'); - $user = new User(); + $user = new Users(); return $user->getColumnNames_User(); } @@ -323,8 +323,8 @@ function create_session($user_name, $password) { global $adb,$log; - require_once('modules/Users/User.php'); - $objuser = new User(); + require_once('modules/Users/Users.php'); + $objuser = new Users(); if($password != "" && $user_name != '') { $objuser->column_fields['user_name'] = $user_name; From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 00:04:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 07:04:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9628 - in /vtigercrm/branches/5.0.2: ./ include/utils/ install/ modules/Accounts/ modules/Calendar/ modules/Campaigns/ modules/Contacts/ modules/Emails/ modules/Home/ modules/Import/ modules/Invoice/ modules/Leads/ modules/Notes/ modules/Potentials/ modules/PriceBooks/ modules/Products/ modules/PurchaseOrder/ modules/Quotes/ modules/SalesOrder/ modules/Users/ modules/Vendors/ modules/Webmails/ soap/ Message-ID: <20061016070428.557F4787E3D@vtiger.fosslabs.com> Author: richie Date: Mon Oct 16 01:02:11 2006 New Revision: 9628 Log: module name ,File name ,Class name made unique --Jeri Modified: vtigercrm/branches/5.0.2/Popup.php vtigercrm/branches/5.0.2/include/utils/EditViewUtils.php vtigercrm/branches/5.0.2/include/utils/ListViewUtils.php vtigercrm/branches/5.0.2/include/utils/export.php vtigercrm/branches/5.0.2/include/utils/utils.php vtigercrm/branches/5.0.2/index.php vtigercrm/branches/5.0.2/install/5createTables.inc.php vtigercrm/branches/5.0.2/install/populateSeedData.php vtigercrm/branches/5.0.2/modules/Accounts/Account.php vtigercrm/branches/5.0.2/modules/Accounts/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Accounts/Delete.php vtigercrm/branches/5.0.2/modules/Accounts/DetailView.php vtigercrm/branches/5.0.2/modules/Accounts/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Accounts/EditView.php vtigercrm/branches/5.0.2/modules/Accounts/HeadLines.php vtigercrm/branches/5.0.2/modules/Accounts/ListView.php vtigercrm/branches/5.0.2/modules/Accounts/ListViewTop.php vtigercrm/branches/5.0.2/modules/Accounts/Save.php vtigercrm/branches/5.0.2/modules/Accounts/Tickerdetail.php vtigercrm/branches/5.0.2/modules/Calendar/Activity.php vtigercrm/branches/5.0.2/modules/Calendar/RenderRelatedListUI.php vtigercrm/branches/5.0.2/modules/Campaigns/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Campaigns/Campaign.php vtigercrm/branches/5.0.2/modules/Campaigns/Delete.php vtigercrm/branches/5.0.2/modules/Campaigns/DetailView.php vtigercrm/branches/5.0.2/modules/Campaigns/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Campaigns/EditView.php vtigercrm/branches/5.0.2/modules/Campaigns/ListView.php vtigercrm/branches/5.0.2/modules/Campaigns/Save.php vtigercrm/branches/5.0.2/modules/Contacts/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Contacts/Contact.php vtigercrm/branches/5.0.2/modules/Contacts/Delete.php vtigercrm/branches/5.0.2/modules/Contacts/DetailView.php vtigercrm/branches/5.0.2/modules/Contacts/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Contacts/EditView.php vtigercrm/branches/5.0.2/modules/Contacts/ListView.php vtigercrm/branches/5.0.2/modules/Contacts/Save.php vtigercrm/branches/5.0.2/modules/Emails/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Emails/ChooseEmail.php vtigercrm/branches/5.0.2/modules/Emails/Delete.php vtigercrm/branches/5.0.2/modules/Emails/DetailView.php vtigercrm/branches/5.0.2/modules/Emails/EditView.php vtigercrm/branches/5.0.2/modules/Emails/Email.php vtigercrm/branches/5.0.2/modules/Emails/EmailsAjax.php vtigercrm/branches/5.0.2/modules/Emails/ListView.php vtigercrm/branches/5.0.2/modules/Emails/Save.php vtigercrm/branches/5.0.2/modules/Emails/mailsend.php vtigercrm/branches/5.0.2/modules/Emails/sendmail.php vtigercrm/branches/5.0.2/modules/Home/UnifiedSearch.php vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php vtigercrm/branches/5.0.2/modules/Import/ImportContact.php vtigercrm/branches/5.0.2/modules/Import/ImportLead.php vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php vtigercrm/branches/5.0.2/modules/Import/ImportStep2.php vtigercrm/branches/5.0.2/modules/Import/ImportSteplast.php vtigercrm/branches/5.0.2/modules/Invoice/EditView.php vtigercrm/branches/5.0.2/modules/Leads/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Leads/Delete.php vtigercrm/branches/5.0.2/modules/Leads/DetailView.php vtigercrm/branches/5.0.2/modules/Leads/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Leads/EditView.php vtigercrm/branches/5.0.2/modules/Leads/Lead.php vtigercrm/branches/5.0.2/modules/Leads/LeadConvertToEntities.php vtigercrm/branches/5.0.2/modules/Leads/ListView.php vtigercrm/branches/5.0.2/modules/Leads/Save.php vtigercrm/branches/5.0.2/modules/Leads/result.php vtigercrm/branches/5.0.2/modules/Notes/Delete.php vtigercrm/branches/5.0.2/modules/Notes/DetailView.php vtigercrm/branches/5.0.2/modules/Notes/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Notes/EditView.php vtigercrm/branches/5.0.2/modules/Notes/ListView.php vtigercrm/branches/5.0.2/modules/Notes/Note.php vtigercrm/branches/5.0.2/modules/Notes/Save.php vtigercrm/branches/5.0.2/modules/Potentials/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Potentials/Charts.php vtigercrm/branches/5.0.2/modules/Potentials/Delete.php vtigercrm/branches/5.0.2/modules/Potentials/DetailView.php vtigercrm/branches/5.0.2/modules/Potentials/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Potentials/EditView.php vtigercrm/branches/5.0.2/modules/Potentials/ListView.php vtigercrm/branches/5.0.2/modules/Potentials/ListViewTop.php vtigercrm/branches/5.0.2/modules/Potentials/Opportunity.php vtigercrm/branches/5.0.2/modules/Potentials/Save.php vtigercrm/branches/5.0.2/modules/PriceBooks/CallRelatedList.php vtigercrm/branches/5.0.2/modules/PriceBooks/Delete.php vtigercrm/branches/5.0.2/modules/PriceBooks/DetailView.php vtigercrm/branches/5.0.2/modules/PriceBooks/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/PriceBooks/EditView.php vtigercrm/branches/5.0.2/modules/PriceBooks/ListView.php vtigercrm/branches/5.0.2/modules/PriceBooks/PriceBook.php vtigercrm/branches/5.0.2/modules/PriceBooks/Save.php vtigercrm/branches/5.0.2/modules/Products/AddProductToPriceBooks.php vtigercrm/branches/5.0.2/modules/Products/AddProductsToPriceBook.php vtigercrm/branches/5.0.2/modules/Products/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Products/Delete.php vtigercrm/branches/5.0.2/modules/Products/DetailView.php vtigercrm/branches/5.0.2/modules/Products/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Products/EditView.php vtigercrm/branches/5.0.2/modules/Products/ListView.php vtigercrm/branches/5.0.2/modules/Products/Product.php vtigercrm/branches/5.0.2/modules/Products/Save.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/CallRelatedList.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/CreatePDF.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/Delete.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailView.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/EditView.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListTopPurchaseOrder.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListView.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/PurchaseOrder.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/Save.php vtigercrm/branches/5.0.2/modules/Quotes/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Quotes/CreatePDF.php vtigercrm/branches/5.0.2/modules/Quotes/Delete.php vtigercrm/branches/5.0.2/modules/Quotes/DetailView.php vtigercrm/branches/5.0.2/modules/Quotes/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Quotes/EditView.php vtigercrm/branches/5.0.2/modules/Quotes/ListTopQuotes.php vtigercrm/branches/5.0.2/modules/Quotes/ListView.php vtigercrm/branches/5.0.2/modules/Quotes/Quote.php vtigercrm/branches/5.0.2/modules/Quotes/Save.php vtigercrm/branches/5.0.2/modules/SalesOrder/EditView.php vtigercrm/branches/5.0.2/modules/Users/Authenticate.php vtigercrm/branches/5.0.2/modules/Users/ChangePassword.php vtigercrm/branches/5.0.2/modules/Users/CreateUserPrivilegeFile.php vtigercrm/branches/5.0.2/modules/Users/DetailView.php vtigercrm/branches/5.0.2/modules/Users/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Users/EditView.php vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php vtigercrm/branches/5.0.2/modules/Users/ListView.php vtigercrm/branches/5.0.2/modules/Users/Logout.php vtigercrm/branches/5.0.2/modules/Users/Save.php vtigercrm/branches/5.0.2/modules/Users/ShowAuditTrail.php vtigercrm/branches/5.0.2/modules/Users/ShowHistory.php vtigercrm/branches/5.0.2/modules/Users/User.php vtigercrm/branches/5.0.2/modules/Users/massChangeStatus.php vtigercrm/branches/5.0.2/modules/Users/populatetemplate.php vtigercrm/branches/5.0.2/modules/Vendors/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Vendors/Delete.php vtigercrm/branches/5.0.2/modules/Vendors/DetailView.php vtigercrm/branches/5.0.2/modules/Vendors/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Vendors/EditView.php vtigercrm/branches/5.0.2/modules/Vendors/ListView.php vtigercrm/branches/5.0.2/modules/Vendors/Save.php vtigercrm/branches/5.0.2/modules/Vendors/Vendor.php vtigercrm/branches/5.0.2/modules/Webmails/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Webmails/Save.php vtigercrm/branches/5.0.2/soap/firefoxtoolbar.php vtigercrm/branches/5.0.2/soap/thunderbirdplugin.php vtigercrm/branches/5.0.2/soap/vtigerolservice.php vtigercrm/branches/5.0.2/soap/webforms.php vtigercrm/branches/5.0.2/soap/wordplugin.php Modified: vtigercrm/branches/5.0.2/Popup.php ============================================================================== --- vtigercrm/branches/5.0.2/Popup.php (original) +++ vtigercrm/branches/5.0.2/Popup.php Mon Oct 16 01:02:11 2006 @@ -33,8 +33,8 @@ switch($currentModule) { case 'Contacts': - require_once("modules/$currentModule/Contact.php"); - $focus = new Contact(); + require_once("modules/$currentModule/Contacts.php"); + $focus = new Contacts(); $log = LoggerManager::getLogger('contact_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom'); $comboFieldArray = getComboArray($comboFieldNames); @@ -47,8 +47,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","",""); break; case 'Campaigns': - require_once("modules/$currentModule/Campaign.php"); - $focus = new Campaign(); + require_once("modules/$currentModule/Campaigns.php"); + $focus = new Campaigns(); $log = LoggerManager::getLogger('campaign_list'); $comboFieldNames = Array('campaignstatus'=>'campaignstatus_dom', 'campaigntype'=>'campaigntype_dom'); @@ -60,8 +60,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','campaignname','true','basic',$popuptype,"","",""); break; case 'Accounts': - require_once("modules/$currentModule/Account.php"); - $focus = new Account(); + require_once("modules/$currentModule/Accounts.php"); + $focus = new Accounts(); $log = LoggerManager::getLogger('account_list'); $comboFieldNames = Array('accounttype'=>'account_type_dom' ,'industry'=>'industry_dom'); @@ -74,8 +74,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','accountname','true','basic',$popuptype,"","",""); break; case 'Leads': - require_once("modules/$currentModule/Lead.php"); - $focus = new Lead(); + require_once("modules/$currentModule/Leads.php"); + $focus = new Leads(); $log = LoggerManager::getLogger('contact_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom' ,'leadstatus'=>'leadstatus_dom' @@ -91,8 +91,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","",""); break; case 'Potentials': - require_once("modules/$currentModule/Opportunity.php"); - $focus = new Potential(); + require_once("modules/$currentModule/Potentials.php"); + $focus = new Potentials(); $log = LoggerManager::getLogger('potential_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom' ,'opportunity_type'=>'opportunity_type_dom' @@ -104,8 +104,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','potentialname','true','basic',$popuptype,"","",""); break; case 'Quotes': - require_once("modules/$currentModule/Quote.php"); - $focus = new Quote(); + require_once("modules/$currentModule/Quotes.php"); + $focus = new Quotes(); $log = LoggerManager::getLogger('quotes_list'); $comboFieldNames = Array('quotestage'=>'quotestage_dom'); $comboFieldArray = getComboArray($comboFieldNames); @@ -121,8 +121,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','subject','true','basic',$popuptype,"","",""); break; case 'Products': - require_once("modules/$currentModule/Product.php"); - $focus = new Product(); + require_once("modules/$currentModule/Products.php"); + $focus = new Products(); $smarty->assign("SINGLE_MOD",'Product'); if(isset($_REQUEST['curr_row'])) { @@ -135,8 +135,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','productname','true','basic',$popuptype,"","",""); break; case 'Vendors': - require_once("modules/$currentModule/Vendor.php"); - $focus = new Vendor(); + require_once("modules/$currentModule/Vendors.php"); + $focus = new Vendors(); $smarty->assign("SINGLE_MOD",'Vendor'); $alphabetical = AlphabeticalSearch($currentModule,'Popup','vendorname','true','basic',$popuptype,"","",""); break; @@ -150,15 +150,15 @@ break; case 'PurchaseOrder': require_once("modules/$currentModule/PurchaseOrder.php"); - $focus = new Order(); + $focus = new PurchaseOrder(); $smarty->assign("SINGLE_MOD",'PurchaseOrder'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); $alphabetical = AlphabeticalSearch($currentModule,'Popup','subject','true','basic',$popuptype,"","",""); break; case 'PriceBooks': - require_once("modules/$currentModule/PriceBook.php"); - $focus = new PriceBook(); + require_once("modules/$currentModule/PriceBooks.php"); + $focus = new PriceBooks(); $smarty->assign("SINGLE_MOD",'PriceBook'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); @@ -175,8 +175,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','bookname','true','basic',$popuptype,"","",""); break; case 'Users': - require_once("modules/$currentModule/User.php"); - $focus = new User(); + require_once("modules/$currentModule/Users.php"); + $focus = new Users(); $smarty->assign("SINGLE_MOD",'Users'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); Modified: vtigercrm/branches/5.0.2/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.2/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.2/include/utils/EditViewUtils.php Mon Oct 16 01:02:11 2006 @@ -863,15 +863,15 @@ $nemail=count($realid); if ($pmodule=='Accounts'){ - require_once('modules/Accounts/Account.php'); - $myfocus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $myfocus = new Accounts(); $myfocus->retrieve_entity_info($entityid,"Accounts"); $fullname=br2nl($myfocus->column_fields['accountname']); $account_selected = 'selected'; } elseif ($pmodule=='Contacts'){ - require_once('modules/Contacts/Contact.php'); - $myfocus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $myfocus = new Contacts(); $myfocus->retrieve_entity_info($entityid,"Contacts"); $fname=br2nl($myfocus->column_fields['firstname']); $lname=br2nl($myfocus->column_fields['lastname']); @@ -879,8 +879,8 @@ $contact_selected = 'selected'; } elseif ($pmodule=='Leads'){ - require_once('modules/Leads/Lead.php'); - $myfocus = new Lead(); + require_once('modules/Leads/Leads.php'); + $myfocus = new Leads(); $myfocus->retrieve_entity_info($entityid,"Leads"); $fname=br2nl($myfocus->column_fields['firstname']); $lname=br2nl($myfocus->column_fields['lastname']); Modified: vtigercrm/branches/5.0.2/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.2/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.2/include/utils/ListViewUtils.php Mon Oct 16 01:02:11 2006 @@ -1385,8 +1385,8 @@ } elseif($popuptype == "specific_account_address") { - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($entity_id,"Accounts"); $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']).'"); window.close()\'>'.$temp_val.''; @@ -1394,8 +1394,8 @@ } elseif($popuptype == "specific_contact_account_address") { - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($entity_id,"Accounts"); $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']).'"); window.close()\'>'.$temp_val.''; @@ -1405,8 +1405,8 @@ elseif($popuptype == "specific_potential_account_address") { $acntid = $adb->query_result($list_result,$list_result_count,"accountid"); - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($acntid,"Accounts"); $account_name = getAccountName($acntid); @@ -1461,8 +1461,8 @@ } elseif($popuptype == "specific_vendor_address") { - require_once('modules/Vendors/Vendor.php'); - $acct_focus = new Vendor(); + require_once('modules/Vendors/Vendors.php'); + $acct_focus = new Vendors(); $acct_focus->retrieve_entity_info($entity_id,"Vendors"); $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']).'"); window.close()\'>'.$temp_val.''; Modified: vtigercrm/branches/5.0.2/include/utils/export.php ============================================================================== --- vtigercrm/branches/5.0.2/include/utils/export.php (original) +++ vtigercrm/branches/5.0.2/include/utils/export.php Mon Oct 16 01:02:11 2006 @@ -20,23 +20,23 @@ require_once('config.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Leads/Lead.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Leads/Leads.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Emails/Emails.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Users/User.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Users/Users.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/UserInfoUtil.php'); global $allow_exports; session_start(); -$current_user = new User(); +$current_user = new Users(); if(isset($_SESSION['authenticated_user_id'])) { Modified: vtigercrm/branches/5.0.2/include/utils/utils.php ============================================================================== --- vtigercrm/branches/5.0.2/include/utils/utils.php (original) +++ vtigercrm/branches/5.0.2/include/utils/utils.php Mon Oct 16 01:02:11 2006 @@ -2048,9 +2048,9 @@ $log->debug("Entering getEmailParentsList(".$module.",".$id.") method ..."); global $adb; if($module == 'Contacts') - $focus = new Contact(); + $focus = new Contacts(); if($module == 'Leads') - $focus = new Lead(); + $focus = new Leads(); $focus->retrieve_entity_info($id,$module); $fieldid = 0; Modified: vtigercrm/branches/5.0.2/index.php ============================================================================== --- vtigercrm/branches/5.0.2/index.php (original) +++ vtigercrm/branches/5.0.2/index.php Mon Oct 16 01:02:11 2006 @@ -101,7 +101,7 @@ set_default_config($default_config_values); require_once('include/logging.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); global $currentModule; @@ -352,7 +352,7 @@ $lang_crm = (isset($_SESSION['authenticated_user_language'])) ? $_SESSION['authenticated_user_language'] : ""; $GLOBALS['request_string'] = "&module=$module&action=$action&record=$record&lang_crm=$lang_crm"; -$current_user = new User(); +$current_user = new Users(); if($use_current_login) { @@ -432,90 +432,22 @@ // Use the record to track the viewing. // todo - Have a record of modules and thier primary object names. //Getting the actual module - $actualModule = $currentModule; switch($currentModule) { - case 'Leads': - require_once("modules/$currentModule/Lead.php"); - $focus = new Lead(); - break; - case 'Contacts': - require_once("modules/$currentModule/Contact.php"); - $focus = new Contact(); - break; - case 'Accounts': - require_once("modules/$currentModule/Account.php"); - $focus = new Account(); - break; - case 'Potentials': - require_once("modules/$currentModule/Opportunity.php"); - $focus = new Potential(); - break; case 'Calendar': require_once("modules/$currentModule/Activity.php"); $focus = new Activity(); break; - case 'Notes': - require_once("modules/$currentModule/Note.php"); - $focus = new Note(); - break; - case 'Emails': - require_once("modules/$currentModule/Email.php"); - $focus = new Email(); - break; - case 'Users': - require_once("modules/$currentModule/User.php"); - $focus = new User(); - break; - case 'Products': - require_once("modules/$currentModule/Product.php"); - $focus = new Product(); - break; - case 'Vendors': - require_once("modules/$currentModule/Vendor.php"); - $focus = new Vendor(); - $actualModule = 'Vendors'; - break; - case 'PriceBooks': - require_once("modules/$currentModule/PriceBook.php"); - $focus = new PriceBook(); - $actualModule = 'PriceBooks'; - break; - case 'HelpDesk': - require_once("modules/$currentModule/HelpDesk.php"); - $focus = new HelpDesk(); - break; - case 'Faq': - require_once("modules/$currentModule/Faq.php"); - $focus = new Faq(); - break; - case 'Quotes': - require_once("modules/$currentModule/Quote.php"); - $focus = new Quote(); - break; - case 'PurchaseOrder': - require_once("modules/$currentModule/PurchaseOrder.php"); - $focus = new Order(); - break; - case 'SalesOrder': - require_once("modules/$currentModule/SalesOrder.php"); - $focus = new SalesOrder(); - break; - - case 'Invoice': - require_once("modules/$currentModule/Invoice.php"); - $focus = new Invoice(); - break; - case 'Campaigns': - require_once("modules/$currentModule/Campaign.php"); - $focus = new Campaign(); + default: + require_once("modules/$currentModule/$currentModule.php"); + $focus = new $currentModule(); break; } if(isset($_REQUEST['record']) && $_REQUEST['record']!='' && $_REQUEST["module"] != "Webmails") { // Only track a viewing if the record was retrieved. - $focus->track_view($current_user->id, $actualModule,$_REQUEST['record']); + $focus->track_view($current_user->id, $currentModule,$_REQUEST['record']); } } Modified: vtigercrm/branches/5.0.2/install/5createTables.inc.php ============================================================================== --- vtigercrm/branches/5.0.2/install/5createTables.inc.php (original) +++ vtigercrm/branches/5.0.2/install/5createTables.inc.php Mon Oct 16 01:02:11 2006 @@ -22,14 +22,14 @@ require_once('config.php'); require_once('include/database/PearDatabase.php'); require_once('include/logging.php'); -require_once('modules/Leads/Lead.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Leads/Leads.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Users/User.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Users/Users.php'); require_once('modules/Import/ImportMap.php'); require_once('modules/Import/UsersLastImport.php'); require_once('modules/Users/LoginHistory.php'); @@ -66,7 +66,7 @@ global $default_user_is_admin; // create default admin user - $user = new User(); + $user = new Users(); $user->column_fields["last_name"] = 'Administrator'; $user->column_fields["user_name"] = 'admin'; $user->column_fields["status"] = 'Active'; @@ -122,7 +122,7 @@ //Creating the Standard User - $user = new User(); + $user = new Users(); $user->column_fields["last_name"] = 'StandardUser'; $user->column_fields["user_name"] = 'standarduser'; $user->column_fields["is_admin"] = 'off'; Modified: vtigercrm/branches/5.0.2/install/populateSeedData.php ============================================================================== --- vtigercrm/branches/5.0.2/install/populateSeedData.php (original) +++ vtigercrm/branches/5.0.2/install/populateSeedData.php Mon Oct 16 01:02:11 2006 @@ -19,29 +19,29 @@ require_once('config.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('modules/Contacts/contactSeedData.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Campaigns/Campaign.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); require_once('include/language/en_us.lang.php'); require_once('include/ComboStrings.php'); require_once('include/ComboUtil.php'); -require_once('modules/Products/Product.php'); -require_once('modules/PriceBooks/PriceBook.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Products/Products.php'); +require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/Vendors/Vendors.php'); require_once('modules/Faq/Faq.php'); require_once('modules/HelpDesk/HelpDesk.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Quotes/Quotes.php'); require_once('modules/SalesOrder/SalesOrder.php'); require_once('modules/PurchaseOrder/PurchaseOrder.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/InventoryUtils.php'); //Included to save inventory related products in demo data global $first_name_array; @@ -113,7 +113,7 @@ } // Look up the user id for the assigned user -$seed_user = new User(); +$seed_user = new Users(); //$adb->println("PSD assignname=".$assigned_user_name); @@ -121,7 +121,7 @@ global $current_user; -$current_user = new User(); +$current_user = new Users(); $result = $current_user->retrieve_entity_info($assigned_user_id,'Users'); $tagkey = 1; @@ -147,7 +147,7 @@ $account_name = $company_name_array[$i]; // Create new accounts. - $account = new Account(); + $account = new Accounts(); $account->column_fields["accountname"] = $account_name; $account->column_fields["phone"] = create_phone_number(); $account->column_fields["assigned_user_id"] = $assigned_user_id; @@ -196,7 +196,7 @@ //Create new opportunities - $opp = new Potential(); + $opp = new Potentials(); $opp->column_fields["assigned_user_id"] = $assigned_user_id; $opp->column_fields["potentialname"] = $account_name." - 1000 units"; @@ -235,7 +235,7 @@ for($i=0; $i<10; $i++) { - $contact = new Contact(); + $contact = new Contacts(); $contact->column_fields["firstname"] = ucfirst(strtolower($first_name_array[$i])); $contact->column_fields["lastname"] = ucfirst(strtolower($last_name_array[$i])); $contact->column_fields["assigned_user_id"] = $assigned_user_id; @@ -327,7 +327,7 @@ $company_count=0; for($i=0; $i<10; $i++) { - $lead = new Lead(); + $lead = new Leads(); $lead->column_fields["firstname"] = ucfirst(strtolower($first_name_array[$i])); $lead->column_fields["lastname"] = ucfirst(strtolower($last_name_array[$i])); @@ -404,7 +404,7 @@ //Populating Vendor Data for($i=0; $i<10; $i++) { - $vendor = new Vendor(); + $vendor = new Vendors(); $vendor->column_fields["vendorname"] = ucfirst(strtolower($first_name_array[$i])); $vendor->column_fields["phone"] = create_phone_number(); $vendor->column_fields["email"] = strtolower($vendor->column_fields["vendorname"])."@company.com"; @@ -442,7 +442,7 @@ .jpeg###","product7.jpeg###product8.jpeg###product9.jpeg###product10.jpeg###"); for($i=0; $i<10; $i++) { - $product = new Product(); + $product = new Products(); if($i>4) { $parent_key = array_rand($opportunity_ids); @@ -579,7 +579,7 @@ $validtill_array = array ("2006-09-21", "2006-10-29", "2006-12-11", "2006-10-09", "2006-11-18"); for($i=0;$i<5;$i++) { - $quote = new Quote(); + $quote = new Quotes(); $quote->column_fields["assigned_user_id"] = $assigned_user_id; $account_key = array_rand($account_ids); @@ -730,7 +730,7 @@ for($i=0;$i<5;$i++) { - $po = new Order(); + $po = new PurchaseOrder(); $po->column_fields["assigned_user_id"] = $assigned_user_id; $vendor_key = array_rand($vendor_ids); @@ -896,7 +896,7 @@ for($i=0;$i<5;$i++) { - $email = new Email(); + $email = new Emails(); $email->column_fields["assigned_user_id"] = $assigned_user_id; @@ -923,7 +923,7 @@ //$num_array = array(0,1,2,3,4); for($i=0;$i<12;$i++) { - $pricebook = new PriceBook(); + $pricebook = new PriceBooks(); $rand = array_rand($num_array); $pricebook->column_fields["bookname"] = $PB_array[$i]; @@ -940,7 +940,7 @@ for($i=0;$i<7;$i++) { - $notes = new Note(); + $notes = new Notes(); $rand = array_rand($num_array); $contact_key = array_rand($contact_ids); @@ -1118,7 +1118,7 @@ //$expected_response = Array(null,null,null); for($i=0;$icolumn_fields["campaignname"] = $campaign_name; $campaign->column_fields["campaigntype"] = $campaign_type_array[$i]; Modified: vtigercrm/branches/5.0.2/modules/Accounts/Account.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/Account.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/Account.php Mon Oct 16 01:02:11 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Accounts/Account.php,v 1.53 2005/04/28 08:06:45 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Accounts/Accounts.php,v 1.53 2005/04/28 08:06:45 rank Exp $ * Description: Defines the Account SugarBean Account entity with the necessary * methods and variables. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. @@ -26,11 +26,11 @@ require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -96,7 +96,7 @@ var $default_order_by = 'accountname'; var $default_sort_order = 'ASC'; - function Account() { + function Accounts() { $this->log =LoggerManager::getLogger('account'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Accounts'); @@ -147,7 +147,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $mod_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; if(isPermitted("Contacts",1,"") == 'yes') @@ -191,7 +191,7 @@ $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; - $focus = new Potential(); + $focus = new Potentials(); $button = ''; if(isPermitted("Potentials",1,"") == 'yes') @@ -388,9 +388,9 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quote.php'); - - $focus = new Quote(); + require_once('modules/Quotes/Quotes.php'); + + $focus = new Quotes(); $button = ''; if(isPermitted("Quotes",1,"") == 'yes') @@ -627,10 +627,10 @@ { global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Product.php'); + require_once('modules/Products/Products.php'); global $app_strings; - $focus = new Product(); + $focus = new Products(); $button = ''; Modified: vtigercrm/branches/5.0.2/modules/Accounts/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -22,7 +22,7 @@ } else { -$focus = new Account(); +$focus = new Accounts(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.2/modules/Accounts/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/Delete.php Mon Oct 16 01:02:11 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Account(); +$focus = new Accounts(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.2/modules/Accounts/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/DetailView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ global $app_list_strings; global $log, $currentModule, $singlepane_view; -$focus = new Account(); +$focus = new Accounts(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Accounts"); $focus->id = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.2/modules/Accounts/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $acntObj = new Account(); + $acntObj = new Accounts(); $acntObj->retrieve_entity_info($crmid,"Accounts"); $acntObj->column_fields[$fieldname] = $fieldvalue; if($fieldname == 'annual_revenue')//annual revenue converted to dollar value while saving Modified: vtigercrm/branches/5.0.2/modules/Accounts/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/EditView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -31,7 +31,7 @@ global $app_strings,$mod_strings,$currentModule,$theme; $smarty=new vtigerCRM_Smarty; -$focus = new Account(); +$focus = new Accounts(); if(isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.2/modules/Accounts/HeadLines.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/HeadLines.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/HeadLines.php Mon Oct 16 01:02:11 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -include("modules/Accounts/Account.php"); +include("modules/Accounts/Accounts.php"); include("getCompanyProfile.php"); $variable = $_REQUEST['tickersymbol']; $url = "http://finance.yahoo.com/q?s=".$variable; Modified: vtigercrm/branches/5.0.2/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/ListView.php Mon Oct 16 01:02:11 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -43,7 +43,7 @@ $url_string = ''; -$focus = new Account(); +$focus = new Accounts(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.2/modules/Accounts/ListViewTop.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/ListViewTop.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/ListViewTop.php Mon Oct 16 01:02:11 2006 @@ -28,7 +28,7 @@ $log = LoggerManager::getLogger('top accounts_list'); $log->debug("Entering getTopAccounts() method ..."); require_once("data/Tracker.php"); - require_once('modules/Potentials/Opportunity.php'); + require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); global $app_strings; Modified: vtigercrm/branches/5.0.2/modules/Accounts/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/Save.php Mon Oct 16 01:02:11 2006 @@ -21,14 +21,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/logging.php'); //require_once('database/DatabaseConnection.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); global $log; -$focus = new Account(); +$focus = new Accounts(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.2/modules/Accounts/Tickerdetail.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/Tickerdetail.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/Tickerdetail.php Mon Oct 16 01:02:11 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once("modules/Accounts/Account.php"); +require_once("modules/Accounts/Accounts.php"); require_once("getCompanyProfile.php"); $variable = $_REQUEST['tickersymbol']; $url = "http://moneycentral.msn.com/investor/research/profile.asp?Symbol=".trim($variable); Modified: vtigercrm/branches/5.0.2/modules/Calendar/Activity.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Calendar/Activity.php (original) +++ vtigercrm/branches/5.0.2/modules/Calendar/Activity.php Mon Oct 16 01:02:11 2006 @@ -154,7 +154,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; @@ -177,7 +177,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new User(); + $focus = new Users(); $button = ''; @@ -395,8 +395,8 @@ global $log,$adb; $log->debug("Entering get_tasksforol(".$username.") method ..."); global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -447,8 +447,8 @@ global $log,$adb; $log->debug("Entering get_calendarsforol(".$user_name.") method ..."); global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); Modified: vtigercrm/branches/5.0.2/modules/Calendar/RenderRelatedListUI.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Calendar/RenderRelatedListUI.php (original) +++ vtigercrm/branches/5.0.2/modules/Calendar/RenderRelatedListUI.php Mon Oct 16 01:02:11 2006 @@ -10,8 +10,8 @@ ********************************************************************************/ require_once('include/RelatedListView.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/UserInfoUtil.php'); // functions added for group calendar -Jaguar Modified: vtigercrm/branches/5.0.2/modules/Campaigns/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Campaigns/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Campaigns/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Campaigns/Campaign.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 @@ -23,7 +23,7 @@ } else { -$focus = new Campaign(); +$focus = new Campaigns(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.2/modules/Campaigns/Campaign.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Campaigns/Campaign.php (original) +++ vtigercrm/branches/5.0.2/modules/Campaigns/Campaign.php Mon Oct 16 01:02:11 2006 @@ -18,8 +18,8 @@ require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); require_once('include/utils/utils.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Leads/Leads.php'); require_once('user_privileges/default_module_view.php'); class Campaign extends CRMEntity { @@ -66,7 +66,7 @@ 'Campaign Type'=>'campaigntype', ); - function Campaign() + function Campaigns() { $this->log =LoggerManager::getLogger('campaign'); $this->db = new PearDatabase(); @@ -120,7 +120,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $mod_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; if($singlepane_view == 'true') @@ -145,7 +145,7 @@ $log->debug("Entering get_leads(".$id.") method ..."); global $mod_strings; - $focus = new Lead(); + $focus = new Leads(); $button = ''; if($singlepane_view == 'true') @@ -169,7 +169,7 @@ $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; - $focus = new Potential(); + $focus = new Potentials(); $button = ''; if($singlepane_view == 'true') Modified: vtigercrm/branches/5.0.2/modules/Campaigns/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Campaigns/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Campaigns/Delete.php Mon Oct 16 01:02:11 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('ticket_delete'); -$focus = new Campaign(); +$focus = new Campaigns(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.2/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Campaigns/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Campaigns/DetailView.php Mon Oct 16 01:02:11 2006 @@ -11,12 +11,12 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Campaigns/Campaign.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'); -$focus = new Campaign(); +$focus = new Campaigns(); if(isset($_REQUEST['record']) && $_REQUEST['record']!= null ) { Modified: vtigercrm/branches/5.0.2/modules/Campaigns/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Campaigns/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Campaigns/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Campaign(); + $modObj = new Campaigns(); $modObj->retrieve_entity_info($crmid,"Campaigns"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/Campaigns/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Campaigns/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Campaigns/EditView.php Mon Oct 16 01:02:11 2006 @@ -11,12 +11,12 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once('include/utils/utils.php'); -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$currentModule,$theme; -$focus = new Campaign(); +$focus = new Campaigns(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] !='') Modified: vtigercrm/branches/5.0.2/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Campaigns/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Campaigns/ListView.php Mon Oct 16 01:02:11 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once("data/Tracker.php"); @@ -28,7 +28,7 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; -$focus = new Campaign(); +$focus = new Campaigns(); $category = getParentTab(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.2/modules/Campaigns/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Campaigns/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Campaigns/Save.php Mon Oct 16 01:02:11 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new Campaign(); +$focus = new Campaigns(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.2/modules/Contacts/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Contacts/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Contacts/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout @@ -22,7 +22,7 @@ } else { -$focus = new Contact(); +$focus = new Contacts(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.2/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Contacts/Contact.php (original) +++ vtigercrm/branches/5.0.2/modules/Contacts/Contact.php Mon Oct 16 01:02:11 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Contacts/Contact.php,v 1.70 2005/04/27 11:21:49 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Contacts/Contacts.php,v 1.70 2005/04/27 11:21:49 rank Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -25,11 +25,11 @@ require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); require_once('include/utils/utils.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Campaigns/Campaign.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); require_once('modules/HelpDesk/HelpDesk.php'); require_once('user_privileges/default_module_view.php'); @@ -125,7 +125,7 @@ var $default_order_by = 'lastname'; var $default_sort_order = 'ASC'; - function Contact() { + function Contacts() { $this->log = LoggerManager::getLogger('contact'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Contacts'); @@ -334,7 +334,7 @@ $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; - $focus = new Potential(); + $focus = new Potentials(); $button = ''; if(isPermitted("Potentials",1,"") == 'yes') @@ -486,8 +486,8 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quote.php'); - $focus = new Quote(); + require_once('modules/Quotes/Quotes.php'); + $focus = new Quotes(); $button = ''; if(isPermitted("Quotes",1,"") == 'yes') @@ -540,8 +540,8 @@ global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); global $app_strings; - require_once('modules/Products/Product.php'); - $focus = new Product(); + require_once('modules/Products/Products.php'); + $focus = new Products(); $button = ''; if(isPermitted("Products",1,"") == 'yes') @@ -570,7 +570,7 @@ $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new Order(); + $focus = new PurchaseOrder(); $button = ''; @@ -600,7 +600,7 @@ $log->debug("Entering get_emails(".$id.") method ..."); global $mod_strings; - $focus = new Email(); + $focus = new Emails(); $button = ''; @@ -631,7 +631,7 @@ $log->debug("Entering get_campaigns(".$id.") method ..."); global $mod_strings; - $focus = new Campaign(); + $focus = new Campaigns(); if($singlepane_view == 'true') $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; else @@ -735,8 +735,8 @@ { global $log; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -775,8 +775,8 @@ { global $log,$adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); Modified: vtigercrm/branches/5.0.2/modules/Contacts/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Contacts/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Contacts/Delete.php Mon Oct 16 01:02:11 2006 @@ -17,13 +17,13 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Contact(); +$focus = new Contacts(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.2/modules/Contacts/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Contacts/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Contacts/DetailView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -33,7 +33,7 @@ global $app_strings; global $currentModule, $singlepane_view; -$focus = new Contact(); +$focus = new Contacts(); if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.2/modules/Contacts/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Contacts/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Contacts/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $cntObj = new Contact(); + $cntObj = new Contacts(); $cntObj->retrieve_entity_info($crmid,"Contacts"); $cntObj->column_fields[$fieldname] = $fieldvalue; $cntObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/Contacts/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Contacts/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Contacts/EditView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -39,7 +39,7 @@ $image_error=isset($_REQUEST['image_error'])?$_REQUEST['image_error']:"false"; //end -$focus = new Contact(); +$focus = new Contacts(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) @@ -68,9 +68,9 @@ if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']=='') { - require_once('modules/Accounts/Account.php'); + require_once('modules/Accounts/Accounts.php'); $focus->column_fields['account_id'] = $_REQUEST['account_id']; - $acct_focus = new Account(); + $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']; Modified: vtigercrm/branches/5.0.2/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Contacts/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Contacts/ListView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -39,7 +39,7 @@ global $currentModule,$theme; -$focus = new Contact(); +$focus = new Contacts(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.2/modules/Contacts/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Contacts/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Contacts/Save.php Mon Oct 16 01:02:11 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once("modules/Emails/mail.php"); @@ -51,7 +51,7 @@ $local_log =& LoggerManager::getLogger('index'); global $log,$adb; -$focus = new Contact(); +$focus = new Contacts(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.2/modules/Emails/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -11,10 +11,10 @@ require_once('Smarty_setup.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); -$focus = new Email(); +$focus = new Emails(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.2/modules/Emails/ChooseEmail.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/ChooseEmail.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/ChooseEmail.php Mon Oct 16 01:02:11 2006 @@ -29,20 +29,20 @@ if ($pmodule=='Accounts') { - require_once('modules/Accounts/Account.php'); - $myfocus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $myfocus = new Accounts(); $myfocus->retrieve_entity_info($entityid,"Accounts"); } elseif ($pmodule=='Contacts') { - require_once('modules/Contacts/Contact.php'); - $myfocus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $myfocus = new Contacts(); $myfocus->retrieve_entity_info($entityid,"Contacts"); } elseif ($pmodule=='Leads') { - require_once('modules/Leads/Lead.php'); - $myfocus = new Lead(); + require_once('modules/Leads/Leads.php'); + $myfocus = new Leads(); $myfocus->retrieve_entity_info($entityid,"Leads"); } ?> Modified: vtigercrm/branches/5.0.2/modules/Emails/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/Delete.php Mon Oct 16 01:02:11 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('email_delete'); -$focus = new Email(); +$focus = new Emails(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the email."); Modified: vtigercrm/branches/5.0.2/modules/Emails/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/DetailView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/upload_file.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ global $mod_strings; global $currentModule; -$focus = new Email(); +$focus = new Emails(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record'])) Modified: vtigercrm/branches/5.0.2/modules/Emails/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/EditView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/FormValidationUtil.php'); @@ -34,7 +34,7 @@ global $current_user; global $currentModule; -$focus = new Email(); +$focus = new Emails(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['upload_error'] == true) Modified: vtigercrm/branches/5.0.2/modules/Emails/Email.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/Email.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/Email.php Mon Oct 16 01:02:11 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Email.php,v 1.41 2005/04/28 08:11:21 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Emails.php,v 1.41 2005/04/28 08:11:21 rank Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -25,10 +25,10 @@ require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Users/User.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Users/Users.php'); // Email is used to store customer information. class Email extends CRMEntity { @@ -78,9 +78,9 @@ /** This function will set the columnfields for Email module */ - function Email() { + function Emails() { $this->log = LoggerManager::getLogger('email'); - $this->log->debug("Entering Email() method ..."); + $this->log->debug("Entering Emails() method ..."); $this->log = LoggerManager::getLogger('email'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Emails'); @@ -101,7 +101,7 @@ global $mod_strings; global $app_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; $returnset = '&return_module=Emails&return_action=CallRelatedList&return_id='.$id; Modified: vtigercrm/branches/5.0.2/modules/Emails/EmailsAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/EmailsAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/EmailsAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = $_REQUEST["fieldValue"]; if($crmid != "") { - $modObj = new Email(); + $modObj = new Emails(); $modObj->retrieve_entity_info($crmid,"Emails"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/Emails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/ListView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/utils/utils.php'); @@ -42,7 +42,7 @@ $url_string = ''; // assigning http url string -$focus = new Email(); +$focus = new Emails(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.2/modules/Emails/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/Save.php Mon Oct 16 01:02:11 2006 @@ -51,13 +51,13 @@ $mailbox = 'INBOX'; } -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Email(); +$focus = new Emails(); global $current_user; setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.2/modules/Emails/mailsend.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/mailsend.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/mailsend.php Mon Oct 16 01:02:11 2006 @@ -124,20 +124,20 @@ $fresult=$adb->query($myquery); if ($pmodule=='Contacts') { - require_once('modules/Contacts/Contact.php'); - $myfocus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $myfocus = new Contacts(); $myfocus->retrieve_entity_info($mycrmid,"Contacts"); } elseif ($pmodule=='Accounts') { - require_once('modules/Accounts/Account.php'); - $myfocus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $myfocus = new Accounts(); $myfocus->retrieve_entity_info($mycrmid,"Accounts"); } elseif ($pmodule=='Leads') { - require_once('modules/Leads/Lead.php'); - $myfocus = new Lead(); + require_once('modules/Leads/Leads.php'); + $myfocus = new Leads(); $myfocus->retrieve_entity_info($mycrmid,"Leads"); } $fldname=$adb->query_result($fresult,0,"columnname"); Modified: vtigercrm/branches/5.0.2/modules/Emails/sendmail.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/sendmail.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/sendmail.php Mon Oct 16 01:02:11 2006 @@ -18,7 +18,7 @@ * @copyright 2001 - 2003 Brent R. Matzelle */ -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/logging.php'); require("modules/Emails/class.phpmailer.php"); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/branches/5.0.2/modules/Home/UnifiedSearch.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Home/UnifiedSearch.php (original) +++ vtigercrm/branches/5.0.2/modules/Home/UnifiedSearch.php Mon Oct 16 01:02:11 2006 @@ -21,18 +21,18 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Leads/Leads.php'); require_once('modules/Faq/Faq.php'); -require_once('modules/Vendors/Vendor.php'); -require_once('modules/PriceBooks/PriceBook.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Vendors/Vendors.php'); +require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/Quotes/Quotes.php'); require_once('modules/PurchaseOrder/PurchaseOrder.php'); require_once('modules/SalesOrder/SalesOrder.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('modules/Home/language/en_us.lang.php'); require_once('include/database/PearDatabase.php'); require_once('modules/CustomView/CustomView.php'); Modified: vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php Mon Oct 16 01:02:11 2006 @@ -22,11 +22,11 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/ComboUtil.php'); // Account is used to store vtiger_account information. Modified: vtigercrm/branches/5.0.2/modules/Import/ImportContact.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportContact.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportContact.php Mon Oct 16 01:02:11 2006 @@ -18,7 +18,7 @@ ********************************************************************************/ include_once('config.php'); require_once('include/logging.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('modules/Import/UsersLastImport.php'); require_once('include/database/PearDatabase.php'); require_once('include/ComboUtil.php'); @@ -169,7 +169,7 @@ $arr = array(); // check if it already exists - $focus = new Account(); + $focus = new Accounts(); $query = ''; Modified: vtigercrm/branches/5.0.2/modules/Import/ImportLead.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportLead.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportLead.php Mon Oct 16 01:02:11 2006 @@ -26,13 +26,13 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/ComboUtil.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); class ImportLead extends Lead { Modified: vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php Mon Oct 16 01:02:11 2006 @@ -22,11 +22,11 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/ComboUtil.php'); // Get _dom arrays from Database @@ -131,7 +131,7 @@ $arr = array(); // check if it already exists - $focus = new Account(); + $focus = new Accounts(); $query = ''; Modified: vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php Mon Oct 16 01:02:11 2006 @@ -26,14 +26,14 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Products/Products.php'); require_once('include/ComboUtil.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); class ImportProduct extends Product { Modified: vtigercrm/branches/5.0.2/modules/Import/ImportStep2.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportStep2.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportStep2.php Mon Oct 16 01:02:11 2006 @@ -250,27 +250,27 @@ if($_REQUEST['module']=='Accounts') { $tablename='account'; - $focus1=new Account(); + $focus1=new Accounts(); } if($_REQUEST['module']=='Contacts') { $tablename='contactdetails'; - $focus1=new Contact(); + $focus1=new Contacts(); } if($_REQUEST['module']=='Leads') { $tablename='leaddetails'; - $focus1=new Lead(); + $focus1=new Leads(); } if($_REQUEST['module']=='Potentials') { $tablename='potential'; - $focus1=new Potential(); + $focus1=new Potentials(); } if($_REQUEST['module']=='Products') { $tablename='products'; - $focus1=new Product(); + $focus1=new Products(); } Modified: vtigercrm/branches/5.0.2/modules/Import/ImportSteplast.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportSteplast.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportSteplast.php Mon Oct 16 01:02:11 2006 @@ -26,7 +26,7 @@ require_once('modules/Import/UsersLastImport.php'); require_once('modules/Import/parse_utils.php'); require_once('include/ListView/ListView.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/utils/utils.php'); global $mod_strings; Modified: vtigercrm/branches/5.0.2/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Invoice/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Invoice/EditView.php Mon Oct 16 01:02:11 2006 @@ -23,9 +23,9 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('modules/SalesOrder/SalesOrder.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -43,7 +43,7 @@ if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoinvoice') { $quoteid = $_REQUEST['record']; - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToInvoice($focus,$quote_focus,$quoteid); @@ -179,7 +179,7 @@ } if(isset($_REQUEST['opportunity_id']) && $_REQUEST['opportunity_id'] !='') { - $potfocus = new Potential(); + $potfocus = new Potentials(); $potfocus->column_fields['potential_id'] = $_REQUEST['opportunity_id']; $associated_prod = getAssociatedProducts("Potentials",$potfocus,$potfocus->column_fields['potential_id']); @@ -194,8 +194,8 @@ if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && ($_REQUEST['record']=='' || $_REQUEST['convertmode'] == "potentoinvoice")){ - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/branches/5.0.2/modules/Leads/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -22,7 +22,7 @@ } else { -$focus = new Lead(); +$focus = new Leads(); $MODULE = $_REQUEST['module']; $RECORD = $_REQUEST['record']; $currentmodule = $_REQUEST['module']; Modified: vtigercrm/branches/5.0.2/modules/Leads/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/Delete.php Mon Oct 16 01:02:11 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('lead_delete'); -$focus = new Lead(); +$focus = new Leads(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.2/modules/Leads/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/DetailView.php Mon Oct 16 01:02:11 2006 @@ -14,7 +14,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/database/PearDatabase.php'); require_once('include/CustomFieldUtil.php'); require_once('include/utils/utils.php'); @@ -25,7 +25,7 @@ global $app_strings; global $currentModule, $singlepane_view; global $log; -$focus = new Lead(); +$focus = new Leads(); if(isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.2/modules/Leads/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -24,7 +24,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $leadObj = new Lead(); + $leadObj = new Leads(); $leadObj->retrieve_entity_info($crmid,"Leads"); $leadObj->column_fields[$fieldname] = $fieldvalue; $leadObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/Leads/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/EditView.php Mon Oct 16 01:02:11 2006 @@ -14,7 +14,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/database/PearDatabase.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); @@ -23,7 +23,7 @@ global $mod_strings,$app_strings,$theme,$currentModule; -$focus = new Lead(); +$focus = new Leads(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.2/modules/Leads/Lead.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/Lead.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/Lead.php Mon Oct 16 01:02:11 2006 @@ -19,9 +19,9 @@ require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Campaigns/Campaign.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -84,9 +84,9 @@ var $default_order_by = 'lastname'; var $default_sort_order = 'ASC'; - function Lead() { + function Leads() { $this->log = LoggerManager::getLogger('lead'); - $this->log->debug("Entering Lead() method ..."); + $this->log->debug("Entering Leads() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Leads'); $this->log->debug("Exiting Lead method ..."); @@ -230,7 +230,7 @@ global $log, $singlepane_view; $log->debug("Entering get_campaigns(".$id.") method ..."); global $mod_strings; - $focus = new Campaign(); + $focus = new Campaigns(); $button = ''; if($singlepane_view == 'true') @@ -258,7 +258,7 @@ global $mod_strings; require_once('include/RelatedListView.php'); - $focus = new Email(); + $focus = new Emails(); $button = ''; @@ -358,11 +358,11 @@ { global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Product.php'); + require_once('modules/Products/Products.php'); global $mod_strings; global $app_strings; - $focus = new Product(); + $focus = new Products(); $button = ''; Modified: vtigercrm/branches/5.0.2/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/LeadConvertToEntities.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); //Getting the Parameters from the ConvertLead Form $id = $_REQUEST["record"]; @@ -39,7 +39,7 @@ $potential_name = $check_unit[0]; //Retrieve info from all the vtiger_tables related to leads -$focus = new Lead(); +$focus = new Leads(); $focus->retrieve_entity_info($id,"Leads"); //get all the lead related columns Modified: vtigercrm/branches/5.0.2/modules/Leads/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/ListView.php Mon Oct 16 01:02:11 2006 @@ -19,7 +19,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -49,7 +49,7 @@ $url_string = ''; // assigning http url string -$focus = new Lead(); +$focus = new Leads(); $smarty = new vtigerCRM_Smarty; $other_text=Array(); Modified: vtigercrm/branches/5.0.2/modules/Leads/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/Save.php Mon Oct 16 01:02:11 2006 @@ -13,14 +13,14 @@ * Contributor(s): ______________________________________. ********************************************************************************/ -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/UserInfoUtil.php'); $local_log =& LoggerManager::getLogger('index'); global $log,$adb; -$focus = new Lead(); +$focus = new Leads(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.2/modules/Leads/result.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/result.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/result.php Mon Oct 16 01:02:11 2006 @@ -12,7 +12,7 @@ require_once('include/utils/utils.php'); require_once 'Excel/reader.php'; -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/database/PearDatabase.php'); $data = new Spreadsheet_Excel_Reader(); Modified: vtigercrm/branches/5.0.2/modules/Notes/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Notes/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Notes/Delete.php Mon Oct 16 01:02:11 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('note_delete'); -$focus = new Note(); +$focus = new Notes(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the note."); Modified: vtigercrm/branches/5.0.2/modules/Notes/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Notes/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Notes/DetailView.php Mon Oct 16 01:02:11 2006 @@ -22,14 +22,14 @@ require_once('data/Tracker.php'); require_once('Smarty_setup.php'); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/upload_file.php'); require_once('include/utils/utils.php'); global $app_strings; global $mod_strings; global $currentModule; -$focus = new Note(); +$focus = new Notes(); if(isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Notes"); Modified: vtigercrm/branches/5.0.2/modules/Notes/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Notes/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Notes/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Note(); + $modObj = new Notes(); $modObj->retrieve_entity_info($crmid,"Notes"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/Notes/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Notes/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Notes/EditView.php Mon Oct 16 01:02:11 2006 @@ -22,12 +22,12 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/utils/utils.php'); global $app_strings,$app_list_strings,$mod_strings,$theme,$currentModule; -$focus = new Note(); +$focus = new Notes(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['upload_error'] == true) Modified: vtigercrm/branches/5.0.2/modules/Notes/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Notes/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Notes/ListView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -66,7 +66,7 @@ $url_string = ''; // assigning http url string -$focus = new Note(); +$focus = new Notes(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.2/modules/Notes/Note.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Notes/Note.php (original) +++ vtigercrm/branches/5.0.2/modules/Notes/Note.php Mon Oct 16 01:02:11 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Notes/Note.php,v 1.15 2005/03/15 10:01:08 shaw Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Notes/Notes.php,v 1.15 2005/03/15 10:01:08 shaw Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -70,9 +70,9 @@ var $default_order_by = 'modifiedtime'; var $default_sort_order = 'ASC'; - function Note() { + function Notes() { $this->log = LoggerManager::getLogger('notes'); - $this->log->debug("Entering Note() method ..."); + $this->log->debug("Entering Notes() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Notes'); $this->log->debug("Exiting Note method ..."); Modified: vtigercrm/branches/5.0.2/modules/Notes/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Notes/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Notes/Save.php Mon Oct 16 01:02:11 2006 @@ -21,13 +21,13 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/logging.php'); require_once('include/upload_file.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Note(); +$focus = new Notes(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.2/modules/Potentials/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ } else { -$focus = new Potential(); +$focus = new Potentials(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.2/modules/Potentials/Charts.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/Charts.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/Charts.php Mon Oct 16 01:02:11 2006 @@ -19,7 +19,7 @@ require_once('config.php'); require_once('include/logging.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('Image/Graph.php'); require_once('include/utils/utils.php'); require_once('include/utils/GraphUtils.php'); @@ -102,7 +102,7 @@ //Now do the db queries //query for opportunity data that matches $datay and $user - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -441,7 +441,7 @@ //Now do the db queries //query for opportunity data that matches $datay and $user - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -779,7 +779,7 @@ //Now do the db queries //query for opportunity data that matches $datax and $user - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -1057,7 +1057,7 @@ $where .= ")"; } - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by lead source data Modified: vtigercrm/branches/5.0.2/modules/Potentials/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/Delete.php Mon Oct 16 01:02:11 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Potential(); +$focus = new Potentials(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the opportunity."); Modified: vtigercrm/branches/5.0.2/modules/Potentials/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/DetailView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/CustomFieldUtil.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -31,7 +31,7 @@ global $app_strings; global $currentModule, $singlepane_view; -$focus = new Potential(); +$focus = new Potentials(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.2/modules/Potentials/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Potential(); + $modObj = new Potentials(); $modObj->retrieve_entity_info($crmid,"Potentials"); $modObj->column_fields[$fieldname] = $fieldvalue; $_REQUEST[$fieldname] = $fieldvalue; Modified: vtigercrm/branches/5.0.2/modules/Potentials/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/EditView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -30,7 +30,7 @@ global $app_strings; global $mod_strings; global $currentModule; -$focus = new Potential(); +$focus = new Potentials(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/branches/5.0.2/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/ListView.php Mon Oct 16 01:02:11 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -38,7 +38,7 @@ $url_string = ''; // assigning http url string -$focus = new Potential(); +$focus = new Potentials(); $smarty = new vtigerCRM_Smarty(); $other_text = Array(); Modified: vtigercrm/branches/5.0.2/modules/Potentials/ListViewTop.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/ListViewTop.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/ListViewTop.php Mon Oct 16 01:02:11 2006 @@ -28,7 +28,7 @@ $log = LoggerManager::getLogger('top opportunity_list'); $log->debug("Entering getTopPotentials() method ..."); require_once("data/Tracker.php"); - require_once('modules/Potentials/Opportunity.php'); + require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); Modified: vtigercrm/branches/5.0.2/modules/Potentials/Opportunity.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/Opportunity.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/Opportunity.php Mon Oct 16 01:02:11 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Potentials/Opportunity.php,v 1.65 2005/04/28 08:08:27 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Potentials/Potentials.php,v 1.65 2005/04/28 08:08:27 rank Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -25,10 +25,10 @@ require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -96,7 +96,7 @@ var $default_order_by = 'potentialname'; var $default_sort_order = 'ASC'; - function Potential() { + function Potentials() { $this->log = LoggerManager::getLogger('potential'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Potentials'); @@ -233,7 +233,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; @@ -294,10 +294,10 @@ { global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Product.php'); + require_once('modules/Products/Products.php'); global $app_strings; - $focus = new Product(); + $focus = new Products(); $button = ''; @@ -446,10 +446,10 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quote.php'); + require_once('modules/Quotes/Quotes.php'); if($this->column_fields['account_id']!='') - $focus = new Quote(); + $focus = new Quotes(); $button = ''; if(isPermitted("Quotes",1,"") == 'yes') Modified: vtigercrm/branches/5.0.2/modules/Potentials/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/Save.php Mon Oct 16 01:02:11 2006 @@ -20,13 +20,13 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Potential(); +$focus = new Potentials(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PriceBooks/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/PriceBooks/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -22,7 +22,7 @@ { global $currentModule; -$focus = new PriceBook(); +$focus = new PriceBooks(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PriceBooks/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/PriceBooks/Delete.php Mon Oct 16 01:02:11 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new PriceBook(); +$focus = new PriceBooks(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PriceBooks/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/PriceBooks/DetailView.php Mon Oct 16 01:02:11 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new PriceBook(); +$focus = new PriceBooks(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PriceBooks/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/PriceBooks/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new PriceBook(); + $modObj = new PriceBooks(); $modObj->retrieve_entity_info($crmid,"PriceBooks"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PriceBooks/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/PriceBooks/EditView.php Mon Oct 16 01:02:11 2006 @@ -11,12 +11,12 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$theme,$currentModule; -$focus = new PriceBook(); +$focus = new PriceBooks(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PriceBooks/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/PriceBooks/ListView.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/ListView/ListView.php'); require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); @@ -33,7 +33,7 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$focus = new PriceBook(); +$focus = new PriceBooks(); $other_text=Array(); if(!$_SESSION['lvs'][$currentModule]) Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/PriceBook.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PriceBooks/PriceBook.php (original) +++ vtigercrm/branches/5.0.2/modules/PriceBooks/PriceBook.php Mon Oct 16 01:02:11 2006 @@ -51,9 +51,9 @@ /** Constructor which will set the column_fields in this object */ - function PriceBook() { + function PriceBooks() { $this->log =LoggerManager::getLogger('pricebook'); - $this->log->debug("Entering PriceBook() method ..."); + $this->log->debug("Entering PriceBooks() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('PriceBooks'); $this->log->debug("Exiting PriceBook method ..."); @@ -98,8 +98,8 @@ global $log,$singlepane_view; $log->debug("Entering get_pricebook_products(".$id.") method ..."); global $app_strings; - require_once('modules/Products/Product.php'); - $focus = new Product(); + require_once('modules/Products/Products.php'); + $focus = new Products(); $button = ''; Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PriceBooks/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/PriceBooks/Save.php Mon Oct 16 01:02:11 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new PriceBook(); +$focus = new PriceBooks(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.2/modules/Products/AddProductToPriceBooks.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/AddProductToPriceBooks.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/AddProductToPriceBooks.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/utils/utils.php'); require_once('include/ComboUtil.php'); @@ -30,7 +30,7 @@ $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$focus = new PriceBook(); +$focus = new PriceBooks(); //Retreive the list of PriceBooks $list_query = getListQuery("PriceBooks"); Modified: vtigercrm/branches/5.0.2/modules/Products/AddProductsToPriceBook.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/AddProductsToPriceBook.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/AddProductsToPriceBook.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/utils.php'); require_once('include/utils/utils.php'); require_once('include/ComboUtil.php'); @@ -29,7 +29,7 @@ $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$focus = new Product(); +$focus = new Products(); if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; Modified: vtigercrm/branches/5.0.2/modules/Products/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -21,7 +21,7 @@ } else { -$focus = new Product(); +$focus = new Products(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) Modified: vtigercrm/branches/5.0.2/modules/Products/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/Delete.php Mon Oct 16 01:02:11 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new Product(); +$focus = new Products(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.2/modules/Products/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/DetailView.php Mon Oct 16 01:02:11 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new Product(); +$focus = new Products(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { //Display the error message Modified: vtigercrm/branches/5.0.2/modules/Products/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/database/PearDatabase.php'); global $adb,$current_user; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Product(); + $modObj = new Products(); $modObj->retrieve_entity_info($crmid,"Products"); $modObj->column_fields[$fieldname] = $fieldvalue; if($fieldname == 'unit_price')//unit price converted to dollar value while saving Modified: vtigercrm/branches/5.0.2/modules/Products/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/EditView.php Mon Oct 16 01:02:11 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/FormValidationUtil.php'); global $app_strings; @@ -28,7 +28,7 @@ -$focus = new Product(); +$focus = new Products(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['record']!="") Modified: vtigercrm/branches/5.0.2/modules/Products/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/ListView.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/ListView/ListView.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -56,7 +56,7 @@ } $url_string = '&smodule=PRODUCTS'; // assigning http url string -$focus = new Product(); +$focus = new Products(); //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> $sorder = $focus->getSortOrder(); Modified: vtigercrm/branches/5.0.2/modules/Products/Product.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/Product.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/Product.php Mon Oct 16 01:02:11 2006 @@ -72,9 +72,9 @@ /** Constructor which will set the column_fields in this object */ - function Product() { + function Products() { $this->log =LoggerManager::getLogger('product'); - $this->log->debug("Entering Product() method ..."); + $this->log->debug("Entering Products() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Products'); $this->log->debug("Exiting Product method ..."); @@ -301,8 +301,8 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quote.php'); - $focus = new Quote(); + require_once('modules/Quotes/Quotes.php'); + $focus = new Quotes(); $button = ''; if($singlepane_view == 'true') @@ -345,7 +345,7 @@ $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new Order(); + $focus = new PurchaseOrder(); $button = ''; @@ -466,8 +466,8 @@ global $log,$singlepane_view; $log->debug("Entering get_product_pricebooks(".$id.") method ..."); global $mod_strings; - require_once('modules/PriceBooks/PriceBook.php'); - $focus = new PriceBook(); + require_once('modules/PriceBooks/PriceBooks.php'); + $focus = new PriceBooks(); $button = ''; if($singlepane_view == 'true') $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; Modified: vtigercrm/branches/5.0.2/modules/Products/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/Save.php Mon Oct 16 01:02:11 2006 @@ -21,14 +21,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); global $log,$current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); $rate = $rate_symbol['rate']; -$focus = new Product(); +$focus = new Products(); if(isset($_REQUEST['record'])) { $focus->id = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -21,7 +21,7 @@ } else { -$focus = new Order(); +$focus = new PurchaseOrder(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/CreatePDF.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/CreatePDF.php Mon Oct 16 01:02:11 2006 @@ -26,7 +26,7 @@ $id = $_REQUEST['record']; //retreiving the vtiger_invoice info -$focus = new Order(); +$focus = new PurchaseOrder(); $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); $vendor_name = getVendorName($focus->column_fields[vendor_id]); Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/Delete.php Mon Oct 16 01:02:11 2006 @@ -24,7 +24,7 @@ require_once('include/logging.php'); $log = LoggerManager::getLogger('order_delete'); -$focus = new Order(); +$focus = new PurchaseOrder(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailView.php Mon Oct 16 01:02:11 2006 @@ -29,7 +29,7 @@ require_once('user_privileges/default_module_view.php'); global $mod_strings,$app_strings,$theme,$currentModule,$singlepane_view; -$focus = new Order(); +$focus = new PurchaseOrder(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Order(); + $modObj = new PurchaseOrder(); $modObj->retrieve_entity_info($crmid,"PurchaseOrder"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/EditView.php Mon Oct 16 01:02:11 2006 @@ -31,7 +31,7 @@ global $app_strings,$mod_strings,$log,$theme,$currentModule; -$focus = new Order(); +$focus = new PurchaseOrder(); $smarty = new vtigerCRM_Smarty(); global $current_user; $currencyid=fetchCurrency($current_user->id); @@ -60,8 +60,8 @@ // Get vtiger_vendor address if vtiger_vendorid is given if(isset($_REQUEST['vendor_id']) && $_REQUEST['vendor_id']!='' && $_REQUEST['record']==''){ - require_once('modules/Vendors/Vendor.php'); - $vend_focus = new Vendor(); + require_once('modules/Vendors/Vendors.php'); + $vend_focus = new Vendors(); $vend_focus->retrieve_entity_info($_REQUEST['vendor_id'],"Vendors"); $focus->column_fields['bill_city']=$vend_focus->column_fields['city']; Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListTopPurchaseOrder.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListTopPurchaseOrder.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListTopPurchaseOrder.php Mon Oct 16 01:02:11 2006 @@ -47,7 +47,7 @@ $viewid = "0"; } } - $focus = new Order(); + $focus = new PurchaseOrder(); $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListView.php Mon Oct 16 01:02:11 2006 @@ -35,7 +35,7 @@ $url_string = '&smodule=PO'; -$focus = new Order(); +$focus = new PurchaseOrder(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/PurchaseOrder.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/PurchaseOrder.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/PurchaseOrder.php Mon Oct 16 01:02:11 2006 @@ -30,7 +30,7 @@ require_once('user_privileges/default_module_view.php'); // Account is used to store vtiger_account information. -class Order extends CRMEntity { +class PurchaseOrder extends CRMEntity { var $log; var $db; @@ -94,7 +94,7 @@ * 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. */ - function Order() { + function PurchaseOrder() { $this->log =LoggerManager::getLogger('PurchaseOrder'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('PurchaseOrder'); Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/Save.php Mon Oct 16 01:02:11 2006 @@ -27,7 +27,7 @@ $local_log =& LoggerManager::getLogger('index'); -$focus = new Order(); +$focus = new PurchaseOrder(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.2/modules/Quotes/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ } else { -$focus = new Quote(); +$focus = new Quotes(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.2/modules/Quotes/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/CreatePDF.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/CreatePDF.php Mon Oct 16 01:02:11 2006 @@ -11,7 +11,7 @@ require_once('include/fpdf/pdf.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/database/PearDatabase.php'); global $adb,$app_strings; @@ -25,7 +25,7 @@ global $products_per_page; $products_per_page="6"; -$focus = new Quote(); +$focus = new Quotes(); $focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); $account_name = getAccountName($focus->column_fields[account_id]); Modified: vtigercrm/branches/5.0.2/modules/Quotes/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/Delete.php Mon Oct 16 01:02:11 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('quote_delete'); -$focus = new Quote(); +$focus = new Quotes(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.2/modules/Quotes/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/DetailView.php Mon Oct 16 01:02:11 2006 @@ -22,13 +22,13 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); global $mod_strings,$app_strings,$currentModule,$theme,$singlepane_view; -$focus = new Quote(); +$focus = new Quotes(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); Modified: vtigercrm/branches/5.0.2/modules/Quotes/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Quote(); + $modObj = new Quotes(); $modObj->retrieve_entity_info($crmid,"Quotes"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/Quotes/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/EditView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ $log->debug("Inside Quote EditView"); -$focus = new Quote(); +$focus = new Quotes(); $smarty = new vtigerCRM_Smarty; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); @@ -70,8 +70,8 @@ // Get Account address if vtiger_account is given if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']==''){ - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/branches/5.0.2/modules/Quotes/ListTopQuotes.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/ListTopQuotes.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/ListTopQuotes.php Mon Oct 16 01:02:11 2006 @@ -19,7 +19,7 @@ function getTopQuotes() { require_once("data/Tracker.php"); - require_once('modules/Quotes/Quote.php'); + require_once('modules/Quotes/Quotes.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); require_once('include/database/PearDatabase.php'); @@ -51,7 +51,7 @@ $viewid = "0"; } } - $focus = new Quote(); + $focus = new Quotes(); $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; Modified: vtigercrm/branches/5.0.2/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/ListView.php Mon Oct 16 01:02:11 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -33,7 +33,7 @@ $url_string = ''; -$focus = new Quote(); +$focus = new Quotes(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.2/modules/Quotes/Quote.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/Quote.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/Quote.php Mon Oct 16 01:02:11 2006 @@ -101,7 +101,7 @@ /** Constructor which will set the column_fields in this object */ - function Quote() { + function Quotes() { $this->log =LoggerManager::getLogger('quote'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Quotes'); Modified: vtigercrm/branches/5.0.2/modules/Quotes/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/Save.php Mon Oct 16 01:02:11 2006 @@ -21,7 +21,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); include("modules/Emails/mail.php"); @@ -34,7 +34,7 @@ $rate = $rate_symbol['rate']; $log->debug("Inside Quote Save"); -$focus = new Quote(); +$focus = new Quotes(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.2/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/SalesOrder/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/SalesOrder/EditView.php Mon Oct 16 01:02:11 2006 @@ -23,7 +23,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/SalesOrder/SalesOrder.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -44,7 +44,7 @@ if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoso') { $quoteid = $_REQUEST['record']; - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -80,7 +80,7 @@ $quoteid = $focus->column_fields['quote_id']; $smarty->assign("QUOTE_ID", $focus->column_fields['quote_id']); - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -118,7 +118,7 @@ $focus->column_fields['duedate'] = getDBInsertDateValue($curr_due_date); } $quoteid = $focus->column_fields['quote_id']; - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -161,8 +161,8 @@ // Get Account address if vtiger_account is given if(isset($_REQUEST['account_id']) && $_REQUEST['record']=='' && $_REQUEST['account_id'] != ''){ - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/branches/5.0.2/modules/Users/Authenticate.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/Authenticate.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/Authenticate.php Mon Oct 16 01:02:11 2006 @@ -20,14 +20,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('modules/Users/CreateUserPrivilegeFile.php'); require_once('include/logging.php'); require_once('user_privileges/audit_trail.php'); global $mod_strings; -$focus = new User(); +$focus = new Users(); // Add in defensive code here. $focus->column_fields["user_name"] = to_html($_REQUEST['user_name']); Modified: vtigercrm/branches/5.0.2/modules/Users/ChangePassword.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/ChangePassword.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/ChangePassword.php Mon Oct 16 01:02:11 2006 @@ -23,7 +23,7 @@ // The popup_picker.html file is used for generating a list from which to find and choose one instance. global $theme; -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); Modified: vtigercrm/branches/5.0.2/modules/Users/CreateUserPrivilegeFile.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/CreateUserPrivilegeFile.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/CreateUserPrivilegeFile.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('config.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/utils/utils.php'); require_once('include/utils/GetUserGroups.php'); @@ -32,7 +32,7 @@ $newbuf .="retrieve_entity_info($userid,"Users"); $userInfo=Array(); $user_focus->column_fields["id"] = ''; @@ -120,7 +120,7 @@ $newbuf .="retrieve_entity_info($userid,"Users"); if($user_focus->is_admin == 'on') { Modified: vtigercrm/branches/5.0.2/modules/Users/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/DetailView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/utils/utils.php'); require_once('include/utils/CommonUtils.php'); require_once('include/utils/UserInfoUtil.php'); @@ -37,7 +37,7 @@ global $app_strings; global $mod_strings; -$focus = new User(); +$focus = new Users(); if(!empty($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],'Users'); Modified: vtigercrm/branches/5.0.2/modules/Users/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -24,7 +24,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $userObj = new User(); + $userObj = new Users(); $userObj->retrieve_entity_info($crmid,"Users"); $userObj->column_fields[$fieldname] = $fieldvalue; $userObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/Users/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/EditView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/utils/UserInfoUtil.php'); require_once('modules/Users/Forms.php'); require_once('include/database/PearDatabase.php'); @@ -36,7 +36,7 @@ $smarty=new vtigerCRM_Smarty; -$focus = new User(); +$focus = new Users(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $smarty->assign("ID",$_REQUEST['record']); Modified: vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php Mon Oct 16 01:02:11 2006 @@ -12,7 +12,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/branches/5.0.2/modules/Users/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/ListView.php Mon Oct 16 01:02:11 2006 @@ -24,7 +24,7 @@ global $current_language; $mod_strings = return_module_language($current_language,'Users'); $category = getParentTab(); -$focus = new User(); +$focus = new Users(); $smarty = new vtigerCRM_Smarty; $no_of_users=UserCount(); //Retreiving the start value from request Modified: vtigercrm/branches/5.0.2/modules/Users/Logout.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/Logout.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/Logout.php Mon Oct 16 01:02:11 2006 @@ -20,7 +20,7 @@ require_once('include/logging.php'); require_once('database/DatabaseConnection.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('config.php'); require_once('include/db_backup/backup.php'); require_once('include/db_backup/ftp.php'); Modified: vtigercrm/branches/5.0.2/modules/Users/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/Save.php Mon Oct 16 01:02:11 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/logging.php'); require_once('include/utils/UserInfoUtil.php'); $log =& LoggerManager::getLogger('index'); @@ -46,7 +46,7 @@ if (isset($_POST['record']) && !is_admin($current_user) && $_POST['record'] != $current_user->id) echo ("Unauthorized access to user administration."); elseif (!isset($_POST['record']) && !is_admin($current_user)) echo ("Unauthorized access to user administration."); -$focus = new User(); +$focus = new Users(); if(isset($_REQUEST["record"]) && $_REQUEST["record"] != '') { $focus->mode='edit'; Modified: vtigercrm/branches/5.0.2/modules/Users/ShowAuditTrail.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/ShowAuditTrail.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/ShowAuditTrail.php Mon Oct 16 01:02:11 2006 @@ -12,7 +12,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/AuditTrail.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/branches/5.0.2/modules/Users/ShowHistory.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/ShowHistory.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/ShowHistory.php Mon Oct 16 01:02:11 2006 @@ -12,11 +12,11 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -#require_once('modules/Users/User.php'); +#require_once('modules/Users/Users.php'); require_once('include/utils/utils.php'); global $app_strings; Modified: vtigercrm/branches/5.0.2/modules/Users/User.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/User.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/User.php Mon Oct 16 01:02:11 2006 @@ -21,7 +21,7 @@ ********************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/User.php,v 1.10 2005/04/19 14:40:48 ray Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/Users.php,v 1.10 2005/04/19 14:40:48 ray Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -33,7 +33,7 @@ require_once('data/CRMEntity.php'); require_once('include/utils/UserInfoUtil.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('data/Tracker.php'); // User is used to store customer information. @@ -155,11 +155,11 @@ * */ - function User() { + function Users() { $this->log = LoggerManager::getLogger('user'); - $this->log->debug("Entering User() method ..."); + $this->log->debug("Entering Users() method ..."); $this->db = new PearDatabase(); - $this->log->debug("Exiting User() method ..."); + $this->log->debug("Exiting Users() method ..."); } Modified: vtigercrm/branches/5.0.2/modules/Users/massChangeStatus.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/massChangeStatus.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/massChangeStatus.php Mon Oct 16 01:02:11 2006 @@ -15,12 +15,12 @@ require_once('include/ComboUtil.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); global $app_list_strings; global $app_strings; global $current_user; -$focus = new Lead(); +$focus = new Leads(); $idlist = $_POST['idlist']; //echo $idlist; Modified: vtigercrm/branches/5.0.2/modules/Users/populatetemplate.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/populatetemplate.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/populatetemplate.php Mon Oct 16 01:02:11 2006 @@ -10,9 +10,9 @@ ********************************************************************************/ //query the specific vtiger_table and then get the data and write the data here require_once('include/database/PearDatabase.php'); -include_once('modules/Contacts/Contact.php'); -include_once('modules/Leads/Lead.php'); -include_once('modules/Users/User.php'); +include_once('modules/Contacts/Contacts.php'); +include_once('modules/Leads/Leads.php'); +include_once('modules/Users/Users.php'); global $log; //download the template file and store it in some specific location @@ -60,11 +60,11 @@ //get the module if($module == 'leads') { - $focus = new Lead(); + $focus = new Leads(); } else { - $focus = new Contact(); + $focus = new Contacts(); } $focus->retrieve_entity_info($recordid,$module); Modified: vtigercrm/branches/5.0.2/modules/Vendors/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Vendors/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Vendors/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ else { global $currentModule; -$focus = new Vendor(); +$focus = new Vendors(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.2/modules/Vendors/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Vendors/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Vendors/Delete.php Mon Oct 16 01:02:11 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new Vendor(); +$focus = new Vendors(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.2/modules/Vendors/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Vendors/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Vendors/DetailView.php Mon Oct 16 01:02:11 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new Vendor(); +$focus = new Vendors(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.2/modules/Vendors/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Vendors/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Vendors/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Vendor(); + $modObj = new Vendors(); $modObj->retrieve_entity_info($crmid,"Vendors"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/Vendors/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Vendors/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Vendors/EditView.php Mon Oct 16 01:02:11 2006 @@ -11,12 +11,12 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$theme,$currentModule; -$focus = new Vendor(); +$focus = new Vendors(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/branches/5.0.2/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Vendors/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Vendors/ListView.php Mon Oct 16 01:02:11 2006 @@ -11,7 +11,7 @@ require_once('include/database/PearDatabase.php'); require_once('include/database/Postgres8.php'); require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/ListView/ListView.php'); require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); @@ -32,7 +32,7 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$focus = new Vendor(); +$focus = new Vendors(); $other_text = Array(); if(!$_SESSION['lvs'][$currentModule]) Modified: vtigercrm/branches/5.0.2/modules/Vendors/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Vendors/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Vendors/Save.php Mon Oct 16 01:02:11 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new Vendor(); +$focus = new Vendors(); setObjectValuesFromRequest(&$focus); $focus->save("Vendors"); Modified: vtigercrm/branches/5.0.2/modules/Vendors/Vendor.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Vendors/Vendor.php (original) +++ vtigercrm/branches/5.0.2/modules/Vendors/Vendor.php Mon Oct 16 01:02:11 2006 @@ -58,9 +58,9 @@ /** Constructor which will set the column_fields in this object */ - function Vendor() { + function Vendors() { $this->log =LoggerManager::getLogger('vendor'); - $this->log->debug("Entering Vendor() method ..."); + $this->log->debug("Entering Vendors() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Vendors'); $this->log->debug("Exiting Vendor method ..."); @@ -75,8 +75,8 @@ global $log,$singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); global $app_strings; - require_once('modules/Products/Product.php'); - $focus = new Product(); + require_once('modules/Products/Products.php'); + $focus = new Products(); $button = ''; @@ -100,7 +100,7 @@ $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new Order(); + $focus = new PurchaseOrder(); $button = ''; @@ -123,8 +123,8 @@ global $log,$singlepane_view; $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - require_once('modules/Contacts/Contact.php'); - $focus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $focus = new Contacts(); $button = ''; if($singlepane_view == 'true') Modified: vtigercrm/branches/5.0.2/modules/Webmails/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Webmails/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Webmails/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -11,7 +11,7 @@ global $current_user; require_once('Smarty_setup.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once('data/Tracker.php'); Modified: vtigercrm/branches/5.0.2/modules/Webmails/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Webmails/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Webmails/Save.php Mon Oct 16 01:02:11 2006 @@ -9,7 +9,7 @@ * ********************************************************************************/ -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('modules/Webmails/Webmail.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); @@ -20,7 +20,7 @@ global $current_user; $local_log =& LoggerManager::getLogger('index'); -$focus = new Email(); +$focus = new Emails(); $to_address = explode(";",$_REQUEST['to_list']); $cc_address = explode(";",$_REQUEST['cc_list']); @@ -61,8 +61,8 @@ 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/Contact.php'); - $contact_focus = new 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"); Modified: vtigercrm/branches/5.0.2/soap/firefoxtoolbar.php ============================================================================== --- vtigercrm/branches/5.0.2/soap/firefoxtoolbar.php (original) +++ vtigercrm/branches/5.0.2/soap/firefoxtoolbar.php Mon Oct 16 01:02:11 2006 @@ -175,8 +175,8 @@ function CheckLeadPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -193,8 +193,8 @@ function CheckContactPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -211,8 +211,8 @@ function CheckAccountPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -229,8 +229,8 @@ function CheckTicketPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -247,8 +247,8 @@ function CheckVendorPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -265,8 +265,8 @@ function CheckProductPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -283,8 +283,8 @@ function CheckNotePermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -301,8 +301,8 @@ function CheckSitePermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -319,8 +319,8 @@ function CheckRssPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -340,8 +340,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -365,11 +365,11 @@ function LogintoVtigerCRM($user_name,$password) { global $log; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); $return_access = "FALSE"; - $objuser = new User(); + $objuser = new Users(); if($password != "") { @@ -397,8 +397,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -436,15 +436,15 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Note.php"); - - $focus = new Note(); + require_once("modules/Notes/Notes.php"); + + $focus = new Notes(); if(isPermitted("Notes","EditView") == "yes") { $focus->column_fields['notes_title'] = $subject; @@ -473,17 +473,17 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Product.php"); + require_once("modules/Products/Products.php"); if(isPermitted("Products","EditView") == "yes") { - $focus = new Product(); + $focus = new Products(); $focus->column_fields['productname'] = $productname; $focus->column_fields['productcode'] = $code; $focus->column_fields['website'] = $website; @@ -508,16 +508,16 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Vendor.php"); + require_once("modules/Vendors/Vendors.php"); if(isPermitted("Vendors","EditView" ) == "yes") { - $focus = new Vendor(); + $focus = new Vendors(); $focus->column_fields['vendorname'] = $vendorname; $focus->column_fields['email'] = $email; $focus->column_fields['phone'] = $phone; @@ -547,8 +547,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -591,15 +591,15 @@ 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/User.php"); - $seed_user=new 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/Account.php"); + require_once("modules/Accounts/Accounts.php"); if(isPermitted("Accounts","EditView") == "yes") { - $account=new Account(); + $account=new Accounts(); $account->column_fields['accountname']=$accountname; $account->column_fields['email1']=$email; $account->column_fields['phone']=$phone; @@ -642,15 +642,15 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Lead.php"); - - $focus = new Lead(); + require_once("modules/Leads/Leads.php"); + + $focus = new Leads(); if(isPermitted("Leads","EditView") == "yes") { $focus->column_fields['lastname'] = $lastname; @@ -689,16 +689,16 @@ { global $adb,$log; global $current_user; - require_once('modules/Users/User.php'); - $seed_user = new 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/Contact.php'); + require_once('modules/Contacts/Contacts.php'); if(isPermitted("Contacts","EditView") == "yes") { - $contact = new Contact(); + $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 Modified: vtigercrm/branches/5.0.2/soap/thunderbirdplugin.php ============================================================================== --- vtigercrm/branches/5.0.2/soap/thunderbirdplugin.php (original) +++ vtigercrm/branches/5.0.2/soap/thunderbirdplugin.php Mon Oct 16 01:02:11 2006 @@ -13,7 +13,7 @@ require_once('include/logging.php'); require_once('include/nusoap/nusoap.php'); require_once('include/database/PearDatabase.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); $log = &LoggerManager::getLogger('thunderbirdplugin'); @@ -173,9 +173,9 @@ function SearchContactsByEmail($username,$emailaddress) { - require_once('modules/Contacts/Contact.php'); - - $seed_contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); $output_list = Array(); $response = $seed_contact->get_searchbyemailid($username,$emailaddress); @@ -201,13 +201,13 @@ function track_email($user_name, $contact_ids, $date_sent, $email_subject, $email_body) { global $adb; - require_once('modules/Users/User.php'); - require_once('modules/Emails/Email.php'); - - $seed_user = new User(); + 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 Email(); + $email = new Emails(); //$log->debug($msgdtls['contactid']); $emailbody = str_replace("'", "''", $email_body); $emailsubject = str_replace("'", "''",$email_subject); @@ -241,9 +241,9 @@ { global $adb; global $log; - require_once('modules/Contacts/Contact.php'); - - $seed_contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); $output_list = Array(); $query = $seed_contact->get_contactsforol($username); @@ -332,8 +332,8 @@ $rows_count = $db->getRowCount($result); if($rows_count==0) { - require_once('modules/Accounts/Account.php'); - $account = new Account(); + 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"); @@ -360,10 +360,10 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new 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"); @@ -384,7 +384,7 @@ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); } - $contact = new Contact(); + $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") : ""; @@ -418,10 +418,10 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Leads/Lead.php'); - - $seed_user = new 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"); @@ -442,7 +442,7 @@ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); } - $Lead = new Lead(); + $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") : ""; @@ -478,8 +478,8 @@ { global $adb,$log; $return_access = 'failure'; - require_once('modules/Users/User.php'); - $objuser = new User(); + require_once('modules/Users/Users.php'); + $objuser = new Users(); if($password != "" && $user_name != '') { $objuser->column_fields['user_name'] = $user_name; @@ -511,8 +511,8 @@ function CheckContactPerm($user_name) { global $current_user; - require_once('modules/Users/User.php'); - $seed_user = new 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"); @@ -528,8 +528,8 @@ function CheckContactViewPerm($user_name) { global $current_user,$log; - require_once('modules/Users/User.php'); - $seed_user = new 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"); Modified: vtigercrm/branches/5.0.2/soap/vtigerolservice.php ============================================================================== --- vtigercrm/branches/5.0.2/soap/vtigerolservice.php (original) +++ vtigercrm/branches/5.0.2/soap/vtigerolservice.php Mon Oct 16 01:02:11 2006 @@ -280,9 +280,9 @@ function SearchContactsByEmail($username,$emailaddress) { - require_once('modules/Contacts/Contact.php'); + require_once('modules/Contacts/Contacts.php'); - $seed_contact = new Contact(); + $seed_contact = new Contacts(); $output_list = Array(); $response = $seed_contact->get_searchbyemailid($username,$emailaddress); @@ -308,17 +308,17 @@ function AddMessageToContact($username,$contactid,$msgdtls) { global $adb; - require_once('modules/Users/User.php'); - require_once('modules/Emails/Email.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Emails/Emails.php'); + + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); foreach($msgdtls as $msgdtl) { if(isset($msgdtl)) { - $email = new Email(); + $email = new Emails(); //$log->debug($msgdtls['contactid']); $email_body = str_replace("'", "''", $msgdtl['body']); $email_subject = str_replace("'", "''",$msgdtl['subject']); @@ -356,11 +356,11 @@ function LoginToVtiger($userid,$password) { global $adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); $return_access = "FALSE"; - $objuser = new User(); + $objuser = new Users(); if($password != "") { @@ -385,8 +385,8 @@ function CheckEmailPermission($username) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -403,8 +403,8 @@ function CheckContactPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -421,8 +421,8 @@ function CheckActivityPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -439,12 +439,12 @@ function AddEmailAttachment($emailid,$filedata,$filename,$filesize,$filetype,$username) { global $adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('include/utils/utils.php'); $date_var = date('YmdHis'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $crmid = $adb->getUniqueID("vtiger_crmentity"); @@ -483,9 +483,9 @@ function GetContacts($username) { global $adb; - require_once('modules/Contacts/Contact.php'); - - $seed_contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); $output_list = Array(); $query = $seed_contact->get_contactsforol($username); @@ -564,15 +564,15 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.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"); - $contact = new Contact(); + $contact = new Contacts(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -646,15 +646,15 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.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"); - $contact = new Contact(); + $contact = new Contacts(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -727,15 +727,15 @@ function DeleteContacts($username,$crmid) { global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.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"); - $contact = new Contact(); + $contact = new Contacts(); $contact->id = $crmid; $contact->mark_deleted($contact->id); @@ -760,8 +760,8 @@ $rows_count = $db->getRowCount($result); if($rows_count==0) { - require_once('modules/Accounts/Account.php'); - $account = new Account(); + 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"); @@ -856,10 +856,10 @@ function AddTasks($username,$taskdtls) { global $current_user,$adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -937,10 +937,10 @@ function UpdateTasks($username,$taskdtls) { global $current_user,$adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1022,10 +1022,10 @@ function DeleteTasks($username,$crmid) { global $current_user; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1091,10 +1091,10 @@ function AddClndr($username,$clndrdtls) { global $current_user,$adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1159,10 +1159,10 @@ { global $current_user; global $adb,$log; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1228,10 +1228,10 @@ function DeleteClndr($username,$crmid) { global $current_user; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); Modified: vtigercrm/branches/5.0.2/soap/webforms.php ============================================================================== --- vtigercrm/branches/5.0.2/soap/webforms.php (original) +++ vtigercrm/branches/5.0.2/soap/webforms.php Mon Oct 16 01:02:11 2006 @@ -82,8 +82,8 @@ $assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id'); } - require_once("modules/Leads/Lead.php"); - $focus = new Lead(); + require_once("modules/Leads/Leads.php"); + $focus = new Leads(); $focus->column_fields['lastname'] = $lastname; $focus->column_fields['email'] = $email; $focus->column_fields['phone'] = $phone; @@ -126,8 +126,8 @@ $assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id'); } - require_once('modules/Contacts/Contact.php'); - $focus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $focus = new Contacts(); $focus->column_fields['firstname'] = $first_name; $focus->column_fields['lastname'] = $last_name; Modified: vtigercrm/branches/5.0.2/soap/wordplugin.php ============================================================================== --- vtigercrm/branches/5.0.2/soap/wordplugin.php (original) +++ vtigercrm/branches/5.0.2/soap/wordplugin.php Mon Oct 16 01:02:11 2006 @@ -215,8 +215,8 @@ function get_tickets_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -237,15 +237,15 @@ function get_contacts_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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","index") == "yes") { - require_once('modules/Contacts/Contact.php'); - $contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $contact = new Contacts(); $log->debug($contact->getColumnNames()); return $contact->getColumnNames(); } @@ -261,15 +261,15 @@ function get_accounts_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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("Accounts","index") == "yes") { - require_once('modules/Accounts/Account.php'); - $account = new Account(); + require_once('modules/Accounts/Accounts.php'); + $account = new Accounts(); $log->debug($account->getColumnNames_Acnt()); return $account->getColumnNames_Acnt(); } @@ -285,16 +285,16 @@ function get_leads_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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("Leads","index") == "yes") { - require_once('modules/Leads/Lead.php'); - $lead = new Lead(); + require_once('modules/Leads/Leads.php'); + $lead = new Leads(); $log->debug($lead->getColumnNames_Lead()); return $lead->getColumnNames_Lead(); } @@ -309,12 +309,12 @@ function get_user_columns($user_name, $password) { global $current_user; - require_once('modules/Users/User.php'); - $seed_user=new 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'); - $user = new User(); + $user = new Users(); return $user->getColumnNames_User(); } @@ -323,8 +323,8 @@ function create_session($user_name, $password) { global $adb,$log; - require_once('modules/Users/User.php'); - $objuser = new User(); + require_once('modules/Users/Users.php'); + $objuser = new Users(); if($password != "" && $user_name != '') { $objuser->column_fields['user_name'] = $user_name; From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 00:13:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 07:13:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9629 - in /vtigercrm/branches/5.0.2/modules: Accounts/ Campaigns/ Contacts/ Emails/ Leads/ Notes/ Potentials/ PriceBooks/ Products/ Quotes/ Users/ Vendors/ Message-ID: <20061016071346.ADBDA787FC0@vtiger.fosslabs.com> Author: richie Date: Mon Oct 16 01:13:28 2006 New Revision: 9629 Log: Files removed as filename,classname,modulename made unique Removed: vtigercrm/branches/5.0.2/modules/Accounts/Account.php vtigercrm/branches/5.0.2/modules/Campaigns/Campaign.php vtigercrm/branches/5.0.2/modules/Contacts/Contact.php vtigercrm/branches/5.0.2/modules/Emails/Email.php vtigercrm/branches/5.0.2/modules/Leads/Lead.php vtigercrm/branches/5.0.2/modules/Notes/Note.php vtigercrm/branches/5.0.2/modules/Potentials/Opportunity.php vtigercrm/branches/5.0.2/modules/PriceBooks/PriceBook.php vtigercrm/branches/5.0.2/modules/Products/Product.php vtigercrm/branches/5.0.2/modules/Quotes/Quote.php vtigercrm/branches/5.0.2/modules/Users/User.php vtigercrm/branches/5.0.2/modules/Vendors/Vendor.php From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 00:17:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 07:17:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9630 - in /vtigercrm/branches/5.0.2/modules: Accounts/ Campaigns/ Contacts/ Emails/ Leads/ Notes/ Potentials/ PriceBooks/ Products/ Quotes/ Users/ Vendors/ Message-ID: <20061016071749.380B1787FC0@vtiger.fosslabs.com> Author: richie Date: Mon Oct 16 01:17:23 2006 New Revision: 9630 Log: Filename changed as filename,modulename,classname made unique--Jeri Added: vtigercrm/branches/5.0.2/modules/Accounts/Accounts.php vtigercrm/branches/5.0.2/modules/Campaigns/Campaigns.php vtigercrm/branches/5.0.2/modules/Contacts/Contacts.php vtigercrm/branches/5.0.2/modules/Emails/Emails.php vtigercrm/branches/5.0.2/modules/Leads/Leads.php (with props) vtigercrm/branches/5.0.2/modules/Notes/Notes.php vtigercrm/branches/5.0.2/modules/Potentials/Potentials.php vtigercrm/branches/5.0.2/modules/PriceBooks/PriceBooks.php (with props) vtigercrm/branches/5.0.2/modules/Products/Products.php (with props) vtigercrm/branches/5.0.2/modules/Quotes/Quotes.php (with props) vtigercrm/branches/5.0.2/modules/Users/Users.php (with props) vtigercrm/branches/5.0.2/modules/Vendors/Vendors.php (with props) From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 00:52:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 07:52:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9631 - in /vtigercrm/branches/5.0.1: ./ include/utils/ install/ modules/Accounts/ modules/Calendar/ modules/Campaigns/ modules/Contacts/ modules/Emails/ modules/Home/ modules/Import/ modules/Invoice/ modules/Leads/ modules/Notes/ modules/Potentials/ modules/PriceBooks/ modules/Products/ modules/PurchaseOrder/ modules/Quotes/ modules/SalesOrder/ modules/Users/ modules/Vendors/ modules/Webmails/ soap/ Message-ID: <20061016075251.E85FE787E3D@vtiger.fosslabs.com> Author: richie Date: Mon Oct 16 01:50:32 2006 New Revision: 9631 Log: Changes reverted back to v9625 Modified: vtigercrm/branches/5.0.1/Popup.php vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php vtigercrm/branches/5.0.1/include/utils/ListViewUtils.php vtigercrm/branches/5.0.1/include/utils/export.php vtigercrm/branches/5.0.1/include/utils/utils.php vtigercrm/branches/5.0.1/index.php vtigercrm/branches/5.0.1/install/5createTables.inc.php vtigercrm/branches/5.0.1/install/populateSeedData.php vtigercrm/branches/5.0.1/modules/Accounts/Account.php vtigercrm/branches/5.0.1/modules/Accounts/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Accounts/Delete.php vtigercrm/branches/5.0.1/modules/Accounts/DetailView.php vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Accounts/EditView.php vtigercrm/branches/5.0.1/modules/Accounts/HeadLines.php vtigercrm/branches/5.0.1/modules/Accounts/ListView.php vtigercrm/branches/5.0.1/modules/Accounts/ListViewTop.php vtigercrm/branches/5.0.1/modules/Accounts/Save.php vtigercrm/branches/5.0.1/modules/Accounts/Tickerdetail.php vtigercrm/branches/5.0.1/modules/Calendar/Activity.php vtigercrm/branches/5.0.1/modules/Calendar/RenderRelatedListUI.php vtigercrm/branches/5.0.1/modules/Campaigns/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Campaigns/Campaign.php vtigercrm/branches/5.0.1/modules/Campaigns/Delete.php vtigercrm/branches/5.0.1/modules/Campaigns/DetailView.php vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php vtigercrm/branches/5.0.1/modules/Campaigns/ListView.php vtigercrm/branches/5.0.1/modules/Campaigns/Save.php vtigercrm/branches/5.0.1/modules/Contacts/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Contacts/Contact.php vtigercrm/branches/5.0.1/modules/Contacts/Delete.php vtigercrm/branches/5.0.1/modules/Contacts/DetailView.php vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Contacts/EditView.php vtigercrm/branches/5.0.1/modules/Contacts/ListView.php vtigercrm/branches/5.0.1/modules/Contacts/Save.php vtigercrm/branches/5.0.1/modules/Emails/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Emails/ChooseEmail.php vtigercrm/branches/5.0.1/modules/Emails/Delete.php vtigercrm/branches/5.0.1/modules/Emails/DetailView.php vtigercrm/branches/5.0.1/modules/Emails/EditView.php vtigercrm/branches/5.0.1/modules/Emails/Email.php vtigercrm/branches/5.0.1/modules/Emails/EmailsAjax.php vtigercrm/branches/5.0.1/modules/Emails/ListView.php vtigercrm/branches/5.0.1/modules/Emails/Save.php vtigercrm/branches/5.0.1/modules/Emails/mailsend.php vtigercrm/branches/5.0.1/modules/Emails/sendmail.php vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php vtigercrm/branches/5.0.1/modules/Import/ImportAccount.php vtigercrm/branches/5.0.1/modules/Import/ImportContact.php vtigercrm/branches/5.0.1/modules/Import/ImportLead.php vtigercrm/branches/5.0.1/modules/Import/ImportOpportunity.php vtigercrm/branches/5.0.1/modules/Import/ImportProduct.php vtigercrm/branches/5.0.1/modules/Import/ImportStep2.php vtigercrm/branches/5.0.1/modules/Import/ImportSteplast.php vtigercrm/branches/5.0.1/modules/Invoice/EditView.php vtigercrm/branches/5.0.1/modules/Leads/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Leads/Delete.php vtigercrm/branches/5.0.1/modules/Leads/DetailView.php vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Leads/EditView.php vtigercrm/branches/5.0.1/modules/Leads/Lead.php vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php vtigercrm/branches/5.0.1/modules/Leads/ListView.php vtigercrm/branches/5.0.1/modules/Leads/Save.php vtigercrm/branches/5.0.1/modules/Leads/result.php vtigercrm/branches/5.0.1/modules/Notes/Delete.php vtigercrm/branches/5.0.1/modules/Notes/DetailView.php vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Notes/EditView.php vtigercrm/branches/5.0.1/modules/Notes/ListView.php vtigercrm/branches/5.0.1/modules/Notes/Note.php vtigercrm/branches/5.0.1/modules/Notes/Save.php vtigercrm/branches/5.0.1/modules/Potentials/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Potentials/Charts.php vtigercrm/branches/5.0.1/modules/Potentials/Delete.php vtigercrm/branches/5.0.1/modules/Potentials/DetailView.php vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Potentials/EditView.php vtigercrm/branches/5.0.1/modules/Potentials/ListView.php vtigercrm/branches/5.0.1/modules/Potentials/ListViewTop.php vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php vtigercrm/branches/5.0.1/modules/Potentials/Save.php vtigercrm/branches/5.0.1/modules/PriceBooks/CallRelatedList.php vtigercrm/branches/5.0.1/modules/PriceBooks/Delete.php vtigercrm/branches/5.0.1/modules/PriceBooks/DetailView.php vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php vtigercrm/branches/5.0.1/modules/PriceBooks/ListView.php vtigercrm/branches/5.0.1/modules/PriceBooks/PriceBook.php vtigercrm/branches/5.0.1/modules/PriceBooks/Save.php vtigercrm/branches/5.0.1/modules/Products/AddProductToPriceBooks.php vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php vtigercrm/branches/5.0.1/modules/Products/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Products/Delete.php vtigercrm/branches/5.0.1/modules/Products/DetailView.php vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Products/EditView.php vtigercrm/branches/5.0.1/modules/Products/ListView.php vtigercrm/branches/5.0.1/modules/Products/Product.php vtigercrm/branches/5.0.1/modules/Products/Save.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/CallRelatedList.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/CreatePDF.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/Delete.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailView.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/EditView.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListTopPurchaseOrder.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListView.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/PurchaseOrder.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/Save.php vtigercrm/branches/5.0.1/modules/Quotes/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Quotes/CreatePDF.php vtigercrm/branches/5.0.1/modules/Quotes/Delete.php vtigercrm/branches/5.0.1/modules/Quotes/DetailView.php vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Quotes/EditView.php vtigercrm/branches/5.0.1/modules/Quotes/ListTopQuotes.php vtigercrm/branches/5.0.1/modules/Quotes/ListView.php vtigercrm/branches/5.0.1/modules/Quotes/Quote.php vtigercrm/branches/5.0.1/modules/Quotes/Save.php vtigercrm/branches/5.0.1/modules/SalesOrder/EditView.php vtigercrm/branches/5.0.1/modules/Users/Authenticate.php vtigercrm/branches/5.0.1/modules/Users/ChangePassword.php vtigercrm/branches/5.0.1/modules/Users/CreateUserPrivilegeFile.php vtigercrm/branches/5.0.1/modules/Users/DetailView.php vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Users/EditView.php vtigercrm/branches/5.0.1/modules/Users/ListLoginHistory.php vtigercrm/branches/5.0.1/modules/Users/ListView.php vtigercrm/branches/5.0.1/modules/Users/Logout.php vtigercrm/branches/5.0.1/modules/Users/Save.php vtigercrm/branches/5.0.1/modules/Users/ShowAuditTrail.php vtigercrm/branches/5.0.1/modules/Users/ShowHistory.php vtigercrm/branches/5.0.1/modules/Users/User.php vtigercrm/branches/5.0.1/modules/Users/massChangeStatus.php vtigercrm/branches/5.0.1/modules/Users/populatetemplate.php vtigercrm/branches/5.0.1/modules/Vendors/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Vendors/Delete.php vtigercrm/branches/5.0.1/modules/Vendors/DetailView.php vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Vendors/EditView.php vtigercrm/branches/5.0.1/modules/Vendors/ListView.php vtigercrm/branches/5.0.1/modules/Vendors/Save.php vtigercrm/branches/5.0.1/modules/Vendors/Vendor.php vtigercrm/branches/5.0.1/modules/Webmails/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Webmails/Save.php vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php vtigercrm/branches/5.0.1/soap/vtigerolservice.php vtigercrm/branches/5.0.1/soap/webforms.php vtigercrm/branches/5.0.1/soap/wordplugin.php Modified: vtigercrm/branches/5.0.1/Popup.php ============================================================================== --- vtigercrm/branches/5.0.1/Popup.php (original) +++ vtigercrm/branches/5.0.1/Popup.php Mon Oct 16 01:50:32 2006 @@ -33,8 +33,8 @@ switch($currentModule) { case 'Contacts': - require_once("modules/$currentModule/Contacts.php"); - $focus = new Contacts(); + require_once("modules/$currentModule/Contact.php"); + $focus = new Contact(); $log = LoggerManager::getLogger('contact_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom'); $comboFieldArray = getComboArray($comboFieldNames); @@ -47,8 +47,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","",""); break; case 'Campaigns': - require_once("modules/$currentModule/Campaigns.php"); - $focus = new Campaigns(); + require_once("modules/$currentModule/Campaign.php"); + $focus = new Campaign(); $log = LoggerManager::getLogger('campaign_list'); $comboFieldNames = Array('campaignstatus'=>'campaignstatus_dom', 'campaigntype'=>'campaigntype_dom'); @@ -60,8 +60,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','campaignname','true','basic',$popuptype,"","",""); break; case 'Accounts': - require_once("modules/$currentModule/Accounts.php"); - $focus = new Accounts(); + require_once("modules/$currentModule/Account.php"); + $focus = new Account(); $log = LoggerManager::getLogger('account_list'); $comboFieldNames = Array('accounttype'=>'account_type_dom' ,'industry'=>'industry_dom'); @@ -74,8 +74,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','accountname','true','basic',$popuptype,"","",""); break; case 'Leads': - require_once("modules/$currentModule/Leads.php"); - $focus = new Leads(); + require_once("modules/$currentModule/Lead.php"); + $focus = new Lead(); $log = LoggerManager::getLogger('contact_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom' ,'leadstatus'=>'leadstatus_dom' @@ -91,8 +91,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","",""); break; case 'Potentials': - require_once("modules/$currentModule/Potentials.php"); - $focus = new Potentials(); + require_once("modules/$currentModule/Opportunity.php"); + $focus = new Potential(); $log = LoggerManager::getLogger('potential_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom' ,'opportunity_type'=>'opportunity_type_dom' @@ -104,8 +104,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','potentialname','true','basic',$popuptype,"","",""); break; case 'Quotes': - require_once("modules/$currentModule/Quotes.php"); - $focus = new Quotes(); + require_once("modules/$currentModule/Quote.php"); + $focus = new Quote(); $log = LoggerManager::getLogger('quotes_list'); $comboFieldNames = Array('quotestage'=>'quotestage_dom'); $comboFieldArray = getComboArray($comboFieldNames); @@ -121,8 +121,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','subject','true','basic',$popuptype,"","",""); break; case 'Products': - require_once("modules/$currentModule/Products.php"); - $focus = new Products(); + require_once("modules/$currentModule/Product.php"); + $focus = new Product(); $smarty->assign("SINGLE_MOD",'Product'); if(isset($_REQUEST['curr_row'])) { @@ -135,8 +135,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','productname','true','basic',$popuptype,"","",""); break; case 'Vendors': - require_once("modules/$currentModule/Vendors.php"); - $focus = new Vendors(); + require_once("modules/$currentModule/Vendor.php"); + $focus = new Vendor(); $smarty->assign("SINGLE_MOD",'Vendor'); $alphabetical = AlphabeticalSearch($currentModule,'Popup','vendorname','true','basic',$popuptype,"","",""); break; @@ -150,15 +150,15 @@ break; case 'PurchaseOrder': require_once("modules/$currentModule/PurchaseOrder.php"); - $focus = new PurchaseOrder(); + $focus = new Order(); $smarty->assign("SINGLE_MOD",'PurchaseOrder'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); $alphabetical = AlphabeticalSearch($currentModule,'Popup','subject','true','basic',$popuptype,"","",""); break; case 'PriceBooks': - require_once("modules/$currentModule/PriceBooks.php"); - $focus = new PriceBooks(); + require_once("modules/$currentModule/PriceBook.php"); + $focus = new PriceBook(); $smarty->assign("SINGLE_MOD",'PriceBook'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); @@ -175,8 +175,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','bookname','true','basic',$popuptype,"","",""); break; case 'Users': - require_once("modules/$currentModule/Users.php"); - $focus = new Users(); + require_once("modules/$currentModule/User.php"); + $focus = new User(); $smarty->assign("SINGLE_MOD",'Users'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); Modified: vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php Mon Oct 16 01:50:32 2006 @@ -863,15 +863,15 @@ $nemail=count($realid); if ($pmodule=='Accounts'){ - require_once('modules/Accounts/Accounts.php'); - $myfocus = new Accounts(); + require_once('modules/Accounts/Account.php'); + $myfocus = new Account(); $myfocus->retrieve_entity_info($entityid,"Accounts"); $fullname=br2nl($myfocus->column_fields['accountname']); $account_selected = 'selected'; } elseif ($pmodule=='Contacts'){ - require_once('modules/Contacts/Contacts.php'); - $myfocus = new Contacts(); + require_once('modules/Contacts/Contact.php'); + $myfocus = new Contact(); $myfocus->retrieve_entity_info($entityid,"Contacts"); $fname=br2nl($myfocus->column_fields['firstname']); $lname=br2nl($myfocus->column_fields['lastname']); @@ -879,8 +879,8 @@ $contact_selected = 'selected'; } elseif ($pmodule=='Leads'){ - require_once('modules/Leads/Leads.php'); - $myfocus = new Leads(); + require_once('modules/Leads/Lead.php'); + $myfocus = new Lead(); $myfocus->retrieve_entity_info($entityid,"Leads"); $fname=br2nl($myfocus->column_fields['firstname']); $lname=br2nl($myfocus->column_fields['lastname']); Modified: vtigercrm/branches/5.0.1/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/ListViewUtils.php Mon Oct 16 01:50:32 2006 @@ -1385,8 +1385,8 @@ } elseif($popuptype == "specific_account_address") { - require_once('modules/Accounts/Accounts.php'); - $acct_focus = new Accounts(); + require_once('modules/Accounts/Account.php'); + $acct_focus = new Account(); $acct_focus->retrieve_entity_info($entity_id,"Accounts"); $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']).'"); window.close()\'>'.$temp_val.''; @@ -1394,8 +1394,8 @@ } elseif($popuptype == "specific_contact_account_address") { - require_once('modules/Accounts/Accounts.php'); - $acct_focus = new Accounts(); + require_once('modules/Accounts/Account.php'); + $acct_focus = new Account(); $acct_focus->retrieve_entity_info($entity_id,"Accounts"); $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']).'"); window.close()\'>'.$temp_val.''; @@ -1405,8 +1405,8 @@ elseif($popuptype == "specific_potential_account_address") { $acntid = $adb->query_result($list_result,$list_result_count,"accountid"); - require_once('modules/Accounts/Accounts.php'); - $acct_focus = new Accounts(); + require_once('modules/Accounts/Account.php'); + $acct_focus = new Account(); $acct_focus->retrieve_entity_info($acntid,"Accounts"); $account_name = getAccountName($acntid); @@ -1461,8 +1461,8 @@ } elseif($popuptype == "specific_vendor_address") { - require_once('modules/Vendors/Vendors.php'); - $acct_focus = new Vendors(); + require_once('modules/Vendors/Vendor.php'); + $acct_focus = new Vendor(); $acct_focus->retrieve_entity_info($entity_id,"Vendors"); $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']).'"); window.close()\'>'.$temp_val.''; Modified: vtigercrm/branches/5.0.1/include/utils/export.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/export.php (original) +++ vtigercrm/branches/5.0.1/include/utils/export.php Mon Oct 16 01:50:32 2006 @@ -20,23 +20,23 @@ require_once('config.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -require_once('modules/Accounts/Accounts.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Leads/Leads.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Leads/Lead.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Emails/Email.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Potentials/Potentials.php'); -require_once('modules/Users/Users.php'); -require_once('modules/Products/Products.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Users/User.php'); +require_once('modules/Products/Product.php'); require_once('include/utils/UserInfoUtil.php'); global $allow_exports; session_start(); -$current_user = new Users(); +$current_user = new User(); if(isset($_SESSION['authenticated_user_id'])) { Modified: vtigercrm/branches/5.0.1/include/utils/utils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/utils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/utils.php Mon Oct 16 01:50:32 2006 @@ -2048,9 +2048,9 @@ $log->debug("Entering getEmailParentsList(".$module.",".$id.") method ..."); global $adb; if($module == 'Contacts') - $focus = new Contacts(); + $focus = new Contact(); if($module == 'Leads') - $focus = new Leads(); + $focus = new Lead(); $focus->retrieve_entity_info($id,$module); $fieldid = 0; Modified: vtigercrm/branches/5.0.1/index.php ============================================================================== --- vtigercrm/branches/5.0.1/index.php (original) +++ vtigercrm/branches/5.0.1/index.php Mon Oct 16 01:50:32 2006 @@ -101,7 +101,7 @@ set_default_config($default_config_values); require_once('include/logging.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); global $currentModule; @@ -352,7 +352,7 @@ $lang_crm = (isset($_SESSION['authenticated_user_language'])) ? $_SESSION['authenticated_user_language'] : ""; $GLOBALS['request_string'] = "&module=$module&action=$action&record=$record&lang_crm=$lang_crm"; -$current_user = new Users(); +$current_user = new User(); if($use_current_login) { @@ -432,22 +432,90 @@ // Use the record to track the viewing. // todo - Have a record of modules and thier primary object names. //Getting the actual module + $actualModule = $currentModule; switch($currentModule) { + case 'Leads': + require_once("modules/$currentModule/Lead.php"); + $focus = new Lead(); + break; + case 'Contacts': + require_once("modules/$currentModule/Contact.php"); + $focus = new Contact(); + break; + case 'Accounts': + require_once("modules/$currentModule/Account.php"); + $focus = new Account(); + break; + case 'Potentials': + require_once("modules/$currentModule/Opportunity.php"); + $focus = new Potential(); + break; case 'Calendar': require_once("modules/$currentModule/Activity.php"); $focus = new Activity(); break; - default: - require_once("modules/$currentModule/$currentModule.php"); - $focus = new $currentModule(); + case 'Notes': + require_once("modules/$currentModule/Note.php"); + $focus = new Note(); + break; + case 'Emails': + require_once("modules/$currentModule/Email.php"); + $focus = new Email(); + break; + case 'Users': + require_once("modules/$currentModule/User.php"); + $focus = new User(); + break; + case 'Products': + require_once("modules/$currentModule/Product.php"); + $focus = new Product(); + break; + case 'Vendors': + require_once("modules/$currentModule/Vendor.php"); + $focus = new Vendor(); + $actualModule = 'Vendors'; + break; + case 'PriceBooks': + require_once("modules/$currentModule/PriceBook.php"); + $focus = new PriceBook(); + $actualModule = 'PriceBooks'; + break; + case 'HelpDesk': + require_once("modules/$currentModule/HelpDesk.php"); + $focus = new HelpDesk(); + break; + case 'Faq': + require_once("modules/$currentModule/Faq.php"); + $focus = new Faq(); + break; + case 'Quotes': + require_once("modules/$currentModule/Quote.php"); + $focus = new Quote(); + break; + case 'PurchaseOrder': + require_once("modules/$currentModule/PurchaseOrder.php"); + $focus = new Order(); + break; + case 'SalesOrder': + require_once("modules/$currentModule/SalesOrder.php"); + $focus = new SalesOrder(); + break; + + case 'Invoice': + require_once("modules/$currentModule/Invoice.php"); + $focus = new Invoice(); + break; + case 'Campaigns': + require_once("modules/$currentModule/Campaign.php"); + $focus = new Campaign(); break; } if(isset($_REQUEST['record']) && $_REQUEST['record']!='' && $_REQUEST["module"] != "Webmails") { // Only track a viewing if the record was retrieved. - $focus->track_view($current_user->id, $currentModule,$_REQUEST['record']); + $focus->track_view($current_user->id, $actualModule,$_REQUEST['record']); } } Modified: vtigercrm/branches/5.0.1/install/5createTables.inc.php ============================================================================== --- vtigercrm/branches/5.0.1/install/5createTables.inc.php (original) +++ vtigercrm/branches/5.0.1/install/5createTables.inc.php Mon Oct 16 01:50:32 2006 @@ -22,14 +22,14 @@ require_once('config.php'); require_once('include/database/PearDatabase.php'); require_once('include/logging.php'); -require_once('modules/Leads/Leads.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Accounts/Accounts.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Leads/Lead.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Accounts/Account.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Emails/Emails.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Emails/Email.php'); +require_once('modules/Users/User.php'); require_once('modules/Import/ImportMap.php'); require_once('modules/Import/UsersLastImport.php'); require_once('modules/Users/LoginHistory.php'); @@ -66,7 +66,7 @@ global $default_user_is_admin; // create default admin user - $user = new Users(); + $user = new User(); $user->column_fields["last_name"] = 'Administrator'; $user->column_fields["user_name"] = 'admin'; $user->column_fields["status"] = 'Active'; @@ -122,7 +122,7 @@ //Creating the Standard User - $user = new Users(); + $user = new User(); $user->column_fields["last_name"] = 'StandardUser'; $user->column_fields["user_name"] = 'standarduser'; $user->column_fields["is_admin"] = 'off'; Modified: vtigercrm/branches/5.0.1/install/populateSeedData.php ============================================================================== --- vtigercrm/branches/5.0.1/install/populateSeedData.php (original) +++ vtigercrm/branches/5.0.1/install/populateSeedData.php Mon Oct 16 01:50:32 2006 @@ -19,29 +19,29 @@ require_once('config.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); require_once('modules/Contacts/contactSeedData.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Accounts/Accounts.php'); -require_once('modules/Campaigns/Campaigns.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Accounts/Account.php'); +require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('modules/Calendar/Activity.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); require_once('include/language/en_us.lang.php'); require_once('include/ComboStrings.php'); require_once('include/ComboUtil.php'); -require_once('modules/Products/Products.php'); -require_once('modules/PriceBooks/PriceBooks.php'); -require_once('modules/Vendors/Vendors.php'); +require_once('modules/Products/Product.php'); +require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/Vendors/Vendor.php'); require_once('modules/Faq/Faq.php'); require_once('modules/HelpDesk/HelpDesk.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Quotes/Quote.php'); require_once('modules/SalesOrder/SalesOrder.php'); require_once('modules/PurchaseOrder/PurchaseOrder.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('include/utils/InventoryUtils.php'); //Included to save inventory related products in demo data global $first_name_array; @@ -113,7 +113,7 @@ } // Look up the user id for the assigned user -$seed_user = new Users(); +$seed_user = new User(); //$adb->println("PSD assignname=".$assigned_user_name); @@ -121,7 +121,7 @@ global $current_user; -$current_user = new Users(); +$current_user = new User(); $result = $current_user->retrieve_entity_info($assigned_user_id,'Users'); $tagkey = 1; @@ -147,7 +147,7 @@ $account_name = $company_name_array[$i]; // Create new accounts. - $account = new Accounts(); + $account = new Account(); $account->column_fields["accountname"] = $account_name; $account->column_fields["phone"] = create_phone_number(); $account->column_fields["assigned_user_id"] = $assigned_user_id; @@ -196,7 +196,7 @@ //Create new opportunities - $opp = new Potentials(); + $opp = new Potential(); $opp->column_fields["assigned_user_id"] = $assigned_user_id; $opp->column_fields["potentialname"] = $account_name." - 1000 units"; @@ -235,7 +235,7 @@ for($i=0; $i<10; $i++) { - $contact = new Contacts(); + $contact = new Contact(); $contact->column_fields["firstname"] = ucfirst(strtolower($first_name_array[$i])); $contact->column_fields["lastname"] = ucfirst(strtolower($last_name_array[$i])); $contact->column_fields["assigned_user_id"] = $assigned_user_id; @@ -327,7 +327,7 @@ $company_count=0; for($i=0; $i<10; $i++) { - $lead = new Leads(); + $lead = new Lead(); $lead->column_fields["firstname"] = ucfirst(strtolower($first_name_array[$i])); $lead->column_fields["lastname"] = ucfirst(strtolower($last_name_array[$i])); @@ -404,7 +404,7 @@ //Populating Vendor Data for($i=0; $i<10; $i++) { - $vendor = new Vendors(); + $vendor = new Vendor(); $vendor->column_fields["vendorname"] = ucfirst(strtolower($first_name_array[$i])); $vendor->column_fields["phone"] = create_phone_number(); $vendor->column_fields["email"] = strtolower($vendor->column_fields["vendorname"])."@company.com"; @@ -442,7 +442,7 @@ .jpeg###","product7.jpeg###product8.jpeg###product9.jpeg###product10.jpeg###"); for($i=0; $i<10; $i++) { - $product = new Products(); + $product = new Product(); if($i>4) { $parent_key = array_rand($opportunity_ids); @@ -579,7 +579,7 @@ $validtill_array = array ("2006-09-21", "2006-10-29", "2006-12-11", "2006-10-09", "2006-11-18"); for($i=0;$i<5;$i++) { - $quote = new Quotes(); + $quote = new Quote(); $quote->column_fields["assigned_user_id"] = $assigned_user_id; $account_key = array_rand($account_ids); @@ -730,7 +730,7 @@ for($i=0;$i<5;$i++) { - $po = new PurchaseOrder(); + $po = new Order(); $po->column_fields["assigned_user_id"] = $assigned_user_id; $vendor_key = array_rand($vendor_ids); @@ -896,7 +896,7 @@ for($i=0;$i<5;$i++) { - $email = new Emails(); + $email = new Email(); $email->column_fields["assigned_user_id"] = $assigned_user_id; @@ -923,7 +923,7 @@ //$num_array = array(0,1,2,3,4); for($i=0;$i<12;$i++) { - $pricebook = new PriceBooks(); + $pricebook = new PriceBook(); $rand = array_rand($num_array); $pricebook->column_fields["bookname"] = $PB_array[$i]; @@ -940,7 +940,7 @@ for($i=0;$i<7;$i++) { - $notes = new Notes(); + $notes = new Note(); $rand = array_rand($num_array); $contact_key = array_rand($contact_ids); @@ -1118,7 +1118,7 @@ //$expected_response = Array(null,null,null); for($i=0;$icolumn_fields["campaignname"] = $campaign_name; $campaign->column_fields["campaigntype"] = $campaign_type_array[$i]; Modified: vtigercrm/branches/5.0.1/modules/Accounts/Account.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/Account.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/Account.php Mon Oct 16 01:50:32 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Accounts/Accounts.php,v 1.53 2005/04/28 08:06:45 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Accounts/Account.php,v 1.53 2005/04/28 08:06:45 rank Exp $ * Description: Defines the Account SugarBean Account entity with the necessary * methods and variables. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. @@ -26,11 +26,11 @@ require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Emails/Email.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -96,7 +96,7 @@ var $default_order_by = 'accountname'; var $default_sort_order = 'ASC'; - function Accounts() { + function Account() { $this->log =LoggerManager::getLogger('account'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Accounts'); @@ -147,7 +147,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $mod_strings; - $focus = new Contacts(); + $focus = new Contact(); $button = ''; if(isPermitted("Contacts",1,"") == 'yes') @@ -191,7 +191,7 @@ $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; - $focus = new Potentials(); + $focus = new Potential(); $button = ''; if(isPermitted("Potentials",1,"") == 'yes') @@ -388,9 +388,9 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quotes.php'); - - $focus = new Quotes(); + require_once('modules/Quotes/Quote.php'); + + $focus = new Quote(); $button = ''; if(isPermitted("Quotes",1,"") == 'yes') @@ -627,10 +627,10 @@ { global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Products.php'); + require_once('modules/Products/Product.php'); global $app_strings; - $focus = new Products(); + $focus = new Product(); $button = ''; Modified: vtigercrm/branches/5.0.1/modules/Accounts/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Accounts/Account.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -22,7 +22,7 @@ } else { -$focus = new Accounts(); +$focus = new Account(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Accounts/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/Delete.php Mon Oct 16 01:50:32 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Accounts/Account.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Accounts(); +$focus = new Account(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Accounts/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/DetailView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Accounts/Account.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ global $app_list_strings; global $log, $currentModule, $singlepane_view; -$focus = new Accounts(); +$focus = new Account(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Accounts"); $focus->id = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Accounts/Account.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $acntObj = new Accounts(); + $acntObj = new Account(); $acntObj->retrieve_entity_info($crmid,"Accounts"); $acntObj->column_fields[$fieldname] = $fieldvalue; if($fieldname == 'annual_revenue')//annual revenue converted to dollar value while saving Modified: vtigercrm/branches/5.0.1/modules/Accounts/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/EditView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Accounts/Account.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -31,7 +31,7 @@ global $app_strings,$mod_strings,$currentModule,$theme; $smarty=new vtigerCRM_Smarty; -$focus = new Accounts(); +$focus = new Account(); if(isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Accounts/HeadLines.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/HeadLines.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/HeadLines.php Mon Oct 16 01:50:32 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -include("modules/Accounts/Accounts.php"); +include("modules/Accounts/Account.php"); include("getCompanyProfile.php"); $variable = $_REQUEST['tickersymbol']; $url = "http://finance.yahoo.com/q?s=".$variable; Modified: vtigercrm/branches/5.0.1/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/ListView.php Mon Oct 16 01:50:32 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Accounts/Account.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -43,7 +43,7 @@ $url_string = ''; -$focus = new Accounts(); +$focus = new Account(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Accounts/ListViewTop.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/ListViewTop.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/ListViewTop.php Mon Oct 16 01:50:32 2006 @@ -28,7 +28,7 @@ $log = LoggerManager::getLogger('top accounts_list'); $log->debug("Entering getTopAccounts() method ..."); require_once("data/Tracker.php"); - require_once('modules/Potentials/Potentials.php'); + require_once('modules/Potentials/Opportunity.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); global $app_strings; Modified: vtigercrm/branches/5.0.1/modules/Accounts/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/Save.php Mon Oct 16 01:50:32 2006 @@ -21,14 +21,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Accounts/Account.php'); require_once('include/logging.php'); //require_once('database/DatabaseConnection.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); global $log; -$focus = new Accounts(); +$focus = new Account(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/Accounts/Tickerdetail.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/Tickerdetail.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/Tickerdetail.php Mon Oct 16 01:50:32 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once("modules/Accounts/Accounts.php"); +require_once("modules/Accounts/Account.php"); require_once("getCompanyProfile.php"); $variable = $_REQUEST['tickersymbol']; $url = "http://moneycentral.msn.com/investor/research/profile.asp?Symbol=".trim($variable); Modified: vtigercrm/branches/5.0.1/modules/Calendar/Activity.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Calendar/Activity.php (original) +++ vtigercrm/branches/5.0.1/modules/Calendar/Activity.php Mon Oct 16 01:50:32 2006 @@ -154,7 +154,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new Contacts(); + $focus = new Contact(); $button = ''; @@ -177,7 +177,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new Users(); + $focus = new User(); $button = ''; @@ -395,8 +395,8 @@ global $log,$adb; $log->debug("Entering get_tasksforol(".$username.") method ..."); global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -447,8 +447,8 @@ global $log,$adb; $log->debug("Entering get_calendarsforol(".$user_name.") method ..."); global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($user_name); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); Modified: vtigercrm/branches/5.0.1/modules/Calendar/RenderRelatedListUI.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Calendar/RenderRelatedListUI.php (original) +++ vtigercrm/branches/5.0.1/modules/Calendar/RenderRelatedListUI.php Mon Oct 16 01:50:32 2006 @@ -10,8 +10,8 @@ ********************************************************************************/ require_once('include/RelatedListView.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Products/Products.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Products/Product.php'); require_once('include/utils/UserInfoUtil.php'); // functions added for group calendar -Jaguar Modified: vtigercrm/branches/5.0.1/modules/Campaigns/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Campaigns/Campaign.php'); require_once('modules/CustomView/CustomView.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout @@ -23,7 +23,7 @@ } else { -$focus = new Campaigns(); +$focus = new Campaign(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Campaigns/Campaign.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/Campaign.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/Campaign.php Mon Oct 16 01:50:32 2006 @@ -18,8 +18,8 @@ require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); require_once('include/utils/utils.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Leads/Lead.php'); require_once('user_privileges/default_module_view.php'); class Campaign extends CRMEntity { @@ -66,7 +66,7 @@ 'Campaign Type'=>'campaigntype', ); - function Campaigns() + function Campaign() { $this->log =LoggerManager::getLogger('campaign'); $this->db = new PearDatabase(); @@ -120,7 +120,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $mod_strings; - $focus = new Contacts(); + $focus = new Contact(); $button = ''; if($singlepane_view == 'true') @@ -145,7 +145,7 @@ $log->debug("Entering get_leads(".$id.") method ..."); global $mod_strings; - $focus = new Leads(); + $focus = new Lead(); $button = ''; if($singlepane_view == 'true') @@ -169,7 +169,7 @@ $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; - $focus = new Potentials(); + $focus = new Potential(); $button = ''; if($singlepane_view == 'true') Modified: vtigercrm/branches/5.0.1/modules/Campaigns/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/Delete.php Mon Oct 16 01:50:32 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Campaigns/Campaign.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('ticket_delete'); -$focus = new Campaigns(); +$focus = new Campaign(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/DetailView.php Mon Oct 16 01:50:32 2006 @@ -11,12 +11,12 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Campaigns/Campaign.php'); require_once('modules/CustomView/CustomView.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new Campaigns(); +$focus = new Campaign(); if(isset($_REQUEST['record']) && $_REQUEST['record']!= null ) { Modified: vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Campaigns/Campaign.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Campaigns(); + $modObj = new Campaign(); $modObj->retrieve_entity_info($crmid,"Campaigns"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php Mon Oct 16 01:50:32 2006 @@ -11,12 +11,12 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once('include/utils/utils.php'); -require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Campaigns/Campaign.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$currentModule,$theme; -$focus = new Campaigns(); +$focus = new Campaign(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] !='') Modified: vtigercrm/branches/5.0.1/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/ListView.php Mon Oct 16 01:50:32 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Campaigns/Campaign.php'); require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once("data/Tracker.php"); @@ -28,7 +28,7 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; -$focus = new Campaigns(); +$focus = new Campaign(); $category = getParentTab(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Campaigns/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/Save.php Mon Oct 16 01:50:32 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Campaigns/Campaign.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new Campaigns(); +$focus = new Campaign(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/Contacts/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout @@ -22,7 +22,7 @@ } else { -$focus = new Contacts(); +$focus = new Contact(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/Contact.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/Contact.php Mon Oct 16 01:50:32 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Contacts/Contacts.php,v 1.70 2005/04/27 11:21:49 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Contacts/Contact.php,v 1.70 2005/04/27 11:21:49 rank Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -25,11 +25,11 @@ require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); require_once('include/utils/utils.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Campaigns/Campaigns.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Emails/Email.php'); require_once('modules/HelpDesk/HelpDesk.php'); require_once('user_privileges/default_module_view.php'); @@ -125,7 +125,7 @@ var $default_order_by = 'lastname'; var $default_sort_order = 'ASC'; - function Contacts() { + function Contact() { $this->log = LoggerManager::getLogger('contact'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Contacts'); @@ -334,7 +334,7 @@ $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; - $focus = new Potentials(); + $focus = new Potential(); $button = ''; if(isPermitted("Potentials",1,"") == 'yes') @@ -486,8 +486,8 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quotes.php'); - $focus = new Quotes(); + require_once('modules/Quotes/Quote.php'); + $focus = new Quote(); $button = ''; if(isPermitted("Quotes",1,"") == 'yes') @@ -540,8 +540,8 @@ global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); global $app_strings; - require_once('modules/Products/Products.php'); - $focus = new Products(); + require_once('modules/Products/Product.php'); + $focus = new Product(); $button = ''; if(isPermitted("Products",1,"") == 'yes') @@ -570,7 +570,7 @@ $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new PurchaseOrder(); + $focus = new Order(); $button = ''; @@ -600,7 +600,7 @@ $log->debug("Entering get_emails(".$id.") method ..."); global $mod_strings; - $focus = new Emails(); + $focus = new Email(); $button = ''; @@ -631,7 +631,7 @@ $log->debug("Entering get_campaigns(".$id.") method ..."); global $mod_strings; - $focus = new Campaigns(); + $focus = new Campaign(); if($singlepane_view == 'true') $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; else @@ -735,8 +735,8 @@ { global $log; global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -775,8 +775,8 @@ { global $log,$adb; global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($user_name); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); Modified: vtigercrm/branches/5.0.1/modules/Contacts/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/Delete.php Mon Oct 16 01:50:32 2006 @@ -17,13 +17,13 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Contacts(); +$focus = new Contact(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Contacts/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/DetailView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -33,7 +33,7 @@ global $app_strings; global $currentModule, $singlepane_view; -$focus = new Contacts(); +$focus = new Contact(); if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $cntObj = new Contacts(); + $cntObj = new Contact(); $cntObj->retrieve_entity_info($crmid,"Contacts"); $cntObj->column_fields[$fieldname] = $fieldvalue; $cntObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Contacts/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/EditView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -39,7 +39,7 @@ $image_error=isset($_REQUEST['image_error'])?$_REQUEST['image_error']:"false"; //end -$focus = new Contacts(); +$focus = new Contact(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) @@ -68,9 +68,9 @@ if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']=='') { - require_once('modules/Accounts/Accounts.php'); + require_once('modules/Accounts/Account.php'); $focus->column_fields['account_id'] = $_REQUEST['account_id']; - $acct_focus = new Accounts(); + $acct_focus = new Account(); $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']; Modified: vtigercrm/branches/5.0.1/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/ListView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -39,7 +39,7 @@ global $currentModule,$theme; -$focus = new Contacts(); +$focus = new Contact(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Contacts/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/Save.php Mon Oct 16 01:50:32 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once("modules/Emails/mail.php"); @@ -51,7 +51,7 @@ $local_log =& LoggerManager::getLogger('index'); global $log,$adb; -$focus = new Contacts(); +$focus = new Contact(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/Emails/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -11,10 +11,10 @@ require_once('Smarty_setup.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('include/utils/utils.php'); -$focus = new Emails(); +$focus = new Email(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Emails/ChooseEmail.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/ChooseEmail.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/ChooseEmail.php Mon Oct 16 01:50:32 2006 @@ -29,20 +29,20 @@ if ($pmodule=='Accounts') { - require_once('modules/Accounts/Accounts.php'); - $myfocus = new Accounts(); + require_once('modules/Accounts/Account.php'); + $myfocus = new Account(); $myfocus->retrieve_entity_info($entityid,"Accounts"); } elseif ($pmodule=='Contacts') { - require_once('modules/Contacts/Contacts.php'); - $myfocus = new Contacts(); + require_once('modules/Contacts/Contact.php'); + $myfocus = new Contact(); $myfocus->retrieve_entity_info($entityid,"Contacts"); } elseif ($pmodule=='Leads') { - require_once('modules/Leads/Leads.php'); - $myfocus = new Leads(); + require_once('modules/Leads/Lead.php'); + $myfocus = new Lead(); $myfocus->retrieve_entity_info($entityid,"Leads"); } ?> Modified: vtigercrm/branches/5.0.1/modules/Emails/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/Delete.php Mon Oct 16 01:50:32 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('email_delete'); -$focus = new Emails(); +$focus = new Email(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the email."); Modified: vtigercrm/branches/5.0.1/modules/Emails/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/DetailView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('include/upload_file.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ global $mod_strings; global $currentModule; -$focus = new Emails(); +$focus = new Email(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record'])) Modified: vtigercrm/branches/5.0.1/modules/Emails/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/EditView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/FormValidationUtil.php'); @@ -34,7 +34,7 @@ global $current_user; global $currentModule; -$focus = new Emails(); +$focus = new Email(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['upload_error'] == true) Modified: vtigercrm/branches/5.0.1/modules/Emails/Email.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/Email.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/Email.php Mon Oct 16 01:50:32 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Emails.php,v 1.41 2005/04/28 08:11:21 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Email.php,v 1.41 2005/04/28 08:11:21 rank Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -25,10 +25,10 @@ require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Accounts/Accounts.php'); -require_once('modules/Potentials/Potentials.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Accounts/Account.php'); +require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Users/User.php'); // Email is used to store customer information. class Email extends CRMEntity { @@ -78,9 +78,9 @@ /** This function will set the columnfields for Email module */ - function Emails() { + function Email() { $this->log = LoggerManager::getLogger('email'); - $this->log->debug("Entering Emails() method ..."); + $this->log->debug("Entering Email() method ..."); $this->log = LoggerManager::getLogger('email'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Emails'); @@ -101,7 +101,7 @@ global $mod_strings; global $app_strings; - $focus = new Contacts(); + $focus = new Contact(); $button = ''; $returnset = '&return_module=Emails&return_action=CallRelatedList&return_id='.$id; Modified: vtigercrm/branches/5.0.1/modules/Emails/EmailsAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/EmailsAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/EmailsAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = $_REQUEST["fieldValue"]; if($crmid != "") { - $modObj = new Emails(); + $modObj = new Email(); $modObj->retrieve_entity_info($crmid,"Emails"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Emails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/ListView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/utils/utils.php'); @@ -42,7 +42,7 @@ $url_string = ''; // assigning http url string -$focus = new Emails(); +$focus = new Email(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Emails/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/Save.php Mon Oct 16 01:50:32 2006 @@ -51,13 +51,13 @@ $mailbox = 'INBOX'; } -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Emails(); +$focus = new Email(); global $current_user; setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/Emails/mailsend.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/mailsend.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/mailsend.php Mon Oct 16 01:50:32 2006 @@ -124,20 +124,20 @@ $fresult=$adb->query($myquery); if ($pmodule=='Contacts') { - require_once('modules/Contacts/Contacts.php'); - $myfocus = new Contacts(); + require_once('modules/Contacts/Contact.php'); + $myfocus = new Contact(); $myfocus->retrieve_entity_info($mycrmid,"Contacts"); } elseif ($pmodule=='Accounts') { - require_once('modules/Accounts/Accounts.php'); - $myfocus = new Accounts(); + require_once('modules/Accounts/Account.php'); + $myfocus = new Account(); $myfocus->retrieve_entity_info($mycrmid,"Accounts"); } elseif ($pmodule=='Leads') { - require_once('modules/Leads/Leads.php'); - $myfocus = new Leads(); + require_once('modules/Leads/Lead.php'); + $myfocus = new Lead(); $myfocus->retrieve_entity_info($mycrmid,"Leads"); } $fldname=$adb->query_result($fresult,0,"columnname"); Modified: vtigercrm/branches/5.0.1/modules/Emails/sendmail.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/sendmail.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/sendmail.php Mon Oct 16 01:50:32 2006 @@ -18,7 +18,7 @@ * @copyright 2001 - 2003 Brent R. Matzelle */ -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('include/logging.php'); require("modules/Emails/class.phpmailer.php"); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php (original) +++ vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php Mon Oct 16 01:50:32 2006 @@ -21,18 +21,18 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Accounts/Accounts.php'); -require_once('modules/Potentials/Potentials.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Accounts/Account.php'); +require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Leads/Lead.php'); require_once('modules/Faq/Faq.php'); -require_once('modules/Vendors/Vendors.php'); -require_once('modules/PriceBooks/PriceBooks.php'); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Vendors/Vendor.php'); +require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/Quotes/Quote.php'); require_once('modules/PurchaseOrder/PurchaseOrder.php'); require_once('modules/SalesOrder/SalesOrder.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Campaigns/Campaign.php'); require_once('modules/Home/language/en_us.lang.php'); require_once('include/database/PearDatabase.php'); require_once('modules/CustomView/CustomView.php'); Modified: vtigercrm/branches/5.0.1/modules/Import/ImportAccount.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportAccount.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportAccount.php Mon Oct 16 01:50:32 2006 @@ -22,11 +22,11 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Potentials/Potentials.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Emails/Emails.php'); -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Emails/Email.php'); +require_once('modules/Accounts/Account.php'); require_once('include/ComboUtil.php'); // Account is used to store vtiger_account information. Modified: vtigercrm/branches/5.0.1/modules/Import/ImportContact.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportContact.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportContact.php Mon Oct 16 01:50:32 2006 @@ -18,7 +18,7 @@ ********************************************************************************/ include_once('config.php'); require_once('include/logging.php'); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('modules/Import/UsersLastImport.php'); require_once('include/database/PearDatabase.php'); require_once('include/ComboUtil.php'); @@ -169,7 +169,7 @@ $arr = array(); // check if it already exists - $focus = new Accounts(); + $focus = new Account(); $query = ''; Modified: vtigercrm/branches/5.0.1/modules/Import/ImportLead.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportLead.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportLead.php Mon Oct 16 01:50:32 2006 @@ -26,13 +26,13 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Potentials/Potentials.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Emails/Emails.php'); -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Emails/Email.php'); +require_once('modules/Accounts/Account.php'); require_once('include/ComboUtil.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); class ImportLead extends Lead { Modified: vtigercrm/branches/5.0.1/modules/Import/ImportOpportunity.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportOpportunity.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportOpportunity.php Mon Oct 16 01:50:32 2006 @@ -22,11 +22,11 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Potentials/Potentials.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Emails/Emails.php'); -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Emails/Email.php'); +require_once('modules/Accounts/Account.php'); require_once('include/ComboUtil.php'); // Get _dom arrays from Database @@ -131,7 +131,7 @@ $arr = array(); // check if it already exists - $focus = new Accounts(); + $focus = new Account(); $query = ''; Modified: vtigercrm/branches/5.0.1/modules/Import/ImportProduct.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportProduct.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportProduct.php Mon Oct 16 01:50:32 2006 @@ -26,14 +26,14 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Potentials/Potentials.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Emails/Emails.php'); -require_once('modules/Accounts/Accounts.php'); -require_once('modules/Products/Products.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Emails/Email.php'); +require_once('modules/Accounts/Account.php'); +require_once('modules/Products/Product.php'); require_once('include/ComboUtil.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); class ImportProduct extends Product { Modified: vtigercrm/branches/5.0.1/modules/Import/ImportStep2.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportStep2.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportStep2.php Mon Oct 16 01:50:32 2006 @@ -250,27 +250,27 @@ if($_REQUEST['module']=='Accounts') { $tablename='account'; - $focus1=new Accounts(); + $focus1=new Account(); } if($_REQUEST['module']=='Contacts') { $tablename='contactdetails'; - $focus1=new Contacts(); + $focus1=new Contact(); } if($_REQUEST['module']=='Leads') { $tablename='leaddetails'; - $focus1=new Leads(); + $focus1=new Lead(); } if($_REQUEST['module']=='Potentials') { $tablename='potential'; - $focus1=new Potentials(); + $focus1=new Potential(); } if($_REQUEST['module']=='Products') { $tablename='products'; - $focus1=new Products(); + $focus1=new Product(); } Modified: vtigercrm/branches/5.0.1/modules/Import/ImportSteplast.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportSteplast.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportSteplast.php Mon Oct 16 01:50:32 2006 @@ -26,7 +26,7 @@ require_once('modules/Import/UsersLastImport.php'); require_once('modules/Import/parse_utils.php'); require_once('include/ListView/ListView.php'); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('include/utils/utils.php'); global $mod_strings; Modified: vtigercrm/branches/5.0.1/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Invoice/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Invoice/EditView.php Mon Oct 16 01:50:32 2006 @@ -23,9 +23,9 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); require_once('modules/SalesOrder/SalesOrder.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -43,7 +43,7 @@ if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoinvoice') { $quoteid = $_REQUEST['record']; - $quote_focus = new Quotes(); + $quote_focus = new Quote(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToInvoice($focus,$quote_focus,$quoteid); @@ -179,7 +179,7 @@ } if(isset($_REQUEST['opportunity_id']) && $_REQUEST['opportunity_id'] !='') { - $potfocus = new Potentials(); + $potfocus = new Potential(); $potfocus->column_fields['potential_id'] = $_REQUEST['opportunity_id']; $associated_prod = getAssociatedProducts("Potentials",$potfocus,$potfocus->column_fields['potential_id']); @@ -194,8 +194,8 @@ if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && ($_REQUEST['record']=='' || $_REQUEST['convertmode'] == "potentoinvoice")){ - require_once('modules/Accounts/Accounts.php'); - $acct_focus = new Accounts(); + require_once('modules/Accounts/Account.php'); + $acct_focus = new Account(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/branches/5.0.1/modules/Leads/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -22,7 +22,7 @@ } else { -$focus = new Leads(); +$focus = new Lead(); $MODULE = $_REQUEST['module']; $RECORD = $_REQUEST['record']; $currentmodule = $_REQUEST['module']; Modified: vtigercrm/branches/5.0.1/modules/Leads/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/Delete.php Mon Oct 16 01:50:32 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('lead_delete'); -$focus = new Leads(); +$focus = new Lead(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Leads/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/DetailView.php Mon Oct 16 01:50:32 2006 @@ -14,7 +14,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); require_once('include/database/PearDatabase.php'); require_once('include/CustomFieldUtil.php'); require_once('include/utils/utils.php'); @@ -25,7 +25,7 @@ global $app_strings; global $currentModule, $singlepane_view; global $log; -$focus = new Leads(); +$focus = new Lead(); if(isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -24,7 +24,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $leadObj = new Leads(); + $leadObj = new Lead(); $leadObj->retrieve_entity_info($crmid,"Leads"); $leadObj->column_fields[$fieldname] = $fieldvalue; $leadObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Leads/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/EditView.php Mon Oct 16 01:50:32 2006 @@ -14,7 +14,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); require_once('include/database/PearDatabase.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); @@ -23,7 +23,7 @@ global $mod_strings,$app_strings,$theme,$currentModule; -$focus = new Leads(); +$focus = new Lead(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Leads/Lead.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/Lead.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/Lead.php Mon Oct 16 01:50:32 2006 @@ -19,9 +19,9 @@ require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Campaigns/Campaigns.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Emails/Email.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -84,9 +84,9 @@ var $default_order_by = 'lastname'; var $default_sort_order = 'ASC'; - function Leads() { + function Lead() { $this->log = LoggerManager::getLogger('lead'); - $this->log->debug("Entering Leads() method ..."); + $this->log->debug("Entering Lead() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Leads'); $this->log->debug("Exiting Lead method ..."); @@ -230,7 +230,7 @@ global $log, $singlepane_view; $log->debug("Entering get_campaigns(".$id.") method ..."); global $mod_strings; - $focus = new Campaigns(); + $focus = new Campaign(); $button = ''; if($singlepane_view == 'true') @@ -258,7 +258,7 @@ global $mod_strings; require_once('include/RelatedListView.php'); - $focus = new Emails(); + $focus = new Email(); $button = ''; @@ -358,11 +358,11 @@ { global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Products.php'); + require_once('modules/Products/Product.php'); global $mod_strings; global $app_strings; - $focus = new Products(); + $focus = new Product(); $button = ''; Modified: vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); //Getting the Parameters from the ConvertLead Form $id = $_REQUEST["record"]; @@ -39,7 +39,7 @@ $potential_name = $check_unit[0]; //Retrieve info from all the vtiger_tables related to leads -$focus = new Leads(); +$focus = new Lead(); $focus->retrieve_entity_info($id,"Leads"); //get all the lead related columns Modified: vtigercrm/branches/5.0.1/modules/Leads/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/ListView.php Mon Oct 16 01:50:32 2006 @@ -19,7 +19,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -49,7 +49,7 @@ $url_string = ''; // assigning http url string -$focus = new Leads(); +$focus = new Lead(); $smarty = new vtigerCRM_Smarty; $other_text=Array(); Modified: vtigercrm/branches/5.0.1/modules/Leads/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/Save.php Mon Oct 16 01:50:32 2006 @@ -13,14 +13,14 @@ * Contributor(s): ______________________________________. ********************************************************************************/ -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/UserInfoUtil.php'); $local_log =& LoggerManager::getLogger('index'); global $log,$adb; -$focus = new Leads(); +$focus = new Lead(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/Leads/result.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/result.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/result.php Mon Oct 16 01:50:32 2006 @@ -12,7 +12,7 @@ require_once('include/utils/utils.php'); require_once 'Excel/reader.php'; -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('include/database/PearDatabase.php'); $data = new Spreadsheet_Excel_Reader(); Modified: vtigercrm/branches/5.0.1/modules/Notes/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/Delete.php Mon Oct 16 01:50:32 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Notes/Notes.php'); +require_once('modules/Notes/Note.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('note_delete'); -$focus = new Notes(); +$focus = new Note(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the note."); Modified: vtigercrm/branches/5.0.1/modules/Notes/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/DetailView.php Mon Oct 16 01:50:32 2006 @@ -22,14 +22,14 @@ require_once('data/Tracker.php'); require_once('Smarty_setup.php'); -require_once('modules/Notes/Notes.php'); +require_once('modules/Notes/Note.php'); require_once('include/upload_file.php'); require_once('include/utils/utils.php'); global $app_strings; global $mod_strings; global $currentModule; -$focus = new Notes(); +$focus = new Note(); if(isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Notes"); Modified: vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Notes/Notes.php'); +require_once('modules/Notes/Note.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Notes(); + $modObj = new Note(); $modObj->retrieve_entity_info($crmid,"Notes"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Notes/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/EditView.php Mon Oct 16 01:50:32 2006 @@ -22,12 +22,12 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Notes/Notes.php'); +require_once('modules/Notes/Note.php'); require_once('include/utils/utils.php'); global $app_strings,$app_list_strings,$mod_strings,$theme,$currentModule; -$focus = new Notes(); +$focus = new Note(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['upload_error'] == true) Modified: vtigercrm/branches/5.0.1/modules/Notes/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/ListView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Notes/Notes.php'); +require_once('modules/Notes/Note.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -66,7 +66,7 @@ $url_string = ''; // assigning http url string -$focus = new Notes(); +$focus = new Note(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Notes/Note.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/Note.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/Note.php Mon Oct 16 01:50:32 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Notes/Notes.php,v 1.15 2005/03/15 10:01:08 shaw Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Notes/Note.php,v 1.15 2005/03/15 10:01:08 shaw Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -70,9 +70,9 @@ var $default_order_by = 'modifiedtime'; var $default_sort_order = 'ASC'; - function Notes() { + function Note() { $this->log = LoggerManager::getLogger('notes'); - $this->log->debug("Entering Notes() method ..."); + $this->log->debug("Entering Note() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Notes'); $this->log->debug("Exiting Note method ..."); Modified: vtigercrm/branches/5.0.1/modules/Notes/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/Save.php Mon Oct 16 01:50:32 2006 @@ -21,13 +21,13 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Notes/Notes.php'); +require_once('modules/Notes/Note.php'); require_once('include/logging.php'); require_once('include/upload_file.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Notes(); +$focus = new Note(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/Potentials/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ } else { -$focus = new Potentials(); +$focus = new Potential(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/Potentials/Charts.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/Charts.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/Charts.php Mon Oct 16 01:50:32 2006 @@ -19,7 +19,7 @@ require_once('config.php'); require_once('include/logging.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('Image/Graph.php'); require_once('include/utils/utils.php'); require_once('include/utils/GraphUtils.php'); @@ -102,7 +102,7 @@ //Now do the db queries //query for opportunity data that matches $datay and $user - $opp = new Potentials(); + $opp = new Potential(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -441,7 +441,7 @@ //Now do the db queries //query for opportunity data that matches $datay and $user - $opp = new Potentials(); + $opp = new Potential(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -779,7 +779,7 @@ //Now do the db queries //query for opportunity data that matches $datax and $user - $opp = new Potentials(); + $opp = new Potential(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -1057,7 +1057,7 @@ $where .= ")"; } - $opp = new Potentials(); + $opp = new Potential(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by lead source data Modified: vtigercrm/branches/5.0.1/modules/Potentials/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/Delete.php Mon Oct 16 01:50:32 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Potentials(); +$focus = new Potential(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the opportunity."); Modified: vtigercrm/branches/5.0.1/modules/Potentials/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/DetailView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('include/CustomFieldUtil.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -31,7 +31,7 @@ global $app_strings; global $currentModule, $singlepane_view; -$focus = new Potentials(); +$focus = new Potential(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Potentials(); + $modObj = new Potential(); $modObj->retrieve_entity_info($crmid,"Potentials"); $modObj->column_fields[$fieldname] = $fieldvalue; $_REQUEST[$fieldname] = $fieldvalue; Modified: vtigercrm/branches/5.0.1/modules/Potentials/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/EditView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -30,7 +30,7 @@ global $app_strings; global $mod_strings; global $currentModule; -$focus = new Potentials(); +$focus = new Potential(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/branches/5.0.1/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/ListView.php Mon Oct 16 01:50:32 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -38,7 +38,7 @@ $url_string = ''; // assigning http url string -$focus = new Potentials(); +$focus = new Potential(); $smarty = new vtigerCRM_Smarty(); $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Potentials/ListViewTop.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/ListViewTop.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/ListViewTop.php Mon Oct 16 01:50:32 2006 @@ -28,7 +28,7 @@ $log = LoggerManager::getLogger('top opportunity_list'); $log->debug("Entering getTopPotentials() method ..."); require_once("data/Tracker.php"); - require_once('modules/Potentials/Potentials.php'); + require_once('modules/Potentials/Opportunity.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); Modified: vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php Mon Oct 16 01:50:32 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Potentials/Potentials.php,v 1.65 2005/04/28 08:08:27 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Potentials/Opportunity.php,v 1.65 2005/04/28 08:08:27 rank Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -25,10 +25,10 @@ require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Emails/Email.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -96,7 +96,7 @@ var $default_order_by = 'potentialname'; var $default_sort_order = 'ASC'; - function Potentials() { + function Potential() { $this->log = LoggerManager::getLogger('potential'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Potentials'); @@ -233,7 +233,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new Contacts(); + $focus = new Contact(); $button = ''; @@ -294,10 +294,10 @@ { global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Products.php'); + require_once('modules/Products/Product.php'); global $app_strings; - $focus = new Products(); + $focus = new Product(); $button = ''; @@ -446,10 +446,10 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quotes.php'); + require_once('modules/Quotes/Quote.php'); if($this->column_fields['account_id']!='') - $focus = new Quotes(); + $focus = new Quote(); $button = ''; if(isPermitted("Quotes",1,"") == 'yes') Modified: vtigercrm/branches/5.0.1/modules/Potentials/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/Save.php Mon Oct 16 01:50:32 2006 @@ -20,13 +20,13 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Potentials(); +$focus = new Potential(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/PriceBooks/PriceBook.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -22,7 +22,7 @@ { global $currentModule; -$focus = new PriceBooks(); +$focus = new PriceBook(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/Delete.php Mon Oct 16 01:50:32 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/PriceBooks/PriceBook.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new PriceBooks(); +$focus = new PriceBook(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/DetailView.php Mon Oct 16 01:50:32 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/PriceBooks/PriceBook.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new PriceBooks(); +$focus = new PriceBook(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/PriceBooks/PriceBook.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new PriceBooks(); + $modObj = new PriceBook(); $modObj->retrieve_entity_info($crmid,"PriceBooks"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php Mon Oct 16 01:50:32 2006 @@ -11,12 +11,12 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/PriceBooks/PriceBook.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$theme,$currentModule; -$focus = new PriceBooks(); +$focus = new PriceBook(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/ListView.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/PriceBooks/PriceBook.php'); require_once('include/ListView/ListView.php'); require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); @@ -33,7 +33,7 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$focus = new PriceBooks(); +$focus = new PriceBook(); $other_text=Array(); if(!$_SESSION['lvs'][$currentModule]) Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/PriceBook.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/PriceBook.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/PriceBook.php Mon Oct 16 01:50:32 2006 @@ -51,9 +51,9 @@ /** Constructor which will set the column_fields in this object */ - function PriceBooks() { + function PriceBook() { $this->log =LoggerManager::getLogger('pricebook'); - $this->log->debug("Entering PriceBooks() method ..."); + $this->log->debug("Entering PriceBook() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('PriceBooks'); $this->log->debug("Exiting PriceBook method ..."); @@ -98,8 +98,8 @@ global $log,$singlepane_view; $log->debug("Entering get_pricebook_products(".$id.") method ..."); global $app_strings; - require_once('modules/Products/Products.php'); - $focus = new Products(); + require_once('modules/Products/Product.php'); + $focus = new Product(); $button = ''; Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/Save.php Mon Oct 16 01:50:32 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/PriceBooks/PriceBook.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new PriceBooks(); +$focus = new PriceBook(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/Products/AddProductToPriceBooks.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/AddProductToPriceBooks.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/AddProductToPriceBooks.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/PriceBooks/PriceBook.php'); require_once('include/utils/utils.php'); require_once('include/ComboUtil.php'); @@ -30,7 +30,7 @@ $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$focus = new PriceBooks(); +$focus = new PriceBook(); //Retreive the list of PriceBooks $list_query = getListQuery("PriceBooks"); Modified: vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Products.php'); +require_once('modules/Products/Product.php'); require_once('include/utils/utils.php'); require_once('include/utils/utils.php'); require_once('include/ComboUtil.php'); @@ -29,7 +29,7 @@ $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$focus = new Products(); +$focus = new Product(); if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; Modified: vtigercrm/branches/5.0.1/modules/Products/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Products/Products.php'); +require_once('modules/Products/Product.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -21,7 +21,7 @@ } else { -$focus = new Products(); +$focus = new Product(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) Modified: vtigercrm/branches/5.0.1/modules/Products/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/Delete.php Mon Oct 16 01:50:32 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Products/Products.php'); +require_once('modules/Products/Product.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new Products(); +$focus = new Product(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Products/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/DetailView.php Mon Oct 16 01:50:32 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Products.php'); +require_once('modules/Products/Product.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new Products(); +$focus = new Product(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { //Display the error message Modified: vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Products/Products.php'); +require_once('modules/Products/Product.php'); require_once('include/database/PearDatabase.php'); global $adb,$current_user; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Products(); + $modObj = new Product(); $modObj->retrieve_entity_info($crmid,"Products"); $modObj->column_fields[$fieldname] = $fieldvalue; if($fieldname == 'unit_price')//unit price converted to dollar value while saving Modified: vtigercrm/branches/5.0.1/modules/Products/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/EditView.php Mon Oct 16 01:50:32 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/Products/Products.php'); +require_once('modules/Products/Product.php'); require_once('include/FormValidationUtil.php'); global $app_strings; @@ -28,7 +28,7 @@ -$focus = new Products(); +$focus = new Product(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['record']!="") Modified: vtigercrm/branches/5.0.1/modules/Products/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/ListView.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Products.php'); +require_once('modules/Products/Product.php'); require_once('include/ListView/ListView.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -56,7 +56,7 @@ } $url_string = '&smodule=PRODUCTS'; // assigning http url string -$focus = new Products(); +$focus = new Product(); //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> $sorder = $focus->getSortOrder(); Modified: vtigercrm/branches/5.0.1/modules/Products/Product.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/Product.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/Product.php Mon Oct 16 01:50:32 2006 @@ -72,9 +72,9 @@ /** Constructor which will set the column_fields in this object */ - function Products() { + function Product() { $this->log =LoggerManager::getLogger('product'); - $this->log->debug("Entering Products() method ..."); + $this->log->debug("Entering Product() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Products'); $this->log->debug("Exiting Product method ..."); @@ -301,8 +301,8 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quotes.php'); - $focus = new Quotes(); + require_once('modules/Quotes/Quote.php'); + $focus = new Quote(); $button = ''; if($singlepane_view == 'true') @@ -345,7 +345,7 @@ $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new PurchaseOrder(); + $focus = new Order(); $button = ''; @@ -466,8 +466,8 @@ global $log,$singlepane_view; $log->debug("Entering get_product_pricebooks(".$id.") method ..."); global $mod_strings; - require_once('modules/PriceBooks/PriceBooks.php'); - $focus = new PriceBooks(); + require_once('modules/PriceBooks/PriceBook.php'); + $focus = new PriceBook(); $button = ''; if($singlepane_view == 'true') $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; Modified: vtigercrm/branches/5.0.1/modules/Products/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/Save.php Mon Oct 16 01:50:32 2006 @@ -21,14 +21,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Products/Products.php'); +require_once('modules/Products/Product.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); global $log,$current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); $rate = $rate_symbol['rate']; -$focus = new Products(); +$focus = new Product(); if(isset($_REQUEST['record'])) { $focus->id = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -21,7 +21,7 @@ } else { -$focus = new PurchaseOrder(); +$focus = new Order(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/CreatePDF.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/CreatePDF.php Mon Oct 16 01:50:32 2006 @@ -26,7 +26,7 @@ $id = $_REQUEST['record']; //retreiving the vtiger_invoice info -$focus = new PurchaseOrder(); +$focus = new Order(); $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); $vendor_name = getVendorName($focus->column_fields[vendor_id]); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/Delete.php Mon Oct 16 01:50:32 2006 @@ -24,7 +24,7 @@ require_once('include/logging.php'); $log = LoggerManager::getLogger('order_delete'); -$focus = new PurchaseOrder(); +$focus = new Order(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailView.php Mon Oct 16 01:50:32 2006 @@ -29,7 +29,7 @@ require_once('user_privileges/default_module_view.php'); global $mod_strings,$app_strings,$theme,$currentModule,$singlepane_view; -$focus = new PurchaseOrder(); +$focus = new Order(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new PurchaseOrder(); + $modObj = new Order(); $modObj->retrieve_entity_info($crmid,"PurchaseOrder"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/EditView.php Mon Oct 16 01:50:32 2006 @@ -31,7 +31,7 @@ global $app_strings,$mod_strings,$log,$theme,$currentModule; -$focus = new PurchaseOrder(); +$focus = new Order(); $smarty = new vtigerCRM_Smarty(); global $current_user; $currencyid=fetchCurrency($current_user->id); @@ -60,8 +60,8 @@ // Get vtiger_vendor address if vtiger_vendorid is given if(isset($_REQUEST['vendor_id']) && $_REQUEST['vendor_id']!='' && $_REQUEST['record']==''){ - require_once('modules/Vendors/Vendors.php'); - $vend_focus = new Vendors(); + require_once('modules/Vendors/Vendor.php'); + $vend_focus = new Vendor(); $vend_focus->retrieve_entity_info($_REQUEST['vendor_id'],"Vendors"); $focus->column_fields['bill_city']=$vend_focus->column_fields['city']; Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListTopPurchaseOrder.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListTopPurchaseOrder.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListTopPurchaseOrder.php Mon Oct 16 01:50:32 2006 @@ -47,7 +47,7 @@ $viewid = "0"; } } - $focus = new PurchaseOrder(); + $focus = new Order(); $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListView.php Mon Oct 16 01:50:32 2006 @@ -35,7 +35,7 @@ $url_string = '&smodule=PO'; -$focus = new PurchaseOrder(); +$focus = new Order(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/PurchaseOrder.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/PurchaseOrder.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/PurchaseOrder.php Mon Oct 16 01:50:32 2006 @@ -30,7 +30,7 @@ require_once('user_privileges/default_module_view.php'); // Account is used to store vtiger_account information. -class PurchaseOrder extends CRMEntity { +class Order extends CRMEntity { var $log; var $db; @@ -94,7 +94,7 @@ * 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. */ - function PurchaseOrder() { + function Order() { $this->log =LoggerManager::getLogger('PurchaseOrder'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('PurchaseOrder'); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/Save.php Mon Oct 16 01:50:32 2006 @@ -27,7 +27,7 @@ $local_log =& LoggerManager::getLogger('index'); -$focus = new PurchaseOrder(); +$focus = new Order(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/Quotes/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ } else { -$focus = new Quotes(); +$focus = new Quote(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Quotes/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/CreatePDF.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/CreatePDF.php Mon Oct 16 01:50:32 2006 @@ -11,7 +11,7 @@ require_once('include/fpdf/pdf.php'); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); require_once('include/database/PearDatabase.php'); global $adb,$app_strings; @@ -25,7 +25,7 @@ global $products_per_page; $products_per_page="6"; -$focus = new Quotes(); +$focus = new Quote(); $focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); $account_name = getAccountName($focus->column_fields[account_id]); Modified: vtigercrm/branches/5.0.1/modules/Quotes/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/Delete.php Mon Oct 16 01:50:32 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('quote_delete'); -$focus = new Quotes(); +$focus = new Quote(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Quotes/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/DetailView.php Mon Oct 16 01:50:32 2006 @@ -22,13 +22,13 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); global $mod_strings,$app_strings,$currentModule,$theme,$singlepane_view; -$focus = new Quotes(); +$focus = new Quote(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); Modified: vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Quotes(); + $modObj = new Quote(); $modObj->retrieve_entity_info($crmid,"Quotes"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Quotes/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/EditView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ $log->debug("Inside Quote EditView"); -$focus = new Quotes(); +$focus = new Quote(); $smarty = new vtigerCRM_Smarty; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); @@ -70,8 +70,8 @@ // Get Account address if vtiger_account is given if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']==''){ - require_once('modules/Accounts/Accounts.php'); - $acct_focus = new Accounts(); + require_once('modules/Accounts/Account.php'); + $acct_focus = new Account(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/branches/5.0.1/modules/Quotes/ListTopQuotes.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/ListTopQuotes.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/ListTopQuotes.php Mon Oct 16 01:50:32 2006 @@ -19,7 +19,7 @@ function getTopQuotes() { require_once("data/Tracker.php"); - require_once('modules/Quotes/Quotes.php'); + require_once('modules/Quotes/Quote.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); require_once('include/database/PearDatabase.php'); @@ -51,7 +51,7 @@ $viewid = "0"; } } - $focus = new Quotes(); + $focus = new Quote(); $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; Modified: vtigercrm/branches/5.0.1/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/ListView.php Mon Oct 16 01:50:32 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -33,7 +33,7 @@ $url_string = ''; -$focus = new Quotes(); +$focus = new Quote(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Quotes/Quote.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/Quote.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/Quote.php Mon Oct 16 01:50:32 2006 @@ -101,7 +101,7 @@ /** Constructor which will set the column_fields in this object */ - function Quotes() { + function Quote() { $this->log =LoggerManager::getLogger('quote'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Quotes'); Modified: vtigercrm/branches/5.0.1/modules/Quotes/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/Save.php Mon Oct 16 01:50:32 2006 @@ -21,7 +21,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); include("modules/Emails/mail.php"); @@ -34,7 +34,7 @@ $rate = $rate_symbol['rate']; $log->debug("Inside Quote Save"); -$focus = new Quotes(); +$focus = new Quote(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/SalesOrder/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/SalesOrder/EditView.php Mon Oct 16 01:50:32 2006 @@ -23,7 +23,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/SalesOrder/SalesOrder.php'); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -44,7 +44,7 @@ if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoso') { $quoteid = $_REQUEST['record']; - $quote_focus = new Quotes(); + $quote_focus = new Quote(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -80,7 +80,7 @@ $quoteid = $focus->column_fields['quote_id']; $smarty->assign("QUOTE_ID", $focus->column_fields['quote_id']); - $quote_focus = new Quotes(); + $quote_focus = new Quote(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -118,7 +118,7 @@ $focus->column_fields['duedate'] = getDBInsertDateValue($curr_due_date); } $quoteid = $focus->column_fields['quote_id']; - $quote_focus = new Quotes(); + $quote_focus = new Quote(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -161,8 +161,8 @@ // Get Account address if vtiger_account is given if(isset($_REQUEST['account_id']) && $_REQUEST['record']=='' && $_REQUEST['account_id'] != ''){ - require_once('modules/Accounts/Accounts.php'); - $acct_focus = new Accounts(); + require_once('modules/Accounts/Account.php'); + $acct_focus = new Account(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/branches/5.0.1/modules/Users/Authenticate.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/Authenticate.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/Authenticate.php Mon Oct 16 01:50:32 2006 @@ -20,14 +20,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('modules/Users/CreateUserPrivilegeFile.php'); require_once('include/logging.php'); require_once('user_privileges/audit_trail.php'); global $mod_strings; -$focus = new Users(); +$focus = new User(); // Add in defensive code here. $focus->column_fields["user_name"] = to_html($_REQUEST['user_name']); Modified: vtigercrm/branches/5.0.1/modules/Users/ChangePassword.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ChangePassword.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ChangePassword.php Mon Oct 16 01:50:32 2006 @@ -23,7 +23,7 @@ // The popup_picker.html file is used for generating a list from which to find and choose one instance. global $theme; -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); Modified: vtigercrm/branches/5.0.1/modules/Users/CreateUserPrivilegeFile.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/CreateUserPrivilegeFile.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/CreateUserPrivilegeFile.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('config.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/utils/utils.php'); require_once('include/utils/GetUserGroups.php'); @@ -32,7 +32,7 @@ $newbuf .="retrieve_entity_info($userid,"Users"); $userInfo=Array(); $user_focus->column_fields["id"] = ''; @@ -120,7 +120,7 @@ $newbuf .="retrieve_entity_info($userid,"Users"); if($user_focus->is_admin == 'on') { Modified: vtigercrm/branches/5.0.1/modules/Users/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/DetailView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('include/utils/utils.php'); require_once('include/utils/CommonUtils.php'); require_once('include/utils/UserInfoUtil.php'); @@ -37,7 +37,7 @@ global $app_strings; global $mod_strings; -$focus = new Users(); +$focus = new User(); if(!empty($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],'Users'); Modified: vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -24,7 +24,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $userObj = new Users(); + $userObj = new User(); $userObj->retrieve_entity_info($crmid,"Users"); $userObj->column_fields[$fieldname] = $fieldvalue; $userObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Users/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/EditView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('include/utils/UserInfoUtil.php'); require_once('modules/Users/Forms.php'); require_once('include/database/PearDatabase.php'); @@ -36,7 +36,7 @@ $smarty=new vtigerCRM_Smarty; -$focus = new Users(); +$focus = new User(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $smarty->assign("ID",$_REQUEST['record']); Modified: vtigercrm/branches/5.0.1/modules/Users/ListLoginHistory.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ListLoginHistory.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ListLoginHistory.php Mon Oct 16 01:50:32 2006 @@ -12,7 +12,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/branches/5.0.1/modules/Users/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ListView.php Mon Oct 16 01:50:32 2006 @@ -24,7 +24,7 @@ global $current_language; $mod_strings = return_module_language($current_language,'Users'); $category = getParentTab(); -$focus = new Users(); +$focus = new User(); $smarty = new vtigerCRM_Smarty; $no_of_users=UserCount(); //Retreiving the start value from request Modified: vtigercrm/branches/5.0.1/modules/Users/Logout.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/Logout.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/Logout.php Mon Oct 16 01:50:32 2006 @@ -20,7 +20,7 @@ require_once('include/logging.php'); require_once('database/DatabaseConnection.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('config.php'); require_once('include/db_backup/backup.php'); require_once('include/db_backup/ftp.php'); Modified: vtigercrm/branches/5.0.1/modules/Users/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/Save.php Mon Oct 16 01:50:32 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('include/logging.php'); require_once('include/utils/UserInfoUtil.php'); $log =& LoggerManager::getLogger('index'); @@ -46,7 +46,7 @@ if (isset($_POST['record']) && !is_admin($current_user) && $_POST['record'] != $current_user->id) echo ("Unauthorized access to user administration."); elseif (!isset($_POST['record']) && !is_admin($current_user)) echo ("Unauthorized access to user administration."); -$focus = new Users(); +$focus = new User(); if(isset($_REQUEST["record"]) && $_REQUEST["record"] != '') { $focus->mode='edit'; Modified: vtigercrm/branches/5.0.1/modules/Users/ShowAuditTrail.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ShowAuditTrail.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ShowAuditTrail.php Mon Oct 16 01:50:32 2006 @@ -12,7 +12,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/AuditTrail.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/branches/5.0.1/modules/Users/ShowHistory.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ShowHistory.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ShowHistory.php Mon Oct 16 01:50:32 2006 @@ -12,11 +12,11 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -#require_once('modules/Users/Users.php'); +#require_once('modules/Users/User.php'); require_once('include/utils/utils.php'); global $app_strings; Modified: vtigercrm/branches/5.0.1/modules/Users/User.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/User.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/User.php Mon Oct 16 01:50:32 2006 @@ -21,7 +21,7 @@ ********************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/Users.php,v 1.10 2005/04/19 14:40:48 ray Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/User.php,v 1.10 2005/04/19 14:40:48 ray Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -33,7 +33,7 @@ require_once('data/CRMEntity.php'); require_once('include/utils/UserInfoUtil.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('data/Tracker.php'); // User is used to store customer information. @@ -155,11 +155,11 @@ * */ - function Users() { + function User() { $this->log = LoggerManager::getLogger('user'); - $this->log->debug("Entering Users() method ..."); + $this->log->debug("Entering User() method ..."); $this->db = new PearDatabase(); - $this->log->debug("Exiting Users() method ..."); + $this->log->debug("Exiting User() method ..."); } Modified: vtigercrm/branches/5.0.1/modules/Users/massChangeStatus.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/massChangeStatus.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/massChangeStatus.php Mon Oct 16 01:50:32 2006 @@ -15,12 +15,12 @@ require_once('include/ComboUtil.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); global $app_list_strings; global $app_strings; global $current_user; -$focus = new Leads(); +$focus = new Lead(); $idlist = $_POST['idlist']; //echo $idlist; Modified: vtigercrm/branches/5.0.1/modules/Users/populatetemplate.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/populatetemplate.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/populatetemplate.php Mon Oct 16 01:50:32 2006 @@ -10,9 +10,9 @@ ********************************************************************************/ //query the specific vtiger_table and then get the data and write the data here require_once('include/database/PearDatabase.php'); -include_once('modules/Contacts/Contacts.php'); -include_once('modules/Leads/Leads.php'); -include_once('modules/Users/Users.php'); +include_once('modules/Contacts/Contact.php'); +include_once('modules/Leads/Lead.php'); +include_once('modules/Users/User.php'); global $log; //download the template file and store it in some specific location @@ -60,11 +60,11 @@ //get the module if($module == 'leads') { - $focus = new Leads(); + $focus = new Lead(); } else { - $focus = new Contacts(); + $focus = new Contact(); } $focus->retrieve_entity_info($recordid,$module); Modified: vtigercrm/branches/5.0.1/modules/Vendors/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendors.php'); +require_once('modules/Vendors/Vendor.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ else { global $currentModule; -$focus = new Vendors(); +$focus = new Vendor(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/Vendors/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/Delete.php Mon Oct 16 01:50:32 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Vendors/Vendors.php'); +require_once('modules/Vendors/Vendor.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new Vendors(); +$focus = new Vendor(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Vendors/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/DetailView.php Mon Oct 16 01:50:32 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendors.php'); +require_once('modules/Vendors/Vendor.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new Vendors(); +$focus = new Vendor(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Vendors/Vendors.php'); +require_once('modules/Vendors/Vendor.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Vendors(); + $modObj = new Vendor(); $modObj->retrieve_entity_info($crmid,"Vendors"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Vendors/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/EditView.php Mon Oct 16 01:50:32 2006 @@ -11,12 +11,12 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/Vendors/Vendors.php'); +require_once('modules/Vendors/Vendor.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$theme,$currentModule; -$focus = new Vendors(); +$focus = new Vendor(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/branches/5.0.1/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/ListView.php Mon Oct 16 01:50:32 2006 @@ -11,7 +11,7 @@ require_once('include/database/PearDatabase.php'); require_once('include/database/Postgres8.php'); require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendors.php'); +require_once('modules/Vendors/Vendor.php'); require_once('include/ListView/ListView.php'); require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); @@ -32,7 +32,7 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$focus = new Vendors(); +$focus = new Vendor(); $other_text = Array(); if(!$_SESSION['lvs'][$currentModule]) Modified: vtigercrm/branches/5.0.1/modules/Vendors/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/Save.php Mon Oct 16 01:50:32 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Vendors/Vendors.php'); +require_once('modules/Vendors/Vendor.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new Vendors(); +$focus = new Vendor(); setObjectValuesFromRequest(&$focus); $focus->save("Vendors"); Modified: vtigercrm/branches/5.0.1/modules/Vendors/Vendor.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/Vendor.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/Vendor.php Mon Oct 16 01:50:32 2006 @@ -58,9 +58,9 @@ /** Constructor which will set the column_fields in this object */ - function Vendors() { + function Vendor() { $this->log =LoggerManager::getLogger('vendor'); - $this->log->debug("Entering Vendors() method ..."); + $this->log->debug("Entering Vendor() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Vendors'); $this->log->debug("Exiting Vendor method ..."); @@ -75,8 +75,8 @@ global $log,$singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); global $app_strings; - require_once('modules/Products/Products.php'); - $focus = new Products(); + require_once('modules/Products/Product.php'); + $focus = new Product(); $button = ''; @@ -100,7 +100,7 @@ $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new PurchaseOrder(); + $focus = new Order(); $button = ''; @@ -123,8 +123,8 @@ global $log,$singlepane_view; $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - require_once('modules/Contacts/Contacts.php'); - $focus = new Contacts(); + require_once('modules/Contacts/Contact.php'); + $focus = new Contact(); $button = ''; if($singlepane_view == 'true') Modified: vtigercrm/branches/5.0.1/modules/Webmails/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Webmails/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Webmails/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -11,7 +11,7 @@ global $current_user; require_once('Smarty_setup.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once('data/Tracker.php'); Modified: vtigercrm/branches/5.0.1/modules/Webmails/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Webmails/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Webmails/Save.php Mon Oct 16 01:50:32 2006 @@ -9,7 +9,7 @@ * ********************************************************************************/ -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('modules/Webmails/Webmail.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); @@ -20,7 +20,7 @@ global $current_user; $local_log =& LoggerManager::getLogger('index'); -$focus = new Emails(); +$focus = new Email(); $to_address = explode(";",$_REQUEST['to_list']); $cc_address = explode(";",$_REQUEST['cc_list']); @@ -61,8 +61,8 @@ 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(); + require_once('modules/Contacts/Contact.php'); + $contact_focus = new Contact(); $contact_focus->column_fields['lastname'] =$email->fromname; $contact_focus->column_fields['email'] = $email->from; $contact_focus->save("Contacts"); Modified: vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php (original) +++ vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php Mon Oct 16 01:50:32 2006 @@ -175,8 +175,8 @@ function CheckLeadPermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -193,8 +193,8 @@ function CheckContactPermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -211,8 +211,8 @@ function CheckAccountPermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -229,8 +229,8 @@ function CheckTicketPermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -247,8 +247,8 @@ function CheckVendorPermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -265,8 +265,8 @@ function CheckProductPermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -283,8 +283,8 @@ function CheckNotePermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -301,8 +301,8 @@ function CheckSitePermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -319,8 +319,8 @@ function CheckRssPermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -340,8 +340,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -365,11 +365,11 @@ function LogintoVtigerCRM($user_name,$password) { global $log; - require_once('modules/Users/Users.php'); + require_once('modules/Users/User.php'); $return_access = "FALSE"; - $objuser = new Users(); + $objuser = new User(); if($password != "") { @@ -397,8 +397,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -436,15 +436,15 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $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(); + require_once("modules/Notes/Note.php"); + + $focus = new Note(); if(isPermitted("Notes","EditView") == "yes") { $focus->column_fields['notes_title'] = $subject; @@ -473,17 +473,17 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $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"); + require_once("modules/Products/Product.php"); if(isPermitted("Products","EditView") == "yes") { - $focus = new Products(); + $focus = new Product(); $focus->column_fields['productname'] = $productname; $focus->column_fields['productcode'] = $code; $focus->column_fields['website'] = $website; @@ -508,16 +508,16 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $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"); + require_once("modules/Vendors/Vendor.php"); if(isPermitted("Vendors","EditView" ) == "yes") { - $focus = new Vendors(); + $focus = new Vendor(); $focus->column_fields['vendorname'] = $vendorname; $focus->column_fields['email'] = $email; $focus->column_fields['phone'] = $phone; @@ -547,8 +547,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -591,15 +591,15 @@ 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(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $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"); + require_once("modules/Accounts/Account.php"); if(isPermitted("Accounts","EditView") == "yes") { - $account=new Accounts(); + $account=new Account(); $account->column_fields['accountname']=$accountname; $account->column_fields['email1']=$email; $account->column_fields['phone']=$phone; @@ -642,15 +642,15 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $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(); + require_once("modules/Leads/Lead.php"); + + $focus = new Lead(); if(isPermitted("Leads","EditView") == "yes") { $focus->column_fields['lastname'] = $lastname; @@ -689,16 +689,16 @@ { global $adb,$log; global $current_user; - require_once('modules/Users/Users.php'); - $seed_user = new Users(); + require_once('modules/Users/User.php'); + $seed_user = new User(); $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'); + require_once('modules/Contacts/Contact.php'); if(isPermitted("Contacts","EditView") == "yes") { - $contact = new Contacts(); + $contact = new Contact(); $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 Modified: vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php (original) +++ vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php Mon Oct 16 01:50:32 2006 @@ -13,7 +13,7 @@ require_once('include/logging.php'); require_once('include/nusoap/nusoap.php'); require_once('include/database/PearDatabase.php'); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); $log = &LoggerManager::getLogger('thunderbirdplugin'); @@ -173,9 +173,9 @@ function SearchContactsByEmail($username,$emailaddress) { - require_once('modules/Contacts/Contacts.php'); - - $seed_contact = new Contacts(); + require_once('modules/Contacts/Contact.php'); + + $seed_contact = new Contact(); $output_list = Array(); $response = $seed_contact->get_searchbyemailid($username,$emailaddress); @@ -201,13 +201,13 @@ 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(); + require_once('modules/Users/User.php'); + require_once('modules/Emails/Email.php'); + + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($user_name); - $email = new Emails(); + $email = new Email(); //$log->debug($msgdtls['contactid']); $emailbody = str_replace("'", "''", $email_body); $emailsubject = str_replace("'", "''",$email_subject); @@ -241,9 +241,9 @@ { global $adb; global $log; - require_once('modules/Contacts/Contacts.php'); - - $seed_contact = new Contacts(); + require_once('modules/Contacts/Contact.php'); + + $seed_contact = new Contact(); $output_list = Array(); $query = $seed_contact->get_contactsforol($username); @@ -332,8 +332,8 @@ $rows_count = $db->getRowCount($result); if($rows_count==0) { - require_once('modules/Accounts/Accounts.php'); - $account = new Accounts(); + require_once('modules/Accounts/Account.php'); + $account = new Account(); $account->column_fields[accountname] = $account_name; $account->column_fields[assigned_user_id]=$user_id; //$account->saveentity("Accounts"); @@ -360,10 +360,10 @@ { global $adb; global $current_user; - require_once('modules/Users/Users.php'); - require_once('modules/Contacts/Contacts.php'); - - $seed_user = new Users(); + require_once('modules/Users/User.php'); + require_once('modules/Contacts/Contact.php'); + + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($user_name); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -384,7 +384,7 @@ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); } - $contact = new Contacts(); + $contact = new Contact(); $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") : ""; @@ -418,10 +418,10 @@ { global $adb; global $current_user; - require_once('modules/Users/Users.php'); - require_once('modules/Leads/Leads.php'); - - $seed_user = new Users(); + require_once('modules/Users/User.php'); + require_once('modules/Leads/Lead.php'); + + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($user_name); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -442,7 +442,7 @@ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); } - $Lead = new Leads(); + $Lead = new Lead(); $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") : ""; @@ -478,8 +478,8 @@ { global $adb,$log; $return_access = 'failure'; - require_once('modules/Users/Users.php'); - $objuser = new Users(); + require_once('modules/Users/User.php'); + $objuser = new User(); if($password != "" && $user_name != '') { $objuser->column_fields['user_name'] = $user_name; @@ -511,8 +511,8 @@ function CheckContactPerm($user_name) { global $current_user; - require_once('modules/Users/Users.php'); - $seed_user = new Users(); + require_once('modules/Users/User.php'); + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($user_name); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -528,8 +528,8 @@ function CheckContactViewPerm($user_name) { global $current_user,$log; - require_once('modules/Users/Users.php'); - $seed_user = new Users(); + require_once('modules/Users/User.php'); + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($user_name); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); Modified: vtigercrm/branches/5.0.1/soap/vtigerolservice.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/vtigerolservice.php (original) +++ vtigercrm/branches/5.0.1/soap/vtigerolservice.php Mon Oct 16 01:50:32 2006 @@ -280,9 +280,9 @@ function SearchContactsByEmail($username,$emailaddress) { - require_once('modules/Contacts/Contacts.php'); + require_once('modules/Contacts/Contact.php'); - $seed_contact = new Contacts(); + $seed_contact = new Contact(); $output_list = Array(); $response = $seed_contact->get_searchbyemailid($username,$emailaddress); @@ -308,17 +308,17 @@ function AddMessageToContact($username,$contactid,$msgdtls) { global $adb; - require_once('modules/Users/Users.php'); - require_once('modules/Emails/Emails.php'); - - $seed_user = new Users(); + require_once('modules/Users/User.php'); + require_once('modules/Emails/Email.php'); + + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); foreach($msgdtls as $msgdtl) { if(isset($msgdtl)) { - $email = new Emails(); + $email = new Email(); //$log->debug($msgdtls['contactid']); $email_body = str_replace("'", "''", $msgdtl['body']); $email_subject = str_replace("'", "''",$msgdtl['subject']); @@ -356,11 +356,11 @@ function LoginToVtiger($userid,$password) { global $adb; - require_once('modules/Users/Users.php'); + require_once('modules/Users/User.php'); $return_access = "FALSE"; - $objuser = new Users(); + $objuser = new User(); if($password != "") { @@ -385,8 +385,8 @@ function CheckEmailPermission($username) { global $current_user,$log; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -403,8 +403,8 @@ function CheckContactPermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -421,8 +421,8 @@ function CheckActivityPermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -439,12 +439,12 @@ function AddEmailAttachment($emailid,$filedata,$filename,$filesize,$filetype,$username) { global $adb; - require_once('modules/Users/Users.php'); + require_once('modules/Users/User.php'); require_once('include/utils/utils.php'); $date_var = date('YmdHis'); - $seed_user = new Users(); + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $crmid = $adb->getUniqueID("vtiger_crmentity"); @@ -483,9 +483,9 @@ function GetContacts($username) { global $adb; - require_once('modules/Contacts/Contacts.php'); - - $seed_contact = new Contacts(); + require_once('modules/Contacts/Contact.php'); + + $seed_contact = new Contact(); $output_list = Array(); $query = $seed_contact->get_contactsforol($username); @@ -564,15 +564,15 @@ { global $adb; global $current_user; - require_once('modules/Users/Users.php'); - require_once('modules/Contacts/Contacts.php'); - - $seed_user = new Users(); + require_once('modules/Users/User.php'); + require_once('modules/Contacts/Contact.php'); + + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); - $contact = new Contacts(); + $contact = new Contact(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -646,15 +646,15 @@ { global $adb; global $current_user; - require_once('modules/Users/Users.php'); - require_once('modules/Contacts/Contacts.php'); - - $seed_user = new Users(); + require_once('modules/Users/User.php'); + require_once('modules/Contacts/Contact.php'); + + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); - $contact = new Contacts(); + $contact = new Contact(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -727,15 +727,15 @@ function DeleteContacts($username,$crmid) { global $current_user; - require_once('modules/Users/Users.php'); - require_once('modules/Contacts/Contacts.php'); - - $seed_user = new Users(); + require_once('modules/Users/User.php'); + require_once('modules/Contacts/Contact.php'); + + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); - $contact = new Contacts(); + $contact = new Contact(); $contact->id = $crmid; $contact->mark_deleted($contact->id); @@ -760,8 +760,8 @@ $rows_count = $db->getRowCount($result); if($rows_count==0) { - require_once('modules/Accounts/Accounts.php'); - $account = new Accounts(); + require_once('modules/Accounts/Account.php'); + $account = new Account(); $account->column_fields[accountname] = $account_name; $account->column_fields[assigned_user_id]=$user_id; //$account->saveentity("Accounts"); @@ -856,10 +856,10 @@ function AddTasks($username,$taskdtls) { global $current_user,$adb; - require_once('modules/Users/Users.php'); + require_once('modules/Users/User.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new Users(); + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -937,10 +937,10 @@ function UpdateTasks($username,$taskdtls) { global $current_user,$adb; - require_once('modules/Users/Users.php'); + require_once('modules/Users/User.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new Users(); + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1022,10 +1022,10 @@ function DeleteTasks($username,$crmid) { global $current_user; - require_once('modules/Users/Users.php'); + require_once('modules/Users/User.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new Users(); + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1091,10 +1091,10 @@ function AddClndr($username,$clndrdtls) { global $current_user,$adb; - require_once('modules/Users/Users.php'); + require_once('modules/Users/User.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new Users(); + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1159,10 +1159,10 @@ { global $current_user; global $adb,$log; - require_once('modules/Users/Users.php'); + require_once('modules/Users/User.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new Users(); + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1228,10 +1228,10 @@ function DeleteClndr($username,$crmid) { global $current_user; - require_once('modules/Users/Users.php'); + require_once('modules/Users/User.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new Users(); + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); Modified: vtigercrm/branches/5.0.1/soap/webforms.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/webforms.php (original) +++ vtigercrm/branches/5.0.1/soap/webforms.php Mon Oct 16 01:50:32 2006 @@ -82,8 +82,8 @@ $assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id'); } - require_once("modules/Leads/Leads.php"); - $focus = new Leads(); + require_once("modules/Leads/Lead.php"); + $focus = new Lead(); $focus->column_fields['lastname'] = $lastname; $focus->column_fields['email'] = $email; $focus->column_fields['phone'] = $phone; @@ -126,8 +126,8 @@ $assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id'); } - require_once('modules/Contacts/Contacts.php'); - $focus = new Contacts(); + require_once('modules/Contacts/Contact.php'); + $focus = new Contact(); $focus->column_fields['firstname'] = $first_name; $focus->column_fields['lastname'] = $last_name; Modified: vtigercrm/branches/5.0.1/soap/wordplugin.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/wordplugin.php (original) +++ vtigercrm/branches/5.0.1/soap/wordplugin.php Mon Oct 16 01:50:32 2006 @@ -215,8 +215,8 @@ function get_tickets_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($user_name); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -237,15 +237,15 @@ function get_contacts_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $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") { - require_once('modules/Contacts/Contacts.php'); - $contact = new Contacts(); + require_once('modules/Contacts/Contact.php'); + $contact = new Contact(); $log->debug($contact->getColumnNames()); return $contact->getColumnNames(); } @@ -261,15 +261,15 @@ function get_accounts_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($user_name); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); if(isPermitted("Accounts","index") == "yes") { - require_once('modules/Accounts/Accounts.php'); - $account = new Accounts(); + require_once('modules/Accounts/Account.php'); + $account = new Account(); $log->debug($account->getColumnNames_Acnt()); return $account->getColumnNames_Acnt(); } @@ -285,16 +285,16 @@ function get_leads_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($user_name); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); if(isPermitted("Leads","index") == "yes") { - require_once('modules/Leads/Leads.php'); - $lead = new Leads(); + require_once('modules/Leads/Lead.php'); + $lead = new Lead(); $log->debug($lead->getColumnNames_Lead()); return $lead->getColumnNames_Lead(); } @@ -309,12 +309,12 @@ function get_user_columns($user_name, $password) { global $current_user; - require_once('modules/Users/Users.php'); - $seed_user=new Users(); + require_once('modules/Users/User.php'); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($user_name); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); - $user = new Users(); + $user = new User(); return $user->getColumnNames_User(); } @@ -323,8 +323,8 @@ function create_session($user_name, $password) { global $adb,$log; - require_once('modules/Users/Users.php'); - $objuser = new Users(); + require_once('modules/Users/User.php'); + $objuser = new User(); if($password != "" && $user_name != '') { $objuser->column_fields['user_name'] = $user_name; From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 03:05:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 10:05:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9632 - /vtigercrm/branches/5.0.2/Copie de LICENSE.txt Message-ID: <20061016100537.D99ED788944@vtiger.fosslabs.com> Author: aissafranc Date: Mon Oct 16 04:04:46 2006 New Revision: 9632 Log: test commit, i will remove the file after Added: vtigercrm/branches/5.0.2/Copie de LICENSE.txt From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 03:09:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 10:09:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9633 - /vtigercrm/branches/5.0.2/Copie de LICENSE.txt Message-ID: <20061016100939.EFEE4788945@vtiger.fosslabs.com> Author: aissafranc Date: Mon Oct 16 04:09:35 2006 New Revision: 9633 Log: ok, commit work fine Removed: vtigercrm/branches/5.0.2/Copie de LICENSE.txt From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 07:44:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 14:44:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9634 - in /vtigercrm/branches/5.0.2: include/utils/utils.php modules/CustomView/CustomView.php modules/CustomView/EditView.php Message-ID: <20061016144404.863BA788954@vtiger.fosslabs.com> Author: jerrydgeorge Date: Mon Oct 16 08:43:49 2006 New Revision: 9634 Log: Block Details got from database for custom views--Jeri Modified: vtigercrm/branches/5.0.2/include/utils/utils.php vtigercrm/branches/5.0.2/modules/CustomView/CustomView.php vtigercrm/branches/5.0.2/modules/CustomView/EditView.php Modified: vtigercrm/branches/5.0.2/include/utils/utils.php ============================================================================== --- vtigercrm/branches/5.0.2/include/utils/utils.php (original) +++ vtigercrm/branches/5.0.2/include/utils/utils.php Mon Oct 16 08:43:49 2006 @@ -385,6 +385,35 @@ $return_value = $mod_strings; $mod_strings = $temp_mod_strings; + + $log->debug("Exiting return_module_language method ..."); + return $return_value; +} + +/*This function returns the mod_strings for the current language and the specified module +*/ + +function return_specified_module_language($language, $module) +{ + global $log; + global $default_language, $translation_string_prefix; + + @include("modules/$module/language/$language.lang.php"); + if(!isset($mod_strings)) + { + $log->warn("Unable to find the module language file for language: ".$language." and module: ".$module); + require("modules/$module/language/$default_language.lang.php"); + $language_used = $default_language; + } + + if(!isset($mod_strings)) + { + $log->fatal("Unable to load the module($module) language file for the selected language($language) or the default language($default_language)"); + $log->debug("Exiting return_module_language method ..."); + return null; + } + + $return_value = $mod_strings; $log->debug("Exiting return_module_language method ..."); return $return_value; Modified: vtigercrm/branches/5.0.2/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/CustomView/CustomView.php (original) +++ vtigercrm/branches/5.0.2/modules/CustomView/CustomView.php Mon Oct 16 08:43:49 2006 @@ -36,25 +36,7 @@ - var $module_list = Array("Leads"=>Array("Information"=>13,"Address"=>15,"Description"=>16,"Custom Information"=>14), - "Contacts"=>Array("Information"=>4,"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), - "Campaigns"=>Array("Information"=>76,"Expectations"=>78,"Description"=>82,"Custom Information"=>77), - "Products"=>Array("Information"=>31,"Description"=>36,"Pricing Information"=>32,"Stock Information"=>33,"Custom Information"=>34), - "Vendors"=>Array("Information"=>44,"Address"=>46,"Description"=>47,"Custom Information"=>45), - "PriceBooks"=>Array("Information"=>48,"Description"=>50,"Custom Information"=>49), - "Notes"=>Array("Information"=>17,"Description"=>18), - "Emails"=>Array("Information"=>'21,22,23',"Description"=>24), - "HelpDesk"=>Array("Information"=>'25,26',"Description"=>28,"Custom Information"=>27,"Solution"=>29), - "Quotes"=>Array("Information"=>51,"Address"=>53,"Description"=>56,"Terms and Conditions"=>55,"Custom Information"=>52), - "PurchaseOrder"=>Array("Information"=>57,"Address"=>59,"Description"=>62,"Terms and Conditions"=>61,"Custom Information"=>58), - "SalesOrder"=>Array("Information"=>63,"Address"=>65,"Description"=>68,"Terms and Conditions"=>67,"Custom Information"=>64), - "Faq"=>Array("Information"=>'37,38,39'), - "Invoice"=>Array("Information"=>69,"Address"=>71,"Description"=>74,"Terms and Conditions"=>73,"Custom Information"=>70) - ); - + var $module_list = Array(); var $customviewmodule; @@ -292,6 +274,8 @@ function getModuleColumnsList($module) { + + $module_info = $this->getCustomViewModuleInfo($module); foreach($this->module_list[$module] as $key=>$value) { $columnlist = $this->getColumnsListbyBlock($module,$value); @@ -342,7 +326,7 @@ global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); - + $module_info = $this->getCustomViewModuleInfo($module); foreach($this->module_list[$module] as $key=>$blockid) { $blockids[] = $blockid; @@ -1525,5 +1509,35 @@ return $calist; } + + /* This function sets the block information for the given module to the class variable module_list + * and return the array + */ + + function getCustomViewModuleInfo($module) + { + global $adb; + global $current_language; + $current_mod_strings = return_specified_module_language($current_language, $module); + $block_info = Array(); + $Sql = "select distinct block,vtiger_field.tabid,name,blocklabel from vtiger_field inner join vtiger_blocks on vtiger_blocks.blockid=vtiger_field.block inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where displaytype != 3 and vtiger_field.block not in(40,6,75,35,30,54,60,66,72) and vtiger_tab.name='$module' order by block"; + $result = $adb->query($Sql); + while($block_result = $adb->fetch_array($result)) + { + $block_label = $block_result['blocklabel']; + if (trim($block_label) == '') + { + $block_info[$pre_block_label] = $block_info[$pre_block_label].",".$block_result['block']; + }else + { + $lan_block_label = $current_mod_strings[$block_label]; + $block_info[$lan_block_label] = $block_result['block']; + } + $pre_block_label = $lan_block_label; + } + $this->module_list[$module] = $block_info; + return $this->module_list; + } + } ?> Modified: vtigercrm/branches/5.0.2/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/CustomView/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/CustomView/EditView.php Mon Oct 16 08:43:49 2006 @@ -221,7 +221,7 @@ foreach($oCustomView->module_list[$module] as $key=>$value) { $advfilter = array(); - $label = $app_list_strings['moduleList'][$module]." ".$key; + $label = $key; if(isset($columnslist[$module][$key])) { foreach($columnslist[$module][$key] as $field=>$fieldlabel) From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 07:52:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 14:52:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9635 - /vtigercrm/branches/5.0.2/modules/Users/DefaultDataPopulator.php Message-ID: <20061016145210.DAF2F788959@vtiger.fosslabs.com> Author: jerrydgeorge Date: Mon Oct 16 08:52:03 2006 New Revision: 9635 Log: issue because of the Entries for manufacturer and Emails fields has been fixed --Jeri Modified: vtigercrm/branches/5.0.2/modules/Users/DefaultDataPopulator.php Modified: vtigercrm/branches/5.0.2/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/DefaultDataPopulator.php Mon Oct 16 08:52:03 2006 @@ -428,7 +428,7 @@ $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").",'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,1,31,'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')"); @@ -502,8 +502,8 @@ $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,23,1,'V~M',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,2,23,1,'V~O',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,9,23,1,'T~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,22,1,'T~O',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,null,'BAS')"); //Block21 -- End From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 08:39:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 15:39:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9636 - /vtigercrm/branches/5.0.2/modules/Settings/CustomFieldList.php Message-ID: <20061016153943.231EB787E3D@vtiger.fosslabs.com> Author: jerrydgeorge Date: Mon Oct 16 09:39:36 2006 New Revision: 9636 Log: Hardcoded array removed and custom field supported modules obtained from database--Jeri Modified: vtigercrm/branches/5.0.2/modules/Settings/CustomFieldList.php Modified: vtigercrm/branches/5.0.2/modules/Settings/CustomFieldList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Settings/CustomFieldList.php (original) +++ vtigercrm/branches/5.0.2/modules/Settings/CustomFieldList.php Mon Oct 16 09:39:36 2006 @@ -22,20 +22,8 @@ $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); $smarty->assign("IMAGE_PATH", $image_path); -$module_array=Array('Leads'=>'Leads', - 'Accounts'=>'Accounts', - 'Contacts'=>'Contacts', - 'Potentials'=>'Potentials', - 'HelpDesk'=>'HelpDesk', - 'Products'=>'Products', - 'Vendors'=>'Vendors', - 'PriceBooks'=>'PriceBooks', - 'PurchaseOrder'=>'PurchaseOrder', - 'SalesOrder'=>'SalesOrder', - 'Quotes'=>'Quotes', - 'Invoice'=>'Invoice', - 'Campaigns'=>'Campaigns' - ); +$module_array=getCustomFieldSupportedModules(); + $cfimagecombo = Array($image_path."text.gif", $image_path."number.gif", $image_path."percent.gif", @@ -166,4 +154,18 @@ return $label; } +/* function to get the modules supports Custom Fields +*/ + +function getCustomFieldSupportedModules() +{ + global $adb; + $sql="select distinct vtiger_field.tabid,name from vtiger_field inner join vtiger_tab on vtiger_field.tabid=vtiger_tab.tabid where vtiger_field.tabid not in(9,10,16,15,8,29)"; + $result = $adb->query($sql); + while($moduleinfo=$adb->fetch_array($result)) + { + $modulelist[$moduleinfo['name']] = $moduleinfo['name']; + } + return $modulelist; +} ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 10:38:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 17:38:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9637 - in /vtigercrm/branches/5.0.2: Smarty/templates/Settings/TaxConfig.tpl include/js/Inventory.js modules/Settings/TaxConfig.php Message-ID: <20061016173855.B334D76D56F@vtiger.fosslabs.com> Author: richie Date: Mon Oct 16 11:38:47 2006 New Revision: 9637 Log: * Modified to provide the TaxLabel editing Modified: vtigercrm/branches/5.0.2/Smarty/templates/Settings/TaxConfig.tpl vtigercrm/branches/5.0.2/include/js/Inventory.js vtigercrm/branches/5.0.2/modules/Settings/TaxConfig.php Modified: vtigercrm/branches/5.0.2/Smarty/templates/Settings/TaxConfig.tpl ============================================================================== --- vtigercrm/branches/5.0.2/Smarty/templates/Settings/TaxConfig.tpl (original) +++ vtigercrm/branches/5.0.2/Smarty/templates/Settings/TaxConfig.tpl Mon Oct 16 11:38:47 2006 @@ -13,6 +13,7 @@ + {literal} '; echo "


      @@ -130,11 +132,11 @@ $unit_price = $adb->query_result($list_result,$i,"unit_price"); $field_name=$entity_id."_listprice"; - $list_body .= ''.$adb->query_result($list_result,$i,"productname").''.$adb->query_result($list_result,$i,"productcode").''.$unit_price.'
    "; - echo ""; + echo ""; echo "
    vtiger CRM 5.0.0 | Visit www.vtiger.com for more information
    vtiger CRM 5.0.2 | Visit www.vtiger.com for more information © Copyright Details
    "; // echo " Modified: vtigercrm/branches/5.0.2/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/5.0.2/install/4createConfigFile.php (original) +++ vtigercrm/branches/5.0.2/install/4createConfigFile.php Mon Oct 30 05:45:05 2006 @@ -45,8 +45,8 @@ // vtiger CRM version number; do not edit! -$vtiger_version = "5.0.1"; -$release_date = "10 October 2006"; +$vtiger_version = "5.0.2"; +$release_date = "31 October 2006"; if (isset($_REQUEST['db_hostname'])) Modified: vtigercrm/branches/5.0.2/install/5createTables.php ============================================================================== --- vtigercrm/branches/5.0.2/install/5createTables.php (original) +++ vtigercrm/branches/5.0.2/install/5createTables.php Mon Oct 30 05:45:05 2006 @@ -123,7 +123,7 @@
    "; Modified: vtigercrm/branches/5.0.2/modules/Users/about_us.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/about_us.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/about_us.php Thu Oct 26 11:42:44 2006 @@ -22,7 +22,7 @@ } else { - $patch_string = "--None--"; + $patch_string = $vtiger_current_version; } global $app_strings; global $app_list_strings; From vtigercrm-commits at vtiger.fosslabs.com Thu Oct 26 10:54:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 26 Oct 2006 17:54:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9733 - in /vtigercrm/branches/5.0.2/modules/Import: ImportAccount.php ImportContact.php ImportLead.php ImportOpportunity.php ImportProduct.php Message-ID: <20061026175417.6C007788B30@vtiger.fosslabs.com> Author: richie Date: Thu Oct 26 11:54:11 2006 New Revision: 9733 Log: Class name changed Modified: vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php vtigercrm/branches/5.0.2/modules/Import/ImportContact.php vtigercrm/branches/5.0.2/modules/Import/ImportLead.php vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php Modified: vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php Thu Oct 26 11:54:11 2006 @@ -30,7 +30,7 @@ require_once('include/ComboUtil.php'); // Account is used to store vtiger_account information. -class ImportAccount extends Account { +class ImportAccount extends Accounts { var $db; // Get _dom arrays from Database Modified: vtigercrm/branches/5.0.2/modules/Import/ImportContact.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportContact.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportContact.php Thu Oct 26 11:54:11 2006 @@ -28,7 +28,7 @@ $comboFieldArray = getComboArray($comboFieldNames); // Contact is used to store customer information. -class ImportContact extends Contact { +class ImportContact extends Contacts { // these are vtiger_fields that may be set on import // but are to be processed and incorporated // into vtiger_fields of the parent class Modified: vtigercrm/branches/5.0.2/modules/Import/ImportLead.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportLead.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportLead.php Thu Oct 26 11:54:11 2006 @@ -35,7 +35,7 @@ require_once('modules/Leads/Leads.php'); -class ImportLead extends Lead { +class ImportLead extends Leads { var $db; // This is the list of the functions to run when importing Modified: vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php Thu Oct 26 11:54:11 2006 @@ -36,7 +36,7 @@ $comboFieldArray = getComboArray($comboFieldNames); // Account is used to store vtiger_account information. -class ImportOpportunity extends Potential { +class ImportOpportunity extends Potentials { var $db; // This is the list of vtiger_fields that are required. Modified: vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php Thu Oct 26 11:54:11 2006 @@ -36,7 +36,7 @@ require_once('modules/Leads/Leads.php'); -class ImportProduct extends Product { +class ImportProduct extends Products { var $db; // This is the list of the functions to run when importing From vtigercrm-commits at vtiger.fosslabs.com Thu Oct 26 16:48:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 26 Oct 2006 23:48:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9734 - /vtigercrm/branches/4.2/include/submenu.js Message-ID: <20061026234850.DFA997704D0@vtiger.fosslabs.com> Author: allanbush Date: Thu Oct 26 17:48:48 2006 New Revision: 9734 Log: Fixed calendar display issues with IE and select boxes not being hidden properly. Closes #35. Modified: vtigercrm/branches/4.2/include/submenu.js Modified: vtigercrm/branches/4.2/include/submenu.js ============================================================================== --- vtigercrm/branches/4.2/include/submenu.js (original) +++ vtigercrm/branches/4.2/include/submenu.js Thu Oct 26 17:48:48 2006 @@ -6,8 +6,8 @@ getObj("subMenuBg").style.width=getObj("subMenu").offsetWidth getObj("subMenuBg").style.height=getObj("subMenu").offsetHeight - /*for (i=0;i Author: allanbush Date: Thu Oct 26 18:12:41 2006 New Revision: 9735 Log: Removed "Custom Action" button from customview edit view as I have no idea what it's there for. Modified: vtigercrm/branches/4.2/modules/CustomView/EditView.html vtigercrm/branches/4.2/modules/CustomView/EditView.php Modified: vtigercrm/branches/4.2/modules/CustomView/EditView.html ============================================================================== --- vtigercrm/branches/4.2/modules/CustomView/EditView.html (original) +++ vtigercrm/branches/4.2/modules/CustomView/EditView.html Thu Oct 26 18:12:41 2006 @@ -182,11 +182,6 @@ //return true; } -function goto_CustomAction(module) -{ - document.location.href = "index.php?module="+module+"&action=CustomAction&record={CUSTOMVIEWID}"; -} - @@ -206,7 +201,6 @@ {CANSAVE} - {CUSTOMACTIONBUTTON}
    Modified: vtigercrm/branches/4.2/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/branches/4.2/modules/CustomView/EditView.php (original) +++ vtigercrm/branches/4.2/modules/CustomView/EditView.php Thu Oct 26 18:12:41 2006 @@ -144,13 +144,6 @@ $xtpl->assign("MANDATORYCHECK",implode(",",$oCustomView->mandatoryvalues)); $xtpl->assign("SHOWVALUES",implode(",",$oCustomView->showvalues)); - - $cactionhtml = ""; - - if($cv_module == "Leads" || $cv_module == "Accounts" || $cv_module == "Contacts") - { - $xtpl->assign("CUSTOMACTIONBUTTON",$cactionhtml); - } } // current user can only save his own records From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 27 02:27:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 27 Oct 2006 09:27:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9736 - /vtigercrm/branches/5.0.2/modules/Settings/DeleteCustomField.php Message-ID: <20061027092701.40D54787EBE@vtiger.fosslabs.com> Author: jerrydgeorge Date: Fri Oct 27 03:26:24 2006 New Revision: 9736 Log: Columns from Customview and reports are deleted when a cutom field is deleted --jeri Modified: vtigercrm/branches/5.0.2/modules/Settings/DeleteCustomField.php Modified: vtigercrm/branches/5.0.2/modules/Settings/DeleteCustomField.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Settings/DeleteCustomField.php (original) +++ vtigercrm/branches/5.0.2/modules/Settings/DeleteCustomField.php Fri Oct 27 03:26:24 2006 @@ -50,7 +50,15 @@ $adb->query($dbquery); -//HANDLE HERE - we have to remove the entries in customview and report related tables which have this field ($colName) +//we have to remove the entries in customview and report related tables which have this field ($colName) +$adb->query("delete from vtiger_cvcolumnlist where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_cvstdfilter where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_cvadvfilter where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_selectcolumn where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_relcriteria where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_reportsortcol where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_reportdatefilter where datecolumnname like '%".$colName."%'"); +$adb->query("delete from vtiger_reportsummary where columnname like '%".$colName."%'"); //Deleting from convert lead mapping vtiger_table- Jaguar @@ -66,10 +74,7 @@ $deltablequery = 'drop table '.$colName; $adb->query($deltablequery); } -//we have to delete the custom field from custom views - don -$adb->query("delete from vtiger_cvcolumnlist where columnname like '%".$colName."%'"); -$adb->query("delete from vtiger_cvstdfilter where columnname like '%".$colName."%'"); -$adb->query("delete from vtiger_cvadvfilter where columnname like '%".$colName."%'"); + header("Location:index.php?module=Settings&action=CustomFieldList&fld_module=".$fld_module."&parenttab=Settings"); From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 27 03:35:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 27 Oct 2006 10:35:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9737 - /vtigercrm/branches/5.0.2/modules/Leads/Leads.php Message-ID: <20061027103524.61F33788B1A@vtiger.fosslabs.com> Author: richie Date: Fri Oct 27 04:35:20 2006 New Revision: 9737 Log: save_module function has been included Modified: vtigercrm/branches/5.0.2/modules/Leads/Leads.php Modified: vtigercrm/branches/5.0.2/modules/Leads/Leads.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/Leads.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/Leads.php Fri Oct 27 04:35:20 2006 @@ -86,6 +86,12 @@ $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 From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 27 06:52:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 27 Oct 2006 13:52:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9738 - /vtigercrm/branches/5.0.2/include/utils/ExportUtils.php Message-ID: <20061027135226.EA706788A61@vtiger.fosslabs.com> Author: richie Date: Fri Oct 27 07:51:46 2006 New Revision: 9738 Log: common file aded Added: vtigercrm/branches/5.0.2/include/utils/ExportUtils.php From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 27 07:15:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 27 Oct 2006 14:15:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9739 - /vtigercrm/trunk/include/utils/ExportUtils.php Message-ID: <20061027141517.8FFB0787EBE@vtiger.fosslabs.com> Author: richie Date: Fri Oct 27 08:13:59 2006 New Revision: 9739 Log: common file aded Added: vtigercrm/trunk/include/utils/ExportUtils.php From vtigercrm-commits at vtiger.fosslabs.com Sun Oct 29 10:50:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 29 Oct 2006 18:50:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9740 - in /vtigercrm/branches/5.0.2/modules/Migration: 502DBChanges.php ModifyDatabase/42P2_to_50.php ModifyDatabase/deleteCustomFields.php Message-ID: <20061029185023.ECE03788A0F@vtiger.fosslabs.com> Author: richie Date: Sun Oct 29 11:50:16 2006 New Revision: 9740 Log: file added and modifed for 502 db changes Added: vtigercrm/branches/5.0.2/modules/Migration/502DBChanges.php vtigercrm/branches/5.0.2/modules/Migration/ModifyDatabase/deleteCustomFields.php (with props) Modified: vtigercrm/branches/5.0.2/modules/Migration/ModifyDatabase/42P2_to_50.php Modified: vtigercrm/branches/5.0.2/modules/Migration/ModifyDatabase/42P2_to_50.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Migration/ModifyDatabase/42P2_to_50.php (original) +++ vtigercrm/branches/5.0.2/modules/Migration/ModifyDatabase/42P2_to_50.php Sun Oct 29 11:50:16 2006 @@ -3766,6 +3766,59 @@ } } +//Added after 5.0.1 +//we have to delete the entries from customview and report related tables for deleted customfields +include("modules/Migration/ModifyDatabase/deleteCustomFields.php"); + +//5.0.2 database changes - added on 27-10-06 + +//Query added to show Manufacturer field in Products module +Execute("update vtiger_field set displaytype=1,block=31 where tabid=14 and block=1"); +Execute("update vtiger_field set block=23,displaytype=1 where block=1 and displaytype=23 and tabid=10"); +Execute("update vtiger_field set block=22,displaytype=1 where block=1 and displaytype=22 and tabid=10"); + +//Added to rearange the attachment in HelpDesk +Execute(" update vtiger_field set block=25,sequence=12 where tabid=13 and fieldname='filename'"); + +//Query added to as entityname,its tablename,its primarykey are saved in a table +Execute(" CREATE TABLE `vtiger_entityname` ( + `tabid` int(19) NOT NULL default '0', + `modulename` varchar(50) NOT NULL, + `tablename` varchar(50) NOT NULL, + `fieldname` varchar(150) NOT NULL, + `entityidfield` varchar(150) NOT NULL, + PRIMARY KEY (`tabid`), + KEY `entityname_tabid_idx` (`tabid`) +)"); + +//Data Populated for the existing modules +Execute("insert into vtiger_entityname values(7,'Leads','vtiger_leaddetails','lastname,firstname','leadid')"); +Execute("insert into vtiger_entityname values(6,'Accounts','vtiger_account','accountname','accountid')"); +Execute("insert into vtiger_entityname values(4,'Contacts','vtiger_contactdetails','lastname,firstname','contactid')"); +Execute("insert into vtiger_entityname values(2,'Potentials','vtiger_potential','potentialname','potentialid')"); +Execute("insert into vtiger_entityname values(8,'Notes','vtiger_notes','title','notesid')"); +Execute("insert into vtiger_entityname values(13,'HelpDesk','vtiger_troubletickets','title','ticketid')"); +Execute("insert into vtiger_entityname values(9,'Calendar','vtiger_activity','subject','activityid')"); +Execute("insert into vtiger_entityname values(10,'Emails','vtiger_activity','subject','activityid')"); +Execute("insert into vtiger_entityname values(14,'Products','vtiger_products','productname','productid')"); +Execute("insert into vtiger_entityname values(29,'Users','vtiger_users','last_name,first_name','id')"); +Execute("insert into vtiger_entityname values(23,'Invoice','vtiger_invoice','subject','invoiceid')"); +Execute("insert into vtiger_entityname values(20,'Quotes','vtiger_quotes','subject','quoteid')"); +Execute("insert into vtiger_entityname values(21,'PurchaseOrder','vtiger_purchaseorder','subject','purchaseorderid')"); +Execute("insert into vtiger_entityname values(22,'SalesOrder','vtiger_salesorder','subject','salesorderid')"); +Execute("insert into vtiger_entityname values(18,'Vendors','vtiger_vendor','vendorname','vendorid')"); +Execute("insert into vtiger_entityname values(19,'PriceBooks','vtiger_pricebook','bookname','pricebookid')"); +Execute("insert into vtiger_entityname values(26,'Campaigns','vtiger_campaign','campaignname','campaignid')"); +Execute("insert into vtiger_entityname values(15,'Faq','vtiger_faq','question','id')"); + +//added quantity in stock in product default listview - All +$res = $conn->query("select vtiger_cvcolumnlist.cvid from vtiger_cvcolumnlist inner join vtiger_customview on vtiger_cvcolumnlist.cvid=vtiger_customview.cvid where entitytype='Products' and viewname='All'"); +if($conn->num_rows != 0) +{ + $cvid = $conn->query_result($res,0,'cvid'); + Execute("insert into vtiger_cvcolumnlist values($cvid,5,'vtiger_products:qtyinstock:qtyinstock:Products_Quantity_In_Stock:V')"); +} + From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 04:45:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 12:45:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9741 - in /vtigercrm/branches/5.0.2/install: 0welcome.php 4createConfigFile.php 5createTables.php Message-ID: <20061030124511.9F36E7830A2@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 05:45:05 2006 New Revision: 9741 Log: version changed to 5.0.2 Modified: vtigercrm/branches/5.0.2/install/0welcome.php vtigercrm/branches/5.0.2/install/4createConfigFile.php vtigercrm/branches/5.0.2/install/5createTables.php Modified: vtigercrm/branches/5.0.2/install/0welcome.php ============================================================================== --- vtigercrm/branches/5.0.2/install/0welcome.php (original) +++ vtigercrm/branches/5.0.2/install/0welcome.php Mon Oct 30 05:45:05 2006 @@ -97,10 +97,10 @@
    -

           This Configuration Wizard will create vtiger CRM 5.0.1 databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready. +

           This Configuration Wizard will create vtiger CRM 5.0.2 databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready.

    -

    - vtiger CRM 5.0.1 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.

    -

    vtiger CRM 5.0.1 will not work on mysql 4.0.x versions

    vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements
    +

    - vtiger CRM 5.0.2 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.

    +

    vtiger CRM 5.0.2 will not work on mysql 4.0.x versions

    vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements

    The installation wizard will guide you with the installation regardless of the setup you may have.

    - - -
    - vtigercrm-5.0.1 is all set to go! + vtigercrm-5.0.2 is all set to go!
      From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 04:49:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 12:49:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9742 - /vtigercrm/branches/5.0.2/modules/Users/about_us.php Message-ID: <20061030124950.47C1C7830A2@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 05:49:45 2006 New Revision: 9742 Log: few developers added Modified: vtigercrm/branches/5.0.2/modules/Users/about_us.php Modified: vtigercrm/branches/5.0.2/modules/Users/about_us.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/about_us.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/about_us.php Mon Oct 30 05:49:45 2006 @@ -83,18 +83,20 @@ - + + + - + - + From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 05:19:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 13:19:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9743 - in /vtigercrm/branches/5.0.2: Smarty/templates/ProfileDetailView.tpl include/language/en_us.lang.php include/utils/UserInfoUtil.php modules/Users/RenameProfile.php modules/Users/profilePrivileges.php Message-ID: <20061030131938.8B651788BA0@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 06:19:21 2006 New Revision: 9743 Log: * Modified to handle the profile name and description renaming Added: vtigercrm/branches/5.0.2/modules/Users/RenameProfile.php Modified: vtigercrm/branches/5.0.2/Smarty/templates/ProfileDetailView.tpl vtigercrm/branches/5.0.2/include/language/en_us.lang.php vtigercrm/branches/5.0.2/include/utils/UserInfoUtil.php vtigercrm/branches/5.0.2/modules/Users/profilePrivileges.php Modified: vtigercrm/branches/5.0.2/Smarty/templates/ProfileDetailView.tpl ============================================================================== --- vtigercrm/branches/5.0.2/Smarty/templates/ProfileDetailView.tpl (original) +++ vtigercrm/branches/5.0.2/Smarty/templates/ProfileDetailView.tpl Mon Oct 30 06:19:21 2006 @@ -20,6 +20,45 @@ {/literal} + + +{/literal}
      Ahmed
      Anusha
      Bharath
      Bharathi
      Don
      Ela
      Gopal
      Jeri
      Mani
      Mickie
      Minnie
      Nithya
      Philip
      Radiant
      Richie
      SRaj
      Vashni
       
      Aissa Belaid
      @@ -29,13 +68,15 @@
      {include file='SetMenu.tpl'} - + + +
      @@ -79,9 +120,47 @@
     
    +
       +
    + + + + + @@ -309,4 +388,11 @@ document.getElementById(obj).className = 'hideTable'; } {/literal} +{literal} + //for move RenameProfile + var theEventHandle = document.getElementById("renameUI"); + var theEventRoot = document.getElementById("renameProfile"); + Drag.init(theEventHandle, theEventRoot); +{/literal} + Modified: vtigercrm/branches/5.0.2/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.2/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.2/include/language/en_us.lang.php Mon Oct 30 06:19:21 2006 @@ -1042,6 +1042,9 @@ 'LBL_ADDRESS_INF'=>'Address Information', 'yes'=>'yes', +'LBL_RENAMEPROFILE_BUTTON_LABEL'=>'Rename', +'LBL_RENAME_PROFILE'=>'Rename Profile', +'LBL_PROFILE_NAME'=>'Profile Name', ); Modified: vtigercrm/branches/5.0.2/include/utils/UserInfoUtil.php ============================================================================== --- vtigercrm/branches/5.0.2/include/utils/UserInfoUtil.php (original) +++ vtigercrm/branches/5.0.2/include/utils/UserInfoUtil.php Mon Oct 30 06:19:21 2006 @@ -1346,6 +1346,23 @@ $log->debug("Exiting getProfileName method ..."); return $profilename; } +/** Function to get the vtiger_profile Description from the vtiger_profileid + * @param $profileid -- Profile Id:: Type integer + * @returns $rolename -- Role Name:: Type varchar + * + */ +function getProfileDescription($profileid) +{ + global $log; + $log->debug("Entering getProfileDescription(".$profileid.") method ..."); + global $adb; + $sql1 = "select description from vtiger_profile where profileid=".$profileid; + $result = $adb->query($sql1); + $profileDescription = $adb->query_result($result,0,"description"); + $log->debug("Exiting getProfileName method ..."); + return $profileDescription; +} + /** Function to check if the currently logged in user is permitted to perform the specified action * @param $module -- Module Name:: Type varchar Modified: vtigercrm/branches/5.0.2/modules/Users/profilePrivileges.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/profilePrivileges.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/profilePrivileges.php Mon Oct 30 06:19:21 2006 @@ -59,16 +59,24 @@ else { $profileName=getProfileName($profileId); + } $smarty->assign("PROFILE_NAME", $profileName); if(isset($_REQUEST['profile_description']) && $_REQUEST['profile_description'] != '' && $_REQUEST['mode'] == 'create') + $smarty->assign("PROFILE_DESCRIPTION",$_REQUEST['profile_description']); +else +{ + $profileDescription = getProfileDescription($profileId); +} + +$smarty->assign("Profile_Name", $profileName); +$smarty->assign("Profile_Description", $profileDescription); + if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != '') $smarty->assign("MODE",$_REQUEST['mode']); - - //Initially setting the secondary selected vtiger_tab From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 05:27:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 13:27:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9744 - /vtigercrm/branches/5.0.2/modules/Calendar/Appointment.php Message-ID: <20061030132708.3897F788BAC@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 06:27:03 2006 New Revision: 9744 Log: changes made to fix the issue in event display in calendar view --Minnie Modified: vtigercrm/branches/5.0.2/modules/Calendar/Appointment.php Modified: vtigercrm/branches/5.0.2/modules/Calendar/Appointment.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Calendar/Appointment.php (original) +++ vtigercrm/branches/5.0.2/modules/Calendar/Appointment.php Mon Oct 30 06:27:03 2006 @@ -60,7 +60,7 @@ require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); $shared_ids = getSharedCalendarId($current_user->id); - $q= "select vtiger_activity.*, vtiger_crmentity.*, vtiger_activitygrouprelation.groupname FROM vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid left join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted = 0 and vtiger_activity.activitytype in ('Call','Meeting') AND (vtiger_activity.date_start < '". $to_datetime->get_formatted_date() ."' AND vtiger_activity.date_start >= '". $from_datetime->get_formatted_date()."') "; + $q= "select vtiger_activity.*, vtiger_crmentity.*, vtiger_activitygrouprelation.groupname FROM vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid left join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname WHERE vtiger_crmentity.deleted = 0 and vtiger_activity.activitytype in ('Call','Meeting') AND (vtiger_activity.date_start < '". $to_datetime->get_formatted_date() ."' AND vtiger_activity.date_start >= '". $from_datetime->get_formatted_date()."') "; if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[16] == 3) { $sec_parameter=getListViewSecurityParameter('Calendar'); @@ -83,7 +83,7 @@ unset($obj); } //Get Recurring events - $q = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_crmentity.description, vtiger_activity.time_start,vtiger_activity.time_end, vtiger_activity.duration_hours, vtiger_activity.duration_minutes,vtiger_activity.due_date, vtiger_activity.priority, vtiger_activity.location,vtiger_activity.eventstatus, vtiger_crmentity.*, vtiger_recurringevents.recurringid, vtiger_recurringevents.recurringdate as date_start ,vtiger_recurringevents.recurringtype,vtiger_activitygrouprelation.groupname from vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid inner join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid"; + $q = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_crmentity.description, vtiger_activity.time_start,vtiger_activity.time_end, vtiger_activity.duration_hours, vtiger_activity.duration_minutes,vtiger_activity.due_date, vtiger_activity.priority, vtiger_activity.location,vtiger_activity.eventstatus, vtiger_crmentity.*, vtiger_recurringevents.recurringid, vtiger_recurringevents.recurringdate as date_start ,vtiger_recurringevents.recurringtype,vtiger_activitygrouprelation.groupname from vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid inner join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname "; $q.=" where vtiger_crmentity.deleted = 0 and vtiger_activity.activitytype in ('Call','Meeting') AND (recurringdate < '".$to_datetime->get_formatted_date()."' AND recurringdate >= '".$from_datetime->get_formatted_date(). "') "; @@ -93,7 +93,7 @@ $q .= $sec_parameter; } - $q .= " ORDER by recurringid"; + $q .= " ORDER by vtiger_recurringevents.recurringid"; $r = $adb->query($q); $n = $adb->getRowCount($r); $a = 0; From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 05:29:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 13:29:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9745 - in /vtigercrm/branches/5.0.2/Smarty/templates: pendingActivities.tpl upcomingActivities.tpl Message-ID: <20061030132944.8A6CB788BAD@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 06:29:37 2006 New Revision: 9745 Log: files added to integrate Home page activities feature --Minnie Added: vtigercrm/branches/5.0.2/Smarty/templates/pendingActivities.tpl vtigercrm/branches/5.0.2/Smarty/templates/upcomingActivities.tpl From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 05:33:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 13:33:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9746 - /vtigercrm/branches/5.0.2/Smarty/templates/HomePage.tpl Message-ID: <20061030133325.53C9E788910@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 06:33:12 2006 New Revision: 9746 Log: files added to integrate Home page activities feature --Minnie Modified: vtigercrm/branches/5.0.2/Smarty/templates/HomePage.tpl Modified: vtigercrm/branches/5.0.2/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/branches/5.0.2/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/branches/5.0.2/Smarty/templates/HomePage.tpl Mon Oct 30 06:33:12 2006 @@ -18,7 +18,26 @@ - + {**} @@ -169,75 +188,12 @@
    - {if $ACTIVITIES.0.Entries.noofactivities > 0} - - - - - - - - - - - - -
    {$MOD.LBL_UPCOMING_EVENTS}
    - - {if $ACTIVITIES.0.Entries.noofactivities eq 1} - {$ACTIVITIES.0.Entries.noofactivities} {$APP.Event} {$APP.LBL_FOR} {$MOD[$ACTIVITIES.0.Title.0]} - {else} - {$ACTIVITIES.0.Entries.noofactivities} {$APP.Events} {$APP.LBL_FOR} {$MOD[$ACTIVITIES.0.Title.0]} - {/if} -
    - - - - {foreach item=entries from=$ACTIVITIES.0.Entries} - - - - - {/foreach} -
    {$entries.IMAGE}{$entries.0}{*
    {$entries.ACCOUNT_NAME*}
    -
    -
    - {/if} - - -{if $ACTIVITIES.1.Entries.noofactivities > 0} - - - - - - - - - - -
    - {$MOD.LBL_PENDING_EVENTS}
    - - {if $ACTIVITIES.1.Entries.noofactivities eq 1} - {$ACTIVITIES.1.Entries.noofactivities} {$MOD.LBL_SINGLE_PENDING_EVENT} - {else} - {$ACTIVITIES.1.Entries.noofactivities} {$MOD.LBL_MULTIPLE_PENDING_EVENTS} - {/if} -
    - - {foreach item=entries from=$ACTIVITIES.1.Entries} - - - - - {/foreach} -
    {$entries.IMAGE}{$entries.0}{*
    {$entries.ACCOUNT_NAME*}
    -
    - -
    -{/if} - +
    + {include file="upcomingActivities.tpl"} +

    +
    + {include file="pendingActivities.tpl"} +

    From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 05:44:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 13:44:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9747 - /vtigercrm/branches/5.0.2/modules/Calendar/OpenListView.php Message-ID: <20061030134447.0DC4B7830A2@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 06:44:42 2006 New Revision: 9747 Log: files added to integrate Home page activities feature --Minnie Modified: vtigercrm/branches/5.0.2/modules/Calendar/OpenListView.php Modified: vtigercrm/branches/5.0.2/modules/Calendar/OpenListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Calendar/OpenListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Calendar/OpenListView.php Mon Oct 30 06:44:42 2006 @@ -49,82 +49,67 @@ //code added to customize upcomming and pending activities if($_REQUEST['activity_view']=='') { - $query = "select activity_view from vtiger_users where id ='$current_user->id'"; - $result=$adb->query($query); - $activity_view=$adb->query_result($result,0,'activity_view'); + $activity_view='today'; } else $activity_view=$_REQUEST['activity_view']; $today = date("Y-m-d", time()); - if($activity_view == 'Today') - { - $later = date("Y-m-d",strtotime("$today +1 day")); - } - else if($activity_view == 'This Week') - { - $later = date("Y-m-d", strtotime("$today +7 days")); - } - else if($activity_view == 'This Month') - { - $later = date("Y-m-d", strtotime("$today +1 month")); - } - else if($activity_view == 'This Year') - { - $later = date("Y-m-d", strtotime("$today +1 year")); - } - else if($activity_view == 'OverDue') - { - $later = date("Y-m-d", strtotime("$today +1 day")); - } - $last_tendays = date("Y-m-d",strtotime("$today -10 days")); + if($activity_view == 'today') + { + $upcoming_condition = " AND (date_start = '$today' OR vtiger_recurringevents.recurringdate = '$today')"; + $pending_condition = " AND (due_date = '$today' OR vtiger_recurringevents.recurringdate = '$today')"; + } + else if($activity_view == 'all') + { + $upcoming_condition = " AND (date_start >= '$today' OR vtiger_recurringevents.recurringdate >= '$today')"; + $pending_condition = " AND (due_date <= '$today' OR vtiger_recurringevents.recurringdate <= '$today')"; + } if($mode != 1) { //for upcoming avtivities - $list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity 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_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE 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.status is NULL OR vtiger_activity.status != 'Deferred') and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Not Held' ) AND ((date_start > '$today' AND date_start < '$later') OR (vtiger_recurringevents.recurringdate between '$today' and '$later') ) AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'"; + $list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity 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_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE 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.status is NULL OR vtiger_activity.status != 'Deferred') and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Not Held' ) ".$upcoming_condition." AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'"; } else { - //for pending activities for the last 10 days - $list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity 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_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE 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.status is NULL OR vtiger_activity.status != 'Deferred') and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Not Held' ) AND ((due_date > '$last_tendays' AND due_date <= '$today') OR (vtiger_recurringevents.recurringdate > '$last_tendays' AND vtiger_recurringevents.recurringdate <= '$today')) AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'"; - } + //for pending activities + $list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity 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_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE 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.status is NULL OR vtiger_activity.status != 'Deferred') and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Not Held' ) ".$pending_condition." AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'"; + } + $res = $adb->query($list_query); $noofrecords = $adb->num_rows($res); - $list_result = $adb->limitQuery($list_query,0,5); $open_activity_list = array(); - $noofrows = $adb->num_rows($list_result); - if (count($list_result)>0) + $noofrows = $adb->num_rows($res); + if (count($res)>0) for($i=0;$i<$noofrows;$i++) { - $parent_name=getRelatedTo("Calendar",$list_result,$i); - $open_activity_list[] = Array('name' => $adb->query_result($list_result,$i,'subject'), - 'id' => $adb->query_result($list_result,$i,'activityid'), - 'type' => $adb->query_result($list_result,$i,'activitytype'), - 'module' => $adb->query_result($list_result,$i,'setype'), - 'status' => $adb->query_result($list_result,$i,'status'), - 'firstname' => $adb->query_result($list_result,$i,'firstname'), - 'lastname' => $adb->query_result($list_result,$i,'lastname'), - 'accountname' => $adb->query_result($list_result,$i,'accountname'), - 'accountid' => $adb->query_result($list_result, $i, 'accountid'), - 'contactid' => $adb->query_result($list_result,$i,'contactid'), - 'date_start' => getDisplayDate($adb->query_result($list_result,$i,'date_start')), - 'due_date' => getDisplayDate($adb->query_result($list_result,$i,'due_date')), - 'recurringtype' => getDisplayDate($adb->query_result($list_result,$i,'recurringtype')), - 'recurringdate' => getDisplayDate($adb->query_result($list_result,$i,'recurringdate')), + $parent_name=getRelatedTo("Calendar",$res,$i); + $open_activity_list[] = Array('name' => $adb->query_result($res,$i,'subject'), + 'id' => $adb->query_result($res,$i,'activityid'), + 'type' => $adb->query_result($res,$i,'activitytype'), + 'module' => $adb->query_result($res,$i,'setype'), + 'status' => $adb->query_result($res,$i,'status'), + 'firstname' => $adb->query_result($res,$i,'firstname'), + 'lastname' => $adb->query_result($res,$i,'lastname'), + 'accountname' => $adb->query_result($res,$i,'accountname'), + 'accountid' => $adb->query_result($res, $i, 'accountid'), + 'contactid' => $adb->query_result($res,$i,'contactid'), + 'date_start' => getDisplayDate($adb->query_result($res,$i,'date_start')), + 'due_date' => getDisplayDate($adb->query_result($res,$i,'due_date')), + 'recurringtype' => getDisplayDate($adb->query_result($res,$i,'recurringtype')), + 'recurringdate' => getDisplayDate($adb->query_result($res,$i,'recurringdate')), 'parent'=> $parent_name, // Fredy Klammsteiner, 4.8.2005: changes from 4.0.1 migrated to 4.2 - 'priority' => $adb->query_result($list_result,$i,'priority'), // Armando L?scher 04.07.2005 -> ?priority -> Desc: Get vtiger_priority from db + 'priority' => $adb->query_result($res,$i,'priority'), // Armando L?scher 04.07.2005 -> ?priority -> Desc: Get vtiger_priority from db ); } - $later_day = getDisplayDate(date("Y-m-d", strtotime("$later -1 day "))); $title=array(); $title[]=$activity_view; $title[]='myUpcoPendAct.gif'; - //.'('.$current_module_strings["LBL_TODAY"].' '.$later_day.')'; $title[]='home_myact'; - $title[]=getActivityView($activity_view); + //$title[]=getActivityView($activity_view); $title[]='showActivityView'; $title[]='MyUpcumingFrm'; $title[]='activity_view'; @@ -229,7 +214,6 @@ } } // Code by Jaguar Ends - $entries['noofactivities'] = $noofrecords; $entries[$event['id']] = array( '0' => ''.$event["name"].'', 'IMAGE' => '', @@ -241,7 +225,7 @@ 'RECURRINGTYPE' => ereg_replace('--','',$event['recurringtype']), ); } - $values=Array('Title'=>$title,'Header'=>$header,'Entries'=>$entries); + $values=Array('noofactivities'=>$noofrecords,'Title'=>$title,'Header'=>$header,'Entries'=>$entries); $log->debug("Exiting getPendingActivities method ..."); return $values; } From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 05:47:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 13:47:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9748 - /vtigercrm/branches/5.0.2/modules/Calendar/ActivityAjax.php Message-ID: <20061030134713.72BE6786B41@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 06:47:04 2006 New Revision: 9748 Log: files added to integrate Home page activities feature --Minnie Modified: vtigercrm/branches/5.0.2/modules/Calendar/ActivityAjax.php Modified: vtigercrm/branches/5.0.2/modules/Calendar/ActivityAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Calendar/ActivityAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Calendar/ActivityAjax.php Mon Oct 30 06:47:04 2006 @@ -19,6 +19,27 @@ $cal_log =& LoggerManager::getLogger('calendar'); $cal_log->debug("In CalendarAjax file"); $mysel = $_REQUEST['view']; +if($_REQUEST['file'] == 'OpenListView') +{ + require_once('Smarty_setup.php'); + $smarty = new vtigerCRM_Smarty; + require_once("modules/Calendar/OpenListView.php"); + $smarty->assign("APP",$app_strings); + $smarty->assign("IMAGE_PATH",$image_path); + if($_REQUEST['mode'] == '0') + { + $activities[0] = getPendingActivities(0); + $smarty->assign("ACTIVITIES",$activities); + $smarty->display("upcomingActivities.tpl"); + } + else if($_REQUEST['mode'] == '1') + { + $activities[1] = getPendingActivities(1); + $smarty->assign("ACTIVITIES",$activities); + $smarty->display("pendingActivities.tpl"); + } + die(); +} $calendar_arr = Array(); $calendar_arr['IMAGE_PATH'] = $image_path; $date_data = array(); From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 06:09:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 14:09:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9749 - in /vtigercrm/branches/5.0.2: include/RelatedListView.php include/language/en_us.lang.php modules/HelpDesk/HelpDesk.php Message-ID: <20061030140948.D2ACE788BAB@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 07:09:39 2006 New Revision: 9749 Log: * Modified to display the start and end date headers and values in activity history Modified: vtigercrm/branches/5.0.2/include/RelatedListView.php vtigercrm/branches/5.0.2/include/language/en_us.lang.php vtigercrm/branches/5.0.2/modules/HelpDesk/HelpDesk.php Modified: vtigercrm/branches/5.0.2/include/RelatedListView.php ============================================================================== --- vtigercrm/branches/5.0.2/include/RelatedListView.php (original) +++ vtigercrm/branches/5.0.2/include/RelatedListView.php Mon Oct 30 07:09:39 2006 @@ -383,8 +383,8 @@ $header[] = $app_strings['LBL_TYPE']; $header[] = $app_strings['LBL_SUBJECT']; $header[] = $app_strings['LBL_RELATED_TO']; - $header[] = $mod_strings['LBL_START_DATE']; - $header[] = $mod_strings['LBL_END_DATE']; + $header[] = $app_strings['LBL_START_DATE']; + $header[] = $app_strings['LBL_END_DATE']; //$header[] = $app_strings['LBL_DESCRIPTION']; $header[] = $app_strings['LBL_ACTION']; $header[] = $app_strings['LBL_ASSIGNED_TO']; Modified: vtigercrm/branches/5.0.2/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.2/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.2/include/language/en_us.lang.php Mon Oct 30 07:09:39 2006 @@ -1045,6 +1045,8 @@ 'LBL_RENAMEPROFILE_BUTTON_LABEL'=>'Rename', 'LBL_RENAME_PROFILE'=>'Rename Profile', 'LBL_PROFILE_NAME'=>'Profile Name', +'LBL_START_DATE'=>'Start Date', +'LBL_END_DATE'=>'End Date', ); Modified: vtigercrm/branches/5.0.2/modules/HelpDesk/HelpDesk.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/HelpDesk/HelpDesk.php (original) +++ vtigercrm/branches/5.0.2/modules/HelpDesk/HelpDesk.php Mon Oct 30 07:09:39 2006 @@ -534,7 +534,7 @@ { global $log; $log->debug("Entering get_history(".$id.") method ..."); - $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus, + $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus, vtiger_activity.date_start, vtiger_activity.due_date, vtiger_activity.activitytype, vtiger_troubletickets.ticketid, vtiger_troubletickets.title, vtiger_crmentity.modifiedtime, vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name from vtiger_activity From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 06:16:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 14:16:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9750 - /vtigercrm/branches/5.0.2/modules/Emails/class.phpmailer.php Message-ID: <20061030141629.AFE43788BB9@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 07:16:25 2006 New Revision: 9750 Log: * Removed the extra parameter for the functions SendmailSend, MailSend and SmtpSend, where as these functions have only two arguements Modified: vtigercrm/branches/5.0.2/modules/Emails/class.phpmailer.php Modified: vtigercrm/branches/5.0.2/modules/Emails/class.phpmailer.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/class.phpmailer.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/class.phpmailer.php Mon Oct 30 07:16:25 2006 @@ -366,13 +366,13 @@ switch($this->Mailer) { case "sendmail": - $result = $this->SendmailSend($header, $header, html_entity_decode($body)); + $result = $this->SendmailSend($header, html_entity_decode($body)); break; case "mail": - $result = $this->MailSend($header, $header, html_entity_decode($body)); + $result = $this->MailSend($header, html_entity_decode($body)); break; case "smtp": - $result = $this->SmtpSend($header, $header, html_entity_decode($body)); + $result = $this->SmtpSend($header, html_entity_decode($body)); break; default: $this->SetError($this->Mailer . $this->Lang("mailer_not_supported")); From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 06:58:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 14:58:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9751 - in /vtigercrm/branches/5.0.2: Smarty/templates/MigrationStep1.tpl modules/Migration/502DBChanges.php modules/Migration/MigrationStep1.php Message-ID: <20061030145838.9BFCD788BAB@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 07:58:31 2006 New Revision: 9751 Log: * Modified to provide the link to apply the Database changes betseen 5.0.0/5.0.1 to 5.0.2 Modified: vtigercrm/branches/5.0.2/Smarty/templates/MigrationStep1.tpl vtigercrm/branches/5.0.2/modules/Migration/502DBChanges.php vtigercrm/branches/5.0.2/modules/Migration/MigrationStep1.php Modified: vtigercrm/branches/5.0.2/Smarty/templates/MigrationStep1.tpl ============================================================================== --- vtigercrm/branches/5.0.2/Smarty/templates/MigrationStep1.tpl (original) +++ vtigercrm/branches/5.0.2/Smarty/templates/MigrationStep1.tpl Mon Oct 30 07:58:31 2006 @@ -25,6 +25,12 @@ Modified: vtigercrm/branches/5.0.2/modules/Migration/502DBChanges.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Migration/502DBChanges.php (original) +++ vtigercrm/branches/5.0.2/modules/Migration/502DBChanges.php Mon Oct 30 07:58:31 2006 @@ -61,7 +61,7 @@ } - +echo "
      5.0.2 Database changes has been done.
    "; ?> Modified: vtigercrm/branches/5.0.2/modules/Migration/MigrationStep1.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Migration/MigrationStep1.php (original) +++ vtigercrm/branches/5.0.2/modules/Migration/MigrationStep1.php Mon Oct 30 07:58:31 2006 @@ -129,6 +129,11 @@ } } +//For 5.0.2 we have added this table. After 5.0.2 we have to remove this and provide the migration in some other way +$res = $adb->query("show create table vtiger_entityname"); +if(!$res) + $smarty->assign("502_PATCH","apply"); + $smarty->display("MigrationStep1.tpl"); From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 07:47:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 15:47:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9752 - /vtigercrm/branches/5.0.2/Release_Notes.html Message-ID: <20061030154730.7FABA788BA6@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 08:47:25 2006 New Revision: 9752 Log: modified for 5.0.2 release Modified: vtigercrm/branches/5.0.2/Release_Notes.html Modified: vtigercrm/branches/5.0.2/Release_Notes.html ============================================================================== --- vtigercrm/branches/5.0.2/Release_Notes.html (original) +++ vtigercrm/branches/5.0.2/Release_Notes.html Mon Oct 30 08:47:25 2006 @@ -27,6 +27,101 @@

    +

     

    +

    vtiger CRM 5.0.2: Release Notes

    +

    Date: October 31, 2006

    +

    Hi All,

    +

    Welcome to vtiger CRM. We are happy to annouce the release of latest + version of vtiger CRM.In this release, we have focussed on the following bug + fixes,

    +

    issues and feature enhancements listed below for your reference:

    +

     

    +

    Table of Contents

    +
      +
    1. Summary
    2. +
    3. Features & Enhancements
    4. +
    5. Bug Fixes
    6. +
    7. Known Issues
    8. +
    9. How to update the patch
    10. +
    +

    1. Summary

    +

    {$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} +
     
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    S. NoItemStatus
    1 Features 
    2Product SizePlatform Independent - 6.1 MB
    + Windows (EXE) - 26 MB
    + Linux (BIN) - 43 MB
    3Database MigrationAvailable for migrating data from 4.2Patch2/4.2.3/4.2.4/5.0.0 to 5.0.2
    4Product Download Click + Here
    5vtiger CRM - PHP Documentation URL: Click + Here
    6Product Documentation +

    Available at the Wiki

    +
    +

    2. Features & Enhancements

    +
      +
    • Viewing quantity in stock in the product list view has been added
    • +
    • Display of Event date in the Activity history
    • +
    • Facility to add tags within the Tag cloud box.
    • +
    • Today's and All views are enabled in the Home page under Upcoming and Pending activities section
      +
    • +
    +

     

    +

    3. Bug Fixes

    +
      +
    • Editing a calender entry resets the start and end time.
    • +
    • Error in custom list view when a custom field related to that view is + deleted has been handled.
    • +
    • Display of currency rate in campaign page
    • +
    • Formating issues in HTML editor.
    • +
    • Using the $contacts-salutationtype$ from Contacts in an email template, + the email client does not send the email-this issue has been fixed.
    • +
    • PHP Version check during installatioin
    • +
    • Issue in removing contacts from Events and To dos.
    • +
    • Product stock reduced twice - SO and Invoice -quantity
    • +
    +

    For more information, please refer our vtiger + CRM Bug Tracker.

    +

    4. Known Issues

    +

    We have about 125 issues to be fixed. You can refer our vtiger CRM Bug Tracker for the details of these issues.

    +

    5.How to update the patch

    +

    Kindly refer to the Migration wizard tool in our product under settings tab. +

    +

     

    +
    +

     

    vtiger CRM 5.0.1: Release Notes

    Date: Octoer 10, 2006

    From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 22:56:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 06:56:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9753 - /thunderbirdextn/trunk/install.rdf Message-ID: <20061031065652.36FD0788B98@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 23:56:20 2006 New Revision: 9753 Log: Version changed to 5.0.2 --Bharath Modified: thunderbirdextn/trunk/install.rdf Modified: thunderbirdextn/trunk/install.rdf ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 23:00:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 07:00:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9754 - /vtigertoolbar/trunk/firefox/install.rdf Message-ID: <20061031070000.C46EF788BC4@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 23:59:24 2006 New Revision: 9754 Log: Version changed to 5.0.1 to 5.0.2 and support for firefox 2.0 has been done --Bharath Modified: vtigertoolbar/trunk/firefox/install.rdf Modified: vtigertoolbar/trunk/firefox/install.rdf ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 23:00:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 07:00:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9755 - /vtigercrm/branches/5.0.2/modules/Calendar/addEventUI.php Message-ID: <20061031070024.9EA27788B98@vtiger.fosslabs.com> Author: richie Date: Tue Oct 31 00:00:21 2006 New Revision: 9755 Log: style modified for todo popup Modified: vtigercrm/branches/5.0.2/modules/Calendar/addEventUI.php Modified: vtigercrm/branches/5.0.2/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Calendar/addEventUI.php (original) +++ vtigercrm/branches/5.0.2/modules/Calendar/addEventUI.php Tue Oct 31 00:00:21 2006 @@ -649,7 +649,7 @@
    -
    - - + + + customerportal ".$version.""; ?> +   + + +   Modified: customerportal/trunk/images/loginVtigerCRM.gif ============================================================================== Binary files - no diff available. Modified: customerportal/trunk/index.php ============================================================================== --- customerportal/trunk/index.php (original) +++ customerportal/trunk/index.php Tue Oct 31 00:54:31 2006 @@ -13,6 +13,7 @@ session_start(); include("include.php"); +include("version.php"); if($_REQUEST['param'] == 'forgot_password') { @@ -35,7 +36,7 @@ session_unregister('last_login'); session_unregister('support_start_date'); session_unregister('support_end_date'); - session_destroy(); + //session_destroy(); //include("index.php"); include("login.php"); } Modified: customerportal/trunk/login.php ============================================================================== --- customerportal/trunk/login.php (original) +++ customerportal/trunk/login.php Tue Oct 31 00:54:31 2006 @@ -10,6 +10,7 @@ ********************************************************************************/ require_once("language/en_us.lang.php"); +include("version.php"); @session_start(); if(isset($_SESSION['customer_id']) && isset($_SESSION['customer_name'])) @@ -74,7 +75,7 @@ ?> - Customer Portal + Customer Portal   Email ID : From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 31 00:42:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 08:42:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9759 - /vtigercrm/branches/5.0.2/Release_Notes.html Message-ID: <20061031084233.1116F788BD2@vtiger.fosslabs.com> Author: richie Date: Tue Oct 31 01:42:29 2006 New Revision: 9759 Log: modified for 5.0.2 Modified: vtigercrm/branches/5.0.2/Release_Notes.html Modified: vtigercrm/branches/5.0.2/Release_Notes.html ============================================================================== --- vtigercrm/branches/5.0.2/Release_Notes.html (original) +++ vtigercrm/branches/5.0.2/Release_Notes.html Tue Oct 31 01:42:29 2006 @@ -31,15 +31,14 @@

    vtiger CRM 5.0.2: Release Notes

    Date: October 31, 2006

    Hi All,

    -

    Welcome to vtiger CRM. We are happy to annouce the release of latest - version of vtiger CRM.In this release, we have focussed on the following bug - fixes,

    -

    issues and feature enhancements listed below for your reference:

    -

     

    +

    Welcome to vtiger CRM!

    +

    We are happy to announce the release of vtiger CRM 5.0.2. In this release, + we have focused mainly on the bug fixes and minor enhancements so that our end-user + community will have better experience with our product.

    Table of Contents

    1. Summary
    2. -
    3. Features & Enhancements
    4. +
    5. Enhancements
    6. Bug Fixes
    7. Known Issues
    8. How to update the patch
    9. @@ -90,34 +89,42 @@ -

      2. Features & Enhancements

      +

      2. Enhancements

        -
      • Viewing quantity in stock in the product list view has been added
      • +
      • Viewing quantity in stock in the product list view
      • Display of Event date in the Activity history
      • Facility to add tags within the Tag cloud box.
      • -
      • Today's and All views are enabled in the Home page under Upcoming and Pending activities section
        +
      • Today's and All views are enabled in the Home page under Upcoming and Pending Activities sections

       

      3. Bug Fixes

        -
      • Editing a calender entry resets the start and end time.
      • -
      • Error in custom list view when a custom field related to that view is - deleted has been handled.
      • -
      • Display of currency rate in campaign page
      • -
      • Formating issues in HTML editor.
      • +
      • Editing a calender entry resets the start and end time (Ticket 2271 )
      • +
      • Error in custom list view when a custom field related to that view is deleted + has been handled (Ticket 2432)
      • +
      • Display of currency rate in campaign page (Ticket 2333 )
      • +
      • Formating issues in HTML editor.(Ticket 2290 )
      • Using the $contacts-salutationtype$ from Contacts in an email template, - the email client does not send the email-this issue has been fixed.
      • -
      • PHP Version check during installatioin
      • -
      • Issue in removing contacts from Events and To dos.
      • -
      • Product stock reduced twice - SO and Invoice -quantity
      • + the email client does not send the email-this issue has been fixed. (Ticket + 2273) +
      • PHP Version check during installation (Ticket 2329 )
      • +
      • Issue in removing contacts from Events and To dos (Ticket 2048 )
      • +
      • Product stock reduced twice - SO and Invoice -quantity (Ticket 1497 )
      -

      For more information, please refer our vtiger - CRM Bug Tracker.

      +

      For more information, please refer our vtiger CRM Bug Tracker.

      4. Known Issues

      We have about 125 issues to be fixed. You can refer our vtiger CRM Bug Tracker for the details of these issues.

      -

      5.How to update the patch

      -

      Kindly refer to the Migration wizard tool in our product under settings tab. +

      +5.How to update the patch +

      +

      To upgrade from the version 5.0.0 or 5.0.1 to the latest version 5.0.2 +

        +
      1. Login as admin user +
      2. Click on the Settings tab +
      3. Go to Migration Wizard. +
      4. Use the link 'Click here to apply the 5.0.2 Database changes from 5.0.0/5.0.1' +

       


      From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 31 01:36:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 09:36:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9760 - /vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php Message-ID: <20061031093627.081F0787D91@vtiger.fosslabs.com> Author: richie Date: Tue Oct 31 02:36:23 2006 New Revision: 9760 Log: * Changed the class name of User to Users Modified: vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php Modified: vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php Tue Oct 31 02:36:23 2006 @@ -42,7 +42,7 @@ $category = getParenttab(); -$oUser = new User($id); +$oUser = new Users($id); $user_list = getUserslist(); From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 31 01:53:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 09:53:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9761 - /vtigercrm/branches/5.0.2/include/language/en_us.lang.php Message-ID: <20061031095309.AD68B788910@vtiger.fosslabs.com> Author: richie Date: Tue Oct 31 02:53:06 2006 New Revision: 9761 Log: label added for Home page activities feature --Minnie Modified: vtigercrm/branches/5.0.2/include/language/en_us.lang.php Modified: vtigercrm/branches/5.0.2/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.2/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.2/include/language/en_us.lang.php Tue Oct 31 02:53:06 2006 @@ -59,6 +59,20 @@ 'LBL_SEARCH'=>'Search', 'LBL_LAST_VIEWED'=>'Last Viewed', + +'LBL_TODAY'=>'Today', + +'LBL_ALL'=>'All', + +'LBL_SHOW'=>'Show :', + +'today'=>"Today's", + +'all'=>'All', + +'LBL_UPCOMING_EVENTS'=>'Upcoming Activities', + +'LBL_PENDING_EVENTS'=>'Pending Activities', 'NTC_WELCOME_MESSAGE'=>"Welcome to vtiger CRM!", From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 31 02:44:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 10:44:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9762 - in /vtigercrm/trunk: ./ Smarty/templates/ Smarty/templates/Inventory/ Smarty/templates/Settings/ data/ include/ include/js/ include/language/ include/nusoap/ include/utils/ install/ modules/Accounts/ modules/Accounts/language/ modules/Calendar/ modules/Calendar/language/ modules/Campaigns/ modules/Contacts/ modules/CustomView/ modules/Emails/ modules/Faq/ modules/HelpDesk/ modules/Home/ modules/Import/ modules/Invoice/ modules/Leads/ modules/Migration/ modules/Migration/ModifyDatabase/ modules/Notes/ modules/Portal/ modules/Potentials/ modules/Potentials/language/ modules/PriceBooks/ modules/Products/ modules/PurchaseOrder/ modules/Quotes/ modules/Reports/ modules/SalesOrder/ modules/SalesOrder/pdf_templates/ modules/Settings/ modules/Users/ modules/Vendors/ modules/Webmails/ schema/ soap/ Message-ID: <20061031104413.65951788BDB@vtiger.fosslabs.com> Author: richie Date: Tue Oct 31 03:40:43 2006 New Revision: 9762 Log: 5.0.2 changes added Removed: vtigercrm/trunk/INSTALLATION.txt Modified: vtigercrm/trunk/Popup.php vtigercrm/trunk/Release_Notes.html vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl vtigercrm/trunk/Smarty/templates/ActivityListView.tpl vtigercrm/trunk/Smarty/templates/Buttons_List.tpl vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl vtigercrm/trunk/Smarty/templates/CreateView.tpl vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl vtigercrm/trunk/Smarty/templates/DisplayFields.tpl vtigercrm/trunk/Smarty/templates/EmailDetailView.tpl vtigercrm/trunk/Smarty/templates/EmailDetails.tpl vtigercrm/trunk/Smarty/templates/HomePage.tpl vtigercrm/trunk/Smarty/templates/ImportStep2.tpl vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl vtigercrm/trunk/Smarty/templates/ListRoles.tpl vtigercrm/trunk/Smarty/templates/ListView.tpl vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl vtigercrm/trunk/Smarty/templates/QuickCreate.tpl vtigercrm/trunk/Smarty/templates/Settings.tpl vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl vtigercrm/trunk/Smarty/templates/TagCloudDisplay.tpl vtigercrm/trunk/Smarty/templates/salesEditView.tpl vtigercrm/trunk/data/CRMEntity.php vtigercrm/trunk/data/Tracker.php vtigercrm/trunk/include/RelatedListView.php vtigercrm/trunk/include/js/Inventory.js vtigercrm/trunk/include/language/en_us.lang.php vtigercrm/trunk/include/nusoap/class.soap_transport_http.php vtigercrm/trunk/include/utils/CommonUtils.php vtigercrm/trunk/include/utils/DetailViewUtils.php vtigercrm/trunk/include/utils/EditViewUtils.php vtigercrm/trunk/include/utils/InventoryUtils.php vtigercrm/trunk/include/utils/ListViewUtils.php vtigercrm/trunk/include/utils/UserInfoUtil.php vtigercrm/trunk/include/utils/export.php vtigercrm/trunk/include/utils/utils.php vtigercrm/trunk/index.php vtigercrm/trunk/install/0welcome.php vtigercrm/trunk/install/1checkSystem.php vtigercrm/trunk/install/2setConfig.php vtigercrm/trunk/install/4createConfigFile.php vtigercrm/trunk/install/5createTables.inc.php vtigercrm/trunk/install/5createTables.php vtigercrm/trunk/install/populateSeedData.php vtigercrm/trunk/modules/Accounts/CallRelatedList.php vtigercrm/trunk/modules/Accounts/Delete.php vtigercrm/trunk/modules/Accounts/DetailView.php vtigercrm/trunk/modules/Accounts/DetailViewAjax.php vtigercrm/trunk/modules/Accounts/EditView.php vtigercrm/trunk/modules/Accounts/HeadLines.php vtigercrm/trunk/modules/Accounts/ListView.php vtigercrm/trunk/modules/Accounts/ListViewTop.php vtigercrm/trunk/modules/Accounts/Merge.php vtigercrm/trunk/modules/Accounts/Save.php vtigercrm/trunk/modules/Accounts/Tickerdetail.php vtigercrm/trunk/modules/Accounts/language/en_us.lang.php vtigercrm/trunk/modules/Calendar/Activity.php vtigercrm/trunk/modules/Calendar/ActivityAjax.php vtigercrm/trunk/modules/Calendar/Appointment.php vtigercrm/trunk/modules/Calendar/CalendarCommon.php vtigercrm/trunk/modules/Calendar/DetailView.php vtigercrm/trunk/modules/Calendar/ListView.php vtigercrm/trunk/modules/Calendar/OpenListView.php vtigercrm/trunk/modules/Calendar/RenderRelatedListUI.php vtigercrm/trunk/modules/Calendar/addEventUI.php vtigercrm/trunk/modules/Calendar/language/en_us.lang.php vtigercrm/trunk/modules/Campaigns/CallRelatedList.php vtigercrm/trunk/modules/Campaigns/Delete.php vtigercrm/trunk/modules/Campaigns/DetailView.php vtigercrm/trunk/modules/Campaigns/DetailViewAjax.php vtigercrm/trunk/modules/Campaigns/EditView.php vtigercrm/trunk/modules/Campaigns/ListView.php vtigercrm/trunk/modules/Campaigns/Save.php vtigercrm/trunk/modules/Contacts/CallRelatedList.php vtigercrm/trunk/modules/Contacts/Delete.php vtigercrm/trunk/modules/Contacts/DetailView.php vtigercrm/trunk/modules/Contacts/DetailViewAjax.php vtigercrm/trunk/modules/Contacts/EditView.php vtigercrm/trunk/modules/Contacts/ListView.php vtigercrm/trunk/modules/Contacts/Save.php vtigercrm/trunk/modules/CustomView/CustomView.php vtigercrm/trunk/modules/CustomView/EditView.php vtigercrm/trunk/modules/CustomView/PopulateCustomView.php vtigercrm/trunk/modules/Emails/CallRelatedList.php vtigercrm/trunk/modules/Emails/ChooseEmail.php vtigercrm/trunk/modules/Emails/Delete.php vtigercrm/trunk/modules/Emails/DetailView.php vtigercrm/trunk/modules/Emails/EditView.php vtigercrm/trunk/modules/Emails/EmailsAjax.php vtigercrm/trunk/modules/Emails/ListView.php vtigercrm/trunk/modules/Emails/Save.php vtigercrm/trunk/modules/Emails/class.phpmailer.php vtigercrm/trunk/modules/Emails/mail.php vtigercrm/trunk/modules/Emails/mailsend.php vtigercrm/trunk/modules/Emails/sendmail.php vtigercrm/trunk/modules/Faq/Faq.php vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php vtigercrm/trunk/modules/HelpDesk/HelpDesk.php vtigercrm/trunk/modules/HelpDesk/ListView.php vtigercrm/trunk/modules/Home/UnifiedSearch.php vtigercrm/trunk/modules/Import/ImportAccount.php vtigercrm/trunk/modules/Import/ImportAjax.php vtigercrm/trunk/modules/Import/ImportContact.php vtigercrm/trunk/modules/Import/ImportLead.php vtigercrm/trunk/modules/Import/ImportMap.php vtigercrm/trunk/modules/Import/ImportOpportunity.php vtigercrm/trunk/modules/Import/ImportProduct.php vtigercrm/trunk/modules/Import/ImportStep2.php vtigercrm/trunk/modules/Import/ImportSteplast.php vtigercrm/trunk/modules/Invoice/EditView.php vtigercrm/trunk/modules/Invoice/Invoice.php vtigercrm/trunk/modules/Invoice/ListTopInvoice.php vtigercrm/trunk/modules/Invoice/ListView.php vtigercrm/trunk/modules/Invoice/Save.php vtigercrm/trunk/modules/Leads/CallRelatedList.php vtigercrm/trunk/modules/Leads/Delete.php vtigercrm/trunk/modules/Leads/DetailView.php vtigercrm/trunk/modules/Leads/DetailViewAjax.php vtigercrm/trunk/modules/Leads/EditView.php vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php vtigercrm/trunk/modules/Leads/ListView.php vtigercrm/trunk/modules/Leads/Save.php vtigercrm/trunk/modules/Leads/result.php vtigercrm/trunk/modules/Migration/MigrationStep1.php vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php vtigercrm/trunk/modules/Notes/Delete.php vtigercrm/trunk/modules/Notes/DetailView.php vtigercrm/trunk/modules/Notes/DetailViewAjax.php vtigercrm/trunk/modules/Notes/EditView.php vtigercrm/trunk/modules/Notes/ListView.php vtigercrm/trunk/modules/Notes/Save.php vtigercrm/trunk/modules/Portal/Portal.js vtigercrm/trunk/modules/Portal/Save.php vtigercrm/trunk/modules/Potentials/CallRelatedList.php vtigercrm/trunk/modules/Potentials/Charts.php vtigercrm/trunk/modules/Potentials/Delete.php vtigercrm/trunk/modules/Potentials/DetailView.php vtigercrm/trunk/modules/Potentials/DetailViewAjax.php vtigercrm/trunk/modules/Potentials/EditView.php vtigercrm/trunk/modules/Potentials/ListView.php vtigercrm/trunk/modules/Potentials/ListViewTop.php vtigercrm/trunk/modules/Potentials/Save.php vtigercrm/trunk/modules/Potentials/language/en_us.lang.php vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php vtigercrm/trunk/modules/PriceBooks/Delete.php vtigercrm/trunk/modules/PriceBooks/DetailView.php vtigercrm/trunk/modules/PriceBooks/DetailViewAjax.php vtigercrm/trunk/modules/PriceBooks/EditView.php vtigercrm/trunk/modules/PriceBooks/ListView.php vtigercrm/trunk/modules/PriceBooks/Save.php vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php vtigercrm/trunk/modules/Products/CallRelatedList.php vtigercrm/trunk/modules/Products/Delete.php vtigercrm/trunk/modules/Products/DetailView.php vtigercrm/trunk/modules/Products/DetailViewAjax.php vtigercrm/trunk/modules/Products/EditView.php vtigercrm/trunk/modules/Products/ListView.php vtigercrm/trunk/modules/Products/Save.php vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php vtigercrm/trunk/modules/PurchaseOrder/Delete.php vtigercrm/trunk/modules/PurchaseOrder/DetailView.php vtigercrm/trunk/modules/PurchaseOrder/DetailViewAjax.php vtigercrm/trunk/modules/PurchaseOrder/EditView.php vtigercrm/trunk/modules/PurchaseOrder/ListTopPurchaseOrder.php vtigercrm/trunk/modules/PurchaseOrder/ListView.php vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php vtigercrm/trunk/modules/PurchaseOrder/Save.php vtigercrm/trunk/modules/Quotes/CallRelatedList.php vtigercrm/trunk/modules/Quotes/CreatePDF.php vtigercrm/trunk/modules/Quotes/Delete.php vtigercrm/trunk/modules/Quotes/DetailView.php vtigercrm/trunk/modules/Quotes/DetailViewAjax.php vtigercrm/trunk/modules/Quotes/EditView.php vtigercrm/trunk/modules/Quotes/ListTopQuotes.php vtigercrm/trunk/modules/Quotes/ListView.php vtigercrm/trunk/modules/Quotes/Save.php vtigercrm/trunk/modules/Reports/ReportColumns.php vtigercrm/trunk/modules/Reports/ReportRun.php vtigercrm/trunk/modules/Reports/Reports.php vtigercrm/trunk/modules/SalesOrder/EditView.php vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php vtigercrm/trunk/modules/SalesOrder/ListView.php vtigercrm/trunk/modules/SalesOrder/SalesOrder.php vtigercrm/trunk/modules/SalesOrder/Save.php vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php vtigercrm/trunk/modules/Settings/CustomFieldList.php vtigercrm/trunk/modules/Settings/DeleteCustomField.php vtigercrm/trunk/modules/Settings/EditComboField.php vtigercrm/trunk/modules/Settings/TaxConfig.php vtigercrm/trunk/modules/Users/Authenticate.php vtigercrm/trunk/modules/Users/ChangePassword.php vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php vtigercrm/trunk/modules/Users/DefaultDataPopulator.php vtigercrm/trunk/modules/Users/DetailView.php vtigercrm/trunk/modules/Users/DetailViewAjax.php vtigercrm/trunk/modules/Users/EditView.php vtigercrm/trunk/modules/Users/ListLoginHistory.php vtigercrm/trunk/modules/Users/ListView.php vtigercrm/trunk/modules/Users/Logout.php vtigercrm/trunk/modules/Users/Save.php vtigercrm/trunk/modules/Users/ShowAuditTrail.php vtigercrm/trunk/modules/Users/ShowHistory.php vtigercrm/trunk/modules/Users/about_us.php vtigercrm/trunk/modules/Users/massChangeStatus.php vtigercrm/trunk/modules/Users/populatetemplate.php vtigercrm/trunk/modules/Users/profilePrivileges.php vtigercrm/trunk/modules/Users/updateLeadDBStatus.php vtigercrm/trunk/modules/Vendors/CallRelatedList.php vtigercrm/trunk/modules/Vendors/Delete.php vtigercrm/trunk/modules/Vendors/DetailView.php vtigercrm/trunk/modules/Vendors/DetailViewAjax.php vtigercrm/trunk/modules/Vendors/EditView.php vtigercrm/trunk/modules/Vendors/ListView.php vtigercrm/trunk/modules/Vendors/Save.php vtigercrm/trunk/modules/Webmails/CallRelatedList.php vtigercrm/trunk/modules/Webmails/Save.php vtigercrm/trunk/schema/DatabaseSchema.xml vtigercrm/trunk/soap/firefoxtoolbar.php vtigercrm/trunk/soap/thunderbirdplugin.php vtigercrm/trunk/soap/vtigerolservice.php vtigercrm/trunk/soap/webforms.php vtigercrm/trunk/soap/wordplugin.php vtigercrm/trunk/vtigerversion.php Modified: vtigercrm/trunk/Popup.php ============================================================================== --- vtigercrm/trunk/Popup.php (original) +++ vtigercrm/trunk/Popup.php Tue Oct 31 03:40:43 2006 @@ -33,8 +33,8 @@ switch($currentModule) { case 'Contacts': - require_once("modules/$currentModule/Contact.php"); - $focus = new Contact(); + require_once("modules/$currentModule/Contacts.php"); + $focus = new Contacts(); $log = LoggerManager::getLogger('contact_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom'); $comboFieldArray = getComboArray($comboFieldNames); @@ -47,8 +47,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","",""); break; case 'Campaigns': - require_once("modules/$currentModule/Campaign.php"); - $focus = new Campaign(); + require_once("modules/$currentModule/Campaigns.php"); + $focus = new Campaigns(); $log = LoggerManager::getLogger('campaign_list'); $comboFieldNames = Array('campaignstatus'=>'campaignstatus_dom', 'campaigntype'=>'campaigntype_dom'); @@ -60,8 +60,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','campaignname','true','basic',$popuptype,"","",""); break; case 'Accounts': - require_once("modules/$currentModule/Account.php"); - $focus = new Account(); + require_once("modules/$currentModule/Accounts.php"); + $focus = new Accounts(); $log = LoggerManager::getLogger('account_list'); $comboFieldNames = Array('accounttype'=>'account_type_dom' ,'industry'=>'industry_dom'); @@ -74,8 +74,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','accountname','true','basic',$popuptype,"","",""); break; case 'Leads': - require_once("modules/$currentModule/Lead.php"); - $focus = new Lead(); + require_once("modules/$currentModule/Leads.php"); + $focus = new Leads(); $log = LoggerManager::getLogger('contact_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom' ,'leadstatus'=>'leadstatus_dom' @@ -91,8 +91,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","",""); break; case 'Potentials': - require_once("modules/$currentModule/Opportunity.php"); - $focus = new Potential(); + require_once("modules/$currentModule/Potentials.php"); + $focus = new Potentials(); $log = LoggerManager::getLogger('potential_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom' ,'opportunity_type'=>'opportunity_type_dom' @@ -104,8 +104,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','potentialname','true','basic',$popuptype,"","",""); break; case 'Quotes': - require_once("modules/$currentModule/Quote.php"); - $focus = new Quote(); + require_once("modules/$currentModule/Quotes.php"); + $focus = new Quotes(); $log = LoggerManager::getLogger('quotes_list'); $comboFieldNames = Array('quotestage'=>'quotestage_dom'); $comboFieldArray = getComboArray($comboFieldNames); @@ -121,8 +121,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','subject','true','basic',$popuptype,"","",""); break; case 'Products': - require_once("modules/$currentModule/Product.php"); - $focus = new Product(); + require_once("modules/$currentModule/Products.php"); + $focus = new Products(); $smarty->assign("SINGLE_MOD",'Product'); if(isset($_REQUEST['curr_row'])) { @@ -135,8 +135,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','productname','true','basic',$popuptype,"","",""); break; case 'Vendors': - require_once("modules/$currentModule/Vendor.php"); - $focus = new Vendor(); + require_once("modules/$currentModule/Vendors.php"); + $focus = new Vendors(); $smarty->assign("SINGLE_MOD",'Vendor'); $alphabetical = AlphabeticalSearch($currentModule,'Popup','vendorname','true','basic',$popuptype,"","",""); break; @@ -150,15 +150,15 @@ break; case 'PurchaseOrder': require_once("modules/$currentModule/PurchaseOrder.php"); - $focus = new Order(); + $focus = new PurchaseOrder(); $smarty->assign("SINGLE_MOD",'PurchaseOrder'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); $alphabetical = AlphabeticalSearch($currentModule,'Popup','subject','true','basic',$popuptype,"","",""); break; case 'PriceBooks': - require_once("modules/$currentModule/PriceBook.php"); - $focus = new PriceBook(); + require_once("modules/$currentModule/PriceBooks.php"); + $focus = new PriceBooks(); $smarty->assign("SINGLE_MOD",'PriceBook'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); @@ -175,8 +175,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','bookname','true','basic',$popuptype,"","",""); break; case 'Users': - require_once("modules/$currentModule/User.php"); - $focus = new User(); + require_once("modules/$currentModule/Users.php"); + $focus = new Users(); $smarty->assign("SINGLE_MOD",'Users'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); Modified: vtigercrm/trunk/Release_Notes.html ============================================================================== --- vtigercrm/trunk/Release_Notes.html (original) +++ vtigercrm/trunk/Release_Notes.html Tue Oct 31 03:40:43 2006 @@ -1,5 +1,5 @@ -vtiger CRM 5 Beta: Release Notes +vtiger CRM 5.0.2 : Release Notes {/literal} + + +{/literal}
      @@ -29,13 +68,15 @@
      {include file='SetMenu.tpl'} - + + +
      @@ -79,9 +120,47 @@
      -   - - +    + + + + + + + + @@ -309,4 +388,11 @@ document.getElementById(obj).className = 'hideTable'; } {/literal} +{literal} + //for move RenameProfile + var theEventHandle = document.getElementById("renameUI"); + var theEventRoot = document.getElementById("renameProfile"); + Drag.init(theEventHandle, theEventRoot); +{/literal} + Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Tue Oct 31 03:40:43 2006 @@ -68,10 +68,9 @@ Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Tue Oct 31 03:40:43 2006 @@ -11,20 +11,14 @@ -->*} {include file="Buttons_List1.tpl"} +

      - - - - +
      - - - {$MOD.LBL_SETTINGS} -
      Modified: vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl Tue Oct 31 03:40:43 2006 @@ -13,6 +13,7 @@ + {literal} '; echo "


      "; - echo ""; + echo ""; echo "
      vtiger CRM 5.0.0 | Visit www.vtiger.com for more information
      vtiger CRM 5.0.2 | Visit www.vtiger.com for more information © Copyright Details
      "; // echo " Modified: vtigercrm/trunk/install/1checkSystem.php ============================================================================== --- vtigercrm/trunk/install/1checkSystem.php (original) +++ vtigercrm/trunk/install/1checkSystem.php Tue Oct 31 03:40:43 2006 @@ -203,7 +203,7 @@
      "; Modified: vtigercrm/trunk/install/0welcome.php ============================================================================== --- vtigercrm/trunk/install/0welcome.php (original) +++ vtigercrm/trunk/install/0welcome.php Tue Oct 31 03:40:43 2006 @@ -97,10 +97,10 @@
      -

             This Configuration Wizard will create vtiger CRM 5.0.1 databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready. +

             This Configuration Wizard will create vtiger CRM 5.0.2 databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready.

      -

      - vtiger CRM 5.0.1 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.

      -

      vtiger CRM 5.0.1 will not work on mysql 4.0.x versions

      vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements
      +

      - vtiger CRM 5.0.2 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.

      +

      vtiger CRM 5.0.2 will not work on mysql 4.0.x versions

      vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements

      The installation wizard will guide you with the installation regardless of the setup you may have.

      - + Modified: vtigercrm/trunk/install/2setConfig.php ============================================================================== --- vtigercrm/trunk/install/2setConfig.php (original) +++ vtigercrm/trunk/install/2setConfig.php Tue Oct 31 03:40:43 2006 @@ -99,7 +99,7 @@ elseif (isset($dbconfig['db_name']) && $dbconfig['db_name']!='_DBC_NAME_') $db_name = $dbconfig['db_name']; else - $db_name = 'vtigercrm501'; + $db_name = 'vtigercrm502'; !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; if (isset($_REQUEST['host_name'])) $host_name = $_REQUEST['host_name']; @@ -145,7 +145,7 @@ } else { !isset($_REQUEST['db_hostname']) ? $db_hostname = $hostname: $db_hostname = $_REQUEST['db_hostname']; - !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm501" : $db_name = $_REQUEST['db_name']; + !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm502" : $db_name = $_REQUEST['db_name']; !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; !isset($_REQUEST['host_name']) ? $host_name= $hostname : $host_name= $_REQUEST['host_name']; !isset($_REQUEST['site_URL']) ? $site_URL = $web_root : $site_URL = $_REQUEST['site_URL']; @@ -155,7 +155,7 @@ !isset($_REQUEST['mail_server_username']) ? $mail_server_username = $mail_server_username : $mail_server_username = stripslashes($_REQUEST['mail_server_username']); !isset($_REQUEST['mail_server_password']) ? $mail_server_password = $mail_server_password : $mail_server_password = stripslashes($_REQUEST['mail_server_password']); !isset($_REQUEST['admin_email']) ? $admin_email = "" : $admin_email = $_REQUEST['admin_email']; - } + } !isset($_REQUEST['check_createdb']) ? $check_createdb = "" : $check_createdb = $_REQUEST['check_createdb']; !isset($_REQUEST['root_user']) ? $root_user = "" : $root_user = $_REQUEST['root_user']; !isset($_REQUEST['root_password']) ? $root_password = "" : $root_password = $_REQUEST['root_password']; @@ -367,7 +367,7 @@
      Core Components
      PHP version 5.0.x
      PHP version
      Failed.
      Invalid version ($php_version) Installed
      " : "Passed
      Version $php_version Installed
      "; ?>
      Database Type * - No Database Support Deteched + No Database Support Detected Modified: vtigercrm/trunk/install/4createConfigFile.php ============================================================================== --- vtigercrm/trunk/install/4createConfigFile.php (original) +++ vtigercrm/trunk/install/4createConfigFile.php Tue Oct 31 03:40:43 2006 @@ -45,8 +45,8 @@ // vtiger CRM version number; do not edit! -$vtiger_version = "5.0.1"; -$release_date = "10 October 2006"; +$vtiger_version = "5.0.2"; +$release_date = "31 October 2006"; if (isset($_REQUEST['db_hostname'])) Modified: vtigercrm/trunk/install/5createTables.inc.php ============================================================================== --- vtigercrm/trunk/install/5createTables.inc.php (original) +++ vtigercrm/trunk/install/5createTables.inc.php Tue Oct 31 03:40:43 2006 @@ -22,14 +22,14 @@ require_once('config.php'); require_once('include/database/PearDatabase.php'); require_once('include/logging.php'); -require_once('modules/Leads/Lead.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Leads/Leads.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Users/User.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Users/Users.php'); require_once('modules/Import/ImportMap.php'); require_once('modules/Import/UsersLastImport.php'); require_once('modules/Users/LoginHistory.php'); @@ -66,7 +66,7 @@ global $default_user_is_admin; // create default admin user - $user = new User(); + $user = new Users(); $user->column_fields["last_name"] = 'Administrator'; $user->column_fields["user_name"] = 'admin'; $user->column_fields["status"] = 'Active'; @@ -122,7 +122,7 @@ //Creating the Standard User - $user = new User(); + $user = new Users(); $user->column_fields["last_name"] = 'StandardUser'; $user->column_fields["user_name"] = 'standarduser'; $user->column_fields["is_admin"] = 'off'; Modified: vtigercrm/trunk/install/5createTables.php ============================================================================== --- vtigercrm/trunk/install/5createTables.php (original) +++ vtigercrm/trunk/install/5createTables.php Tue Oct 31 03:40:43 2006 @@ -123,7 +123,7 @@
      - vtigercrm-5.0.1 is all set to go! + vtigercrm-5.0.2 is all set to go!
        Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== --- vtigercrm/trunk/install/populateSeedData.php (original) +++ vtigercrm/trunk/install/populateSeedData.php Tue Oct 31 03:40:43 2006 @@ -19,29 +19,29 @@ require_once('config.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('modules/Contacts/contactSeedData.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Campaigns/Campaign.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); require_once('include/language/en_us.lang.php'); require_once('include/ComboStrings.php'); require_once('include/ComboUtil.php'); -require_once('modules/Products/Product.php'); -require_once('modules/PriceBooks/PriceBook.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Products/Products.php'); +require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/Vendors/Vendors.php'); require_once('modules/Faq/Faq.php'); require_once('modules/HelpDesk/HelpDesk.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Quotes/Quotes.php'); require_once('modules/SalesOrder/SalesOrder.php'); require_once('modules/PurchaseOrder/PurchaseOrder.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/InventoryUtils.php'); //Included to save inventory related products in demo data global $first_name_array; @@ -113,7 +113,7 @@ } // Look up the user id for the assigned user -$seed_user = new User(); +$seed_user = new Users(); //$adb->println("PSD assignname=".$assigned_user_name); @@ -121,7 +121,7 @@ global $current_user; -$current_user = new User(); +$current_user = new Users(); $result = $current_user->retrieve_entity_info($assigned_user_id,'Users'); $tagkey = 1; @@ -147,7 +147,7 @@ $account_name = $company_name_array[$i]; // Create new accounts. - $account = new Account(); + $account = new Accounts(); $account->column_fields["accountname"] = $account_name; $account->column_fields["phone"] = create_phone_number(); $account->column_fields["assigned_user_id"] = $assigned_user_id; @@ -196,7 +196,7 @@ //Create new opportunities - $opp = new Potential(); + $opp = new Potentials(); $opp->column_fields["assigned_user_id"] = $assigned_user_id; $opp->column_fields["potentialname"] = $account_name." - 1000 units"; @@ -235,7 +235,7 @@ for($i=0; $i<10; $i++) { - $contact = new Contact(); + $contact = new Contacts(); $contact->column_fields["firstname"] = ucfirst(strtolower($first_name_array[$i])); $contact->column_fields["lastname"] = ucfirst(strtolower($last_name_array[$i])); $contact->column_fields["assigned_user_id"] = $assigned_user_id; @@ -327,7 +327,7 @@ $company_count=0; for($i=0; $i<10; $i++) { - $lead = new Lead(); + $lead = new Leads(); $lead->column_fields["firstname"] = ucfirst(strtolower($first_name_array[$i])); $lead->column_fields["lastname"] = ucfirst(strtolower($last_name_array[$i])); @@ -404,7 +404,7 @@ //Populating Vendor Data for($i=0; $i<10; $i++) { - $vendor = new Vendor(); + $vendor = new Vendors(); $vendor->column_fields["vendorname"] = ucfirst(strtolower($first_name_array[$i])); $vendor->column_fields["phone"] = create_phone_number(); $vendor->column_fields["email"] = strtolower($vendor->column_fields["vendorname"])."@company.com"; @@ -442,7 +442,7 @@ .jpeg###","product7.jpeg###product8.jpeg###product9.jpeg###product10.jpeg###"); for($i=0; $i<10; $i++) { - $product = new Product(); + $product = new Products(); if($i>4) { $parent_key = array_rand($opportunity_ids); @@ -579,7 +579,7 @@ $validtill_array = array ("2006-09-21", "2006-10-29", "2006-12-11", "2006-10-09", "2006-11-18"); for($i=0;$i<5;$i++) { - $quote = new Quote(); + $quote = new Quotes(); $quote->column_fields["assigned_user_id"] = $assigned_user_id; $account_key = array_rand($account_ids); @@ -730,7 +730,7 @@ for($i=0;$i<5;$i++) { - $po = new Order(); + $po = new PurchaseOrder(); $po->column_fields["assigned_user_id"] = $assigned_user_id; $vendor_key = array_rand($vendor_ids); @@ -896,7 +896,7 @@ for($i=0;$i<5;$i++) { - $email = new Email(); + $email = new Emails(); $email->column_fields["assigned_user_id"] = $assigned_user_id; @@ -923,7 +923,7 @@ //$num_array = array(0,1,2,3,4); for($i=0;$i<12;$i++) { - $pricebook = new PriceBook(); + $pricebook = new PriceBooks(); $rand = array_rand($num_array); $pricebook->column_fields["bookname"] = $PB_array[$i]; @@ -940,7 +940,7 @@ for($i=0;$i<7;$i++) { - $notes = new Note(); + $notes = new Notes(); $rand = array_rand($num_array); $contact_key = array_rand($contact_ids); @@ -1118,7 +1118,7 @@ //$expected_response = Array(null,null,null); for($i=0;$icolumn_fields["campaignname"] = $campaign_name; $campaign->column_fields["campaigntype"] = $campaign_type_array[$i]; Modified: vtigercrm/trunk/modules/Accounts/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Accounts/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -22,7 +22,7 @@ } else { -$focus = new Account(); +$focus = new Accounts(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/trunk/modules/Accounts/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/Delete.php (original) +++ vtigercrm/trunk/modules/Accounts/Delete.php Tue Oct 31 03:40:43 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Account(); +$focus = new Accounts(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/trunk/modules/Accounts/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/DetailView.php (original) +++ vtigercrm/trunk/modules/Accounts/DetailView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ global $app_list_strings; global $log, $currentModule, $singlepane_view; -$focus = new Account(); +$focus = new Accounts(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Accounts"); $focus->id = $_REQUEST['record']; Modified: vtigercrm/trunk/modules/Accounts/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Accounts/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $acntObj = new Account(); + $acntObj = new Accounts(); $acntObj->retrieve_entity_info($crmid,"Accounts"); $acntObj->column_fields[$fieldname] = $fieldvalue; if($fieldname == 'annual_revenue')//annual revenue converted to dollar value while saving Modified: vtigercrm/trunk/modules/Accounts/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/EditView.php (original) +++ vtigercrm/trunk/modules/Accounts/EditView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -31,7 +31,7 @@ global $app_strings,$mod_strings,$currentModule,$theme; $smarty=new vtigerCRM_Smarty; -$focus = new Account(); +$focus = new Accounts(); if(isset($_REQUEST['record'])) { Modified: vtigercrm/trunk/modules/Accounts/HeadLines.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/HeadLines.php (original) +++ vtigercrm/trunk/modules/Accounts/HeadLines.php Tue Oct 31 03:40:43 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -include("modules/Accounts/Account.php"); +include("modules/Accounts/Accounts.php"); include("getCompanyProfile.php"); $variable = $_REQUEST['tickersymbol']; $url = "http://finance.yahoo.com/q?s=".$variable; Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Tue Oct 31 03:40:43 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -43,7 +43,7 @@ $url_string = ''; -$focus = new Account(); +$focus = new Accounts(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); @@ -80,6 +80,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); Modified: vtigercrm/trunk/modules/Accounts/ListViewTop.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListViewTop.php (original) +++ vtigercrm/trunk/modules/Accounts/ListViewTop.php Tue Oct 31 03:40:43 2006 @@ -28,7 +28,7 @@ $log = LoggerManager::getLogger('top accounts_list'); $log->debug("Entering getTopAccounts() method ..."); require_once("data/Tracker.php"); - require_once('modules/Potentials/Opportunity.php'); + require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); global $app_strings; Modified: vtigercrm/trunk/modules/Accounts/Merge.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/Merge.php (original) +++ vtigercrm/trunk/modules/Accounts/Merge.php Tue Oct 31 03:40:43 2006 @@ -1,259 +1,259 @@ - - - - -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"); -} - -//echo $mass_merge; -//die; -//for setting vtiger_accountid=0 for the contacts which are deleted -$ct_query = "select crmid from vtiger_crmentity where setype='Contacts' and deleted=1"; -$result = $adb->query($ct_query); - -while($row = $adb->fetch_array($result)) -{ - $deleted_id[] = $row['crmid']; -} - -if(count($deleted_id) > 0) -{ - $deleted_id = implode(",",$deleted_id); - $update_query = "update vtiger_contactdetails set accountid = 0 where contactid in (".$deleted_id.")"; - $result = $adb->query($update_query); -} -//End setting vtiger_accountid=0 for the contacts which are deleted - -//<<<<<<<<<<<<<<<
        >>>>>>>>>>>>>>>>>>>>>>> -$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 == "Contacts") - { - $tablename = "crmentityContacts"; - } - } - $querycolumns[$x] = $tablename.".".$columnname; - if($columnname == "smownerid") - { - if($modulename == "Accounts") - { - $querycolumns[$x] = "concat(vtiger_users.last_name,' ',vtiger_users.first_name) as userjoinname,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($modulename == "Contacts") - { - $querycolumns[$x] = "concat(usersContacts.last_name,' ',usersContacts.first_name) as userjoincname"; - } - } - if($columnname == "parentid") - { - $querycolumns[$x] = "accountAccount.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($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"; - } - } - - if($modulename == "Contacts") - { - $field_label[$x] = "CONTACT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); - } - -} - -$csvheader = implode(",",$field_label); -//<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>> - -if(count($querycolumns) > 0) -{ - $selectcolumns = implode($querycolumns,","); - -$query = "select ".$selectcolumns." from vtiger_account - 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_account as vtiger_accountAccount on vtiger_accountAccount.accountid = vtiger_account.parentid - left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid - left join vtiger_contactdetails on vtiger_contactdetails.accountid=vtiger_account.accountid - 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 - left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid - 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 - where vtiger_crmentity.deleted=0 and (crmentityContacts.deleted=0 || vtiger_crmentityContacts.deleted is null) and vtiger_account.accountid in(".$mass_merge.")"; -//echo $query; -//die; -$result = $adb->query($query); - -while($columnValues = $adb->fetch_array($result)) -{ - $y=$adb->num_fields($result); - for($x=0; $x<$y; $x++) - { - $value = $columnValues[$x]; - //<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>> - if($value == "0") - { - $value = ""; - } - if(trim($value) == "--None--" || trim($value) == "--none--") - { - $value = ""; - } - //<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>> - $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"); +} + +//echo $mass_merge; +//die; +//for setting vtiger_accountid=0 for the contacts which are deleted +$ct_query = "select crmid from vtiger_crmentity where setype='Contacts' and deleted=1"; +$result = $adb->query($ct_query); + +while($row = $adb->fetch_array($result)) +{ + $deleted_id[] = $row['crmid']; +} + +if(count($deleted_id) > 0) +{ + $deleted_id = implode(",",$deleted_id); + $update_query = "update vtiger_contactdetails set accountid = 0 where contactid in (".$deleted_id.")"; + $result = $adb->query($update_query); +} +//End setting vtiger_accountid=0 for the contacts which are deleted + +//<<<<<<<<<<<<<<<
        >>>>>>>>>>>>>>>>>>>>>>> +$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 == "Contacts") + { + $tablename = "vtiger_crmentityContacts"; + } + } + $querycolumns[$x] = $tablename.".".$columnname; + if($columnname == "smownerid") + { + if($modulename == "Accounts") + { + $querycolumns[$x] = "concat(vtiger_users.last_name,' ',vtiger_users.first_name) as userjoinname,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($modulename == "Contacts") + { + $querycolumns[$x] = "concat(vtiger_usersContacts.last_name,' ',vtiger_usersContacts.first_name) as userjoincname"; + } + } + if($columnname == "parentid") + { + $querycolumns[$x] = "vtiger_accountAccount.accountname"; + } + if($columnname == "accountid") + { + $querycolumns[$x] = "vtiger_accountContacts.accountname"; + } + if($columnname == "reportsto") + { + $querycolumns[$x] = "vtiger_contactdetailsContacts.lastname"; + } + + if($modulename == "Accounts") + { + $field_label[$x] = "ACCOUNT_".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"; + } + } + + if($modulename == "Contacts") + { + $field_label[$x] = "CONTACT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); + } + +} + +$csvheader = implode(",",$field_label); +//<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>> + +if(count($querycolumns) > 0) +{ + $selectcolumns = implode($querycolumns,","); + +$query = "select ".$selectcolumns." from vtiger_account + 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_account as vtiger_accountAccount on vtiger_accountAccount.accountid = vtiger_account.parentid + left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid + left join vtiger_contactdetails on vtiger_contactdetails.accountid=vtiger_account.accountid + 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 + left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid + 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 + where vtiger_crmentity.deleted=0 and (vtiger_crmentityContacts.deleted=0 || vtiger_crmentityContacts.deleted is null) and vtiger_account.accountid in(".$mass_merge.")"; +//echo $query; +//die; +$result = $adb->query($query); + +while($columnValues = $adb->fetch_array($result)) +{ + $y=$adb->num_fields($result); + for($x=0; $x<$y; $x++) + { + $value = $columnValues[$x]; + //<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>> + if($value == "0") + { + $value = ""; + } + if(trim($value) == "--None--" || trim($value) == "--none--") + { + $value = ""; + } + //<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>> + $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); +?> + + + Modified: vtigercrm/trunk/modules/Accounts/Save.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/Save.php (original) +++ vtigercrm/trunk/modules/Accounts/Save.php Tue Oct 31 03:40:43 2006 @@ -21,14 +21,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/logging.php'); //require_once('database/DatabaseConnection.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); global $log; -$focus = new Account(); +$focus = new Accounts(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/trunk/modules/Accounts/Tickerdetail.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/Tickerdetail.php (original) +++ vtigercrm/trunk/modules/Accounts/Tickerdetail.php Tue Oct 31 03:40:43 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once("modules/Accounts/Account.php"); +require_once("modules/Accounts/Accounts.php"); require_once("getCompanyProfile.php"); $variable = $_REQUEST['tickersymbol']; $url = "http://moneycentral.msn.com/investor/research/profile.asp?Symbol=".trim($variable); Modified: vtigercrm/trunk/modules/Accounts/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Accounts/language/en_us.lang.php Tue Oct 31 03:40:43 2006 @@ -205,6 +205,8 @@ 'Press'=>'Press', 'Prospect'=>'Prospect', 'Reseller'=>'Reseller', +'LBL_START_DATE' => 'Start Date', +'LBL_END_DATE' => 'End Date', Modified: vtigercrm/trunk/modules/Calendar/Activity.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/Activity.php (original) +++ vtigercrm/trunk/modules/Calendar/Activity.php Tue Oct 31 03:40:43 2006 @@ -30,19 +30,8 @@ class Activity extends CRMEntity { var $log; var $db; - - var $table_name = "vtiger_activity"; - #var $object_name = "activity"; - // Mike Crowe Mod --------------------------------------------------------Renamed to match vtiger_tab - var $object_name = "Activities"; - // Mike Crowe Mod --------------------------------------------------------added for general search - var $base_table_name = "vtiger_activity"; - var $cf_table_name = ""; - var $module_id = "activityid"; - - var $reminder_table = "vtiger_activity_reminder"; - - var $tab_name = Array('vtiger_crmentity','vtiger_activity','vtiger_seactivityrel','vtiger_cntactivityrel','vtiger_salesmanactivityrel','vtiger_activity_reminder','vtiger_recurringevents','vtiger_invitees'); + var $reminder_table = 'vtiger_activity_reminder'; + 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_salesmanactivityrel'=>'activityid','vtiger_activity_reminder'=>'activity_id','vtiger_recurringevents'=>'activityid'); @@ -104,8 +93,261 @@ $this->column_fields = getColumnFields('Calendar'); } - var $new_schema = true; - + + function save_module($module) + { + //Handling module specific save + //Insert into seactivity rel + if(isset($this->column_fields['parent_id']) && $this->column_fields['parent_id'] != '') + { + $this->insertIntoEntityTable("vtiger_seactivityrel", $module); + } + elseif($this->column_fields['parent_id']=='' && $insertion_mode=="edit") + { + $this->deleteRelation("vtiger_seactivityrel"); + } + //Insert into cntactivity rel + + if(isset($this->column_fields['contact_id']) && $this->column_fields['contact_id'] != '') + { + $this->insertIntoEntityTable('vtiger_cntactivityrel', $module); + } + elseif($this->column_fields['contact_id'] =='' && $insertion_mode=="edit") + { + $this->deleteRelation('vtiger_cntactivityrel'); + } + + //Handling for recurring type + //Insert into vtiger_activity_remainder table + if(isset($this->column_fields['recurringtype']) && $this->column_fields['recurringtype']!='') + $recur_type = trim($this->column_fields['recurringtype']); + else + $recur_type=''; + + if($recur_type == "--None--") + { + $this->insertIntoReminderTable('vtiger_activity_reminder',$module,""); + } + + //Insert into vtiger_recurring event table + $recur_type = trim($this->column_fields['recurringtype']); + if($recur_type != "--None--" && $recur_type != '') + { + $recur_data = getrecurringObjValue(); + if(is_object($recur_data)) + $this->insertIntoRecurringTable($recur_data); + } + + //Handling for invitees + if(isset($_REQUEST['inviteesid']) && $_REQUEST['inviteesid']!='') + { + $selected_users_string = $_REQUEST['inviteesid']; + $invitees_array = explode(';',$selected_users_string); + $this->insertIntoInviteeTable('vtiger_invitees',$module,$invitees_array); + + } + + //Inserting into sales man activity rel + $this->insertIntoSmActivityRel($module); + + + + } + + + /** Function to insert values in vtiger_activity_remainder table for the specified module, + * @param $table_name -- table name:: Type varchar + * @param $module -- module:: Type varchar + */ + function insertIntoReminderTable($table_name,$module,$recurid) + { + global $log; + $log->info("in insertIntoReminderTable ".$table_name." module is ".$module); + if($_REQUEST['set_reminder'] == 'Yes') + { + $log->debug("set reminder is set"); + $rem_days = $_REQUEST['remdays']; + $log->debug("rem_days is ".$rem_days); + $rem_hrs = $_REQUEST['remhrs']; + $log->debug("rem_hrs is ".$rem_hrs); + $rem_min = $_REQUEST['remmin']; + $log->debug("rem_minutes is ".$rem_min); + $reminder_time = $rem_days * 24 * 60 + $rem_hrs * 60 + $rem_min; + $log->debug("reminder_time is ".$reminder_time); + if ($recurid == "") + { + if($_REQUEST['mode'] == 'edit') + { + $this->activity_reminder($this->id,$reminder_time,0,$recurid,'edit'); + } + else + { + $this->activity_reminder($this->id,$reminder_time,0,$recurid,''); + } + } + else + { + $this->activity_reminder($this->id,$reminder_time,0,$recurid,''); + } + } + elseif($_REQUEST['set_reminder'] == 'No') + { + $this->activity_reminder($this->id,'0',0,$recurid,'delete'); + } + } + + + // Code included by Jaguar - starts + /** Function to insert values in vtiger_recurringevents table for the specified tablename,module + * @param $recurObj -- Recurring Object:: Type varchar + */ +function insertIntoRecurringTable(& $recurObj) +{ + global $log,$adb; + $log->info("in insertIntoRecurringTable "); + $st_date = $recurObj->startdate->get_formatted_date(); + $log->debug("st_date ".$st_date); + $end_date = $recurObj->enddate->get_formatted_date(); + $log->debug("end_date is set ".$end_date); + $type = $recurObj->recur_type; + $log->debug("type is ".$type); + $flag="true"; + + if($_REQUEST['mode'] == 'edit') + { + $activity_id=$this->id; + + $sql='select min(recurringdate) AS min_date,max(recurringdate) AS max_date, recurringtype, activityid from vtiger_recurringevents where activityid='. $activity_id.' group by activityid, recurringtype'; + + $result = $adb->query($sql); + $noofrows = $adb->num_rows($result); + for($i=0; $i<$noofrows; $i++) + { + $recur_type_b4_edit = $adb->query_result($result,$i,"recurringtype"); + $date_start_b4edit = $adb->query_result($result,$i,"min_date"); + $end_date_b4edit = $adb->query_result($result,$i,"max_date"); + } + if(($st_date == $date_start_b4edit) && ($end_date==$end_date_b4edit) && ($type == $recur_type_b4_edit)) + { + if($_REQUEST['set_reminder'] == 'Yes') + { + $sql = 'delete from vtiger_activity_reminder where activity_id='.$activity_id; + $adb->query($sql); + $sql = 'delete from vtiger_recurringevents where activityid='.$activity_id; + $adb->query($sql); + $flag="true"; + } + elseif($_REQUEST['set_reminder'] == 'No') + { + $sql = 'delete from vtiger_activity_reminder where activity_id='.$activity_id; + $adb->query($sql); + $flag="false"; + } + else + $flag="false"; + } + else + { + $sql = 'delete from vtiger_activity_reminder where activity_id='.$activity_id; + $adb->query($sql); + $sql = 'delete from vtiger_recurringevents where activityid='.$activity_id; + $adb->query($sql); + } + } + $date_array = $recurObj->recurringdates; + if(isset($recurObj->recur_freq) && $recurObj->recur_freq != null) + $recur_freq = $recurObj->recur_freq; + else + $recur_freq = 1; + if($recurObj->recur_type == 'Daily' || $recurObj->recur_type == 'Yearly') + $recurringinfo = $recurObj->recur_type; + elseif($recurObj->recur_type == 'Weekly') + { + $recurringinfo = $recurObj->recur_type; + if($recurObj->dayofweek_to_rpt != null) + $recurringinfo = $recurringinfo.'::'.implode('::',$recurObj->dayofweek_to_rpt); + } + elseif($recurObj->recur_type == 'Monthly') + { + $recurringinfo = $recurObj->recur_type.'::'.$recurObj->repeat_monthby; + if($recurObj->repeat_monthby == 'date') + $recurringinfo = $recurringinfo.'::'.$recurObj->rptmonth_datevalue; + else + $recurringinfo = $recurringinfo.'::'.$recurObj->rptmonth_daytype.'::'.$recurObj->dayofweek_to_rpt[0]; + } + else + { + $recurringinfo = ''; + } + if($flag=="true") + { + for($k=0; $k< count($date_array); $k++) + { + $tdate=$date_array[$k]; + if($tdate <= $end_date) + { + $max_recurid_qry = 'select max(recurringid) AS recurid from vtiger_recurringevents;'; + $result = $adb->query($max_recurid_qry); + $noofrows = $adb->num_rows($result); + for($i=0; $i<$noofrows; $i++) + { + $recur_id = $adb->query_result($result,$i,"recurid"); + } + $current_id =$recur_id+1; + $recurring_insert = "insert into vtiger_recurringevents values ('".$current_id."','".$this->id."','".$tdate."','".$type."','".$recur_freq."','".$recurringinfo."')"; + $adb->query($recurring_insert); + if($_REQUEST['set_reminder'] == 'Yes') + { + $this->insertIntoReminderTable("vtiger_activity_reminder",$module,$current_id,''); + } + } + } + } +} + + + /** Function to insert values in vtiger_invitees table for the specified module,tablename ,invitees_array + * @param $table_name -- table name:: Type varchar + * @param $module -- module:: Type varchar + * @param $invitees_array Array + */ + function insertIntoInviteeTable($table_name,$module,$invitees_array) + { + global $log,$adb; + $log->debug("Entering insertIntoInviteeTable(".$table_name.",".$module.",".$invitees_array.") method ..."); + foreach($invitees_array as $inviteeid) + { + if($inviteeid != '') + { + $query="insert into vtiger_invitees values(".$this->id.",".$inviteeid.")"; + $adb->query($query); + } + } + $log->debug("Exiting insertIntoInviteeTable method ..."); + + } + + + /** Function to insert values in vtiger_salesmanactivityrel table for the specified module + * @param $module -- module:: Type varchar + */ + + function insertIntoSmActivityRel($module) + { + global $adb; + global $current_user; + if($this->mode == 'edit') + { + + $sql = "delete from vtiger_salesmanactivityrel where activityid=".$this->id." and smid = ".$this->column_fields['assigned_user_id'].""; + $adb->query($sql); + + } + $sql_qry = "insert into vtiger_salesmanactivityrel (smid,activityid) values(".$this->column_fields['assigned_user_id'].",".$this->id.")"; + $adb->query($sql_qry); + + } + // Mike Crowe Mod --------------------------------------------------------Default ordering for us /** @@ -154,7 +396,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; @@ -177,7 +419,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new User(); + $focus = new Users(); $button = ''; @@ -395,8 +637,8 @@ global $log,$adb; $log->debug("Entering get_tasksforol(".$username.") method ..."); global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -447,8 +689,8 @@ global $log,$adb; $log->debug("Entering get_calendarsforol(".$user_name.") method ..."); global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); Modified: vtigercrm/trunk/modules/Calendar/ActivityAjax.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/ActivityAjax.php (original) +++ vtigercrm/trunk/modules/Calendar/ActivityAjax.php Tue Oct 31 03:40:43 2006 @@ -19,6 +19,27 @@ $cal_log =& LoggerManager::getLogger('calendar'); $cal_log->debug("In CalendarAjax file"); $mysel = $_REQUEST['view']; +if($_REQUEST['file'] == 'OpenListView') +{ + require_once('Smarty_setup.php'); + $smarty = new vtigerCRM_Smarty; + require_once("modules/Calendar/OpenListView.php"); + $smarty->assign("APP",$app_strings); + $smarty->assign("IMAGE_PATH",$image_path); + if($_REQUEST['mode'] == '0') + { + $activities[0] = getPendingActivities(0); + $smarty->assign("ACTIVITIES",$activities); + $smarty->display("upcomingActivities.tpl"); + } + else if($_REQUEST['mode'] == '1') + { + $activities[1] = getPendingActivities(1); + $smarty->assign("ACTIVITIES",$activities); + $smarty->display("pendingActivities.tpl"); + } + die(); +} $calendar_arr = Array(); $calendar_arr['IMAGE_PATH'] = $image_path; $date_data = array(); Modified: vtigercrm/trunk/modules/Calendar/Appointment.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/Appointment.php (original) +++ vtigercrm/trunk/modules/Calendar/Appointment.php Tue Oct 31 03:40:43 2006 @@ -60,7 +60,7 @@ require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); $shared_ids = getSharedCalendarId($current_user->id); - $q= "select vtiger_activity.*, vtiger_crmentity.*, vtiger_activitygrouprelation.groupname FROM vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid left join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted = 0 and vtiger_activity.activitytype in ('Call','Meeting') AND (vtiger_activity.date_start < '". $to_datetime->get_formatted_date() ."' AND vtiger_activity.date_start >= '". $from_datetime->get_formatted_date()."') "; + $q= "select vtiger_activity.*, vtiger_crmentity.*, vtiger_activitygrouprelation.groupname FROM vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid left join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname WHERE vtiger_crmentity.deleted = 0 and vtiger_activity.activitytype in ('Call','Meeting') AND (vtiger_activity.date_start < '". $to_datetime->get_formatted_date() ."' AND vtiger_activity.date_start >= '". $from_datetime->get_formatted_date()."') "; if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[16] == 3) { $sec_parameter=getListViewSecurityParameter('Calendar'); @@ -83,7 +83,7 @@ unset($obj); } //Get Recurring events - $q = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_crmentity.description, vtiger_activity.time_start,vtiger_activity.time_end, vtiger_activity.duration_hours, vtiger_activity.duration_minutes,vtiger_activity.due_date, vtiger_activity.priority, vtiger_activity.location,vtiger_activity.eventstatus, vtiger_crmentity.*, vtiger_recurringevents.recurringid, vtiger_recurringevents.recurringdate as date_start ,vtiger_recurringevents.recurringtype,vtiger_activitygrouprelation.groupname from vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid inner join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid"; + $q = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_crmentity.description, vtiger_activity.time_start,vtiger_activity.time_end, vtiger_activity.duration_hours, vtiger_activity.duration_minutes,vtiger_activity.due_date, vtiger_activity.priority, vtiger_activity.location,vtiger_activity.eventstatus, vtiger_crmentity.*, vtiger_recurringevents.recurringid, vtiger_recurringevents.recurringdate as date_start ,vtiger_recurringevents.recurringtype,vtiger_activitygrouprelation.groupname from vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid inner join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname "; $q.=" where vtiger_crmentity.deleted = 0 and vtiger_activity.activitytype in ('Call','Meeting') AND (recurringdate < '".$to_datetime->get_formatted_date()."' AND recurringdate >= '".$from_datetime->get_formatted_date(). "') "; @@ -93,7 +93,7 @@ $q .= $sec_parameter; } - $q .= " ORDER by recurringid"; + $q .= " ORDER by vtiger_recurringevents.recurringid"; $r = $adb->query($q); $n = $adb->getRowCount($r); $a = 0; Modified: vtigercrm/trunk/modules/Calendar/CalendarCommon.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/CalendarCommon.php (original) +++ vtigercrm/trunk/modules/Calendar/CalendarCommon.php Tue Oct 31 03:40:43 2006 @@ -206,7 +206,7 @@ $hrsel = 'selected'; else $hrsel = ''; - $combo .= ''; + $combo .= ''; } $combo .= ' '; $combo .= ' '; $combo .= 'Hr '; $combo .= ' min'; } Modified: vtigercrm/trunk/modules/Calendar/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/DetailView.php (original) +++ vtigercrm/trunk/modules/Calendar/DetailView.php Tue Oct 31 03:40:43 2006 @@ -136,21 +136,21 @@ $data['date_start'] = $stdate; $data['due_date'] = $enddate; $data['assigned_user_id'] = $finaldata['assigned_user_id']; -$data['taskpriority'] = $finaldata['taskpriority']; +$data['taskpriority'] = $mod_strings[$finaldata['taskpriority']]; $data['modifiedtime'] = $finaldata['modifiedtime']; $data['createdtime'] = $finaldata['createdtime']; $data['parent_name'] = $finaldata['parent_id']; $data['description'] = $finaldata['description']; if($activity_mode == 'Task') { - $data['taskstatus'] = $finaldata['taskstatus']; + $data['taskstatus'] = $mod_strings[$finaldata['taskstatus']]; $data['activitytype'] = $activity_mode; $data['contact_id'] = $finaldata['contact_id']; } elseif($activity_mode == 'Events') { $data['visibility'] = $finaldata['visibility']; - $data['eventstatus'] = $finaldata['eventstatus']; + $data['eventstatus'] = $mod_strings[$finaldata['eventstatus']]; $data['activitytype'] = $finaldata['activitytype']; $data['location'] = $finaldata['location']; //Calculating reminder time Modified: vtigercrm/trunk/modules/Calendar/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/ListView.php (original) +++ vtigercrm/trunk/modules/Calendar/ListView.php Tue Oct 31 03:40:43 2006 @@ -76,6 +76,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); $where = ""; $url_string = ''; // assigning http url string Modified: vtigercrm/trunk/modules/Calendar/OpenListView.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/OpenListView.php (original) +++ vtigercrm/trunk/modules/Calendar/OpenListView.php Tue Oct 31 03:40:43 2006 @@ -49,82 +49,67 @@ //code added to customize upcomming and pending activities if($_REQUEST['activity_view']=='') { - $query = "select activity_view from vtiger_users where id ='$current_user->id'"; - $result=$adb->query($query); - $activity_view=$adb->query_result($result,0,'activity_view'); + $activity_view='today'; } else $activity_view=$_REQUEST['activity_view']; $today = date("Y-m-d", time()); - if($activity_view == 'Today') - { - $later = date("Y-m-d",strtotime("$today +1 day")); - } - else if($activity_view == 'This Week') - { - $later = date("Y-m-d", strtotime("$today +7 days")); - } - else if($activity_view == 'This Month') - { - $later = date("Y-m-d", strtotime("$today +1 month")); - } - else if($activity_view == 'This Year') - { - $later = date("Y-m-d", strtotime("$today +1 year")); - } - else if($activity_view == 'OverDue') - { - $later = date("Y-m-d", strtotime("$today +1 day")); - } - $last_tendays = date("Y-m-d",strtotime("$today -10 days")); + if($activity_view == 'today') + { + $upcoming_condition = " AND (date_start = '$today' OR vtiger_recurringevents.recurringdate = '$today')"; + $pending_condition = " AND (due_date = '$today' OR vtiger_recurringevents.recurringdate = '$today')"; + } + else if($activity_view == 'all') + { + $upcoming_condition = " AND (date_start >= '$today' OR vtiger_recurringevents.recurringdate >= '$today')"; + $pending_condition = " AND (due_date <= '$today' OR vtiger_recurringevents.recurringdate <= '$today')"; + } if($mode != 1) { //for upcoming avtivities - $list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity 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_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE 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.status is NULL OR vtiger_activity.status != 'Deferred') and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Not Held' ) AND ((date_start > '$today' AND date_start < '$later') OR (vtiger_recurringevents.recurringdate between '$today' and '$later') ) AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'"; + $list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity 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_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE 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.status is NULL OR vtiger_activity.status != 'Deferred') and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Not Held' ) ".$upcoming_condition." AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'"; } else { - //for pending activities for the last 10 days - $list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity 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_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE 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.status is NULL OR vtiger_activity.status != 'Deferred') and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Not Held' ) AND ((due_date > '$last_tendays' AND due_date <= '$today') OR (vtiger_recurringevents.recurringdate > '$last_tendays' AND vtiger_recurringevents.recurringdate <= '$today')) AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'"; - } + //for pending activities + $list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity 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_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE 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.status is NULL OR vtiger_activity.status != 'Deferred') and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Not Held' ) ".$pending_condition." AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'"; + } + $res = $adb->query($list_query); $noofrecords = $adb->num_rows($res); - $list_result = $adb->limitQuery($list_query,0,5); $open_activity_list = array(); - $noofrows = $adb->num_rows($list_result); - if (count($list_result)>0) + $noofrows = $adb->num_rows($res); + if (count($res)>0) for($i=0;$i<$noofrows;$i++) { - $parent_name=getRelatedTo("Calendar",$list_result,$i); - $open_activity_list[] = Array('name' => $adb->query_result($list_result,$i,'subject'), - 'id' => $adb->query_result($list_result,$i,'activityid'), - 'type' => $adb->query_result($list_result,$i,'activitytype'), - 'module' => $adb->query_result($list_result,$i,'setype'), - 'status' => $adb->query_result($list_result,$i,'status'), - 'firstname' => $adb->query_result($list_result,$i,'firstname'), - 'lastname' => $adb->query_result($list_result,$i,'lastname'), - 'accountname' => $adb->query_result($list_result,$i,'accountname'), - 'accountid' => $adb->query_result($list_result, $i, 'accountid'), - 'contactid' => $adb->query_result($list_result,$i,'contactid'), - 'date_start' => getDisplayDate($adb->query_result($list_result,$i,'date_start')), - 'due_date' => getDisplayDate($adb->query_result($list_result,$i,'due_date')), - 'recurringtype' => getDisplayDate($adb->query_result($list_result,$i,'recurringtype')), - 'recurringdate' => getDisplayDate($adb->query_result($list_result,$i,'recurringdate')), + $parent_name=getRelatedTo("Calendar",$res,$i); + $open_activity_list[] = Array('name' => $adb->query_result($res,$i,'subject'), + 'id' => $adb->query_result($res,$i,'activityid'), + 'type' => $adb->query_result($res,$i,'activitytype'), + 'module' => $adb->query_result($res,$i,'setype'), + 'status' => $adb->query_result($res,$i,'status'), + 'firstname' => $adb->query_result($res,$i,'firstname'), + 'lastname' => $adb->query_result($res,$i,'lastname'), + 'accountname' => $adb->query_result($res,$i,'accountname'), + 'accountid' => $adb->query_result($res, $i, 'accountid'), + 'contactid' => $adb->query_result($res,$i,'contactid'), + 'date_start' => getDisplayDate($adb->query_result($res,$i,'date_start')), + 'due_date' => getDisplayDate($adb->query_result($res,$i,'due_date')), + 'recurringtype' => getDisplayDate($adb->query_result($res,$i,'recurringtype')), + 'recurringdate' => getDisplayDate($adb->query_result($res,$i,'recurringdate')), 'parent'=> $parent_name, // Fredy Klammsteiner, 4.8.2005: changes from 4.0.1 migrated to 4.2 - 'priority' => $adb->query_result($list_result,$i,'priority'), // Armando L?scher 04.07.2005 -> ?priority -> Desc: Get vtiger_priority from db + 'priority' => $adb->query_result($res,$i,'priority'), // Armando L?scher 04.07.2005 -> ?priority -> Desc: Get vtiger_priority from db ); } - $later_day = getDisplayDate(date("Y-m-d", strtotime("$later -1 day "))); $title=array(); $title[]=$activity_view; $title[]='myUpcoPendAct.gif'; - //.'('.$current_module_strings["LBL_TODAY"].' '.$later_day.')'; $title[]='home_myact'; - $title[]=getActivityView($activity_view); + //$title[]=getActivityView($activity_view); $title[]='showActivityView'; $title[]='MyUpcumingFrm'; $title[]='activity_view'; @@ -229,7 +214,6 @@ } } // Code by Jaguar Ends - $entries['noofactivities'] = $noofrecords; $entries[$event['id']] = array( '0' => ''.$event["name"].'', 'IMAGE' => '', @@ -241,7 +225,7 @@ 'RECURRINGTYPE' => ereg_replace('--','',$event['recurringtype']), ); } - $values=Array('Title'=>$title,'Header'=>$header,'Entries'=>$entries); + $values=Array('noofactivities'=>$noofrecords,'Title'=>$title,'Header'=>$header,'Entries'=>$entries); $log->debug("Exiting getPendingActivities method ..."); return $values; } Modified: vtigercrm/trunk/modules/Calendar/RenderRelatedListUI.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/RenderRelatedListUI.php (original) +++ vtigercrm/trunk/modules/Calendar/RenderRelatedListUI.php Tue Oct 31 03:40:43 2006 @@ -10,8 +10,8 @@ ********************************************************************************/ require_once('include/RelatedListView.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/UserInfoUtil.php'); // functions added for group calendar -Jaguar Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/addEventUI.php (original) +++ vtigercrm/trunk/modules/Calendar/addEventUI.php Tue Oct 31 03:40:43 2006 @@ -202,8 +202,8 @@ - - + +
        @@ -649,7 +649,7 @@
      -
      - + Modified: vtigercrm/trunk/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Tue Oct 31 03:40:43 2006 @@ -402,6 +402,8 @@ 'Pending Input'=>'Pending Input', 'LBL_REMAINDER_DAY'=>'days', 'LBL_REMAINDER_HRS'=>'hrs', +'Call'=>'Call', +'Meeting'=>'Meeting', ); Modified: vtigercrm/trunk/modules/Campaigns/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Campaigns/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Campaigns/Campaign.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 @@ -23,7 +23,7 @@ } else { -$focus = new Campaign(); +$focus = new Campaigns(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/trunk/modules/Campaigns/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/Delete.php (original) +++ vtigercrm/trunk/modules/Campaigns/Delete.php Tue Oct 31 03:40:43 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('ticket_delete'); -$focus = new Campaign(); +$focus = new Campaigns(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/DetailView.php (original) +++ vtigercrm/trunk/modules/Campaigns/DetailView.php Tue Oct 31 03:40:43 2006 @@ -11,12 +11,12 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Campaigns/Campaign.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'); -$focus = new Campaign(); +$focus = new Campaigns(); if(isset($_REQUEST['record']) && $_REQUEST['record']!= null ) { Modified: vtigercrm/trunk/modules/Campaigns/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Campaigns/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Campaign(); + $modObj = new Campaigns(); $modObj->retrieve_entity_info($crmid,"Campaigns"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/trunk/modules/Campaigns/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/EditView.php (original) +++ vtigercrm/trunk/modules/Campaigns/EditView.php Tue Oct 31 03:40:43 2006 @@ -11,12 +11,12 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once('include/utils/utils.php'); -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$currentModule,$theme; -$focus = new Campaign(); +$focus = new Campaigns(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] !='') Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Tue Oct 31 03:40:43 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once("data/Tracker.php"); @@ -28,7 +28,7 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; -$focus = new Campaign(); +$focus = new Campaigns(); $category = getParentTab(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); @@ -77,6 +77,7 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); //<<<<>>>> if($viewid != 0) Modified: vtigercrm/trunk/modules/Campaigns/Save.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/Save.php (original) +++ vtigercrm/trunk/modules/Campaigns/Save.php Tue Oct 31 03:40:43 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new Campaign(); +$focus = new Campaigns(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/trunk/modules/Contacts/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Contacts/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout @@ -22,7 +22,7 @@ } else { -$focus = new Contact(); +$focus = new Contacts(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/trunk/modules/Contacts/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/Delete.php (original) +++ vtigercrm/trunk/modules/Contacts/Delete.php Tue Oct 31 03:40:43 2006 @@ -17,13 +17,13 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Contact(); +$focus = new Contacts(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/trunk/modules/Contacts/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/DetailView.php (original) +++ vtigercrm/trunk/modules/Contacts/DetailView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -33,7 +33,7 @@ global $app_strings; global $currentModule, $singlepane_view; -$focus = new Contact(); +$focus = new Contacts(); if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/trunk/modules/Contacts/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Contacts/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $cntObj = new Contact(); + $cntObj = new Contacts(); $cntObj->retrieve_entity_info($crmid,"Contacts"); $cntObj->column_fields[$fieldname] = $fieldvalue; $cntObj->id = $crmid; Modified: vtigercrm/trunk/modules/Contacts/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/EditView.php (original) +++ vtigercrm/trunk/modules/Contacts/EditView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -39,7 +39,7 @@ $image_error=isset($_REQUEST['image_error'])?$_REQUEST['image_error']:"false"; //end -$focus = new Contact(); +$focus = new Contacts(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) @@ -68,9 +68,9 @@ if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']=='') { - require_once('modules/Accounts/Account.php'); + require_once('modules/Accounts/Accounts.php'); $focus->column_fields['account_id'] = $_REQUEST['account_id']; - $acct_focus = new Account(); + $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']; Modified: vtigercrm/trunk/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ListView.php (original) +++ vtigercrm/trunk/modules/Contacts/ListView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -39,7 +39,7 @@ global $currentModule,$theme; -$focus = new Contact(); +$focus = new Contacts(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); @@ -114,6 +114,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); // Buttons and View options if($viewid != 0) { Modified: vtigercrm/trunk/modules/Contacts/Save.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/Save.php (original) +++ vtigercrm/trunk/modules/Contacts/Save.php Tue Oct 31 03:40:43 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once("modules/Emails/mail.php"); @@ -51,7 +51,7 @@ $local_log =& LoggerManager::getLogger('index'); global $log,$adb; -$focus = new Contact(); +$focus = new Contacts(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/trunk/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/CustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/CustomView.php Tue Oct 31 03:40:43 2006 @@ -36,25 +36,7 @@ - var $module_list = Array("Leads"=>Array("Information"=>13,"Address"=>15,"Description"=>16,"Custom Information"=>14), - "Contacts"=>Array("Information"=>4,"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), - "Campaigns"=>Array("Information"=>76,"Expectations"=>78,"Description"=>82,"Custom Information"=>77), - "Products"=>Array("Information"=>31,"Description"=>36,"Pricing Information"=>32,"Stock Information"=>33,"Custom Information"=>34), - "Vendors"=>Array("Information"=>44,"Address"=>46,"Description"=>47,"Custom Information"=>45), - "PriceBooks"=>Array("Information"=>48,"Description"=>50,"Custom Information"=>49), - "Notes"=>Array("Information"=>17,"Description"=>18), - "Emails"=>Array("Information"=>'21,22,23',"Description"=>24), - "HelpDesk"=>Array("Information"=>'25,26',"Description"=>28,"Custom Information"=>27,"Solution"=>29), - "Quotes"=>Array("Information"=>51,"Address"=>53,"Description"=>56,"Terms and Conditions"=>55,"Custom Information"=>52), - "PurchaseOrder"=>Array("Information"=>57,"Address"=>59,"Description"=>62,"Terms and Conditions"=>61,"Custom Information"=>58), - "SalesOrder"=>Array("Information"=>63,"Address"=>65,"Description"=>68,"Terms and Conditions"=>67,"Custom Information"=>64), - "Faq"=>Array("Information"=>'37,38,39'), - "Invoice"=>Array("Information"=>69,"Address"=>71,"Description"=>74,"Terms and Conditions"=>73,"Custom Information"=>70) - ); - + var $module_list = Array(); var $customviewmodule; @@ -292,6 +274,8 @@ function getModuleColumnsList($module) { + + $module_info = $this->getCustomViewModuleInfo($module); foreach($this->module_list[$module] as $key=>$value) { $columnlist = $this->getColumnsListbyBlock($module,$value); @@ -342,7 +326,7 @@ global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); - + $module_info = $this->getCustomViewModuleInfo($module); foreach($this->module_list[$module] as $key=>$blockid) { $blockids[] = $blockid; @@ -1525,5 +1509,35 @@ return $calist; } + + /* This function sets the block information for the given module to the class variable module_list + * and return the array + */ + + function getCustomViewModuleInfo($module) + { + global $adb; + global $current_language; + $current_mod_strings = return_specified_module_language($current_language, $module); + $block_info = Array(); + $Sql = "select distinct block,vtiger_field.tabid,name,blocklabel from vtiger_field inner join vtiger_blocks on vtiger_blocks.blockid=vtiger_field.block inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where displaytype != 3 and vtiger_field.block not in(40,6,75,35,30,54,60,66,72) and vtiger_tab.name='$module' order by block"; + $result = $adb->query($Sql); + while($block_result = $adb->fetch_array($result)) + { + $block_label = $block_result['blocklabel']; + if (trim($block_label) == '') + { + $block_info[$pre_block_label] = $block_info[$pre_block_label].",".$block_result['block']; + }else + { + $lan_block_label = $current_mod_strings[$block_label]; + $block_info[$lan_block_label] = $block_result['block']; + } + $pre_block_label = $lan_block_label; + } + $this->module_list[$module] = $block_info; + return $this->module_list; + } + } ?> Modified: vtigercrm/trunk/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/EditView.php (original) +++ vtigercrm/trunk/modules/CustomView/EditView.php Tue Oct 31 03:40:43 2006 @@ -221,7 +221,7 @@ foreach($oCustomView->module_list[$module] as $key=>$value) { $advfilter = array(); - $label = $app_list_strings['moduleList'][$module]." ".$key; + $label = $key; if(isset($columnslist[$module][$key])) { foreach($columnslist[$module][$key] as $field=>$fieldlabel) Modified: vtigercrm/trunk/modules/CustomView/PopulateCustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/PopulateCustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/PopulateCustomView.php Tue Oct 31 03:40:43 2006 @@ -315,6 +315,7 @@ Array('vtiger_products:productname:productname:Products_Product_Name:V', 'vtiger_products:productcode:productcode:Products_Product_Code:V', 'vtiger_products:commissionrate:commissionrate:Products_Commission_Rate:V', + 'vtiger_products:qtyinstock:qtyinstock:Products_Quantity_In_Stock:V', 'vtiger_products:qty_per_unit:qty_per_unit:Products_Qty/Unit:V', 'vtiger_products:unit_price:unit_price:Products_Unit_Price:V'), Modified: vtigercrm/trunk/modules/Emails/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Emails/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Emails/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -11,10 +11,10 @@ require_once('Smarty_setup.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); -$focus = new Email(); +$focus = new Emails(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/trunk/modules/Emails/ChooseEmail.php ============================================================================== --- vtigercrm/trunk/modules/Emails/ChooseEmail.php (original) +++ vtigercrm/trunk/modules/Emails/ChooseEmail.php Tue Oct 31 03:40:43 2006 @@ -29,20 +29,20 @@ if ($pmodule=='Accounts') { - require_once('modules/Accounts/Account.php'); - $myfocus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $myfocus = new Accounts(); $myfocus->retrieve_entity_info($entityid,"Accounts"); } elseif ($pmodule=='Contacts') { - require_once('modules/Contacts/Contact.php'); - $myfocus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $myfocus = new Contacts(); $myfocus->retrieve_entity_info($entityid,"Contacts"); } elseif ($pmodule=='Leads') { - require_once('modules/Leads/Lead.php'); - $myfocus = new Lead(); + require_once('modules/Leads/Leads.php'); + $myfocus = new Leads(); $myfocus->retrieve_entity_info($entityid,"Leads"); } ?> Modified: vtigercrm/trunk/modules/Emails/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Emails/Delete.php (original) +++ vtigercrm/trunk/modules/Emails/Delete.php Tue Oct 31 03:40:43 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('email_delete'); -$focus = new Email(); +$focus = new Emails(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the email."); Modified: vtigercrm/trunk/modules/Emails/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Emails/DetailView.php (original) +++ vtigercrm/trunk/modules/Emails/DetailView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/upload_file.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ global $mod_strings; global $currentModule; -$focus = new Email(); +$focus = new Emails(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record'])) Modified: vtigercrm/trunk/modules/Emails/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Emails/EditView.php (original) +++ vtigercrm/trunk/modules/Emails/EditView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/FormValidationUtil.php'); @@ -34,7 +34,7 @@ global $current_user; global $currentModule; -$focus = new Email(); +$focus = new Emails(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['upload_error'] == true) Modified: vtigercrm/trunk/modules/Emails/EmailsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Emails/EmailsAjax.php (original) +++ vtigercrm/trunk/modules/Emails/EmailsAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = $_REQUEST["fieldValue"]; if($crmid != "") { - $modObj = new Email(); + $modObj = new Emails(); $modObj->retrieve_entity_info($crmid,"Emails"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/trunk/modules/Emails/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Emails/ListView.php (original) +++ vtigercrm/trunk/modules/Emails/ListView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/utils/utils.php'); @@ -42,7 +42,7 @@ $url_string = ''; // assigning http url string -$focus = new Email(); +$focus = new Emails(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/trunk/modules/Emails/Save.php ============================================================================== --- vtigercrm/trunk/modules/Emails/Save.php (original) +++ vtigercrm/trunk/modules/Emails/Save.php Tue Oct 31 03:40:43 2006 @@ -51,13 +51,13 @@ $mailbox = 'INBOX'; } -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Email(); +$focus = new Emails(); global $current_user; setObjectValuesFromRequest(&$focus); Modified: vtigercrm/trunk/modules/Emails/class.phpmailer.php ============================================================================== --- vtigercrm/trunk/modules/Emails/class.phpmailer.php (original) +++ vtigercrm/trunk/modules/Emails/class.phpmailer.php Tue Oct 31 03:40:43 2006 @@ -365,14 +365,14 @@ // Choose the mailer switch($this->Mailer) { - case "sendmail": - $result = $this->SendmailSend($header, $body); + case "sendmail": + $result = $this->SendmailSend($header, html_entity_decode($body)); break; case "mail": - $result = $this->MailSend($header, $body); + $result = $this->MailSend($header, html_entity_decode($body)); break; case "smtp": - $result = $this->SmtpSend($header, $body); + $result = $this->SmtpSend($header, html_entity_decode($body)); break; default: $this->SetError($this->Mailer . $this->Lang("mailer_not_supported")); Modified: vtigercrm/trunk/modules/Emails/mail.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mail.php (original) +++ vtigercrm/trunk/modules/Emails/mail.php Tue Oct 31 03:40:43 2006 @@ -137,7 +137,7 @@ $adb->println("Inside the function setMailerProperties"); $mail->Subject = $subject; - $mail->Body = nl2br($contents); + $mail->Body = $contents; //$mail->Body = html_entity_decode(nl2br($contents)); //if we get html tags in mail then we will use this line $mail->AltBody = strip_tags(preg_replace(array("/

      /i","/
      /i","/
      /i"),array("\n","\n","\n"),$contents)); Modified: vtigercrm/trunk/modules/Emails/mailsend.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mailsend.php (original) +++ vtigercrm/trunk/modules/Emails/mailsend.php Tue Oct 31 03:40:43 2006 @@ -124,24 +124,27 @@ $fresult=$adb->query($myquery); if ($pmodule=='Contacts') { - require_once('modules/Contacts/Contact.php'); - $myfocus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $myfocus = new Contacts(); $myfocus->retrieve_entity_info($mycrmid,"Contacts"); } elseif ($pmodule=='Accounts') { - require_once('modules/Accounts/Account.php'); - $myfocus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $myfocus = new Accounts(); $myfocus->retrieve_entity_info($mycrmid,"Accounts"); } elseif ($pmodule=='Leads') { - require_once('modules/Leads/Lead.php'); - $myfocus = new Lead(); + require_once('modules/Leads/Leads.php'); + $myfocus = new Leads(); $myfocus->retrieve_entity_info($mycrmid,"Leads"); } $fldname=$adb->query_result($fresult,0,"columnname"); $emailadd=br2nl($myfocus->column_fields[$fldname]); + +//This is to convert the html encoded string to original html entities so that in mail description contents will be displayed correctly + $focus->column_fields['description'] = from_html($focus->column_fields['description']); if($emailadd != '') { Modified: vtigercrm/trunk/modules/Emails/sendmail.php ============================================================================== --- vtigercrm/trunk/modules/Emails/sendmail.php (original) +++ vtigercrm/trunk/modules/Emails/sendmail.php Tue Oct 31 03:40:43 2006 @@ -18,7 +18,7 @@ * @copyright 2001 - 2003 Brent R. Matzelle */ -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/logging.php'); require("modules/Emails/class.phpmailer.php"); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/trunk/modules/Faq/Faq.php ============================================================================== --- vtigercrm/trunk/modules/Faq/Faq.php (original) +++ vtigercrm/trunk/modules/Faq/Faq.php Tue Oct 31 03:40:43 2006 @@ -33,7 +33,7 @@ var $log; var $db; - var $tab_name = Array('vtiger_crmentity','vtiger_faq','vtiger_faqcomments'); + var $tab_name = Array('vtiger_crmentity','vtiger_faq'); var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_faq'=>'id','vtiger_faqcomments'=>'faqid'); var $entity_table = "vtiger_crmentity"; @@ -86,6 +86,40 @@ $this->log->debug("Exiting Faq method ..."); } + function save_module($module) + { + //Inserting into Faq comment table + $this->insertIntoFAQCommentTable('vtiger_faqcomments', $module); + + } + + + /** Function to insert values in vtiger_faqcomments table for the specified module, + * @param $table_name -- table name:: Type varchar + * @param $module -- module:: Type varchar + */ + function insertIntoFAQCommentTable($table_name, $module) + { + global $log; + $log->info("in insertIntoFAQCommentTable ".$table_name." module is ".$module); + global $adb; + + $current_time = $adb->formatDate(date('YmdHis')); + + if($this->column_fields['comments'] != '') + $comment = $this->column_fields['comments']; + else + $comment = $_REQUEST['comments']; + + if($comment != '') + { + $comment = addslashes($comment); + $sql = "insert into vtiger_faqcomments values('',".$this->id.",'".$comment."',".$current_time.")"; + $adb->query($sql); + } + } + + /** Function to get the list of comments for the given FAQ id * @param int $faqid - FAQ id * @return list $list - return the list of comments and comment informations as a html output where as these comments and comments informations will be formed in div tag. Modified: vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php Tue Oct 31 03:40:43 2006 @@ -49,7 +49,9 @@ $sql = "select ticketid, comments, createdtime from vtiger_ticketcomments where ticketid=".$_REQUEST['record']; $res = $adb->query($sql); $noofrows = $adb->num_rows($res); - $answer .= '\r\n\r\nCOMMENTS:'; + + if($noofrows > 0) + $answer .= '\r\n\r\nCOMMENTS:'; for($i=0; $i < $noofrows; $i++) { $comments = $adb->query_result($res,$i,'comments'); Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original) +++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Tue Oct 31 03:40:43 2006 @@ -24,7 +24,7 @@ var $log; var $db; - var $tab_name = Array('vtiger_crmentity','vtiger_troubletickets','vtiger_seticketsrel','vtiger_ticketcf','vtiger_ticketcomments','vtiger_attachments'); + 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 $column_fields = Array(); @@ -91,6 +91,83 @@ $this->log->debug("Exiting HelpDesk method ..."); } + + function save_module($module) + { + //Inserting into Ticket Comment Table + $this->insertIntoTicketCommentTable("vtiger_ticketcomments",'HelpDesk'); + + //Inserting into vtiger_seticketsrel table + + if(isset($this->column_fields['parent_id']) && $this->column_fields['parent_id'] != '') + { + $this->insertIntoEntityTable('vtiger_seticketsrel', 'HelpDesk'); + } + elseif($this->column_fields['parent_id']=='' && $insertion_mode=="edit") + { + $this->deleteRelation('vtiger_seticketsrel'); + } + + //Inserting into vtiger_attachments + $this->insertIntoAttachment($this->id,'HelpDesk'); + + } + + /** Function to insert values in vtiger_ticketcomments for the specified tablename and module + * @param $table_name -- table name:: Type varchar + * @param $module -- module:: Type varchar + */ + function insertIntoTicketCommentTable($table_name, $module) + { + global $log; + $log->info("in insertIntoTicketCommentTable ".$table_name." module is ".$module); + global $adb; + global $current_user; + + $current_time = $adb->formatDate(date('YmdHis')); + if($this->column_fields['assigned_user_id'] != '') + $ownertype = 'user'; + else + $ownertype = 'customer'; + + if($this->column_fields['comments'] != '') + $comment = $this->column_fields['comments']; + else + $comment = $_REQUEST['comments']; + + if($comment != '') + { + $comment = addslashes($comment); + $sql = "insert into vtiger_ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."',".$current_time.")"; + $adb->query($sql); + } + } + + + /** + * 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; + + foreach($_FILES as $fileindex => $files) + { + if($files['name'] != '' && $files['size'] > 0) + { + $file_saved = $this->uploadAndSaveFile($id,$module,$files); + } + } + + $log->debug("Exiting from insertIntoAttachment($id,$module) method."); + } + + /** Function used to get the sort order for HelpDesk listview * @return string $sorder - first check the $_REQUEST['sorder'] if request value is empty then check in the $_SESSION['HELPDESK_SORT_ORDER'] if this session value is empty then default sort order will be returned. */ @@ -457,7 +534,7 @@ { global $log; $log->debug("Entering get_history(".$id.") method ..."); - $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus, + $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus, vtiger_activity.date_start, vtiger_activity.due_date, vtiger_activity.activitytype, vtiger_troubletickets.ticketid, vtiger_troubletickets.title, vtiger_crmentity.modifiedtime, vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name from vtiger_activity Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Tue Oct 31 03:40:43 2006 @@ -82,6 +82,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); if($viewid != 0) { $CActionDtls = $oCustomView->getCustomActionDetails($viewid); Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php ============================================================================== --- vtigercrm/trunk/modules/Home/UnifiedSearch.php (original) +++ vtigercrm/trunk/modules/Home/UnifiedSearch.php Tue Oct 31 03:40:43 2006 @@ -21,18 +21,6 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Leads/Lead.php'); -require_once('modules/Faq/Faq.php'); -require_once('modules/Vendors/Vendor.php'); -require_once('modules/PriceBooks/PriceBook.php'); -require_once('modules/Quotes/Quote.php'); -require_once('modules/PurchaseOrder/PurchaseOrder.php'); -require_once('modules/SalesOrder/SalesOrder.php'); -require_once('modules/Invoice/Invoice.php'); -require_once('modules/Campaigns/Campaign.php'); require_once('modules/Home/language/en_us.lang.php'); require_once('include/database/PearDatabase.php'); require_once('modules/CustomView/CustomView.php'); @@ -41,37 +29,25 @@ global $mod_strings; $total_record_count = 0; -//echo get_module_title("", "Search Results", true); -if(isset($_REQUEST['query_string']) && preg_match("/[\w]/", $_REQUEST['query_string'])) { + +$query_string = trim($_REQUEST['query_string']); +if(isset($query_string) && $query_string != '')//preg_match("/[\w]/", $_REQUEST['query_string'])) +{ //module => object - $object_array = Array( - 'Potentials'=>'Potential', - 'Accounts'=>'Account', - 'Contacts'=>'Contact', - 'Leads'=>'Lead', - 'Notes'=>'Note', - 'Calendar'=>'Activity', - 'Emails'=>'Email', - 'HelpDesk'=>'HelpDesk', - 'Products'=>'Product', - 'Faq'=>'Faq', - //'Events'=>'', - 'Vendors'=>'Vendor', - 'PriceBooks'=>'PriceBook', - 'Quotes'=>'Quote', - 'PurchaseOrder'=>'Order', - 'SalesOrder'=>'SalesOrder', - 'Invoice'=>'Invoice', - 'Campaigns'=>'Campaign' - ); + $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 = $_REQUEST['query_string']; + $search_val = $query_string; $search_module = $_REQUEST['search_module']; getSearchModulesComboList($search_module); @@ -285,4 +261,28 @@

      $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/trunk/modules/Import/ImportAccount.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportAccount.php (original) +++ vtigercrm/trunk/modules/Import/ImportAccount.php Tue Oct 31 03:40:43 2006 @@ -22,15 +22,15 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/ComboUtil.php'); // Account is used to store vtiger_account information. -class ImportAccount extends Account { +class ImportAccount extends Accounts { var $db; // Get _dom arrays from Database Modified: vtigercrm/trunk/modules/Import/ImportAjax.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportAjax.php (original) +++ vtigercrm/trunk/modules/Import/ImportAjax.php Tue Oct 31 03:40:43 2006 @@ -12,6 +12,14 @@ require_once('Smarty_setup.php'); include('modules/Import/ImportMap.php'); include('modules/Import/Forms.php'); + +//This is to delete the map +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']); Modified: vtigercrm/trunk/modules/Import/ImportContact.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportContact.php (original) +++ vtigercrm/trunk/modules/Import/ImportContact.php Tue Oct 31 03:40:43 2006 @@ -18,7 +18,7 @@ ********************************************************************************/ include_once('config.php'); require_once('include/logging.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('modules/Import/UsersLastImport.php'); require_once('include/database/PearDatabase.php'); require_once('include/ComboUtil.php'); @@ -28,7 +28,7 @@ $comboFieldArray = getComboArray($comboFieldNames); // Contact is used to store customer information. -class ImportContact extends Contact { +class ImportContact extends Contacts { // these are vtiger_fields that may be set on import // but are to be processed and incorporated // into vtiger_fields of the parent class @@ -169,7 +169,7 @@ $arr = array(); // check if it already exists - $focus = new Account(); + $focus = new Accounts(); $query = ''; Modified: vtigercrm/trunk/modules/Import/ImportLead.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportLead.php (original) +++ vtigercrm/trunk/modules/Import/ImportLead.php Tue Oct 31 03:40:43 2006 @@ -26,16 +26,16 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/ComboUtil.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); -class ImportLead extends Lead { +class ImportLead extends Leads { var $db; // This is the list of the functions to run when importing Modified: vtigercrm/trunk/modules/Import/ImportMap.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportMap.php (original) +++ vtigercrm/trunk/modules/Import/ImportMap.php Tue Oct 31 03:40:43 2006 @@ -99,6 +99,14 @@ $this->content = "".$this->db->getEmptyBlob().""; $this->has_header = $has_header; $this->deleted = 0; + + //check whether this map name is already exist, if yes then overwrite the existing one, else create new + $res = $this->db->query("select id from vtiger_import_maps where name='".trim($name)."'"); + if($this->db->num_rows($res) > 0) + { + $this->id = $this->db->query_result($res,0,'id'); + } + $returnid = $this->save(); $this->db->updateBlob($this->table_name,"content","name='".$name."' and module='".$module."'",$content); @@ -180,7 +188,7 @@ */ function getSavedMappingsList($module) { - $query = "SELECT * FROM $this->table_name where module='".$module."'"; + $query = "SELECT * FROM $this->table_name where module='".$module."' and deleted=0"; $result = $this->db->query($query,true," Error: "); $map_lists = array(); @@ -197,7 +205,7 @@ */ function getSavedMappingContent($mapid) { - $query = "SELECT * FROM $this->table_name where id='".$mapid."'"; + $query = "SELECT * FROM $this->table_name where id='".$mapid."' and deleted=0"; $result = $this->db->query($query,true," Error: "); $mapping_arr = array(); Modified: vtigercrm/trunk/modules/Import/ImportOpportunity.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportOpportunity.php (original) +++ vtigercrm/trunk/modules/Import/ImportOpportunity.php Tue Oct 31 03:40:43 2006 @@ -22,11 +22,11 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/ComboUtil.php'); // Get _dom arrays from Database @@ -36,7 +36,7 @@ $comboFieldArray = getComboArray($comboFieldNames); // Account is used to store vtiger_account information. -class ImportOpportunity extends Potential { +class ImportOpportunity extends Potentials { var $db; // This is the list of vtiger_fields that are required. @@ -131,7 +131,7 @@ $arr = array(); // check if it already exists - $focus = new Account(); + $focus = new Accounts(); $query = ''; Modified: vtigercrm/trunk/modules/Import/ImportProduct.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportProduct.php (original) +++ vtigercrm/trunk/modules/Import/ImportProduct.php Tue Oct 31 03:40:43 2006 @@ -26,17 +26,17 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Products/Products.php'); require_once('include/ComboUtil.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); -class ImportProduct extends Product { +class ImportProduct extends Products { var $db; // This is the list of the functions to run when importing Modified: vtigercrm/trunk/modules/Import/ImportStep2.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportStep2.php (original) +++ vtigercrm/trunk/modules/Import/ImportStep2.php Tue Oct 31 03:40:43 2006 @@ -183,6 +183,8 @@ } } $map_list_combo .= ''; +//This link is Delete link for the selected mapping +$map_list_combo .= "   "; $smarty->assign("SAVED_MAP_LISTS",$map_list_combo); @@ -250,27 +252,27 @@ if($_REQUEST['module']=='Accounts') { $tablename='account'; - $focus1=new Account(); + $focus1=new Accounts(); } if($_REQUEST['module']=='Contacts') { $tablename='contactdetails'; - $focus1=new Contact(); + $focus1=new Contacts(); } if($_REQUEST['module']=='Leads') { $tablename='leaddetails'; - $focus1=new Lead(); + $focus1=new Leads(); } if($_REQUEST['module']=='Potentials') { $tablename='potential'; - $focus1=new Potential(); + $focus1=new Potentials(); } if($_REQUEST['module']=='Products') { $tablename='products'; - $focus1=new Product(); + $focus1=new Products(); } Modified: vtigercrm/trunk/modules/Import/ImportSteplast.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportSteplast.php (original) +++ vtigercrm/trunk/modules/Import/ImportSteplast.php Tue Oct 31 03:40:43 2006 @@ -26,7 +26,7 @@ require_once('modules/Import/UsersLastImport.php'); require_once('modules/Import/parse_utils.php'); require_once('include/ListView/ListView.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/utils/utils.php'); global $mod_strings; Modified: vtigercrm/trunk/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/EditView.php (original) +++ vtigercrm/trunk/modules/Invoice/EditView.php Tue Oct 31 03:40:43 2006 @@ -23,9 +23,9 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('modules/SalesOrder/SalesOrder.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -43,7 +43,7 @@ if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoinvoice') { $quoteid = $_REQUEST['record']; - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToInvoice($focus,$quote_focus,$quoteid); @@ -179,7 +179,7 @@ } if(isset($_REQUEST['opportunity_id']) && $_REQUEST['opportunity_id'] !='') { - $potfocus = new Potential(); + $potfocus = new Potentials(); $potfocus->column_fields['potential_id'] = $_REQUEST['opportunity_id']; $associated_prod = getAssociatedProducts("Potentials",$potfocus,$potfocus->column_fields['potential_id']); @@ -194,8 +194,8 @@ if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && ($_REQUEST['record']=='' || $_REQUEST['convertmode'] == "potentoinvoice")){ - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/trunk/modules/Invoice/Invoice.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Invoice.php (original) +++ vtigercrm/trunk/modules/Invoice/Invoice.php Tue Oct 31 03:40:43 2006 @@ -33,22 +33,12 @@ class Invoice extends CRMEntity { var $log; var $db; - + var $table_name = "vtiger_invoice"; + var $module_id = "invoiceid"; var $tab_name = Array('vtiger_crmentity','vtiger_invoice','vtiger_invoicebillads','vtiger_invoiceshipads','vtiger_invoicecf'); var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_invoice'=>'invoiceid','vtiger_invoicebillads'=>'invoicebilladdressid','vtiger_invoiceshipads'=>'invoiceshipaddressid','vtiger_invoicecf'=>'invoiceid'); - - var $entity_table = "vtiger_crmentity"; - - var $billadr_table = "vtiger_invoicebillads"; - - var $object_name = "Invoice"; - - var $new_schema = true; - - var $module_id = "invoiceid"; - var $column_fields = Array(); var $sortby_fields = Array('subject','crmid','invoicestatus','smownerid'); @@ -102,6 +92,25 @@ $this->column_fields = getColumnFields('Invoice'); $this->log->debug("Exiting Invoice method ..."); } + + + /** Function to handle the module specific save operations + + */ + + function save_module($module) + { + //Checking if vtiger_salesorderid is present and updating the quote status + if($this->column_fields["salesorder_id"] != '') + { + $so_id = $this->column_fields["salesorder_id"]; + $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'); + } + /** Function used to get the sort order for Invoice listview * @return string $sorder - first check the $_REQUEST['sorder'] if request value is empty then check in the $_SESSION['INVOICE_SORT_ORDER'] if this session value is empty then default sort order will be returned. Modified: vtigercrm/trunk/modules/Invoice/ListTopInvoice.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListTopInvoice.php (original) +++ vtigercrm/trunk/modules/Invoice/ListTopInvoice.php Tue Oct 31 03:40:43 2006 @@ -52,9 +52,9 @@ $date_var = date('Y-m-d'); //Changed for Patch 2 by Don - $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_invoice.invoicestatus != \'Paid\' ORDER BY total DESC'; + $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_invoice.invoicestatus != \'Paid\''; $query = getListQuery("Invoice",$where); - + $query .= " ORDER BY total DESC"; //<<<<<<<>>>>>>>> $list_result = $adb->limitQuery($query,0,5); Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Tue Oct 31 03:40:43 2006 @@ -80,6 +80,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); if(isPermitted('Invoice','Delete','') == 'yes') { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; Modified: vtigercrm/trunk/modules/Invoice/Save.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Save.php (original) +++ vtigercrm/trunk/modules/Invoice/Save.php Tue Oct 31 03:40:43 2006 @@ -30,25 +30,9 @@ $focus = new Invoice(); global $current_user; -$currencyid=fetchCurrency($current_user->id); -$rate_symbol = getCurrencySymbolandCRate($currencyid); -$rate = $rate_symbol['rate']; setObjectValuesFromRequest(&$focus); $focus->save("Invoice"); - -//Checking if vtiger_salesorderid is present and updating the quote status -if($focus->column_fields["salesorder_id"] != '') -{ - $so_id = $focus->column_fields["salesorder_id"]; - $query1 = "update vtiger_salesorder set sostatus='Approved' where salesorderid=".$so_id; - $adb->query($query1); -} - - -//Based on the total Number of rows we will save the product relationship with this entity -saveInventoryProductDetails(&$focus, 'Invoice'); - $return_id = $focus->id; Modified: vtigercrm/trunk/modules/Leads/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Leads/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Leads/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -22,7 +22,7 @@ } else { -$focus = new Lead(); +$focus = new Leads(); $MODULE = $_REQUEST['module']; $RECORD = $_REQUEST['record']; $currentmodule = $_REQUEST['module']; Modified: vtigercrm/trunk/modules/Leads/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Delete.php (original) +++ vtigercrm/trunk/modules/Leads/Delete.php Tue Oct 31 03:40:43 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('lead_delete'); -$focus = new Lead(); +$focus = new Leads(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/trunk/modules/Leads/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/DetailView.php (original) +++ vtigercrm/trunk/modules/Leads/DetailView.php Tue Oct 31 03:40:43 2006 @@ -14,7 +14,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/database/PearDatabase.php'); require_once('include/CustomFieldUtil.php'); require_once('include/utils/utils.php'); @@ -25,7 +25,7 @@ global $app_strings; global $currentModule, $singlepane_view; global $log; -$focus = new Lead(); +$focus = new Leads(); if(isset($_REQUEST['record'])) { Modified: vtigercrm/trunk/modules/Leads/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Leads/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Leads/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -24,7 +24,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $leadObj = new Lead(); + $leadObj = new Leads(); $leadObj->retrieve_entity_info($crmid,"Leads"); $leadObj->column_fields[$fieldname] = $fieldvalue; $leadObj->id = $crmid; Modified: vtigercrm/trunk/modules/Leads/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/EditView.php (original) +++ vtigercrm/trunk/modules/Leads/EditView.php Tue Oct 31 03:40:43 2006 @@ -14,7 +14,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/database/PearDatabase.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); @@ -23,7 +23,7 @@ global $mod_strings,$app_strings,$theme,$currentModule; -$focus = new Lead(); +$focus = new Leads(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); //Getting the Parameters from the ConvertLead Form $id = $_REQUEST["record"]; @@ -39,7 +39,7 @@ $potential_name = $check_unit[0]; //Retrieve info from all the vtiger_tables related to leads -$focus = new Lead(); +$focus = new Leads(); $focus->retrieve_entity_info($id,"Leads"); //get all the lead related columns Modified: vtigercrm/trunk/modules/Leads/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ListView.php (original) +++ vtigercrm/trunk/modules/Leads/ListView.php Tue Oct 31 03:40:43 2006 @@ -19,7 +19,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -49,7 +49,7 @@ $url_string = ''; // assigning http url string -$focus = new Lead(); +$focus = new Leads(); $smarty = new vtigerCRM_Smarty; $other_text=Array(); @@ -83,6 +83,7 @@ $smarty->assign("CHANGE_STATUS",$change_status); $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); Modified: vtigercrm/trunk/modules/Leads/Save.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Save.php (original) +++ vtigercrm/trunk/modules/Leads/Save.php Tue Oct 31 03:40:43 2006 @@ -13,14 +13,14 @@ * Contributor(s): ______________________________________. ********************************************************************************/ -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/UserInfoUtil.php'); $local_log =& LoggerManager::getLogger('index'); global $log,$adb; -$focus = new Lead(); +$focus = new Leads(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/trunk/modules/Leads/result.php ============================================================================== --- vtigercrm/trunk/modules/Leads/result.php (original) +++ vtigercrm/trunk/modules/Leads/result.php Tue Oct 31 03:40:43 2006 @@ -12,7 +12,7 @@ require_once('include/utils/utils.php'); require_once 'Excel/reader.php'; -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/database/PearDatabase.php'); $data = new Spreadsheet_Excel_Reader(); Modified: vtigercrm/trunk/modules/Migration/MigrationStep1.php ============================================================================== --- vtigercrm/trunk/modules/Migration/MigrationStep1.php (original) +++ vtigercrm/trunk/modules/Migration/MigrationStep1.php Tue Oct 31 03:40:43 2006 @@ -129,6 +129,11 @@ } } +//For 5.0.2 we have added this table. After 5.0.2 we have to remove this and provide the migration in some other way +$res = $adb->query("show create table vtiger_entityname"); +if(!$res) + $smarty->assign("502_PATCH","apply"); + $smarty->display("MigrationStep1.tpl"); Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php Tue Oct 31 03:40:43 2006 @@ -1257,7 +1257,7 @@ "insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_contactdetails:firstname:firstname:Contacts_First_Name:V')", "insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_contactdetails:lastname:lastname:Contacts_Last_Name:V')", "insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_contactdetails:title:title:Contacts_Title:V')", - "insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_account:accountname:accountname:Contacts_Account_Name:V')", + "insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_contactdetails:accountid:account_id:Contacts_Account_Name:I')", "insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_contactdetails:email:email:Contacts_Email:V')", "insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_contactdetails:phone:phone:Contacts_Office_Phone:V')", "insert into vtiger_cvcolumnlist values ($cvid,6,'vtiger_crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V')" @@ -3766,6 +3766,59 @@ } } +//Added after 5.0.1 +//we have to delete the entries from customview and report related tables for deleted customfields +include("modules/Migration/ModifyDatabase/deleteCustomFields.php"); + +//5.0.2 database changes - added on 27-10-06 + +//Query added to show Manufacturer field in Products module +Execute("update vtiger_field set displaytype=1,block=31 where tabid=14 and block=1"); +Execute("update vtiger_field set block=23,displaytype=1 where block=1 and displaytype=23 and tabid=10"); +Execute("update vtiger_field set block=22,displaytype=1 where block=1 and displaytype=22 and tabid=10"); + +//Added to rearange the attachment in HelpDesk +Execute(" update vtiger_field set block=25,sequence=12 where tabid=13 and fieldname='filename'"); + +//Query added to as entityname,its tablename,its primarykey are saved in a table +Execute(" CREATE TABLE `vtiger_entityname` ( + `tabid` int(19) NOT NULL default '0', + `modulename` varchar(50) NOT NULL, + `tablename` varchar(50) NOT NULL, + `fieldname` varchar(150) NOT NULL, + `entityidfield` varchar(150) NOT NULL, + PRIMARY KEY (`tabid`), + KEY `entityname_tabid_idx` (`tabid`) +)"); + +//Data Populated for the existing modules +Execute("insert into vtiger_entityname values(7,'Leads','vtiger_leaddetails','lastname,firstname','leadid')"); +Execute("insert into vtiger_entityname values(6,'Accounts','vtiger_account','accountname','accountid')"); +Execute("insert into vtiger_entityname values(4,'Contacts','vtiger_contactdetails','lastname,firstname','contactid')"); +Execute("insert into vtiger_entityname values(2,'Potentials','vtiger_potential','potentialname','potentialid')"); +Execute("insert into vtiger_entityname values(8,'Notes','vtiger_notes','title','notesid')"); +Execute("insert into vtiger_entityname values(13,'HelpDesk','vtiger_troubletickets','title','ticketid')"); +Execute("insert into vtiger_entityname values(9,'Calendar','vtiger_activity','subject','activityid')"); +Execute("insert into vtiger_entityname values(10,'Emails','vtiger_activity','subject','activityid')"); +Execute("insert into vtiger_entityname values(14,'Products','vtiger_products','productname','productid')"); +Execute("insert into vtiger_entityname values(29,'Users','vtiger_users','last_name,first_name','id')"); +Execute("insert into vtiger_entityname values(23,'Invoice','vtiger_invoice','subject','invoiceid')"); +Execute("insert into vtiger_entityname values(20,'Quotes','vtiger_quotes','subject','quoteid')"); +Execute("insert into vtiger_entityname values(21,'PurchaseOrder','vtiger_purchaseorder','subject','purchaseorderid')"); +Execute("insert into vtiger_entityname values(22,'SalesOrder','vtiger_salesorder','subject','salesorderid')"); +Execute("insert into vtiger_entityname values(18,'Vendors','vtiger_vendor','vendorname','vendorid')"); +Execute("insert into vtiger_entityname values(19,'PriceBooks','vtiger_pricebook','bookname','pricebookid')"); +Execute("insert into vtiger_entityname values(26,'Campaigns','vtiger_campaign','campaignname','campaignid')"); +Execute("insert into vtiger_entityname values(15,'Faq','vtiger_faq','question','id')"); + +//added quantity in stock in product default listview - All +$res = $conn->query("select vtiger_cvcolumnlist.cvid from vtiger_cvcolumnlist inner join vtiger_customview on vtiger_cvcolumnlist.cvid=vtiger_customview.cvid where entitytype='Products' and viewname='All'"); +if($conn->num_rows != 0) +{ + $cvid = $conn->query_result($res,0,'cvid'); + Execute("insert into vtiger_cvcolumnlist values($cvid,5,'vtiger_products:qtyinstock:qtyinstock:Products_Quantity_In_Stock:V')"); +} + Modified: vtigercrm/trunk/modules/Notes/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Notes/Delete.php (original) +++ vtigercrm/trunk/modules/Notes/Delete.php Tue Oct 31 03:40:43 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('note_delete'); -$focus = new Note(); +$focus = new Notes(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the note."); Modified: vtigercrm/trunk/modules/Notes/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Notes/DetailView.php (original) +++ vtigercrm/trunk/modules/Notes/DetailView.php Tue Oct 31 03:40:43 2006 @@ -22,14 +22,14 @@ require_once('data/Tracker.php'); require_once('Smarty_setup.php'); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/upload_file.php'); require_once('include/utils/utils.php'); global $app_strings; global $mod_strings; global $currentModule; -$focus = new Note(); +$focus = new Notes(); if(isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Notes"); Modified: vtigercrm/trunk/modules/Notes/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Notes/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Notes/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Note(); + $modObj = new Notes(); $modObj->retrieve_entity_info($crmid,"Notes"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/trunk/modules/Notes/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Notes/EditView.php (original) +++ vtigercrm/trunk/modules/Notes/EditView.php Tue Oct 31 03:40:43 2006 @@ -22,12 +22,12 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/utils/utils.php'); global $app_strings,$app_list_strings,$mod_strings,$theme,$currentModule; -$focus = new Note(); +$focus = new Notes(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['upload_error'] == true) Modified: vtigercrm/trunk/modules/Notes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Notes/ListView.php (original) +++ vtigercrm/trunk/modules/Notes/ListView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -66,7 +66,7 @@ $url_string = ''; // assigning http url string -$focus = new Note(); +$focus = new Notes(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/trunk/modules/Notes/Save.php ============================================================================== --- vtigercrm/trunk/modules/Notes/Save.php (original) +++ vtigercrm/trunk/modules/Notes/Save.php Tue Oct 31 03:40:43 2006 @@ -21,13 +21,13 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/logging.php'); require_once('include/upload_file.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Note(); +$focus = new Notes(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/trunk/modules/Portal/Portal.js ============================================================================== --- vtigercrm/trunk/modules/Portal/Portal.js (original) +++ vtigercrm/trunk/modules/Portal/Portal.js Tue Oct 31 03:40:43 2006 @@ -71,6 +71,7 @@ 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', Modified: vtigercrm/trunk/modules/Portal/Save.php ============================================================================== --- vtigercrm/trunk/modules/Portal/Save.php (original) +++ vtigercrm/trunk/modules/Portal/Save.php Tue Oct 31 03:40:43 2006 @@ -13,10 +13,10 @@ if(isset($_REQUEST['record']) && $_REQUEST['record'] !='') { - $result=UpdatePortal($_REQUEST['portalname'],"http://".$_REQUEST['portalurl'],$_REQUEST['record']); + $result=UpdatePortal($_REQUEST['portalname'],"http://".str_replace("#$#$#","&",$_REQUEST['portalurl']),$_REQUEST['record']); }else { - $result=SavePortal($_REQUEST['portalname'],"http://".$_REQUEST['portalurl']); + $result=SavePortal($_REQUEST['portalname'],"http://".str_replace("#$#$#","&",$_REQUEST['portalurl'])); } header("Location: index.php?action=PortalAjax&module=Portal&file=ListView&mode=ajax&datamode=manage"); ?> Modified: vtigercrm/trunk/modules/Potentials/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Potentials/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ } else { -$focus = new Potential(); +$focus = new Potentials(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/trunk/modules/Potentials/Charts.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/Charts.php (original) +++ vtigercrm/trunk/modules/Potentials/Charts.php Tue Oct 31 03:40:43 2006 @@ -19,7 +19,7 @@ require_once('config.php'); require_once('include/logging.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('Image/Graph.php'); require_once('include/utils/utils.php'); require_once('include/utils/GraphUtils.php'); @@ -102,7 +102,7 @@ //Now do the db queries //query for opportunity data that matches $datay and $user - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -441,7 +441,7 @@ //Now do the db queries //query for opportunity data that matches $datay and $user - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -779,7 +779,7 @@ //Now do the db queries //query for opportunity data that matches $datax and $user - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -1057,7 +1057,7 @@ $where .= ")"; } - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by lead source data Modified: vtigercrm/trunk/modules/Potentials/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/Delete.php (original) +++ vtigercrm/trunk/modules/Potentials/Delete.php Tue Oct 31 03:40:43 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Potential(); +$focus = new Potentials(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the opportunity."); Modified: vtigercrm/trunk/modules/Potentials/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/DetailView.php (original) +++ vtigercrm/trunk/modules/Potentials/DetailView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/CustomFieldUtil.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -31,7 +31,7 @@ global $app_strings; global $currentModule, $singlepane_view; -$focus = new Potential(); +$focus = new Potentials(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/trunk/modules/Potentials/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Potentials/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Potential(); + $modObj = new Potentials(); $modObj->retrieve_entity_info($crmid,"Potentials"); $modObj->column_fields[$fieldname] = $fieldvalue; $_REQUEST[$fieldname] = $fieldvalue; Modified: vtigercrm/trunk/modules/Potentials/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/EditView.php (original) +++ vtigercrm/trunk/modules/Potentials/EditView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -30,7 +30,7 @@ global $app_strings; global $mod_strings; global $currentModule; -$focus = new Potential(); +$focus = new Potentials(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/trunk/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListView.php (original) +++ vtigercrm/trunk/modules/Potentials/ListView.php Tue Oct 31 03:40:43 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -38,7 +38,7 @@ $url_string = ''; // assigning http url string -$focus = new Potential(); +$focus = new Potentials(); $smarty = new vtigerCRM_Smarty(); $other_text = Array(); @@ -108,7 +108,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); - +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); if(isPermitted('Potentials','Delete','') == 'yes') { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; Modified: vtigercrm/trunk/modules/Potentials/ListViewTop.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListViewTop.php (original) +++ vtigercrm/trunk/modules/Potentials/ListViewTop.php Tue Oct 31 03:40:43 2006 @@ -28,7 +28,7 @@ $log = LoggerManager::getLogger('top opportunity_list'); $log->debug("Entering getTopPotentials() method ..."); require_once("data/Tracker.php"); - require_once('modules/Potentials/Opportunity.php'); + require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -42,7 +42,7 @@ $title[]='myTopOpenPotentials.gif'; $title[]=$current_module_strings['LBL_TOP_OPPORTUNITIES']; $title[]='home_mypot'; - $where = "AND vtiger_potential.sales_stage <> '".$app_strings['LBL_CLOSE_WON']."' AND vtiger_potential.sales_stage <> '".$app_strings['LBL_CLOSE_LOST']."' AND vtiger_crmentity.smownerid='".$current_user->id."' ORDER BY amount DESC"; + $where = "AND vtiger_potential.sales_stage <> 'Closed Won' AND vtiger_potential.sales_stage <> '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']; @@ -53,6 +53,7 @@ $header[]=$current_module_strings['LBL_LIST_AMOUNT'].'('.$curr_symbol.')'; $header[]=$current_module_strings['LBL_LIST_DATE_CLOSED']; $list_query = getListQuery("Potentials",$where); + $list_query .=" ORDER BY amount DESC"; $list_result = $adb->limitQuery($list_query,0,5); $open_potentials_list = array(); $noofrows = $adb->num_rows($list_result); Modified: vtigercrm/trunk/modules/Potentials/Save.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/Save.php (original) +++ vtigercrm/trunk/modules/Potentials/Save.php Tue Oct 31 03:40:43 2006 @@ -20,13 +20,13 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Potential(); +$focus = new Potentials(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/trunk/modules/Potentials/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Potentials/language/en_us.lang.php Tue Oct 31 03:40:43 2006 @@ -100,6 +100,7 @@ 'Account Name'=>'Account Name', 'Currency'=>'Currency', 'Expected Close Date'=>'Expected Close Date', +'Opportunity Type'=>'Opportunity Type', 'Type'=>'Type', 'Next Step'=>'Next Step', 'Lead Source'=>'Lead Source', Modified: vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -22,7 +22,7 @@ { global $currentModule; -$focus = new PriceBook(); +$focus = new PriceBooks(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/trunk/modules/PriceBooks/Delete.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/Delete.php (original) +++ vtigercrm/trunk/modules/PriceBooks/Delete.php Tue Oct 31 03:40:43 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new PriceBook(); +$focus = new PriceBooks(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/trunk/modules/PriceBooks/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/DetailView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/DetailView.php Tue Oct 31 03:40:43 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new PriceBook(); +$focus = new PriceBooks(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/trunk/modules/PriceBooks/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/PriceBooks/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new PriceBook(); + $modObj = new PriceBooks(); $modObj->retrieve_entity_info($crmid,"PriceBooks"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/trunk/modules/PriceBooks/EditView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/EditView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/EditView.php Tue Oct 31 03:40:43 2006 @@ -11,12 +11,12 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$theme,$currentModule; -$focus = new PriceBook(); +$focus = new PriceBooks(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/ListView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/ListView.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/ListView/ListView.php'); require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); @@ -33,7 +33,7 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$focus = new PriceBook(); +$focus = new PriceBooks(); $other_text=Array(); if(!$_SESSION['lvs'][$currentModule]) Modified: vtigercrm/trunk/modules/PriceBooks/Save.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/Save.php (original) +++ vtigercrm/trunk/modules/PriceBooks/Save.php Tue Oct 31 03:40:43 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new PriceBook(); +$focus = new PriceBooks(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php ============================================================================== --- vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php (original) +++ vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/utils/utils.php'); require_once('include/ComboUtil.php'); @@ -30,7 +30,7 @@ $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$focus = new PriceBook(); +$focus = new PriceBooks(); //Retreive the list of PriceBooks $list_query = getListQuery("PriceBooks"); Modified: vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php ============================================================================== --- vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php (original) +++ vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/utils.php'); require_once('include/utils/utils.php'); require_once('include/ComboUtil.php'); @@ -29,7 +29,7 @@ $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$focus = new Product(); +$focus = new Products(); if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; Modified: vtigercrm/trunk/modules/Products/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Products/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Products/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -21,7 +21,7 @@ } else { -$focus = new Product(); +$focus = new Products(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) Modified: vtigercrm/trunk/modules/Products/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Products/Delete.php (original) +++ vtigercrm/trunk/modules/Products/Delete.php Tue Oct 31 03:40:43 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new Product(); +$focus = new Products(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/trunk/modules/Products/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Products/DetailView.php (original) +++ vtigercrm/trunk/modules/Products/DetailView.php Tue Oct 31 03:40:43 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new Product(); +$focus = new Products(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { //Display the error message Modified: vtigercrm/trunk/modules/Products/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Products/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Products/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/database/PearDatabase.php'); global $adb,$current_user; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Product(); + $modObj = new Products(); $modObj->retrieve_entity_info($crmid,"Products"); $modObj->column_fields[$fieldname] = $fieldvalue; if($fieldname == 'unit_price')//unit price converted to dollar value while saving Modified: vtigercrm/trunk/modules/Products/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Products/EditView.php (original) +++ vtigercrm/trunk/modules/Products/EditView.php Tue Oct 31 03:40:43 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/FormValidationUtil.php'); global $app_strings; @@ -28,7 +28,7 @@ -$focus = new Product(); +$focus = new Products(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['record']!="") Modified: vtigercrm/trunk/modules/Products/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Products/ListView.php (original) +++ vtigercrm/trunk/modules/Products/ListView.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/ListView/ListView.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -56,7 +56,7 @@ } $url_string = '&smodule=PRODUCTS'; // assigning http url string -$focus = new Product(); +$focus = new Products(); //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> $sorder = $focus->getSortOrder(); @@ -84,6 +84,7 @@ //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); if($viewnamedesc['viewname'] == 'All') { $smarty->assign("ALL", 'All'); Modified: vtigercrm/trunk/modules/Products/Save.php ============================================================================== --- vtigercrm/trunk/modules/Products/Save.php (original) +++ vtigercrm/trunk/modules/Products/Save.php Tue Oct 31 03:40:43 2006 @@ -21,14 +21,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); global $log,$current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); $rate = $rate_symbol['rate']; -$focus = new Product(); +$focus = new Products(); if(isset($_REQUEST['record'])) { $focus->id = $_REQUEST['record']; Modified: vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -21,7 +21,7 @@ } else { -$focus = new Order(); +$focus = new PurchaseOrder(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Tue Oct 31 03:40:43 2006 @@ -26,7 +26,7 @@ $id = $_REQUEST['record']; //retreiving the vtiger_invoice info -$focus = new Order(); +$focus = new PurchaseOrder(); $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); $vendor_name = getVendorName($focus->column_fields[vendor_id]); Modified: vtigercrm/trunk/modules/PurchaseOrder/Delete.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/Delete.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/Delete.php Tue Oct 31 03:40:43 2006 @@ -24,7 +24,7 @@ require_once('include/logging.php'); $log = LoggerManager::getLogger('order_delete'); -$focus = new Order(); +$focus = new PurchaseOrder(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/trunk/modules/PurchaseOrder/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/DetailView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Tue Oct 31 03:40:43 2006 @@ -29,7 +29,7 @@ require_once('user_privileges/default_module_view.php'); global $mod_strings,$app_strings,$theme,$currentModule,$singlepane_view; -$focus = new Order(); +$focus = new PurchaseOrder(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); Modified: vtigercrm/trunk/modules/PurchaseOrder/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Order(); + $modObj = new PurchaseOrder(); $modObj->retrieve_entity_info($crmid,"PurchaseOrder"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/EditView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/EditView.php Tue Oct 31 03:40:43 2006 @@ -31,7 +31,7 @@ global $app_strings,$mod_strings,$log,$theme,$currentModule; -$focus = new Order(); +$focus = new PurchaseOrder(); $smarty = new vtigerCRM_Smarty(); global $current_user; $currencyid=fetchCurrency($current_user->id); @@ -60,8 +60,8 @@ // Get vtiger_vendor address if vtiger_vendorid is given if(isset($_REQUEST['vendor_id']) && $_REQUEST['vendor_id']!='' && $_REQUEST['record']==''){ - require_once('modules/Vendors/Vendor.php'); - $vend_focus = new Vendor(); + require_once('modules/Vendors/Vendors.php'); + $vend_focus = new Vendors(); $vend_focus->retrieve_entity_info($_REQUEST['vendor_id'],"Vendors"); $focus->column_fields['bill_city']=$vend_focus->column_fields['city']; Modified: vtigercrm/trunk/modules/PurchaseOrder/ListTopPurchaseOrder.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListTopPurchaseOrder.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListTopPurchaseOrder.php Tue Oct 31 03:40:43 2006 @@ -47,7 +47,7 @@ $viewid = "0"; } } - $focus = new Order(); + $focus = new PurchaseOrder(); $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -56,9 +56,9 @@ //<<<<<<<<>>>>>>>> $date_var = date('Y-m-d'); - $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_purchaseorder.duedate >= \''.$date_var.'\' ORDER BY total DESC'; + $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_purchaseorder.duedate >= \''.$date_var.'\''; $query = getListQuery("PurchaseOrder",$where); - + $query .=" ORDER BY total DESC"; //<<<<<<<>>>>>>>> Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Tue Oct 31 03:40:43 2006 @@ -35,7 +35,7 @@ $url_string = '&smodule=PO'; -$focus = new Order(); +$focus = new PurchaseOrder(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); @@ -81,6 +81,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); if(isPermitted('PurchaseOrder','Delete','') == 'yes') { Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Tue Oct 31 03:40:43 2006 @@ -30,7 +30,7 @@ require_once('user_privileges/default_module_view.php'); // Account is used to store vtiger_account information. -class Order extends CRMEntity { +class PurchaseOrder extends CRMEntity { var $log; var $db; @@ -42,10 +42,6 @@ var $billadr_table = "vtiger_pobillads"; - var $object_name = "Order"; - - var $new_schema = true; - var $module_id = "purchaseorderid"; var $column_fields = Array(); @@ -94,12 +90,20 @@ * 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. */ - function Order() { + function PurchaseOrder() { $this->log =LoggerManager::getLogger('PurchaseOrder'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('PurchaseOrder'); } + 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); + } + + + /** Function used to get the sort order for Purchase Order listview * @return string $sorder - first check the $_REQUEST['sorder'] if request value is empty then check in the $_SESSION['PURCHASEORDER_SORT_ORDER'] if this session value is empty then default sort order will be returned. */ Modified: vtigercrm/trunk/modules/PurchaseOrder/Save.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/Save.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/Save.php Tue Oct 31 03:40:43 2006 @@ -27,31 +27,23 @@ $local_log =& LoggerManager::getLogger('index'); -$focus = new Order(); +$focus = new PurchaseOrder(); global $current_user; -$currencyid=fetchCurrency($current_user->id); -$rate_symbol = getCurrencySymbolandCRate($currencyid); -$rate = $rate_symbol['rate']; setObjectValuesFromRequest(&$focus); //Added code for auto product stock updation on receiving goods -$update_prod_stock=''; +$focus->update_prod_stock=''; if($focus->column_fields['postatus'] == 'Received Shipment' && $focus->mode == 'edit') { $prev_postatus=getPoStatus($focus->id); if($focus->column_fields['postatus'] != $prev_postatus) { - $update_prod_stock='true'; + $focus->update_prod_stock='true'; } } $focus->save("PurchaseOrder"); - - -//Based on the total Number of rows we will save the product relationship with this entity -saveInventoryProductDetails(&$focus, 'PurchaseOrder', $update_prod_stock); - $return_id = $focus->id; Modified: vtigercrm/trunk/modules/Quotes/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Quotes/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ } else { -$focus = new Quote(); +$focus = new Quotes(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/CreatePDF.php (original) +++ vtigercrm/trunk/modules/Quotes/CreatePDF.php Tue Oct 31 03:40:43 2006 @@ -11,7 +11,7 @@ require_once('include/fpdf/pdf.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/database/PearDatabase.php'); global $adb,$app_strings; @@ -25,7 +25,7 @@ global $products_per_page; $products_per_page="6"; -$focus = new Quote(); +$focus = new Quotes(); $focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); $account_name = getAccountName($focus->column_fields[account_id]); Modified: vtigercrm/trunk/modules/Quotes/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Delete.php (original) +++ vtigercrm/trunk/modules/Quotes/Delete.php Tue Oct 31 03:40:43 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('quote_delete'); -$focus = new Quote(); +$focus = new Quotes(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/trunk/modules/Quotes/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/DetailView.php (original) +++ vtigercrm/trunk/modules/Quotes/DetailView.php Tue Oct 31 03:40:43 2006 @@ -22,13 +22,13 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); global $mod_strings,$app_strings,$currentModule,$theme,$singlepane_view; -$focus = new Quote(); +$focus = new Quotes(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); Modified: vtigercrm/trunk/modules/Quotes/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Quotes/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Quote(); + $modObj = new Quotes(); $modObj->retrieve_entity_info($crmid,"Quotes"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/trunk/modules/Quotes/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/EditView.php (original) +++ vtigercrm/trunk/modules/Quotes/EditView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ $log->debug("Inside Quote EditView"); -$focus = new Quote(); +$focus = new Quotes(); $smarty = new vtigerCRM_Smarty; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); @@ -70,8 +70,8 @@ // Get Account address if vtiger_account is given if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']==''){ - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/trunk/modules/Quotes/ListTopQuotes.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListTopQuotes.php (original) +++ vtigercrm/trunk/modules/Quotes/ListTopQuotes.php Tue Oct 31 03:40:43 2006 @@ -19,7 +19,7 @@ function getTopQuotes() { require_once("data/Tracker.php"); - require_once('modules/Quotes/Quote.php'); + require_once('modules/Quotes/Quotes.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); require_once('include/database/PearDatabase.php'); @@ -51,7 +51,7 @@ $viewid = "0"; } } - $focus = new Quote(); + $focus = new Quotes(); $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -60,9 +60,9 @@ //<<<<<<<<>>>>>>>> $date_var = date('Y-m-d'); - $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_quotes.validtill >= \''.$date_var.'\' ORDER BY total DESC'; + $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_quotes.validtill >= \''.$date_var.'\''; $query = getListQuery("Quotes",$where); - + $query .=" ORDER BY total DESC"; //<<<<<<<>>>>>>>> $list_result = $adb->limitQuery($query,0,5); Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Tue Oct 31 03:40:43 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -33,7 +33,7 @@ $url_string = ''; -$focus = new Quote(); +$focus = new Quotes(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); @@ -79,6 +79,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); if(isPermitted('Quotes','Delete','') == 'yes') { Modified: vtigercrm/trunk/modules/Quotes/Save.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Save.php (original) +++ vtigercrm/trunk/modules/Quotes/Save.php Tue Oct 31 03:40:43 2006 @@ -21,7 +21,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); include("modules/Emails/mail.php"); @@ -34,7 +34,7 @@ $rate = $rate_symbol['rate']; $log->debug("Inside Quote Save"); -$focus = new Quote(); +$focus = new Quotes(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/trunk/modules/Reports/ReportColumns.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportColumns.php (original) +++ vtigercrm/trunk/modules/Reports/ReportColumns.php Tue Oct 31 03:40:43 2006 @@ -113,7 +113,7 @@ $shtml .= ""; foreach($ogReport->sec_module_columnslist[$secmodule[$i]][$key] as $field=>$fieldlabel) { - if(isset($mod_strings[$fieldlable])) + if(isset($mod_strings[$fieldlabel])) { $shtml .= ""; }else Modified: vtigercrm/trunk/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportRun.php (original) +++ vtigercrm/trunk/modules/Reports/ReportRun.php Tue Oct 31 03:40:43 2006 @@ -1269,11 +1269,14 @@ } - if($module == "Campaigns")// added for 5.0 - { - $query = "from vtiger_campaign - 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)." + if($module == "Campaigns") + { + $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"; } $log->info("ReportRun :: Successfully returned getReportsQuery".$module); Modified: vtigercrm/trunk/modules/Reports/Reports.php ============================================================================== --- vtigercrm/trunk/modules/Reports/Reports.php (original) +++ vtigercrm/trunk/modules/Reports/Reports.php Tue Oct 31 03:40:43 2006 @@ -793,10 +793,20 @@ { $fieldcolname = $adb->query_result($result,$i,"columnname"); $fieldlist = explode(":",$fieldcolname); + + //Fix for multilanguage support - code contribution by Ding jianting + $fieldlabel_array = explode("_",$fieldlist[2]); + $mod_strings = return_module_language($current_language,$fieldlabel_array[0]); if($fieldcolname != "") { - $shtml .= ""; - } + $fieldlabel = trim(str_replace($modules," ",$fieldlist[2])); + if(isset($mod_strings[$fieldlabel])) { + $shtml .= ""; + } else { + $shtml .= ""; + } + } + //Code contribution ends } $log->info("Reports :: Successfully returned getSelectedColumnsList"); Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/EditView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/EditView.php Tue Oct 31 03:40:43 2006 @@ -23,7 +23,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/SalesOrder/SalesOrder.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -44,7 +44,7 @@ if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoso') { $quoteid = $_REQUEST['record']; - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -80,7 +80,7 @@ $quoteid = $focus->column_fields['quote_id']; $smarty->assign("QUOTE_ID", $focus->column_fields['quote_id']); - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -118,7 +118,7 @@ $focus->column_fields['duedate'] = getDBInsertDateValue($curr_due_date); } $quoteid = $focus->column_fields['quote_id']; - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -161,8 +161,8 @@ // Get Account address if vtiger_account is given if(isset($_REQUEST['account_id']) && $_REQUEST['record']=='' && $_REQUEST['account_id'] != ''){ - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php Tue Oct 31 03:40:43 2006 @@ -56,9 +56,9 @@ //<<<<<<<<>>>>>>>> $date_var = date('Y-m-d'); - $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_salesorder.duedate >= \''.$date_var.'\' ORDER BY total DESC'; + $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_salesorder.duedate >= \''.$date_var.'\''; $query = getListQuery("SalesOrder",$where); - + $query .=" ORDER BY total DESC"; //<<<<<<<>>>>>>>> $list_result = $adb->limitQuery($query,0,5); Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListView.php Tue Oct 31 03:40:43 2006 @@ -79,6 +79,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); // Buttons and View options if(isPermitted('SalesOrder','Delete','') == 'yes') { Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original) +++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Tue Oct 31 03:40:43 2006 @@ -106,6 +106,23 @@ $this->db = new PearDatabase(); $this->column_fields = getColumnFields('SalesOrder'); } + + function save_module($module) + { + + //Checking if quote_id is present and updating the quote status + if($this->column_fields["quote_id"] != '') + { + $qt_id = $this->column_fields["quote_id"]; + $query1 = "update vtiger_quotes set quotestage='Accepted' where quoteid=".$qt_id; + $this->db->query($query1); + } + + //Based on the total Number of rows we will save the product relationship with this entity + saveInventoryProductDetails(&$this, 'SalesOrder'); + + + } /** Function used to get the sort order for Sales Order listview * @return string $sorder - first check the $_REQUEST['sorder'] if request value is empty then check in the $_SESSION['SALESORDER_SORT_ORDER'] if this session value is empty then default sort order will be returned. Modified: vtigercrm/trunk/modules/SalesOrder/Save.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/Save.php (original) +++ vtigercrm/trunk/modules/SalesOrder/Save.php Tue Oct 31 03:40:43 2006 @@ -31,39 +31,7 @@ $focus = new SalesOrder(); setObjectValuesFromRequest(&$focus); -if($focus->mode == 'edit' && ($focus->column_fields['sostatus'] == 'Delivered' || $focus->column_fields['sostatus'] == 'Approved')) -{ - $prev_sostatus=$adb->query_result($adb->query("select sostatus from vtiger_salesorder where salesorderid=$focus->id"),0,'sostatus'); - - if($focus->column_fields['sostatus'] != $prev_sostatus) - { - if($focus->column_fields['sostatus'] == 'Delivered') - { - //Deduct the quantity from Quantity In Stock and Quantity In Demand - $updateStockAndDemand = 'true'; - } - elseif($focus->column_fields['sostatus'] == 'Approved') - { - //Add the quantity with Quantity In Demand - $updateDemand = 'true'; - } - } - -} - $focus->save("SalesOrder"); - -//Checking if quote_id is present and updating the quote status -if($focus->column_fields["quote_id"] != '') -{ - $qt_id = $focus->column_fields["quote_id"]; - $query1 = "update vtiger_quotes set quotestage='Accepted' where quoteid=".$qt_id; - $adb->query($query1); -} - -//Based on the total Number of rows we will save the product relationship with this entity -saveInventoryProductDetails(&$focus, 'SalesOrder','',$updateStockAndDemand, $updateDemand); - $return_id = $focus->id; Modified: vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php (original) +++ vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php Tue Oct 31 03:40:43 2006 @@ -69,7 +69,7 @@ // vtiger_invoice number block $invBlock=array("145","65"); -$pdf->addRecBlock($id, "Invoice Number",$invBlock); +$pdf->addRecBlock($id, "SO Number",$invBlock); /* ************ End Invoice Data ************************ */ Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php ============================================================================== --- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original) +++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Tue Oct 31 03:40:43 2006 @@ -79,25 +79,7 @@ //Assigning the vtiger_table Name $tableName =''; - if($fldmodule == 'Leads') - { - $tableName='vtiger_leadscf'; - } - elseif($fldmodule == 'Accounts') - { - - $tableName='vtiger_accountscf'; - } - elseif($fldmodule == 'Contacts') - { - - $tableName='vtiger_contactscf'; - } - elseif($fldmodule == 'Potentials') - { - $tableName='vtiger_potentialscf'; - } - elseif($fldmodule == 'HelpDesk') + if($fldmodule == 'HelpDesk') { $tableName='vtiger_ticketcf'; } @@ -113,25 +95,9 @@ { $tableName='vtiger_pricebookcf'; } - elseif($fldmodule == 'Quotes') - { - $tableName='vtiger_quotescf'; - } - elseif($fldmodule == 'PurchaseOrder') - { - $tableName='vtiger_purchaseordercf'; - } - elseif($fldmodule == 'SalesOrder') - { - $tableName='vtiger_salesordercf'; - } - elseif($fldmodule == 'Invoice') - { - $tableName='vtiger_invoicecf'; - } - elseif($fldmodule == 'Campaigns') - { - $tableName='vtiger_campaignscf'; + elseif($fldmodule != '') + { + $tableName= 'vtiger_'.strtolower($fldmodule).'cf'; } //Assigning the uitype $fldlength=$_REQUEST['fldLength']; Modified: vtigercrm/trunk/modules/Settings/CustomFieldList.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CustomFieldList.php (original) +++ vtigercrm/trunk/modules/Settings/CustomFieldList.php Tue Oct 31 03:40:43 2006 @@ -22,20 +22,8 @@ $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); $smarty->assign("IMAGE_PATH", $image_path); -$module_array=Array('Leads'=>'Leads', - 'Accounts'=>'Accounts', - 'Contacts'=>'Contacts', - 'Potentials'=>'Potentials', - 'HelpDesk'=>'HelpDesk', - 'Products'=>'Products', - 'Vendors'=>'Vendors', - 'PriceBooks'=>'PriceBooks', - 'PurchaseOrder'=>'PurchaseOrder', - 'SalesOrder'=>'SalesOrder', - 'Quotes'=>'Quotes', - 'Invoice'=>'Invoice', - 'Campaigns'=>'Campaigns' - ); +$module_array=getCustomFieldSupportedModules(); + $cfimagecombo = Array($image_path."text.gif", $image_path."number.gif", $image_path."percent.gif", @@ -166,4 +154,18 @@ return $label; } +/* function to get the modules supports Custom Fields +*/ + +function getCustomFieldSupportedModules() +{ + global $adb; + $sql="select distinct vtiger_field.tabid,name from vtiger_field inner join vtiger_tab on vtiger_field.tabid=vtiger_tab.tabid where vtiger_field.tabid not in(9,10,16,15,8,29)"; + $result = $adb->query($sql); + while($moduleinfo=$adb->fetch_array($result)) + { + $modulelist[$moduleinfo['name']] = $moduleinfo['name']; + } + return $modulelist; +} ?> Modified: vtigercrm/trunk/modules/Settings/DeleteCustomField.php ============================================================================== --- vtigercrm/trunk/modules/Settings/DeleteCustomField.php (original) +++ vtigercrm/trunk/modules/Settings/DeleteCustomField.php Tue Oct 31 03:40:43 2006 @@ -50,7 +50,15 @@ $adb->query($dbquery); -//HANDLE HERE - we have to remove the entries in customview and report related tables which have this field ($colName) +//we have to remove the entries in customview and report related tables which have this field ($colName) +$adb->query("delete from vtiger_cvcolumnlist where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_cvstdfilter where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_cvadvfilter where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_selectcolumn where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_relcriteria where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_reportsortcol where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_reportdatefilter where datecolumnname like '%".$colName."%'"); +$adb->query("delete from vtiger_reportsummary where columnname like '%".$colName."%'"); //Deleting from convert lead mapping vtiger_table- Jaguar @@ -67,5 +75,7 @@ $adb->query($deltablequery); } + + header("Location:index.php?module=Settings&action=CustomFieldList&fld_module=".$fld_module."&parenttab=Settings"); ?> Modified: vtigercrm/trunk/modules/Settings/EditComboField.php ============================================================================== --- vtigercrm/trunk/modules/Settings/EditComboField.php (original) +++ vtigercrm/trunk/modules/Settings/EditComboField.php Tue Oct 31 03:40:43 2006 @@ -91,7 +91,9 @@ $smarty->assign("ENTRIES",$fldVal); $smarty->assign("MODULE",$moduleName); $smarty->assign("FIELDNAME",$tableName); -$smarty->assign("FIELDLABEL",$fieldlabel); +//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); +$smarty->assign("FIELDLABEL",$temp_label); $smarty->assign("UITYPE", $uitype); $smarty->assign("MOD", return_module_language($current_language,'Settings')); $smarty->assign("IMAGE_PATH",$image_path); Modified: vtigercrm/trunk/modules/Settings/TaxConfig.php ============================================================================== --- vtigercrm/trunk/modules/Settings/TaxConfig.php (original) +++ vtigercrm/trunk/modules/Settings/TaxConfig.php Tue Oct 31 03:40:43 2006 @@ -1,214 +1,244 @@ -assign("EDIT_MODE", 'true'); -} -elseif($_REQUEST['sh_edit_tax'] == 'true') -{ - $smarty->assign("SH_EDIT_MODE", 'true'); -} - -//To add tax -if($_REQUEST['add_tax_type'] == 'true') -{ - //Add the given tax name and value as a new tax type - echo addTaxType($_REQUEST['addTaxLabel'],$_REQUEST['addTaxValue']); - $getlist = true; -} -elseif($_REQUEST['sh_add_tax_type'] == 'true') -{ - echo addTaxType($_REQUEST['sh_addTaxLabel'],$_REQUEST['sh_addTaxValue'],'sh'); - $getlist = true; -} - -//To Disable ie., delete or enable -if(($_REQUEST['disable'] == 'true' || $_REQUEST['enable'] == 'true') && $_REQUEST['taxname'] != '') -{ - if($_REQUEST['disable'] == 'true') - changeDeleted($_REQUEST['taxname'],1); - else - changeDeleted($_REQUEST['taxname'],0); - $getlist = true; -} -elseif(($_REQUEST['sh_disable'] == 'true' || $_REQUEST['sh_enable'] == 'true') && $_REQUEST['sh_taxname'] != '') -{ - if($_REQUEST['sh_disable'] == 'true') - changeDeleted($_REQUEST['sh_taxname'],1,'sh'); - else - changeDeleted($_REQUEST['sh_taxname'],0,'sh'); - $getlist = true; -} - -//after done save or enable/disable or added new tax the list will be retrieved again from db -if($getlist) -{ - $tax_details = getAllTaxes(); - $sh_tax_details = getAllTaxes('all','sh'); -} - -$smarty->assign("TAX_COUNT", count($tax_details)); -$smarty->assign("SH_TAX_COUNT", count($sh_tax_details)); - -if(count($tax_details) == 0) - $smarty->assign("TAX_COUNT", 0); -if(count($sh_tax_details) == 0) - $smarty->assign("SH_TAX_COUNT", 0); - -$smarty->assign("TAX_VALUES", $tax_details); -$smarty->assign("SH_TAX_VALUES", $sh_tax_details); - -$smarty->assign("MOD", return_module_language($current_language,'Settings')); -$smarty->assign("IMAGE_PATH",$image_path); -$smarty->assign("APP", $app_strings); -$smarty->assign("MOD", $mod_strings); -$smarty->display("Settings/TaxConfig.tpl"); - - -/** Function to update the list of Tax percentages for the passed tax types - * @param array $new_percentages - array of tax types and the values like [taxid]=new value ie., [1]=3.56, [2]=11.45 - * @param string $sh - sh or empty, if sh passed then update will be done in shipping and handling related table - * @return void - */ -function updateTaxPercentages($new_percentages, $sh='') -{ - global $adb, $log; - $log->debug("Entering into the function updateTaxPercentages"); - - $tax_percentage = Array(); - - foreach($new_percentages as $taxid => $new_val) - { - if($new_val != '') - { - if($sh != '' && $sh == 'sh') - $query = "update vtiger_shippingtaxinfo set percentage = \"$new_val\" where taxid=\"$taxid\""; - else - $query = "update vtiger_inventorytaxinfo set percentage = \"$new_val\" where taxid=\"$taxid\""; - $adb->query($query); - } - } - - $log->debug("Exiting from the function updateTaxPercentages"); -} - -/** Function used to add the tax type which will do database alterations - * @param string $taxlabel - tax label name to be added - * @param string $taxvalue - tax value to be added - * @param string $sh - sh or empty , if sh passed then the tax will be added in shipping and handling related table - * @return void - */ -function addTaxType($taxlabel, $taxvalue, $sh='') -{ - global $adb, $log; - $log->debug("Entering into function addTaxType($taxlabel, $taxvalue, $sh)"); - - //First we will check whether the tax is already available or not - if($sh != '' && $sh == 'sh') - $check_query = "select taxlabel from vtiger_shippingtaxinfo where taxlabel='".addslashes($taxlabel)."'"; - else - $check_query = "select taxlabel from vtiger_inventorytaxinfo where taxlabel='".addslashes($taxlabel)."'"; - $check_res = $adb->query($check_query); - - if($adb->num_rows($check_res) > 0) - return "This tax is already available"; - - //if the tax is not available then add this tax. - //Add this tax as a column in related table - if($sh != '' && $sh == 'sh') - { - $taxid = $adb->getUniqueID("vtiger_shippingtaxinfo"); - $taxname = "shtax".$taxid; - - $query = "alter table vtiger_inventoryshippingrel add column $taxname decimal(7,3) default NULL"; - } - else - { - $taxid = $adb->getUniqueID("vtiger_inventorytaxinfo"); - $taxname = "tax".$taxid; - $query = "alter table vtiger_inventoryproductrel add column $taxname decimal(7,3) default NULL"; - } - $res = $adb->query($query); - - //if the tax is added as a column then we should add this tax in the list of taxes - if($res) - { - if($sh != '' && $sh == 'sh') - $query1 = "insert into vtiger_shippingtaxinfo values($taxid,'".$taxname."','".$taxlabel."','".$taxvalue."',0)"; - else - $query1 = "insert into vtiger_inventorytaxinfo values($taxid,'".$taxname."','".$taxlabel."','".$taxvalue."',0)"; - - $res1 = $adb->query($query1); - } - - $log->debug("Exit from function addTaxType($taxlabel, $taxvalue)"); - if($res1) - return ''; - else - return "There may be some problem in adding the Tax type. Please try again"; -} - -/** Function used to Enable or Disable the tax type - * @param string $taxname - taxname to enable or disble - * @param int $deleted - 0 or 1 where 0 to enable and 1 to disable - * @param string $sh - sh or empty, if sh passed then the enable/disable will be done in shipping and handling tax table ie.,vtiger_shippingtaxinfo else this enable/disable will be done in Product tax table ie., in vtiger_inventorytaxinfo - * @return void - */ -function changeDeleted($taxname, $deleted, $sh='') -{ - global $log, $adb; - $log->debug("Entering into function changeDeleted($taxname, $deleted, $sh)"); - - if($sh == 'sh') - $adb->query("update vtiger_shippingtaxinfo set deleted=$deleted where taxname=\"$taxname\""); - else - $adb->query("update vtiger_inventorytaxinfo set deleted=$deleted where taxname=\"$taxname\""); - $log->debug("Exit from function changeDeleted($taxname, $deleted, $sh)"); -} - -?> +assign("EDIT_MODE", 'true'); +} +elseif($_REQUEST['sh_edit_tax'] == 'true') +{ + $smarty->assign("SH_EDIT_MODE", 'true'); +} + +//To add tax +if($_REQUEST['add_tax_type'] == 'true') +{ + //Add the given tax name and value as a new tax type + echo addTaxType($_REQUEST['addTaxLabel'],$_REQUEST['addTaxValue']); + $getlist = true; +} +elseif($_REQUEST['sh_add_tax_type'] == 'true') +{ + echo addTaxType($_REQUEST['sh_addTaxLabel'],$_REQUEST['sh_addTaxValue'],'sh'); + $getlist = true; +} + +//To Disable ie., delete or enable +if(($_REQUEST['disable'] == 'true' || $_REQUEST['enable'] == 'true') && $_REQUEST['taxname'] != '') +{ + if($_REQUEST['disable'] == 'true') + changeDeleted($_REQUEST['taxname'],1); + else + changeDeleted($_REQUEST['taxname'],0); + $getlist = true; +} +elseif(($_REQUEST['sh_disable'] == 'true' || $_REQUEST['sh_enable'] == 'true') && $_REQUEST['sh_taxname'] != '') +{ + if($_REQUEST['sh_disable'] == 'true') + changeDeleted($_REQUEST['sh_taxname'],1,'sh'); + else + changeDeleted($_REQUEST['sh_taxname'],0,'sh'); + $getlist = true; +} + +//after done save or enable/disable or added new tax the list will be retrieved again from db +if($getlist) +{ + $tax_details = getAllTaxes(); + $sh_tax_details = getAllTaxes('all','sh'); +} + +$smarty->assign("TAX_COUNT", count($tax_details)); +$smarty->assign("SH_TAX_COUNT", count($sh_tax_details)); + +if(count($tax_details) == 0) + $smarty->assign("TAX_COUNT", 0); +if(count($sh_tax_details) == 0) + $smarty->assign("SH_TAX_COUNT", 0); + +$smarty->assign("TAX_VALUES", $tax_details); + +$smarty->assign("SH_TAX_VALUES", $sh_tax_details); + +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("MOD", $mod_strings); +$smarty->display("Settings/TaxConfig.tpl"); + + +/** Function to update the list of Tax percentages for the passed tax types + * @param array $new_percentages - array of tax types and the values like [taxid]=new value ie., [1]=3.56, [2]=11.45 + * @param string $sh - sh or empty, if sh passed then update will be done in shipping and handling related table + * @return void + */ +function updateTaxPercentages($new_percentages, $sh='') +{ + global $adb, $log; + $log->debug("Entering into the function updateTaxPercentages"); + + foreach($new_percentages as $taxid => $new_val) + { + if($new_val != '') + { + if($sh != '' && $sh == 'sh') + $query = "update vtiger_shippingtaxinfo set percentage=\"$new_val\" where taxid=\"$taxid\""; + else + $query = "update vtiger_inventorytaxinfo set percentage = \"$new_val\" where taxid=\"$taxid\""; + $adb->query($query); + } + } + + $log->debug("Exiting from the function updateTaxPercentages"); +} + +/** Function to update the list of Tax Labels for the taxes + * @param array $new_labels - array of tax types and the values like [taxid]=new label ie., [1]=aa, [2]=bb + * @param string $sh - sh or empty, if sh passed then update will be done in shipping and handling related table + * @return void + */ +function updateTaxLabels($new_labels, $sh='') +{ + global $adb, $log; + $log->debug("Entering into the function updateTaxPercentages"); + + foreach($new_labels as $taxid => $new_val) + { + if($new_val != '') + { + if($sh != '' && $sh == 'sh') + $query = "update vtiger_shippingtaxinfo set taxlabel= \"$new_val\" where taxid=\"$taxid\""; + else + $query = "update vtiger_inventorytaxinfo set taxlabel = \"$new_val\" where taxid=\"$taxid\""; + $adb->query($query); + } + } + + $log->debug("Exiting from the function updateTaxPercentages"); +} +/** Function used to add the tax type which will do database alterations + * @param string $taxlabel - tax label name to be added + * @param string $taxvalue - tax value to be added + * @param string $sh - sh or empty , if sh passed then the tax will be added in shipping and handling related table + * @return void + */ +function addTaxType($taxlabel, $taxvalue, $sh='') +{ + global $adb, $log; + $log->debug("Entering into function addTaxType($taxlabel, $taxvalue, $sh)"); + + //First we will check whether the tax is already available or not + if($sh != '' && $sh == 'sh') + $check_query = "select taxlabel from vtiger_shippingtaxinfo where taxlabel='".addslashes($taxlabel)."'"; + else + $check_query = "select taxlabel from vtiger_inventorytaxinfo where taxlabel='".addslashes($taxlabel)."'"; + $check_res = $adb->query($check_query); + + if($adb->num_rows($check_res) > 0) + return "This tax is already available"; + + //if the tax is not available then add this tax. + //Add this tax as a column in related table + if($sh != '' && $sh == 'sh') + { + $taxid = $adb->getUniqueID("vtiger_shippingtaxinfo"); + $taxname = "shtax".$taxid; + $query = "alter table vtiger_inventoryshippingrel add column $taxname decimal(7,3) default NULL"; + } + else + { + $taxid = $adb->getUniqueID("vtiger_inventorytaxinfo"); + $taxname = "tax".$taxid; + $query = "alter table vtiger_inventoryproductrel add column $taxname decimal(7,3) default NULL"; + } + $res = $adb->query($query); + + //if the tax is added as a column then we should add this tax in the list of taxes + if($res) + { + if($sh != '' && $sh == 'sh') + $query1 = "insert into vtiger_shippingtaxinfo values($taxid,'".$taxname."','".$taxlabel."','".$taxvalue."',0)"; + else + $query1 = "insert into vtiger_inventorytaxinfo values($taxid,'".$taxname."','".$taxlabel."','".$taxvalue."',0)"; + + $res1 = $adb->query($query1); + } + + $log->debug("Exit from function addTaxType($taxlabel, $taxvalue)"); + if($res1) + return ''; + else + return "There may be some problem in adding the Tax type. Please try again"; +} + +/** Function used to Enable or Disable the tax type + * @param string $taxname - taxname to enable or disble + * @param int $deleted - 0 or 1 where 0 to enable and 1 to disable + * @param string $sh - sh or empty, if sh passed then the enable/disable will be done in shipping and handling tax table ie.,vtiger_shippingtaxinfo else this enable/disable will be done in Product tax table ie., in vtiger_inventorytaxinfo + * @return void + */ +function changeDeleted($taxname, $deleted, $sh='') +{ + global $log, $adb; + $log->debug("Entering into function changeDeleted($taxname, $deleted, $sh)"); + + if($sh == 'sh') + $adb->query("update vtiger_shippingtaxinfo set deleted=$deleted where taxname=\"$taxname\""); + else + $adb->query("update vtiger_inventorytaxinfo set deleted=$deleted where taxname=\"$taxname\""); + $log->debug("Exit from function changeDeleted($taxname, $deleted, $sh)"); +} + +?> Modified: vtigercrm/trunk/modules/Users/Authenticate.php ============================================================================== --- vtigercrm/trunk/modules/Users/Authenticate.php (original) +++ vtigercrm/trunk/modules/Users/Authenticate.php Tue Oct 31 03:40:43 2006 @@ -20,14 +20,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('modules/Users/CreateUserPrivilegeFile.php'); require_once('include/logging.php'); require_once('user_privileges/audit_trail.php'); global $mod_strings; -$focus = new User(); +$focus = new Users(); // Add in defensive code here. $focus->column_fields["user_name"] = to_html($_REQUEST['user_name']); Modified: vtigercrm/trunk/modules/Users/ChangePassword.php ============================================================================== --- vtigercrm/trunk/modules/Users/ChangePassword.php (original) +++ vtigercrm/trunk/modules/Users/ChangePassword.php Tue Oct 31 03:40:43 2006 @@ -23,7 +23,7 @@ // The popup_picker.html file is used for generating a list from which to find and choose one instance. global $theme; -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php ============================================================================== --- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original) +++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('config.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/utils/utils.php'); require_once('include/utils/GetUserGroups.php'); @@ -32,7 +32,7 @@ $newbuf .="retrieve_entity_info($userid,"Users"); $userInfo=Array(); $user_focus->column_fields["id"] = ''; @@ -120,7 +120,7 @@ $newbuf .="retrieve_entity_info($userid,"Users"); if($user_focus->is_admin == 'on') { Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Oct 31 03:40:43 2006 @@ -412,7 +412,7 @@ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,25,2,'T~O',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,25,2,'T~O',1,null,'BAS')"); //Added on 26-12-2005 to add attachment in ticket editview - $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,12,26,1,'V~O',0,3,'BAS')"); + $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,12,25,1,'V~O',0,3,'BAS')"); $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'title','vtiger_troubletickets',1,'22','ticket_title','Title',1,0,0,100,1,26,1,'V~M',0,1,'BAS')"); $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_troubletickets',1,'19','description','Description',1,0,0,100,1,28,1,'V~O',0,2,'BAS')"); @@ -428,7 +428,7 @@ $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").",'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,1,31,'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')"); @@ -502,8 +502,8 @@ $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,23,1,'V~M',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,2,23,1,'V~O',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,9,23,1,'T~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,22,1,'T~O',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,null,'BAS')"); //Block21 -- End @@ -912,6 +912,25 @@ //user Details End +//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')"); // Insert End Modified: vtigercrm/trunk/modules/Users/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Users/DetailView.php (original) +++ vtigercrm/trunk/modules/Users/DetailView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/utils/utils.php'); require_once('include/utils/CommonUtils.php'); require_once('include/utils/UserInfoUtil.php'); @@ -37,7 +37,7 @@ global $app_strings; global $mod_strings; -$focus = new User(); +$focus = new Users(); if(!empty($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],'Users'); Modified: vtigercrm/trunk/modules/Users/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Users/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Users/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -24,7 +24,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $userObj = new User(); + $userObj = new Users(); $userObj->retrieve_entity_info($crmid,"Users"); $userObj->column_fields[$fieldname] = $fieldvalue; $userObj->id = $crmid; Modified: vtigercrm/trunk/modules/Users/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Users/EditView.php (original) +++ vtigercrm/trunk/modules/Users/EditView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/utils/UserInfoUtil.php'); require_once('modules/Users/Forms.php'); require_once('include/database/PearDatabase.php'); @@ -36,7 +36,7 @@ $smarty=new vtigerCRM_Smarty; -$focus = new User(); +$focus = new Users(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $smarty->assign("ID",$_REQUEST['record']); Modified: vtigercrm/trunk/modules/Users/ListLoginHistory.php ============================================================================== --- vtigercrm/trunk/modules/Users/ListLoginHistory.php (original) +++ vtigercrm/trunk/modules/Users/ListLoginHistory.php Tue Oct 31 03:40:43 2006 @@ -12,7 +12,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); @@ -42,7 +42,7 @@ $category = getParenttab(); -$oUser = new User($id); +$oUser = new Users($id); $user_list = getUserslist(); Modified: vtigercrm/trunk/modules/Users/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Users/ListView.php (original) +++ vtigercrm/trunk/modules/Users/ListView.php Tue Oct 31 03:40:43 2006 @@ -24,7 +24,7 @@ global $current_language; $mod_strings = return_module_language($current_language,'Users'); $category = getParentTab(); -$focus = new User(); +$focus = new Users(); $smarty = new vtigerCRM_Smarty; $no_of_users=UserCount(); //Retreiving the start value from request Modified: vtigercrm/trunk/modules/Users/Logout.php ============================================================================== --- vtigercrm/trunk/modules/Users/Logout.php (original) +++ vtigercrm/trunk/modules/Users/Logout.php Tue Oct 31 03:40:43 2006 @@ -20,7 +20,7 @@ require_once('include/logging.php'); require_once('database/DatabaseConnection.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('config.php'); require_once('include/db_backup/backup.php'); require_once('include/db_backup/ftp.php'); Modified: vtigercrm/trunk/modules/Users/Save.php ============================================================================== --- vtigercrm/trunk/modules/Users/Save.php (original) +++ vtigercrm/trunk/modules/Users/Save.php Tue Oct 31 03:40:43 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/logging.php'); require_once('include/utils/UserInfoUtil.php'); $log =& LoggerManager::getLogger('index'); @@ -46,7 +46,7 @@ if (isset($_POST['record']) && !is_admin($current_user) && $_POST['record'] != $current_user->id) echo ("Unauthorized access to user administration."); elseif (!isset($_POST['record']) && !is_admin($current_user)) echo ("Unauthorized access to user administration."); -$focus = new User(); +$focus = new Users(); if(isset($_REQUEST["record"]) && $_REQUEST["record"] != '') { $focus->mode='edit'; Modified: vtigercrm/trunk/modules/Users/ShowAuditTrail.php ============================================================================== --- vtigercrm/trunk/modules/Users/ShowAuditTrail.php (original) +++ vtigercrm/trunk/modules/Users/ShowAuditTrail.php Tue Oct 31 03:40:43 2006 @@ -12,7 +12,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/AuditTrail.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/trunk/modules/Users/ShowHistory.php ============================================================================== --- vtigercrm/trunk/modules/Users/ShowHistory.php (original) +++ vtigercrm/trunk/modules/Users/ShowHistory.php Tue Oct 31 03:40:43 2006 @@ -12,11 +12,11 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -#require_once('modules/Users/User.php'); +#require_once('modules/Users/Users.php'); require_once('include/utils/utils.php'); global $app_strings; Modified: vtigercrm/trunk/modules/Users/about_us.php ============================================================================== --- vtigercrm/trunk/modules/Users/about_us.php (original) +++ vtigercrm/trunk/modules/Users/about_us.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ } else { - $patch_string = "--None--"; + $patch_string = $vtiger_current_version; } global $app_strings; global $app_list_strings; @@ -83,18 +83,20 @@ - + + + - + - + Modified: vtigercrm/trunk/modules/Users/massChangeStatus.php ============================================================================== --- vtigercrm/trunk/modules/Users/massChangeStatus.php (original) +++ vtigercrm/trunk/modules/Users/massChangeStatus.php Tue Oct 31 03:40:43 2006 @@ -15,12 +15,12 @@ require_once('include/ComboUtil.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); global $app_list_strings; global $app_strings; global $current_user; -$focus = new Lead(); +$focus = new Leads(); $idlist = $_POST['idlist']; //echo $idlist; Modified: vtigercrm/trunk/modules/Users/populatetemplate.php ============================================================================== --- vtigercrm/trunk/modules/Users/populatetemplate.php (original) +++ vtigercrm/trunk/modules/Users/populatetemplate.php Tue Oct 31 03:40:43 2006 @@ -10,9 +10,9 @@ ********************************************************************************/ //query the specific vtiger_table and then get the data and write the data here require_once('include/database/PearDatabase.php'); -include_once('modules/Contacts/Contact.php'); -include_once('modules/Leads/Lead.php'); -include_once('modules/Users/User.php'); +include_once('modules/Contacts/Contacts.php'); +include_once('modules/Leads/Leads.php'); +include_once('modules/Users/Users.php'); global $log; //download the template file and store it in some specific location @@ -60,11 +60,11 @@ //get the module if($module == 'leads') { - $focus = new Lead(); + $focus = new Leads(); } else { - $focus = new Contact(); + $focus = new Contacts(); } $focus->retrieve_entity_info($recordid,$module); Modified: vtigercrm/trunk/modules/Users/profilePrivileges.php ============================================================================== --- vtigercrm/trunk/modules/Users/profilePrivileges.php (original) +++ vtigercrm/trunk/modules/Users/profilePrivileges.php Tue Oct 31 03:40:43 2006 @@ -59,16 +59,24 @@ else { $profileName=getProfileName($profileId); + } $smarty->assign("PROFILE_NAME", $profileName); if(isset($_REQUEST['profile_description']) && $_REQUEST['profile_description'] != '' && $_REQUEST['mode'] == 'create') + $smarty->assign("PROFILE_DESCRIPTION",$_REQUEST['profile_description']); +else +{ + $profileDescription = getProfileDescription($profileId); +} + +$smarty->assign("Profile_Name", $profileName); +$smarty->assign("Profile_Description", $profileDescription); + if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != '') $smarty->assign("MODE",$_REQUEST['mode']); - - //Initially setting the secondary selected vtiger_tab Modified: vtigercrm/trunk/modules/Users/updateLeadDBStatus.php ============================================================================== --- vtigercrm/trunk/modules/Users/updateLeadDBStatus.php (original) +++ vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Tue Oct 31 03:40:43 2006 @@ -19,6 +19,47 @@ $viewid = $_REQUEST['viewname']; $return_module = $_REQUEST['return_module']; $return_action = $_REQUEST['return_action']; +$module_array = array ( + 'Leads' => 'updateLeadGroupRelation', + 'Accounts' => 'updateAccountGroupRelation', + 'Contacts' => 'updateContactGroupRelation', + 'Potentials' => 'updatePotentialGroupRelation', + 'Quotes' => 'updateQuoteGroupRelation', + 'SalesOrder' => 'updateSoGroupRelation', + 'Invoice' => 'updateInvoiceGroupRelation', + 'PurchaseOrder' => 'updatePoGroupRelation', + 'HelpDesk' => 'updateTicketGroupRelation', + 'Campaigns' => 'updateCampaignGroupRelation', + 'Calendar' => 'updateActivityGroupRelation', + ); + +$deletegroup_array = array ( + 'Leads'=>'vtiger_leadgrouprelation', + 'Accounts'=>'vtiger_accountgrouprelation', + 'Contacts'=>'vtiger_contactgrouprelation', + 'Potentials'=>'vtiger_potentialgrouprelation', + 'Quotes'=>'vtiger_quotegrouprelation', + 'SalesOrder'=>'vtiger_sogrouprelation', + 'Invoice'=>'vtiger_invoicegrouprelation', + 'PurchaseOrder'=>'vtiger_pogrouprelation', + 'HelpDesk'=>'vtiger_ticketgrouprelation', + 'Campaigns'=>'vtiger_campaigngrouprelation', + 'Calendar'=>'vtiger_activitygrouprelation', + ); +$tableId_array= array ( + 'Leads'=>'leadid', + 'Accounts'=>'accountid', + 'Contacts'=>'contactid', + 'Potentials'=>'potentialid', + 'Quotes'=>'quoteid', + 'SalesOrder'=>'salesorderid', + 'Invoice'=>'invoiceid', + 'PurchaseOrder'=>'purchaseorderid', + 'HelpDesk'=>'ticketid', + 'Campaigns'=>'campaignid', + 'Calendar'=>'activityid', + ); + global $current_user; global $adb; $storearray = explode(";",trim($idlist,';')); @@ -26,15 +67,31 @@ $ids_list = array(); $date_var = date('YmdHis'); -if(isset($_REQUEST['user_id']) && $_REQUEST['user_id']!='') + +if((isset($_REQUEST['user_id']) && $_REQUEST['user_id']!='') || ($_REQUEST['group_id'] != '')) { foreach($storearray as $id) { if(isPermitted($return_module,'EditView',$id) == 'yes') { - if($id != '') { + if($_REQUEST['user_id'] != '' && $id != '') + { + //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); + + //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); + } + else if($_REQUEST['group_id'] != '' && $id != '') + { + //CHANGE HERE -- Here we have to use the getGroupName function. But that function is not correct one because they have used this function to get the assigned group name for the entity - Mickie + $groupname = $adb->query_result($adb->query("select groupname from vtiger_groups where groupid=".$_REQUEST['group_id']),0,'groupname'); + //This is to update the entity - group relation + $module_array[$return_module]($id,$groupname); + //Now we have to set the smownerid as 0 + $adb->query("update vtiger_crmentity set smownerid=0 where crmid=$id"); } } else Modified: vtigercrm/trunk/modules/Vendors/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Vendors/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ else { global $currentModule; -$focus = new Vendor(); +$focus = new Vendors(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/trunk/modules/Vendors/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/Delete.php (original) +++ vtigercrm/trunk/modules/Vendors/Delete.php Tue Oct 31 03:40:43 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new Vendor(); +$focus = new Vendors(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/trunk/modules/Vendors/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/DetailView.php (original) +++ vtigercrm/trunk/modules/Vendors/DetailView.php Tue Oct 31 03:40:43 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new Vendor(); +$focus = new Vendors(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/trunk/modules/Vendors/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Vendors/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Vendor(); + $modObj = new Vendors(); $modObj->retrieve_entity_info($crmid,"Vendors"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/trunk/modules/Vendors/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/EditView.php (original) +++ vtigercrm/trunk/modules/Vendors/EditView.php Tue Oct 31 03:40:43 2006 @@ -11,12 +11,12 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$theme,$currentModule; -$focus = new Vendor(); +$focus = new Vendors(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/trunk/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/ListView.php (original) +++ vtigercrm/trunk/modules/Vendors/ListView.php Tue Oct 31 03:40:43 2006 @@ -11,7 +11,7 @@ require_once('include/database/PearDatabase.php'); require_once('include/database/Postgres8.php'); require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/ListView/ListView.php'); require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); @@ -32,7 +32,7 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$focus = new Vendor(); +$focus = new Vendors(); $other_text = Array(); if(!$_SESSION['lvs'][$currentModule]) Modified: vtigercrm/trunk/modules/Vendors/Save.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/Save.php (original) +++ vtigercrm/trunk/modules/Vendors/Save.php Tue Oct 31 03:40:43 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new Vendor(); +$focus = new Vendors(); setObjectValuesFromRequest(&$focus); $focus->save("Vendors"); Modified: vtigercrm/trunk/modules/Webmails/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Webmails/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -11,7 +11,7 @@ global $current_user; require_once('Smarty_setup.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once('data/Tracker.php'); Modified: vtigercrm/trunk/modules/Webmails/Save.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/Save.php (original) +++ vtigercrm/trunk/modules/Webmails/Save.php Tue Oct 31 03:40:43 2006 @@ -9,7 +9,7 @@ * ********************************************************************************/ -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('modules/Webmails/Webmail.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); @@ -20,7 +20,7 @@ global $current_user; $local_log =& LoggerManager::getLogger('index'); -$focus = new Email(); +$focus = new Emails(); $to_address = explode(";",$_REQUEST['to_list']); $cc_address = explode(";",$_REQUEST['cc_list']); @@ -61,8 +61,8 @@ 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/Contact.php'); - $contact_focus = new 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"); Modified: vtigercrm/trunk/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/schema/DatabaseSchema.xml (original) +++ vtigercrm/trunk/schema/DatabaseSchema.xml Tue Oct 31 03:40:43 2006 @@ -6082,6 +6082,29 @@
      Ahmed
      Anusha
      Bharath
      Bharathi
      Don
      Ela
      Gopal
      Jeri
      Mani
      Mickie
      Minnie
      Nithya
      Philip
      Radiant
      Richie
      SRaj
      Vashni
       
      Aissa Belaid
      + + + + + + + + + + + + + + + + + + + tabid + + Type=InnoDB +
      + Modified: vtigercrm/trunk/soap/firefoxtoolbar.php ============================================================================== --- vtigercrm/trunk/soap/firefoxtoolbar.php (original) +++ vtigercrm/trunk/soap/firefoxtoolbar.php Tue Oct 31 03:40:43 2006 @@ -175,8 +175,8 @@ function CheckLeadPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -193,8 +193,8 @@ function CheckContactPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -211,8 +211,8 @@ function CheckAccountPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -229,8 +229,8 @@ function CheckTicketPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -247,8 +247,8 @@ function CheckVendorPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -265,8 +265,8 @@ function CheckProductPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -283,8 +283,8 @@ function CheckNotePermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -301,8 +301,8 @@ function CheckSitePermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -319,8 +319,8 @@ function CheckRssPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -340,8 +340,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -365,11 +365,11 @@ function LogintoVtigerCRM($user_name,$password) { global $log; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); $return_access = "FALSE"; - $objuser = new User(); + $objuser = new Users(); if($password != "") { @@ -397,8 +397,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -436,15 +436,15 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Note.php"); - - $focus = new Note(); + require_once("modules/Notes/Notes.php"); + + $focus = new Notes(); if(isPermitted("Notes","EditView") == "yes") { $focus->column_fields['notes_title'] = $subject; @@ -473,17 +473,17 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Product.php"); + require_once("modules/Products/Products.php"); if(isPermitted("Products","EditView") == "yes") { - $focus = new Product(); + $focus = new Products(); $focus->column_fields['productname'] = $productname; $focus->column_fields['productcode'] = $code; $focus->column_fields['website'] = $website; @@ -508,16 +508,16 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Vendor.php"); + require_once("modules/Vendors/Vendors.php"); if(isPermitted("Vendors","EditView" ) == "yes") { - $focus = new Vendor(); + $focus = new Vendors(); $focus->column_fields['vendorname'] = $vendorname; $focus->column_fields['email'] = $email; $focus->column_fields['phone'] = $phone; @@ -547,8 +547,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -591,15 +591,15 @@ 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/User.php"); - $seed_user=new 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/Account.php"); + require_once("modules/Accounts/Accounts.php"); if(isPermitted("Accounts","EditView") == "yes") { - $account=new Account(); + $account=new Accounts(); $account->column_fields['accountname']=$accountname; $account->column_fields['email1']=$email; $account->column_fields['phone']=$phone; @@ -642,15 +642,15 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Lead.php"); - - $focus = new Lead(); + require_once("modules/Leads/Leads.php"); + + $focus = new Leads(); if(isPermitted("Leads","EditView") == "yes") { $focus->column_fields['lastname'] = $lastname; @@ -689,16 +689,16 @@ { global $adb,$log; global $current_user; - require_once('modules/Users/User.php'); - $seed_user = new 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/Contact.php'); + require_once('modules/Contacts/Contacts.php'); if(isPermitted("Contacts","EditView") == "yes") { - $contact = new Contact(); + $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 Modified: vtigercrm/trunk/soap/thunderbirdplugin.php ============================================================================== --- vtigercrm/trunk/soap/thunderbirdplugin.php (original) +++ vtigercrm/trunk/soap/thunderbirdplugin.php Tue Oct 31 03:40:43 2006 @@ -13,7 +13,7 @@ require_once('include/logging.php'); require_once('include/nusoap/nusoap.php'); require_once('include/database/PearDatabase.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); $log = &LoggerManager::getLogger('thunderbirdplugin'); @@ -173,9 +173,9 @@ function SearchContactsByEmail($username,$emailaddress) { - require_once('modules/Contacts/Contact.php'); - - $seed_contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); $output_list = Array(); $response = $seed_contact->get_searchbyemailid($username,$emailaddress); @@ -201,13 +201,13 @@ function track_email($user_name, $contact_ids, $date_sent, $email_subject, $email_body) { global $adb; - require_once('modules/Users/User.php'); - require_once('modules/Emails/Email.php'); - - $seed_user = new User(); + 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 Email(); + $email = new Emails(); //$log->debug($msgdtls['contactid']); $emailbody = str_replace("'", "''", $email_body); $emailsubject = str_replace("'", "''",$email_subject); @@ -241,9 +241,9 @@ { global $adb; global $log; - require_once('modules/Contacts/Contact.php'); - - $seed_contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); $output_list = Array(); $query = $seed_contact->get_contactsforol($username); @@ -332,8 +332,8 @@ $rows_count = $db->getRowCount($result); if($rows_count==0) { - require_once('modules/Accounts/Account.php'); - $account = new Account(); + 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"); @@ -360,10 +360,10 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new 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"); @@ -384,7 +384,7 @@ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); } - $contact = new Contact(); + $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") : ""; @@ -418,10 +418,10 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Leads/Lead.php'); - - $seed_user = new 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"); @@ -442,7 +442,7 @@ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); } - $Lead = new Lead(); + $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") : ""; @@ -478,8 +478,8 @@ { global $adb,$log; $return_access = 'failure'; - require_once('modules/Users/User.php'); - $objuser = new User(); + require_once('modules/Users/Users.php'); + $objuser = new Users(); if($password != "" && $user_name != '') { $objuser->column_fields['user_name'] = $user_name; @@ -511,8 +511,8 @@ function CheckContactPerm($user_name) { global $current_user; - require_once('modules/Users/User.php'); - $seed_user = new 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"); @@ -528,8 +528,8 @@ function CheckContactViewPerm($user_name) { global $current_user,$log; - require_once('modules/Users/User.php'); - $seed_user = new 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"); Modified: vtigercrm/trunk/soap/vtigerolservice.php ============================================================================== --- vtigercrm/trunk/soap/vtigerolservice.php (original) +++ vtigercrm/trunk/soap/vtigerolservice.php Tue Oct 31 03:40:43 2006 @@ -280,9 +280,9 @@ function SearchContactsByEmail($username,$emailaddress) { - require_once('modules/Contacts/Contact.php'); + require_once('modules/Contacts/Contacts.php'); - $seed_contact = new Contact(); + $seed_contact = new Contacts(); $output_list = Array(); $response = $seed_contact->get_searchbyemailid($username,$emailaddress); @@ -308,17 +308,17 @@ function AddMessageToContact($username,$contactid,$msgdtls) { global $adb; - require_once('modules/Users/User.php'); - require_once('modules/Emails/Email.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Emails/Emails.php'); + + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); foreach($msgdtls as $msgdtl) { if(isset($msgdtl)) { - $email = new Email(); + $email = new Emails(); //$log->debug($msgdtls['contactid']); $email_body = str_replace("'", "''", $msgdtl['body']); $email_subject = str_replace("'", "''",$msgdtl['subject']); @@ -356,11 +356,11 @@ function LoginToVtiger($userid,$password) { global $adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); $return_access = "FALSE"; - $objuser = new User(); + $objuser = new Users(); if($password != "") { @@ -385,8 +385,8 @@ function CheckEmailPermission($username) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -403,8 +403,8 @@ function CheckContactPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -421,8 +421,8 @@ function CheckActivityPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -439,12 +439,12 @@ function AddEmailAttachment($emailid,$filedata,$filename,$filesize,$filetype,$username) { global $adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('include/utils/utils.php'); $date_var = date('YmdHis'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $crmid = $adb->getUniqueID("vtiger_crmentity"); @@ -483,9 +483,9 @@ function GetContacts($username) { global $adb; - require_once('modules/Contacts/Contact.php'); - - $seed_contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); $output_list = Array(); $query = $seed_contact->get_contactsforol($username); @@ -564,15 +564,15 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.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"); - $contact = new Contact(); + $contact = new Contacts(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -646,15 +646,15 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.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"); - $contact = new Contact(); + $contact = new Contacts(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -727,15 +727,15 @@ function DeleteContacts($username,$crmid) { global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.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"); - $contact = new Contact(); + $contact = new Contacts(); $contact->id = $crmid; $contact->mark_deleted($contact->id); @@ -760,8 +760,8 @@ $rows_count = $db->getRowCount($result); if($rows_count==0) { - require_once('modules/Accounts/Account.php'); - $account = new Account(); + 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"); @@ -856,10 +856,10 @@ function AddTasks($username,$taskdtls) { global $current_user,$adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -937,10 +937,10 @@ function UpdateTasks($username,$taskdtls) { global $current_user,$adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1022,10 +1022,10 @@ function DeleteTasks($username,$crmid) { global $current_user; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1091,10 +1091,10 @@ function AddClndr($username,$clndrdtls) { global $current_user,$adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1159,10 +1159,10 @@ { global $current_user; global $adb,$log; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1228,10 +1228,10 @@ function DeleteClndr($username,$crmid) { global $current_user; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); Modified: vtigercrm/trunk/soap/webforms.php ============================================================================== --- vtigercrm/trunk/soap/webforms.php (original) +++ vtigercrm/trunk/soap/webforms.php Tue Oct 31 03:40:43 2006 @@ -82,8 +82,8 @@ $assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id'); } - require_once("modules/Leads/Lead.php"); - $focus = new Lead(); + require_once("modules/Leads/Leads.php"); + $focus = new Leads(); $focus->column_fields['lastname'] = $lastname; $focus->column_fields['email'] = $email; $focus->column_fields['phone'] = $phone; @@ -126,8 +126,8 @@ $assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id'); } - require_once('modules/Contacts/Contact.php'); - $focus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $focus = new Contacts(); $focus->column_fields['firstname'] = $first_name; $focus->column_fields['lastname'] = $last_name; Modified: vtigercrm/trunk/soap/wordplugin.php ============================================================================== --- vtigercrm/trunk/soap/wordplugin.php (original) +++ vtigercrm/trunk/soap/wordplugin.php Tue Oct 31 03:40:43 2006 @@ -215,8 +215,8 @@ function get_tickets_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -237,15 +237,15 @@ function get_contacts_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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","index") == "yes") { - require_once('modules/Contacts/Contact.php'); - $contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $contact = new Contacts(); $log->debug($contact->getColumnNames()); return $contact->getColumnNames(); } @@ -261,15 +261,15 @@ function get_accounts_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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("Accounts","index") == "yes") { - require_once('modules/Accounts/Account.php'); - $account = new Account(); + require_once('modules/Accounts/Accounts.php'); + $account = new Accounts(); $log->debug($account->getColumnNames_Acnt()); return $account->getColumnNames_Acnt(); } @@ -285,16 +285,16 @@ function get_leads_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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("Leads","index") == "yes") { - require_once('modules/Leads/Lead.php'); - $lead = new Lead(); + require_once('modules/Leads/Leads.php'); + $lead = new Leads(); $log->debug($lead->getColumnNames_Lead()); return $lead->getColumnNames_Lead(); } @@ -309,12 +309,12 @@ function get_user_columns($user_name, $password) { global $current_user; - require_once('modules/Users/User.php'); - $seed_user=new 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'); - $user = new User(); + $user = new Users(); return $user->getColumnNames_User(); } @@ -323,8 +323,8 @@ function create_session($user_name, $password) { global $adb,$log; - require_once('modules/Users/User.php'); - $objuser = new User(); + require_once('modules/Users/Users.php'); + $objuser = new Users(); if($password != "" && $user_name != '') { $objuser->column_fields['user_name'] = $user_name; Modified: vtigercrm/trunk/vtigerversion.php ============================================================================== --- vtigercrm/trunk/vtigerversion.php (original) +++ vtigercrm/trunk/vtigerversion.php Tue Oct 31 03:40:43 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -$patch_version = '1'; +$patch_version = ''; $modified_database = ''; -$vtiger_current_version = '5.0.0'; +$vtiger_current_version = '5.0.2'; ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 31 04:02:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 12:02:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9763 - in /vtigercrm/trunk: Smarty/templates/ modules/Accounts/ modules/Activities/ modules/Campaigns/ modules/Contacts/ modules/Emails/ modules/Leads/ modules/Migration/ modules/Migration/ModifyDatabase/ modules/Notes/ modules/Potentials/ modules/PriceBooks/ modules/Products/ modules/Quotes/ modules/Users/ modules/Vendors/ themes/alphagrey/images/ themes/bluelagoon/images/ themes/woodspice/images/ Message-ID: <20061031120210.2F3C3788BE8@vtiger.fosslabs.com> Author: richie Date: Tue Oct 31 05:01:29 2006 New Revision: 9763 Log: new files added for 5.0.2 Added: vtigercrm/trunk/Smarty/templates/pendingActivities.tpl vtigercrm/trunk/Smarty/templates/upcomingActivities.tpl vtigercrm/trunk/modules/Accounts/Accounts.php vtigercrm/trunk/modules/Activities/ vtigercrm/trunk/modules/Campaigns/Campaigns.php vtigercrm/trunk/modules/Contacts/Contacts.php vtigercrm/trunk/modules/Emails/Emails.php vtigercrm/trunk/modules/Leads/Leads.php (with props) vtigercrm/trunk/modules/Migration/502DBChanges.php vtigercrm/trunk/modules/Migration/ModifyDatabase/deleteCustomFields.php (with props) vtigercrm/trunk/modules/Notes/Notes.php vtigercrm/trunk/modules/Potentials/Potentials.php vtigercrm/trunk/modules/PriceBooks/PriceBooks.php (with props) vtigercrm/trunk/modules/Products/Products.php (with props) vtigercrm/trunk/modules/Quotes/Quotes.php (with props) vtigercrm/trunk/modules/Users/RenameProfile.php vtigercrm/trunk/modules/Users/Users.php (with props) vtigercrm/trunk/modules/Vendors/Vendors.php (with props) vtigercrm/trunk/themes/alphagrey/images/skype.gif (with props) vtigercrm/trunk/themes/bluelagoon/images/skype.gif (with props) vtigercrm/trunk/themes/woodspice/images/skype.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 31 04:35:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 12:35:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9764 - /vtigercrm/branches/5.0.2/Smarty/templates/Settings.tpl Message-ID: <20061031123548.BD123788B98@vtiger.fosslabs.com> Author: richie Date: Tue Oct 31 05:35:41 2006 New Revision: 9764 Log: Settings UI bug fixed Modified: vtigercrm/branches/5.0.2/Smarty/templates/Settings.tpl Modified: vtigercrm/branches/5.0.2/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/branches/5.0.2/Smarty/templates/Settings.tpl (original) +++ vtigercrm/branches/5.0.2/Smarty/templates/Settings.tpl Tue Oct 31 05:35:41 2006 @@ -495,7 +495,7 @@
      - + From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 31 04:40:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 12:40:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9765 - /vtigercrm/trunk/Smarty/templates/Settings.tpl Message-ID: <20061031124033.120ED788B98@vtiger.fosslabs.com> Author: richie Date: Tue Oct 31 05:40:28 2006 New Revision: 9765 Log: UI issue fixed in settings home page Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Tue Oct 31 05:40:28 2006 @@ -495,7 +495,7 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 3 03:20:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 03 Oct 2006 07:20:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9546 - in /vtigercrm/branches/5.0.1/themes: alphagrey/style.css woodspice/style.css Message-ID: <20061003072009.336CD787E0F@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Oct 3 01:19:52 2006 New Revision: 9546 Log: css trimed for alphagrey and wood spice Modified: vtigercrm/branches/5.0.1/themes/alphagrey/style.css vtigercrm/branches/5.0.1/themes/woodspice/style.css Modified: vtigercrm/branches/5.0.1/themes/alphagrey/style.css ============================================================================== --- vtigercrm/branches/5.0.1/themes/alphagrey/style.css (original) +++ vtigercrm/branches/5.0.1/themes/alphagrey/style.css Tue Oct 3 01:19:52 2006 @@ -109,7 +109,7 @@ -.level2text { +/*.level2text { font-family: Arial, Helvetica, sans-serif; font-size: 11px; @@ -130,7 +130,7 @@ text-decoration:underline; color:#555555; -} +}*/ .level2Bg { @@ -165,13 +165,6 @@ padding-top:5px; padding-bottom:5px; } - - -.tabLiner { - background:#999 url(images/moduleSelectorBg.gif) bottom repeat-x; - padding:0px; -} - .sep1 { background:#999999; } @@ -183,15 +176,10 @@ a { text-decoration:none; color:#000099; - - - } a:hover { text-decoration:underline; - - } .hdrLink { @@ -239,8 +227,6 @@ } .lvtBg { - - } .lvtHeaderText { @@ -319,16 +305,6 @@ border-bottom:2px solid #aaaaaa; padding-left:0px; } - -.rightAddInfo { - border-left:1px solid #a2a2a2; - border-right:1px solid #dddddd; - border-bottom:1px solid #dddddd; - border-top:1px solid #a2a2a2; - background-color:#fafafa; - padding:5px; -} - .dvtCellLabel, .cellLabel { background-color:#efefef; padding-right:10px; @@ -363,18 +339,6 @@ background-color:#fafafa; } - -.rightUpcomingActivitiesHeader{ - border-bottom:1px solid #dddddd; - padding:5px; - background-color:#ffffdd; -} - -.rightUpcomingActivitiesContent { - padding:5px; - background-color:#ffffef; -} - .detailedViewHeader{ border-bottom:2px solid #dadada; padding:5px; @@ -390,17 +354,6 @@ width:90%; background-color:#ffffff; } - -.detailedViewProdTextBox { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:85%; - background-color:#ffffff; -} - .detailedViewTextBoxOn { font-family: Arial, Helvetica, sans-serif; font-size: 11px; @@ -409,32 +362,6 @@ padding-left:5px; width:90%; background-color:#ffffdd; -} - -.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 ------------------------------------------- */ - -.moduleSearch { - border:1px solid #dddddd; - background-color:#ffffef; - -} - -.searchHdrBox { - - border-bottom:1px dashed #dddddd; } .advSearch { @@ -463,29 +390,6 @@ width:10px } -.searchNotFound { - border:2px solid #999999; - background-color:#fafafa; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #ff0000; - height:50px; - width:640px; -} - - -.loginTopBg { - background:url(images/loginTopBg.gif) repeat-x; -} - -.loginTopShade { - background:url(images/loginTopShade.gif) repeat-x; -} - -.loginBg{ - background:#448cEB url(images/loginBg.gif) repeat-x; -} - .textbox { border:1px solid #999999; background-color:#ffffff; @@ -495,31 +399,8 @@ padding:2px; } - -.loginBottomBg { - background:url(images/loginBottomBg.gif) repeat-x; -} - -.loginSignin { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - color: #448ceb; - font-weight:bold; -} - -.loginBillBoard { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color:#ffffff; -} - .mx { } - -.calTopBg { - background:url(images/calBg.gif) repeat-x; -} - .calListTable td{ border-bottom:1px solid #efefef; border-left:1px solid #efefef; @@ -528,18 +409,6 @@ width:100%; border:1px solid #999999; -} -.calDisplay { - border-left:1px solid #d0d0d0; - border-right:1px solid #d0d0d0; -} -.calBottomBg { - background:url(images/calBottomBg.gif) repeat-x; -} - -.calDayHourCell { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; } .calDayHour { border-top:1px solid #dddddd; @@ -548,35 +417,6 @@ border-right:1px solid #dddddd; background-color:#eaeaea; } -.calDiv { - overflow:auto; width:95%;height:200px;padding:0px;background-color:#fefefe; - border-top: 1px solid #bababa; - border-bottom: 1px solid #bababa; -} -.calColHdr{ - border-top:1px solid #fefefa; - border-left:1px solid #fefefa; - - border-right:1px solid #a9a9a9; - background-color:#f5f5f5; -} -.calHourCol { - border-top: 1px solid #fefefa; - border-left: 1px solid #fefefa; - border-right: 1px solid #9a9a9a; - border-bottom: 1px solid #9a9a9a; - background-color: #efefef; - height: 30px; - -} -.calHourOccupied { - background-color:#d9d9d9; - -} -.calListViewRow { - border-bottom:1px solid e1e1e1; -} - .calAddEvent { position:absolute; z-index:10000; @@ -585,105 +425,14 @@ top:150px; background-color:#ffffff; } - -.addEventHeader{ - border-bottom:2px dotted #cccccc; -} - -.addEventFooter{ - border-top:2px dotted #cccccc; - height:40px; -} - .addEventInnerBox { border:1px dotted #dadada; } - -.cellScheduled { - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSchHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSch{ - border:0px; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellNormalHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffff; - color:#7a7a7a; -} - .cellNormal { border:0px; background-color:#ffffff; } - -.calEventNormal { - border:1px solid #999999; - background-color:#99ffcc; - -} - -.calEventCritical { - border:1px solid #999999; - background-color:#FFCC33; -} -.tblPro1 { - -border:2px solid #dadada; - background-color:white; - -} - -.tblPro1IconCell { - border-right:1px solid #dadada; -} - -.tblPro1HeadingCell { - font-weight:bold; -color:#4a4a4a; -} - -.tblPro1ColHeader { - background-color:#dadada; - border-left:1px solid white; - border-right:1px solid #999999; - font-size: 11px; - line-height: 14px; - background-image:url(images/tblPro1ColBg.gif); -} - -.tblPro1DataCell { - border-bottom:1px solid #f5f5f5; - color:#5a5a5a; - font-size: 11px; - line-height: 14px; - -} - -.divEventToDo { -overflow:auto; -height:150px; -border:1px solid #dadada; - -} - .EventToDo{ } @@ -696,119 +445,6 @@ margin-right: 10px; margin-bottom: 15px; } - -.thumbnailcaption -{ font-size: 0.9em; padding-top: 0.2em ; } - -/* For Settings */ - -.lftMnuTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-color:#BBBBBB; - border-left:1px solid #666666; - border-right:1px solid #666666; - border-top:0px solid #666666; - border-collapse:collapse; - text-align:right; - padding-top:0px; - padding-left:5px; - padding-right:5px; - vertical-align:top; -} - -.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-decoration:none; - width:99%; -} - -.lftMnuHdr tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-align:left; - text-decoration:none; - height:25px; - padding-right:0px; - padding-left:0px; -} - -a.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; - vertical-align:middle; -} - -a.lftMnuHdr:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; -} - -a.lftSubMnu{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; -} - -a.lftSubMnu:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; - background-color:#CCCCCC; -} - .padTab{ padding-top:0px; padding-left:0px; @@ -817,26 +453,6 @@ vertical-align:top; } - -.controlTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - width:100%; - border:0px; -} - -.controlTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - vertical-align:bottom; -} - #company{ position:relative; width:100%; @@ -850,32 +466,9 @@ #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;} -#studioTab{position:relative;left:0px;top:0px;width:100%;display:none;} - -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} -.imgDoc{ - cursor:pointer; - border:0px; -} - #one{ position:relative; display:block; @@ -936,83 +529,12 @@ /*Added for Advance Seearch*/ -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} - -.imgDoc{ - cursor:pointer; - border:0px; -} -#slideMnu{ - background-color:#BBBBBB; - vertical-align:top; -} - #one{ position:relative; display:block; width:245px; } -.prdTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:100%; - border-left:0px solid #CCCCCC; - border-right:0px solid #CCCCCC; - border-collapse:collapse; -} - -.prdTab tr th{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - padding-left:5px; - background-color:#E5E5E5; - height:20px; - color:#000000; - font-weight:bold; - text-decoration:none; - border-bottom:1px solid #CCCCCC; -} - -.prdTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - border-bottom:1px solid #CCCCCC; - padding-left:5px; - color:#000000; - text-decoration:none; - font-weight:normal; - height:20px; -} - -.delTxt{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:underline; - font-weight:normal; - color:#000099; - cursor:pointer; -} /* Dashboard CSS */ a.dash_href{ @@ -1045,13 +567,6 @@ background-color:#bfbfbf; padding:5px; } - -.dash_shadow{ - background-image:url(images/dash_top_shadow.jpg); - background-repeat:repeat-x; - height:10px; -} - .dash_white{ background-color:#FFFFFF; padding:5px 10px 5px 10px; @@ -1068,15 +583,6 @@ color:#000000; padding-left:10px;padding-right:10px; } -.dashMatrixSeperator{ - border-left:2px dashed #dadada; - -} -.dashMatrixBottomLiner{ - border-bottom:2px dashed #dadada; - -} - .dash_switch{ cursor:pointer; width:26px; @@ -1125,56 +631,12 @@ background-repeat:repeat-x; position:top; } - -.dash_sel_top{ - background-image:url(images/dash_sel_top.jpg); - background-repeat:repeat-x; - height:5px; - background-position:left top; - font-size:0px; -} - -.dash_sel_btm{ - background-image:url(images/dash_sel_btm.jpg); - background-repeat:repeat-x; - height:4px; - background-position:left top; - font-size:0px; -} - -.dash_sel_left{ - background-color:#dadada; - border-left:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:200px; - text-align:left; - padding-left:5px; - font-size:11px; - font-weight:bold; - color:#000000; -} - -.dash_sel_right{ - background-color:#dadada; - border-right:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:25px; - padding-left:5px; - cursor:pointer; -} - + /* menu */ -#mnuSlide{ - position:absolute; - left:0px; - top:100px; -/* width:110px;*/ -} - -/* a.submenu{ + + + a.submenu{ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; padding-top:5px; @@ -1200,7 +662,7 @@ text-align:left; text-decoration:none; display:block; -} */ +} #mnuKey{ font-family:Verdana, Arial, Helvetica, sans-serif; @@ -1227,7 +689,7 @@ border-right:1px solid #CCCCCC; opacity:.9; display:none; -} +}*/ /* clock */ @@ -1308,11 +770,6 @@ /* Calculator */ -.calcBg { - /*background-color: #666;*//*BFC1B7*/ - background: url(images/cal_bg.gif); - border: 1px solid #009900; -} .calcResult { width: 100%; height: 25px; @@ -1441,22 +898,6 @@ padding:2px; } - -.frameHdr{ - height:32px; - background-image:url(images/rssframeHdr.gif); - background-repeat:repeat-x; - background-position:top left; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - text-align:left; - padding-left:5px; - color:#FFFF00; - vertical-align:middle; - border:0px solid #000000; -} - .forwardBg{ font-family:Arial, Helvetica, sans-serif; font-size:12px; @@ -1473,45 +914,6 @@ /* New Styles */ -.hometop{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:14px; - color:white; - text-decoration:none; - text-align:left; - padding-left:10px; - background-image:url(../images/hometop.gif); - background-position:top left; - background-repeat:repeat-x; - height:35px; - vertical-align:middle; -} - -.homeBtm{ - background-image:url(../images/HomeBtm.gif); - background-position:top left; - background-repeat:repeat-x; - height:29px; -} - -.imageTab{ - background-color:#F5F5F5; - border:0px solid #EBEBEB; - width:30px; - height:30px; - position:relative; - visibility:visible; -} - -a.imageTab:Hover{ - background-color:#BFBFFF; - border:0px solid #EBEBEB; - width:30px; - height:30px; - display:block; - opacity:.5; -} - .mnuTab{ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; @@ -1525,107 +927,6 @@ padding-left:5px; vertical-align:middle; } - -.mnuSel td{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - background-color:#EBEBEB; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuSel td:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#EBEBEB; -} - -.mnuUnSel td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - background-color:#D7D7D7; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuUnSel td:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#D7D7D7; -} - -.tabRht{ - background-image:url(../images/tabRht.gif); - background-position:top left; - background-repeat:repeat-y; - width:31px; -} - - -.frmSelect{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - border:1px #EBEBEB; -} - -#mnuSlide{ - position:absolute; - left:0px; - top:100px; - width:110px; -} - - -#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:#ECECEC; - border-right:1px solid #CCCCCC; - opacity:.8; -} - /* profile */ .prvPrfBigText { @@ -1645,58 +946,14 @@ border:1px solid #ebebeb; } -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - cursor:pointer; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - cursor:pointer; -} - .prvPrfTexture { background:url(images/prvPrfTexture1.gif); } -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; -} - .prvPrfHoverOn { background-color:#ffffef; } -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; -} - /* Organization */ .orgTab{ @@ -1730,56 +987,7 @@ border-right:1px solid #CCCCCC; } -.globTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - color:#000000; - border:1px solid #999999; - border-collapse:collapse; - width:100%; -} - -.globTab tr th{ - text-align:right; - background-color:#CCCCCC; - border-bottom:1px solid #999999; - border-right:2px solid #999999; - color:#000000; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-decoration:none; - font-weight:bold; - height:20px; - padding-right:5px; - -} - -.globTab tr td{ - text-align:left; - border:1px solid #CCCCCC; - color:#666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:none; - font-weight:normal; - padding-left:5px; - height:20px; -} - - /* Groups */ - -.groupul{ - margin:0px; - font-family:Arial, Helvetica, sans-serif; - font-weight:bold; - font-size:12px; - color:#000000; - text-decoration:underline; - text-align:left; -} - .groupli{ margin-left:20px; font-family:Arial, Helvetica, sans-serif; @@ -1837,35 +1045,6 @@ padding-bottom:3px; } -.classBtnSmall{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:9px; - 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; -} - -.classBtnDisable{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:10px; - background-color:#DBDBDB; - border-bottom:2px solid #CCCCCC; - border-right:2px solid #CCCCCC; - border-top:2px solid #F5F5F5; - border-left:2px solid #F5F5F5; - color:#666666; - text-align:center; - padding-top:3px; - padding-bottom:3px; -} .txtBox{ width:85%; @@ -1907,15 +1086,6 @@ font-family:Arial, Helvetica, sans-serif; font-size:11px; } - -#imLead{ - width:100%; - overflow:auto; - position:relative; - border:1px solid #666666; - height:175px; -} - .txtGreen{ color:green; } @@ -1926,16 +1096,6 @@ padding-top:2px; } /* MY PREFERENCES */ - -#chPhoto{ - position:relative; - display:none; - top:20px; - width:100%; - border:1px dashed #666666; - background-color:#FFFFEC; -} - /* CSS FOR REPORTS */ .reportHdr{ @@ -1971,7 +1131,7 @@ } -/* a.reportMnu{ + a.reportMnu{ font-size:11px; color:#0070BA; text-decoration:none; @@ -1993,20 +1153,8 @@ border-bottom:1px solid #E1E1E1; padding-left:20px; padding-top:3px; -} */ - -.reportGenarateTable{ - border-bottom:1px solid #6D6D6D; - border-left:1px solid #6D6D6D; - border-right:1px solid #6D6D6D; - border-top:0px solid #6D6D6D; - background-image:url(../images/report_bg.gif); - background-repeat:repeat-x; -} - -.reportGenarateTable tr td{ - padding:5px; -} +} + #Generate{ position:relative; width:100%; @@ -2014,16 +1162,9 @@ display:none; } -.lvtSel{ - font-weight:bold; -} - /* END OF REPORT */ - - - /* WEB MAIL */ -/* a.webMnu{ + a.webMnu{ font-size:11px; color:#0070BA; text-decoration:underline; @@ -2032,14 +1173,10 @@ font-size:11px; color:#0070BA; text-decoration:underline; -} */ - - +} /* END OF WEB MAIL */ - /* POPUP */ - -/* a.alpha{ + a.alpha{ font-size:11px; color:gray; text-decoration:none; @@ -2057,7 +1194,7 @@ padding-right:5px; border:1px dotted #CCCCCC; background-color:#FFFFCC; -} */ +} /* Home Page */ .MatrixLayer{ @@ -2090,7 +1227,7 @@ left:200px; top:100px; position:absolute; - z-index:10000001; + z-index:1000001; display:none; padding:10px; background:#ffffff url(images/layerPopUpBg.gif); @@ -2159,15 +1296,11 @@ } /* End Of All Menu */ - - - /* Calendar */ .calHdr{ background-image:url(images/mailSubHeaderBg.gif); background-repeat:repeat-x; background-position:left top; - } .calSel{ @@ -2187,13 +1320,6 @@ } - -.calSelTabMask { - background-color:#dfdfdf; - height:5px; - -} - .calInnerBorder { border-left:2px solid #a5a5a5; border-right:2px solid #a5a5a5; @@ -2207,10 +1333,6 @@ background:#fefefe url(images/layerPopupBg.gif); } -.calTopLeft { - border-left: 1px solid #a5a5a5; -} - .calTopRight { border-right: 1px solid #a5a5a5; } @@ -2221,33 +1343,6 @@ font-weight:normal; text-align:center; width:8%; -} - -.calTitle{ - background-position:right top; - background-repeat:no-repeat; - background-image:url(images/cal_title.jpg); - width:150px; -} - -.tabBorder{ - background-color:#EBEBEB; - border-bottom:1px solid #666666; - border-left:1px solid #666666; - border-right:1px solid #666666; - padding:10px; -} - -.eventLay{ - background-color:#a5a5a5; - position:relative; - left:0px; - top:0px; - width:100%; - visibility:visible; - padding:5px 5px 5px 5px; - display:block; - z-index:1000; } a.calMnu{ @@ -2270,9 +1365,9 @@ padding-top:3px; } -.bggray{ +/*.bggray{ background-color: #dfdfdf; -} +}*/ .bgwhite{ background-color: #FFFFFF; } @@ -2294,18 +1389,6 @@ display:none; } .style1 {color: #FF0000} - -#hrViewContent{ - width:100%; - height:150px; - overflow:auto; - position:relative; - border-top:1px solid #CCCCCC; - border-bottom:0px solid white; - border-left:0px solid white; - border-right:0px solid white; -} - .event{ background-color:#ddd; border:1px solid #999999; @@ -2321,11 +1404,6 @@ #hrView{ display:block; } - -#lstView{ - display:none; -} - .calendarNav{ font-size:12px; color:#FFFFFF; @@ -2337,7 +1415,6 @@ background-image:url(images/cal_nav.gif); background-repeat:repeat-x; } - #addEventDropDown{ position:absolute; display:none; @@ -2367,36 +1444,11 @@ top:150px; background-color:#ffffff; } - -#cal_popup{ - width:600px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; - position:absolute; - left:100px; - top:100px; -} - .outer{ border-bottom:1px solid #CCCCCC; border-left:1px solid #CCCCCC; border-right:1px solid #CCCCCC; } - -.outerBorder{ - border:1px solid #CCCCCC; - width:95%; -} - -.fieldHead{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - border:0px solid #CCCCCC; - padding:2px 5px 2px 5px; -} - .calTxt{ width:50%; border:1px solid #CCCCCC; @@ -2418,39 +1470,6 @@ /* End of Calendar */ /* Cal Year View */ -.month_table{ - border:2px solid #CCCCCC; - width:100%; - background-color:white; -} - -.month_table tr th{ - background-color:#E9E9E9; - color:#000000; - text-align:center; - border:1px dotted #CCCCCC; - height:20px; - width:14%; - font-weight:normal; -} - -.month_table tr td{ - border:1px dotted #CCCCCC; - color:#000000; - text-align:center; - height:20px; -} - -.cal_Hdr{ - background-image:url(images/cal_Hdr.gif); - background-repeat:repeat-x; - background-position:left top; - font-weight:bold; - color:#000000; - text-align:left; - border:0px solid #000000; -} - .eventDay{ background-color:#FF9966; font-weight:bold; @@ -2533,12 +1552,6 @@ padding: 4px; border-right: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD; -} -.rptTitle { - border-right: 1px solid #333; - border-bottom: 1px solid #333; - background: #2C527C; - color: #FFF; } .rptGrpHead { background: #FFF; @@ -2590,31 +1603,6 @@ /* Css for quick Create */ -.qcWindow { - background-color:white; - border:2px solid #999999; -} - -.qcHeader{ - background:url(images/qcBg.gif) repeat-x; - background-color:gray; - color:black; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 19px; - padding-left:10px; -} -.qcTextBox{ - border:1px solid #999999; - width:90%; -} -.qcTextArea{ - border:1px solid #999999; - width:90%; - height:70px; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; -} .qcTransport{ background-color:#dadada; @@ -2639,50 +1627,6 @@ /* MY SITES */ -.SiteSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_sel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:bold; - font-size:11px; - text-decoration:none; -} - -.SiteUnSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_unsel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; - cursor:pointer; -} - -.SiteHdr{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_hdr.jpg); - background-position:right bottom; - background-repeat:no-repeat; - height:33px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; -} .unread_email { font-weight:bold; } @@ -2707,13 +1651,6 @@ color: #000000; } -.adProgressBar { - border-style:solid; - border-width:2px; - border-color:blue; - -} - .h2 { font-size:18px; @@ -2725,19 +1662,6 @@ color:gray; } - -.hdeskComments { - - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 14px; - color: #999999; - border:0px; - background-color:#ffffef; - width:100%; - -} - ul { list-style:circle; line-height:20px; @@ -2746,14 +1670,6 @@ font-weight:normal; } - - -.branch { - list-style-image: url("secAdd.gif"); -} - - - .tagCloudTopBg { background-image: url(images/tagCloudBg.gif); background-repeat: repeat-x; @@ -2762,15 +1678,6 @@ .tagCloudDisplay { background-color:#e5e5e5; padding:5px; -} - - - -.heading1 { - font-family: Arial, Helvetica, sans-serif; - font-size: 19px; - line-height: 14px; - color: #000000; } .heading2 { @@ -2779,20 +1686,6 @@ line-height: 16px; font-weight:bold; color: #000000; -} - -.heading3 { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 14px; - color: #999999; -} - -.heading4 { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 14px; - color: #999999; } .settingsUI { @@ -2876,7 +1769,7 @@ font-weight:bold; } -/*.cellLabel { +.cellLabel { background-color:#eaebd9; border-top:1px solid #efefef; border-bottom:1px solid #dadada; @@ -2886,7 +1779,7 @@ .cellText { color:#333333; border-bottom:1px solid #dadada; -} */ +} .listTable{ border-left:1px solid #cccccc; @@ -2986,58 +1879,15 @@ .prvPrfOutline { border:1px solid #ebebeb; } - -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - -} - .prvPrfTexture { background:url(images/prvPrfTexture1.gif); -} -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; } .prvPrfHoverOn { background-color:#ffffef; } -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; -} - .cellBottomDotLine { border-bottom-width: 2px; border-bottom-style: dotted; @@ -3056,14 +1906,9 @@ border-bottom-color: #CCCCCC; } -.crmFormDropDown { -border-width:1px; -} + .thickBorder { border: 2px solid #999999; -} -.trackerBorder { - background-color:#ffffff; } .trackerHeading { background-color:#efefef; @@ -3080,20 +1925,11 @@ .crmTable { border:1px solid #dadada; } -.crmTableColHeading { - background-color:#CCCCCC; - border-left:1px solid #eaeaea; - border-top:1px solid #eaeaea; - border-right:1px solid #999999; - border-bottom:1px solid #999999; -} + .crmTableRow { border-bottom:1px dotted #dadada; border-right:1px dotted #dadada } - - - /* Inventory */ @@ -3121,24 +1957,6 @@ /* Inventory */ - - - -/* styles for RSS Display starts */ -.rssDisplay{ - background-color:#eaeaea; -} - - -/* styles for RSS Display ends */ - - - - - - - - /* Email Client Classes ++++++++++++++++++++++ */ .emailSelected{ @@ -3161,11 +1979,6 @@ background:#d9d9d9 url(images/mailSubHeaderBg.gif) repeat-x; padding:4px; } -.mailDetailsHeader { - border-top:2px dotted #999; - border-bottom:1px solid #ddd; -} - .mailClientWriteEmailHeader { font-family:arial, helvetica, sans-serif; font-size:20px; Modified: vtigercrm/branches/5.0.1/themes/woodspice/style.css ============================================================================== --- vtigercrm/branches/5.0.1/themes/woodspice/style.css (original) +++ vtigercrm/branches/5.0.1/themes/woodspice/style.css Tue Oct 3 01:19:52 2006 @@ -30,13 +30,6 @@ border-left:2px dotted #332211; padding:10px; } - - -.yellowBox { - background-color:#ffffE1; - border:1px solid #999999; -} - .genHeaderBig{ font-family: Arial, Helvetica, sans-serif; font-size: 16px; @@ -58,18 +51,9 @@ color: #000000; font-weight:bold; } - -.rssDisplayPanel { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 12px; - color: #ABABAB; -} - - .hdrNameBg { background:#ffffff url(images/primeTopBg.gif) repeat-x; - + } .hdrTabBg { @@ -144,43 +128,6 @@ padding-right:40px; } - -/*.level2text { - background:#bbbbbb url(images/level2Bg.gif) repeat-x; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:20px; - padding-right:20px; - padding-top:5px; - padding-bottom:5px; - font-weight:bold; - color:white; -}*/ - -.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:#e0dbb0 url(images/level2TabBg.gif) bottom repeat-x; font-family: Arial, Helvetica, sans-serif; @@ -206,11 +153,6 @@ padding-bottom:5px; } - -.tabLiner { - background:#9abffc url(images/moduleSelectorBg.gif) bottom repeat-x; - padding:0px; -} .sep1 { background:#999999; @@ -356,15 +298,6 @@ padding-left:0px; } -.rightAddInfo { - border-left:1px solid #a2a2a2; - border-right:1px solid #dddddd; - border-bottom:1px solid #dddddd; - border-top:1px solid #a2a2a2; - background-color:#fafafa; - padding:5px; -} - .dvtCellLabel, .cellLabel { background-color:#efefe2; padding-right:10px; @@ -396,17 +329,6 @@ padding:5px; background-color:#fafafa; -} - -.rightUpcomingActivitiesHeader{ - border-bottom:1px solid #ddddcc; - padding:5px; - background-color:#ffffdd; -} - -.rightUpcomingActivitiesContent { - padding:5px; - background-color:#ffffef; } .detailedViewHeader{ @@ -426,16 +348,6 @@ background-color:#ffffff; } -.detailedViewProdTextBox { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:85%; - background-color:#ffffff; -} - .detailedViewTextBoxOn { font-family: Arial, Helvetica, sans-serif; font-size: 11px; @@ -446,31 +358,9 @@ background-color:#ffffdd; } -.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 ------------------------------------------- */ -.moduleSearch { - border:1px solid #dddddd; - background-color:#ffffef; - -} - -.searchHdrBox { - - border-bottom:1px dashed #dddddd; -} .advSearch { padding:10px; @@ -498,28 +388,6 @@ width:10px } -.searchNotFound { - border:2px solid #ff3333; - background-color:#fafafa; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #ff0000; - height:50px; - width:640px; -} - - -.loginTopBg { - background:url(images/loginTopBg.gif) repeat-x; -} - -.loginTopShade { - background:url(images/loginTopShade.gif) repeat-x; -} - -.loginBg{ - background:#448cEB url(images/loginBg.gif) repeat-x; -} .textbox { border:1px solid #999999; @@ -531,28 +399,9 @@ } -.loginBottomBg { - background:url(images/loginBottomBg.gif) repeat-x; -} - -.loginSignin { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - color: #448ceb; - font-weight:bold; -} - -.loginBillBoard { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color:#ffffff; -} + .mx { -} - -.calTopBg { - background:url(images/calBg.gif) repeat-x; } .calListTable td{ @@ -564,18 +413,7 @@ border:1px solid #999999; } -.calDisplay { - border-left:1px solid #d0d0d0; - border-right:1px solid #d0d0d0; -} -.calBottomBg { - background:url(images/calBottomBg.gif) repeat-x; -} - -.calDayHourCell { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; -} + .calDayHour { border-top:1px solid #a8a591; border-left:1px solid #a8a591; @@ -583,34 +421,7 @@ border-right:1px solid #a8a591; background-color:#eae7da; } -.calDiv { - overflow:auto; width:95%;height:320px;padding:0px;background-color:#fefefe; - border-top: 1px solid #bababa; - border-bottom: 1px solid #bababa; -} -.calColHdr{ - border-top:1px solid #fefefa; - border-left:1px solid #fefefa; - - border-right:1px solid #a8a591; - background-color:#eae7da; -} -.calHourCol { - border-top: 1px solid #fefefa; - border-left: 1px solid #fefefa; - border-right: 1px solid #a8a591; - border-bottom: 1px solid #a8a591; - background-color: #eae7da; - height: 40px; - -} -.calHourOccupied { - background-color:#ffffbb; - -} -.calListViewRow { - border-bottom:1px solid eae3d1; -} + .calAddEvent { position:absolute; @@ -621,102 +432,17 @@ background-color:#ffffff; } -.addEventHeader{ - border-bottom:2px dotted #cccccc; -} - -.addEventFooter{ - border-top:2px dotted #cccccc; - height:40px; -} + .addEventInnerBox { border:1px dotted #dadada; } -.cellScheduled { - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSchHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSch{ - border:0px; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellNormalHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffff; - color:#7a7a7a; -} .cellNormal { border:0px; background-color:#ffffff; -} - -.calEventNormal { - border:1px solid #999999; - background-color:#99ffcc; - -} - -.calEventCritical { - border:1px solid #999999; - background-color:#FFCC33; -} -.tblPro1 { - -border:2px solid #dadada; - background-color:white; - -} - -.tblPro1IconCell { - border-right:1px solid #dadada; -} - -.tblPro1HeadingCell { - font-weight:bold; -color:#4a4a4a; -} - -.tblPro1ColHeader { - background-color:#dadada; - border-left:1px solid white; - border-right:1px solid #999999; - font-size: 11px; - line-height: 14px; - background-image:url(images/tblPro1ColBg.gif); -} - -.tblPro1DataCell { - border-bottom:1px solid #f5f5f5; - color:#5a5a5a; - font-size: 11px; - line-height: 14px; - -} - -.divEventToDo { -overflow:auto; -height:150px; -border:1px solid #dadada; - } .EventToDo{ @@ -732,118 +458,6 @@ margin-bottom: 15px; } -.thumbnailcaption -{ font-size: 0.9em; padding-top: 0.2em ; } - -/* For Settings */ - -.lftMnuTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-color:#BBBBBB; - border-left:1px solid #666666; - border-right:1px solid #666666; - border-top:0px solid #666666; - border-collapse:collapse; - text-align:right; - padding-top:0px; - padding-left:5px; - padding-right:5px; - vertical-align:top; -} - -.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-decoration:none; - width:99%; -} - -.lftMnuHdr tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-align:left; - text-decoration:none; - height:25px; - padding-right:0px; - padding-left:0px; -} - -a.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; - vertical-align:middle; -} - -a.lftMnuHdr:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; -} - -a.lftSubMnu{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; -} - -a.lftSubMnu:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; - background-color:#CCCCCC; -} - .padTab{ padding-top:0px; padding-left:0px; @@ -851,25 +465,6 @@ padding-bottom:0px; vertical-align:top; -} - -.controlTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - width:100%; - border:0px; -} - -.controlTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - vertical-align:bottom; } #company{ @@ -885,31 +480,12 @@ #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;} -#studioTab{position:relative;left:0px;top:0px;width:100%;display:none;} - -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} -.imgDoc{ - cursor:pointer; - border:0px; -} + #one{ position:relative; @@ -944,9 +520,7 @@ /* End of Settings */ -.bggray{ - background-color: #dfdfdf; -} + .bgwhite{ background-color: #FFFFFF; } @@ -969,92 +543,10 @@ display:none; } -/*Added for Advance Seearch*/ - -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} - -.imgDoc{ - cursor:pointer; - border:0px; -} -#slideMnu{ - background-color:#BBBBBB; - vertical-align:top; -} - #one{ position:relative; display:block; width:245px; -} - -.prdTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:100%; - border-left:0px solid #CCCCCC; - border-right:0px solid #CCCCCC; - border-collapse:collapse; -} - -.prdTab tr th{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - padding-left:5px; - background-color:#E5E5E5; - height:20px; - color:#000000; - font-weight:bold; - text-decoration:none; - border-bottom:1px solid #CCCCCC; -} - -.prdTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - border-bottom:1px solid #CCCCCC; - padding-left:5px; - color:#000000; - text-decoration:none; - font-weight:normal; - height:20px; -} - -.delTxt{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:underline; - font-weight:normal; - color:#000099; - cursor:pointer; -} - -/* Dashboard CSS */ -a.dash_href{ - display:block; - width:24px;height:24px; - vertical-align:middle; - margin-top:10px; } @@ -1081,11 +573,6 @@ padding:5px; } -.dash_shadow{ - background-image:url(images/dash_top_shadow.jpg); - background-repeat:repeat-x; - height:10px; -} .dash_white{ background-color:#FFFFFF; @@ -1103,14 +590,7 @@ color:#000000; padding-left:10px;padding-right:10px; } -.dashMatrixSeperator{ - border-left:2px dashed #dadada; - -} -.dashMatrixBottomLiner{ - border-bottom:2px dashed #dadada; - -} + .dash_switch{ cursor:pointer; @@ -1161,55 +641,12 @@ position:top; } -.dash_sel_top{ - background-image:url(images/dash_sel_top.jpg); - background-repeat:repeat-x; - height:5px; - background-position:left top; - font-size:0px; -} - -.dash_sel_btm{ - background-image:url(images/dash_sel_btm.jpg); - background-repeat:repeat-x; - height:4px; - background-position:left top; - font-size:0px; -} - -.dash_sel_left{ - background-color:#F9F7C9; - border-left:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:200px; - text-align:left; - padding-left:5px; - font-size:11px; - font-weight:bold; - color:#000000; -} - -.dash_sel_right{ - background-color:#F9F7C9; - border-right:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:25px; - padding-left:5px; - cursor:pointer; -} /* menu */ -#mnuSlide{ - position:absolute; - left:0px; - top:100px; -/* width:110px;*/ -} - -/* a.submenu{ + + + a.submenu{ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; padding-top:5px; @@ -1235,7 +672,7 @@ text-align:left; text-decoration:none; display:block; -} */ +} #mnuKey{ font-family:Verdana, Arial, Helvetica, sans-serif; @@ -1343,11 +780,7 @@ /* Calculator */ -.calcBg { - /*background-color: #666;*//*BFC1B7*/ - background: url(images/cal_bg.gif); - border: 1px solid #009900; -} + .calcResult { width: 100%; height: 25px; @@ -1477,21 +910,6 @@ } -.frameHdr{ - height:32px; - background-image:url(images/rssframeHdr.gif); - background-repeat:repeat-x; - background-position:top left; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - text-align:left; - padding-left:5px; - color:#FFFF00; - vertical-align:middle; - border:0px solid #000000; -} - .forwardBg{ font-family:Arial, Helvetica, sans-serif; font-size:12px; @@ -1508,44 +926,7 @@ /* New Styles */ -.hometop{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:14px; - color:white; - text-decoration:none; - text-align:left; - padding-left:10px; - background-image:url(../images/hometop.gif); - background-position:top left; - background-repeat:repeat-x; - height:35px; - vertical-align:middle; -} - -.homeBtm{ - background-image:url(../images/HomeBtm.gif); - background-position:top left; - background-repeat:repeat-x; - height:29px; -} - -.imageTab{ - background-color:#F5F5F5; - border:0px solid #EBEBEB; - width:30px; - height:30px; - position:relative; - visibility:visible; -} - -a.imageTab:Hover{ - background-color:#BFBFFF; - border:0px solid #EBEBEB; - width:30px; - height:30px; - display:block; - opacity:.5; -} + .mnuTab{ font-family:Verdana, Arial, Helvetica, sans-serif; @@ -1561,106 +942,6 @@ vertical-align:middle; } -.mnuSel td{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - background-color:#EBEBEB; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuSel td:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#EBEBEB; -} - -.mnuUnSel td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - background-color:#D7D7D7; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuUnSel td:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#D7D7D7; -} - -.tabRht{ - background-image:url(../images/tabRht.gif); - background-position:top left; - background-repeat:repeat-y; - width:31px; -} - - -.frmSelect{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - border:1px #EBEBEB; -} - -#mnuSlide{ - position:absolute; - left:0px; - top:100px; - width:110px; -} - - -#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:#ECECEC; - border-right:1px solid #CCCCCC; - opacity:.8; -} - /* profile */ .prvPrfBigText { @@ -1680,56 +961,16 @@ border:1px solid #ebebeb; } -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - cursor:pointer; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - cursor:pointer; -} + .prvPrfTexture { background:url(images/prvPrfTexture1.gif); } -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; -} .prvPrfHoverOn { background-color:#ffffef; -} -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; } /* Organization */ @@ -1765,55 +1006,9 @@ border-right:1px solid #CCCCCC; } -.globTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - color:#000000; - border:1px solid #999999; - border-collapse:collapse; - width:100%; -} - -.globTab tr th{ - text-align:right; - background-color:#CCCCCC; - border-bottom:1px solid #999999; - border-right:2px solid #999999; - color:#000000; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-decoration:none; - font-weight:bold; - height:20px; - padding-right:5px; - -} - -.globTab tr td{ - text-align:left; - border:1px solid #CCCCCC; - color:#666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:none; - font-weight:normal; - padding-left:5px; - height:20px; -} - /* Groups */ -.groupul{ - margin:0px; - font-family:Arial, Helvetica, sans-serif; - font-weight:bold; - font-size:12px; - color:#000000; - text-decoration:underline; - text-align:left; -} .groupli{ margin-left:20px; @@ -1872,36 +1067,6 @@ padding-bottom:3px; } -.classBtnSmall{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:9px; - 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; -} - -.classBtnDisable{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:10px; - background-color:#DBDBDB; - border-bottom:2px solid #CCCCCC; - border-right:2px solid #CCCCCC; - border-top:2px solid #F5F5F5; - border-left:2px solid #F5F5F5; - color:#666666; - text-align:center; - padding-top:3px; - padding-bottom:3px; -} - .txtBox{ width:85%; border:1px solid #666666; @@ -1943,13 +1108,6 @@ font-size:11px; } -#imLead{ - width:100%; - overflow:auto; - position:relative; - border:1px solid #666666; - height:175px; -} .txtGreen{ color:green; @@ -1962,14 +1120,6 @@ } /* MY PREFERENCES */ -#chPhoto{ - position:relative; - display:none; - top:20px; - width:100%; - border:1px dashed #666666; - background-color:#FFFFEC; -} /* CSS FOR REPORTS */ @@ -2006,7 +1156,7 @@ } -/* a.reportMnu{ +a.reportMnu{ font-size:11px; color:#0070BA; text-decoration:none; @@ -2028,20 +1178,8 @@ border-bottom:1px solid #E1E1E1; padding-left:20px; padding-top:3px; -} */ - -.reportGenarateTable{ - border-bottom:1px solid #6D6D6D; - border-left:1px solid #6D6D6D; - border-right:1px solid #6D6D6D; - border-top:0px solid #6D6D6D; - background-image:url(../images/report_bg.gif); - background-repeat:repeat-x; -} - -.reportGenarateTable tr td{ - padding:5px; -} +} + #Generate{ position:relative; width:100%; @@ -2049,16 +1187,13 @@ display:none; } -.lvtSel{ - font-weight:bold; -} - + /* END OF REPORT */ /* WEB MAIL */ -/* a.webMnu{ + a.webMnu{ font-size:11px; color:#0070BA; text-decoration:underline; @@ -2067,14 +1202,14 @@ font-size:11px; color:#0070BA; text-decoration:underline; -} */ +} /* END OF WEB MAIL */ /* POPUP */ -/* a.alpha{ + a.alpha{ font-size:11px; color:gray; text-decoration:none; @@ -2092,7 +1227,7 @@ padding-right:5px; border:1px dotted #CCCCCC; background-color:#FFFFCC; -} */ +} /* Home Page */ .MatrixLayer{ @@ -2125,7 +1260,7 @@ left:300px; top:100px; position:absolute; - z-index:10000001; + z-index:1000001; display:none; padding:10px; background:#ffffff url(images/layerPopUpBg.gif); @@ -2222,13 +1357,6 @@ } - -.calSelTabMask { - background-color:#D6D2AB; - height:5px; - -} - .calInnerBorder { border-left:1px solid #d6d2ab; border-right:1px solid #d6d2ab; @@ -2242,9 +1370,6 @@ background:#fefefe url(images/layerPopupBg.gif); } -.calTopLeft { - border-left: 1px solid #939271; -} .calTopRight { border-right: 1px solid #939271; @@ -2258,32 +1383,6 @@ width:8%; } -.calTitle{ - background-position:right top; - background-repeat:no-repeat; - background-image:url(images/cal_title.jpg); - width:150px; -} - -.tabBorder{ - background-color:#EBEBEB; - border-bottom:1px solid #666666; - border-left:1px solid #666666; - border-right:1px solid #666666; - padding:10px; -} - -.eventLay{ - background-color:#DBF3FD; - position:relative; - left:0px; - top:0px; - width:100%; - visibility:visible; - padding:5px 5px 5px 5px; - display:block; - z-index:1000; -} a.calMnu{ font-size:11px; @@ -2304,10 +1403,6 @@ padding-left:5px; padding-top:3px; } - -.bggray{ - background-color: #dfdfdf; -} .bgwhite{ background-color: #FFFFFF; } @@ -2329,17 +1424,6 @@ display:none; } .style1 {color: #FF0000} - -#hrViewContent{ - width:100%; - height:250px; - overflow:auto; - position:relative; - border-top:1px solid #CCCCCC; - border-bottom:0px solid white; - border-left:0px solid white; - border-right:0px solid white; -} .event{ background-color:#D3EAF0; @@ -2356,11 +1440,6 @@ #hrView{ display:block; } - -#lstView{ - display:none; -} - .calendarNav{ font-size:12px; color:#FFFFFF; @@ -2403,33 +1482,10 @@ background-color:#ffffff; } -#cal_popup{ - width:600px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; - position:absolute; - left:100px; - top:100px; -} - .outer{ border-bottom:1px solid #CCCCCC; border-left:1px solid #CCCCCC; border-right:1px solid #CCCCCC; -} - -.outerBorder{ - border:1px solid #CCCCCC; - width:95%; -} - -.fieldHead{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - border:0px solid #CCCCCC; - padding:2px 5px 2px 5px; } .calTxt{ @@ -2453,38 +1509,7 @@ /* End of Calendar */ /* Cal Year View */ -.month_table{ - border:2px solid #CCCCCC; - width:100%; - background-color:white; -} - -.month_table tr th{ - background-color:#E9E9E9; - color:#000000; - text-align:center; - border:1px dotted #CCCCCC; - height:20px; - width:14%; - font-weight:normal; -} - -.month_table tr td{ - border:1px dotted #CCCCCC; - color:#000000; - text-align:center; - height:20px; -} - -.cal_Hdr{ - background-image:url(images/cal_Hdr.gif); - background-repeat:repeat-x; - background-position:left top; - font-weight:bold; - color:#000000; - text-align:left; - border:0px solid #000000; -} + .eventDay{ background-color:#FF9966; @@ -2569,12 +1594,7 @@ border-right: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD; } -.rptTitle { - border-right: 1px solid #333; - border-bottom: 1px solid #333; - background: #2C527C; - color: #FFF; -} + .rptGrpHead { background: #FFF; border-bottom: 1px solid #FFF; @@ -2625,31 +1645,7 @@ /* Css for quick Create */ -.qcWindow { - background-color:white; - border:2px solid #999999; -} - -.qcHeader{ - background:url(images/qcBg.gif) repeat-x; - background-color:gray; - color:black; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 19px; - padding-left:10px; -} -.qcTextBox{ - border:1px solid #999999; - width:90%; -} -.qcTextArea{ - border:1px solid #999999; - width:90%; - height:70px; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; -} + .qcTransport{ background-color:#d3d2c1; @@ -2674,50 +1670,7 @@ /* MY SITES */ -.SiteSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_sel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:bold; - font-size:11px; - text-decoration:none; -} - -.SiteUnSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_unsel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; - cursor:pointer; -} - -.SiteHdr{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_hdr.jpg); - background-position:right bottom; - background-repeat:no-repeat; - height:33px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; -} + .unread_email { font-weight:bold; } @@ -2742,12 +1695,6 @@ color: #000000; } -.adProgressBar { - border-style:solid; - border-width:2px; - border-color:blue; - -} .h2 { @@ -2761,17 +1708,6 @@ color:gray; } -.hdeskComments { - - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 14px; - color: #999999; - border:0px; - background-color:#ffffef; - width:100%; - -} ul { list-style:circle; @@ -2783,9 +1719,6 @@ } -.branch { - list-style-image: url("secAdd.gif"); -} @@ -2801,12 +1734,7 @@ -.heading1 { - font-family: Arial, Helvetica, sans-serif; - font-size: 19px; - line-height: 14px; - color: #000000; -} + .heading2 { font-family: Arial, Helvetica, sans-serif; @@ -2816,19 +1744,7 @@ color: #000000; } -.heading3 { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 14px; - color: #999999; -} - -.heading4 { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 14px; - color: #999999; -} + .settingsUI { @@ -2909,7 +1825,7 @@ font-weight:bold; } -/*.cellLabel { +.cellLabel { background-color:#eaebd9; border-top:1px solid #efefef; border-bottom:1px solid #dadada; @@ -2919,7 +1835,7 @@ .cellText { color:#333333; border-bottom:1px solid #dadada; -} */ +} .listTable{ border-left:1px solid #cccccc; @@ -3019,56 +1935,19 @@ border:1px solid #ebebeb; } -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - -} + .prvPrfTexture { background:url(images/prvPrfTexture1.gif); } -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; -} + .prvPrfHoverOn { background-color:#ffffef; } -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; -} + .cellBottomDotLine { border-bottom-width: 2px; @@ -3088,15 +1967,11 @@ border-bottom-color: #CCCCCC; } -.crmFormDropDown { -border-width:1px; -} + .thickBorder { border: 2px solid #999999; } -.trackerBorder { - background-color:#ffffff; -} + .trackerHeading { background-color:#efefef; } @@ -3112,19 +1987,11 @@ .crmTable { border:1px solid #dadada; } -.crmTableColHeading { - background-color:#CCCCCC; - border-left:1px solid #eaeaea; - border-top:1px solid #eaeaea; - border-right:1px solid #999999; - border-bottom:1px solid #999999; -} + .crmTableRow { border-bottom:1px dotted #dadada; border-right:1px dotted #dadada } - - /* Inventory */ @@ -3153,24 +2020,6 @@ /* Inventory */ - - - -/* styles for RSS Display starts */ -.rssDisplay{ - background-color:#e8e3ca; -} - - -/* styles for RSS Display ends */ - - - - - - - - /* Email Client Classes ++++++++++++++++++++++ */ .emailSelected{ @@ -3192,10 +2041,7 @@ background:#e0dbb0 url(images/mailSubHeaderBg.gif) repeat-x; padding:4px; } -.mailDetailsHeader { - border-top:2px dotted #999; - border-bottom:1px solid #ddd; -} + .mailClientWriteEmailHeader{ font-family:arial, helvetica, sans-serif; From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 3 03:21:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 03 Oct 2006 07:21:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9547 - in /vtigercrm/branches/5.0.1: ./ cron/ modules/Calendar/ modules/Emails/ modules/Faq/ modules/Invoice/ modules/Leads/ modules/Portal/ modules/Products/ modules/PurchaseOrder/ modules/Rss/ modules/SalesOrder/ modules/Settings/ modules/Users/ modules/Vendors/ Message-ID: <20061003072114.55050787E0F@vtiger.fosslabs.com> Author: richie Date: Tue Oct 3 01:20:52 2006 New Revision: 9547 Log: * Changed the php short tag ie., changed the tag from Modified: vtigercrm/branches/5.0.1/modules/Invoice/Popup.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Invoice/Popup.php (original) +++ vtigercrm/branches/5.0.1/modules/Invoice/Popup.php Tue Oct 3 01:20:52 2006 @@ -1,4 +1,4 @@ - Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/Popup.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/Popup.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/Popup.php Tue Oct 3 01:20:52 2006 @@ -1,4 +1,4 @@ - Modified: vtigercrm/branches/5.0.1/modules/Rss/RssAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Rss/RssAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Rss/RssAjax.php Tue Oct 3 01:20:52 2006 @@ -1,4 +1,4 @@ - Modified: vtigercrm/branches/5.0.1/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/SalesOrder/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/SalesOrder/ListView.php Tue Oct 3 01:20:52 2006 @@ -1,4 +1,4 @@ - Modified: vtigercrm/branches/5.0.1/modules/Settings/SettingsAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Settings/SettingsAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Settings/SettingsAjax.php Tue Oct 3 01:20:52 2006 @@ -1,4 +1,4 @@ - From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 3 03:23:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 03 Oct 2006 07:23:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9548 - /vtigercrm/branches/5.0.1/include/language/en_us.lang.php Message-ID: <20061003072315.420D0787E44@vtiger.fosslabs.com> Author: richie Date: Tue Oct 3 01:23:12 2006 New Revision: 9548 Log: * Added language entry for Part Number Modified: vtigercrm/branches/5.0.1/include/language/en_us.lang.php Modified: vtigercrm/branches/5.0.1/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/include/language/en_us.lang.php Tue Oct 3 01:23:12 2006 @@ -1027,6 +1027,7 @@ //Record deleted message 'LBL_RECORD_DELETE'=>'The record you are trying to view has been deleted.', +'Part Number'=>'Part Number', ); From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 3 03:30:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 03 Oct 2006 07:30:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9549 - /vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php Message-ID: <20061003073037.D09E0787E44@vtiger.fosslabs.com> Author: richie Date: Tue Oct 3 01:30:32 2006 New Revision: 9549 Log: * Modified to fix the ticket 2202 ie., when we are in a module's Listview and enter global search, in the result for that corresponding module it only searches in the customview which we were looked in Modified: vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php Modified: vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php (original) +++ vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php Tue Oct 3 01:30:32 2006 @@ -80,83 +80,77 @@ { 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); + $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); - //Avoided the modules Faq and PriceBooks. we should remove this if when change the customview function - $oCustomView = ''; - if($module != 'Faq' && $module != 'PriceBooks') - { - //Added to get the default 'All' customview query + $listquery = getListQuery($module); + $oCustomView = ''; + $oCustomView = new CustomView($module); - $viewid = $oCustomView->getViewId($module); - - $listquery = $oCustomView->getModifiedCvListQuery($viewid,$listquery,$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]); + + 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]); } } @@ -182,7 +176,7 @@ { global $adb; - $query = "SELECT * FROM vtiger_field WHERE tabid = ".getTabid($module); + $query = "SELECT columnname, tablename FROM vtiger_field WHERE tabid = ".getTabid($module); $result = $adb->query($query); $noofrows = $adb->num_rows($result); @@ -197,7 +191,7 @@ { if($where != '') $where .= " OR "; - $where .= $tablename.".".$columnname." LIKE ".$adb->quote("%$search_val%"); + $where .= $tablename.".".$columnname." LIKE ".$adb->quote("%$search_val%"); } } From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 3 07:40:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 03 Oct 2006 11:40:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9550 - /vtigercrm/branches/5.0.1/modules/HelpDesk/Merge.php Message-ID: <20061003114050.615357700CF@vtiger.fosslabs.com> Author: richie Date: Tue Oct 3 05:40:46 2006 New Revision: 9550 Log: Issue during mail merge in trouble tickets fixed Modified: vtigercrm/branches/5.0.1/modules/HelpDesk/Merge.php Modified: vtigercrm/branches/5.0.1/modules/HelpDesk/Merge.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/HelpDesk/Merge.php (original) +++ vtigercrm/branches/5.0.1/modules/HelpDesk/Merge.php Tue Oct 3 05:40:46 2006 @@ -92,7 +92,7 @@ { $column_name = "productsRel.productname"; } - if($tablename == "crmentity") + if($tablename == "vtiger_crmentity") { if($modulename == "Contacts") { @@ -171,7 +171,7 @@ left join vtiger_products as productsRel on productsRel.productid = vtiger_troubletickets.product_id left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id left join vtiger_account on vtiger_account.accountid = vtiger_troubletickets.parent_id - left join vtiger_crmentity as _crmentityAccounts on crmentityAccounts.crmid = vtiger_account.accountid + left join vtiger_crmentity as crmentityAccounts on crmentityAccounts.crmid = vtiger_account.accountid left join vtiger_accountbillads on vtiger_accountbillads.accountaddressid = vtiger_account.accountid left join vtiger_accountshipads on vtiger_accountshipads.accountaddressid = vtiger_account.accountid left join vtiger_accountscf on vtiger_accountbillads.accountaddressid = vtiger_accountscf.accountid From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 3 10:22:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 03 Oct 2006 14:22:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9551 - in /vtigercrm/branches/5.0.1: Popup.php Smarty/templates/Popup.tpl Smarty/templates/RelatedListContents.tpl modules/Products/updateRelations.php Message-ID: <20061003142238.EC6DE787E87@vtiger.fosslabs.com> Author: richie Date: Tue Oct 3 08:22:32 2006 New Revision: 9551 Log: * Changes made to add the button Select Product in Vendor Related list Modified: vtigercrm/branches/5.0.1/Popup.php vtigercrm/branches/5.0.1/Smarty/templates/Popup.tpl vtigercrm/branches/5.0.1/Smarty/templates/RelatedListContents.tpl vtigercrm/branches/5.0.1/modules/Products/updateRelations.php Modified: vtigercrm/branches/5.0.1/Popup.php ============================================================================== --- vtigercrm/branches/5.0.1/Popup.php (original) +++ vtigercrm/branches/5.0.1/Popup.php Tue Oct 3 08:22:32 2006 @@ -195,6 +195,7 @@ } +$smarty->assign("RETURN_ACTION",$_REQUEST['return_action']); $theme_path="themes/".$theme."/"; Modified: vtigercrm/branches/5.0.1/Smarty/templates/Popup.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/Popup.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/Popup.tpl Tue Oct 3 08:22:32 2006 @@ -18,7 +18,7 @@ Modified: vtigercrm/branches/5.0.1/Smarty/templates/RelatedListContents.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/RelatedListContents.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/RelatedListContents.tpl Tue Oct 3 08:22:32 2006 @@ -37,15 +37,16 @@ {/if} {elseif $header eq 'Products'} {if $MODULE eq 'PriceBooks'} - + {elseif $MODULE eq 'Potentials'}   - + {elseif $MODULE eq 'Vendors'} + {else} - + {/if} {elseif $header eq 'Leads'} {if $MODULE eq 'Campaigns'} Modified: vtigercrm/branches/5.0.1/modules/Products/updateRelations.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/updateRelations.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/updateRelations.php Tue Oct 3 08:22:32 2006 @@ -12,11 +12,12 @@ require_once('include/database/PearDatabase.php'); global $adb; +//This if will be true, when we select product from vendor related list if($_REQUEST['destination_module']=='Products') { - if($_REQUEST['smodule']=='VENDOR') + if($_REQUEST['parid'] != '' && $_REQUEST['entityid'] != '') { - $sql = "update vtiger_products set vtiger_vendor_id=".$_REQUEST['parid']." where productid=".$_REQUEST['entityid']; + $sql = "update vtiger_products set vendor_id=".$_REQUEST['parid']." where productid=".$_REQUEST['entityid']; $adb->query($sql); } } @@ -29,8 +30,11 @@ } } +$return_action = 'DetailView'; +if($_REQUEST['return_action'] != '') + $return_action = $_REQUEST['return_action']; - header("Location:index.php?action=DetailView&module=Vendors&record=".$_REQUEST["parid"]); +header("Location:index.php?action=$return_action&module=Vendors&record=".$_REQUEST["parid"]); From vtigercrm-commits at vtiger.fosslabs.com Wed Oct 4 07:32:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 04 Oct 2006 11:32:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9552 - in /vtigercrm/branches/5.0.1/soap: firefoxtoolbar.php thunderbirdplugin.php vtigerolservice.php wordplugin.php Message-ID: <20061004113227.4A93C787E05@vtiger.fosslabs.com> Author: jerrydgeorge Date: Wed Oct 4 05:32:13 2006 New Revision: 9552 Log: Namaspace Url changed.Fixes # 2067. Modified: vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php vtigercrm/branches/5.0.1/soap/vtigerolservice.php vtigercrm/branches/5.0.1/soap/wordplugin.php Modified: vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php (original) +++ vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php Wed Oct 4 05:32:13 2006 @@ -16,7 +16,7 @@ $log = &LoggerManager::getLogger('firefoxlog'); -$NAMESPACE = 'http://www.vtiger.com/vtigercrm/'; +$NAMESPACE = 'http://www.vtiger.com/products/crm'; $server = new soap_server; $accessDenied = "You are not authorized for performing this action"; $server->configureWSDL('vtigersoap'); Modified: vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php (original) +++ vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php Wed Oct 4 05:32:13 2006 @@ -18,7 +18,7 @@ $log = &LoggerManager::getLogger('thunderbirdplugin'); $accessDenied = "You are not authorized for performing this action"; -$NAMESPACE = 'http://www.vtiger.com/vtigercrm/'; +$NAMESPACE = 'http://www.vtiger.com/products/crm'; $server = new soap_server; $server->configureWSDL('vtigersoap'); Modified: vtigercrm/branches/5.0.1/soap/vtigerolservice.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/vtigerolservice.php (original) +++ vtigercrm/branches/5.0.1/soap/vtigerolservice.php Wed Oct 4 05:32:13 2006 @@ -17,7 +17,7 @@ error_reporting(0); -$NAMESPACE = 'http://www.vtigercrm.com/vtigercrm'; +$NAMESPACE = 'http://www.vtiger.com/products/crm'; $server = new soap_server; Modified: vtigercrm/branches/5.0.1/soap/wordplugin.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/wordplugin.php (original) +++ vtigercrm/branches/5.0.1/soap/wordplugin.php Wed Oct 4 05:32:13 2006 @@ -17,7 +17,7 @@ $log = &LoggerManager::getLogger('wordplugin'); error_reporting(0); -$NAMESPACE = 'http://www.vtiger.com/vtigercrm/'; +$NAMESPACE = 'http://www.vtiger.com/products/crm'; $server = new soap_server; $accessDenied = "You are not permitted to perform this action"; $server->configureWSDL('vtigersoap'); From vtigercrm-commits at vtiger.fosslabs.com Wed Oct 4 07:35:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 04 Oct 2006 11:35:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9553 - /vtigercrm/branches/5.0.1/vtigerservice.php Message-ID: <20061004113517.AA29A787E9C@vtiger.fosslabs.com> Author: jerrydgeorge Date: Wed Oct 4 05:35:00 2006 New Revision: 9553 Log: Error_reporting set and link for wordplugin changed ,Fixes #2065,#2066. Modified: vtigercrm/branches/5.0.1/vtigerservice.php Modified: vtigercrm/branches/5.0.1/vtigerservice.php ============================================================================== --- vtigercrm/branches/5.0.1/vtigerservice.php (original) +++ vtigercrm/branches/5.0.1/vtigerservice.php Wed Oct 4 05:35:00 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ - +ini_set (error_reporting,E_ALL & ~E_NOTICE ); if(isset($_REQUEST['service'])) { if($_REQUEST['service'] == "outlook") @@ -44,11 +44,11 @@ { echo "

      vtigerCRM Soap Services

      "; echo "
    10. vtigerCRM Outlook Plugin EndPoint URL -- Click here
    11. "; - echo "
    12. vtigerCRM Word Plugin EndPoint URL -- Click here
    13. "; + echo "
    14. vtigerCRM Word Plugin EndPoint URL -- Click here
    15. "; echo "
    16. vtigerCRM ThunderBird Extenstion EndPoint URL -- Click here
    17. "; echo "
    18. vtigerCRM Customer Portal EndPoint URL -- Click here
    19. "; echo "
    20. vtigerCRM WebForm EndPoint URL -- Click here
    21. "; - echo "
    22. vtigerCRM FireFox Extension EndPoint URL -- Click here
    23. "; + echo "
    24. vtigerCRM FireFox Extension EndPoint URL -- Click here
    25. "; } From vtigercrm-commits at vtiger.fosslabs.com Wed Oct 4 08:03:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 04 Oct 2006 12:03:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9554 - /vtigercrm/branches/5.1_jens/ Message-ID: <20061004120333.F038B787E96@vtiger.fosslabs.com> Author: richie Date: Wed Oct 4 06:03:22 2006 New Revision: 9554 Log: Creating a branch for jens for 5.1 development Added: vtigercrm/branches/5.1_jens/ - copied from r9529, vtigercrm/trunk/ From vtigercrm-commits at vtiger.fosslabs.com Wed Oct 4 08:50:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 04 Oct 2006 12:50:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9555 - /vtigercrm/branches/5.0.1/data/SugarBean.php Message-ID: <20061004125036.E833E787E82@vtiger.fosslabs.com> Author: richie Date: Wed Oct 4 06:50:33 2006 New Revision: 9555 Log: * Removed the quotes for the date_entered and date_modified field values because single quotes will be added in the function adodb's formatString which throws error when we save import mapping Modified: vtigercrm/branches/5.0.1/data/SugarBean.php Modified: vtigercrm/branches/5.0.1/data/SugarBean.php ============================================================================== --- vtigercrm/branches/5.0.1/data/SugarBean.php (original) +++ vtigercrm/branches/5.0.1/data/SugarBean.php Wed Oct 4 06:50:33 2006 @@ -58,7 +58,7 @@ } //$this->date_modified = $this->db->formatDate(date('YmdHis')); - $this->date_modified = $this->db->formatDate(date('YmdHis')); + $this->date_modified = date('YmdHis'); if (isset($current_user)) $this->modified_user_id = $current_user->id; if($isUpdate) @@ -68,7 +68,7 @@ else { //$this->date_entered = $this->db->formatDate(date('YmdHis')); - $this->date_entered = $this->db->formatDate(date('YmdHis')); + $this->date_entered = date('YmdHis'); if($this->new_schema && $this->new_with_id == false) From vtigercrm-commits at vtiger.fosslabs.com Wed Oct 4 11:42:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 04 Oct 2006 15:42:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9556 - in /vtigercrm/branches/5.0.1: Smarty/templates/Settings.tpl Smarty/templates/Settings/TaxConfig.tpl modules/Contacts/language/en_us.lang.php modules/Contacts/vtchat.php modules/Settings/language/en_us.lang.php Message-ID: <20061004154240.290C4787EB5@vtiger.fosslabs.com> Author: richie Date: Wed Oct 4 09:42:04 2006 New Revision: 9556 Log: * Modified to fix the i18n issues Modified: vtigercrm/branches/5.0.1/Smarty/templates/Settings.tpl vtigercrm/branches/5.0.1/Smarty/templates/Settings/TaxConfig.tpl vtigercrm/branches/5.0.1/modules/Contacts/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/Contacts/vtchat.php vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php Modified: vtigercrm/branches/5.0.1/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/Settings.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/Settings.tpl Wed Oct 4 09:42:04 2006 @@ -22,7 +22,7 @@ - {$MOD.LBL_SETTINGS} +   Modified: vtigercrm/branches/5.0.1/Smarty/templates/Settings/TaxConfig.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/Settings/TaxConfig.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/Settings/TaxConfig.tpl Wed Oct 4 09:42:04 2006 @@ -86,7 +86,7 @@   {if $EDIT_MODE neq 'true'} - + {/if} Modified: vtigercrm/branches/5.0.1/modules/Contacts/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/language/en_us.lang.php Wed Oct 4 09:42:04 2006 @@ -225,6 +225,7 @@ 'Web Site'=>'Web Site', 'Word of mouth'=>'Word of mouth', 'Other'=>'Other', +'User List'=>'User List', ); Modified: vtigercrm/branches/5.0.1/modules/Contacts/vtchat.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/vtchat.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/vtchat.php Wed Oct 4 09:42:04 2006 @@ -74,7 +74,7 @@ - + Modified: vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php Wed Oct 4 09:42:04 2006 @@ -721,6 +721,7 @@ 'LBL_TYPEALERT_2'=>'data type. Kindly map the same data types.', 'LBL_ENABLE'=>'Enable', 'LBL_FAQ_FIELD_ACCESS'=>'Faq Field Access', +'LBL_ADD_TAX_BUTTON'=>'Add Tax', ); From vtigercrm-commits at vtiger.fosslabs.com Wed Oct 4 11:58:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 04 Oct 2006 15:58:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9557 - /vtigercrm/branches/5.0.1/Smarty/templates/Settings.tpl Message-ID: <20061004155859.0FEC2787EB5@vtiger.fosslabs.com> Author: richie Date: Wed Oct 4 09:58:48 2006 New Revision: 9557 Log: Inventory Terms and Condition moved to other section. Fixes #763 Modified: vtigercrm/branches/5.0.1/Smarty/templates/Settings.tpl Modified: vtigercrm/branches/5.0.1/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/Settings.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/Settings.tpl Wed Oct 4 09:58:48 2006 @@ -22,7 +22,7 @@ @@ -309,63 +309,6 @@
      User List
      -   + {$MOD.LBL_SETTINGS}
      - - - - - - - - - - - - - - - -
      {$MOD.INVENTORYTERMSANDCONDITIONS}{$MOD.LBL_INVENTORY_TANDC}
      {$MOD.LBL_INV_TANDC_DESCRIPTION}
      - - - - - - - - - - - - - -
        
       
      - - - - - - - - - - - - -
        
       
      - - - - - - - - - - - - -
        
       
      - @@ -536,20 +479,24 @@ {$MOD.LBL_MIGRATION_INFO} -   - - -   -   -   - - - - - - - + + + + + + + + + + +
      {$MOD.INVENTORYTERMSANDCONDITIONS}{$MOD.LBL_INVENTORY_TANDC}
      {$MOD.LBL_INV_TANDC_DESCRIPTION}
      + + + + + + From vtigercrm-commits at vtiger.fosslabs.com Thu Oct 5 05:47:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 05 Oct 2006 09:47:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9558 - in /vtigercrm/branches/5.0.1: Smarty/templates/CreateWordTemplate.tpl modules/Users/upload.php Message-ID: <20061005094709.6FCEF76FEAF@vtiger.fosslabs.com> Author: richie Date: Thu Oct 5 03:47:03 2006 New Revision: 9558 Log: * Modified to handle the hardcoded attachment size to be captured in config.inc.php file Modified: vtigercrm/branches/5.0.1/Smarty/templates/CreateWordTemplate.tpl vtigercrm/branches/5.0.1/modules/Users/upload.php Modified: vtigercrm/branches/5.0.1/Smarty/templates/CreateWordTemplate.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/CreateWordTemplate.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/CreateWordTemplate.tpl Thu Oct 5 03:47:03 2006 @@ -25,7 +25,7 @@ - + Users Modified: vtigercrm/branches/5.0.1/modules/Users/upload.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/upload.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/upload.php Thu Oct 5 03:47:03 2006 @@ -19,6 +19,7 @@ global $mod_strings; global $app_list_strings; global $adb; +global $upload_maxsize; global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -44,6 +45,7 @@ $smarty->assign("APP", $app_strings); $smarty->assign("UMOD", $mod_strings); $smarty->assign("PARENTTAB", $_REQUEST['parenttab']); +$smarty->assign("MAX_FILE_SIZE", $upload_maxsize); $smarty->display('CreateWordTemplate.tpl'); From vtigercrm-commits at vtiger.fosslabs.com Thu Oct 5 07:48:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 05 Oct 2006 11:48:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9559 - /vtigercrm/branches/5.0.1/modules/Dashboard/HomepageDB.php Message-ID: <20061005114836.D9FC6787E4A@vtiger.fosslabs.com> Author: richie Date: Thu Oct 5 05:48:32 2006 New Revision: 9559 Log: changes made to fix the issue 2115 - Minnie Modified: vtigercrm/branches/5.0.1/modules/Dashboard/HomepageDB.php Modified: vtigercrm/branches/5.0.1/modules/Dashboard/HomepageDB.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Dashboard/HomepageDB.php (original) +++ vtigercrm/branches/5.0.1/modules/Dashboard/HomepageDB.php Thu Oct 5 05:48:32 2006 @@ -9,17 +9,10 @@ * ********************************************************************************/ require_once("modules/Dashboard/Entity_charts.php"); -/** - * Function to get Dashboard in homepage - * return the graph - $sHTML - */ + global $current_user,$user_id,$date_start,$end_date,$tmp_dir,$mod_strings; $type='recordsforuser'; - //require('user_privileges/user_privileges_'.$current_user->id.'.php'); - //if($is_admin) - // $homepagedb_query = "select vtiger_crmentity.* from vtiger_crmentity where vtiger_crmentity.setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder','SalesOrder','Activities','HelpDesk','Campaigns') and vtiger_crmentity.deleted=0"; - //else - $homepagedb_query = "select * from vtiger_crmentity se left join vtiger_leaddetails le on le.leadid=se.crmid left join vtiger_activity act on act.activityid=se.crmid where se.deleted=0 and (le.converted=0 or le.converted is null) and ((act.status!='Completed' and act.status!='Deferred') or act.status is null) and ((act.eventstatus!='Held' and act.eventstatus!='Not Held') or act.eventstatus is null) and setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder', 'SalesOrder','Calendar','HelpDesk','Campaigns') and se.deleted=0 and se.smownerid=".$current_user->id; + $homepagedb_query = "select * from vtiger_crmentity se left join vtiger_leaddetails le on le.leadid=se.crmid left join vtiger_troubletickets tt on tt.ticketid=se.crmid left join vtiger_activity act on act.activityid=se.crmid where se.deleted=0 and (le.converted=0 or le.converted is null) and (tt.status!='Closed' or tt.status is null) and ((act.status!='Completed' and act.status!='Deferred') or act.status is null) and ((act.eventstatus!='Held' and act.eventstatus!='Not Held') or act.eventstatus is null) and setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder', 'SalesOrder','Calendar','HelpDesk','Campaigns') and se.deleted=0 and se.smownerid=".$current_user->id; $graph_by="setype"; $graph_title=$mod_strings['recordsforuser'].' '.$current_user->user_name; $module="Home"; From vtigercrm-commits at vtiger.fosslabs.com Thu Oct 5 07:52:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 05 Oct 2006 11:52:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9560 - /vtigercrm/branches/5.0.1/modules/HelpDesk/ListView.php Message-ID: <20061005115206.B8F25787E4A@vtiger.fosslabs.com> Author: richie Date: Thu Oct 5 05:52:03 2006 New Revision: 9560 Log: changes made to fix the issue 2115 - Minnie Modified: vtigercrm/branches/5.0.1/modules/HelpDesk/ListView.php Modified: vtigercrm/branches/5.0.1/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/HelpDesk/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/HelpDesk/ListView.php Thu Oct 5 05:52:03 2006 @@ -122,6 +122,8 @@ 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 '.$where; } From vtigercrm-commits at vtiger.fosslabs.com Thu Oct 5 07:56:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 05 Oct 2006 11:56:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9561 - /vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl Message-ID: <20061005115649.0D900787E4A@vtiger.fosslabs.com> Author: richie Date: Thu Oct 5 05:56:46 2006 New Revision: 9561 Log: changes made to fix the issue 2207 - Minnie Modified: vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl Modified: vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl Thu Oct 5 05:56:46 2006 @@ -135,10 +135,10 @@ {assign var=style_group value='display:block'} {/if} -  User +  {$APP.LBL_USER} {if $secondvalue neq ''} -  Group +  {$APP.LBL_GROUP} {/if}   -   - {/if} - {if $DELETE eq 'permitted'} -   - {/if} + + + + + +
      + {if $EDIT_DUPLICATE eq 'permitted'} +   + {/if} + + {if $EDIT_DUPLICATE eq 'permitted'} +   + {/if} + {if $DELETE eq 'permitted'} +   + {/if} +
      - - - - + + + + Modified: vtigercrm/branches/5.0.1/modules/Settings/UpdateComboValues.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Settings/UpdateComboValues.php (original) +++ vtigercrm/branches/5.0.1/modules/Settings/UpdateComboValues.php Thu Oct 5 09:34:24 2006 @@ -12,6 +12,8 @@ $fld_module=$_REQUEST["fld_module"]; $tableName=$_REQUEST["table_name"]; $fldPickList = $_REQUEST['listarea']; +//changed by dingjianting on 2006-10-1 for picklist editor +$fldPickList = utf8RawUrlDecode($fldPickList); $uitype = $_REQUEST['uitype']; global $adb; From vtigercrm-commits at vtiger.fosslabs.com Thu Oct 5 14:53:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 05 Oct 2006 18:53:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9572 - in /vtigercrm/branches/5.0.1/modules: Accounts/ Campaigns/ Contacts/ Faq/ HelpDesk/ Invoice/ Leads/ Notes/ Potentials/ PriceBooks/ Products/ PurchaseOrder/ Quotes/ SalesOrder/ Users/ Vendors/ Message-ID: <20061005185321.C008E66ADA0@vtiger.fosslabs.com> Author: richie Date: Thu Oct 5 12:52:28 2006 New Revision: 9572 Log: UTF-8 support added. Fixes #2297 Modified: vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Faq/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/HelpDesk/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Invoice/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/SalesOrder/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php Modified: vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $acntObj = new Account(); Modified: vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Campaign(); Modified: vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $cntObj = new Contact(); Modified: vtigercrm/branches/5.0.1/modules/Faq/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Faq/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Faq/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Faq(); Modified: vtigercrm/branches/5.0.1/modules/HelpDesk/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/HelpDesk/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/HelpDesk/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { Modified: vtigercrm/branches/5.0.1/modules/Invoice/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Invoice/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Invoice/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { Modified: vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -21,7 +21,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $leadObj = new Lead(); Modified: vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Note(); Modified: vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Potential(); Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new PriceBook(); Modified: vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Product(); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Order(); Modified: vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Quote(); Modified: vtigercrm/branches/5.0.1/modules/SalesOrder/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/SalesOrder/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/SalesOrder/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new SalesOrder(); Modified: vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -21,7 +21,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $userObj = new User(); Modified: vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php Thu Oct 5 12:52:28 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Vendor(); From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 03:11:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 07:11:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9573 - in /vtigercrm/branches/5.0.1/modules/Portal: Popup.php Portal.js Save.php Message-ID: <20061006071153.4E2646F7583@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 01:11:48 2006 New Revision: 9573 Log: * Modified to fix the http:// to add with the site given - ticket 2169 Modified: vtigercrm/branches/5.0.1/modules/Portal/Popup.php vtigercrm/branches/5.0.1/modules/Portal/Portal.js vtigercrm/branches/5.0.1/modules/Portal/Save.php Modified: vtigercrm/branches/5.0.1/modules/Portal/Popup.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Portal/Popup.php (original) +++ vtigercrm/branches/5.0.1/modules/Portal/Popup.php Fri Oct 6 01:11:48 2006 @@ -42,7 +42,7 @@ '.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_URL'] .' - + http:// '.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_NAME'] .' Modified: vtigercrm/branches/5.0.1/modules/Portal/Portal.js ============================================================================== --- vtigercrm/branches/5.0.1/modules/Portal/Portal.js (original) +++ vtigercrm/branches/5.0.1/modules/Portal/Portal.js Fri Oct 6 01:11:48 2006 @@ -90,3 +90,25 @@ 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.0.1/modules/Portal/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Portal/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Portal/Save.php Fri Oct 6 01:11:48 2006 @@ -13,10 +13,10 @@ if(isset($_REQUEST['record']) && $_REQUEST['record'] !='') { - $result=UpdatePortal($_REQUEST['portalname'],$_REQUEST['portalurl'],$_REQUEST['record']); + $result=UpdatePortal($_REQUEST['portalname'],"http://".$_REQUEST['portalurl'],$_REQUEST['record']); }else { - $result=SavePortal($_REQUEST['portalname'],$_REQUEST['portalurl']); + $result=SavePortal($_REQUEST['portalname'],"http://".$_REQUEST['portalurl']); } header("Location: index.php?action=PortalAjax&module=Portal&file=ListView&mode=ajax&datamode=manage"); ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 03:34:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 07:34:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9574 - /vtigercrm/branches/5.0.1/modules/Portal/Popup.php Message-ID: <20061006073405.C36487700B0@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 01:34:01 2006 New Revision: 9574 Log: * Added script function call in save onclick to remove http:// from the given URL Modified: vtigercrm/branches/5.0.1/modules/Portal/Popup.php Modified: vtigercrm/branches/5.0.1/modules/Portal/Popup.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Portal/Popup.php (original) +++ vtigercrm/branches/5.0.1/modules/Portal/Popup.php Fri Oct 6 01:34:01 2006 @@ -55,7 +55,7 @@ From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 04:43:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 08:43:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9575 - in /vtigercrm/branches/5.0.1/modules/Calendar: addEventUI.php language/en_us.lang.php Message-ID: <20061006084310.8510B7700B0@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 02:43:05 2006 New Revision: 9575 Log: * Modified for i18n Modified: vtigercrm/branches/5.0.1/modules/Calendar/addEventUI.php vtigercrm/branches/5.0.1/modules/Calendar/language/en_us.lang.php Modified: vtigercrm/branches/5.0.1/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Calendar/addEventUI.php (original) +++ vtigercrm/branches/5.0.1/modules/Calendar/addEventUI.php Fri Oct 6 02:43:05 2006 @@ -429,7 +429,7 @@ - days + hrs + minutes  +  
      -    +   
      Modified: vtigercrm/branches/5.0.1/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Calendar/language/en_us.lang.php Fri Oct 6 02:43:05 2006 @@ -403,6 +403,8 @@ 'High'=>'High', 'Medium'=>'Medium', 'Low'=>'Low', +'LBL_REMAINDER_DAY'=>'days', +'LBL_REMAINDER_HRS'=>'hrs', ); From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 08:59:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 12:59:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9576 - /vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php Message-ID: <20061006125922.07228787EFD@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 06:59:18 2006 New Revision: 9576 Log: Users->New Users throws a database error. Fixes #2278 Modified: vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php Modified: vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php Fri Oct 6 06:59:18 2006 @@ -1195,12 +1195,14 @@ elseif($uitype == 105) { $editview_label[]=$mod_strings[$fieldlabel]; - $query = "select attachments.path, attachments.name from contactdetails left join seattachmentsrel on seattachmentsrel.crmid=contactdetails.contactid inner join attachments on attachments.attachmentsid=seattachmentsrel.attachmentsid where contactdetails.imagename=attachments.name and contactid=".$col_fields['record_id']; - $result_image = $adb->query($query); - for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++) - { - $image_array[] = $adb->query_result($result_image,$image_iter,'name'); - $image_path_array[] = $adb->query_result($result_image,$image_iter,'path'); + if( isset( $col_fields['record_id']) && $col_fields['record_id'] != '') { + $query = "select vtiger_attachments.path, vtiger_attachments.name from vtiger_contactdetails left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_contactdetails.contactid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where vtiger_contactdetails.imagename=vtiger_attachments.name and contactid=".$col_fields['record_id']; + $result_image = $adb->query($query); + for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++) + { + $image_array[] = $adb->query_result($result_image,$image_iter,'name'); + $image_path_array[] = $adb->query_result($result_image,$image_iter,'path'); + } } if(is_array($image_array)) for($img_itr=0;$img_itr Author: richie Date: Fri Oct 6 08:29:00 2006 New Revision: 9577 Log: * Added file contains the functions which are used in Export records to CSV file Added: vtigercrm/branches/5.0.1/include/utils/ExportUtils.php From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 10:37:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 14:37:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9578 - in /vtigercrm/branches/5.0.1/modules: Accounts/Account.php Contacts/Contact.php Emails/Email.php Leads/Lead.php Notes/Note.php Potentials/Opportunity.php Products/Product.php Message-ID: <20061006143732.8A450787F08@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 08:37:21 2006 New Revision: 9578 Log: * Added security for the Export query so that the permitted fields and premitted records only can be export to CSV files Modified: vtigercrm/branches/5.0.1/modules/Accounts/Account.php vtigercrm/branches/5.0.1/modules/Contacts/Contact.php vtigercrm/branches/5.0.1/modules/Emails/Email.php vtigercrm/branches/5.0.1/modules/Leads/Lead.php vtigercrm/branches/5.0.1/modules/Notes/Note.php vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php vtigercrm/branches/5.0.1/modules/Products/Product.php Modified: vtigercrm/branches/5.0.1/modules/Accounts/Account.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/Account.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/Account.php Fri Oct 6 08:37:21 2006 @@ -670,64 +670,34 @@ function create_export_query(&$order_by, &$where) { global $log; + global $current_user; $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - if($this->checkIfCustomTableExists('vtiger_accountscf')) - { - - $query = $this->constructCustomQueryAddendum('vtiger_accountscf','Accounts') . " - vtiger_account.*, - ".$this->entity_table.".*, - vtiger_accountbillads.city AS billing_city, - vtiger_accountbillads.country AS billing_country, - vtiger_accountbillads.code AS billing_code, - vtiger_accountbillads.state AS billing_state, - vtiger_accountbillads.street AS billing_street, - vtiger_accountshipads.city AS shipping_city, - vtiger_accountshipads.country AS shipping_country, - vtiger_accountshipads.code AS shipping_code, - vtiger_accountshipads.state AS shipping_state, - vtiger_accountshipads.street AS shipping_street, - vtiger_users.user_name, - vtiger_users.status AS user_status - FROM ".$this->entity_table." + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Accounts", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list FROM ".$this->entity_table." INNER JOIN vtiger_account ON vtiger_crmentity.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 + LEFT JOIN vtiger_accountscf ON vtiger_accountscf.accountid = vtiger_account.accountid + LEFT JOIN vtiger_accountgrouprelation + ON vtiger_accountscf.accountid = vtiger_accountgrouprelation.accountid + LEFT JOIN vtiger_groups + ON vtiger_groups.groupname = vtiger_accountgrouprelation.groupname LEFT JOIN vtiger_users - ON vtiger_crmentity.smownerid = vtiger_users.id "; - - } - else - { - $query = "SELECT vtiger_account.*, - ".$this->entity_table.".*, - vtiger_accountbillads.city AS billing_city, - vtiger_accountbillads.country AS billing_country, - vtiger_accountbillads.code AS billing_code, - vtiger_accountbillads.state AS billing_state, - vtiger_accountbillads.street AS billing_street, - vtiger_accountshipads.city AS shipping_city, - vtiger_accountshipads.country AS shipping_country, - vtiger_accountshipads.code AS shipping_code, - vtiger_accountshipads.state AS shipping_state, - vtiger_accountshipads.street AS shipping_street, - vtiger_users.user_name, - vtiger_users.status AS user_status - FROM ".$this->entity_table." - INNER JOIN vtiger_account - ON vtiger_crmentity.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_users - ON vtiger_crmentity.smownerid = vtiger_users.id "; - } + ON vtiger_crmentity.smownerid = vtiger_users.id + LEFT JOIN vtiger_account vtiger_account2 + ON vtiger_account2.accountid = vtiger_account.parentid + ";//vtiger_account2 is added to get the Member of account + $where_auto = " vtiger_users.status = 'Active' AND vtiger_crmentity.deleted = 0 "; @@ -737,8 +707,18 @@ 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[6] == 3) + { + //Added security check to get the permitted records only + $query = $query." ".getListViewSecurityParameter("Accounts"); + } + if(!empty($order_by)) $query .= " ORDER BY $order_by"; + $log->debug("Exiting create_export_query method ..."); return $query; } Modified: vtigercrm/branches/5.0.1/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/Contact.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/Contact.php Fri Oct 6 08:37:21 2006 @@ -653,36 +653,43 @@ function create_export_query(&$order_by, &$where) { global $log; + global $current_user; $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - if($this->checkIfCustomTableExists('vtiger_contactscf')) - { - $query = $this->constructCustomQueryAddendum('vtiger_contactscf','Contacts') ." - vtiger_contactdetails.*, vtiger_contactaddress.*, - vtiger_account.accountname account_name, - vtiger_users.user_name assigned_user_name - 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_contactscf on vtiger_contactscf.contactid=vtiger_contactdetails.contactid - where vtiger_crmentity.deleted=0 and vtiger_users.status='Active' "; - } - else - { - $query = "SELECT - vtiger_contactdetails.*, vtiger_contactaddress.*, - vtiger_account.accountname account_name, - vtiger_users.user_name assigned_user_name + + 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->info("Export Query Constructed Successfully"); $log->debug("Exiting create_export_query method ..."); return $query; } Modified: vtigercrm/branches/5.0.1/modules/Emails/Email.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/Email.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/Email.php Fri Oct 6 08:37:21 2006 @@ -257,8 +257,50 @@ function create_export_query(&$order_by, &$where) { global $log; + global $current_user; $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - $query = 'SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_attachments.name as filename, vtiger_crmentity.description as email_content FROM vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_seattachmentsrel on vtiger_activity.activityid=vtiger_seattachmentsrel.crmid left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid where vtiger_activity.activitytype="Emails" and vtiger_crmentity.deleted=0'; + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Emails", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list FROM vtiger_activity + INNER JOIN vtiger_crmentity + ON vtiger_crmentity.crmid=vtiger_activity.activityid + LEFT JOIN vtiger_users + ON vtiger_users.id = vtiger_crmentity.smownerid + LEFT JOIN vtiger_seactivityrel + ON vtiger_seactivityrel.activityid = vtiger_activity.activityid + LEFT JOIN vtiger_contactdetails + ON vtiger_contactdetails.contactid = vtiger_seactivityrel.crmid + LEFT JOIN vtiger_cntactivityrel + ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid + AND vtiger_cntactivityrel.contactid = vtiger_cntactivityrel.contactid + 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_salesmanactivityrel + ON vtiger_salesmanactivityrel.activityid = vtiger_activity.activityid + LEFT JOIN vtiger_emaildetails + ON vtiger_emaildetails.emailid = vtiger_activity.activityid + LEFT JOIN vtiger_seattachmentsrel + ON vtiger_activity.activityid=vtiger_seattachmentsrel.crmid + LEFT JOIN vtiger_attachments + ON vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid + WHERE vtiger_activity.activitytype='Emails' AND 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) + { + $sec_parameter=getListViewSecurityParameter("Emails"); + $query .= $sec_parameter; + } $log->debug("Exiting create_export_query method ..."); return $query; Modified: vtigercrm/branches/5.0.1/modules/Leads/Lead.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/Lead.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/Lead.php Fri Oct 6 08:37:21 2006 @@ -138,38 +138,32 @@ function create_export_query(&$order_by, &$where) { global $log; + global $current_user; $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - if($this->checkIfCustomTableExists('vtiger_leadscf')) - { - - $query = $this->constructCustomQueryAddendum('vtiger_leadscf','Leads') . " - vtiger_leaddetails.*, ".$this->entity_table.".*, vtiger_leadsubdetails.*,vtiger_leadaddress.city city, vtiger_leadaddress.state state,vtiger_leadaddress.code code,vtiger_leadaddress.country country, vtiger_leadaddress.phone phone, vtiger_users.user_name, vtiger_users.status user_status - FROM ".$this->entity_table." + + 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_leadaddress - ON vtiger_leaddetails.leadid=vtiger_leadaddress.leadaddressid + ON vtiger_crmentity.crmid=vtiger_leaddetails.leadid LEFT JOIN vtiger_leadsubdetails - ON vtiger_leaddetails.leadid=vtiger_leadsubdetails.leadsubscriptionid + 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 + 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 "; - - } - else - { - $query = "SELECT - vtiger_leaddetails.*, ".$this->entity_table.".*, vtiger_leadsubdetails.*,vtiger_leadaddress.*,vtiger_users.user_name, vtiger_users.status user_status 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_users - ON vtiger_crmentity.smownerid = vtiger_users.id "; - } + ON vtiger_crmentity.smownerid = vtiger_users.id + "; + $where_auto = " vtiger_users.status='Active' AND vtiger_crmentity.deleted=0 AND vtiger_leaddetails.converted =0"; @@ -178,6 +172,15 @@ $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"; Modified: vtigercrm/branches/5.0.1/modules/Notes/Note.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/Note.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/Note.php Fri Oct 6 08:37:21 2006 @@ -89,12 +89,55 @@ { global $log; $log->debug("Entering create_export_query(".$order_by.",". $where.") method ..."); - $query = "SELECT - vtiger_notes.*, - vtiger_contactdetails.firstname, - vtiger_contactdetails.lastname - FROM vtiger_notes - LEFT JOIN vtiger_contactdetails ON vtiger_notes.contact_id=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_notes.notesid and vtiger_crmentity.deleted=0 "; + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Notes", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list FROM vtiger_notes + inner join vtiger_crmentity + on vtiger_crmentity.crmid=vtiger_notes.notesid + LEFT JOIN vtiger_senotesrel + ON vtiger_senotesrel.notesid = vtiger_notes.notesid + LEFT JOIN vtiger_contactdetails + ON vtiger_notes.contact_id=vtiger_contactdetails.contactid + + LEFT JOIN vtiger_crmentity vtiger_crmentityRelatedTo + ON vtiger_crmentityRelatedTo.crmid = vtiger_senotesrel.crmid + + LEFT JOIN vtiger_leaddetails vtiger_NoteRelatedToLead + ON vtiger_NoteRelatedToLead.leadid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_account vtiger_NoteRelatedToAccount + ON vtiger_NoteRelatedToAccount.accountid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_potential vtiger_NoteRelatedToPotential + ON vtiger_NoteRelatedToPotential.potentialid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_products vtiger_NoteRelatedToProduct + ON vtiger_NoteRelatedToProduct.productid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_invoice vtiger_NoteRelatedToInvoice + ON vtiger_NoteRelatedToInvoice.invoiceid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_purchaseorder vtiger_NoteRelatedToPO + ON vtiger_NoteRelatedToPO.purchaseorderid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_salesorder vtiger_NoteRelatedToSO + ON vtiger_NoteRelatedToSO.salesorderid = vtiger_senotesrel.crmid + + WHERE vtiger_crmentity.deleted=0 + + AND ((vtiger_senotesrel.crmid IS NULL + AND (vtiger_notes.contact_id = 0 + OR vtiger_notes.contact_id IS NULL)) + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Leads').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Accounts').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Potentials').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Products').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Invoice').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('PurchaseOrder').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('SalesOrder').") + OR vtiger_notes.contact_id IN (".getReadEntityIds('Contacts').")) + + "; + $log->debug("Exiting create_export_query method ..."); return $query; } Modified: vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php Fri Oct 6 08:37:21 2006 @@ -183,34 +183,37 @@ function create_export_query($order_by, $where) { global $log; + global $current_user; $log->debug("Entering create_export_query(".$order_by.",". $where.") method ..."); - if($this->checkIfCustomTableExists('vtiger_potentialscf')) - { - $query = $this->constructCustomQueryAddendum('vtiger_potentialscf','Potentials') ." - vtiger_potential.*, - vtiger_account.accountname account_name, - vtiger_users.user_name assigned_user_name - FROM vtiger_potential - INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid=vtiger_potential.potentialid - 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_users on vtiger_crmentity.smownerid=vtiger_users.id - where vtiger_crmentity.deleted=0 "; - } - else - { - $query = "SELECT - vtiger_potential.*, - vtiger_account.accountname account_name, - vtiger_users.user_name assigned_user_name - FROM vtiger_potential + 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; Modified: vtigercrm/branches/5.0.1/modules/Products/Product.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/Product.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/Product.php Fri Oct 6 08:37:21 2006 @@ -517,96 +517,54 @@ { global $log; $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - if($this->checkIfCustomTableExists('vtiger_productcf')) - { - - $query = $this->constructCustomQueryAddendum('vtiger_productcf','Products') ." - vtiger_products.productid AS productid, - vtiger_products.productname AS productname, - vtiger_products.productcode AS productcode, - vtiger_products.productcategory AS productcategory, - vtiger_products.manufacturer AS manufacturer, - vtiger_crmentity.description AS product_description, - vtiger_products.qty_per_unit AS qty_per_unit, - vtiger_products.unit_price AS unit_price, - vtiger_products.weight AS weight, - vtiger_products.pack_size AS pack_size, - DATE_FORMAT(vtiger_products.start_date, '%Y-%m-%d') AS start_date, - DATE_FORMAT(vtiger_products.expiry_date, '%Y-%m-%d') AS expiry_date, - vtiger_products.cost_factor AS cost_factor, - vtiger_products.commissionrate AS commissionrate, - vtiger_products.commissionmethod AS commissionmethod, - vtiger_products.discontinued AS discontinued, - vtiger_products.sales_start_date AS sales_start_date, - vtiger_products.sales_end_date AS sales_end_date, - vtiger_products.usageunit AS usageunit, - vtiger_products.serialno AS serialno, - vtiger_products.currency AS currency, - vtiger_products.reorderlevel AS reorderlevel, - vtiger_products.website AS website, - vtiger_products.taxclass AS taxclass, - vtiger_products.mfr_part_no AS mfr_part_no, - vtiger_products.vendor_part_no AS vendor_part_no, - vtiger_products.qtyinstock AS qtyinstock, - vtiger_products.productsheet AS productsheet, - vtiger_products.qtyindemand AS qtyindemand - FROM ".$this->entity_table." - INNER JOIN vtiger_products - ON vtiger_crmentity.crmid = vtiger_products.productid + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Products", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list FROM ".$this->table_name ." + 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_seproductsrel + ON vtiger_seproductsrel.productid = vtiger_products.productid + LEFT JOIN vtiger_producttaxrel + ON vtiger_producttaxrel.productid = vtiger_products.productid INNER JOIN vtiger_users - ON vtiger_users.id = vtiger_crmentity.smownerid - LEFT JOIN vtiger_productcf - ON vtiger_productcf.productid = vtiger_products.productid"; - - } - else - { - $query = "SELECT vtiger_products.productid AS productid, - vtiger_products.productname AS productname, - vtiger_products.productcode AS productcode, - vtiger_products.productcategory AS productcategory, - vtiger_products.manufacturer AS manufacturer, - vtiger_crmentity.description AS product_description, - vtiger_products.qty_per_unit AS qty_per_unit, - vtiger_products.unit_price AS unit_price, - vtiger_products.weight AS weight, - vtiger_products.pack_size AS pack_size, - DATE_FORMAT(vtiger_products.start_date, '%Y-%m-%d') AS start_date, - DATE_FORMAT(vtiger_products.expiry_date, '%Y-%m-%d') AS expiry_date, - vtiger_products.cost_factor AS cost_factor, - vtiger_products.commissionrate AS commissionrate, - vtiger_products.commissionmethod AS commissionmethod, - vtiger_products.discontinued AS discontinued, - vtiger_products.sales_start_date AS sales_start_date, - vtiger_products.sales_end_date AS sales_end_date, - vtiger_products.usageunit AS usageunit, - vtiger_products.serialno AS serialno, - vtiger_products.currency AS vtiger_currency, - vtiger_products.reorderlevel AS reorderlevel, - vtiger_products.website AS website, - vtiger_products.taxclass AS taxclass, - vtiger_products.mfr_part_no AS mfr_part_no, - vtiger_products.vendor_part_no AS vendor_part_no, - vtiger_products.qtyinstock AS qtyinstock, - vtiger_products.productsheet AS productsheet, - vtiger_products.qtyindemand AS qtyindemand - FROM ".$this->table_name ." - INNER JOIN vtiger_crmentity - ON vtiger_crmentity.crmid = vtiger_products.productid - INNER JOIN vtiger_users - ON vtiger_users.id=vtiger_crmentity.smownerid "; - - } + ON vtiger_users.id=vtiger_crmentity.smownerid + + LEFT JOIN vtiger_crmentity vtiger_crmentityRelatedTo + ON vtiger_crmentityRelatedTo.crmid = vtiger_seproductsrel.crmid + + LEFT JOIN vtiger_leaddetails vtiger_ProductRelatedToLead + ON vtiger_ProductRelatedToLead.leadid = vtiger_seproductsrel.crmid + LEFT JOIN vtiger_account vtiger_ProductRelatedToAccount + ON vtiger_ProductRelatedToAccount.accountid = vtiger_seproductsrel.crmid + LEFT JOIN vtiger_potential vtiger_ProductRelatedToPotential + ON vtiger_ProductRelatedToPotential.potentialid = vtiger_seproductsrel.crmid - $where_auto = " vtiger_users.status = 'Active' - AND vtiger_crmentity.deleted = 0 "; - - - - if($where != "") - $query .= " WHERE ($where) AND ".$where_auto; - else - $query .= " WHERE ".$where_auto; + LEFT JOIN vtiger_contactdetails + ON vtiger_contactdetails.contactid = vtiger_products.contactid + 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').")) + group by vtiger_products.productid + "; + //ProductRelatedToLead, Account and Potential tables are added to get the Related to field + + + if($where != "") + $query .= " AND ($where) "; if(!empty($order_by)) $query .= " ORDER BY $order_by"; From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 11:36:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 15:36:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9579 - in /vtigercrm/branches/5.0.1/modules: Accounts/ Campaigns/ Contacts/ HelpDesk/ Leads/ Notes/ Potentials/ PriceBooks/ Products/ Vendors/ Message-ID: <20061006153654.89D0476FF01@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 09:36:41 2006 New Revision: 9579 Log: * Modified the SINGLE_MOD value from app_strings to hardcoded value because this value displayed from language string in tpl file Modified: vtigercrm/branches/5.0.1/modules/Accounts/EditView.php vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php vtigercrm/branches/5.0.1/modules/Contacts/EditView.php vtigercrm/branches/5.0.1/modules/HelpDesk/EditView.php vtigercrm/branches/5.0.1/modules/Leads/EditView.php vtigercrm/branches/5.0.1/modules/Notes/EditView.php vtigercrm/branches/5.0.1/modules/Potentials/EditView.php vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php vtigercrm/branches/5.0.1/modules/Products/EditView.php vtigercrm/branches/5.0.1/modules/Vendors/EditView.php Modified: vtigercrm/branches/5.0.1/modules/Accounts/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/EditView.php Fri Oct 6 09:36:41 2006 @@ -95,7 +95,7 @@ $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",$app_strings['Account']); +$smarty->assign("SINGLE_MOD",'Account'); $smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']); $smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT'])); Modified: vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php Fri Oct 6 09:36:41 2006 @@ -47,7 +47,7 @@ $smarty->assign("OP_MODE",$disp_view); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Campaign']); +$smarty->assign("SINGLE_MOD",'Campaign'); $category = getParentTab(); Modified: vtigercrm/branches/5.0.1/modules/Contacts/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/EditView.php Fri Oct 6 09:36:41 2006 @@ -134,7 +134,7 @@ } $smarty->assign("ID", $focus->id); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Contact']); +$smarty->assign("SINGLE_MOD",'Contact'); if($focus->mode == 'edit') { Modified: vtigercrm/branches/5.0.1/modules/HelpDesk/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/HelpDesk/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/HelpDesk/EditView.php Fri Oct 6 09:36:41 2006 @@ -52,7 +52,7 @@ $smarty->assign("OP_MODE",$disp_view); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Ticket']); +$smarty->assign("SINGLE_MOD",'Ticket'); $category = getParentTab(); Modified: vtigercrm/branches/5.0.1/modules/Leads/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/EditView.php Fri Oct 6 09:36:41 2006 @@ -89,7 +89,7 @@ $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id()); $smarty->assign("ID", $focus->id); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Lead']); +$smarty->assign("SINGLE_MOD",'Lead'); $smarty->assign("HEADER", get_module_title("Leads", "{MOD.LBL_LEAD} ".$focus->firstname." ".$focus->lastname, true)); Modified: vtigercrm/branches/5.0.1/modules/Notes/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/EditView.php Fri Oct 6 09:36:41 2006 @@ -110,7 +110,7 @@ $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Note']); +$smarty->assign("SINGLE_MOD",'Note'); //Display the FCKEditor or not? -- configure $FCKEDITOR_DISPLAY in config.php $smarty->assign("FCKEDITOR_DISPLAY",$FCKEDITOR_DISPLAY); Modified: vtigercrm/branches/5.0.1/modules/Potentials/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/EditView.php Fri Oct 6 09:36:41 2006 @@ -119,7 +119,7 @@ $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",$app_strings['Potential']); +$smarty->assign("SINGLE_MOD",'Potential'); $tabid = getTabid("Potentials"); Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php Fri Oct 6 09:36:41 2006 @@ -50,7 +50,7 @@ $smarty->assign("OP_MODE",$disp_view); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['PriceBook']); +$smarty->assign("SINGLE_MOD",'PriceBook'); $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); Modified: vtigercrm/branches/5.0.1/modules/Products/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/EditView.php Fri Oct 6 09:36:41 2006 @@ -95,7 +95,7 @@ $smarty->assign("OP_MODE",$disp_view); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Product']); +$smarty->assign("SINGLE_MOD",'Product'); $smarty->assign("MOD", $mod_strings); Modified: vtigercrm/branches/5.0.1/modules/Vendors/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/EditView.php Fri Oct 6 09:36:41 2006 @@ -54,7 +54,7 @@ $smarty->assign("OP_MODE",$disp_view); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Vendor']); +$smarty->assign("SINGLE_MOD",'Vendor'); $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 11:53:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 15:53:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9580 - in /vtigercrm/branches/5.0.1/modules: Accounts/language/ Contacts/language/ CustomView/language/ Import/language/ Invoice/language/ Leads/language/ Products/language/ PurchaseOrder/language/ Quotes/language/ SalesOrder/language/ Vendors/language/ Message-ID: <20061006155357.5AF3476FF01@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 09:53:28 2006 New Revision: 9580 Log: * Modified all Po Box to PO Box Modified: vtigercrm/branches/5.0.1/modules/Accounts/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/Contacts/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/CustomView/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/Import/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/Invoice/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/Leads/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/Products/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/Quotes/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/SalesOrder/language/en_us.lang.php vtigercrm/branches/5.0.1/modules/Vendors/language/en_us.lang.php Modified: vtigercrm/branches/5.0.1/modules/Accounts/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -144,8 +144,8 @@ 'Created Time'=>'Created Time', 'Modified Time'=>'Modified Time', 'Description'=>'Description', -'Shipping Po Box'=>'Shipping Po Box', -'Billing Po Box'=>'Billing Po Box', +'Shipping Po Box'=>'Shipping PO Box', +'Billing Po Box'=>'Billing PO Box', //Added after 4.2 patch 2 'Email Opt Out'=>'Email Opt Out', Modified: vtigercrm/branches/5.0.1/modules/Contacts/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -168,8 +168,8 @@ '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', +'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', Modified: vtigercrm/branches/5.0.1/modules/CustomView/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/CustomView/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/CustomView/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -141,8 +141,8 @@ 'Email Opt Out'=>'Email Opt Out', 'Billing Address'=>'Billing Address', 'Shipping Address'=>'Shipping Address', -'Shipping Po Box'=>'Shipping Po Box', -'Billing Po Box'=>'Billing Po Box', +'Shipping Po Box'=>'Shipping PO Box', +'Billing Po Box'=>'Billing PO Box', 'Billing City'=>'Billing City', 'Shipping City'=>'Shipping City', 'Billing State'=>'Billing State', @@ -163,8 +163,8 @@ 'Do Not Call'=>'Do Not Call', 'Mailing Street'=>'Mailing Street', 'Other Street'=>'Other Street', -'Mailing Po Box'=>'Mailing Po Box', -'Other Po Box'=>'Other Po Box', +'Mailing Po Box'=>'Mailing PO Box', +'Other Po Box'=>'Other PO Box', 'Mailing City'=>'Mailing City', 'Other City'=>'Other City', 'Mailing State'=>'Mailing State', Modified: vtigercrm/branches/5.0.1/modules/Import/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -242,13 +242,13 @@ ,"assistant"=>"Assistant" ,"assistantphone"=>"Assistant Phone" ,"mailingstreet"=>"Mailing Address Street" - ,"mailingpobox"=>"Mailing Address Po Box" + ,"mailingpobox"=>"Mailing Address PO Box" ,"mailingcity"=>"Mailing Address City" ,"mailingstate"=>"Mailing Address State" ,"mailingzip"=>"Mailing Address Postalcode" ,"mailingcountry"=>"Mailing Address Country" ,"otherstreet"=>"Other Address Street" - ,"otherpobox"=>"Other Address Po Box" + ,"otherpobox"=>"Other Address PO Box" ,"othercity"=>"Other Address City" ,"otherstate"=>"Other Address State" ,"otherzip"=>"Other Address Postalcode" @@ -279,7 +279,7 @@ //"billing_address_street_2"=>"Billing Address Street 2", //"billing_address_street_3"=>"Billing Address Street 3", //"billing_address_street_4"=>"Billing Address Street 4", - "bill_pobox"=>"Billing Address Po Box", + "bill_pobox"=>"Billing Address PO Box", "bill_city"=>"Billing Address City", "bill_state"=>"Billing Address State", "bill_code"=>"Billing Address Postalcode", @@ -288,7 +288,7 @@ //"shipping_address_street_2"=>"Shipping Address Street 2", //"shipping_address_street_3"=>"Shipping Address Street 3", //"shipping_address_street_4"=>"Shipping Address Street 4", - "ship_pobox"=>"Shipping Address Po Box", + "ship_pobox"=>"Shipping Address PO Box", "ship_city"=>"Shipping Address City", "ship_state"=>"Shipping Address State", "ship_code"=>"Shipping Address Postalcode", @@ -334,7 +334,7 @@ "assigned_user_id"=>"Assigned To", "yahooid"=>"Yahoo Id", "lane"=>"Street", - "pobox"=>"Po Box", + "pobox"=>"PO Box", "code"=>"Postal Code", "city"=>"City", "country"=>"Country", Modified: vtigercrm/branches/5.0.1/modules/Invoice/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Invoice/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Invoice/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -138,8 +138,8 @@ 'Billing State'=>'Billing State', 'Billing Code'=>'Billing Postal Code', 'Billing Country'=>'Billing Country', -'Billing Po Box'=>'Billing Po Box', -'Shipping Po Box'=>'Shipping Po Box', +'Billing Po Box'=>'Billing PO Box', +'Shipping Po Box'=>'Shipping PO Box', 'Shipping City'=>'Shipping City', 'Shipping State'=>'Shipping State', 'Shipping Code'=>'Shipping Postal Code', Modified: vtigercrm/branches/5.0.1/modules/Leads/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -153,7 +153,7 @@ 'Country'=>'Country', 'State'=>'State', 'Description'=>'Description', -'Po Box'=>'Po Box', +'Po Box'=>'PO Box', 'Campaign Source'=>'Campaign Source', //Added for CustomView 4.2 Release 'Name'=>'Name', Modified: vtigercrm/branches/5.0.1/modules/Products/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -140,7 +140,7 @@ 'Postal Code'=>'Postal Code', 'Country'=>'Country', 'Description'=>'Description', -'Po Box'=>'Po Box', +'Po Box'=>'PO Box', //Mapping for price book 'Price Book Name'=>'Price Book Name', Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -134,8 +134,8 @@ 'Billing State'=>'Billing State', 'Billing Code'=>'Billing Postal Code', 'Billing Country'=>'Billing Country', -'Billing Po Box'=>'Billing Po Box', -'Shipping Po Box'=>'Shipping Po Box', +'Billing Po Box'=>'Billing PO Box', +'Shipping Po Box'=>'Shipping PO Box', 'Shipping City'=>'Shipping City', 'Shipping State'=>'Shipping State', 'Shipping Code'=>'Shipping Postal Code', Modified: vtigercrm/branches/5.0.1/modules/Quotes/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -134,8 +134,8 @@ 'Billing State'=>'Billing State', 'Billing Code'=>'Billing Postal Code', 'Billing Country'=>'Billing Country', -'Billing Po Box'=>'Billing Po Box', -'Shipping Po Box'=>'Shipping Po Box', +'Billing Po Box'=>'Billing PO Box', +'Shipping Po Box'=>'Shipping PO Box', 'Shipping City'=>'Shipping City', 'Shipping State'=>'Shipping State', 'Shipping Code'=>'Shipping Postal Code', Modified: vtigercrm/branches/5.0.1/modules/SalesOrder/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/SalesOrder/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/SalesOrder/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -135,8 +135,8 @@ 'Billing State'=>'Billing State', 'Billing Code'=>'Billing Postal Code', 'Billing Country'=>'Billing Country', -'Billing Po Box'=>'Billing Po Box', -'Shipping Po Box'=>'Shipping Po Box', +'Billing Po Box'=>'Billing PO Box', +'Shipping Po Box'=>'Shipping PO Box', 'Shipping City'=>'Shipping City', 'Shipping State'=>'Shipping State', 'Shipping Code'=>'Shipping Postal Code', Modified: vtigercrm/branches/5.0.1/modules/Vendors/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/language/en_us.lang.php Fri Oct 6 09:53:28 2006 @@ -32,7 +32,7 @@ 'Postal Code'=>'Postal Code', 'Country'=>'Country', 'Description'=>'Description', -'Po Box'=>'Po Box', +'Po Box'=>'PO Box', 'Vendor'=>'Vendor', //Added for existing Picklist entries From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 12:08:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 16:08:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9581 - in /vtigercrm/branches/5.0.1/modules/Calendar: calendarLayout.php language/en_us.lang.php Message-ID: <20061006160821.A24E666A86F@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 10:08:15 2006 New Revision: 9581 Log: * Fixed the i18n issue - ticket 2267 Modified: vtigercrm/branches/5.0.1/modules/Calendar/calendarLayout.php vtigercrm/branches/5.0.1/modules/Calendar/language/en_us.lang.php Modified: vtigercrm/branches/5.0.1/modules/Calendar/calendarLayout.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Calendar/calendarLayout.php (original) +++ vtigercrm/branches/5.0.1/modules/Calendar/calendarLayout.php Fri Oct 6 10:08:15 2006 @@ -245,7 +245,7 @@ "; $tabhtml .= "view."".$header['calendar']->date_time->get_date_str()."&viewOption=".$viewBox."&subtab=".$subtab."&parenttab=".$category."\");' src='".$header['IMAGE_PATH']."btnL3Calendar.gif' alt='".$mod_strings['LBL_OPENCAL']."...' title='".$mod_strings['LBL_OPENCAL']."...' align='absmiddle' border='0'>"; $tabhtml .= "view."".$header['calendar']->date_time->get_date_str()."&viewOption=".$viewBox."&subtab=".$subtab."&parenttab=".$category."\");' src='".$header['IMAGE_PATH']."tbarSettings.gif' alt='".$mod_strings['LBL_SETTINGS']."' title='".$mod_strings['LBL_SETTINGS']."' align='absmiddle' border='0'>"; - $tabhtml .= "".$app_strings[Calendar].""; + $tabhtml .= "".$app_strings['Calendar'].""; $tabhtml .= ""; echo $tabhtml; $cal_log->debug("Exiting get_cal_header_tab() method..."); @@ -1137,7 +1137,7 @@ $eventlayer .= ' '.$subject.' - '.$action_str.'('.$user.' | '.$eventstatus.' | '.$priority.') + '.$action_str.'('.$user.' | '.$mod_strings[$eventstatus].' | '.$mod_strings[$priority].') '; @@ -1309,7 +1309,7 @@ global $log; $Entries = Array(); $category = getParentTab(); - global $adb,$current_user,$mod_strings,$cal_log; + global $adb,$current_user,$mod_strings,$app_strings,$cal_log; require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); $cal_log->debug("Entering getEventList() method..."); @@ -1398,16 +1398,16 @@ $more_link = "[".$mod_strings['LBL_MORE']."...]"; $type = $adb->query_result($result,$i,"activitytype"); if($type == 'Call') - $image_tag = " ".$type; + $image_tag = " ".$app_strings['Call']; if($type == 'Meeting') - $image_tag = " ".$type; + $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['status'] = $adb->query_result($result,$i,"eventstatus"); + $element['status'] = $mod_strings[$adb->query_result($result,$i,"eventstatus")]; $assignedto = $adb->query_result($result,$i,"user_name"); if(!empty($assignedto)) $element['assignedto'] = $assignedto; Modified: vtigercrm/branches/5.0.1/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Calendar/language/en_us.lang.php Fri Oct 6 10:08:15 2006 @@ -400,9 +400,6 @@ 'Not Started'=>'Not Started', 'In Progress'=>'In Progress', 'Pending Input'=>'Pending Input', -'High'=>'High', -'Medium'=>'Medium', -'Low'=>'Low', 'LBL_REMAINDER_DAY'=>'days', 'LBL_REMAINDER_HRS'=>'hrs', From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 12:57:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 16:57:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9582 - in /vtigercrm/branches/5.0.1: Smarty/templates/AddMailAccount.tpl modules/Settings/language/en_us.lang.php Message-ID: <20061006165706.24357787DE6@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 10:56:58 2006 New Revision: 9582 Log: Mail server name corrected . Fixes #2218 Modified: vtigercrm/branches/5.0.1/Smarty/templates/AddMailAccount.tpl vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php Modified: vtigercrm/branches/5.0.1/Smarty/templates/AddMailAccount.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/AddMailAccount.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/AddMailAccount.tpl Fri Oct 6 10:56:58 2006 @@ -1,168 +1,168 @@ -{**} - - - - - - - - -
      -
      - {$MOD.LBL_MY_MAIL_SERVER_DET}
      -

      - - - - - - - - - -
      - - - - - - + +
      - - - - - - - -
       {$MOD.LBL_MY_MAIL_SERVER_DET}  
      -
      - - - - - - + + +
      - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {$MOD.LBL_EMAIL_ID}
      {$MOD.LBL_DISPLAY_NAME}{$MOD.LBL_NAME_EXAMPLE}
      {$APP.LBL_REQUIRED_SYMBOL} {$MOD.LBL_EMAIL_ADDRESS} {$MOD.LBL_EMAIL_EXAMPLE}
       
      {$MOD.LBL_MAIL_SERVER_SETTINGS}
      {$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_MAIL_SERVER_NAME} 
      {$APP.LBL_REQUIRED_SYMBOL}{$APP.LBL_LIST_USER_NAME} 
      {$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_LIST_PASSWORD} 
       
      {$MOD.LBL_MAIL_PROTOCOL} +{**} + + + + + + + + +
      +
      + {$MOD.LBL_MY_MAIL_SERVER_DET}
      +

      + + + + + + + + + +
      + + + + + + -
      + + + + + + + +
       {$MOD.LBL_MY_MAIL_SERVER_DET}  
      +
      + + + + + + - -
      + + + - - -
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {$MOD.LBL_EMAIL_ID}
      {$MOD.LBL_DISPLAY_NAME}{$MOD.LBL_NAME_EXAMPLE}
      {$APP.LBL_REQUIRED_SYMBOL} {$MOD.LBL_EMAIL_ADDRESS} {$MOD.LBL_EMAIL_EXAMPLE}
       
      {$MOD.LBL_INCOME_SERVER_SETTINGS}
      {$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_MAIL_SERVER_NAME} 
      {$APP.LBL_REQUIRED_SYMBOL}{$APP.LBL_LIST_USER_NAME} 
      {$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_LIST_PASSWORD} 
       
      {$MOD.LBL_MAIL_PROTOCOL} -  {$MOD.LBL_IMAP2} -  {$MOD.LBL_IMAP4} -  
      {$MOD.LBL_SSL_OPTIONS} -  {$MOD.LBL_NO_TLS} -   {$MOD.LBL_TLS}  
      {$MOD.LBL_CERT_VAL} -  {$MOD.LBL_VAL_SSL_CERT} -  {$MOD.LBL_DONOT_VAL_SSL_CERT} -  
      {$MOD.LBL_INT_MAILER} -  {$MOD.LBL_INT_MAILER_USE} -  {$MOD.LBL_INT_MAILER_NOUSE} -  
      {$MOD.LBL_REFRESH_TIMEOUT} - -  
      {$MOD.LBL_EMAILS_PER_PAGE} 
      {$MOD.LBL_MAIL_DISCLAIM}
       
      - -    -
       
      -
      -
      - -
      - -{$JAVASCRIPT} +  {$MOD.LBL_IMAP2} +  {$MOD.LBL_IMAP4} +
       
      {$MOD.LBL_SSL_OPTIONS} +  {$MOD.LBL_NO_TLS} +   {$MOD.LBL_TLS}  
      {$MOD.LBL_CERT_VAL} +  {$MOD.LBL_VAL_SSL_CERT} +  {$MOD.LBL_DONOT_VAL_SSL_CERT} +  
      {$MOD.LBL_INT_MAILER} +  {$MOD.LBL_INT_MAILER_USE} +  {$MOD.LBL_INT_MAILER_NOUSE} +  
      {$MOD.LBL_REFRESH_TIMEOUT} + +  
      {$MOD.LBL_EMAILS_PER_PAGE} 
      {$MOD.LBL_MAIL_DISCLAIM}
       
      + +    +
       
      +
      + + + + + + +{$JAVASCRIPT} Modified: vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php Fri Oct 6 10:56:58 2006 @@ -1,728 +1,729 @@ -'Settings', - -'LBL_MODULE_TITLE'=>'Settings: Home', - -'LBL_LIST_CONTACT_ROLE'=>'Role', - - - -'LBL_LIST_LAST_NAME'=>'Last Name', - -'LBL_FIRST_NAME'=>'First Name:', - -'LBL_LAST_NAME'=>'Last Name:', - -'LBL_PHONE'=>'Phone:', - -'LBL_EMAIL_ADDRESS'=>'Email', - -'LBL_TRANSCURR'=>'Transfer User currency to', - -'LBL_CURRDEL'=>'Currency to be Deleted', - -'LBL_NEW_FORM_TITLE'=>'New Contact', - -'LBL_NEW_CURRENCY'=>'New Currency', - -'LBL_VIEWING'=>'Viewing', - -'LBL_CURRENCY_NAME'=>'Currency Name', - -'LBL_CURRENCY_CODE'=>'Currency Code', - -'LBL_CURRENCY_SYMBOL'=>'Symbol', - -'LBL_CURRENCY_CRATE'=>'Conversion Rate', - -'LBL_CURRENCY_STATUS'=>'Status', - -'LBL_CURRENCY_TOOL'=>'Tools', - -'LBL_CURRENCY_LIST'=>'Currencies List', - - -'NTC_DELETE_CONFIRMATION'=>'Are you sure you want to delete this record?', - -'LEADCUSTOMFIELDS'=>'Lead Custom Fields', - -'ACCOUNTCUSTOMFIELDS'=>'Account Custom Fields', - -'CONTACTCUSTOMFIELDS'=>'Contact Custom Fields', - -'OPPORTUNITYCUSTOMFIELDS'=>'Potential Custom Fields', - -'HELPDESKCUSTOMFIELDS'=>'Helpdesk Custom Fields', - -'PRODUCTCUSTOMFIELDS'=>'Product Custom Fields', - -'VENDORCUSTOMFIELDS'=>'Vendor Custom Fields', - -'PRICEBOOKCUSTOMFIELDS'=>'PriceBook Custom Fields', - -'POCUSTOMFIELDS'=>'Purchase Order Custom Fields', -'SOCUSTOMFIELDS'=>'Sales Order Custom Fields', -'QUOTESCUSTOMFIELDS'=>'Quotes Custom Fields', -'INVOICECUSTOMFIELDS'=>'Invoice Custom Fields', - -'EDITLEADPICKLISTVALUES'=>'Edit Lead Picklist ', - -'EDITACCOUNTPICKLISTVALUES'=>'Edit Account Picklist ', - -'EDITCONTACTPICKLISTVALUES'=>'Edit Contact Picklist ', - -'EDITOPPORTUNITYPICKLISTVALUES'=>'Edit Potential Picklist ', - -'EDITHELPDESKPICKLISTVALUES'=>'Edit HelpDesk Picklist ', - -'EDITPRODUCTPICKLISTVALUES'=>'Edit Product Picklist ', - -'EDITEVENTPICKLISTVALUES'=>'Edit Event Picklist ', - -'EDITTASKPICKLISTVALUES'=>'Edit Task Picklist ', - -'EDITRSSPICKLISTVALUES'=>'Edit Rss Picklist', -'EDITVENDORPICKLISTVALUES'=>'Edit Vendor Picklist', -'EDITPBPICKLISTVALUES'=>'Edit PriceBook Picklist', -'EDITPOPICKLISTVALUES'=>'Edit Purchase Order Picklist', -'EDITSOPICKLISTVALUES'=>'Edit Sales Order Picklist', -'EDITQUOTEPICKLISTVALUES'=>'Edit Quote Picklist', -'EDITINVOICEPICKLISTVALUES'=>'Edit Invoice Picklist', - - -// Added for Release vtigerCRM 3.2 PATCH 1.0 - -//Settings/index.php - -'LBL_CUSTOM_FIELD_SETTINGS'=>'Custom Field Settings:', - -'LBL_PICKLIST_FIELD_SETTINGS'=>'Picklist Field Settings:', - - - -//SETTINGS/CustomFieldList.php,ComboFieldList.php,CreateCustomField.php - -'Leads'=>'Lead', - -'Accounts'=>'Account', - -'Contacts'=>'Contact', - -'Potentials'=>'Potential', - -'HelpDesk'=>'HelpDesk', - -'Products'=>'Product', - -'Events'=>'Event', - -'Activities'=>'Task', - - - - - -'CustomFields'=>' Custom Fields', - -'NewCustomField'=>'New Custom Field', - -'NewCustomFieldAltC'=>'New Custom Field [Alt+c]:', - -'FieldName'=>'Field Name', - -'FieldType'=>'Field Type', - -'FieldLabel'=>'Field Label', - -'Delete'=>'Del', - -'NEW'=>'New', - -'CUSTOMFIELD'=>'Custom Field', - -'LBL_CUSTOM_FIELDS'=>'Custom Fields', - -'LBL_ADD_FIELD'=>'Create Custom Field', - -'LBL_CUSTM_MSG'=>'allows you to ....', - -'PicklistFields'=>' Picklist Fields', - -'LBL_PICKLIST_EDITOR'=>'Picklist Editor', - -'Edit'=>'Edit', - -'LBL_EDIT_FIELD_TYPE'=>'Edit Field Type', - -//Settings/CustomField.html - -'LBL_PROVIDE_FIELD_INFORMATION'=>'Provide Field Information: ', - -'LBL_SELECT_FIELD_TYPE'=>'Select Field Type: ', - -'LBL_PROVIDE_FIELD_DETAILS'=>'Provide Field Details: ', - -'LBL_LABEL'=>'Label: ', - -'LBL_LENGTH'=>'Length: ', - -'LBL_DECIMAL_PLACES'=>'Decimal Places: ', - -'LBL_PICK_LIST_VALUES'=>'Pick list Values: ', - - - -//Settings/EditComboField.php - -'EditPickListValues'=>'Picklist Edit ', - - - -//Settings/EditField.html - -'LBL_FIELD_INFORMATION'=>'Field Information:', - -'Values'=>'Values', - -'EnterListOfValues'=>'Please enter the list of values below. Each value should be in its own line.', - - - -//Settings/fieldtypes.php - -'Text'=>'Text', - -'Number'=>'Number', - -'Percent'=>'Percent', - -'Currency'=>'Currency', - -'Date'=>'Date', - -'Email'=>'Email', - -'Phone'=>'Phone', - -'PickList'=>'Pick List', - -'LBL_MULTISELECT_COMBO'=>'Multi-Select Combo Box', - - - -//added for patch2 - -'USERGROUPLIST'=>'Groups', - -'EMAILTEMPLATES'=>'E-mail Templates', - -'WORDINTEGRATION'=>'Mail Merge Templates', - -'LBL_MAIL_MERGE'=>'Mail Merge', - -'NOTIFICATIONSCHEDULERS'=>'Notification Schedulers', -//currency status -'LBL_ACTIVE'=>'Active', - -'LBL_INACTIVE'=>'Inactive', - -'LBL_NOTIFICATION'=>'Notification', -'LBL_DESCRIPTION'=>'Description', -'LBL_TOOL'=>'Tool', - - -//Added fields for Title Informations -- after 4 Beta - -'LBL_EMAIL_CONFIG'=>'Outgoing Mail Server Configuration', - -'LBL_WORD_INTEGRATION'=>'Word Integration:', - -'LBL_GROUP_SETTINGS'=>'Group Settings:', - -'LBL_TEMPLATE_SETTINGS'=>'Template Settings:', - -'LBL_NOTIFICATION_SETTINGS'=>'Notification Settings:', - -'LBL_EMAIL_SETTINGS'=>'Email Settings:', - -'LBL_SECURITY_SETTINGS'=>'Security Settings:', - - - -//Added fields after RC1 - Release - -'LBL_MAIL_SERVER_INFO'=>'Outgoing Mail Server Information', - -'LBL_OUTGOING_MAIL_SERVER'=>'Server Name', - -'LBL_OUTGOING_MAIL_SERVER_LOGIN_USER_NAME'=>'Outgoing Mail Server Login User Name', - -'LBL_OUTGOING_MAIL_SERVER_PASSWORD'=>'Outgoing Mail Server Password', - -'LBL_MAIL_SERVER_SMTP'=>'Mail Server Settings (SMTP)', - -'LBL_BACKUP_SERVER_CONFIG'=>'Backup Server Configuration', - -'LBL_SERVER_ADDRESS'=>'Server Address', - -'LBL_FTP_SERVER_NAME'=>'FTP Server Name', - -'LBL_FTP_USER_NAME'=>'FTP User Name', - -'LBL_FTP_PASSWORD'=>'FTP Password', - -'LBL_FTP'=>'FTP', - -'LBL_SYSTEM_CONFIG'=>'System Configuration', -'LBL_SYSTEM_INFO'=>'System Details', -'LBL_PROXY_SETTINGS'=>'Proxy Server', -'LBL_AUDIT_TRAIL'=>'Audit Trails', -'LBL_ENABLE_AUDIT_TRAIL'=>'Enable Audit Trail', -'LBL_USER_AUDIT'=>'Select User', -'LBL_VIEW_AUDIT_TRAIL'=>'View Audit Trail', -'LBL_AUDIT_TRAIL_DESC'=>'Display Audit Trail of Users who access CRM', -'LBL_NO_DATA'=>'No Data', - -'LBL_CURRENCY_CONFIGURATION'=>'- Currency Information', - -'LBL_CURRENCY_CONFIG'=>'Currency Configuration', - -'LBL_CURRENCY_INFO'=>'Currency Information', - -'LBL_CURRENCY_TITLE'=>'Currency', - -'LBL_CURRENCY_SETTINGS'=>'Currencies', - -'LBL_YES'=>'yes', -'LBL_NO'=>'no', - -'LBL_USERNAME'=>'User Name', -'LBL_PASWRD'=>'Password', -'LBL_REQUIRES_AUTHENT'=>'Requires Authentication?', - -//Fields for Settings - -'LBL_USER_MANAGEMENT'=>'Users & Access Management', - -'LBL_USERS'=>'Users', - -'LBL_USERS_LIST'=>'Users List', -'LBL_GROUP_LIST'=>'Groups List', - -'LBL_CREATE_AND_MANAGE_USERS'=>'- Create and Manage Users (e.g., admin)', - -'LBL_ROLES'=>'Roles', - -'LBL_CREATE_AND_MANAGE_USER_ROLES'=>'- Create and Manage user roles (e.g., Administrator, Standard User, etc.)', - -'LBL_PROFILES'=>'Profiles', - -'LBL_PROFILES_LIST'=>'Profiles List', - -'LBL_CREATE_AND_MANAGE_USER_PROFILES'=>'- Create and Manage user profiles (e.g., CEO, Sales Manager, etc.)', - -'LBL_CREATE_AND_MANAGE_USER_GROUPS'=>'- Create and Manage user groups', - -'LBL_SHARING_ACCESS'=>'Sharing Access', - -'LBL_FIELDS_ACCESS'=>'Fields Access', - -'LBL_DEFAULT_ORGANIZATION_FIELDS'=>'Default Organization Fields Access', - -'LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS'=>' - Setting Default Field Access within the Organization', - -'LBL_SETTING_DEFAULT_SHARING_ACCESS'=>'- Setting Default Sharing Access within the Organization', - -'LBL_FIELD_ACCESSIBILITY'=>'Field Accessibility', - -'LBL_SETTING_FIELD_ACCESSIBILITY'=>' - Setting Field Accessibility for each profiles', -//<<<<<<<>>>>> -'LBL_FIELD_ORDERING_DESC'=>' - Edit Field Order', - -'LBL_FIELD_ORDERING'=>'Edit Field Blocks', -//<<<<<<<<<>>>>>>>>>>>> -'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_DELETE_DEMO_DATA'=>'Delete Demo Data', - -'LBL_DELETE_DEMO_DATA_INFO'=>'- Delete the Demo Data which is created at the time of installation', - - - -'LBL_STUDIO'=>'Studio', - -'LBL_CUSTOM_FIELD_SETTINGS'=>'Custom Field Settings', - -'LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS'=>'Manage your company-wide custom fields.', - -'LBL_SELECT_MODULE'=>'Select Module', - -'LBL_SELECT_CF_TEXT'=>'Select Module:', - - - -'LBL_PICKLIST_SETTINGS'=>'Picklist Settings', - -'LBL_EDIT_PICKLIST_VALUES'=>' - Edit values of Picklist fields', - -'LBL_EDIT'=>'Editing', - -'LBL_COMMUNICATION_TEMPLATES'=>'Communication Templates', - -'LBL_CREATE_EMAIL_TEMPLATES'=>'New Email Template', - -'LBL_UPLOAD_MSWORD_TEMPLATES'=>' - Upload MS Word Templates for Mail Merge', - -'LBL_SCHEDULE_EMAIL_NOTIFICATION'=>' - Schedule Email Notifications', - -'LBL_EXPAND_CLOSE_MENU'=>'Expand/Close Menu', - -'LBL_CONFIGURATION'=>'Configuration', - -'LBL_CONFIGURE_MAIL_SERVER'=>' - Configure Outgoing Mail Server', - -'LBL_BACKUP_SERVER_CONFIGURATION'=>'Backup Server Configuration', - -'LBL_BACKUP_SERVER_INFO'=>'Backup Server Information', - -'LBL_BACKUP_SERVER_SETTINGS'=>'Backup Server', - -'LBL_CONFIGURE_BACKUP_SERVER'=>' - Configure Backup Server', - -'LBL_SYSTEM_CONFIGURATION'=>' - System Configuration', - -'LBL_PROXY_SERVER_CONFIGURATION'=>'Proxy Server Configuration', - -'LBL_PROXY_SERVER_INFO'=>'Proxy Server Information', - -'LBL_PROXY_SERVER_SETTINGS'=>'Proxy Server', - -'LBL_CONFIGURE_PROXY_SERVER'=>' - Configure Proxy Server', - -'LBL_PROXY_PORT'=>'Port Number', - - - -//Field Types for custom fields - -'LBL_URL'=>'URL', - -'LBL_CHECK_BOX'=>'Checkbox', - - - -//PickList Settings - -'LBL_STANDARD_FIELDS'=>'Standard Fields', - -'LBL_LEAD_SOURCE'=>'Lead Source', - -'LBL_SALUTATION'=>'Salutation', - -'LBL_LEAD_STATUS'=>'Lead Status', - -'LBL_INDUSTRY'=>'Industry', - -'LBL_RATING'=>'Rating', - -'LBL_ACCOUNT_TYPE'=>'Account Type', - -'LBL_BUSINESS_TYPE'=>'Business Type', - -'LBL_CURRENCY_TYPE'=>'Currency Type', - -'LBL_SALES_STAGE'=>'Sales Stage', - -'LBL_PRIORITY'=>'Priority', - -'LBL_STATUS'=>'Status', - -'LBL_CATEGORY'=>'Ticket Category', - -'LBL_MANUFACTURER'=>'Manufacturer', - -'LBL_PRODUCT_CATEGORY'=>'Product Category', - -'LBL_RSS_CATEGORY'=>'Rss Category', - -//Added for Web based Email client integration (post 4.0.1 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_MAIL_SERVER_SETTINGS'=>'Outgoing 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_USAGEUNIT'=>'Usage Unit', -'LBL_GLACCT'=>'GL Account', -'LBL_QUOTE_STAGE'=>'Quote Stage', -'LBL_CARRIER'=>'Carrier', -'LBL_TAXCLASS'=>'Tax Class', -'LBL_MY_DETAILS'=>'My Details', -'LBL_MY_MAIL_SERVER_DET'=>'My Incoming Mail Server Details', -'LBL_EMAIL_ID'=>'Email ID', -'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'=>'Emails per Page', - -//Added for Organization Details (4.2 release) -'LBL_ORGANIZATION_NAME'=>'Company Name', -'LBL_ORGANIZATION_ADDRESS'=>'Address', -'LBL_ORGANIZATION_CITY'=>'City', -'LBL_ORGANIZATION_STATE'=>'State', -'LBL_ORGANIZATION_CODE'=>'Postal Code', -'LBL_ORGANIZATION_COUNTRY'=>'Country', -'LBL_ORGANIZATION_PHONE'=>'Phone', -'LBL_ORGANIZATION_FAX'=>'Fax', -'LBL_ORGANIZATION_WEBSITE'=>'Website', -'LBL_ORGANIZATION_DETAILS'=>'Company Information', -'LBL_SPECIFY_COMPANY_DETAILS'=>' - Specify Company Information', -'LBL_ORGANIZATION_LOGO'=>'Company Logo', -'LBL_UPLOAD'=>'Upload', -'LBL_FILENAME'=>'File Name', -'LBL_SETTINGS'=>'Settings', -'LBL_COMPANY_DETAILS'=>'Company Details', - -'LBL_SEVERITY'=>'Severity', -'LBL_FAQ_CATEGORY'=>'FAQ Category', -'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', -'INVENTORYNOTIFICATION'=>'Inventory Notifications', -'LBL_INVENTORY_NOTIFICATIONS'=>' - Edit Inventory Email Notifications', -'INVENTORYTERMSANDCONDITIONS'=>'Inventory : Terms & Conditions',//newly added for Inventory terms and conditions -'LBL_INVENTORY_TERMSANDCONDITIONS'=>' - Edit Terms & Conditions',//newly added -'LBL_TANDC_TEXT'=>'Terms & Conditions Text', -'LBL_INVENTORY_TANDC'=>'Inventory Terms & Conditions', - -'LBL_OTHER_SETTINGS'=>'Other Settings', -'LBL_SCROLL'=>'[Scroll to Top]', - -'LBL_INV_NOT_DESC'=>'The following is 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', -'Vendor'=>'Vendor', -'PriceBook'=>'PriceBook', -'Quotes'=>'Quote', -'PurchaseOrder'=>'Purchase Order', -'SalesOrder'=>'SalesOrder', -'Invoice'=>'Invoice', - -//For Custom Fields -'LBL_LEAD_MAP_CUSTOM_FIELD'=>'Mapping Lead Custom Fields', -'leadCustomFieldDescription'=>'Map each of your organizations lead custom fields to each of your custom account -,contact, or potential fields. These mappings will be used when you convert leads', -'LBL_MAPPING_INFO'=>'Mapping Information', -'LBL_ACCOUNT_FIELD'=>'Account Custom Field', -'LBL_CONTACT_FIELD'=>'Contact Custom Field', -'LBL_POTENTIAL_FIELD'=>'Potential Custom Field', -'CUSTOMFIELDMAPPING'=>'Custom Field Mapping', -'LBL_FIELD_MAPPING'=>'Field Mapping', -'LBL_LEAD_FIELD'=>'Lead Custom Field', -//After 4.2 GA -'LBL_TEXT_AREA'=>'Text Area', -//for Edit ordering the blocks -'NOTESCUSTOMFIELDS'=>'Notes Custom Fields', - -//Added fields after 4.2 ptach 2 -'LBL_ASSIGN_MODULE_OWNERS'=>'Assign Module Owners', -'LBL_MODULE_OWNERS'=>'Module Owners', -'LBL_ASSIGN_MODULE_OWNERS_INFO'=>' - Assign Owners for each modules', -'LBL_MODULE'=>'CRM Module', -'LBL_OWNER'=>'Assigned Owner', -'LBL_MIGRATION'=>'Migration Wizard', -'LBL_MIGRATION_INFO'=>'Migrate vtiger CRM data from Version 4.2.3 to 5.0.0', - -//Added for 5 GA - Description of Settings UI - -'LBL_USER_DESCRIPTION'=>'Manage users who can access vtiger CRM', -'LBL_ROLE_DESCRIPTION'=>'Set up hierarchy of roles and assign to the users', -'LBL_PROFILE_DESCRIPTION'=>'Manage user-specific modules access to different Roles', -'LBL_GROUP_DESCRIPTION'=>'Manage different types of teams based on roles, users, and profiles', -'LBL_SHARING_ACCESS_DESCRIPTION'=>'Manage module sharing rules & custom sharing rules', -'LBL_SHARING_FIELDS_DESCRIPTION'=>'Define global field-level access in each module', -'LBL_MODULE_OWNERS_DESCRIPTION'=>'Assign Customer Support owners to CRM module', -'LBL_ANNOUNCEMENT_DESCRIPTION'=>'Manage company wide announcements', -'LBL_CUSTOM_FIELDS_DESCRIPTION'=>'Manage different types of user-defined fields', -'LBL_PICKLIST_DESCRIPTION'=>'Customize Picklist values in each module', -'LBL_EMAIL_TEMPLATE_DESCRIPTION'=>'Manage templates for E-Mail module', -'LBL_MAIL_MERGE_DESCRIPTION'=>'Manage templates for Mail Merging', -'LBL_NOTIF_SCHED_DESCRIPTION'=>'Manage Notifications that will alert in case of important actions', -'LBL_INV_NOTIF_DESCRIPTION'=>'Change Settings of Inventory related Notifications', -'LBL_INV_TANDC_DESCRIPTION'=>'Specify Terms and Conditions for quotes, orders, and invoices', -'LBL_COMPANY_DESCRIPTION'=>'Specify business address of company', -'LBL_MAIL_SERVER_DESCRIPTION'=>'Configure Outgoing Mail Server details', -'LBL_BACKUP_SERVER_DESCRIPTION'=>'Specify database backup server details', -'LBL_CURRENCY_DESCRIPTION'=>'Manage international currencies and exchange rates', -'LBL_TAX_DESCRIPTION'=>'Manage taxes and the corresponding tax rates', -'LBL_SYSTEM_DESCRIPTION'=>'View vtiger CRM Server details', -'LBL_PROXY_DESCRIPTION'=>'Configure proxies to access RSS feeds through Internet', -'LBL_AUDIT_DESCRIPTION'=>'Display data opertions performed by users', -'LBL_TAX_DESC'=>'Manage different types of tax rates for taxes, such as Sales Tax, VAT etc.,', -'LBL_COMPANY_DESC'=>'Specify business address of your company', -'LBL_SELECT_LOGO'=>'Select new logo:', -'LBL_INVEN_TANDC_DESC'=>'Specify text for the Terms & Conditions section of Quotes, Orders, and Invoices modules', -'LBL_MAIL_SERVER_DESC'=>'Configure your Outgoing Mail Server details', -'LBL_BACKUP_SERVER_DESC'=>'Manage your Backup Server', -'LBL_MODULES_AND_OWNERS'=>'Modules & Owners', -'LBL_GROUP_DESC'=>'Manage different types of user groups within your organization', -'LBL_MAIL_MERGE_DESC'=>'Manage Mail Merge templates used in CRM modules', - - -//Added fields after 5.0 Alpha -'LBL_REQUIRE_SMTP_AUTHENTICATION'=>'Require SMTP Authentication?', -'LBL_ANNOUNCEMENT'=>'Announcements', -'LBL_SETTING_ANNOUNCEMENT'=>'Announcement', -'LBL_ANNOUNCE_TEXT'=>'Announcement Text', -'LBL_UPDATE_BUTTON'=>'Update', -'LBL_ANNOUNCEMENT_INFO'=>'Type the announcement text below, and click the Update button.', -'LBL_ANNOUNCEMENT_DESC'=>'Change the text that appears in the announcement display on top of each page', -'LBL_EMAIL_CONTENTS'=>'Email Contents', -'LBL_SUBJECT'=>'Subject', -'LBL_MESSAGE'=>'Message', -'LBL_PICKLIST_EDITOR'=>'Picklist Editor', -'LBL_PICKLIST_AVAIL'=>'Picklists Available in', -'LBL_PICKLIST_AVAILINFO1'=>'The picklists available in', -'LBL_PICKLIST_AVAILINFO2'=>'are shown below. Click Edit to modify the contents of the list.', -'LBL_EDIT_PICKLIST'=>'Edit Pick List', -'LBL_PICKLIST_SAVEINFO'=>'Type the entries one - by - one below and click the Save button to save the list.', -'LBL_SELECT_CRM_MODULE'=>'Select CRM Module', -'LBL_TAX_SETTINGS'=>'Tax Calculations', -'LBL_INVENTORY_TAX_CONFIG'=>'Inventory Tax Configuration', -'LBL_CUSTOM_MAPP_INFO'=>'Only in Leads module you can map the fields with Accounts, Contacts, and Potentials.', -'LBL_MAPPING_OTHER_MODULES'=>'Mapping with other Modules', -'LBL_CUSTOM_FILED_IN'=>'Custom Fields in ', -'LBL_ROLE_HIERARCHY_TREE'=>'Roles & Hierarchy Tree', -'LBL_EDIT_FIELD_MAPPING'=>'Editing Field Mapping', -'LBL_LOGIN_HISTORY_DETAILS'=>'User Login History', -'LBL_LOGIN_HISTORY_DESCRIPTION'=>'Display login history of users', -'LBL_NON_EDITABLE_PICKLIST_ENTRIES'=>'Non Editable Picklist Entries', - -//Added for Tax settings -'LBL_PRODUCT_TAX_SETTINGS'=>'Product & Service Taxes', -'LBL_SHIPPING_HANDLING_TAX_SETTINGS'=>'Shipping & Handling Taxes', -'LBL_PROXY_SERVER_DESC'=>'Configure proxies to access RSS feeds through Internet', - -'LBL_NEW_CURRENCTY'=>'New Currency', -'LBL_BASE_CURRENCY'=>'Base Currency - ', -'LBL_DELETE_CURRENCY'=>'Delete Currency', - -//Added for singlepane view in modules - -'LBL_DEFAULT_DETAIL_VIEW'=>'Default Detail View', -'LBL_DEFAULT_MODULE_VIEW'=>'Default Module View', -'LBL_DEFAULT_MODULE_VIEW_DESC'=>'Set Default Detail View for All Modules', -'LBL_ENABLE_SINGLEPANE_VIEW'=>'Enable Singlepane View', - -'LBL_CLEAR_DATA'=>'Clear Data', -'LBL_LENGTHALERT'=>'Sorry, you can cannot map fields with different character size. Kindly map the data with same or more character size.', -'LBL_DECIMALALERT'=>'Sorry, you can cannot map fields with different decimal places. Kindly map the data with same or more decimal places.', -'LBL_TYPEALERT_1'=>'Sorry, you cannot map the', -'LBL_WITH'=>'with', -'LBL_TYPEALERT_2'=>'data type. Kindly map the same data types.', -'LBL_ENABLE'=>'Enable', -'LBL_FAQ_FIELD_ACCESS'=>'Faq Field Access', -'LBL_ADD_TAX_BUTTON'=>'Add Tax', -); - - -?> +'Settings', + +'LBL_MODULE_TITLE'=>'Settings: Home', + +'LBL_LIST_CONTACT_ROLE'=>'Role', + + + +'LBL_LIST_LAST_NAME'=>'Last Name', + +'LBL_FIRST_NAME'=>'First Name:', + +'LBL_LAST_NAME'=>'Last Name:', + +'LBL_PHONE'=>'Phone:', + +'LBL_EMAIL_ADDRESS'=>'Email', + +'LBL_TRANSCURR'=>'Transfer User currency to', + +'LBL_CURRDEL'=>'Currency to be Deleted', + +'LBL_NEW_FORM_TITLE'=>'New Contact', + +'LBL_NEW_CURRENCY'=>'New Currency', + +'LBL_VIEWING'=>'Viewing', + +'LBL_CURRENCY_NAME'=>'Currency Name', + +'LBL_CURRENCY_CODE'=>'Currency Code', + +'LBL_CURRENCY_SYMBOL'=>'Symbol', + +'LBL_CURRENCY_CRATE'=>'Conversion Rate', + +'LBL_CURRENCY_STATUS'=>'Status', + +'LBL_CURRENCY_TOOL'=>'Tools', + +'LBL_CURRENCY_LIST'=>'Currencies List', + + +'NTC_DELETE_CONFIRMATION'=>'Are you sure you want to delete this record?', + +'LEADCUSTOMFIELDS'=>'Lead Custom Fields', + +'ACCOUNTCUSTOMFIELDS'=>'Account Custom Fields', + +'CONTACTCUSTOMFIELDS'=>'Contact Custom Fields', + +'OPPORTUNITYCUSTOMFIELDS'=>'Potential Custom Fields', + +'HELPDESKCUSTOMFIELDS'=>'Helpdesk Custom Fields', + +'PRODUCTCUSTOMFIELDS'=>'Product Custom Fields', + +'VENDORCUSTOMFIELDS'=>'Vendor Custom Fields', + +'PRICEBOOKCUSTOMFIELDS'=>'PriceBook Custom Fields', + +'POCUSTOMFIELDS'=>'Purchase Order Custom Fields', +'SOCUSTOMFIELDS'=>'Sales Order Custom Fields', +'QUOTESCUSTOMFIELDS'=>'Quotes Custom Fields', +'INVOICECUSTOMFIELDS'=>'Invoice Custom Fields', + +'EDITLEADPICKLISTVALUES'=>'Edit Lead Picklist ', + +'EDITACCOUNTPICKLISTVALUES'=>'Edit Account Picklist ', + +'EDITCONTACTPICKLISTVALUES'=>'Edit Contact Picklist ', + +'EDITOPPORTUNITYPICKLISTVALUES'=>'Edit Potential Picklist ', + +'EDITHELPDESKPICKLISTVALUES'=>'Edit HelpDesk Picklist ', + +'EDITPRODUCTPICKLISTVALUES'=>'Edit Product Picklist ', + +'EDITEVENTPICKLISTVALUES'=>'Edit Event Picklist ', + +'EDITTASKPICKLISTVALUES'=>'Edit Task Picklist ', + +'EDITRSSPICKLISTVALUES'=>'Edit Rss Picklist', +'EDITVENDORPICKLISTVALUES'=>'Edit Vendor Picklist', +'EDITPBPICKLISTVALUES'=>'Edit PriceBook Picklist', +'EDITPOPICKLISTVALUES'=>'Edit Purchase Order Picklist', +'EDITSOPICKLISTVALUES'=>'Edit Sales Order Picklist', +'EDITQUOTEPICKLISTVALUES'=>'Edit Quote Picklist', +'EDITINVOICEPICKLISTVALUES'=>'Edit Invoice Picklist', + + +// Added for Release vtigerCRM 3.2 PATCH 1.0 + +//Settings/index.php + +'LBL_CUSTOM_FIELD_SETTINGS'=>'Custom Field Settings:', + +'LBL_PICKLIST_FIELD_SETTINGS'=>'Picklist Field Settings:', + + + +//SETTINGS/CustomFieldList.php,ComboFieldList.php,CreateCustomField.php + +'Leads'=>'Lead', + +'Accounts'=>'Account', + +'Contacts'=>'Contact', + +'Potentials'=>'Potential', + +'HelpDesk'=>'HelpDesk', + +'Products'=>'Product', + +'Events'=>'Event', + +'Activities'=>'Task', + + + + + +'CustomFields'=>' Custom Fields', + +'NewCustomField'=>'New Custom Field', + +'NewCustomFieldAltC'=>'New Custom Field [Alt+c]:', + +'FieldName'=>'Field Name', + +'FieldType'=>'Field Type', + +'FieldLabel'=>'Field Label', + +'Delete'=>'Del', + +'NEW'=>'New', + +'CUSTOMFIELD'=>'Custom Field', + +'LBL_CUSTOM_FIELDS'=>'Custom Fields', + +'LBL_ADD_FIELD'=>'Create Custom Field', + +'LBL_CUSTM_MSG'=>'allows you to ....', + +'PicklistFields'=>' Picklist Fields', + +'LBL_PICKLIST_EDITOR'=>'Picklist Editor', + +'Edit'=>'Edit', + +'LBL_EDIT_FIELD_TYPE'=>'Edit Field Type', + +//Settings/CustomField.html + +'LBL_PROVIDE_FIELD_INFORMATION'=>'Provide Field Information: ', + +'LBL_SELECT_FIELD_TYPE'=>'Select Field Type: ', + +'LBL_PROVIDE_FIELD_DETAILS'=>'Provide Field Details: ', + +'LBL_LABEL'=>'Label: ', + +'LBL_LENGTH'=>'Length: ', + +'LBL_DECIMAL_PLACES'=>'Decimal Places: ', + +'LBL_PICK_LIST_VALUES'=>'Pick list Values: ', + + + +//Settings/EditComboField.php + +'EditPickListValues'=>'Picklist Edit ', + + + +//Settings/EditField.html + +'LBL_FIELD_INFORMATION'=>'Field Information:', + +'Values'=>'Values', + +'EnterListOfValues'=>'Please enter the list of values below. Each value should be in its own line.', + + + +//Settings/fieldtypes.php + +'Text'=>'Text', + +'Number'=>'Number', + +'Percent'=>'Percent', + +'Currency'=>'Currency', + +'Date'=>'Date', + +'Email'=>'Email', + +'Phone'=>'Phone', + +'PickList'=>'Pick List', + +'LBL_MULTISELECT_COMBO'=>'Multi-Select Combo Box', + + + +//added for patch2 + +'USERGROUPLIST'=>'Groups', + +'EMAILTEMPLATES'=>'E-mail Templates', + +'WORDINTEGRATION'=>'Mail Merge Templates', + +'LBL_MAIL_MERGE'=>'Mail Merge', + +'NOTIFICATIONSCHEDULERS'=>'Notification Schedulers', +//currency status +'LBL_ACTIVE'=>'Active', + +'LBL_INACTIVE'=>'Inactive', + +'LBL_NOTIFICATION'=>'Notification', +'LBL_DESCRIPTION'=>'Description', +'LBL_TOOL'=>'Tool', + + +//Added fields for Title Informations -- after 4 Beta + +'LBL_EMAIL_CONFIG'=>'Outgoing Mail Server Configuration', + +'LBL_WORD_INTEGRATION'=>'Word Integration:', + +'LBL_GROUP_SETTINGS'=>'Group Settings:', + +'LBL_TEMPLATE_SETTINGS'=>'Template Settings:', + +'LBL_NOTIFICATION_SETTINGS'=>'Notification Settings:', + +'LBL_EMAIL_SETTINGS'=>'Email Settings:', + +'LBL_SECURITY_SETTINGS'=>'Security Settings:', + + + +//Added fields after RC1 - Release + +'LBL_MAIL_SERVER_INFO'=>'Outgoing Mail Server Information', + +'LBL_OUTGOING_MAIL_SERVER'=>'Server Name', + +'LBL_OUTGOING_MAIL_SERVER_LOGIN_USER_NAME'=>'Outgoing Mail Server Login User Name', + +'LBL_OUTGOING_MAIL_SERVER_PASSWORD'=>'Outgoing Mail Server Password', + +'LBL_MAIL_SERVER_SMTP'=>'Mail Server Settings (SMTP)', + +'LBL_BACKUP_SERVER_CONFIG'=>'Backup Server Configuration', + +'LBL_SERVER_ADDRESS'=>'Server Address', + +'LBL_FTP_SERVER_NAME'=>'FTP Server Name', + +'LBL_FTP_USER_NAME'=>'FTP User Name', + +'LBL_FTP_PASSWORD'=>'FTP Password', + +'LBL_FTP'=>'FTP', + +'LBL_SYSTEM_CONFIG'=>'System Configuration', +'LBL_SYSTEM_INFO'=>'System Details', +'LBL_PROXY_SETTINGS'=>'Proxy Server', +'LBL_AUDIT_TRAIL'=>'Audit Trails', +'LBL_ENABLE_AUDIT_TRAIL'=>'Enable Audit Trail', +'LBL_USER_AUDIT'=>'Select User', +'LBL_VIEW_AUDIT_TRAIL'=>'View Audit Trail', +'LBL_AUDIT_TRAIL_DESC'=>'Display Audit Trail of Users who access CRM', +'LBL_NO_DATA'=>'No Data', + +'LBL_CURRENCY_CONFIGURATION'=>'- Currency Information', + +'LBL_CURRENCY_CONFIG'=>'Currency Configuration', + +'LBL_CURRENCY_INFO'=>'Currency Information', + +'LBL_CURRENCY_TITLE'=>'Currency', + +'LBL_CURRENCY_SETTINGS'=>'Currencies', + +'LBL_YES'=>'yes', +'LBL_NO'=>'no', + +'LBL_USERNAME'=>'User Name', +'LBL_PASWRD'=>'Password', +'LBL_REQUIRES_AUTHENT'=>'Requires Authentication?', + +//Fields for Settings + +'LBL_USER_MANAGEMENT'=>'Users & Access Management', + +'LBL_USERS'=>'Users', + +'LBL_USERS_LIST'=>'Users List', +'LBL_GROUP_LIST'=>'Groups List', + +'LBL_CREATE_AND_MANAGE_USERS'=>'- Create and Manage Users (e.g., admin)', + +'LBL_ROLES'=>'Roles', + +'LBL_CREATE_AND_MANAGE_USER_ROLES'=>'- Create and Manage user roles (e.g., Administrator, Standard User, etc.)', + +'LBL_PROFILES'=>'Profiles', + +'LBL_PROFILES_LIST'=>'Profiles List', + +'LBL_CREATE_AND_MANAGE_USER_PROFILES'=>'- Create and Manage user profiles (e.g., CEO, Sales Manager, etc.)', + +'LBL_CREATE_AND_MANAGE_USER_GROUPS'=>'- Create and Manage user groups', + +'LBL_SHARING_ACCESS'=>'Sharing Access', + +'LBL_FIELDS_ACCESS'=>'Fields Access', + +'LBL_DEFAULT_ORGANIZATION_FIELDS'=>'Default Organization Fields Access', + +'LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS'=>' - Setting Default Field Access within the Organization', + +'LBL_SETTING_DEFAULT_SHARING_ACCESS'=>'- Setting Default Sharing Access within the Organization', + +'LBL_FIELD_ACCESSIBILITY'=>'Field Accessibility', + +'LBL_SETTING_FIELD_ACCESSIBILITY'=>' - Setting Field Accessibility for each profiles', +//<<<<<<<>>>>> +'LBL_FIELD_ORDERING_DESC'=>' - Edit Field Order', + +'LBL_FIELD_ORDERING'=>'Edit Field Blocks', +//<<<<<<<<<>>>>>>>>>>>> +'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_DELETE_DEMO_DATA'=>'Delete Demo Data', + +'LBL_DELETE_DEMO_DATA_INFO'=>'- Delete the Demo Data which is created at the time of installation', + + + +'LBL_STUDIO'=>'Studio', + +'LBL_CUSTOM_FIELD_SETTINGS'=>'Custom Field Settings', + +'LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS'=>'Manage your company-wide custom fields.', + +'LBL_SELECT_MODULE'=>'Select Module', + +'LBL_SELECT_CF_TEXT'=>'Select Module:', + + + +'LBL_PICKLIST_SETTINGS'=>'Picklist Settings', + +'LBL_EDIT_PICKLIST_VALUES'=>' - Edit values of Picklist fields', + +'LBL_EDIT'=>'Editing', + +'LBL_COMMUNICATION_TEMPLATES'=>'Communication Templates', + +'LBL_CREATE_EMAIL_TEMPLATES'=>'New Email Template', + +'LBL_UPLOAD_MSWORD_TEMPLATES'=>' - Upload MS Word Templates for Mail Merge', + +'LBL_SCHEDULE_EMAIL_NOTIFICATION'=>' - Schedule Email Notifications', + +'LBL_EXPAND_CLOSE_MENU'=>'Expand/Close Menu', + +'LBL_CONFIGURATION'=>'Configuration', + +'LBL_CONFIGURE_MAIL_SERVER'=>' - Configure Outgoing Mail Server', + +'LBL_BACKUP_SERVER_CONFIGURATION'=>'Backup Server Configuration', + +'LBL_BACKUP_SERVER_INFO'=>'Backup Server Information', + +'LBL_BACKUP_SERVER_SETTINGS'=>'Backup Server', + +'LBL_CONFIGURE_BACKUP_SERVER'=>' - Configure Backup Server', + +'LBL_SYSTEM_CONFIGURATION'=>' - System Configuration', + +'LBL_PROXY_SERVER_CONFIGURATION'=>'Proxy Server Configuration', + +'LBL_PROXY_SERVER_INFO'=>'Proxy Server Information', + +'LBL_PROXY_SERVER_SETTINGS'=>'Proxy Server', + +'LBL_CONFIGURE_PROXY_SERVER'=>' - Configure Proxy Server', + +'LBL_PROXY_PORT'=>'Port Number', + + + +//Field Types for custom fields + +'LBL_URL'=>'URL', + +'LBL_CHECK_BOX'=>'Checkbox', + + + +//PickList Settings + +'LBL_STANDARD_FIELDS'=>'Standard Fields', + +'LBL_LEAD_SOURCE'=>'Lead Source', + +'LBL_SALUTATION'=>'Salutation', + +'LBL_LEAD_STATUS'=>'Lead Status', + +'LBL_INDUSTRY'=>'Industry', + +'LBL_RATING'=>'Rating', + +'LBL_ACCOUNT_TYPE'=>'Account Type', + +'LBL_BUSINESS_TYPE'=>'Business Type', + +'LBL_CURRENCY_TYPE'=>'Currency Type', + +'LBL_SALES_STAGE'=>'Sales Stage', + +'LBL_PRIORITY'=>'Priority', + +'LBL_STATUS'=>'Status', + +'LBL_CATEGORY'=>'Ticket Category', + +'LBL_MANUFACTURER'=>'Manufacturer', + +'LBL_PRODUCT_CATEGORY'=>'Product Category', + +'LBL_RSS_CATEGORY'=>'Rss Category', + +//Added for Web based Email client integration (post 4.0.1 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_MAIL_SERVER_SETTINGS'=>'Outgoing Server', +'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_USAGEUNIT'=>'Usage Unit', +'LBL_GLACCT'=>'GL Account', +'LBL_QUOTE_STAGE'=>'Quote Stage', +'LBL_CARRIER'=>'Carrier', +'LBL_TAXCLASS'=>'Tax Class', +'LBL_MY_DETAILS'=>'My Details', +'LBL_MY_MAIL_SERVER_DET'=>'My Incoming Mail Server Details', +'LBL_EMAIL_ID'=>'Email ID', +'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'=>'Emails per Page', + +//Added for Organization Details (4.2 release) +'LBL_ORGANIZATION_NAME'=>'Company Name', +'LBL_ORGANIZATION_ADDRESS'=>'Address', +'LBL_ORGANIZATION_CITY'=>'City', +'LBL_ORGANIZATION_STATE'=>'State', +'LBL_ORGANIZATION_CODE'=>'Postal Code', +'LBL_ORGANIZATION_COUNTRY'=>'Country', +'LBL_ORGANIZATION_PHONE'=>'Phone', +'LBL_ORGANIZATION_FAX'=>'Fax', +'LBL_ORGANIZATION_WEBSITE'=>'Website', +'LBL_ORGANIZATION_DETAILS'=>'Company Information', +'LBL_SPECIFY_COMPANY_DETAILS'=>' - Specify Company Information', +'LBL_ORGANIZATION_LOGO'=>'Company Logo', +'LBL_UPLOAD'=>'Upload', +'LBL_FILENAME'=>'File Name', +'LBL_SETTINGS'=>'Settings', +'LBL_COMPANY_DETAILS'=>'Company Details', + +'LBL_SEVERITY'=>'Severity', +'LBL_FAQ_CATEGORY'=>'FAQ Category', +'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', +'INVENTORYNOTIFICATION'=>'Inventory Notifications', +'LBL_INVENTORY_NOTIFICATIONS'=>' - Edit Inventory Email Notifications', +'INVENTORYTERMSANDCONDITIONS'=>'Inventory : Terms & Conditions',//newly added for Inventory terms and conditions +'LBL_INVENTORY_TERMSANDCONDITIONS'=>' - Edit Terms & Conditions',//newly added +'LBL_TANDC_TEXT'=>'Terms & Conditions Text', +'LBL_INVENTORY_TANDC'=>'Inventory Terms & Conditions', + +'LBL_OTHER_SETTINGS'=>'Other Settings', +'LBL_SCROLL'=>'[Scroll to Top]', + +'LBL_INV_NOT_DESC'=>'The following is 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', +'Vendor'=>'Vendor', +'PriceBook'=>'PriceBook', +'Quotes'=>'Quote', +'PurchaseOrder'=>'Purchase Order', +'SalesOrder'=>'SalesOrder', +'Invoice'=>'Invoice', + +//For Custom Fields +'LBL_LEAD_MAP_CUSTOM_FIELD'=>'Mapping Lead Custom Fields', +'leadCustomFieldDescription'=>'Map each of your organizations lead custom fields to each of your custom account +,contact, or potential fields. These mappings will be used when you convert leads', +'LBL_MAPPING_INFO'=>'Mapping Information', +'LBL_ACCOUNT_FIELD'=>'Account Custom Field', +'LBL_CONTACT_FIELD'=>'Contact Custom Field', +'LBL_POTENTIAL_FIELD'=>'Potential Custom Field', +'CUSTOMFIELDMAPPING'=>'Custom Field Mapping', +'LBL_FIELD_MAPPING'=>'Field Mapping', +'LBL_LEAD_FIELD'=>'Lead Custom Field', +//After 4.2 GA +'LBL_TEXT_AREA'=>'Text Area', +//for Edit ordering the blocks +'NOTESCUSTOMFIELDS'=>'Notes Custom Fields', + +//Added fields after 4.2 ptach 2 +'LBL_ASSIGN_MODULE_OWNERS'=>'Assign Module Owners', +'LBL_MODULE_OWNERS'=>'Module Owners', +'LBL_ASSIGN_MODULE_OWNERS_INFO'=>' - Assign Owners for each modules', +'LBL_MODULE'=>'CRM Module', +'LBL_OWNER'=>'Assigned Owner', +'LBL_MIGRATION'=>'Migration Wizard', +'LBL_MIGRATION_INFO'=>'Migrate vtiger CRM data from Version 4.2.3 to 5.0.0', + +//Added for 5 GA - Description of Settings UI + +'LBL_USER_DESCRIPTION'=>'Manage users who can access vtiger CRM', +'LBL_ROLE_DESCRIPTION'=>'Set up hierarchy of roles and assign to the users', +'LBL_PROFILE_DESCRIPTION'=>'Manage user-specific modules access to different Roles', +'LBL_GROUP_DESCRIPTION'=>'Manage different types of teams based on roles, users, and profiles', +'LBL_SHARING_ACCESS_DESCRIPTION'=>'Manage module sharing rules & custom sharing rules', +'LBL_SHARING_FIELDS_DESCRIPTION'=>'Define global field-level access in each module', +'LBL_MODULE_OWNERS_DESCRIPTION'=>'Assign Customer Support owners to CRM module', +'LBL_ANNOUNCEMENT_DESCRIPTION'=>'Manage company wide announcements', +'LBL_CUSTOM_FIELDS_DESCRIPTION'=>'Manage different types of user-defined fields', +'LBL_PICKLIST_DESCRIPTION'=>'Customize Picklist values in each module', +'LBL_EMAIL_TEMPLATE_DESCRIPTION'=>'Manage templates for E-Mail module', +'LBL_MAIL_MERGE_DESCRIPTION'=>'Manage templates for Mail Merging', +'LBL_NOTIF_SCHED_DESCRIPTION'=>'Manage Notifications that will alert in case of important actions', +'LBL_INV_NOTIF_DESCRIPTION'=>'Change Settings of Inventory related Notifications', +'LBL_INV_TANDC_DESCRIPTION'=>'Specify Terms and Conditions for quotes, orders, and invoices', +'LBL_COMPANY_DESCRIPTION'=>'Specify business address of company', +'LBL_MAIL_SERVER_DESCRIPTION'=>'Configure Outgoing Mail Server details', +'LBL_BACKUP_SERVER_DESCRIPTION'=>'Specify database backup server details', +'LBL_CURRENCY_DESCRIPTION'=>'Manage international currencies and exchange rates', +'LBL_TAX_DESCRIPTION'=>'Manage taxes and the corresponding tax rates', +'LBL_SYSTEM_DESCRIPTION'=>'View vtiger CRM Server details', +'LBL_PROXY_DESCRIPTION'=>'Configure proxies to access RSS feeds through Internet', +'LBL_AUDIT_DESCRIPTION'=>'Display data opertions performed by users', +'LBL_TAX_DESC'=>'Manage different types of tax rates for taxes, such as Sales Tax, VAT etc.,', +'LBL_COMPANY_DESC'=>'Specify business address of your company', +'LBL_SELECT_LOGO'=>'Select new logo:', +'LBL_INVEN_TANDC_DESC'=>'Specify text for the Terms & Conditions section of Quotes, Orders, and Invoices modules', +'LBL_MAIL_SERVER_DESC'=>'Configure your Outgoing Mail Server details', +'LBL_BACKUP_SERVER_DESC'=>'Manage your Backup Server', +'LBL_MODULES_AND_OWNERS'=>'Modules & Owners', +'LBL_GROUP_DESC'=>'Manage different types of user groups within your organization', +'LBL_MAIL_MERGE_DESC'=>'Manage Mail Merge templates used in CRM modules', + + +//Added fields after 5.0 Alpha +'LBL_REQUIRE_SMTP_AUTHENTICATION'=>'Require SMTP Authentication?', +'LBL_ANNOUNCEMENT'=>'Announcements', +'LBL_SETTING_ANNOUNCEMENT'=>'Announcement', +'LBL_ANNOUNCE_TEXT'=>'Announcement Text', +'LBL_UPDATE_BUTTON'=>'Update', +'LBL_ANNOUNCEMENT_INFO'=>'Type the announcement text below, and click the Update button.', +'LBL_ANNOUNCEMENT_DESC'=>'Change the text that appears in the announcement display on top of each page', +'LBL_EMAIL_CONTENTS'=>'Email Contents', +'LBL_SUBJECT'=>'Subject', +'LBL_MESSAGE'=>'Message', +'LBL_PICKLIST_EDITOR'=>'Picklist Editor', +'LBL_PICKLIST_AVAIL'=>'Picklists Available in', +'LBL_PICKLIST_AVAILINFO1'=>'The picklists available in', +'LBL_PICKLIST_AVAILINFO2'=>'are shown below. Click Edit to modify the contents of the list.', +'LBL_EDIT_PICKLIST'=>'Edit Pick List', +'LBL_PICKLIST_SAVEINFO'=>'Type the entries one - by - one below and click the Save button to save the list.', +'LBL_SELECT_CRM_MODULE'=>'Select CRM Module', +'LBL_TAX_SETTINGS'=>'Tax Calculations', +'LBL_INVENTORY_TAX_CONFIG'=>'Inventory Tax Configuration', +'LBL_CUSTOM_MAPP_INFO'=>'Only in Leads module you can map the fields with Accounts, Contacts, and Potentials.', +'LBL_MAPPING_OTHER_MODULES'=>'Mapping with other Modules', +'LBL_CUSTOM_FILED_IN'=>'Custom Fields in ', +'LBL_ROLE_HIERARCHY_TREE'=>'Roles & Hierarchy Tree', +'LBL_EDIT_FIELD_MAPPING'=>'Editing Field Mapping', +'LBL_LOGIN_HISTORY_DETAILS'=>'User Login History', +'LBL_LOGIN_HISTORY_DESCRIPTION'=>'Display login history of users', +'LBL_NON_EDITABLE_PICKLIST_ENTRIES'=>'Non Editable Picklist Entries', + +//Added for Tax settings +'LBL_PRODUCT_TAX_SETTINGS'=>'Product & Service Taxes', +'LBL_SHIPPING_HANDLING_TAX_SETTINGS'=>'Shipping & Handling Taxes', +'LBL_PROXY_SERVER_DESC'=>'Configure proxies to access RSS feeds through Internet', + +'LBL_NEW_CURRENCTY'=>'New Currency', +'LBL_BASE_CURRENCY'=>'Base Currency - ', +'LBL_DELETE_CURRENCY'=>'Delete Currency', + +//Added for singlepane view in modules + +'LBL_DEFAULT_DETAIL_VIEW'=>'Default Detail View', +'LBL_DEFAULT_MODULE_VIEW'=>'Default Module View', +'LBL_DEFAULT_MODULE_VIEW_DESC'=>'Set Default Detail View for All Modules', +'LBL_ENABLE_SINGLEPANE_VIEW'=>'Enable Singlepane View', + +'LBL_CLEAR_DATA'=>'Clear Data', +'LBL_LENGTHALERT'=>'Sorry, you can cannot map fields with different character size. Kindly map the data with same or more character size.', +'LBL_DECIMALALERT'=>'Sorry, you can cannot map fields with different decimal places. Kindly map the data with same or more decimal places.', +'LBL_TYPEALERT_1'=>'Sorry, you cannot map the', +'LBL_WITH'=>'with', +'LBL_TYPEALERT_2'=>'data type. Kindly map the same data types.', +'LBL_ENABLE'=>'Enable', +'LBL_FAQ_FIELD_ACCESS'=>'Faq Field Access', +'LBL_ADD_TAX_BUTTON'=>'Add Tax', +); + + +?> From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 6 14:39:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 06 Oct 2006 18:39:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9583 - in /vtigercrm/branches/5.0.1/pkg/bin: startvTiger.bat startvTiger.sh stopvTiger.bat Message-ID: <20061006183951.15C2F787F10@vtiger.fosslabs.com> Author: richie Date: Fri Oct 6 12:39:45 2006 New Revision: 9583 Log: changed 5 to 501 Modified: vtigercrm/branches/5.0.1/pkg/bin/startvTiger.bat vtigercrm/branches/5.0.1/pkg/bin/startvTiger.sh vtigercrm/branches/5.0.1/pkg/bin/stopvTiger.bat Modified: vtigercrm/branches/5.0.1/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/branches/5.0.1/pkg/bin/startvTiger.bat (original) +++ vtigercrm/branches/5.0.1/pkg/bin/startvTiger.bat Fri Oct 6 12:39:45 2006 @@ -43,23 +43,23 @@ echo "" echo "making an attempt to kill any existing vtigercrm service" echo "" -bin\apache -k stop -n vtigercrm5 -bin\apache -k uninstall -n vtigercrm5 +bin\apache -k stop -n vtigercrm501 +bin\apache -k uninstall -n vtigercrm501 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 vtigercrm5 -bin\apache -k uninstall -n vtigercrm5 +bin\apache -k stop -n vtigercrm501 +bin\apache -k uninstall -n vtigercrm501 echo "" echo "" -echo "Installing vtigercrm5 apache service after sleeping for 10 seconds" +echo "Installing vtigercrm501 apache service after sleeping for 10 seconds" echo "" %SLEEP_STR% -n 10 127.0.0.1>nul -bin\apache -k install -n vtigercrm5 -f conf\httpd.conf +bin\apache -k install -n vtigercrm501 -f conf\httpd.conf echo "" -echo "Starting vtigercrm5 apache service" +echo "Starting vtigercrm501 apache service" echo "" -bin\apache -n vtigercrm5 -k start +bin\apache -n vtigercrm501 -k start IF ERRORLEVEL 1 goto stopservice goto checkmysql @@ -117,27 +117,27 @@ :checkdatabase echo "" -echo "check to see if vtigercrm5 database already exists" +echo "check to see if vtigercrm501 database already exists" echo "" -mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm5'" | "%WINDIR%\system32\find.exe" "vtigercrm5" > NUL +mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm501'" | "%WINDIR%\system32\find.exe" "vtigercrm501" > NUL IF ERRORLEVEL 1 goto dbnotexists echo "" -ECHO "vtigercrm5 database exists" +ECHO "vtigercrm501 database exists" echo "" goto end :dbnotexists echo "" -ECHO "vtigercrm5 database does not exist" +ECHO "vtigercrm501 database does not exist" echo "" echo %cd% echo "" -echo "Proceeding to create database vtigercrm5 and populate the same" +echo "Proceeding to create database vtigercrm501 and populate the same" echo "" -mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm5" +mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm501" echo "" -echo "vtigercrm5 database created" +echo "vtigercrm501 database created" echo "" goto end Modified: vtigercrm/branches/5.0.1/pkg/bin/startvTiger.sh ============================================================================== --- vtigercrm/branches/5.0.1/pkg/bin/startvTiger.sh (original) +++ vtigercrm/branches/5.0.1/pkg/bin/startvTiger.sh Fri Oct 6 12:39:45 2006 @@ -111,14 +111,14 @@ fi echo "" -echo "Checking if the vtigercrm5 database already exists" +echo "Checking if the vtigercrm501 database already exists" echo "" -echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm5 >/dev/null +echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm501 >/dev/null if [ $? -ne 0 ]; then echo "" - echo "Database vtigercrm5 does not exist. Creating database vtigercrm5" + echo "Database vtigercrm501 does not exist. Creating database vtigercrm501" echo "" - ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm5" + ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm501" fi host=`hostname` Modified: vtigercrm/branches/5.0.1/pkg/bin/stopvTiger.bat ============================================================================== --- vtigercrm/branches/5.0.1/pkg/bin/stopvTiger.bat (original) +++ vtigercrm/branches/5.0.1/pkg/bin/stopvTiger.bat Fri Oct 6 12:39:45 2006 @@ -32,13 +32,13 @@ cd /d %apache_dir% rem shut down apache echo "" -echo "stopping vtigercrm5 apache service" +echo "stopping vtigercrm501 apache service" echo "" -bin\apache -n vtigercrm5 -k stop +bin\apache -n vtigercrm501 -k stop echo "" -echo "uninstalling vtigercrm5 apache service" +echo "uninstalling vtigercrm501 apache service" echo "" -bin\apache -k uninstall -n vtigercrm5 +bin\apache -k uninstall -n vtigercrm501 rem .\bin\ShutdownApache.exe logs\httpd.pid goto StopMySQL From vtigercrm-commits at vtiger.fosslabs.com Sat Oct 7 08:13:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 07 Oct 2006 12:13:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9584 - in /vtigercrm/branches/5.0.1: data/CRMEntity.php include/utils/DetailViewUtils.php include/utils/EditViewUtils.php modules/Contacts/Save.php Message-ID: <20061007121353.85C096FDF4C@vtiger.fosslabs.com> Author: richie Date: Sat Oct 7 06:13:46 2006 New Revision: 9584 Log: * Modified to fix the issue 2098 ie., when we add attachemnt it shows in the image area Modified: vtigercrm/branches/5.0.1/data/CRMEntity.php vtigercrm/branches/5.0.1/include/utils/DetailViewUtils.php vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php vtigercrm/branches/5.0.1/modules/Contacts/Save.php Modified: vtigercrm/branches/5.0.1/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/5.0.1/data/CRMEntity.php (original) +++ vtigercrm/branches/5.0.1/data/CRMEntity.php Sat Oct 7 06:13:46 2006 @@ -263,7 +263,11 @@ //This is to added to store the existing attachment id of the contact where we should delete this when we give new image if($module == 'Contacts') - $old_attachmentid = $adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid=$id"),0,'attachmentsid'); + { + //if a image attached already then remove that otherwise do not delete the attachment + $query = "select vtiger_attachments.attachmentsid from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid inner join vtiger_contactdetails on vtiger_contactdetails.imagename=vtiger_attachments.name where vtiger_seattachmentsrel.crmid=$id"; + $old_attachmentid = $adb->query_result($adb->query($query),0,'attachmentsid'); + } foreach($_FILES as $fileindex => $files) { @@ -274,7 +278,7 @@ } //This is to handle the delete image for contacts - if($module == 'Contacts' && $file_saved) + if($module == 'Contacts' && $file_saved && $old_attachmentid != '') { $del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$old_attachmentid"); $del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$old_attachmentid"); @@ -384,11 +388,13 @@ $sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')'; $adb->query($sql3); + $log->debug("Exiting from uploadAndSaveFile($id,$module,$file_details) method. return true"); return true; } else { $log->debug("Skip the save attachment process."); + $log->debug("Exiting from uploadAndSaveFile($id,$module,$file_details) method. return false"); return false; } } Modified: vtigercrm/branches/5.0.1/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/DetailViewUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/DetailViewUtils.php Sat Oct 7 06:13:46 2006 @@ -304,7 +304,8 @@ { $imgpath = "test/contact/".$imagename; $label_fld[] =$mod_strings[$fieldlabel]; - $label_fld["cntimage"] ='
       '.$mod_strings[$fieldlabel]; + //This is used to show the contact image as a thumbnail near First Name field + //$label_fld["cntimage"] ='
       '.$mod_strings[$fieldlabel]; } else { @@ -462,7 +463,7 @@ if($tabid==4) { //$imgpath = getModuleFileStoragePath('Contacts').$col_fields[$fieldname]; - $sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid=".$col_fields['record_id']; + $sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid inner join vtiger_contactdetails on vtiger_contactdetails.imagename=vtiger_attachments.name where vtiger_seattachmentsrel.crmid=".$col_fields['record_id']; $image_res = $adb->query($sql); $image_id = $adb->query_result($image_res,0,'attachmentsid'); $image_path = $adb->query_result($image_res,0,'path'); Modified: vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php Sat Oct 7 06:13:46 2006 @@ -578,8 +578,8 @@ $query = 'select vtiger_attachments.path, vtiger_attachments.attachmentsid, vtiger_attachments.name from vtiger_products left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_products.productid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where productid='.$col_fields['record_id']; } else - { - $query = "select vtiger_attachments.path, vtiger_attachments.attachmentsid, vtiger_attachments.name from vtiger_contactdetails left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_contactdetails.contactid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where contactid=".$col_fields['record_id']; + { + $query = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid inner join vtiger_contactdetails on vtiger_contactdetails.imagename=vtiger_attachments.name where vtiger_seattachmentsrel.crmid=".$col_fields['record_id']; } $result_image = $adb->query($query); for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++) Modified: vtigercrm/branches/5.0.1/modules/Contacts/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/Save.php Sat Oct 7 06:13:46 2006 @@ -115,6 +115,11 @@ $focus->column_fields['imagename']=$image_name_val; $log->debug("Assign the Image name to the vtiger_field name "); } + +//if image added then we have to set that $_FILES['name'] in imagename field then only the image will be displayed +if($_FILES['imagename']['name'] != '') + $focus->column_fields['imagename'] = $_FILES['imagename']['name']; + //Saving the contact if($image_error=="false") { From vtigercrm-commits at vtiger.fosslabs.com Sat Oct 7 08:51:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 07 Oct 2006 12:51:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9585 - in /vtigercrm/branches/5.0.1/Smarty/templates: DisplayFields.tpl salesEditView.tpl Message-ID: <20061007125137.08C64787F25@vtiger.fosslabs.com> Author: jerrydgeorge Date: Sat Oct 7 06:51:00 2006 New Revision: 9585 Log: i18N issue has been fixed --Jeri,Fixes #2309 Modified: vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl vtigercrm/branches/5.0.1/Smarty/templates/salesEditView.tpl Modified: vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl Sat Oct 7 06:51:00 2006 @@ -51,7 +51,7 @@ {/if} {elseif $uitype eq 19 || $uitype eq 20} - {if $fldlabel eq 'Add Comment'} + {if $fldlabel eq $MOD.LBL_ADD_COMMENT} {assign var=fldvalue value=""} {/if} Modified: vtigercrm/branches/5.0.1/Smarty/templates/salesEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/salesEditView.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/salesEditView.tpl Sat Oct 7 06:51:00 2006 @@ -115,7 +115,7 @@ - {if $header eq 'Comments' || $header eq 'Comment Information'} + {if $header eq $MOD.LBL_COMMENTS || $header eq $MOD.LBL_COMMENT_INFORMATION}   From admin at eBay.com Sun Oct 8 19:06:48 2006 From: admin at eBay.com (eBay) Date: Sun, 8 Oct 2006 19:06:48 -0400 (EDT) Subject: [Vtigercrm-commits] Question about your item -- respond now Message-ID: <1160348808.42095.qmail@eBay.com> An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20061008/f09d1916/attachment-0001.html From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 00:45:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 04:45:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9586 - /vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php Message-ID: <20061009044534.918E0787E80@vtiger.fosslabs.com> Author: richie Date: Sun Oct 8 22:45:30 2006 New Revision: 9586 Log: changes made to fix the convert lead issue and to avoid duplicate account creation during convertlead operation -- Minnie Modified: vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php Modified: vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php Sun Oct 8 22:45:30 2006 @@ -274,36 +274,51 @@ } -$crmid = $adb->getUniqueID("vtiger_crmentity"); - -//Saving Account - starts -$sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,createdtime,modifiedtime,deleted,description) values(".$crmid.",".$current_user_id.",".$assigned_user_id.",'Accounts',1,".$date_entered.",".$date_modified.",0,'".$row['description']."')"; -$adb->query($sql_crmentity); - -$sql_insert_account = "INSERT INTO vtiger_account (accountid,accountname,industry,annualrevenue,phone,fax,rating,email1,website,employees) VALUES (".$crmid.",'".addslashes($accountname)."','".$row["industry"] ."','" .$row["annualrevenue"] ."','" .$row["phone"] ."','".$row["fax"] ."','" .$row["rating"] ."','" .$row["email"] ."','" .$row["website"] ."','" .$row["noofemployees"] ."')"; -$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"]."')"; -$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"]."')"; -$adb->query($sql_insert_accountshipads); - -//Getting the custom vtiger_field values from leads and inserting into Accounts if the vtiger_field is mapped - Jaguar -$insert_value=$crmid; -$insert_column="accountid"; -$val= getInsertValues("Accounts",$insert_value); -if($val[0]!="") - $insert_column.=","; -if($val[1]!="") - $insert_value.=","; - -$insert_column.=$val[0]; -$insert_value.=$val[1]; -$sql_insert_accountcustomfield = "INSERT INTO vtiger_accountscf (".$insert_column.") VALUES (".$insert_value.")"; -$adb->query($sql_insert_accountcustomfield); -//Saving Account - ends + +/*Code integrated to avoid duplicate Account creation during ConvertLead Operation START-- by Bharathi*/ +$acc_query = "select vtiger_account.accountid from vtiger_account left join vtiger_crmentity on vtiger_account.accountid = vtiger_crmentity.crmid where vtiger_crmentity.deleted=0 and vtiger_account.accountname = '$accountname'"; +$acc_res = $adb->query($acc_query); +$acc_rows = $adb->num_rows($acc_res); +if($acc_rows != 0) + $crmid = $adb->query_result($acc_res,0,"accountid"); +else +{ + $crmid = $adb->getUniqueID("vtiger_crmentity"); + + //Saving Account - starts + $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,createdtime,modifiedtime,deleted,description) values(".$crmid.",".$current_user_id.",".$assigned_user_id.",'Accounts',1,".$date_entered.",".$date_modified.",0,'".$row['description']."')"; + $adb->query($sql_crmentity); + /* Modified by Minnie to fix the convertlead issue -- START*/ + if(isset($row["annualrevenue"]) && !empty($row["annualrevenue"])) $annualrevenue = $row["annualrevenue"]; + else $annualrevenue = 'null'; + if(isset($row["noofemployees"]) && !empty($row["noofemployees"])) $employees = $row["noofemployees"]; + else $employees = 'null'; + $sql_insert_account = "INSERT INTO vtiger_account (accountid,accountname,industry,annualrevenue,phone,fax,rating,email1,website,employees) VALUES (".$crmid.",'".addslashes($accountname)."','".$row["industry"] ."',".$annualrevenue.",'" .$row["phone"] ."','".$row["fax"] ."','" .$row["rating"] ."','" .$row["email"] ."','" .$row["website"] ."',".$employees.")"; + /* 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"]."')"; + $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"]."')"; + $adb->query($sql_insert_accountshipads); + + //Getting the custom vtiger_field values from leads and inserting into Accounts if the vtiger_field is mapped - Jaguar + $insert_value=$crmid; + $insert_column="accountid"; + $val= getInsertValues("Accounts",$insert_value); + if($val[0]!="") + $insert_column.=","; + if($val[1]!="") + $insert_value.=","; + + $insert_column.=$val[0]; + $insert_value.=$val[1]; + $sql_insert_accountcustomfield = "INSERT INTO vtiger_accountscf (".$insert_column.") VALUES (".$insert_value.")"; + $adb->query($sql_insert_accountcustomfield); + //Saving Account - ends +} +/*Code integrated to avoid duplicate Account creation during ConvertLead Operation END-- by Bharathi*/ $account_id=$crmid; getRelatedNotesAttachments($id,$crmid); //To Convert Related Notes & Attachments -Jaguar @@ -320,7 +335,7 @@ //Saving Contact - starts $crmcontactid = $adb->getUniqueID("vtiger_crmentity"); -$sql_crmentity1 = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,description,createdtime) values(".$crmcontactid.",".$current_user_id.",".$assigned_user_id.",'Contacts',0,0,'".$row['description']."',".$date_entered.")"; +$sql_crmentity1 = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,description,createdtime,modifiedtime) values(".$crmcontactid.",".$current_user_id.",".$assigned_user_id.",'Contacts',0,0,'".$row['description']."',".$date_entered.",".$date_modified.")"; $adb->query($sql_crmentity1); @@ -382,7 +397,7 @@ $oppid = $adb->getUniqueID("vtiger_crmentity"); - $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,".$date_entered.",'".$row['description']."')"; + $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,modifiedtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,".$date_entered.",".$date_modified.",'".$row['description']."')"; $adb->query($sql_crmentity); From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 01:19:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 05:19:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9587 - /vtigercrm/branches/5.0.1/include/language/en_us.lang.php Message-ID: <20061009051950.5D988787F62@vtiger.fosslabs.com> Author: richie Date: Sun Oct 8 23:19:46 2006 New Revision: 9587 Log: changes made to fix the issue #2256 -Minnie Modified: vtigercrm/branches/5.0.1/include/language/en_us.lang.php Modified: vtigercrm/branches/5.0.1/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/include/language/en_us.lang.php Sun Oct 8 23:19:46 2006 @@ -620,8 +620,8 @@ 'LBL_CALCULATOR'=>'Calculator', -'LBL_CLOSE_WON' =>'Closed-Won', # 'Closed Won' -'LBL_CLOSE_LOST'=>'Closed-Lost', # 'Closed Lost' +'LBL_CLOSE_WON' =>'Closed Won', # 'Closed Won' +'LBL_CLOSE_LOST'=>'Closed Lost', # 'Closed Lost' 'LBL_USER'=>'User', From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 01:40:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 05:40:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9588 - /vtigercrm/branches/5.0.1/modules/Settings/AddCustomFieldToDB.php Message-ID: <20061009054005.D426B787F3F@vtiger.fosslabs.com> Author: richie Date: Sun Oct 8 23:40:01 2006 New Revision: 9588 Log: new type Skype added for custom field --Minnie Modified: vtigercrm/branches/5.0.1/modules/Settings/AddCustomFieldToDB.php Modified: vtigercrm/branches/5.0.1/modules/Settings/AddCustomFieldToDB.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Settings/AddCustomFieldToDB.php (original) +++ vtigercrm/branches/5.0.1/modules/Settings/AddCustomFieldToDB.php Sun Oct 8 23:40:01 2006 @@ -225,6 +225,12 @@ $uitype = 33; $type = "X"; //adodb type $uichekdata='V~O'; + } + elseif($fldType == 'Skype') + { + $uitype = 85; + $type = "C(255)"; //adodb type + $uichekdata='V~O'; } // No Decimal Pleaces Handling From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 01:49:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 05:49:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9589 - in /vtigercrm/branches/5.0.1: include/js/customview.js modules/Settings/CreateCustomField.php modules/Settings/language/en_us.lang.php Message-ID: <20061009054912.DF6E3787E80@vtiger.fosslabs.com> Author: richie Date: Sun Oct 8 23:49:05 2006 New Revision: 9589 Log: new type Skype added for custom field --Minnie Modified: vtigercrm/branches/5.0.1/include/js/customview.js vtigercrm/branches/5.0.1/modules/Settings/CreateCustomField.php vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php Modified: vtigercrm/branches/5.0.1/include/js/customview.js ============================================================================== --- vtigercrm/branches/5.0.1/include/js/customview.js (original) +++ vtigercrm/branches/5.0.1/include/js/customview.js Sun Oct 8 23:49:05 2006 @@ -120,8 +120,8 @@ } else return false } } -var fieldValueArr=new Array('Text','Number','Percent','Currency','Date','Email','Phone','Picklist','URL','Checkbox','TextArea','MultiSelectCombo'); -var fieldTypeArr=new Array('text','number','percent','currency','date','email','phone','picklist','url','checkbox','textarea','multiselectcombo'); +var fieldValueArr=new Array('Text','Number','Percent','Currency','Date','Email','Phone','Picklist','URL','Checkbox','TextArea','MultiSelectCombo','Skype'); +var fieldTypeArr=new Array('text','number','percent','currency','date','email','phone','picklist','url','checkbox','textarea','multiselectcombo','skype'); var currFieldIdx=0,totFieldType; var focusFieldType; @@ -175,7 +175,7 @@ lengthLayer.style.visibility="visible" decimalLayer.style.visibility="hidden" pickListLayer.style.visibility="hidden" - } else if (type=='date' || type=='email' || type=='phone' || type=='url' || type=='checkbox' || type=='textarea') { + } else if (type=='date' || type=='email' || type=='phone' || type=='url' || type=='checkbox' || type=='textarea' || type=='skype') { getObj("lengthdetails").style.visibility="hidden" decimalLayer.style.visibility="hidden" pickListLayer.style.visibility="hidden" Modified: vtigercrm/branches/5.0.1/modules/Settings/CreateCustomField.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Settings/CreateCustomField.php (original) +++ vtigercrm/branches/5.0.1/modules/Settings/CreateCustomField.php Sun Oct 8 23:49:05 2006 @@ -39,7 +39,8 @@ $image_path."url.gif", $image_path."checkbox.gif", $image_path."text.gif", - $image_path."cfpicklist.gif"); + $image_path."cfpicklist.gif", + $image_path."skype.gif"); $cftextcombo = Array($mod_strings['Text'], $mod_strings['Number'], @@ -52,7 +53,8 @@ $mod_strings['LBL_URL'], $mod_strings['LBL_CHECK_BOX'], $mod_strings['LBL_TEXT_AREA'], - $mod_strings['LBL_MULTISELECT_COMBO'] + $mod_strings['LBL_MULTISELECT_COMBO'], + $mod_strings['Skype'] ); $typeVal = Array( '0'=>'Text', @@ -64,7 +66,8 @@ '6'=>'Phone', '7'=>'Picklist', '8'=>'URL', - '11'=>'MultiSelectCombo'); + '11'=>'MultiSelectCombo', + '12'=>'Skype'); if(isset($fieldid) && $fieldid!='') { $mode='edit'; Modified: vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.1/modules/Settings/language/en_us.lang.php Sun Oct 8 23:49:05 2006 @@ -252,6 +252,8 @@ 'PickList'=>'Pick List', 'LBL_MULTISELECT_COMBO'=>'Multi-Select Combo Box', + +'Skype'=>'Skype', From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 02:15:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 06:15:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9590 - /vtigercrm/branches/5.0.1/include/CustomFieldUtil.php Message-ID: <20061009061531.24E98787F69@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 00:15:27 2006 New Revision: 9590 Log: new type named Skype added for custom field --Minnie Modified: vtigercrm/branches/5.0.1/include/CustomFieldUtil.php Modified: vtigercrm/branches/5.0.1/include/CustomFieldUtil.php ============================================================================== --- vtigercrm/branches/5.0.1/include/CustomFieldUtil.php (original) +++ vtigercrm/branches/5.0.1/include/CustomFieldUtil.php Mon Oct 9 00:15:27 2006 @@ -73,6 +73,10 @@ { $fldname = 'Multi-Select Combo Box'; } + elseif($uitype == 85) + { + $fldname = 'Skype'; + } $log->debug("Exiting getCustomFieldTypeName method ..."); return $fldname; } @@ -216,6 +220,10 @@ { $fieldtype = '11'; } + elseif($label == 'Skype') + { + $fieldtype = '12'; + } $log->debug("Exiting getFldTypeandLengthValue method ..."); return $fieldtype; } From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 02:21:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 06:21:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9591 - /vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php Message-ID: <20061009062102.72980787F69@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 00:20:58 2006 New Revision: 9591 Log: changes made for event end time and for skype customfield integration Modified: vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php Modified: vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php Mon Oct 9 00:20:58 2006 @@ -106,7 +106,8 @@ } else { - $curr_time = date('H:i'); + $endtime = time() + (60 * 60); + $curr_time = date('H:i',$endtime); } } $fieldvalue[] = array($disp_value => $curr_time) ; @@ -152,6 +153,11 @@ $fieldvalue [] = $options; } elseif($uitype == 17) + { + $editview_label[]=$mod_strings[$fieldlabel]; + $fieldvalue [] = $value; + } + elseif($uitype == 85) //added for Skype by Minnie { $editview_label[]=$mod_strings[$fieldlabel]; $fieldvalue [] = $value; From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 02:30:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 06:30:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9592 - /vtigercrm/branches/5.0.1/include/utils/DetailViewUtils.php Message-ID: <20061009063056.49BAF787F66@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 00:30:52 2006 New Revision: 9592 Log: changes made for skype customfield integration Modified: vtigercrm/branches/5.0.1/include/utils/DetailViewUtils.php Modified: vtigercrm/branches/5.0.1/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/DetailViewUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/DetailViewUtils.php Mon Oct 9 00:30:52 2006 @@ -933,6 +933,10 @@ $label_fld[] = ''.getRoleName($col_fields[$fieldname]).''; else $label_fld[] = getRoleName($col_fields[$fieldname]); + }elseif($uitype == 85) //Added for Skype by Minnie + { + $label_fld[] =$mod_strings[$fieldlabel]; + $label_fld[]= $col_fields[$fieldname]; } else { From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 02:36:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 06:36:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9593 - in /vtigercrm/branches/5.0.1/Smarty/templates: DetailViewUI.tpl DisplayFields.tpl Message-ID: <20061009063646.A2B06787F66@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 00:36:42 2006 New Revision: 9593 Log: changes made for uitype 85-Skype --Minnie Modified: vtigercrm/branches/5.0.1/Smarty/templates/DetailViewUI.tpl vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl Modified: vtigercrm/branches/5.0.1/Smarty/templates/DetailViewUI.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/DetailViewUI.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/DetailViewUI.tpl Mon Oct 9 00:36:42 2006 @@ -117,6 +117,14 @@ {$APP.LBL_CANCEL_BUTTON_LABEL} + {elseif $keyid eq '85'} +  Skype{$keyval} + + {elseif $keyid eq '19' || $keyid eq '20'} {if $label eq $MOD.LBL_ADD_COMMENT} Modified: vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/DisplayFields.tpl Mon Oct 9 00:36:42 2006 @@ -274,6 +274,14 @@ + {elseif $uitype eq 85} + + {$fldlabel} + + + Skype + + {elseif $uitype eq 71 || $uitype eq 72} {if $uitype eq 72} From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 02:38:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 06:38:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9594 - /vtigercrm/branches/5.0.1/include/js/dtlviewajax.js Message-ID: <20061009063826.BE6EC787F6F@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 00:38:22 2006 New Revision: 9594 Log: changes made for uitype 85-Skype --Minnie Modified: vtigercrm/branches/5.0.1/include/js/dtlviewajax.js Modified: vtigercrm/branches/5.0.1/include/js/dtlviewajax.js ============================================================================== --- vtigercrm/branches/5.0.1/include/js/dtlviewajax.js (original) +++ vtigercrm/branches/5.0.1/include/js/dtlviewajax.js Mon Oct 9 00:38:22 2006 @@ -216,7 +216,10 @@ }else if(uitype == '17') { getObj(dtlView).innerHTML = ""+tagValue+" "; - }else if(uitype == '53') + }else if(uitype == '85') + { + getObj(dtlView).innerHTML = ""+tagValue+" "; + }else if(uitype == '53') { var hdObj = getObj(hdTxt); if(typeof(document.DetailView.assigntype[0]) != 'undefined') From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 03:05:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 07:05:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9595 - /vtigercrm/branches/5.0.1/include/js/dtlviewajax.js Message-ID: <20061009070521.58AFC787F6F@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 01:05:17 2006 New Revision: 9595 Log: code contribution for multiselect combo box integrated --Minnie Modified: vtigercrm/branches/5.0.1/include/js/dtlviewajax.js Modified: vtigercrm/branches/5.0.1/include/js/dtlviewajax.js ============================================================================== --- vtigercrm/branches/5.0.1/include/js/dtlviewajax.js (original) +++ vtigercrm/branches/5.0.1/include/js/dtlviewajax.js Mon Oct 9 01:05:17 2006 @@ -314,6 +314,23 @@ } }else if(uitype == '33') { + /* Wordwrap a long list of multi-select combo box items at the + * item separator string */ + const DETAILVIEW_WORDWRAP_WIDTH = "70"; // must match value in DetailViewUI.tpl. + + var lineLength = 0; + for(var i=0; i < r.length; i++) { + lineLength += r[i].length + 2; // + 2 for item separator string + if(lineLength > DETAILVIEW_WORDWRAP_WIDTH && i > 0) { + lineLength = r[i].length + 2; // reset. + r[i] = '
       ' + r[i]; // prepend newline. + } + // Prevent a browser splitting multiword items: + r[i] = r[i].replace(/ /g, ' '); + } + /* Join items with item separator string (which must match string in DetailViewUI.tpl, + * EditViewUtils.php and CRMEntity.php)!! + */ getObj(dtlView).innerHTML = r.join(", "); }else { From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 03:09:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 07:09:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9596 - in /vtigercrm/branches/5.0.1/themes: alphagrey/images/skype.gif bluelagoon/images/skype.gif woodspice/images/skype.gif Message-ID: <20061009070941.CA1E8787F6F@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 01:09:32 2006 New Revision: 9596 Log: skype image added --Minnie Added: vtigercrm/branches/5.0.1/themes/alphagrey/images/skype.gif (with props) vtigercrm/branches/5.0.1/themes/bluelagoon/images/skype.gif (with props) vtigercrm/branches/5.0.1/themes/woodspice/images/skype.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 03:17:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 07:17:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9597 - /vtigercrm/branches/5.0.1/modules/Notes/Save.php Message-ID: <20061009071709.EF861787F74@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 01:17:06 2006 New Revision: 9597 Log: code given by DG has been integrated -- Minnie Modified: vtigercrm/branches/5.0.1/modules/Notes/Save.php Modified: vtigercrm/branches/5.0.1/modules/Notes/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/Save.php Mon Oct 9 01:17:06 2006 @@ -85,6 +85,30 @@ 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'] != '') From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 03:20:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 07:20:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9598 - /vtigercrm/branches/5.0.1/include/utils/CommonUtils.php Message-ID: <20061009072008.24B06787F74@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 01:20:03 2006 New Revision: 9598 Log: code given by DG has been integrated -- Minnie Modified: vtigercrm/branches/5.0.1/include/utils/CommonUtils.php Modified: vtigercrm/branches/5.0.1/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/CommonUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/CommonUtils.php Mon Oct 9 01:20:03 2006 @@ -600,9 +600,6 @@ /** * Get the username by giving the user id. This method expects the user id - * param $label_list - the array of strings to that contains the option list - * param $key_list - the array of strings to that contains the values list - * param $selected - the string which contains the default value */ function getUserName($userid) @@ -620,6 +617,29 @@ } $log->debug("Exiting getUserName method ..."); return $user_name; +} + +/** +* Get the user full name by giving the user id. This method expects the user id +* DG 30 Aug 2006 +*/ + +function getUserFullName($userid) +{ + global $log; + $log->debug("Entering getUserFullName(".$userid.") method ..."); + $log->info("in getUserFullName ".$userid); + global $adb; + if($userid != '') + { + $sql = "select first_name, last_name from vtiger_users where id=".$userid; + $result = $adb->query($sql); + $first_name = $adb->query_result($result,0,"first_name"); + $last_name = $adb->query_result($result,0,"last_name"); + $user_name = $first_name." ".$last_name; + } + $log->debug("Exiting getUserFullName method ..."); + return $user_name; } /** From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 03:41:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 07:41:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9599 - /vtigercrm/branches/5.0.1/modules/Migration/ModifyDatabase/42P2_to_50.php Message-ID: <20061009074157.6DF15787F81@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 01:41:53 2006 New Revision: 9599 Log: * Added changes to update activity end time based on start time and duration - hours and munutes Modified: vtigercrm/branches/5.0.1/modules/Migration/ModifyDatabase/42P2_to_50.php Modified: vtigercrm/branches/5.0.1/modules/Migration/ModifyDatabase/42P2_to_50.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Migration/ModifyDatabase/42P2_to_50.php (original) +++ vtigercrm/branches/5.0.1/modules/Migration/ModifyDatabase/42P2_to_50.php Mon Oct 9 01:41:53 2006 @@ -3405,7 +3405,7 @@ $taxres = $conn->query("select taxid from vtiger_inventorytaxinfo where taxlabel='".addslashes($taxlabel)."'"); $taxid = $conn->query_result($taxres,0,'taxid'); - $taxquery = "insert into vtiger_producttaxrel ($productid, \"$taxid\", '0.00')"; + $taxquery = "insert into vtiger_producttaxrel values($productid, \"$taxid\", '0.00')"; //Execute($taxquery); $conn->query($taxquery); } @@ -3555,6 +3555,7 @@ //changes made for CustomView and Reports - Activities changed to Calendar -- Starts //Added to change the entitytype from Activities to Calendar for customview +Execute("update vtiger_crmentity set setype='Calendar' where setype='Activities'"); Execute("update vtiger_customview set entitytype='Calendar' where entitytype='Activities'"); //Added to change the primarymodule from Activities to Calendar for Reports @@ -3722,6 +3723,48 @@ Execute("insert into vtiger_postatus values('','Received Shipment',$sortorderid,1)"); +//Added after 5.0 GA release +//CALCULATE Activity End Time (time_end) +//we have to calculate activity end time (time_end) based on start time (time_start) and duration (duration_hours, duration_minutes) +$sql = "select * from vtiger_activity"; +$result = $conn->query($sql); +$num_rows = $conn->num_rows($result); +for($i=0;$i<$num_rows;$i++) +{ + //First we have to retrieve the time_start, duration_hours and duration_minutes and form as a date with time + $activityid = $conn->query_result($result,$i,'activityid'); + $date_start = $conn->query_result($result,$i,'date_start'); + $time_start = $conn->query_result($result,$i,'time_start'); + $duration_hours = $conn->query_result($result,$i,'duration_hours'); + $duration_minutes = $conn->query_result($result,$i,'duration_minutes'); + + if($duration_hours != '' && $duration_minutes != '') + { + $date_details = explode("-",$date_start); + $start_year = $date_details[0]; + $start_month = $date_details[1]; + $start_date = $date_details[2]; + + $start_details = explode(":",$time_start); + $start_hour = $start_details[0]; + $start_minutes = $start_details[1]; + + $full_duration = "$duration_hours:$duration_minutes:00"; + + $start = date("Y-m-d H:i:s",mktime($start_hour, $start_minutes, 0, $start_month, $start_date, $start_year)); + $end = date("Y-m-d H:i:s",mktime($start_hour+$duration_hours, $start_minutes+$duration_minutes, 0, $start_month, $start_date, $start_year)); + + $end_details = explode(" ",$end); + $due_date = $end_details[0]; + + $end_time_details = explode(":",$end_details[1]); + $time_end = $end_time_details[0].":".$end_time_details[1]; + + $update_query = "update vtiger_activity set due_date=\"$due_date\", time_end=\"$time_end\" where activityid=$activityid"; + + $conn->query($update_query); + } +} From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 05:02:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 09:02:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9600 - in /vtigercrm/branches/5.0.1/install: 0welcome.php 2setConfig.php 4createConfigFile.php 5createTables.php Message-ID: <20061009090200.BB066787F84@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 03:01:54 2006 New Revision: 9600 Log: version changed from 5.0.0 to 5.0.1 Modified: vtigercrm/branches/5.0.1/install/0welcome.php vtigercrm/branches/5.0.1/install/2setConfig.php vtigercrm/branches/5.0.1/install/4createConfigFile.php vtigercrm/branches/5.0.1/install/5createTables.php Modified: vtigercrm/branches/5.0.1/install/0welcome.php ============================================================================== --- vtigercrm/branches/5.0.1/install/0welcome.php (original) +++ vtigercrm/branches/5.0.1/install/0welcome.php Mon Oct 9 03:01:54 2006 @@ -97,10 +97,10 @@ -

             This Configuration Wizard will create vtiger CRM 5.0.0 databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready. +

             This Configuration Wizard will create vtiger CRM 5.0.1 databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready.

      -

      - vtiger CRM 5.0.0 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.

      -

      vtiger CRM 5.0.0 will not work on mysql 4.0.x versions

      vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements
      +

      - vtiger CRM 5.0.1 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.

      +

      vtiger CRM 5.0.1 will not work on mysql 4.0.x versions

      vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements

      The installation wizard will guide you with the installation regardless of the setup you may have. Modified: vtigercrm/branches/5.0.1/install/2setConfig.php ============================================================================== --- vtigercrm/branches/5.0.1/install/2setConfig.php (original) +++ vtigercrm/branches/5.0.1/install/2setConfig.php Mon Oct 9 03:01:54 2006 @@ -99,7 +99,7 @@ elseif (isset($dbconfig['db_name']) && $dbconfig['db_name']!='_DBC_NAME_') $db_name = $dbconfig['db_name']; else - $db_name = 'vtigercrm5'; + $db_name = 'vtigercrm501'; !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; if (isset($_REQUEST['host_name'])) $host_name = $_REQUEST['host_name']; @@ -145,7 +145,7 @@ } else { !isset($_REQUEST['db_hostname']) ? $db_hostname = $hostname: $db_hostname = $_REQUEST['db_hostname']; - !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm5" : $db_name = $_REQUEST['db_name']; + !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm501" : $db_name = $_REQUEST['db_name']; !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; !isset($_REQUEST['host_name']) ? $host_name= $hostname : $host_name= $_REQUEST['host_name']; !isset($_REQUEST['site_URL']) ? $site_URL = $web_root : $site_URL = $_REQUEST['site_URL']; Modified: vtigercrm/branches/5.0.1/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/5.0.1/install/4createConfigFile.php (original) +++ vtigercrm/branches/5.0.1/install/4createConfigFile.php Mon Oct 9 03:01:54 2006 @@ -45,8 +45,8 @@ // vtiger CRM version number; do not edit! -$vtiger_version = "5.0.0"; -$release_date = "14 September 2006"; +$vtiger_version = "5.0.1"; +$release_date = "10 October 2006"; if (isset($_REQUEST['db_hostname'])) Modified: vtigercrm/branches/5.0.1/install/5createTables.php ============================================================================== --- vtigercrm/branches/5.0.1/install/5createTables.php (original) +++ vtigercrm/branches/5.0.1/install/5createTables.php Mon Oct 9 03:01:54 2006 @@ -120,10 +120,10 @@ ?> - +
      '; $field_name=$entity_id."_listprice"; - $list_body .= ''; + $list_body .= ''; $list_body .= ''; $list_body .= ''; - $list_body .= ''; + $list_body .= ''; $list_body .= ''; } - + } Modified: vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php Mon Oct 9 06:21:32 2006 @@ -46,6 +46,8 @@ { $list_query .= ' ORDER BY '.$order_by.' '.$sorder; } + +$list_query .= " group by vtiger_crmentity.crmid"; $list_result = $adb->query($list_query); $num_rows = $adb->num_rows($list_result); @@ -66,7 +68,7 @@ //Buttons Add To PriceBook and Cancel $other_text = '
      - vtigercrm-5.0.0 is all set to go! + vtigercrm-5.0.1 is all set to go!
        From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 05:17:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 09:17:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9601 - /vtigercrm/branches/5.0.1/vtigerversion.php Message-ID: <20061009091707.729BE787F88@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 03:17:02 2006 New Revision: 9601 Log: patch 1 for 5.0.0 Modified: vtigercrm/branches/5.0.1/vtigerversion.php Modified: vtigercrm/branches/5.0.1/vtigerversion.php ============================================================================== --- vtigercrm/branches/5.0.1/vtigerversion.php (original) +++ vtigercrm/branches/5.0.1/vtigerversion.php Mon Oct 9 03:17:02 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -$patch_version = ''; +$patch_version = '1'; $modified_database = ''; $vtiger_current_version = '5.0.0'; ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 07:28:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 11:28:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9602 - /vtigercrm/branches/5.0.1/modules/uploads/add2db.php Message-ID: <20061009112842.A2D45787EBB@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 05:28:39 2006 New Revision: 9602 Log: DG code contibution integrated --Minnie Modified: vtigercrm/branches/5.0.1/modules/uploads/add2db.php Modified: vtigercrm/branches/5.0.1/modules/uploads/add2db.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/uploads/add2db.php (original) +++ vtigercrm/branches/5.0.1/modules/uploads/add2db.php Mon Oct 9 05:28:39 2006 @@ -11,11 +11,14 @@ require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); +require_once('include/logging.php'); +global $log; global $current_user; $vtigerpath = $_SERVER['REQUEST_URI']; $vtigerpath = str_replace("/index.php?module=uploads&action=add2db", "", $vtigerpath); $crmid = $_REQUEST['return_id']; +$log->debug("DGDEBUG In add2db.php"); // Arbitrary File Upload Vulnerability fix - Philip $binFile = $_FILES['filename']['name']; @@ -53,6 +56,48 @@ $query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."',".$date_var.")"; $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']); + 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"); + $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); + $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"); + # 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); + if ($dg_size == $filesize) + { + # Yup, it is probably the same file + $associated_account = ''; + } + } + } + else + { + $associated_account = ''; + } + } + # 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); @@ -61,6 +106,17 @@ $sql1 = "insert into vtiger_seattachmentsrel values('"; $sql1 .= $crmid."','".$current_id."')"; $result = $adb->query($sql1); + + # Added by DG 26 Oct 2005 + # Attachments added to contacts are also added to their accounts + if ($associated_account) + { + $log->debug("DGDEBUG: 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); + } echo ''; } From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 07:57:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 11:57:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9603 - /vtigercrm/branches/5.0.1/Release_Notes.html Message-ID: <20061009115740.2C672787F85@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 05:57:30 2006 New Revision: 9603 Log: Release notes 5.0.1 Modified: vtigercrm/branches/5.0.1/Release_Notes.html Modified: vtigercrm/branches/5.0.1/Release_Notes.html ============================================================================== --- vtigercrm/branches/5.0.1/Release_Notes.html (original) +++ vtigercrm/branches/5.0.1/Release_Notes.html Mon Oct 9 05:57:30 2006 @@ -1,3711 +1,3787 @@ - -vtiger CRM 5 Beta: Release Notes - - - - - -

        -

        vtiger CRM 5.0.0: Release Notes

        -

        Date: Sep 14, 2006

        -

        Welcome to vtiger CRM!

        -

        vtiger CRM is an enterprise-ready open source CRM solution for managing sales, marketing, customer support and order management functions effectively. Before version 5 release, vtiger CRM has passed through more than 10 development cycles.

        -

        Table of Contents

        -
          -
        1. Summary
        2. -
        3. Features
        4. -
        5. Bug Fixes
        6. -
        7. Known Issues
        8. -
        -

        1. Summary

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. NoItemStatus
        1 Features -  
        2Product SizePlatform Independent - 6.1 MB
        -
        Windows (EXE) - 26 MB
        - Linux (BIN) - 40 MB
        3Database MigrationAvailable for migrating data from 4.2.3 , 4.2.4, or 5.0 RC to v5.0
        4Product Download Click Here
        5vtiger CRM - PHP Documentation URL: Click Here
        6Product Documentation

        Available at the Wiki

        -

        2. Features

        -
          -
        • AJAX based User Interface
        • -
        • Color Schemes
        • -
        • Enterprise-grade Security Management
        • -
        • Calendaring
        • -
        • Email Client
        • -
        • Customization
        • -
        • Reports & Dashboard
        • -
        • Order Management
        • -
        • Marketing Automation
        • -
        -

        For more details refer to: http://www.vtiger.com/products/crm/v5-release-notes.pdf

        -

        3. Bug Fixes

        -

        We have fixed about 200 issues after v5 RC release. For more details, kindly refer to the vtiger CRM Bug Tracker.

        -

        4. Known Issues

        -

        As on Sep 14, 2006 there are about 178 open issues. For more details, kindly refer to the vtiger CRM Bug Tracker:

        -
        -

        vtiger CRM 5.0 RC1: Release Notes

        -

        Date: Aug 14, 2006

        -

        vtiger CRM 5.0 RC1, is ready for the last-round of validation before GA release!

        -

        Last few days, we have worked hard to make vtiger CRM more user friendly, bug free, and ready for real-time deployment. We thank our community members who spent their valuable time & energy with us and making the RC release successful.

        -

        We have few bugs remained in our basket and there are some formalities need to be completed before announcing the public release for the real time deployments. In the meantime, kindly help us by reporting bugs that you might have encountered in RC release version. Your suggestions and feedback will definitely help us providing a smooth transition from v4.2.x to next the generation vtiger CRM.

        -

        Major changes in the current update are new "woodspice" theme, calendar enhancements, fully customizable tax calculations, and re-desigend post-installation configuration wizard. We have also fixed about 350 bugs after version 5 Beta 2 release.

        -

        IMPORTANT NOTES:

        -
          -
        • We strongly recommend CRM community NOT to USE vtiger CRM 5 RC1 for any deployments. In case you are looking for an immediate CRM solution for your business, please consider using the vtiger CRM 4.2.3 (latest stable version), which can be downloaded from vtiger.com.
        • -
        • Database migration script is provided for migrating data from v4.2.3 to v5 RC1 only for testing purpose. Hence users are strongly recommended to take a backup of the the v4.2.3 data before testing the migration scripts.
        • -
        • Database migration script is not provided for migrating data from v 5 Beta releases to v5 RC1. Hence users are strongly recommended to take a backup of the the v 5 Beta data before testing the migration script.
        • -
        -

        Appeal to Developers, Testers, Analysts, Writers, and real end users!

        -

        Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 RC1,

        -

        Step 1: Browse through Live Demo

        -

        Step 2: Download product from the vtiger.com and install in your favorite OS.

        -

        Step 3: Post your suggestions & comments at vtiger Discussions under : vtiger CRM 5.x category

        -

        Table of Contents

        -
          -
        1. Summary
        2. -
        3. Features
        4. -
        5. Bug Fixes
        6. -
        7. Known Issues
        8. -
        -

        1. Summary

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. NoItemStatus
        1 Features -

        10

        3Product SizePlatform Independent - 5.6 MB
        -
        Windows (EXE) - 26 MB
        - Linux (BIN) - 40 MB
        4Database MigrationAvailable only for the Testing Purpose. Data (Migration script from v4.2.3 to v5 RC1)
        5vtiger CRM - PHP Documentation URL: Click Here
        6Product Documentation

        Available at the Wiki

        -

        2. Features

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. No Feature
        1Customizable tax calculations for quotes, orders, and invoices.
        2Add new values to the Status field in Inventory, Potentials, and FAQ modules -.
        3PO, SO, Invoice - Status and Quote Stage history.
        4Manage product wise discounts and grand discount while generating quotes, orders, and invoices.
        5Manage individual or group taxes.
        6Adding same product more than once in line items list.
        7Attach documents to the tickets.
        8Add negative adjustments in quotes, orders, and invoices .
        9Enhancements in Live Chat tool.
        10Unsubscribe form in compliance with CAN Spam act.
        -

         

        - - - - - - -
        -

        Note:

        -

        Configuring Web services to update Publicly traded company profiles (With Ticker symbol in Accounts) In Account module, if ticker symbol is specified, company profile will be displayed on top of Edit view page. For this specify the server name, port number, user name and password has in class_http/class_http.php under <vtiger CRM Home> directory.

        -

        Line: 166

        -

        Assign values to the given variables: $server,$port,$user,$pwd

        -

        Bug Fixes

        -

        We have fixed about 350 issues after v5 Beta 2 release. For more details, kindly refer to the vtiger CRM Bug Tracker:

        -

        http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&group=owner&version=5.0.0&order=priority

        -

        4. Known Issues

        -

        As on Aug 13, 2006 there are about 100 open issues. For more details, kindly refer to the vtiger CRM Bug Tracker:

        -

        http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&status=assigned&status=reopened&group=owner&version=5.0.0&order=priority

        -
        -

        vtiger CRM 5.0 Beta 2: Release Notes

        -

        Date: July 05, 2006

        -

        vtiger CRM 5.0 Beta 2 release is ready for end-user community testing. The intent of this release is to showcase to the vtiger community, the significant changes made after v5 Beta release i.e., changes since May, 06'. The noteworthy features in v5 Beta 2 are New user interface for Settings module, Audit Trails as part of the security management, complete Web mail integration (including Outgoing and Incoming mail capability), edit custom fields, enhanced user interface for Calendar, optimized the database queries further for List Views function in all the modules, and others.

        -

        IMPORTANT NOTES:

        -
          -
        • We strongly recommend CRM community NOT to USE vtiger CRM 5 Beta 2 for any real-time deployments. In case you are looking for an immediate CRM solution for your business, please consider using the vtiger CRM 4.2.3 (latest stable version), which can be downloaded from vtiger.com.
        • -
        • vtiger CRM user interface can be best viewed in Mozilla/Firefox. We have some page loading page formatting issues in Internet Explorer, which will be fixed very soon.
        • -
        • JpGraph used for generating dashboards has been replaced by ImageGraph, a third party charting software.
        • -
        • Database migration script is provided for migrating data from v4.2.3 to v5 Beta 2 only for testing purpose. Hence users are strongly recommended to take a backup of the the v4.2.3 data before testing the migration script.
        • -
        • Database migration script is not provided for migrating data from v 5 Beta to v5 Beta 2. Hence users are strongly recommended to take a backup of the the v 5 Beta data before testing the migration script.
        • -
        -

        Appeal to Developers, Testers, Analysts, Writers, and real end users!

        -

        Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 Beta 2,

        -

        Step 1: Browse through Live Demo

        -

        Step 2: Download product from the vtiger.com and install in your favorite Operating System.

        -

        Step 3: Post your suggestions & comments at vtiger Discussions under : vtiger CRM 5.x category

        -

        Table of Contents

        -
          -
        1. Summary
        2. -
        3. Features
        4. -
        5. Bug Fixes
        6. -
        7. Known Issues
        8. -
        -

        1. Summary

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. NoItemStatus
        1 Features -

        12

        3Product SizePlatform Independent - 5.2 MB
        -
        Windows (EXE) - 26 MB
        - Linux (BIN) - 40 MB
        4Database MigrationAvailable only for the Testing Purpose. Data (Migration script from v4.2.3 to v5 Beta 2)
        5vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click Here
        6Product Documentation

        Available at the Wiki

        -

        2. Features

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. No Feature
        1Proxy Server configuration for accessing RSS feeds and information based on Ticker Symbol
        2Vertical bar chart in Home page
        3Security Management support for Emails module
        4Database table prefix support for a deploying vtiger CRM in other working databases
        5Audit Trial support for tracking all users system access details
        6Last 5 records visited
        7New User interface for Settings module
        8Print Report function
        9Email Detail View from Related List
        10Attach multiple documents to email message
        11Delete option for Tag cloud
        12AJAX based edit option for User details
        -

         

        - - - - - - -
        -

        Note:

        -

        Configuring Web services to update Publicly traded company profiles (With Ticker symbol in Accounts) In Account module, if ticker symbol is specified, company profile will be displayed on top of Edit view page. For this specify the server name, port number, user name and password has in class_http/class_http.php under <vtiger CRM Home> directory.

        -

        Line: 166

        -

        Assign values to the given variables: $server,$port,$user,$pwd

        -

        Bug Fixes

        -

        We have fixed about 1000 issues after v5 Beta release. For more details, kindly refer to the vtiger CRM Bug Tracker:

        -

        http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&group=owner&version=5.0.0&order=priority

        -

        4. Known Issues

        -

        As on July 5, 2006 there are about 100 open issues. For more details, kindly refer to the vtiger CRM Bug Tracker:

        -

        http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&status=assigned&status=reopened&group=owner&version=5.0.0&order=priority

        -
        -

        vtiger CRM 5.0 Beta: Release Notes

        -

        Date: May 31, 2006

        -

        vtiger CRM 5.0 Beta release is ready for end-user community testing. The intent of this release is to showcase to the vtiger community, the significant changes made after v5 Alpha 5 release i.e., changes since Apr , 06' . The noteworthy features in v5 Beta are complete Web mail integration (including Outgoing and Incoming mail capability), Office Plugin, Outlook Plugin, Customer Portal, Web-Forms, Firefox Toolbar, - - - edit custom fields, - -new user interface for Calendar, optimized the database queries for List Views function in all the modules, and others. In addition to this, we have  conducted performance testing for some of the modules using a popular Web Based Testing Software (AdventNet QEngine 6.0), which helped us to identify some of the bottlenecks in performance. We have also published the Performance Testing reports. We thank AdventNet for permitting us to make use of this interesting software and we gladly recommend it to everyone too, not because AdventNet allowed us to use it but because it is really good.

        -

        Note:

        -

        IMPORTANT NOTES:

        -
          -
        • We strongly recommend CRM community NOT to USE vtiger CRM 5 Beta for any real-time deployments. In case you are looking for an immediate CRM solution for your business, please consider using the vtiger CRM 4.2.3 (latest stable version), which can be downloaded from vtiger.com.
        • -
        • vtiger CRM user interface can be best viewed in Mozilla/Firefox. We have some page loading page formatting issues in Internet Explorer, which will be fixed very soon.
        • -
        • JpGraph used for generating dashboards has been replaced by ImageGraph, a third party charting software.
        • -
        • Database migration script is provided for migrating data from v4.2.3 to v5 Beta only for testing purpose. Hence users are strongly recommended to take a backup of the the v4.2.3 data before testing the migration script.
        • -
        -

        Appeal to Developers, Testers, Analysts, Writers, and real end users!

        -

        Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 Beta,

        -

        Step 1: Browse through Live Demo

        -

        Step 2: Download product from the vtiger.com and install in your favorite Operating System.

        -

        Step 3: Post your suggestions & comments at vtiger Discussions under : vtiger CRM 5.x category

        -

        Table of Contents

        -
          -
        1. Summary
        2. -
        3. Features
        4. -
        5. Known Issues
        6. -
        -

        1. Summary

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. NoItemStatus
        1 Features -

        28

        3Product SizePlatform Independent - 5.0 MB
        -
        Windows (EXE) - 26 MB
        - Linux (BIN) - 40 MB
        4Database MigrationAvailable only for the Testing Purpose. Data (Migration script from v4.2.3 to v5 Beta)
        5vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click Here
        6Product Documentation
        -

        2. Features

        - -
          -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S.NoFeature
        1Organization Hierarchy (Roles) can be defined using tree based structure
        2Recalculate sharing rules option is provided
        3Security Support for Campaigns module
        4Security Support for Ajax actions done
        5Role selection popup integrated.
        6Duplicate handling for Roles, Profiles and Groups done
        7Module and record-level security support for Create/Edit/Duplicate/Delete Mass Delete, Mass Change Owner, Mass Change Status functions
        8Security Support for Quick Create functions
        9Security Support for Lookup
        10Security Support for Settings module
        11Security Support for Convert Lead feature
        12Email Templates are fully functional with merge field value substitution for Leads, Contacts, Accounts, and Users Modules
        13Module and Record Level Security implemented for Mass Delete, Change Owner & Change Status Buttons across product
        14Internationalization of the product across all modules
        15Smarty templates are used for My Preferences / List Mail Server
        16Option to create Multi select combo-box in Custom Field
        17Option to edit custom fields
        18Calendar module is completely redesigned
        19List View, Detail View and Edit View queries are optimized for a better performance
        20New user interface for Currency Configuration and Custom Field Settings
        21New user interface for Convert Lead function
        22Log entry for all functions are incorporated
        23AJAXified New Email functionality
        24New user interface for Reports
        25New user interface for MySites
        26New user interface for Attachments
        27New RSS reader has been integrated for a better performance
        28Mass Change owner option in various modules
        29Inventory Revamped
        30Advanced and Basic Search UI changed
        31Automatic Tax Calculator Integrated
        32Pagination to the related list added
        33Migration support from 4.2.3 to 5.0 Beta Integrated
        -

         

        - - - - - - -
        -

        Note:

        -

        1. Configuring Web services to update Publicly traded company profiles (With Ticker symbol in Accounts) In Account module, if ticker symbol is specified, company profile will be displayed on top of Edit view page. For this specify the server name, port number, user name and password has in class_http/class_http.php under <vtiger CRM Home> directory.

        -

        Line: 166

        -

        Assign values to the given variables: $server,$port,$user,$pwd

        -

        3. Known Issues

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S.NoKnown Issue
        1While creating a new e-mail using the e-mail template, the values for the fields will not appear in the e-mail
        2Web mail has been moved from ajax/js to prototype framework
        3 Error are not handled properly in Web mail module
        4 Attachments will not work properly in Web mail module
        5 When deleting the groups, the ownership of the records that are owned by the group that is being deleted should be changed. This functionality is not handled in v5 Beta
        6 When the data of a group is shared with other users/groups, the  records owned by the sub groups users will be shared properly but the records owned by the sub-group will not be shared
        7 PHP 5 related exception while saving a ticket or potential
        8 Security support not done for New Emails Module
        9Security implementation in Custom View, Reports, Dashboards has some issues
        10 Detail View Ajax edit has security issues
        11 Security support for Calendar is not done
        12 Security is not implemented in import and export queries
        13 Home Page Security Support has issues
        14 Form Validation for Notes non-functional
        15 Events Scheduled after more than 1 hour gets displayed only at the start of the Hour - Calendar
        16 Navigation missing in mini calendar
        17 While editing the custom field, the field length and type are mismatched
        18 custom field create Pop UI is not proper in IE browser
        19 Send reminder will not work for To do
        20 In campaign related list we have shown the newly created contacts and leads. but in Contact and Lead related list we are not showing the campaign relationship. i.e.., in contact and lead related list there is no table for campaigns. whether we should show this relationship or is this the expected behavior?
        21 In the week calendar you can create event for any old day (even for year 2005). It is better to have a date validation.
        22 From a entity detail view, if we click on edit button then the edit view page shows. now there is one more tan more information. if i click on that tab it shows the related list now if we click on Entity information it goes to detail view instead of edit view
        23 If i add a to do it is not showing the to do list instead it is showing the Events
        24 Not able to delete template documents if there is not more that one
        25 All file types are allowed while uploading template documents
        26Multiple attachments is not supported in Emails
        27 Export to excel is not working in PHP5
        -
        -

        vtiger CRM 5.0 Alpha 5: Release Notes

        -

        Date: April 07, 2006

        -

        vtiger CRM 5.0 release is another release in v5 alpha release cycle, which is currently in active development phase. The intent of this release is to showcase to the vtiger community, the significant changes made after v5 Alpha 4 release i.e., changes since Mar 31, 06' . The noteworthy features in v5 Alpha 5 are new user interface for Company Information, Email templates, Company information, Outgoing mail server, Announcements, RSS, optimized the database queries for List Views function in all the modules, and others. In addition to this, we have  conducted performance testing for some of the modules using a popular Web Based Testing Software (AdventNet QEngine 6.0), which helped us to identify some of the bottlenecks in performance. We will publish the performance reports soon. We thank AdventNet for permitting us to make use of this interesting software and we gladly recommend it to everyone too, not because AdventNet allowed us to use it but because it is really good.

        -

        IMPORTANT NOTES:

        -
          -
        • We strongly recommend CRM community NOT to USE vtiger CRM 5 Alpha 5 for any real-time deployments. In case you are looking for an immediate CRM solution for your business, please consider using the vtiger CRM 4.2.3 (latest stable version), which can be downloaded from vtiger.com.
        • -
        • JpGraph used for generating dashboards has been replaced by ImageGraph, a third party charting software.
        • -
        • Database migration script is provided for migrating data from v4.2.3 to v5 Alpha 5 only for testing purpose. Hence users are strongly recommended to take a backup of the the v4.2.3 data before testing the migration script.
        • -
        -

        Appeal to Developers, Testers, Analysts, Writers, and real end users!

        -

        Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 Alpha 5,

        -

        Table of Contents

        -
          -
        1. Summary
        2. -
        3. Features
        4. -
        5. Bug Fixes
        6. -
        7. Known Issues
        8. -
        -

        1. Summary

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. NoItemStatus
        1 Features -

        15

        2Bug Fixes 2
        3Product SizePlatform Independent - 5.3 MB
        -
        Windows (EXE) - 26 MB
        - Linux (BIN) - 40 MB
        4Database MigrationAvailable only for the Testing Purpose. Data (Migration script from v4.2.3 to v5 alpha 5)
        5vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click Here
        6Product Documentation
        -

        2. Features

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. NoFeature
        1 Smarty template applied to Currency Configuration Feature
        2 List View feature database queries are optimized for all the modules
        3 PHP API documentation for some of the major functions
        4 New module called Marketing is added. Campaigns module is now part of Marketing primary module.
        5 AJAXified Notification Schedulers
        6 AJAXified Inventory Notifications
        7 AJAXified Picklist Settings
        8 AJAXified Assign Module Owners
        9 New UI for Integration of Mail Merge Templates
        10 New UI for Company Information
        11 New UI for Outgoing Mail Server
        12 New UI for Backup Server Configuration
        13 New UI for Terms and Conditions
        14 New UI for Announcements
        15 New UI for RSS module
        -

         

        - - - - - - -
        -

        Note:

        -

        1. Configuring Web services to update Publicly traded company profiles (With Ticker symbol in Accounts) In Account module, if ticker symbol is specified, company profile will be displayed on top of Edit view page. For this specify the server name, port number, user name and password has in class_http/class_http.php under <vtiger CRM Home> directory.

        -

        Line: 166

        -

        Assign values to the given variables: $server,$port,$user,$pwd

        -

        Bug Fixes

        - - - - - - - - - - - - - - - - - - -
        SL No. Ticket ID Description
        1 - There seems to be two "search in emails" icons on the email page
        2 - Quick create drop down menu enabled.
        -

        3. Known Issues

        -
          -
        • While creating a new e-mail using the e-mail template, the values for the fields will not appear in the e-mail
        • -
        • Webmail has been moved from ajax/js to prototype framework
        • -
        • Error are not handled properly in Webmail module
        • -
        • Attachments will not work properly in Webmail module
        • -
        • When deleting the groups, the ownership of the records that are owned by the group that is being deleted should be changed. This functionality is not handled in v5 Alpha 5
        • -
        • When the data of a group is shared with other users/groups, the  records owned by the sub groups users will be shared properly but the records owned by the sub-group will not be shared
        • -
        • PHP 5 related exception while saving a ticket or potential
        • -
        -
        -

        vtiger CRM 5.0 Alpha 4: Release Notes

        -

        Date: March 31, 2006

        -

        vtiger CRM 5.0 Alpha 4 release is currently in active development phase. The - intent of this release is to showcase to the vtiger community, the significant - changes made after v5 Alpha 3 release i.e., changes since Mar 21, 06' . The - noteworthy features in v5 Alpha 3 are create database for vtiger CRM online - through Configuration Wizard, edit custom fields,and so others. In addition, - we are also supporting much awaited PHP 5 and MySQL 5.1.x database. - Please note, the vtiger CRM 5 Alpha 4 will not work with MySQL 4.0.x.
        -

        -

        NOTE: We strongly recommend CRM community NOT to USE vtiger CRM 5 - Alpha 4 for real-time deployment. In case you are looking for an immediate - CRM solution for your business, please consider using the vtiger CRM 4.2.3 - (latest stable version), which can be downloaded from vtiger.com.

        -

        Appeal to Developers, Testers, Analysts, Writers, and end users! -

        -

        Jump-start to vtiger Public Discussions and post your valuable suggestions - & comments to help us deliver a world class open source CRM for you in another - few weeks time. It is very simple,

        -

        Table of Contents

        -
          -
        1. Summary
        2. -
        3. Features
        4. -
        -

        1. Summary

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. NoItemStatus
        1 Features -

        8

        -
        2 Product SizePlatform Independent - 8.3 MB
        -
        Windows (EXE) - 28 MB
        - Linux (BIN) - 43 MB
        3Database MigrationNot Available
        4vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click - Here
        5 Product DocumentationAvailable at the Wiki
        -

        2. Features

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. NoFeature
        1 Support for PHP5
        2 Support for MySQL 5
        3 Removed duplicate code base
        4 Removed junk methods in code base
        5Product API cleanup operation initiated
        6Optimized the product performance a bit by restricting the - database queries, used flat files to store commonly used data instead of - repeated database queries.
        7Create database for vtiger CRM online through Configuration - Wizard
        8Modify custom fields
        -

         

        - - - - - - -
        -

        Note:

        -

        1. Configuring Web services to update Publicly traded company profiles - (With Ticker symbol in Accounts) In Account module, if ticker symbol - is specified, company profile will be displayed on top of Edit view page. - For this specify the server name, port number, user name and password - has in class_http/class_http.php under <vtiger CRM Home> directory.

        -

        Line: 166

        -

        Assign values to the given variables: $server,$port,$user,$pwd

        -
        -

        3. Known Issues

        -
          -
        • Dashboards feature will not function in Alpha 4 because of PHP 5 support. - We are working with an alternative graphs package, which will be available - during next update.
        • -
        -
        -

        vtiger CRM 5.0 Alpha 3: Release Notes

        -

        Date: March 21, 2006

        -

        vtiger CRM 5.0 Alpha 3 release is currently in active development phase. The - intent of this release is to showcase to the vtiger community, the significant - changes made after v5 Alpha 2 release i.e., changes since Feb 28, 06' . The - noteworthy features in v5 Alpha 3 are enhanced user interface for Home page, - security scope for reports and dashboards, integration of AJAX based Chat application, - new user interface for System Administration, global search function for all - the modules, tag based grouping of the records, and so forth. In addition, we - are also supporting much awaited MySQL 5.0.19 and MySQL 4.1.x - database systems. Please note, the vtiger CRM 5 Alpha 3 will not work with MySQL - 4.0.x.
        -

        -

        NOTE: We strongly recommend CRM community NOT to USE vtiger CRM 5 - Alpha 3 for real-time deployment. In case you are looking for an immediate - CRM solution for your business, please consider using the vtiger CRM 4.2.3 - (latest stable version), which can be downloaded from vtiger.com.

        -

        Appeal to Developers, Testers, Analysts, Writers, and end users! -

        -

        Jump-start to vtiger Public Discussions and post your valuable suggestions - & comments to help us deliver a world class open source CRM for you in another - few weeks time. It is very simple,

        -

        Table of Contents

        -
          -
        1. Summary
        2. -
        3. Features
        4. -
        -

        1. Summary

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. NoItemStatus
        1 Features -

        23

        -
        2 Product SizePlatform Independent - 9.3 MB
        -
        Windows (EXE) - 26 MB
        - Linux (BIN) - 39 MB
        4 Database MigrationNot Available/Will Not be Available
        5 vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click - Here
        6 Product DocumentationAvailable at the Wiki
        8 Source Code LabelVTIGERCRM_5_ALPHA3
        -

        2. Features

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. NoFeature
        1 Sleek Home page user interface
        2 Demo data populated across the - modules
        3 Manage RSS feeds completely
        4 Manage frequently visited sites - in mySites module
        5Prototype, a third-party package - bundled with the product
        6Email Templates module redesigned -
        7Custom Views in all the modules - are redesigned using Smarty templates
        9Shared/Group Calendar with multiple - users
        10Slide show of the users' photos - in Users List View
        11Search records easily by tagging - a set of records
        12Newly designed Calculator and - Clock are integrated
        13Fade effect while accessing different - sub-tabs in User Detail View
        14Integrated AJAX based third-party - Chat application.
        15AJAXified Mass Delete function - in all the modules
        16AJAXified Custom View for all - modules
        17 AJAXified Change Owner and Change - Status functions in Leads module
        18Security Management User Interface - is completely redesigned
        19Advance search functions integrated - only for Leads module
        20Security feature enabled for - Reports and Dashbords Home Page
        21Global search for all the modules
        22MySQL 5.0.19 database support
        23Delete handling in security module
        -

         

        - - - - - - -
        -

        Note:

        -

        1. Configuring Web services to update Publicly traded company profiles - (With Ticker symbol in Accounts) In Account module, if ticker symbol - is specified, company profile will be displayed on top of Edit view page. - For this specify the server name, port number, user name and password - has in class_http/class_http.php under <vtiger CRM Home> directory.

        -

        Line: 166

        -

        Assign values to the given variables: $server,$port,$user,$pwd

        -

        2. Shoutbox feature has been phased out.

        -
        -
        -

        vtiger CRM 5.0 Alpha 2: Release Notes

        -

        Date: February 28, 2006

        -

        vtiger CRM 5.0 Alpha 2 release is currently in active development phase. The - intent of this release is to showcase to the vtiger community, the -significant changes made after v5 Alpha release ie changes since Jan -16, 06' . The noteworthy features in v5 Alpha 2 are Campaign management -for marketing folks, enhanced predefined dashboards, AJAXified myPortal -module, intuitive System Administration, integration of Web services to -update all your public listed customer/company profiles, view -multidimensional models for product catalog, latest news on company -updates, redesigned Customer Self-service portal,etc. In addition, we -are also supporting much awaited MySQL 4.1.x database system. Please note, the Alpha2 will not work with MySQL 4.0.x
        -

        -

        NOTE: We strongly recommend CRM community NOT to USE vtiger CRM 5 - Alpha 2 for real-time deployment. In case you are looking for an immediate - CRM solution for your business, please consider using the vtiger CRM 4.2.3 - (latest stable version), which can be downloaded from vtiger.com.

        -

        Appeal to Developers, Testers, Analysts, Writers, and end users! -

        -

        Jump-start to vtiger Public Discussions and post your valuable suggestions - & comments to help us deliver a world class open source CRM for you in another - few weeks time. It is very simple,

        -

        Step 1: Browse through Live Demo: http://vtiger.com/demo/alpha2

        -

        Step 2: Ready with LAMP/WAMP, Download product - from:

        -

        Step 3: Post your suggestions & comments at - vtiger Discussions under : vtiger - CRM 5.x category

        -

        Table of Contents

        -
          -
        1. Summary
        2. -
        3. Features
        4. -
        5. Bug Fixes
        6. -
        7. Known Issues
        8. -
        -

        1. Summary

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. NoItemStatus
        1 - Features -

        27

        -
        2 - Product SizeSource - 9.3 MB
        3 - Bug Fixes18
        4 - Database MigrationNot Available/Will Not be Available
        5 - vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. - URL: Click - Here
        6 - Product DocumentationAvailable at the Wiki
        7 - List of files modified between - alpha and alpha 2 -  
        8 - Source Code LabelVTIGERCRM_5_ALPHA2
        9 - Known Issues11
        -

        2. Features

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        Sl No. - Ticket IDDescription
        1-Enhanced Dashboards with more - than 20 charts
        2 - -Multiple currency support and - currency conversion through Web service integration
        3-Campaign Management module for - Marketing automation
        4 - -Update some of your publicly - traded accounts details online using Web services integration. Input only - the Ticker Symbol in Account page and update the other real-time data. (Refer - to Note)
        5 - -Stay-in-touch with your customers' - by uploading their photos.
        6 -   - Analyze your customers business - performance based on their Web traffic.
        7 - 779 - Show/Hide HTML Editor (FCKEditior).
        8 - 1000Send E-mail notification to assigned - users when potential is updated.
        9 - 1006 Send E-mail notification to other - users.
        10 - 736Show latest/new leads on a Home - page.
        11- Ajax-based multidimensional - product images upload.
        12 - - - Contact Images Scrolling in Contact - ListView
        13 - - - Ajax-based my Portal module - under Tools tab.
        14-In Home page, display the status - of modified records since last logout for users.
        15 - - - Tag Cloud - Integration - (http://tagcloud.com)
        16 - - - Company-wide Announcements configuration - from Settings.
        17 - - - Thumbnail view on Mouseover for - Contact images in List View.
        18 - - - Upload vtiger CRM - Users' photos.(Not Working)
        19 - - - Resize the users photos and create - thumbnails.(Not Working)
        20 - - - Attach multiple files in single - step.
        21 - - - FCK editor upgraded to the latest - version (v2.2).
        22 - - - Shout Box integration with vtiger - CRM Home page for vtiger users to chat online.
        23 - - - Tabbed approach of Detail View - information. Sections are spited to Basic & More for Leads, - Accounts, Contacts, Potentials & Product modules.
        24 - 445 - Addition of multiple - Contacts in Activities, Emails, Potentials, Vendors related lists.
        25 - - - Add New E-mail in Related List - of Leads & Contacts.
        26 - 502 Address Inheritance for Contacts.
        27 - - - Ajaxified detail view for all - modules.
        28-Separate Log Messages for Security - Management.
        -

         

        - - - - -
        -

        Note: Configuring Web services to update - Publicly traded company profiles (With Ticker symbol in Accounts) - - In Account module, if ticker symbol is specified, company profile will - be displayed on top of Edit view page. For this specify the server name, - port number, user name and password has in class_http/class_http.php under - <vtiger CRM Home> directory.

        -

        Line: 166

        -

        Assign values to the given variables: $server,$port,$user,$pwd

        -

         

        -
        -

        3. Bug Fixes

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        SL No. - Ticket ID - Description
        1 - 1058While creating customview for - salesorder return action is not redirected to Salesorder Listview.
        2 - 1070In activity related list,when - I click on "Activity Information" link,activity detailview is not displayed -
        3 - 1067minute combo box - of duration field is not displaying proper values
        4 - -In Popup SalesOrder and PurchaseOrder - "Hacking attempt" exception is thrown.
        5 - - - Adding New Event in Potential - Relatedlist will not be working
        6 - - - In Listview when a set of accounts - are selected and 'sendmail' button is clicked, finally in email editview - the addresses are populated both in To and cc field
        7 - 866Problem with ticket creation
        8 - 898 Attachment Error Message not - proper
        9 - 913 parent email id is not selected - when select a single contact or lead from listview-send mail
        10 - 1011Customer portal issue
        11 - 1034 export of accounts
        12 - 1077can not add email id in 'To' - field of email
        13 - 1088Ticket notification with wrong - signature
        14 - - - Create New User, Edit & Detail - View of the My Preference/Settings Smartified -
        15 - - - In create customview 'Choose - columns' the 'Event information' and 'Event Description' does'nt list
        16 - - - Security Support for Reports -
        17 - - - Activity Reminder Notification - email
        18 - 964 - Activities are not in start date - order and not configurable
        -

        4. Known Issues

        -
          -
        • Added the Product Details Block in the Inventory module of SalesOrder, PurchaseOrder, - Invoice & Quotes. But the functionality of the same is to be worked upon.. - This has to be done for create, edit & detail view.
        • -
        • Event created from calendar will not be displayed in the calendar
        • -
        • Some of the features in the Inventory management related modules will not - function properly. The Smarty templates are not applied fully.
        • -
        • In this release only one theme (blue) is supported. You cannot use the other - bundled themes.
        • -
        • Some of the Related List View functions may not work properly.
        • -
        • In the Basic search, Search by Alphabets, and some of the field Search like - Quote ID, Notes, Related To will not work.
        • -
        • Advance Search will not work in all the modules.
        • -
        • Calendar functionality is not functional, we are providing only the UI.
        • -
        • In home page pipeline and calendar will not be displayed.
        • -
        • Reports are not fully functional. You may experience some errors while working - with reports.
        • -
        • Quick create and global search are not supported.
        • -
        -

        5. List of Files Changed from V 5 alpha to V 5 alpha - 2

        -
          -
        • List of Changed files
        • -
        • Files Moved to Attic 
        • -
        -
        -

        vtiger CRM 5.0 Alpha 1: Release Notes

        -

        Date: January 16, 2006

        -

        vtiger CRM 5.0 Alpha release is only for the testing purpose. The -complete front-end architecture has been redesigned using the Smarty -Template Engine (http://www.smarty.php.net/download.php ) and some -of the features and bugs fixed in earlier versions may not work. Please -feel free to report bugs at:

        -

        http://bugs.vtiger.com

        -

        Table of Contents

        -
          -
        1. Summary
        2. -
        3. Features
        4. -
        5. Bug Fixes
        6. -
        7. Known Issues
        8. -
        -

        1. Summary

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. NoItemStatus
        1 - Features -

        3 -

        -
        2 - Product SizeWindows - 27.5 MB -Linux - 39 MB -Source - 9.8 MB
        3 - Bug Fixes103
        4 - Code Contributionshttp://www.vtiger.com/wiki/index.php/Vtiger_CRM_Code_Contributions -
        5 - Database Migration - Not Available
        6 - vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. -URL: http://prdownloads.sourceforge.net/vtigercrmvtiger_CRM_5_Alpha_PhpDocs.zip?download
        7Product DocumentationAvailable at the Wiki
        8Source Code LabelVTIGERCRM_5_ALPHA
        9 - Known Issues10
        -

        2. Features

        -
          -
        • UI interface has been redesigned based on Smarty template engine.
        • -
        • Bug fixes based on the Operation Consolidation list.
        • -
        • Security Management enhancements. For more detail refer to vtigercrm5_alpha_Security.html
        • -
        -

        3. Bug Fixes

        -

        Refer to the following links:

        - -

        4. Known Issues

        -
          -
        • Some of the features in the Inventory management related modules -will not function properly. The Smarty templates are not applied fully.
        • -
        • In this release only one theme (blue) is supported. You cannot -use the other bundled themes.
        • -
        • Some of the Related List View functions may not work properly.
        • -
        • In the Basic search, Search by Alphabets, and some of the field -Search like Quote ID, Notes, Related To will not work.
        • -
        • Advance Search will not work in all the modules.
        • -
        • Calendar functionality is not functional, we are providing only -the UI.
        • -
        • In home page pipeline and calendar will not be displayed.
        • -
        • Reports are not fully functional. You may experience some errors -while working with reports.
        • -
        • Some of the Popup window may not function properly.
        • -
        • Quick create and global search are not supported.
        • -
        • Problem in Search UI with IE browser
        • -
        -
        -

        vtiger CRM 4.5 : Development Version 3 - Release Notes

        -

        Date: November 23, 2005

        -

        Table of Contents

        -
          -
        1. Summary
        2. -
        3. Features
        4. -
        5. Bug Fixes
        6. -
        7. Known Issues
        8. -
        -

        1. Summary

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. NoItemStatus
        1 - Features -

        -8 -
        2 - Product SizeWindows - 30MB -Linux - 42MB
        3 - Bug Fixes29
        4 - Code Contributionshttp://www.vtiger.com/wiki/index.php/Vtiger_CRM_Code_Contributions -
        5 - Database Migration - Not Available. 
        6 - vtiger CRM - PHP DocumentationBundled with the Product (<vtiger CRM -Home>/vtigerCRM_docs directory)
        7Product DocumentationAvailable at the Wiki
        8Source Code LabelVTIGERCRM_4_5_M3
        9 - Known Issues4
        10 - List of Files Changed from V 4.5 Development 2 to -V 4.5 Development 3110
        11List of Files Changed from V 4.2 Development 1 to -V 4.5 Development 3277
        12List of Files Changed from V 4.2 Patch 2 to V 4.5 -Development 3190
        -

        Back -to Top

        -

        2. Features

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. No Ticket -ID - Subject
        1 -
        -
        -

        Progress bar display during the vtiger CRM database creation -in Installation wizard.

        -
        2 -
        -
        Default Organization Sharing in Security is modified -according to the new Security Schema. Migration support is also -provided for this feature.
        3588 - Suppress sending mail to account when a ticket is submitted.
        4 -
        -
        Product quantity in stock is automatically updated when -the  goods specified in the Purchase Order are received. - - Note: To update the product quantity in stock, users have -to change the Status drop-down list value to 'Received Shipment' -immediately after receiving the shipment.
        5
        -
        In Office Plug-in, fields from multiple modules (Accounts, -Contacts, Leads, HelpDesk, and Users) can be merged while creating mail -merge templates.
        6
        -
        In vtiger CRM create mail merge documents by merging fields -from multiple modules (Accounts,Contacts, Users)
        7
        -
        Provided support for User field in mail merge documents
        8
        -
        Mail merge all the records from a module by selecting "Select -All" checkbox in ListView of Accounts, Contacts, Leads, and HelpDesk -modules.
        - -

        3. Product Size

        - - - - - - - - - - - - - - - - - - -
        DistributionVersion 4.2 Build Size Version 4.5 Milestone 3 Build Size
        Windows (EXE)42 MB -

        -
        30 MB
        Linux (BIN)39 MB -

        -
        42 MB
        - -

        4. Bug Fixes

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. No Bug IDSubject
        1539In the Potential related list view the currency value should -be aligned right, and the currency symbol should be shown in the title -instead of in front of every value.
        2640 Issue in Pop-up New link
        3665
        -
         Check-all checkbox checks wrong checkboxes
        4761 Added dash after Potential Name when converting from -Lead
        5644 Start/End date options in Custom View
        6643Issue in Group Activities display in Home page
        7689utils.php call time pass reference error
        8770Checkbox fields are saved with null instead of 0 value.
        9570Missing information when converting Lead to Contact
        10754Date Format on Quotes, Invoices and Orders
        11511Custom view-  if lastname is selected the first -name and the last name are displayed
        12645Html tags are not shown properly in activity description
        13463Don't show "My group allocation" section if no group is -defined
        14849user belonging to more than 2 group .issue
        15820Product image editing error
        16831custom view error
        17695call time pass reference is corrected
        18484Tickets assigned to a group error
        19851Wrong picklist value in edit view
        20 Access to vtigercrm.log files restricted - -vulnerability fix.
        21
        -
        833
        -
        test mail can be sent to test -the e-mail function on configuring the mail server
        22
        -
        718
        -
        Signatures are double-spaced in -e-mails
        23
        -
        453
        -
        issue in vendor search
        24
        -
        564
        -
        Tickets assigned to Groups
        25
        -
        195
        -
        Email - admin mail is empty, -then cc in email is not going
        26
        -
        710
        -
        activity notifications -> -display further information
        27
        -
        504 New Contact -Account addressNew -Contact -Account address
        28259Office Integration account name -in address block
        29378Office Plugin field selection
        - -

        6. Known Issues

        - - - - - - - - - - - - - - - - - - - - - - - -
        S. No Subject
        1 -

        In user creation page, by default the Organization is -displayed in Role drop-down list field but there is no action -associated with the Organization value. Kindly select roles -other than Organization in the drop-down list.

        -
        2 -

        While sending mass e-mail from Leads/Contact/Accounts, -validation check will not be performed for the To field.

        -
        3 In Block rearrangement feature, If a field is -moved to an unused or new block, the field will not be displayed.
        4 In E-mail ListView, if mail is sent to multiple -recipients the entries will be displayed twice.
        -

         

        -
        -
        -

        vtiger CRM 4.5 : Development Version 2 - Release Notes

        -

        Date: November 16, 2005

        -

        Table of Contents

        -
          -
        1. Summary
        2. -
        3. Features
        4. -
        5. Product Size
        6. -
        7. Bug Fixes
        8. -
        9. Database Migration
        10. -
        11. Known Issues
        12. -
        13. List of Files Changed from V 4.5 -Development 1 to V 4.5 Development 2
        14. -
        15. List of Files Changed from V 4.2 Patch 2 -to V 4.5 Development 2
        16. -
        -

        1. Summary

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. NoItemStatus
        1Features3 -

        -
        2Product SizeWindows - 31MB
        -Linux - 41MB
        3Bug Fixes24
        4Code ContributionsNil
        5vtiger CRM - PHP DocumentationBundled with Product
        6Product DocumentationAvailable at Wiki
        7Source Code LabelVTIGERCRM_4_5_M2
        8List of Files Changed from V 4.5 Development 1 to -V 4.5 Development 2137
        9List of Files Changed from V 4.2 Patch 2 to V 4.5 -Development 2279
        -

        Back to Top

        -

        2. Features

        - - - - - - - - - - - - - - - - - - - -
        S. No Subject
        1 -

        Profile management module is revamped completely

        -
        2 -

        Display all the records that are assigned to users dynamically -in a scrollable format.

        -
        3Documentation for vtiger CRM - PHP libraries is -bundled with the product. (Present under vtigerCRM_docs directory)
        - -

        3. Product Size

        - - - - - - - - - - - - - - - - - - -
        DistributionVersion 4.2 Build Size Version 4.5 Milestone 2 Build Size
        Windows (EXE)42 MB -

        -
        31 MB -

        -
        Linux (BIN)39 MB -

        -
        41 MB
        - -

        4. Bug Fixes

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. No Bug IDSubject
        1810 -

        The close link in activities custom view returns to the -default view

        -
        2  -

        E-mail functions are restructured in the following mailing -functions:

        -
          -
        • Send E-mail to assigned to user, Lead, Contact and Account -in Emails module
        • -
        • Send notification to the assigned to user in Activities -module
        • -
        • Send Ticket details to the assigned to user and Parent in -HelpDesk
        • -
        • Send customer portal login details to the customer in -Contact module
        • -
        • Send mail about the portal ticket creation to the module -owner and the customer itself in Customer Portal
        • -
        -
        3768Lead Street text box restricted to 30 chars
        4486Not Held Meetings shown in Activities instead of -History
        5771Events with status "Not Held" appear still in -Activities instead of the history table
        6682Creating an event with status planned for past -time
        7629Select End date as today's date
        8635End date need not be mandatory if there start -date is mandatory
        9411New Event Creation
        10809Designation Should be converted into Title field -of Contact
        11725Field "Designation" does not seem to get carried -across to either the Account, Potential nor Contact entries.
        12777Converting a lead does not allow two decimal -places
        13700Events->Status is not displayed
        14446displaying product id instead of product name in -ticket list view
        15112Generated Reports topic change
        16359Spelling Error in Reports
        17369'Translation issue'
        18398quotation custom view
        19 Issue - Columns to Total in Reports
        20817table names PortalInfo and CustomerDetails should -be changed in lower case
        21818Added module in portal and the tickets should be -assigned to the owner of the module
        22819after saving the ticket control goes to list of -tickets instead of new ticket's detail view(in customerportal)
        23824E-mail title is missing in E-mail DetailView
        24 -

        -
        -

        -
        -
        nusoap version upgraded to 0.7.1 -

        -
        -
        -

          -

        -
        - -

        5. Database Migration

        -

        Database migration support is provided for the following versions: -

        -

        -
          -
        • From vtigerCRM 4.2 Patch2 to vtigerCRM Developer Version 2
        • -
        • From vtigerCRM Developer Version 1 to vtigerCRM Developer -Version 2
        • -
        -

        Database Migration Procedure:

        -
          -
        1. Download the attached Migration zip and extract to the -<vtigerCRM home> directory (Migration42p2_to_45dev2.zip)
        2. -
        3. Access the dev_index.php file through the browser.
        4. -
        5. Select the versions to migrate.
          -
        6. -
        - -

        6. Known Issues

        - - - - - - - - - - - - - - - - - - - - - - - -
        S. No Subject
        1 -

        In user creation page, by default the Organization is -displayed in Role drop-down list field but there is no action -associated with the Organization value. Kindly select roles -other than Organization in the drop-down list.

        -
        2 -

        While sending mass e-mail from Leads/Contact/Accounts, -validation check will not be performed for the To field.

        -
        3 In Block rearrangement feature, If a field is -moved to an unused or new block, the field will not be displayed.
        4 In E-mail ListView, if mail is sent to multiple -recipients the entries will be displayed twice.
        -
        -

        vtiger CRM 4.5 - Development Version 1 Release Notes -

        Date: November 9, 2005

        -

        -

        Summary:

        - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. NoItemTotalRemarks
        1Features1 
        2Bug Fixes50 
        3Code Contributions64 
        -

        Henceforth the Emails Send/Saved will be treated like mails in Send -items, of our regular mail client, if such emails, need to be resent, -the recipients to be selected again.

        -

        1. Features

        -

        Added BCC field in Emails

        -

        2. Bug Fixes

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. No Bug IDSubject
        1638Priority for Events
        2157Inventory Mgmt Related List Show All Details
        3433Search option missing in Popup Purchase order
        4454Issue in creating new note from product detail -view
        5384Activities not saving?
        6233Bug in invoice
        7220Some Bug in Vtiger 4.2 - Invoice
        8373No Title for description
        9256name in account's address information
        10693Select Contact option Not Available
        11205spelling error and There doesn't seem to be a way -to add a first nam
        12 Thunderbird plugin dialog has to be closed twice
        13 ThunderBird - window problem
        14 print option should open new page
        15 email,phone fields are not validated in contacts
        16 Problems with Thunderbird plugin
        17 Thunderbird Plugin: Error importing Contacts
        18  Thunderbird Extn count doesn't match
        19 Custom view - Mandatory check
        20 Product Custom view
        21744Terms & Conditions in Company Details as well -as in Edit View
        22692While exporting SalesOrder i got New column after -Quote Name.
        23688while generating reports if we select reports an -error message is displayed this issue has been fixed
        24686after integrating the code contributed by raju -the lead names are not displayed in the popup in email module
        25  Having status for events in Customview of -Activities-Customer request
        26284In populating the Demo data of leads,giving the -companyname
        27289In populating Demo data, giving the value for -assigned to
        28151Attachment contains footer of vitgerCRM and -javascript (I attached license_agreement.txt of vtigercrm, but i got in -other name and not in .txt format and content is mixed with -vtigerCRM Footer)
        29194Email Email,Webmail Tab is comming for all pages -in Email Module (While Editing email,still the listview tab -(Emails,Webmails) is comming. It should be like Email : ""Subject"")
        30440issue while creating new contact&account -through add business card
        31690Problem in Close Date and Last modified of the -list of Sales Stage History of the Potentials
        32694Date showing is incorrect in add business card -(when add new business card, there is date for appoinment where the -showing date is not in current user date format
        33158Pick list Custom field issue
        34370duplicate entry in list view
        35288Issue in Inventory Popups
        36347Error Message
        37358Filtering by Headers in Leads
        38342New users can'´t login
        39360System Configuration
        40145related module is empty
        41179Potential-activities
        42203Inventory RL
        43211There is no option to create a Potential for a -contact
        44212Create Quote from Contact
        45354Critical security vulnerability in multi-instance -installations / multiple instance login problem
        46670Propegate Account Address info into New Contact
        47681Bug in utils.php function getListViewEntries
        48754User_name instead of firstname lastname used as -sender in emails
        49773In custom views of Tickets the Ticket id is -missing. Its also not possible to filter by ticket id's.
        50763Misspelling in KeyMetrics
        -

        3. Code Contributions

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        S. No -

        -
        Forums -

        -

        Description
        1 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=1954 -

        -
        GUI -

        rearrange fields within blocks?

        -

        Drag and drop for the fields with different blocks

        -

        -
        2 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=2750 -

        -
        Appropriate -

        tabindex for edit fields.

        -

        One more column is added to the fields table to get the tab

        -

        -
        3 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=2368 -

        -
        Release Relations in -Contacts and Accounts
        4 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=2852 -

        -
        Change the status of -the activities in CustomViews from Activities module
        5 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=2031 -(PDF format)In -the PDF -

        report, to get the address

        -on the right side of the page.
        6 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=1689 -

        -
        LDAP and Active -Directory Support Patch
        7 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=2364 -

        -
        Description -

        visible for History and Notes in Acc/Cnts List view.

        -

        -
        8 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=2748 -

        -
        Make a note before -closing the activity in Home Page
        9 -

        -
        http://forums.vtiger.com/viewtopic.php?p=13502#13502 - Post subject: Bug -resolved (Ticket ID 773): TicketId for dropdown lists...
        10 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=1692Adding -

        priority to Events

        -- Feature
        11 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=2617PDF's output -formatting.
        12 -

        -
        -

        http://www.vtiger.com/discussions/viewtopic.php?t=1530

        -
        Revised Tracker
        13 -

        -
        http://forums.vtiger.com/viewtopic.php?p=13396#13396 - New pdf from matt
        14 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=1585Displaying the -meeting in the calendar, Present in 4.2GA
        15 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=2029Import and Export -Products
        16 -

        -
        -

        http://www.vtiger.com/discussions/viewtopic.php?t=2000

        -
        During -

        'Import', the person who is importing the CSV files -'user_name' in is

        -assigned  to 'Assigned to' field
        17 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=2139When creating a 'New -

        Product'  there was an error in javascript. This is -integrated in

        -patch1
        18 -

        -
        -

        http://www.vtiger.com/discussions/viewtopic.php?t=2196

        -
        The world clock -doesn't show 12pm correctly. It was showing 00pm
        19 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=2524Scroll bars are -added to the -

        'Related List' of Account and contacts for 'Attachments & -Notes'

        -and 'History'
        20 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=2431Search ny Ticket id -in HelpDesk
        21 -

        -
        -

        http://www.vtiger.com/discussions/viewtopic.php?t=2406

        -
        If you write a -

        long description in an activity, it takes off a lot of space -because the text field is one column wide only.

        -

        -With this fix, the descriptions are spaned over all columns,
        22 -

        -
        -

        http://www.vtiger.com/discussions/viewtopic.php?t=2324

        -
        This will move -

        the vTiger logo upwards and the tabs will start from the left -of the page. I've applied this all the themes

        -except 'blue' theme
        23 -

        -
        -

        -

        ttp://www.vtiger.com/discussions/viewtopic.php?t=2025 -

        -
        The date -

        format required is YYYY-mm-dd however the popup uses -mm-dd-YYYY,

        -

        A diffeent format. Upon trying to submit changes, a date error -(js

        -alert) pops up stating invalid month
        24 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=2744 -

        -
        All users in a -activity can view it in Calendar
        25 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=3105 -

        -
        Imporved Emailing -system with easy mass mail support- given by Raju -

        -
        26 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=3100 -

        -
        One color by user in -Calendar -

        -
        27 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=3149 -

        -
        Vtiger php -installer script multilanguage -

        -
        28 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=3143 -

        -
        Fun with Google Maps -

        -
        29 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=3045 -

        -
        Automatic Inventory -Updating -

        -
        30 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=2681 -

        -
        Helpdesk Navigation. -

        In helpdesk, the navigation below the list view.

        -

        -
        31 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=2005 -

        -
        Patches- activity -rows on Home tab, custom activity view fix -

        -
        32 -

        -
        http://www.vtiger.com/discussions/viewtopic.php?t=1770 -

        -
        Make -QuickActivityRegister have enddate(duedate) -

        To have an end date,when creating an activity from the -calendar

        -

        -
        33 -

        -
        http://forums.vtiger.com/viewtopic.php?p=13390#13390 - UI improvement: -Tabbed details and related lists
        34 -

        -
        http://forums.vtiger.com/viewtopic.php?t=3251 -

        -
        Improved pagination -in List View -

        -
        35 -

        -
        http://forums.vtiger.com/viewtopic.php?t=3359 -

        -
        Tickets sorted by -ticket id desc -

        -
        36 -

        -
        http://forums.vtiger.com/viewtopic.php?t=2482 -

        -
        First release of -Communications and Mass Mailing -

        -
        37 -

        -
        http://forums.vtiger.com/viewtopic.php?t=3105 -

        -
        Imporved Emailing -system with easy mass mail support -

        -
        38 -

        -
        http://forums.vtiger.com/viewtopic.php?t=3226 -

        -
        Full Telephony -Integration -

        -
        39 -

        -
        http://forums.vtiger.com/viewtopic.php?t=3342 -

        -
        Report Filters in -PDF And Excel exports -

        -
        40 -

        -
        http://forums.vtiger.com/viewtopic.php?t=3079 -

        -
        Export Activities -to Palm -

        -
        41 -

        -
        http://forums.vtiger.com/viewtopic.php?t=3376 -

        -
        custom invoice view -using custom fields fix (4.2 Patch 2) -

        -
        42 -

        -
        http://forums.vtiger.com/viewtopic.php?t=3367 -

        -
        contactserialize.php -fixes (4.2 Patch 2) -

        -
        43 -

        -
        http://forums.vtiger.com/viewtopic.php?t=1954 -

        -
        GUI rearrange -fields within blocks -

        -
        44 -

        -
        http://forums.vtiger.com/viewtopic.php?t=3390 -

        -
        Hierarchical rights -

        -
        45 -

        -
        http://forums.vtiger.com/viewtopic.php?t=3143 -

        -
        -

        Fun with Google Maps

        -
        46 -

        -
        http://forums.vtiger.com/viewtopic.php?t=3247 -

        -
        -

        Simple Drupal Integration

        -
        47 -

        -
        http://forums.vtiger.com/viewtopic.php?t=3290 -

        -
        -

        Expenses Module Integration

        -
        48 -

        -
        http://forums.vtiger.com/viewtopic.php?t=3548 -

        -
        Activities and Notes -fixes for 4.2 patch 2
        49 -

        -
        http://forums.vtiger.com/viewtopic.php?t=3545 -

        -
        Invoice & Quotes -layout fixes
        50 -

        -
        http://forums.vtiger.com/viewtopic.php?t=2597 -

        -
        -

        Postgres Support

        -
        51 -

        -
        http://sourceforge.net/mailarchive/forum.php?thread_id=8380546&forum_id=44763 -

        -
        -

        Patch for customer Portal- Michael

        -

        fixed some typos

        -
        52 -

        -
        http://sourceforge.net/mailarchive/forum.php?thread_id=8365518&forum_id=44763 -

        -
        -

        Patch for Install - Michael

        -* fixed some typos and invalid html -

        * additional permissions check - prevent

        -

        'My Pipeline' showing a permissions error on new install

        -
        53 -

        -
        http://sourceforge.net/mailarchive/forum.php?thread_id=8365518&forum_id=44763 -

        -
        -

        Patch for vtigercrm nusoap - Michael

        -The following patch upgrades the version of -

        nusoap library from 0.67 to

        -

        0.69.

        -

        -
        54 -

        -
        http://forums.vtiger.com/viewtopic.php?t=3053&highlight=stema -

        -
        Arrange emails by -sent date
        55 -

        -
        -

        -
        -
        Enchanced PDF in -Quotes
        56 -

        -
        http://forums.vtiger.com/viewtopic.php?t=3509&highlight=vip -

        -
        Change Home Page -Order
        57 -

        -
        Overlapping of -company logo and product name while exporting in Invoice -

        -
         
        58overlapping of -company logo and product name while exporting in Invoice  
        59Description visible -for History and Notes in Acc/Cnts List view. 
        60Change the status of -the activities in CustomViews from Activities module 
        61Invoice & Quotes -layout fixes 
        62Arranging the home -page contributed by Mike has been integrated (Bug ID: 291) 
        63Imporved Emailing -system with easy mass mail support(Raju) (Bug ID: 500) 
        64Displaying Emails by -Sent date order(Rcleeve)(Bug ID: 687 ) 
        65Arranging the blocks -in settings page(comes under a code contribution) (Bug ID: 648 )  
        -

        Known Issues

        -

        1) While creating a new user, by default 'Organisation' will be -set  as 'Role' to the user. Kindly change it to  your -specified role before saving, if 'Organisation' is set as role the -user, the will not be able to login to the application.

        -

        2) When sending mass mail form -Leads/Contact/Accounts, validation is not done in 'To' field.

        -

        -

        3) In Block Re-arrangement Feature, -If is a field is moved to a unused/new block, the field will not be -displayed.

        -

        -

        4) In Email Listview, if mail is -sent to mutiple recipients the entries will be displayed twice.

        - - + +vtiger CRM 5 Beta: Release Notes + + + + + +

        +

         

        +

        vtiger CRM 5.0.1: Release Notes

        +

        Date: Octoer 10, 2006

        +

        Hi All,

        +

        We are happy to bring out yet another release of vtiger CRM, with much more + capabilities, interesting code contributions and whole lot of Bug fixes..

        +

         

        +

        Table of Contents

        +
          +
        1. Summary
        2. +
        3. Features
        4. +
        5. Bug Fixes
        6. +
        7. Known Issues
        8. +
        +

        1. Summary

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. NoItemStatus
        1 Features 
        2Product SizePlatform Independent - 6.1 MB
        + Windows (EXE) - 26 MB
        + Linux (BIN) - 43 MB
        3Database MigrationAvailable for migrating data from 4.2.3 + , 4.2.4, or 5.0 RC to v5.0.1. No database changes from 5.0.0 to 5.0.1
        4Product Download Click + Here
        5vtiger CRM - PHP Documentation URL: Click + Here
        6Product Documentation +

        Available at the Wiki

        +
        +

        2. Features

        +
          +
        • UTF-8 Support
        • +
        +

        3. Bug Fixes

        +

        We have fixed about 71 issues after v5.0 Release and intergrated code contributions + from the community. Please refer our vtiger + CRM Bug Tracker.

        +

        4. Known Issues

        +

        We have about 121 issues to be fixed. You can refer our + vtiger CRM Bug Tracker for the details of these issues.

        +

         

        +

         

        +
        +

         

        +

        vtiger CRM 5.0.0: Release Notes

        +

        Date: Sep 14, 2006

        +

        Welcome to vtiger CRM!

        +

        vtiger CRM is an enterprise-ready open source CRM solution for managing sales, marketing, customer support and order management functions effectively. Before version 5 release, vtiger CRM has passed through more than 10 development cycles.

        +

        Table of Contents

        +
          +
        1. Summary
        2. +
        3. Features
        4. +
        5. Bug Fixes
        6. +
        7. Known Issues
        8. +
        +

        1. Summary

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. NoItemStatus
        1 Features  +
        2Product SizePlatform Independent - 6.1 MB
        +
        Windows (EXE) - 26 MB
        + Linux (BIN) - 40 MB
        3Database MigrationAvailable for migrating data from 4.2.3 , 4.2.4, or 5.0 RC to v5.0
        4Product Download Click Here
        5vtiger CRM - PHP Documentation URL: Click Here
        6Product Documentation

        Available at the Wiki

        +

        2. Features

        +
          +
        • AJAX based User Interface
        • +
        • Color Schemes
        • +
        • Enterprise-grade Security Management
        • +
        • Calendaring
        • +
        • Email Client
        • +
        • Customization
        • +
        • Reports & Dashboard
        • +
        • Order Management
        • +
        • Marketing Automation
        • +
        +

        For more details refer to: http://www.vtiger.com/products/crm/v5-release-notes.pdf

        +

        3. Bug Fixes

        +

        We have fixed about 200 issues after v5 RC release. For more details, kindly refer to the vtiger CRM Bug Tracker.

        +

        4. Known Issues

        +

        As on Sep 14, 2006 there are about 178 open issues. For more details, kindly refer to the vtiger CRM Bug Tracker:

        +
        +

        vtiger CRM 5.0 RC1: Release Notes

        +

        Date: Aug 14, 2006

        +

        vtiger CRM 5.0 RC1, is ready for the last-round of validation before GA release!

        +

        Last few days, we have worked hard to make vtiger CRM more user friendly, bug free, and ready for real-time deployment. We thank our community members who spent their valuable time & energy with us and making the RC release successful.

        +

        We have few bugs remained in our basket and there are some formalities need to be completed before announcing the public release for the real time deployments. In the meantime, kindly help us by reporting bugs that you might have encountered in RC release version. Your suggestions and feedback will definitely help us providing a smooth transition from v4.2.x to next the generation vtiger CRM.

        +

        Major changes in the current update are new "woodspice" theme, calendar enhancements, fully customizable tax calculations, and re-desigend post-installation configuration wizard. We have also fixed about 350 bugs after version 5 Beta 2 release.

        +

        IMPORTANT NOTES:

        +
          +
        • We strongly recommend CRM community NOT to USE vtiger CRM 5 RC1 for any deployments. In case you are looking for an immediate CRM solution for your business, please consider using the vtiger CRM 4.2.3 (latest stable version), which can be downloaded from vtiger.com.
        • +
        • Database migration script is provided for migrating data from v4.2.3 to v5 RC1 only for testing purpose. Hence users are strongly recommended to take a backup of the the v4.2.3 data before testing the migration scripts.
        • +
        • Database migration script is not provided for migrating data from v 5 Beta releases to v5 RC1. Hence users are strongly recommended to take a backup of the the v 5 Beta data before testing the migration script.
        • +
        +

        Appeal to Developers, Testers, Analysts, Writers, and real end users!

        +

        Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 RC1,

        +

        Step 1: Browse through Live Demo

        +

        Step 2: Download product from the vtiger.com and install in your favorite OS.

        +

        Step 3: Post your suggestions & comments at vtiger Discussions under : vtiger CRM 5.x category

        +

        Table of Contents

        +
          +
        1. Summary
        2. +
        3. Features
        4. +
        5. Bug Fixes
        6. +
        7. Known Issues
        8. +
        +

        1. Summary

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. NoItemStatus
        1 Features +

        10

        3Product SizePlatform Independent - 5.6 MB
        +
        Windows (EXE) - 26 MB
        + Linux (BIN) - 40 MB
        4Database MigrationAvailable only for the Testing Purpose. Data (Migration script from v4.2.3 to v5 RC1)
        5vtiger CRM - PHP Documentation URL: Click Here
        6Product Documentation

        Available at the Wiki

        +

        2. Features

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. No Feature
        1Customizable tax calculations for quotes, orders, and invoices.
        2Add new values to the Status field in Inventory, Potentials, and FAQ modules +.
        3PO, SO, Invoice - Status and Quote Stage history.
        4Manage product wise discounts and grand discount while generating quotes, orders, and invoices.
        5Manage individual or group taxes.
        6Adding same product more than once in line items list.
        7Attach documents to the tickets.
        8Add negative adjustments in quotes, orders, and invoices .
        9Enhancements in Live Chat tool.
        10Unsubscribe form in compliance with CAN Spam act.
        +

         

        + + + + + + +
        +

        Note:

        +

        Configuring Web services to update Publicly traded company profiles (With Ticker symbol in Accounts) In Account module, if ticker symbol is specified, company profile will be displayed on top of Edit view page. For this specify the server name, port number, user name and password has in class_http/class_http.php under <vtiger CRM Home> directory.

        +

        Line: 166

        +

        Assign values to the given variables: $server,$port,$user,$pwd

        +

        Bug Fixes

        +

        We have fixed about 350 issues after v5 Beta 2 release. For more details, kindly refer to the vtiger CRM Bug Tracker:

        +

        http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&group=owner&version=5.0.0&order=priority

        +

        4. Known Issues

        +

        As on Aug 13, 2006 there are about 100 open issues. For more details, kindly refer to the vtiger CRM Bug Tracker:

        +

        http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&status=assigned&status=reopened&group=owner&version=5.0.0&order=priority

        +
        +

        vtiger CRM 5.0 Beta 2: Release Notes

        +

        Date: July 05, 2006

        +

        vtiger CRM 5.0 Beta 2 release is ready for end-user community testing. The intent of this release is to showcase to the vtiger community, the significant changes made after v5 Beta release i.e., changes since May, 06'. The noteworthy features in v5 Beta 2 are New user interface for Settings module, Audit Trails as part of the security management, complete Web mail integration (including Outgoing and Incoming mail capability), edit custom fields, enhanced user interface for Calendar, optimized the database queries further for List Views function in all the modules, and others.

        +

        IMPORTANT NOTES:

        +
          +
        • We strongly recommend CRM community NOT to USE vtiger CRM 5 Beta 2 for any real-time deployments. In case you are looking for an immediate CRM solution for your business, please consider using the vtiger CRM 4.2.3 (latest stable version), which can be downloaded from vtiger.com.
        • +
        • vtiger CRM user interface can be best viewed in Mozilla/Firefox. We have some page loading page formatting issues in Internet Explorer, which will be fixed very soon.
        • +
        • JpGraph used for generating dashboards has been replaced by ImageGraph, a third party charting software.
        • +
        • Database migration script is provided for migrating data from v4.2.3 to v5 Beta 2 only for testing purpose. Hence users are strongly recommended to take a backup of the the v4.2.3 data before testing the migration script.
        • +
        • Database migration script is not provided for migrating data from v 5 Beta to v5 Beta 2. Hence users are strongly recommended to take a backup of the the v 5 Beta data before testing the migration script.
        • +
        +

        Appeal to Developers, Testers, Analysts, Writers, and real end users!

        +

        Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 Beta 2,

        +

        Step 1: Browse through Live Demo

        +

        Step 2: Download product from the vtiger.com and install in your favorite Operating System.

        +

        Step 3: Post your suggestions & comments at vtiger Discussions under : vtiger CRM 5.x category

        +

        Table of Contents

        +
          +
        1. Summary
        2. +
        3. Features
        4. +
        5. Bug Fixes
        6. +
        7. Known Issues
        8. +
        +

        1. Summary

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. NoItemStatus
        1 Features +

        12

        3Product SizePlatform Independent - 5.2 MB
        +
        Windows (EXE) - 26 MB
        + Linux (BIN) - 40 MB
        4Database MigrationAvailable only for the Testing Purpose. Data (Migration script from v4.2.3 to v5 Beta 2)
        5vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click Here
        6Product Documentation

        Available at the Wiki

        +

        2. Features

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. No Feature
        1Proxy Server configuration for accessing RSS feeds and information based on Ticker Symbol
        2Vertical bar chart in Home page
        3Security Management support for Emails module
        4Database table prefix support for a deploying vtiger CRM in other working databases
        5Audit Trial support for tracking all users system access details
        6Last 5 records visited
        7New User interface for Settings module
        8Print Report function
        9Email Detail View from Related List
        10Attach multiple documents to email message
        11Delete option for Tag cloud
        12AJAX based edit option for User details
        +

         

        + + + + + + +
        +

        Note:

        +

        Configuring Web services to update Publicly traded company profiles (With Ticker symbol in Accounts) In Account module, if ticker symbol is specified, company profile will be displayed on top of Edit view page. For this specify the server name, port number, user name and password has in class_http/class_http.php under <vtiger CRM Home> directory.

        +

        Line: 166

        +

        Assign values to the given variables: $server,$port,$user,$pwd

        +

        Bug Fixes

        +

        We have fixed about 1000 issues after v5 Beta release. For more details, kindly refer to the vtiger CRM Bug Tracker:

        +

        http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&group=owner&version=5.0.0&order=priority

        +

        4. Known Issues

        +

        As on July 5, 2006 there are about 100 open issues. For more details, kindly refer to the vtiger CRM Bug Tracker:

        +

        http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=new&status=assigned&status=reopened&group=owner&version=5.0.0&order=priority

        +
        +

        vtiger CRM 5.0 Beta: Release Notes

        +

        Date: May 31, 2006

        +

        vtiger CRM 5.0 Beta release is ready for end-user community testing. The intent of this release is to showcase to the vtiger community, the significant changes made after v5 Alpha 5 release i.e., changes since Apr , 06' . The noteworthy features in v5 Beta are complete Web mail integration (including Outgoing and Incoming mail capability), Office Plugin, Outlook Plugin, Customer Portal, Web-Forms, Firefox Toolbar, + + + edit custom fields, + +new user interface for Calendar, optimized the database queries for List Views function in all the modules, and others. In addition to this, we have  conducted performance testing for some of the modules using a popular Web Based Testing Software (AdventNet QEngine 6.0), which helped us to identify some of the bottlenecks in performance. We have also published the Performance Testing reports. We thank AdventNet for permitting us to make use of this interesting software and we gladly recommend it to everyone too, not because AdventNet allowed us to use it but because it is really good.

        +

        Note:

        +

        IMPORTANT NOTES:

        +
          +
        • We strongly recommend CRM community NOT to USE vtiger CRM 5 Beta for any real-time deployments. In case you are looking for an immediate CRM solution for your business, please consider using the vtiger CRM 4.2.3 (latest stable version), which can be downloaded from vtiger.com.
        • +
        • vtiger CRM user interface can be best viewed in Mozilla/Firefox. We have some page loading page formatting issues in Internet Explorer, which will be fixed very soon.
        • +
        • JpGraph used for generating dashboards has been replaced by ImageGraph, a third party charting software.
        • +
        • Database migration script is provided for migrating data from v4.2.3 to v5 Beta only for testing purpose. Hence users are strongly recommended to take a backup of the the v4.2.3 data before testing the migration script.
        • +
        +

        Appeal to Developers, Testers, Analysts, Writers, and real end users!

        +

        Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 Beta,

        +

        Step 1: Browse through Live Demo

        +

        Step 2: Download product from the vtiger.com and install in your favorite Operating System.

        +

        Step 3: Post your suggestions & comments at vtiger Discussions under : vtiger CRM 5.x category

        +

        Table of Contents

        +
          +
        1. Summary
        2. +
        3. Features
        4. +
        5. Known Issues
        6. +
        +

        1. Summary

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. NoItemStatus
        1 Features +

        28

        3Product SizePlatform Independent - 5.0 MB
        +
        Windows (EXE) - 26 MB
        + Linux (BIN) - 40 MB
        4Database MigrationAvailable only for the Testing Purpose. Data (Migration script from v4.2.3 to v5 Beta)
        5vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click Here
        6Product Documentation
        +

        2. Features

        + +
          +
        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S.NoFeature
        1Organization Hierarchy (Roles) can be defined using tree based structure
        2Recalculate sharing rules option is provided
        3Security Support for Campaigns module
        4Security Support for Ajax actions done
        5Role selection popup integrated.
        6Duplicate handling for Roles, Profiles and Groups done
        7Module and record-level security support for Create/Edit/Duplicate/Delete Mass Delete, Mass Change Owner, Mass Change Status functions
        8Security Support for Quick Create functions
        9Security Support for Lookup
        10Security Support for Settings module
        11Security Support for Convert Lead feature
        12Email Templates are fully functional with merge field value substitution for Leads, Contacts, Accounts, and Users Modules
        13Module and Record Level Security implemented for Mass Delete, Change Owner & Change Status Buttons across product
        14Internationalization of the product across all modules
        15Smarty templates are used for My Preferences / List Mail Server
        16Option to create Multi select combo-box in Custom Field
        17Option to edit custom fields
        18Calendar module is completely redesigned
        19List View, Detail View and Edit View queries are optimized for a better performance
        20New user interface for Currency Configuration and Custom Field Settings
        21New user interface for Convert Lead function
        22Log entry for all functions are incorporated
        23AJAXified New Email functionality
        24New user interface for Reports
        25New user interface for MySites
        26New user interface for Attachments
        27New RSS reader has been integrated for a better performance
        28Mass Change owner option in various modules
        29Inventory Revamped
        30Advanced and Basic Search UI changed
        31Automatic Tax Calculator Integrated
        32Pagination to the related list added
        33Migration support from 4.2.3 to 5.0 Beta Integrated
        +

         

        + + + + + + +
        +

        Note:

        +

        1. Configuring Web services to update Publicly traded company profiles (With Ticker symbol in Accounts) In Account module, if ticker symbol is specified, company profile will be displayed on top of Edit view page. For this specify the server name, port number, user name and password has in class_http/class_http.php under <vtiger CRM Home> directory.

        +

        Line: 166

        +

        Assign values to the given variables: $server,$port,$user,$pwd

        +

        3. Known Issues

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S.NoKnown Issue
        1While creating a new e-mail using the e-mail template, the values for the fields will not appear in the e-mail
        2Web mail has been moved from ajax/js to prototype framework
        3 Error are not handled properly in Web mail module
        4 Attachments will not work properly in Web mail module
        5 When deleting the groups, the ownership of the records that are owned by the group that is being deleted should be changed. This functionality is not handled in v5 Beta
        6 When the data of a group is shared with other users/groups, the  records owned by the sub groups users will be shared properly but the records owned by the sub-group will not be shared
        7 PHP 5 related exception while saving a ticket or potential
        8 Security support not done for New Emails Module
        9Security implementation in Custom View, Reports, Dashboards has some issues
        10 Detail View Ajax edit has security issues
        11 Security support for Calendar is not done
        12 Security is not implemented in import and export queries
        13 Home Page Security Support has issues
        14 Form Validation for Notes non-functional
        15 Events Scheduled after more than 1 hour gets displayed only at the start of the Hour - Calendar
        16 Navigation missing in mini calendar
        17 While editing the custom field, the field length and type are mismatched
        18 custom field create Pop UI is not proper in IE browser
        19 Send reminder will not work for To do
        20 In campaign related list we have shown the newly created contacts and leads. but in Contact and Lead related list we are not showing the campaign relationship. i.e.., in contact and lead related list there is no table for campaigns. whether we should show this relationship or is this the expected behavior?
        21 In the week calendar you can create event for any old day (even for year 2005). It is better to have a date validation.
        22 From a entity detail view, if we click on edit button then the edit view page shows. now there is one more tan more information. if i click on that tab it shows the related list now if we click on Entity information it goes to detail view instead of edit view
        23 If i add a to do it is not showing the to do list instead it is showing the Events
        24 Not able to delete template documents if there is not more that one
        25 All file types are allowed while uploading template documents
        26Multiple attachments is not supported in Emails
        27 Export to excel is not working in PHP5
        +
        +

        vtiger CRM 5.0 Alpha 5: Release Notes

        +

        Date: April 07, 2006

        +

        vtiger CRM 5.0 release is another release in v5 alpha release cycle, which is currently in active development phase. The intent of this release is to showcase to the vtiger community, the significant changes made after v5 Alpha 4 release i.e., changes since Mar 31, 06' . The noteworthy features in v5 Alpha 5 are new user interface for Company Information, Email templates, Company information, Outgoing mail server, Announcements, RSS, optimized the database queries for List Views function in all the modules, and others. In addition to this, we have  conducted performance testing for some of the modules using a popular Web Based Testing Software (AdventNet QEngine 6.0), which helped us to identify some of the bottlenecks in performance. We will publish the performance reports soon. We thank AdventNet for permitting us to make use of this interesting software and we gladly recommend it to everyone too, not because AdventNet allowed us to use it but because it is really good.

        +

        IMPORTANT NOTES:

        +
          +
        • We strongly recommend CRM community NOT to USE vtiger CRM 5 Alpha 5 for any real-time deployments. In case you are looking for an immediate CRM solution for your business, please consider using the vtiger CRM 4.2.3 (latest stable version), which can be downloaded from vtiger.com.
        • +
        • JpGraph used for generating dashboards has been replaced by ImageGraph, a third party charting software.
        • +
        • Database migration script is provided for migrating data from v4.2.3 to v5 Alpha 5 only for testing purpose. Hence users are strongly recommended to take a backup of the the v4.2.3 data before testing the migration script.
        • +
        +

        Appeal to Developers, Testers, Analysts, Writers, and real end users!

        +

        Jump-start to the vtiger Public Discussions and post your valuable suggestions & comments to help us deliver a world class open source CRM for you in another few weeks time. It is very simple to start working with vtiger CRM 5 Alpha 5,

        +

        Table of Contents

        +
          +
        1. Summary
        2. +
        3. Features
        4. +
        5. Bug Fixes
        6. +
        7. Known Issues
        8. +
        +

        1. Summary

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. NoItemStatus
        1 Features +

        15

        2Bug Fixes 2
        3Product SizePlatform Independent - 5.3 MB
        +
        Windows (EXE) - 26 MB
        + Linux (BIN) - 40 MB
        4Database MigrationAvailable only for the Testing Purpose. Data (Migration script from v4.2.3 to v5 alpha 5)
        5vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click Here
        6Product Documentation
        +

        2. Features

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. NoFeature
        1 Smarty template applied to Currency Configuration Feature
        2 List View feature database queries are optimized for all the modules
        3 PHP API documentation for some of the major functions
        4 New module called Marketing is added. Campaigns module is now part of Marketing primary module.
        5 AJAXified Notification Schedulers
        6 AJAXified Inventory Notifications
        7 AJAXified Picklist Settings
        8 AJAXified Assign Module Owners
        9 New UI for Integration of Mail Merge Templates
        10 New UI for Company Information
        11 New UI for Outgoing Mail Server
        12 New UI for Backup Server Configuration
        13 New UI for Terms and Conditions
        14 New UI for Announcements
        15 New UI for RSS module
        +

         

        + + + + + + +
        +

        Note:

        +

        1. Configuring Web services to update Publicly traded company profiles (With Ticker symbol in Accounts) In Account module, if ticker symbol is specified, company profile will be displayed on top of Edit view page. For this specify the server name, port number, user name and password has in class_http/class_http.php under <vtiger CRM Home> directory.

        +

        Line: 166

        +

        Assign values to the given variables: $server,$port,$user,$pwd

        +

        Bug Fixes

        + + + + + + + + + + + + + + + + + + +
        SL No. Ticket ID Description
        1 - There seems to be two "search in emails" icons on the email page
        2 - Quick create drop down menu enabled.
        +

        3. Known Issues

        +
          +
        • While creating a new e-mail using the e-mail template, the values for the fields will not appear in the e-mail
        • +
        • Webmail has been moved from ajax/js to prototype framework
        • +
        • Error are not handled properly in Webmail module
        • +
        • Attachments will not work properly in Webmail module
        • +
        • When deleting the groups, the ownership of the records that are owned by the group that is being deleted should be changed. This functionality is not handled in v5 Alpha 5
        • +
        • When the data of a group is shared with other users/groups, the  records owned by the sub groups users will be shared properly but the records owned by the sub-group will not be shared
        • +
        • PHP 5 related exception while saving a ticket or potential
        • +
        +
        +

        vtiger CRM 5.0 Alpha 4: Release Notes

        +

        Date: March 31, 2006

        +

        vtiger CRM 5.0 Alpha 4 release is currently in active development phase. The + intent of this release is to showcase to the vtiger community, the significant + changes made after v5 Alpha 3 release i.e., changes since Mar 21, 06' . The + noteworthy features in v5 Alpha 3 are create database for vtiger CRM online + through Configuration Wizard, edit custom fields,and so others. In addition, + we are also supporting much awaited PHP 5 and MySQL 5.1.x database. + Please note, the vtiger CRM 5 Alpha 4 will not work with MySQL 4.0.x.
        +

        +

        NOTE: We strongly recommend CRM community NOT to USE vtiger CRM 5 + Alpha 4 for real-time deployment. In case you are looking for an immediate + CRM solution for your business, please consider using the vtiger CRM 4.2.3 + (latest stable version), which can be downloaded from vtiger.com.

        +

        Appeal to Developers, Testers, Analysts, Writers, and end users! +

        +

        Jump-start to vtiger Public Discussions and post your valuable suggestions + & comments to help us deliver a world class open source CRM for you in another + few weeks time. It is very simple,

        +

        Table of Contents

        +
          +
        1. Summary
        2. +
        3. Features
        4. +
        +

        1. Summary

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. NoItemStatus
        1 Features +

        8

        +
        2 Product SizePlatform Independent - 8.3 MB
        +
        Windows (EXE) - 28 MB
        + Linux (BIN) - 43 MB
        3Database MigrationNot Available
        4vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click + Here
        5 Product DocumentationAvailable at the Wiki
        +

        2. Features

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. NoFeature
        1 Support for PHP5
        2 Support for MySQL 5
        3 Removed duplicate code base
        4 Removed junk methods in code base
        5Product API cleanup operation initiated
        6Optimized the product performance a bit by restricting the + database queries, used flat files to store commonly used data instead of + repeated database queries.
        7Create database for vtiger CRM online through Configuration + Wizard
        8Modify custom fields
        +

         

        + + + + + + +
        +

        Note:

        +

        1. Configuring Web services to update Publicly traded company profiles + (With Ticker symbol in Accounts) In Account module, if ticker symbol + is specified, company profile will be displayed on top of Edit view page. + For this specify the server name, port number, user name and password + has in class_http/class_http.php under <vtiger CRM Home> directory.

        +

        Line: 166

        +

        Assign values to the given variables: $server,$port,$user,$pwd

        +
        +

        3. Known Issues

        +
          +
        • Dashboards feature will not function in Alpha 4 because of PHP 5 support. + We are working with an alternative graphs package, which will be available + during next update.
        • +
        +
        +

        vtiger CRM 5.0 Alpha 3: Release Notes

        +

        Date: March 21, 2006

        +

        vtiger CRM 5.0 Alpha 3 release is currently in active development phase. The + intent of this release is to showcase to the vtiger community, the significant + changes made after v5 Alpha 2 release i.e., changes since Feb 28, 06' . The + noteworthy features in v5 Alpha 3 are enhanced user interface for Home page, + security scope for reports and dashboards, integration of AJAX based Chat application, + new user interface for System Administration, global search function for all + the modules, tag based grouping of the records, and so forth. In addition, we + are also supporting much awaited MySQL 5.0.19 and MySQL 4.1.x + database systems. Please note, the vtiger CRM 5 Alpha 3 will not work with MySQL + 4.0.x.
        +

        +

        NOTE: We strongly recommend CRM community NOT to USE vtiger CRM 5 + Alpha 3 for real-time deployment. In case you are looking for an immediate + CRM solution for your business, please consider using the vtiger CRM 4.2.3 + (latest stable version), which can be downloaded from vtiger.com.

        +

        Appeal to Developers, Testers, Analysts, Writers, and end users! +

        +

        Jump-start to vtiger Public Discussions and post your valuable suggestions + & comments to help us deliver a world class open source CRM for you in another + few weeks time. It is very simple,

        +

        Table of Contents

        +
          +
        1. Summary
        2. +
        3. Features
        4. +
        +

        1. Summary

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. NoItemStatus
        1 Features +

        23

        +
        2 Product SizePlatform Independent - 9.3 MB
        +
        Windows (EXE) - 26 MB
        + Linux (BIN) - 39 MB
        4 Database MigrationNot Available/Will Not be Available
        5 vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. URL: Click + Here
        6 Product DocumentationAvailable at the Wiki
        8 Source Code LabelVTIGERCRM_5_ALPHA3
        +

        2. Features

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. NoFeature
        1 Sleek Home page user interface
        2 Demo data populated across the + modules
        3 Manage RSS feeds completely
        4 Manage frequently visited sites + in mySites module
        5Prototype, a third-party package + bundled with the product
        6Email Templates module redesigned +
        7Custom Views in all the modules + are redesigned using Smarty templates
        9Shared/Group Calendar with multiple + users
        10Slide show of the users' photos + in Users List View
        11Search records easily by tagging + a set of records
        12Newly designed Calculator and + Clock are integrated
        13Fade effect while accessing different + sub-tabs in User Detail View
        14Integrated AJAX based third-party + Chat application.
        15AJAXified Mass Delete function + in all the modules
        16AJAXified Custom View for all + modules
        17 AJAXified Change Owner and Change + Status functions in Leads module
        18Security Management User Interface + is completely redesigned
        19Advance search functions integrated + only for Leads module
        20Security feature enabled for + Reports and Dashbords Home Page
        21Global search for all the modules
        22MySQL 5.0.19 database support
        23Delete handling in security module
        +

         

        + + + + + + +
        +

        Note:

        +

        1. Configuring Web services to update Publicly traded company profiles + (With Ticker symbol in Accounts) In Account module, if ticker symbol + is specified, company profile will be displayed on top of Edit view page. + For this specify the server name, port number, user name and password + has in class_http/class_http.php under <vtiger CRM Home> directory.

        +

        Line: 166

        +

        Assign values to the given variables: $server,$port,$user,$pwd

        +

        2. Shoutbox feature has been phased out.

        +
        +
        +

        vtiger CRM 5.0 Alpha 2: Release Notes

        +

        Date: February 28, 2006

        +

        vtiger CRM 5.0 Alpha 2 release is currently in active development phase. The + intent of this release is to showcase to the vtiger community, the +significant changes made after v5 Alpha release ie changes since Jan +16, 06' . The noteworthy features in v5 Alpha 2 are Campaign management +for marketing folks, enhanced predefined dashboards, AJAXified myPortal +module, intuitive System Administration, integration of Web services to +update all your public listed customer/company profiles, view +multidimensional models for product catalog, latest news on company +updates, redesigned Customer Self-service portal,etc. In addition, we +are also supporting much awaited MySQL 4.1.x database system. Please note, the Alpha2 will not work with MySQL 4.0.x
        +

        +

        NOTE: We strongly recommend CRM community NOT to USE vtiger CRM 5 + Alpha 2 for real-time deployment. In case you are looking for an immediate + CRM solution for your business, please consider using the vtiger CRM 4.2.3 + (latest stable version), which can be downloaded from vtiger.com.

        +

        Appeal to Developers, Testers, Analysts, Writers, and end users! +

        +

        Jump-start to vtiger Public Discussions and post your valuable suggestions + & comments to help us deliver a world class open source CRM for you in another + few weeks time. It is very simple,

        +

        Step 1: Browse through Live Demo: http://vtiger.com/demo/alpha2

        +

        Step 2: Ready with LAMP/WAMP, Download product + from:

        +

        Step 3: Post your suggestions & comments at + vtiger Discussions under : vtiger + CRM 5.x category

        +

        Table of Contents

        +
          +
        1. Summary
        2. +
        3. Features
        4. +
        5. Bug Fixes
        6. +
        7. Known Issues
        8. +
        +

        1. Summary

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. NoItemStatus
        1 + Features +

        27

        +
        2 + Product SizeSource - 9.3 MB
        3 + Bug Fixes18
        4 + Database MigrationNot Available/Will Not be Available
        5 + vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. + URL: Click + Here
        6 + Product DocumentationAvailable at the Wiki
        7 + List of files modified between + alpha and alpha 2 +  
        8 + Source Code LabelVTIGERCRM_5_ALPHA2
        9 + Known Issues11
        +

        2. Features

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        Sl No. + Ticket IDDescription
        1-Enhanced Dashboards with more + than 20 charts
        2 + -Multiple currency support and + currency conversion through Web service integration
        3-Campaign Management module for + Marketing automation
        4 + -Update some of your publicly + traded accounts details online using Web services integration. Input only + the Ticker Symbol in Account page and update the other real-time data. (Refer + to Note)
        5 + -Stay-in-touch with your customers' + by uploading their photos.
        6 +   + Analyze your customers business + performance based on their Web traffic.
        7 + 779 + Show/Hide HTML Editor (FCKEditior).
        8 + 1000Send E-mail notification to assigned + users when potential is updated.
        9 + 1006 Send E-mail notification to other + users.
        10 + 736Show latest/new leads on a Home + page.
        11- Ajax-based multidimensional + product images upload.
        12 + - + Contact Images Scrolling in Contact + ListView
        13 + - + Ajax-based my Portal module + under Tools tab.
        14-In Home page, display the status + of modified records since last logout for users.
        15 + - + Tag Cloud - Integration + (http://tagcloud.com)
        16 + - + Company-wide Announcements configuration + from Settings.
        17 + - + Thumbnail view on Mouseover for + Contact images in List View.
        18 + - + Upload vtiger CRM + Users' photos.(Not Working)
        19 + - + Resize the users photos and create + thumbnails.(Not Working)
        20 + - + Attach multiple files in single + step.
        21 + - + FCK editor upgraded to the latest + version (v2.2).
        22 + - + Shout Box integration with vtiger + CRM Home page for vtiger users to chat online.
        23 + - + Tabbed approach of Detail View + information. Sections are spited to Basic & More for Leads, + Accounts, Contacts, Potentials & Product modules.
        24 + 445 + Addition of multiple + Contacts in Activities, Emails, Potentials, Vendors related lists.
        25 + - + Add New E-mail in Related List + of Leads & Contacts.
        26 + 502 Address Inheritance for Contacts.
        27 + - + Ajaxified detail view for all + modules.
        28-Separate Log Messages for Security + Management.
        +

         

        + + + + +
        +

        Note: Configuring Web services to update + Publicly traded company profiles (With Ticker symbol in Accounts) + + In Account module, if ticker symbol is specified, company profile will + be displayed on top of Edit view page. For this specify the server name, + port number, user name and password has in class_http/class_http.php under + <vtiger CRM Home> directory.

        +

        Line: 166

        +

        Assign values to the given variables: $server,$port,$user,$pwd

        +

         

        +
        +

        3. Bug Fixes

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        SL No. + Ticket ID + Description
        1 + 1058While creating customview for + salesorder return action is not redirected to Salesorder Listview.
        2 + 1070In activity related list,when + I click on "Activity Information" link,activity detailview is not displayed +
        3 + 1067minute combo box + of duration field is not displaying proper values
        4 + -In Popup SalesOrder and PurchaseOrder + "Hacking attempt" exception is thrown.
        5 + - + Adding New Event in Potential + Relatedlist will not be working
        6 + - + In Listview when a set of accounts + are selected and 'sendmail' button is clicked, finally in email editview + the addresses are populated both in To and cc field
        7 + 866Problem with ticket creation
        8 + 898 Attachment Error Message not + proper
        9 + 913 parent email id is not selected + when select a single contact or lead from listview-send mail
        10 + 1011Customer portal issue
        11 + 1034 export of accounts
        12 + 1077can not add email id in 'To' + field of email
        13 + 1088Ticket notification with wrong + signature
        14 + - + Create New User, Edit & Detail + View of the My Preference/Settings Smartified +
        15 + - + In create customview 'Choose + columns' the 'Event information' and 'Event Description' does'nt list
        16 + - + Security Support for Reports +
        17 + - + Activity Reminder Notification + email
        18 + 964 + Activities are not in start date + order and not configurable
        +

        4. Known Issues

        +
          +
        • Added the Product Details Block in the Inventory module of SalesOrder, PurchaseOrder, + Invoice & Quotes. But the functionality of the same is to be worked upon.. + This has to be done for create, edit & detail view.
        • +
        • Event created from calendar will not be displayed in the calendar
        • +
        • Some of the features in the Inventory management related modules will not + function properly. The Smarty templates are not applied fully.
        • +
        • In this release only one theme (blue) is supported. You cannot use the other + bundled themes.
        • +
        • Some of the Related List View functions may not work properly.
        • +
        • In the Basic search, Search by Alphabets, and some of the field Search like + Quote ID, Notes, Related To will not work.
        • +
        • Advance Search will not work in all the modules.
        • +
        • Calendar functionality is not functional, we are providing only the UI.
        • +
        • In home page pipeline and calendar will not be displayed.
        • +
        • Reports are not fully functional. You may experience some errors while working + with reports.
        • +
        • Quick create and global search are not supported.
        • +
        +

        5. List of Files Changed from V 5 alpha to V 5 alpha + 2

        +
          +
        • List of Changed files
        • +
        • Files Moved to Attic 
        • +
        +
        +

        vtiger CRM 5.0 Alpha 1: Release Notes

        +

        Date: January 16, 2006

        +

        vtiger CRM 5.0 Alpha release is only for the testing purpose. The +complete front-end architecture has been redesigned using the Smarty +Template Engine (http://www.smarty.php.net/download.php ) and some +of the features and bugs fixed in earlier versions may not work. Please +feel free to report bugs at:

        +

        http://bugs.vtiger.com

        +

        Table of Contents

        +
          +
        1. Summary
        2. +
        3. Features
        4. +
        5. Bug Fixes
        6. +
        7. Known Issues
        8. +
        +

        1. Summary

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. NoItemStatus
        1 + Features +

        3 +

        +
        2 + Product SizeWindows - 27.5 MB +Linux - 39 MB +Source - 9.8 MB
        3 + Bug Fixes103
        4 + Code Contributionshttp://www.vtiger.com/wiki/index.php/Vtiger_CRM_Code_Contributions +
        5 + Database Migration + Not Available
        6 + vtiger CRM - PHP DocumentationDownload from vtigercrm project in SF.net. +URL: http://prdownloads.sourceforge.net/vtigercrmvtiger_CRM_5_Alpha_PhpDocs.zip?download
        7Product DocumentationAvailable at the Wiki
        8Source Code LabelVTIGERCRM_5_ALPHA
        9 + Known Issues10
        +

        2. Features

        +
          +
        • UI interface has been redesigned based on Smarty template engine.
        • +
        • Bug fixes based on the Operation Consolidation list.
        • +
        • Security Management enhancements. For more detail refer to vtigercrm5_alpha_Security.html
        • +
        +

        3. Bug Fixes

        +

        Refer to the following links:

        + +

        4. Known Issues

        +
          +
        • Some of the features in the Inventory management related modules +will not function properly. The Smarty templates are not applied fully.
        • +
        • In this release only one theme (blue) is supported. You cannot +use the other bundled themes.
        • +
        • Some of the Related List View functions may not work properly.
        • +
        • In the Basic search, Search by Alphabets, and some of the field +Search like Quote ID, Notes, Related To will not work.
        • +
        • Advance Search will not work in all the modules.
        • +
        • Calendar functionality is not functional, we are providing only +the UI.
        • +
        • In home page pipeline and calendar will not be displayed.
        • +
        • Reports are not fully functional. You may experience some errors +while working with reports.
        • +
        • Some of the Popup window may not function properly.
        • +
        • Quick create and global search are not supported.
        • +
        • Problem in Search UI with IE browser
        • +
        +
        +

        vtiger CRM 4.5 : Development Version 3 - Release Notes

        +

        Date: November 23, 2005

        +

        Table of Contents

        +
          +
        1. Summary
        2. +
        3. Features
        4. +
        5. Bug Fixes
        6. +
        7. Known Issues
        8. +
        +

        1. Summary

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. NoItemStatus
        1 + Features +

        +8 +
        2 + Product SizeWindows - 30MB +Linux - 42MB
        3 + Bug Fixes29
        4 + Code Contributionshttp://www.vtiger.com/wiki/index.php/Vtiger_CRM_Code_Contributions +
        5 + Database Migration + Not Available. 
        6 + vtiger CRM - PHP DocumentationBundled with the Product (<vtiger CRM +Home>/vtigerCRM_docs directory)
        7Product DocumentationAvailable at the Wiki
        8Source Code LabelVTIGERCRM_4_5_M3
        9 + Known Issues4
        10 + List of Files Changed from V 4.5 Development 2 to +V 4.5 Development 3110
        11List of Files Changed from V 4.2 Development 1 to +V 4.5 Development 3277
        12List of Files Changed from V 4.2 Patch 2 to V 4.5 +Development 3190
        +

        Back +to Top

        +

        2. Features

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. No Ticket +ID + Subject
        1 +
        +
        +

        Progress bar display during the vtiger CRM database creation +in Installation wizard.

        +
        2 +
        +
        Default Organization Sharing in Security is modified +according to the new Security Schema. Migration support is also +provided for this feature.
        3588 + Suppress sending mail to account when a ticket is submitted.
        4 +
        +
        Product quantity in stock is automatically updated when +the  goods specified in the Purchase Order are received. + + Note: To update the product quantity in stock, users have +to change the Status drop-down list value to 'Received Shipment' +immediately after receiving the shipment.
        5
        +
        In Office Plug-in, fields from multiple modules (Accounts, +Contacts, Leads, HelpDesk, and Users) can be merged while creating mail +merge templates.
        6
        +
        In vtiger CRM create mail merge documents by merging fields +from multiple modules (Accounts,Contacts, Users)
        7
        +
        Provided support for User field in mail merge documents
        8
        +
        Mail merge all the records from a module by selecting "Select +All" checkbox in ListView of Accounts, Contacts, Leads, and HelpDesk +modules.
        + +

        3. Product Size

        + + + + + + + + + + + + + + + + + + +
        DistributionVersion 4.2 Build Size Version 4.5 Milestone 3 Build Size
        Windows (EXE)42 MB +

        +
        30 MB
        Linux (BIN)39 MB +

        +
        42 MB
        + +

        4. Bug Fixes

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. No Bug IDSubject
        1539In the Potential related list view the currency value should +be aligned right, and the currency symbol should be shown in the title +instead of in front of every value.
        2640 Issue in Pop-up New link
        3665
        +
         Check-all checkbox checks wrong checkboxes
        4761 Added dash after Potential Name when converting from +Lead
        5644 Start/End date options in Custom View
        6643Issue in Group Activities display in Home page
        7689utils.php call time pass reference error
        8770Checkbox fields are saved with null instead of 0 value.
        9570Missing information when converting Lead to Contact
        10754Date Format on Quotes, Invoices and Orders
        11511Custom view-  if lastname is selected the first +name and the last name are displayed
        12645Html tags are not shown properly in activity description
        13463Don't show "My group allocation" section if no group is +defined
        14849user belonging to more than 2 group .issue
        15820Product image editing error
        16831custom view error
        17695call time pass reference is corrected
        18484Tickets assigned to a group error
        19851Wrong picklist value in edit view
        20 Access to vtigercrm.log files restricted - +vulnerability fix.
        21
        +
        833
        +
        test mail can be sent to test +the e-mail function on configuring the mail server
        22
        +
        718
        +
        Signatures are double-spaced in +e-mails
        23
        +
        453
        +
        issue in vendor search
        24
        +
        564
        +
        Tickets assigned to Groups
        25
        +
        195
        +
        Email - admin mail is empty, +then cc in email is not going
        26
        +
        710
        +
        activity notifications -> +display further information
        27
        +
        504 New Contact -Account addressNew +Contact -Account address
        28259Office Integration account name +in address block
        29378Office Plugin field selection
        + +

        6. Known Issues

        + + + + + + + + + + + + + + + + + + + + + + + +
        S. No Subject
        1 +

        In user creation page, by default the Organization is +displayed in Role drop-down list field but there is no action +associated with the Organization value. Kindly select roles +other than Organization in the drop-down list.

        +
        2 +

        While sending mass e-mail from Leads/Contact/Accounts, +validation check will not be performed for the To field.

        +
        3 In Block rearrangement feature, If a field is +moved to an unused or new block, the field will not be displayed.
        4 In E-mail ListView, if mail is sent to multiple +recipients the entries will be displayed twice.
        +

         

        +
        +
        +

        vtiger CRM 4.5 : Development Version 2 - Release Notes

        +

        Date: November 16, 2005

        +

        Table of Contents

        +
          +
        1. Summary
        2. +
        3. Features
        4. +
        5. Product Size
        6. +
        7. Bug Fixes
        8. +
        9. Database Migration
        10. +
        11. Known Issues
        12. +
        13. List of Files Changed from V 4.5 +Development 1 to V 4.5 Development 2
        14. +
        15. List of Files Changed from V 4.2 Patch 2 +to V 4.5 Development 2
        16. +
        +

        1. Summary

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. NoItemStatus
        1Features3 +

        +
        2Product SizeWindows - 31MB
        +Linux - 41MB
        3Bug Fixes24
        4Code ContributionsNil
        5vtiger CRM - PHP DocumentationBundled with Product
        6Product DocumentationAvailable at Wiki
        7Source Code LabelVTIGERCRM_4_5_M2
        8List of Files Changed from V 4.5 Development 1 to +V 4.5 Development 2137
        9List of Files Changed from V 4.2 Patch 2 to V 4.5 +Development 2279
        +

        Back to Top

        +

        2. Features

        + + + + + + + + + + + + + + + + + + + +
        S. No Subject
        1 +

        Profile management module is revamped completely

        +
        2 +

        Display all the records that are assigned to users dynamically +in a scrollable format.

        +
        3Documentation for vtiger CRM - PHP libraries is +bundled with the product. (Present under vtigerCRM_docs directory)
        + +

        3. Product Size

        + + + + + + + + + + + + + + + + + + +
        DistributionVersion 4.2 Build Size Version 4.5 Milestone 2 Build Size
        Windows (EXE)42 MB +

        +
        31 MB +

        +
        Linux (BIN)39 MB +

        +
        41 MB
        + +

        4. Bug Fixes

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. No Bug IDSubject
        1810 +

        The close link in activities custom view returns to the +default view

        +
        2  +

        E-mail functions are restructured in the following mailing +functions:

        +
          +
        • Send E-mail to assigned to user, Lead, Contact and Account +in Emails module
        • +
        • Send notification to the assigned to user in Activities +module
        • +
        • Send Ticket details to the assigned to user and Parent in +HelpDesk
        • +
        • Send customer portal login details to the customer in +Contact module
        • +
        • Send mail about the portal ticket creation to the module +owner and the customer itself in Customer Portal
        • +
        +
        3768Lead Street text box restricted to 30 chars
        4486Not Held Meetings shown in Activities instead of +History
        5771Events with status "Not Held" appear still in +Activities instead of the history table
        6682Creating an event with status planned for past +time
        7629Select End date as today's date
        8635End date need not be mandatory if there start +date is mandatory
        9411New Event Creation
        10809Designation Should be converted into Title field +of Contact
        11725Field "Designation" does not seem to get carried +across to either the Account, Potential nor Contact entries.
        12777Converting a lead does not allow two decimal +places
        13700Events->Status is not displayed
        14446displaying product id instead of product name in +ticket list view
        15112Generated Reports topic change
        16359Spelling Error in Reports
        17369'Translation issue'
        18398quotation custom view
        19 Issue - Columns to Total in Reports
        20817table names PortalInfo and CustomerDetails should +be changed in lower case
        21818Added module in portal and the tickets should be +assigned to the owner of the module
        22819after saving the ticket control goes to list of +tickets instead of new ticket's detail view(in customerportal)
        23824E-mail title is missing in E-mail DetailView
        24 +

        +
        +

        +
        +
        nusoap version upgraded to 0.7.1 +

        +
        +
        +

          +

        +
        + +

        5. Database Migration

        +

        Database migration support is provided for the following versions: +

        +

        +
          +
        • From vtigerCRM 4.2 Patch2 to vtigerCRM Developer Version 2
        • +
        • From vtigerCRM Developer Version 1 to vtigerCRM Developer +Version 2
        • +
        +

        Database Migration Procedure:

        +
          +
        1. Download the attached Migration zip and extract to the +<vtigerCRM home> directory (Migration42p2_to_45dev2.zip)
        2. +
        3. Access the dev_index.php file through the browser.
        4. +
        5. Select the versions to migrate.
          +
        6. +
        + +

        6. Known Issues

        + + + + + + + + + + + + + + + + + + + + + + + +
        S. No Subject
        1 +

        In user creation page, by default the Organization is +displayed in Role drop-down list field but there is no action +associated with the Organization value. Kindly select roles +other than Organization in the drop-down list.

        +
        2 +

        While sending mass e-mail from Leads/Contact/Accounts, +validation check will not be performed for the To field.

        +
        3 In Block rearrangement feature, If a field is +moved to an unused or new block, the field will not be displayed.
        4 In E-mail ListView, if mail is sent to multiple +recipients the entries will be displayed twice.
        +
        +

        vtiger CRM 4.5 - Development Version 1 Release Notes +

        Date: November 9, 2005

        +

        +

        Summary:

        + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. NoItemTotalRemarks
        1Features1 
        2Bug Fixes50 
        3Code Contributions64 
        +

        Henceforth the Emails Send/Saved will be treated like mails in Send +items, of our regular mail client, if such emails, need to be resent, +the recipients to be selected again.

        +

        1. Features

        +

        Added BCC field in Emails

        +

        2. Bug Fixes

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. No Bug IDSubject
        1638Priority for Events
        2157Inventory Mgmt Related List Show All Details
        3433Search option missing in Popup Purchase order
        4454Issue in creating new note from product detail +view
        5384Activities not saving?
        6233Bug in invoice
        7220Some Bug in Vtiger 4.2 - Invoice
        8373No Title for description
        9256name in account's address information
        10693Select Contact option Not Available
        11205spelling error and There doesn't seem to be a way +to add a first nam
        12 Thunderbird plugin dialog has to be closed twice
        13 ThunderBird - window problem
        14 print option should open new page
        15 email,phone fields are not validated in contacts
        16 Problems with Thunderbird plugin
        17 Thunderbird Plugin: Error importing Contacts
        18  Thunderbird Extn count doesn't match
        19 Custom view - Mandatory check
        20 Product Custom view
        21744Terms & Conditions in Company Details as well +as in Edit View
        22692While exporting SalesOrder i got New column after +Quote Name.
        23688while generating reports if we select reports an +error message is displayed this issue has been fixed
        24686after integrating the code contributed by raju +the lead names are not displayed in the popup in email module
        25  Having status for events in Customview of +Activities-Customer request
        26284In populating the Demo data of leads,giving the +companyname
        27289In populating Demo data, giving the value for +assigned to
        28151Attachment contains footer of vitgerCRM and +javascript (I attached license_agreement.txt of vtigercrm, but i got in +other name and not in .txt format and content is mixed with +vtigerCRM Footer)
        29194Email Email,Webmail Tab is comming for all pages +in Email Module (While Editing email,still the listview tab +(Emails,Webmails) is comming. It should be like Email : ""Subject"")
        30440issue while creating new contact&account +through add business card
        31690Problem in Close Date and Last modified of the +list of Sales Stage History of the Potentials
        32694Date showing is incorrect in add business card +(when add new business card, there is date for appoinment where the +showing date is not in current user date format
        33158Pick list Custom field issue
        34370duplicate entry in list view
        35288Issue in Inventory Popups
        36347Error Message
        37358Filtering by Headers in Leads
        38342New users can'´t login
        39360System Configuration
        40145related module is empty
        41179Potential-activities
        42203Inventory RL
        43211There is no option to create a Potential for a +contact
        44212Create Quote from Contact
        45354Critical security vulnerability in multi-instance +installations / multiple instance login problem
        46670Propegate Account Address info into New Contact
        47681Bug in utils.php function getListViewEntries
        48754User_name instead of firstname lastname used as +sender in emails
        49773In custom views of Tickets the Ticket id is +missing. Its also not possible to filter by ticket id's.
        50763Misspelling in KeyMetrics
        +

        3. Code Contributions

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        S. No +

        +
        Forums +

        +

        Description
        1 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=1954 +

        +
        GUI +

        rearrange fields within blocks?

        +

        Drag and drop for the fields with different blocks

        +

        +
        2 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=2750 +

        +
        Appropriate +

        tabindex for edit fields.

        +

        One more column is added to the fields table to get the tab

        +

        +
        3 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=2368 +

        +
        Release Relations in +Contacts and Accounts
        4 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=2852 +

        +
        Change the status of +the activities in CustomViews from Activities module
        5 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=2031 +(PDF format)In +the PDF +

        report, to get the address

        +on the right side of the page.
        6 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=1689 +

        +
        LDAP and Active +Directory Support Patch
        7 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=2364 +

        +
        Description +

        visible for History and Notes in Acc/Cnts List view.

        +

        +
        8 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=2748 +

        +
        Make a note before +closing the activity in Home Page
        9 +

        +
        http://forums.vtiger.com/viewtopic.php?p=13502#13502 + Post subject: Bug +resolved (Ticket ID 773): TicketId for dropdown lists...
        10 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=1692Adding +

        priority to Events

        +- Feature
        11 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=2617PDF's output +formatting.
        12 +

        +
        +

        http://www.vtiger.com/discussions/viewtopic.php?t=1530

        +
        Revised Tracker
        13 +

        +
        http://forums.vtiger.com/viewtopic.php?p=13396#13396 + New pdf from matt
        14 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=1585Displaying the +meeting in the calendar, Present in 4.2GA
        15 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=2029Import and Export +Products
        16 +

        +
        +

        http://www.vtiger.com/discussions/viewtopic.php?t=2000

        +
        During +

        'Import', the person who is importing the CSV files +'user_name' in is

        +assigned  to 'Assigned to' field
        17 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=2139When creating a 'New +

        Product'  there was an error in javascript. This is +integrated in

        +patch1
        18 +

        +
        +

        http://www.vtiger.com/discussions/viewtopic.php?t=2196

        +
        The world clock +doesn't show 12pm correctly. It was showing 00pm
        19 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=2524Scroll bars are +added to the +

        'Related List' of Account and contacts for 'Attachments & +Notes'

        +and 'History'
        20 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=2431Search ny Ticket id +in HelpDesk
        21 +

        +
        +

        http://www.vtiger.com/discussions/viewtopic.php?t=2406

        +
        If you write a +

        long description in an activity, it takes off a lot of space +because the text field is one column wide only.

        +

        +With this fix, the descriptions are spaned over all columns,
        22 +

        +
        +

        http://www.vtiger.com/discussions/viewtopic.php?t=2324

        +
        This will move +

        the vTiger logo upwards and the tabs will start from the left +of the page. I've applied this all the themes

        +except 'blue' theme
        23 +

        +
        +

        +

        ttp://www.vtiger.com/discussions/viewtopic.php?t=2025 +

        +
        The date +

        format required is YYYY-mm-dd however the popup uses +mm-dd-YYYY,

        +

        A diffeent format. Upon trying to submit changes, a date error +(js

        +alert) pops up stating invalid month
        24 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=2744 +

        +
        All users in a +activity can view it in Calendar
        25 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=3105 +

        +
        Imporved Emailing +system with easy mass mail support- given by Raju +

        +
        26 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=3100 +

        +
        One color by user in +Calendar +

        +
        27 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=3149 +

        +
        Vtiger php +installer script multilanguage +

        +
        28 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=3143 +

        +
        Fun with Google Maps +

        +
        29 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=3045 +

        +
        Automatic Inventory +Updating +

        +
        30 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=2681 +

        +
        Helpdesk Navigation. +

        In helpdesk, the navigation below the list view.

        +

        +
        31 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=2005 +

        +
        Patches- activity +rows on Home tab, custom activity view fix +

        +
        32 +

        +
        http://www.vtiger.com/discussions/viewtopic.php?t=1770 +

        +
        Make +QuickActivityRegister have enddate(duedate) +

        To have an end date,when creating an activity from the +calendar

        +

        +
        33 +

        +
        http://forums.vtiger.com/viewtopic.php?p=13390#13390 + UI improvement: +Tabbed details and related lists
        34 +

        +
        http://forums.vtiger.com/viewtopic.php?t=3251 +

        +
        Improved pagination +in List View +

        +
        35 +

        +
        http://forums.vtiger.com/viewtopic.php?t=3359 +

        +
        Tickets sorted by +ticket id desc +

        +
        36 +

        +
        http://forums.vtiger.com/viewtopic.php?t=2482 +

        +
        First release of +Communications and Mass Mailing +

        +
        37 +

        +
        http://forums.vtiger.com/viewtopic.php?t=3105 +

        +
        Imporved Emailing +system with easy mass mail support +

        +
        38 +

        +
        http://forums.vtiger.com/viewtopic.php?t=3226 +

        +
        Full Telephony +Integration +

        +
        39 +

        +
        http://forums.vtiger.com/viewtopic.php?t=3342 +

        +
        Report Filters in +PDF And Excel exports +

        +
        40 +

        +
        http://forums.vtiger.com/viewtopic.php?t=3079 +

        +
        Export Activities +to Palm +

        +
        41 +

        +
        http://forums.vtiger.com/viewtopic.php?t=3376 +

        +
        custom invoice view +using custom fields fix (4.2 Patch 2) +

        +
        42 +

        +
        http://forums.vtiger.com/viewtopic.php?t=3367 +

        +
        contactserialize.php +fixes (4.2 Patch 2) +

        +
        43 +

        +
        http://forums.vtiger.com/viewtopic.php?t=1954 +

        +
        GUI rearrange +fields within blocks +

        +
        44 +

        +
        http://forums.vtiger.com/viewtopic.php?t=3390 +

        +
        Hierarchical rights +

        +
        45 +

        +
        http://forums.vtiger.com/viewtopic.php?t=3143 +

        +
        +

        Fun with Google Maps

        +
        46 +

        +
        http://forums.vtiger.com/viewtopic.php?t=3247 +

        +
        +

        Simple Drupal Integration

        +
        47 +

        +
        http://forums.vtiger.com/viewtopic.php?t=3290 +

        +
        +

        Expenses Module Integration

        +
        48 +

        +
        http://forums.vtiger.com/viewtopic.php?t=3548 +

        +
        Activities and Notes +fixes for 4.2 patch 2
        49 +

        +
        http://forums.vtiger.com/viewtopic.php?t=3545 +

        +
        Invoice & Quotes +layout fixes
        50 +

        +
        http://forums.vtiger.com/viewtopic.php?t=2597 +

        +
        +

        Postgres Support

        +
        51 +

        +
        http://sourceforge.net/mailarchive/forum.php?thread_id=8380546&forum_id=44763 +

        +
        +

        Patch for customer Portal- Michael

        +

        fixed some typos

        +
        52 +

        +
        http://sourceforge.net/mailarchive/forum.php?thread_id=8365518&forum_id=44763 +

        +
        +

        Patch for Install - Michael

        +* fixed some typos and invalid html +

        * additional permissions check - prevent

        +

        'My Pipeline' showing a permissions error on new install

        +
        53 +

        +
        http://sourceforge.net/mailarchive/forum.php?thread_id=8365518&forum_id=44763 +

        +
        +

        Patch for vtigercrm nusoap - Michael

        +The following patch upgrades the version of +

        nusoap library from 0.67 to

        +

        0.69.

        +

        +
        54 +

        +
        http://forums.vtiger.com/viewtopic.php?t=3053&highlight=stema +

        +
        Arrange emails by +sent date
        55 +

        +
        +

        +
        +
        Enchanced PDF in +Quotes
        56 +

        +
        http://forums.vtiger.com/viewtopic.php?t=3509&highlight=vip +

        +
        Change Home Page +Order
        57 +

        +
        Overlapping of +company logo and product name while exporting in Invoice +

        +
         
        58overlapping of +company logo and product name while exporting in Invoice  
        59Description visible +for History and Notes in Acc/Cnts List view. 
        60Change the status of +the activities in CustomViews from Activities module 
        61Invoice & Quotes +layout fixes 
        62Arranging the home +page contributed by Mike has been integrated (Bug ID: 291) 
        63Imporved Emailing +system with easy mass mail support(Raju) (Bug ID: 500) 
        64Displaying Emails by +Sent date order(Rcleeve)(Bug ID: 687 ) 
        65Arranging the blocks +in settings page(comes under a code contribution) (Bug ID: 648 )  
        +

        Known Issues

        +

        1) While creating a new user, by default 'Organisation' will be +set  as 'Role' to the user. Kindly change it to  your +specified role before saving, if 'Organisation' is set as role the +user, the will not be able to login to the application.

        +

        2) When sending mass mail form +Leads/Contact/Accounts, validation is not done in 'To' field.

        +

        +

        3) In Block Re-arrangement Feature, +If is a field is moved to a unused/new block, the field will not be +displayed.

        +

        +

        4) In Email Listview, if mail is +sent to mutiple recipients the entries will be displayed twice.

        + + From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 9 08:21:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 09 Oct 2006 12:21:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9604 - in /vtigercrm/branches/5.0.1: Smarty/templates/ modules/PriceBooks/ modules/Products/ Message-ID: <20061009122141.DA1BA66ADCB@vtiger.fosslabs.com> Author: richie Date: Mon Oct 9 06:21:32 2006 New Revision: 9604 Log: * Modified to fix the issue 2110 Modified: vtigercrm/branches/5.0.1/Smarty/templates/AddProductToPriceBooks.tpl vtigercrm/branches/5.0.1/Smarty/templates/AddProductsToPriceBook.tpl vtigercrm/branches/5.0.1/modules/PriceBooks/PriceBook.js vtigercrm/branches/5.0.1/modules/Products/AddProductToPriceBooks.php vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php vtigercrm/branches/5.0.1/modules/Products/Product.js Modified: vtigercrm/branches/5.0.1/Smarty/templates/AddProductToPriceBooks.tpl ============================================================================== --- vtigercrm/branches/5.0.1/Smarty/templates/AddProductToPriceBooks.tpl (original) +++ vtigercrm/branches/5.0.1/Smarty/templates/AddProductToPriceBooks.tpl Mon Oct 9 06:21:32 2006 @@ -108,11 +108,18 @@ {ldelim} var fieldname_array = new Array({$FIELD_NAME_ARRAY}); var unitprice,fieldname; + var id; + var fieldinfo; + var checkid; for(j=0; j @@ -113,13 +113,13 @@ { $list_body .= '
      '.$adb->query_result($list_result,$i,"bookname").''.$unit_price.'
      - + '; + $list_body .= ''; $list_body .= ''; $list_body .= ''; $list_body .= ''; - $list_body .= ''; + $list_body .= ''; } } Modified: vtigercrm/branches/5.0.1/modules/Products/Product.js ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/Product.js (original) +++ vtigercrm/branches/5.0.1/modules/Products/Product.js Mon Oct 9 06:21:32 2006 @@ -8,18 +8,16 @@ * ********************************************************************************/ document.write(" - -
        @@ -130,11 +132,11 @@ $unit_price = $adb->query_result($list_result,$i,"unit_price"); $field_name=$entity_id."_listprice"; - $list_body .= ''.$adb->query_result($list_result,$i,"productname").''.$adb->query_result($list_result,$i,"productcode").''.$unit_price.'
      - - - - - -
      -
      - {$MOD.LBL_MY_MAIL_SERVER_DET}
      -

      - - - - - - - - - -
      - - - - - - + +
      - - - - - - - -
       {$MOD.LBL_MY_MAIL_SERVER_DET}  
      -
      - - - - - - + + +
      - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {$MOD.LBL_EMAIL_ID}
      {$MOD.LBL_DISPLAY_NAME}{$MOD.LBL_NAME_EXAMPLE}
      {$APP.LBL_REQUIRED_SYMBOL} {$MOD.LBL_EMAIL_ADDRESS} {$MOD.LBL_EMAIL_EXAMPLE}
       
      {$MOD.LBL_MAIL_SERVER_SETTINGS}
      {$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_MAIL_SERVER_NAME} 
      {$APP.LBL_REQUIRED_SYMBOL}{$APP.LBL_LIST_USER_NAME} 
      {$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_LIST_PASSWORD} 
       
      {$MOD.LBL_MAIL_PROTOCOL} +{**} + + + + + + + + +
      +
      + {$MOD.LBL_MY_MAIL_SERVER_DET}
      +

      + + + + + + + + + +
      + + + + + + -
      + + + + + + + +
       {$MOD.LBL_MY_MAIL_SERVER_DET}  
      +
      + + + + + + - -
      + + + - - -
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {$MOD.LBL_EMAIL_ID}
      {$MOD.LBL_DISPLAY_NAME}{$MOD.LBL_NAME_EXAMPLE}
      {$APP.LBL_REQUIRED_SYMBOL} {$MOD.LBL_EMAIL_ADDRESS} {$MOD.LBL_EMAIL_EXAMPLE}
       
      {$MOD.LBL_INCOME_SERVER_SETTINGS}
      {$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_MAIL_SERVER_NAME} 
      {$APP.LBL_REQUIRED_SYMBOL}{$APP.LBL_LIST_USER_NAME} 
      {$APP.LBL_REQUIRED_SYMBOL}{$MOD.LBL_LIST_PASSWORD} 
       
      {$MOD.LBL_MAIL_PROTOCOL} -  {$MOD.LBL_IMAP2} -  {$MOD.LBL_IMAP4} -  
      {$MOD.LBL_SSL_OPTIONS} -  {$MOD.LBL_NO_TLS} -   {$MOD.LBL_TLS}  
      {$MOD.LBL_CERT_VAL} -  {$MOD.LBL_VAL_SSL_CERT} -  {$MOD.LBL_DONOT_VAL_SSL_CERT} -  
      {$MOD.LBL_INT_MAILER} -  {$MOD.LBL_INT_MAILER_USE} -  {$MOD.LBL_INT_MAILER_NOUSE} -  
      {$MOD.LBL_REFRESH_TIMEOUT} - -  
      {$MOD.LBL_EMAILS_PER_PAGE} 
      {$MOD.LBL_MAIL_DISCLAIM}
       
      - -    -
       
      -
      -
      - -
      - -{$JAVASCRIPT} +  {$MOD.LBL_IMAP2} +  {$MOD.LBL_IMAP4} +
       
      {$MOD.LBL_SSL_OPTIONS} +  {$MOD.LBL_NO_TLS} +   {$MOD.LBL_TLS}  
      {$MOD.LBL_CERT_VAL} +  {$MOD.LBL_VAL_SSL_CERT} +  {$MOD.LBL_DONOT_VAL_SSL_CERT} +  
      {$MOD.LBL_INT_MAILER} +  {$MOD.LBL_INT_MAILER_USE} +  {$MOD.LBL_INT_MAILER_NOUSE} +  
      {$MOD.LBL_REFRESH_TIMEOUT} + +  
      {$MOD.LBL_EMAILS_PER_PAGE} 
      {$MOD.LBL_MAIL_DISCLAIM}
       
      + +    +
       
      +
      + + + + + + +{$JAVASCRIPT} Modified: vtigercrm/trunk/Smarty/templates/AddProductToPriceBooks.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/AddProductToPriceBooks.tpl (original) +++ vtigercrm/trunk/Smarty/templates/AddProductToPriceBooks.tpl Tue Oct 10 10:02:43 2006 @@ -108,11 +108,18 @@ {ldelim} var fieldname_array = new Array({$FIELD_NAME_ARRAY}); var unitprice,fieldname; + var id; + var fieldinfo; + var checkid; for(j=0; j - + Users Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Tue Oct 10 10:02:43 2006 @@ -117,6 +117,14 @@ {$APP.LBL_CANCEL_BUTTON_LABEL} + {elseif $keyid eq '85'} +  Skype{$keyval} +

      + {elseif $keyid eq '19' || $keyid eq '20'} {if $label eq $MOD.LBL_ADD_COMMENT} Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Tue Oct 10 10:02:43 2006 @@ -51,7 +51,7 @@ {/if} {elseif $uitype eq 19 || $uitype eq 20} - {if $fldlabel eq 'Add Comment'} + {if $fldlabel eq $MOD.LBL_ADD_COMMENT} {assign var=fldvalue value=""} {/if} @@ -135,10 +135,10 @@ {assign var=style_group value='display:block'} {/if} -  User +  {$APP.LBL_USER} {if $secondvalue neq ''} -  Group +  {$APP.LBL_GROUP} {/if} + + {elseif $uitype eq 85} + + {$fldlabel} + + + Skype + {elseif $uitype eq 71 || $uitype eq 72} Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl Tue Oct 10 10:02:43 2006 @@ -111,15 +111,25 @@ {include file='DetailViewHidden.tpl'} {strip} - + + {elseif $MODULE eq 'Potentials'}   - + {elseif $MODULE eq 'Vendors'} + {else} - + {/if} {elseif $header eq 'Leads'} {if $MODULE eq 'Campaigns'} Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Tue Oct 10 10:02:43 2006 @@ -110,12 +110,7 @@ {/if} - {if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'} - - {else} - - {/if} - + {if $smarty.request.action eq 'OrganizationConfig' || $smarty.request.action eq 'EditCompanyDetails' || $smarty.request.action eq 'add2db'} @@ -179,6 +174,13 @@ {/if} + + {if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'} + + {else} + + {/if} +
      - {if $EDIT_DUPLICATE eq 'permitted'} -   -   - {/if} - {if $DELETE eq 'permitted'} -   - {/if} + + + + + +
      + {if $EDIT_DUPLICATE eq 'permitted'} +   + {/if} + + {if $EDIT_DUPLICATE eq 'permitted'} +   + {/if} + {if $DELETE eq 'permitted'} +   + {/if} +
      *} + Modified: vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl Tue Oct 10 10:02:43 2006 @@ -37,15 +37,16 @@ {/if} {elseif $header eq 'Products'} {if $MODULE eq 'PriceBooks'} -
      {$MOD.INVENTORYNOTIFICATION}
      {$MOD.LBL_INVENTORY_TANDC}
      {$MOD.LBL_INVENTORY_TANDC}
      {$MOD.LBL_OTHER_SETTINGS}
      {$MOD.LBL_MIGRATION}
      {$MOD.LBL_INVENTORY_TANDC}
      {$MOD.LBL_INVENTORY_TANDC}
      Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Tue Oct 10 10:02:43 2006 @@ -311,63 +311,6 @@ - - - - - - - - - - - - - -
      {$MOD.INVENTORYTERMSANDCONDITIONS}{$MOD.LBL_INVENTORY_TANDC}
      {$MOD.LBL_INV_TANDC_DESCRIPTION}
      - - - - - - - - - - - - - -
        
       
      - - - - - - - - - - - - -
        
       
      - - - - - - - - - - - - -
        
       
      - - - @@ -536,20 +479,24 @@ {$MOD.LBL_MIGRATION_INFO} -   - - -   -   -   - - - - - - - + + + + + + + + + + +
      {$MOD.INVENTORYTERMSANDCONDITIONS}{$MOD.LBL_INVENTORY_TANDC}
      {$MOD.LBL_INV_TANDC_DESCRIPTION}
      + + + + + + Modified: vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Tue Oct 10 10:02:43 2006 @@ -217,8 +217,33 @@ } ); } + function picklist_validate(mode,fieldname,module,uitype) { + + //alert(trim($("picklist_values").value)); + + var pick_arr=new Array(); + pick_arr=trim($("picklist_values").value).split('\n'); + var len=pick_arr.length; + for(i=0;i  {if $EDIT_MODE neq 'true'} - + {/if} Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Tue Oct 10 10:02:43 2006 @@ -115,7 +115,7 @@ - {if $header eq 'Comments' || $header eq 'Comment Information'} + {if $header eq $MOD.LBL_COMMENTS || $header eq $MOD.LBL_COMMENT_INFORMATION}   Modified: vtigercrm/trunk/connection.php ============================================================================== --- vtigercrm/trunk/connection.php (original) +++ vtigercrm/trunk/connection.php Tue Oct 10 10:02:43 2006 @@ -1,4 +1,4 @@ -query_result($adb->query("select * from vtiger_seattachmentsrel where crmid=$id"),0,'attachmentsid'); + { + //if a image attached already then remove that otherwise do not delete the attachment + $query = "select vtiger_attachments.attachmentsid from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid inner join vtiger_contactdetails on vtiger_contactdetails.imagename=vtiger_attachments.name where vtiger_seattachmentsrel.crmid=$id"; + $old_attachmentid = $adb->query_result($adb->query($query),0,'attachmentsid'); + } foreach($_FILES as $fileindex => $files) { @@ -274,7 +278,7 @@ } //This is to handle the delete image for contacts - if($module == 'Contacts' && $file_saved) + if($module == 'Contacts' && $file_saved && $old_attachmentid != '') { $del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$old_attachmentid"); $del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$old_attachmentid"); @@ -384,11 +388,13 @@ $sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')'; $adb->query($sql3); + $log->debug("Exiting from uploadAndSaveFile($id,$module,$file_details) method. return true"); return true; } else { $log->debug("Skip the save attachment process."); + $log->debug("Exiting from uploadAndSaveFile($id,$module,$file_details) method. return false"); return false; } } Modified: vtigercrm/trunk/data/SugarBean.php ============================================================================== --- vtigercrm/trunk/data/SugarBean.php (original) +++ vtigercrm/trunk/data/SugarBean.php Tue Oct 10 10:02:43 2006 @@ -58,7 +58,7 @@ } //$this->date_modified = $this->db->formatDate(date('YmdHis')); - $this->date_modified = $this->db->formatDate(date('YmdHis')); + $this->date_modified = date('YmdHis'); if (isset($current_user)) $this->modified_user_id = $current_user->id; if($isUpdate) @@ -68,7 +68,7 @@ else { //$this->date_entered = $this->db->formatDate(date('YmdHis')); - $this->date_entered = $this->db->formatDate(date('YmdHis')); + $this->date_entered = date('YmdHis'); if($this->new_schema && $this->new_with_id == false) Modified: vtigercrm/trunk/include/CustomFieldUtil.php ============================================================================== --- vtigercrm/trunk/include/CustomFieldUtil.php (original) +++ vtigercrm/trunk/include/CustomFieldUtil.php Tue Oct 10 10:02:43 2006 @@ -73,6 +73,10 @@ { $fldname = 'Multi-Select Combo Box'; } + elseif($uitype == 85) + { + $fldname = 'Skype'; + } $log->debug("Exiting getCustomFieldTypeName method ..."); return $fldname; } @@ -216,6 +220,10 @@ { $fieldtype = '11'; } + elseif($label == 'Skype') + { + $fieldtype = '12'; + } $log->debug("Exiting getFldTypeandLengthValue method ..."); return $fieldtype; } Modified: vtigercrm/trunk/include/js/customview.js ============================================================================== --- vtigercrm/trunk/include/js/customview.js (original) +++ vtigercrm/trunk/include/js/customview.js Tue Oct 10 10:02:43 2006 @@ -120,8 +120,8 @@ } else return false } } -var fieldValueArr=new Array('Text','Number','Percent','Currency','Date','Email','Phone','Picklist','URL','Checkbox','TextArea','MultiSelectCombo'); -var fieldTypeArr=new Array('text','number','percent','currency','date','email','phone','picklist','url','checkbox','textarea','multiselectcombo'); +var fieldValueArr=new Array('Text','Number','Percent','Currency','Date','Email','Phone','Picklist','URL','Checkbox','TextArea','MultiSelectCombo','Skype'); +var fieldTypeArr=new Array('text','number','percent','currency','date','email','phone','picklist','url','checkbox','textarea','multiselectcombo','skype'); var currFieldIdx=0,totFieldType; var focusFieldType; @@ -175,7 +175,7 @@ lengthLayer.style.visibility="visible" decimalLayer.style.visibility="hidden" pickListLayer.style.visibility="hidden" - } else if (type=='date' || type=='email' || type=='phone' || type=='url' || type=='checkbox' || type=='textarea') { + } else if (type=='date' || type=='email' || type=='phone' || type=='url' || type=='checkbox' || type=='textarea' || type=='skype') { getObj("lengthdetails").style.visibility="hidden" decimalLayer.style.visibility="hidden" pickListLayer.style.visibility="hidden" Modified: vtigercrm/trunk/include/js/dtlviewajax.js ============================================================================== --- vtigercrm/trunk/include/js/dtlviewajax.js (original) +++ vtigercrm/trunk/include/js/dtlviewajax.js Tue Oct 10 10:02:43 2006 @@ -216,7 +216,10 @@ }else if(uitype == '17') { getObj(dtlView).innerHTML = ""+tagValue+" "; - }else if(uitype == '53') + }else if(uitype == '85') + { + getObj(dtlView).innerHTML = ""+tagValue+" "; + }else if(uitype == '53') { var hdObj = getObj(hdTxt); if(typeof(document.DetailView.assigntype[0]) != 'undefined') @@ -311,6 +314,23 @@ } }else if(uitype == '33') { + /* Wordwrap a long list of multi-select combo box items at the + * item separator string */ + const DETAILVIEW_WORDWRAP_WIDTH = "70"; // must match value in DetailViewUI.tpl. + + var lineLength = 0; + for(var i=0; i < r.length; i++) { + lineLength += r[i].length + 2; // + 2 for item separator string + if(lineLength > DETAILVIEW_WORDWRAP_WIDTH && i > 0) { + lineLength = r[i].length + 2; // reset. + r[i] = '
       ' + r[i]; // prepend newline. + } + // Prevent a browser splitting multiword items: + r[i] = r[i].replace(/ /g, ' '); + } + /* Join items with item separator string (which must match string in DetailViewUI.tpl, + * EditViewUtils.php and CRMEntity.php)!! + */ getObj(dtlView).innerHTML = r.join(", "); }else { Modified: vtigercrm/trunk/include/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/include/language/en_us.lang.php (original) +++ vtigercrm/trunk/include/language/en_us.lang.php Tue Oct 10 10:02:43 2006 @@ -620,8 +620,8 @@ 'LBL_CALCULATOR'=>'Calculator', -'LBL_CLOSE_WON' =>'Closed-Won', # 'Closed Won' -'LBL_CLOSE_LOST'=>'Closed-Lost', # 'Closed Lost' +'LBL_CLOSE_WON' =>'Closed Won', # 'Closed Won' +'LBL_CLOSE_LOST'=>'Closed Lost', # 'Closed Lost' 'LBL_USER'=>'User', @@ -1027,6 +1027,7 @@ //Record deleted message 'LBL_RECORD_DELETE'=>'The record you are trying to view has been deleted.', +'Part Number'=>'Part Number', ); Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Tue Oct 10 10:02:43 2006 @@ -600,9 +600,6 @@ /** * Get the username by giving the user id. This method expects the user id - * param $label_list - the array of strings to that contains the option list - * param $key_list - the array of strings to that contains the values list - * param $selected - the string which contains the default value */ function getUserName($userid) @@ -620,6 +617,29 @@ } $log->debug("Exiting getUserName method ..."); return $user_name; +} + +/** +* Get the user full name by giving the user id. This method expects the user id +* DG 30 Aug 2006 +*/ + +function getUserFullName($userid) +{ + global $log; + $log->debug("Entering getUserFullName(".$userid.") method ..."); + $log->info("in getUserFullName ".$userid); + global $adb; + if($userid != '') + { + $sql = "select first_name, last_name from vtiger_users where id=".$userid; + $result = $adb->query($sql); + $first_name = $adb->query_result($result,0,"first_name"); + $last_name = $adb->query_result($result,0,"last_name"); + $user_name = $first_name." ".$last_name; + } + $log->debug("Exiting getUserFullName method ..."); + return $user_name; } /** @@ -2430,6 +2450,13 @@ case 'Contacts': if(is_array($fields["contacts"])) { + //Checking for salutation type and checking the table column to be queried + $key = array_search('salutationtype',$fields["contacts"]); + if(isset($key) && $key !='') + { + $fields["contacts"][$key]='salutation'; + } + $columnfields = implode(',',$fields["contacts"]); $query = 'select '.$columnfields.' from vtiger_contactdetails where contactid='.$id; $result = $adb->query($query); @@ -2443,6 +2470,12 @@ case 'Leads': if(is_array($fields["leads"])) { + //Checking for salutation type and checking the table column to be queried + $key = array_search('salutationtype',$fields["contacts"]); + if(isset($key) && $key !='') + { + $fields["contacts"][$key]='salutation'; + } $columnfields = implode(',',$fields["leads"]); $query = 'select '.$columnfields.' from vtiger_leaddetails where leadid='.$id; $result = $adb->query($query); Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DetailViewUtils.php (original) +++ vtigercrm/trunk/include/utils/DetailViewUtils.php Tue Oct 10 10:02:43 2006 @@ -304,7 +304,8 @@ { $imgpath = "test/contact/".$imagename; $label_fld[] =$mod_strings[$fieldlabel]; - $label_fld["cntimage"] ='
       '.$mod_strings[$fieldlabel]; + //This is used to show the contact image as a thumbnail near First Name field + //$label_fld["cntimage"] ='
       '.$mod_strings[$fieldlabel]; } else { @@ -462,7 +463,7 @@ if($tabid==4) { //$imgpath = getModuleFileStoragePath('Contacts').$col_fields[$fieldname]; - $sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid=".$col_fields['record_id']; + $sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid inner join vtiger_contactdetails on vtiger_contactdetails.imagename=vtiger_attachments.name where vtiger_seattachmentsrel.crmid=".$col_fields['record_id']; $image_res = $adb->query($sql); $image_id = $adb->query_result($image_res,0,'attachmentsid'); $image_path = $adb->query_result($image_res,0,'path'); @@ -932,6 +933,10 @@ $label_fld[] = ''.getRoleName($col_fields[$fieldname]).''; else $label_fld[] = getRoleName($col_fields[$fieldname]); + }elseif($uitype == 85) //Added for Skype by Minnie + { + $label_fld[] =$mod_strings[$fieldlabel]; + $label_fld[]= $col_fields[$fieldname]; } else { Modified: vtigercrm/trunk/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/EditViewUtils.php (original) +++ vtigercrm/trunk/include/utils/EditViewUtils.php Tue Oct 10 10:02:43 2006 @@ -106,7 +106,8 @@ } else { - $curr_time = date('H:i'); + $endtime = time() + (60 * 60); + $curr_time = date('H:i',$endtime); } } $fieldvalue[] = array($disp_value => $curr_time) ; @@ -152,6 +153,11 @@ $fieldvalue [] = $options; } elseif($uitype == 17) + { + $editview_label[]=$mod_strings[$fieldlabel]; + $fieldvalue [] = $value; + } + elseif($uitype == 85) //added for Skype by Minnie { $editview_label[]=$mod_strings[$fieldlabel]; $fieldvalue [] = $value; @@ -578,8 +584,8 @@ $query = 'select vtiger_attachments.path, vtiger_attachments.attachmentsid, vtiger_attachments.name from vtiger_products left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_products.productid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where productid='.$col_fields['record_id']; } else - { - $query = "select vtiger_attachments.path, vtiger_attachments.attachmentsid, vtiger_attachments.name from vtiger_contactdetails left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_contactdetails.contactid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where contactid=".$col_fields['record_id']; + { + $query = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid inner join vtiger_contactdetails on vtiger_contactdetails.imagename=vtiger_attachments.name where vtiger_seattachmentsrel.crmid=".$col_fields['record_id']; } $result_image = $adb->query($query); for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++) @@ -1195,12 +1201,14 @@ elseif($uitype == 105) { $editview_label[]=$mod_strings[$fieldlabel]; - $query = "select attachments.path, attachments.name from contactdetails left join seattachmentsrel on seattachmentsrel.crmid=contactdetails.contactid inner join attachments on attachments.attachmentsid=seattachmentsrel.attachmentsid where contactdetails.imagename=attachments.name and contactid=".$col_fields['record_id']; - $result_image = $adb->query($query); - for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++) - { - $image_array[] = $adb->query_result($result_image,$image_iter,'name'); - $image_path_array[] = $adb->query_result($result_image,$image_iter,'path'); + if( isset( $col_fields['record_id']) && $col_fields['record_id'] != '') { + $query = "select vtiger_attachments.path, vtiger_attachments.name from vtiger_contactdetails left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_contactdetails.contactid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where vtiger_contactdetails.imagename=vtiger_attachments.name and contactid=".$col_fields['record_id']; + $result_image = $adb->query($query); + for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++) + { + $image_array[] = $adb->query_result($result_image,$image_iter,'name'); + $image_path_array[] = $adb->query_result($result_image,$image_iter,'path'); + } } if(is_array($image_array)) for($img_itr=0;$img_itrdebug("Entering into function saveInventoryProductDetails($focus, $module)."); @@ -507,6 +507,18 @@ if($module == 'PurchaseOrder' && $update_prod_stock == 'true') { addToProductStock($prod_id,$qty); + } + if($module == 'SalesOrder') + { + if($updateStockAndDemand == 'true') + { + deductFromProductStock($prod_id,$qty); + deductFromProductDemand($prod_id,$qty); + } + if($updateDemand == 'true') + { + addToProductDemand($prod_id,$qty); + } } $query ="insert into vtiger_inventoryproductrel(id, productid, sequence_no, quantity, listprice, comment) values($focus->id, $prod_id , $prod_seq, $qty, $listprice, '$comment')"; Modified: vtigercrm/trunk/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/ListViewUtils.php (original) +++ vtigercrm/trunk/include/utils/ListViewUtils.php Tue Oct 10 10:02:43 2006 @@ -2079,6 +2079,8 @@ ON vtiger_crmentity.crmid = vtiger_campaign.campaignid LEFT JOIN vtiger_campaigngrouprelation ON vtiger_campaign.campaignid = vtiger_campaigngrouprelation.campaignid + INNER JOIN vtiger_campaignscf + ON vtiger_campaignscf.campaignid = vtiger_campaignscf.campaignid LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_campaigngrouprelation.groupname LEFT JOIN vtiger_users Modified: vtigercrm/trunk/include/utils/utils.php ============================================================================== --- vtigercrm/trunk/include/utils/utils.php (original) +++ vtigercrm/trunk/include/utils/utils.php Tue Oct 10 10:02:43 2006 @@ -837,7 +837,8 @@ $log->debug("Entering to_html(".$string.",".$encode.") method ..."); global $toHtml; if($encode && is_string($string)){//$string = htmlentities($string, ENT_QUOTES); - $string = str_replace(array_keys($toHtml), array_values($toHtml), $string); + if (is_array($toHtml)) + $string = str_replace(array_keys($toHtml), array_values($toHtml), $string); } $log->debug("Exiting to_html method ..."); return $string; @@ -2104,6 +2105,59 @@ $log->debug("Exiting addToProductStock method ..."); } + +/** This Function adds the specified product quantity to the Product Quantity in Demand in the Warehouse + * @param int $productId - ProductId + * @param int $qty - Quantity to be added + */ +function addToProductDemand($productId,$qty) +{ + global $log; + $log->debug("Entering addToProductDemand(".$productId.",".$qty.") method ..."); + global $adb; + $qtyInStck=getProductQtyInDemand($productId); + $updQty=$qtyInStck + $qty; + $sql = "UPDATE vtiger_products set qtyindemand=$updQty where productid=".$productId; + $adb->query($sql); + $log->debug("Exiting addToProductDemand method ..."); + +} + +/** This Function subtract the specified product quantity to the Product Quantity in Stock in the Warehouse + * @param int $productId - ProductId + * @param int $qty - Quantity to be subtracted + */ +function deductFromProductStock($productId,$qty) +{ + global $log; + $log->debug("Entering deductFromProductStock(".$productId.",".$qty.") method ..."); + global $adb; + $qtyInStck=getProductQtyInStock($productId); + $updQty=$qtyInStck - $qty; + $sql = "UPDATE vtiger_products set qtyinstock=$updQty where productid=".$productId; + $adb->query($sql); + $log->debug("Exiting deductFromProductStock method ..."); + +} + +/** This Function subtract the specified product quantity to the Product Quantity in Demand in the Warehouse + * @param int $productId - ProductId + * @param int $qty - Quantity to be subtract + */ +function deductFromProductDemand($productId,$qty) +{ + global $log; + $log->debug("Entering deductFromProductDemand(".$productId.",".$qty.") method ..."); + global $adb; + $qtyInStck=getProductQtyInDemand($productId); + $updQty=$qtyInStck - $qty; + $sql = "UPDATE vtiger_products set qtyindemand=$updQty where productid=".$productId; + $adb->query($sql); + $log->debug("Exiting deductFromProductDemand method ..."); + +} + + /** This Function returns the current product quantity in stock. * The following is the input parameter for the function: * $product_id --> ProductId, Type:Integer @@ -2121,6 +2175,23 @@ } + +/** This Function returns the current product quantity in demand. + * @param int $product_id - ProductId + * @return int $qtyInDemand - Quantity in Demand of a product + */ +function getProductQtyInDemand($product_id) +{ + global $log; + $log->debug("Entering getProductQtyInDemand(".$product_id.") method ..."); + global $adb; + $query1 = "select qtyindemand from vtiger_products where productid=".$product_id; + $result = $adb->query($query1); + $qtyInDemand = $adb->query_result($result,0,"qtyindemand"); + $log->debug("Exiting getProductQtyInDemand method ..."); + return $qtyInDemand; +} + /** Function to seperate the Date and Time * This function accepts a sting with date and time and * returns an array of two elements.The first element @@ -2617,4 +2688,40 @@ global $current_user,$adb; return $adb->query_result($adb->query("select int_mailer from vtiger_mail_accounts where user_id='".$current_user->id."'"),0,"int_mailer"); } + +/** +* the function is like unescape in javascript +* added by dingjianting on 2006-10-1 for picklist editor +*/ +function utf8RawUrlDecode ($source) { + $decodedStr = ""; + $pos = 0; + $len = strlen ($source); + while ($pos < $len) { + $charAt = substr ($source, $pos, 1); + if ($charAt == '%') { + $pos++; + $charAt = substr ($source, $pos, 1); + if ($charAt == 'u') { + // we got a unicode character + $pos++; + $unicodeHexVal = substr ($source, $pos, 4); + $unicode = hexdec ($unicodeHexVal); + $entity = "&#". $unicode . ';'; + $decodedStr .= utf8_encode ($entity); + $pos += 4; + } + else { + // we have an escaped ascii character + $hexVal = substr ($source, $pos, 2); + $decodedStr .= chr (hexdec ($hexVal)); + $pos += 2; + } + } else { + $decodedStr .= $charAt; + $pos++; + } + } + return $decodedStr; +} ?> Modified: vtigercrm/trunk/install/0welcome.php ============================================================================== --- vtigercrm/trunk/install/0welcome.php (original) +++ vtigercrm/trunk/install/0welcome.php Tue Oct 10 10:02:43 2006 @@ -97,10 +97,10 @@ -

             This Configuration Wizard will create vtiger CRM 5.0.0 databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready. +

             This Configuration Wizard will create vtiger CRM 5.0.1 databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready.

      -

      - vtiger CRM 5.0.0 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.

      -

      vtiger CRM 5.0.0 will not work on mysql 4.0.x versions

      vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements
      +

      - vtiger CRM 5.0.1 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.

      +

      vtiger CRM 5.0.1 will not work on mysql 4.0.x versions

      vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements

      The installation wizard will guide you with the installation regardless of the setup you may have. Modified: vtigercrm/trunk/install/2setConfig.php ============================================================================== --- vtigercrm/trunk/install/2setConfig.php (original) +++ vtigercrm/trunk/install/2setConfig.php Tue Oct 10 10:02:43 2006 @@ -99,7 +99,7 @@ elseif (isset($dbconfig['db_name']) && $dbconfig['db_name']!='_DBC_NAME_') $db_name = $dbconfig['db_name']; else - $db_name = 'vtigercrm5'; + $db_name = 'vtigercrm501'; !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; if (isset($_REQUEST['host_name'])) $host_name = $_REQUEST['host_name']; @@ -145,7 +145,7 @@ } else { !isset($_REQUEST['db_hostname']) ? $db_hostname = $hostname: $db_hostname = $_REQUEST['db_hostname']; - !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm5" : $db_name = $_REQUEST['db_name']; + !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm501" : $db_name = $_REQUEST['db_name']; !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; !isset($_REQUEST['host_name']) ? $host_name= $hostname : $host_name= $_REQUEST['host_name']; !isset($_REQUEST['site_URL']) ? $site_URL = $web_root : $site_URL = $_REQUEST['site_URL']; Modified: vtigercrm/trunk/install/4createConfigFile.php ============================================================================== --- vtigercrm/trunk/install/4createConfigFile.php (original) +++ vtigercrm/trunk/install/4createConfigFile.php Tue Oct 10 10:02:43 2006 @@ -45,8 +45,8 @@ // vtiger CRM version number; do not edit! -$vtiger_version = "5.0.0"; -$release_date = "14 September 2006"; +$vtiger_version = "5.0.1"; +$release_date = "10 October 2006"; if (isset($_REQUEST['db_hostname'])) Modified: vtigercrm/trunk/install/5createTables.php ============================================================================== --- vtigercrm/trunk/install/5createTables.php (original) +++ vtigercrm/trunk/install/5createTables.php Tue Oct 10 10:02:43 2006 @@ -120,10 +120,10 @@ ?> - +
      - vtigercrm-5.0.0 is all set to go! + vtigercrm-5.0.1 is all set to go!
        Modified: vtigercrm/trunk/jscalendar/calendar.js ============================================================================== --- vtigercrm/trunk/jscalendar/calendar.js (original) +++ vtigercrm/trunk/jscalendar/calendar.js Tue Oct 10 10:02:43 2006 @@ -1703,7 +1703,9 @@ return str; }; +if ( Date.prototype.__msh_oldSetFullYear == null ) { Date.prototype.__msh_oldSetFullYear = Date.prototype.setFullYear; +} Date.prototype.setFullYear = function(y) { var d = new Date(this); d.__msh_oldSetFullYear(y); Modified: vtigercrm/trunk/modules/Accounts/Account.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/Account.php (original) +++ vtigercrm/trunk/modules/Accounts/Account.php Tue Oct 10 10:02:43 2006 @@ -670,64 +670,34 @@ function create_export_query(&$order_by, &$where) { global $log; + global $current_user; $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - if($this->checkIfCustomTableExists('vtiger_accountscf')) - { - - $query = $this->constructCustomQueryAddendum('vtiger_accountscf','Accounts') . " - vtiger_account.*, - ".$this->entity_table.".*, - vtiger_accountbillads.city AS billing_city, - vtiger_accountbillads.country AS billing_country, - vtiger_accountbillads.code AS billing_code, - vtiger_accountbillads.state AS billing_state, - vtiger_accountbillads.street AS billing_street, - vtiger_accountshipads.city AS shipping_city, - vtiger_accountshipads.country AS shipping_country, - vtiger_accountshipads.code AS shipping_code, - vtiger_accountshipads.state AS shipping_state, - vtiger_accountshipads.street AS shipping_street, - vtiger_users.user_name, - vtiger_users.status AS user_status - FROM ".$this->entity_table." + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Accounts", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list FROM ".$this->entity_table." INNER JOIN vtiger_account ON vtiger_crmentity.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 + LEFT JOIN vtiger_accountscf ON vtiger_accountscf.accountid = vtiger_account.accountid + LEFT JOIN vtiger_accountgrouprelation + ON vtiger_accountscf.accountid = vtiger_accountgrouprelation.accountid + LEFT JOIN vtiger_groups + ON vtiger_groups.groupname = vtiger_accountgrouprelation.groupname LEFT JOIN vtiger_users - ON vtiger_crmentity.smownerid = vtiger_users.id "; - - } - else - { - $query = "SELECT vtiger_account.*, - ".$this->entity_table.".*, - vtiger_accountbillads.city AS billing_city, - vtiger_accountbillads.country AS billing_country, - vtiger_accountbillads.code AS billing_code, - vtiger_accountbillads.state AS billing_state, - vtiger_accountbillads.street AS billing_street, - vtiger_accountshipads.city AS shipping_city, - vtiger_accountshipads.country AS shipping_country, - vtiger_accountshipads.code AS shipping_code, - vtiger_accountshipads.state AS shipping_state, - vtiger_accountshipads.street AS shipping_street, - vtiger_users.user_name, - vtiger_users.status AS user_status - FROM ".$this->entity_table." - INNER JOIN vtiger_account - ON vtiger_crmentity.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_users - ON vtiger_crmentity.smownerid = vtiger_users.id "; - } + ON vtiger_crmentity.smownerid = vtiger_users.id + LEFT JOIN vtiger_account vtiger_account2 + ON vtiger_account2.accountid = vtiger_account.parentid + ";//vtiger_account2 is added to get the Member of account + $where_auto = " vtiger_users.status = 'Active' AND vtiger_crmentity.deleted = 0 "; @@ -737,8 +707,18 @@ 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[6] == 3) + { + //Added security check to get the permitted records only + $query = $query." ".getListViewSecurityParameter("Accounts"); + } + if(!empty($order_by)) $query .= " ORDER BY $order_by"; + $log->debug("Exiting create_export_query method ..."); return $query; } Modified: vtigercrm/trunk/modules/Accounts/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Accounts/DetailViewAjax.php Tue Oct 10 10:02:43 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $acntObj = new Account(); Modified: vtigercrm/trunk/modules/Accounts/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/EditView.php (original) +++ vtigercrm/trunk/modules/Accounts/EditView.php Tue Oct 10 10:02:43 2006 @@ -95,7 +95,7 @@ $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",$app_strings['Account']); +$smarty->assign("SINGLE_MOD",'Account'); $smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']); $smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT'])); Modified: vtigercrm/trunk/modules/Accounts/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Accounts/language/en_us.lang.php Tue Oct 10 10:02:43 2006 @@ -144,8 +144,8 @@ 'Created Time'=>'Created Time', 'Modified Time'=>'Modified Time', 'Description'=>'Description', -'Shipping Po Box'=>'Shipping Po Box', -'Billing Po Box'=>'Billing Po Box', +'Shipping Po Box'=>'Shipping PO Box', +'Billing Po Box'=>'Billing PO Box', //Added after 4.2 patch 2 'Email Opt Out'=>'Email Opt Out', Modified: vtigercrm/trunk/modules/Calendar/CalendarCommon.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/CalendarCommon.php (original) +++ vtigercrm/trunk/modules/Calendar/CalendarCommon.php Tue Oct 10 10:02:43 2006 @@ -182,6 +182,7 @@ function getTimeCombo($format,$bimode,$hour='',$min='',$fmt='') { $combo = ''; + $min = $min - ($min%5); if($format == 'am/pm') { $combo .= ''; Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/addEventUI.php (original) +++ vtigercrm/trunk/modules/Calendar/addEventUI.php Tue Oct 10 10:02:43 2006 @@ -177,9 +177,9 @@ - + -
      - - + - + +
      +
      hour_format,'start');?>
      - Set date.. +
      + Set date.. - - - + + + + @@ -74,7 +74,7 @@ - + Modified: vtigercrm/trunk/modules/CustomView/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/CustomView/language/en_us.lang.php Tue Oct 10 10:02:43 2006 @@ -141,8 +141,8 @@ 'Email Opt Out'=>'Email Opt Out', 'Billing Address'=>'Billing Address', 'Shipping Address'=>'Shipping Address', -'Shipping Po Box'=>'Shipping Po Box', -'Billing Po Box'=>'Billing Po Box', +'Shipping Po Box'=>'Shipping PO Box', +'Billing Po Box'=>'Billing PO Box', 'Billing City'=>'Billing City', 'Shipping City'=>'Shipping City', 'Billing State'=>'Billing State', @@ -163,8 +163,8 @@ 'Do Not Call'=>'Do Not Call', 'Mailing Street'=>'Mailing Street', 'Other Street'=>'Other Street', -'Mailing Po Box'=>'Mailing Po Box', -'Other Po Box'=>'Other Po Box', +'Mailing Po Box'=>'Mailing PO Box', +'Other Po Box'=>'Other PO Box', 'Mailing City'=>'Mailing City', 'Other City'=>'Other City', 'Mailing State'=>'Mailing State', Modified: vtigercrm/trunk/modules/Dashboard/HomepageDB.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/HomepageDB.php (original) +++ vtigercrm/trunk/modules/Dashboard/HomepageDB.php Tue Oct 10 10:02:43 2006 @@ -9,17 +9,10 @@ * ********************************************************************************/ require_once("modules/Dashboard/Entity_charts.php"); -/** - * Function to get Dashboard in homepage - * return the graph - $sHTML - */ + global $current_user,$user_id,$date_start,$end_date,$tmp_dir,$mod_strings; $type='recordsforuser'; - //require('user_privileges/user_privileges_'.$current_user->id.'.php'); - //if($is_admin) - // $homepagedb_query = "select vtiger_crmentity.* from vtiger_crmentity where vtiger_crmentity.setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder','SalesOrder','Activities','HelpDesk','Campaigns') and vtiger_crmentity.deleted=0"; - //else - $homepagedb_query = "select * from vtiger_crmentity se left join vtiger_leaddetails le on le.leadid=se.crmid left join vtiger_activity act on act.activityid=se.crmid where se.deleted=0 and (le.converted=0 or le.converted is null) and ((act.status!='Completed' and act.status!='Deferred') or act.status is null) and ((act.eventstatus!='Held' and act.eventstatus!='Not Held') or act.eventstatus is null) and setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder', 'SalesOrder','Calendar','HelpDesk','Campaigns') and se.deleted=0 and se.smownerid=".$current_user->id; + $homepagedb_query = "select * from vtiger_crmentity se left join vtiger_leaddetails le on le.leadid=se.crmid left join vtiger_troubletickets tt on tt.ticketid=se.crmid left join vtiger_activity act on act.activityid=se.crmid where se.deleted=0 and (le.converted=0 or le.converted is null) and (tt.status!='Closed' or tt.status is null) and ((act.status!='Completed' and act.status!='Deferred') or act.status is null) and ((act.eventstatus!='Held' and act.eventstatus!='Not Held') or act.eventstatus is null) and setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder', 'SalesOrder','Calendar','HelpDesk','Campaigns') and se.deleted=0 and se.smownerid=".$current_user->id; $graph_by="setype"; $graph_title=$mod_strings['recordsforuser'].' '.$current_user->user_name; $module="Home"; Modified: vtigercrm/trunk/modules/Emails/Email.php ============================================================================== --- vtigercrm/trunk/modules/Emails/Email.php (original) +++ vtigercrm/trunk/modules/Emails/Email.php Tue Oct 10 10:02:43 2006 @@ -257,8 +257,50 @@ function create_export_query(&$order_by, &$where) { global $log; + global $current_user; $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - $query = 'SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_attachments.name as filename, vtiger_crmentity.description as email_content FROM vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_seattachmentsrel on vtiger_activity.activityid=vtiger_seattachmentsrel.crmid left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid where vtiger_activity.activitytype="Emails" and vtiger_crmentity.deleted=0'; + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Emails", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list FROM vtiger_activity + INNER JOIN vtiger_crmentity + ON vtiger_crmentity.crmid=vtiger_activity.activityid + LEFT JOIN vtiger_users + ON vtiger_users.id = vtiger_crmentity.smownerid + LEFT JOIN vtiger_seactivityrel + ON vtiger_seactivityrel.activityid = vtiger_activity.activityid + LEFT JOIN vtiger_contactdetails + ON vtiger_contactdetails.contactid = vtiger_seactivityrel.crmid + LEFT JOIN vtiger_cntactivityrel + ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid + AND vtiger_cntactivityrel.contactid = vtiger_cntactivityrel.contactid + 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_salesmanactivityrel + ON vtiger_salesmanactivityrel.activityid = vtiger_activity.activityid + LEFT JOIN vtiger_emaildetails + ON vtiger_emaildetails.emailid = vtiger_activity.activityid + LEFT JOIN vtiger_seattachmentsrel + ON vtiger_activity.activityid=vtiger_seattachmentsrel.crmid + LEFT JOIN vtiger_attachments + ON vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid + WHERE vtiger_activity.activitytype='Emails' AND 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) + { + $sec_parameter=getListViewSecurityParameter("Emails"); + $query .= $sec_parameter; + } $log->debug("Exiting create_export_query method ..."); return $query; Modified: vtigercrm/trunk/modules/Emails/gotodownload.php ============================================================================== --- vtigercrm/trunk/modules/Emails/gotodownload.php (original) +++ vtigercrm/trunk/modules/Emails/gotodownload.php Tue Oct 10 10:02:43 2006 @@ -1,4 +1,4 @@ - Modified: vtigercrm/trunk/modules/HelpDesk/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/HelpDesk/DetailViewAjax.php Tue Oct 10 10:02:43 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { Modified: vtigercrm/trunk/modules/HelpDesk/EditView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/EditView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/EditView.php Tue Oct 10 10:02:43 2006 @@ -52,7 +52,7 @@ $smarty->assign("OP_MODE",$disp_view); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Ticket']); +$smarty->assign("SINGLE_MOD",'Ticket'); $category = getParentTab(); Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Tue Oct 10 10:02:43 2006 @@ -122,6 +122,8 @@ 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 '.$where; } Modified: vtigercrm/trunk/modules/HelpDesk/Merge.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/Merge.php (original) +++ vtigercrm/trunk/modules/HelpDesk/Merge.php Tue Oct 10 10:02:43 2006 @@ -92,7 +92,7 @@ { $column_name = "productsRel.productname"; } - if($tablename == "crmentity") + if($tablename == "vtiger_crmentity") { if($modulename == "Contacts") { @@ -171,7 +171,7 @@ left join vtiger_products as productsRel on productsRel.productid = vtiger_troubletickets.product_id left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id left join vtiger_account on vtiger_account.accountid = vtiger_troubletickets.parent_id - left join vtiger_crmentity as _crmentityAccounts on crmentityAccounts.crmid = vtiger_account.accountid + left join vtiger_crmentity as crmentityAccounts on crmentityAccounts.crmid = vtiger_account.accountid left join vtiger_accountbillads on vtiger_accountbillads.accountaddressid = vtiger_account.accountid left join vtiger_accountshipads on vtiger_accountshipads.accountaddressid = vtiger_account.accountid left join vtiger_accountscf on vtiger_accountbillads.accountaddressid = vtiger_accountscf.accountid Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php ============================================================================== --- vtigercrm/trunk/modules/Home/UnifiedSearch.php (original) +++ vtigercrm/trunk/modules/Home/UnifiedSearch.php Tue Oct 10 10:02:43 2006 @@ -80,83 +80,77 @@ { 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); + $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); - //Avoided the modules Faq and PriceBooks. we should remove this if when change the customview function - $oCustomView = ''; - if($module != 'Faq' && $module != 'PriceBooks') - { - //Added to get the default 'All' customview query + $listquery = getListQuery($module); + $oCustomView = ''; + $oCustomView = new CustomView($module); - $viewid = $oCustomView->getViewId($module); - - $listquery = $oCustomView->getModifiedCvListQuery($viewid,$listquery,$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]); + + 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]); } } @@ -182,7 +176,7 @@ { global $adb; - $query = "SELECT * FROM vtiger_field WHERE tabid = ".getTabid($module); + $query = "SELECT columnname, tablename FROM vtiger_field WHERE tabid = ".getTabid($module); $result = $adb->query($query); $noofrows = $adb->num_rows($result); @@ -197,7 +191,7 @@ { if($where != '') $where .= " OR "; - $where .= $tablename.".".$columnname." LIKE ".$adb->quote("%$search_val%"); + $where .= $tablename.".".$columnname." LIKE ".$adb->quote("%$search_val%"); } } Modified: vtigercrm/trunk/modules/Import/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Import/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Import/language/en_us.lang.php Tue Oct 10 10:02:43 2006 @@ -242,13 +242,13 @@ ,"assistant"=>"Assistant" ,"assistantphone"=>"Assistant Phone" ,"mailingstreet"=>"Mailing Address Street" - ,"mailingpobox"=>"Mailing Address Po Box" + ,"mailingpobox"=>"Mailing Address PO Box" ,"mailingcity"=>"Mailing Address City" ,"mailingstate"=>"Mailing Address State" ,"mailingzip"=>"Mailing Address Postalcode" ,"mailingcountry"=>"Mailing Address Country" ,"otherstreet"=>"Other Address Street" - ,"otherpobox"=>"Other Address Po Box" + ,"otherpobox"=>"Other Address PO Box" ,"othercity"=>"Other Address City" ,"otherstate"=>"Other Address State" ,"otherzip"=>"Other Address Postalcode" @@ -279,7 +279,7 @@ //"billing_address_street_2"=>"Billing Address Street 2", //"billing_address_street_3"=>"Billing Address Street 3", //"billing_address_street_4"=>"Billing Address Street 4", - "bill_pobox"=>"Billing Address Po Box", + "bill_pobox"=>"Billing Address PO Box", "bill_city"=>"Billing Address City", "bill_state"=>"Billing Address State", "bill_code"=>"Billing Address Postalcode", @@ -288,7 +288,7 @@ //"shipping_address_street_2"=>"Shipping Address Street 2", //"shipping_address_street_3"=>"Shipping Address Street 3", //"shipping_address_street_4"=>"Shipping Address Street 4", - "ship_pobox"=>"Shipping Address Po Box", + "ship_pobox"=>"Shipping Address PO Box", "ship_city"=>"Shipping Address City", "ship_state"=>"Shipping Address State", "ship_code"=>"Shipping Address Postalcode", @@ -334,7 +334,7 @@ "assigned_user_id"=>"Assigned To", "yahooid"=>"Yahoo Id", "lane"=>"Street", - "pobox"=>"Po Box", + "pobox"=>"PO Box", "code"=>"Postal Code", "city"=>"City", "country"=>"Country", Modified: vtigercrm/trunk/modules/Invoice/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Invoice/DetailViewAjax.php Tue Oct 10 10:02:43 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { Modified: vtigercrm/trunk/modules/Invoice/Popup.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Popup.php (original) +++ vtigercrm/trunk/modules/Invoice/Popup.php Tue Oct 10 10:02:43 2006 @@ -1,4 +1,4 @@ -'Billing State', 'Billing Code'=>'Billing Postal Code', 'Billing Country'=>'Billing Country', -'Billing Po Box'=>'Billing Po Box', -'Shipping Po Box'=>'Shipping Po Box', +'Billing Po Box'=>'Billing PO Box', +'Shipping Po Box'=>'Shipping PO Box', 'Shipping City'=>'Shipping City', 'Shipping State'=>'Shipping State', 'Shipping Code'=>'Shipping Postal Code', Modified: vtigercrm/trunk/modules/Leads/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Leads/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Leads/DetailViewAjax.php Tue Oct 10 10:02:43 2006 @@ -1,4 +1,5 @@ -assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id()); $smarty->assign("ID", $focus->id); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Lead']); +$smarty->assign("SINGLE_MOD",'Lead'); $smarty->assign("HEADER", get_module_title("Leads", "{MOD.LBL_LEAD} ".$focus->firstname." ".$focus->lastname, true)); Modified: vtigercrm/trunk/modules/Leads/Lead.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Lead.php (original) +++ vtigercrm/trunk/modules/Leads/Lead.php Tue Oct 10 10:02:43 2006 @@ -138,38 +138,32 @@ function create_export_query(&$order_by, &$where) { global $log; + global $current_user; $log->debug("Entering create_export_query(".$order_by.",".$where.") method ..."); - if($this->checkIfCustomTableExists('vtiger_leadscf')) - { - - $query = $this->constructCustomQueryAddendum('vtiger_leadscf','Leads') . " - vtiger_leaddetails.*, ".$this->entity_table.".*, vtiger_leadsubdetails.*,vtiger_leadaddress.city city, vtiger_leadaddress.state state,vtiger_leadaddress.code code,vtiger_leadaddress.country country, vtiger_leadaddress.phone phone, vtiger_users.user_name, vtiger_users.status user_status - FROM ".$this->entity_table." + + 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_leadaddress - ON vtiger_leaddetails.leadid=vtiger_leadaddress.leadaddressid + ON vtiger_crmentity.crmid=vtiger_leaddetails.leadid LEFT JOIN vtiger_leadsubdetails - ON vtiger_leaddetails.leadid=vtiger_leadsubdetails.leadsubscriptionid + 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 + 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 "; - - } - else - { - $query = "SELECT - vtiger_leaddetails.*, ".$this->entity_table.".*, vtiger_leadsubdetails.*,vtiger_leadaddress.*,vtiger_users.user_name, vtiger_users.status user_status 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_users - ON vtiger_crmentity.smownerid = vtiger_users.id "; - } + ON vtiger_crmentity.smownerid = vtiger_users.id + "; + $where_auto = " vtiger_users.status='Active' AND vtiger_crmentity.deleted=0 AND vtiger_leaddetails.converted =0"; @@ -178,6 +172,15 @@ $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"; Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Tue Oct 10 10:02:43 2006 @@ -274,36 +274,51 @@ } -$crmid = $adb->getUniqueID("vtiger_crmentity"); - -//Saving Account - starts -$sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,createdtime,modifiedtime,deleted,description) values(".$crmid.",".$current_user_id.",".$assigned_user_id.",'Accounts',1,".$date_entered.",".$date_modified.",0,'".$row['description']."')"; -$adb->query($sql_crmentity); - -$sql_insert_account = "INSERT INTO vtiger_account (accountid,accountname,industry,annualrevenue,phone,fax,rating,email1,website,employees) VALUES (".$crmid.",'".addslashes($accountname)."','".$row["industry"] ."','" .$row["annualrevenue"] ."','" .$row["phone"] ."','".$row["fax"] ."','" .$row["rating"] ."','" .$row["email"] ."','" .$row["website"] ."','" .$row["noofemployees"] ."')"; -$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"]."')"; -$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"]."')"; -$adb->query($sql_insert_accountshipads); - -//Getting the custom vtiger_field values from leads and inserting into Accounts if the vtiger_field is mapped - Jaguar -$insert_value=$crmid; -$insert_column="accountid"; -$val= getInsertValues("Accounts",$insert_value); -if($val[0]!="") - $insert_column.=","; -if($val[1]!="") - $insert_value.=","; - -$insert_column.=$val[0]; -$insert_value.=$val[1]; -$sql_insert_accountcustomfield = "INSERT INTO vtiger_accountscf (".$insert_column.") VALUES (".$insert_value.")"; -$adb->query($sql_insert_accountcustomfield); -//Saving Account - ends + +/*Code integrated to avoid duplicate Account creation during ConvertLead Operation START-- by Bharathi*/ +$acc_query = "select vtiger_account.accountid from vtiger_account left join vtiger_crmentity on vtiger_account.accountid = vtiger_crmentity.crmid where vtiger_crmentity.deleted=0 and vtiger_account.accountname = '$accountname'"; +$acc_res = $adb->query($acc_query); +$acc_rows = $adb->num_rows($acc_res); +if($acc_rows != 0) + $crmid = $adb->query_result($acc_res,0,"accountid"); +else +{ + $crmid = $adb->getUniqueID("vtiger_crmentity"); + + //Saving Account - starts + $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,createdtime,modifiedtime,deleted,description) values(".$crmid.",".$current_user_id.",".$assigned_user_id.",'Accounts',1,".$date_entered.",".$date_modified.",0,'".$row['description']."')"; + $adb->query($sql_crmentity); + /* Modified by Minnie to fix the convertlead issue -- START*/ + if(isset($row["annualrevenue"]) && !empty($row["annualrevenue"])) $annualrevenue = $row["annualrevenue"]; + else $annualrevenue = 'null'; + if(isset($row["noofemployees"]) && !empty($row["noofemployees"])) $employees = $row["noofemployees"]; + else $employees = 'null'; + $sql_insert_account = "INSERT INTO vtiger_account (accountid,accountname,industry,annualrevenue,phone,fax,rating,email1,website,employees) VALUES (".$crmid.",'".addslashes($accountname)."','".$row["industry"] ."',".$annualrevenue.",'" .$row["phone"] ."','".$row["fax"] ."','" .$row["rating"] ."','" .$row["email"] ."','" .$row["website"] ."',".$employees.")"; + /* 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"]."')"; + $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"]."')"; + $adb->query($sql_insert_accountshipads); + + //Getting the custom vtiger_field values from leads and inserting into Accounts if the vtiger_field is mapped - Jaguar + $insert_value=$crmid; + $insert_column="accountid"; + $val= getInsertValues("Accounts",$insert_value); + if($val[0]!="") + $insert_column.=","; + if($val[1]!="") + $insert_value.=","; + + $insert_column.=$val[0]; + $insert_value.=$val[1]; + $sql_insert_accountcustomfield = "INSERT INTO vtiger_accountscf (".$insert_column.") VALUES (".$insert_value.")"; + $adb->query($sql_insert_accountcustomfield); + //Saving Account - ends +} +/*Code integrated to avoid duplicate Account creation during ConvertLead Operation END-- by Bharathi*/ $account_id=$crmid; getRelatedNotesAttachments($id,$crmid); //To Convert Related Notes & Attachments -Jaguar @@ -320,7 +335,7 @@ //Saving Contact - starts $crmcontactid = $adb->getUniqueID("vtiger_crmentity"); -$sql_crmentity1 = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,description,createdtime) values(".$crmcontactid.",".$current_user_id.",".$assigned_user_id.",'Contacts',0,0,'".$row['description']."',".$date_entered.")"; +$sql_crmentity1 = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,description,createdtime,modifiedtime) values(".$crmcontactid.",".$current_user_id.",".$assigned_user_id.",'Contacts',0,0,'".$row['description']."',".$date_entered.",".$date_modified.")"; $adb->query($sql_crmentity1); @@ -382,7 +397,7 @@ $oppid = $adb->getUniqueID("vtiger_crmentity"); - $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,".$date_entered.",'".$row['description']."')"; + $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,modifiedtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,".$date_entered.",".$date_modified.",'".$row['description']."')"; $adb->query($sql_crmentity); Modified: vtigercrm/trunk/modules/Leads/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Leads/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Leads/language/en_us.lang.php Tue Oct 10 10:02:43 2006 @@ -153,7 +153,7 @@ 'Country'=>'Country', 'State'=>'State', 'Description'=>'Description', -'Po Box'=>'Po Box', +'Po Box'=>'PO Box', 'Campaign Source'=>'Campaign Source', //Added for CustomView 4.2 Release 'Name'=>'Name', Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php Tue Oct 10 10:02:43 2006 @@ -3405,7 +3405,7 @@ $taxres = $conn->query("select taxid from vtiger_inventorytaxinfo where taxlabel='".addslashes($taxlabel)."'"); $taxid = $conn->query_result($taxres,0,'taxid'); - $taxquery = "insert into vtiger_producttaxrel ($productid, \"$taxid\", '0.00')"; + $taxquery = "insert into vtiger_producttaxrel values($productid, \"$taxid\", '0.00')"; //Execute($taxquery); $conn->query($taxquery); } @@ -3555,6 +3555,7 @@ //changes made for CustomView and Reports - Activities changed to Calendar -- Starts //Added to change the entitytype from Activities to Calendar for customview +Execute("update vtiger_crmentity set setype='Calendar' where setype='Activities'"); Execute("update vtiger_customview set entitytype='Calendar' where entitytype='Activities'"); //Added to change the primarymodule from Activities to Calendar for Reports @@ -3722,6 +3723,48 @@ Execute("insert into vtiger_postatus values('','Received Shipment',$sortorderid,1)"); +//Added after 5.0 GA release +//CALCULATE Activity End Time (time_end) +//we have to calculate activity end time (time_end) based on start time (time_start) and duration (duration_hours, duration_minutes) +$sql = "select * from vtiger_activity"; +$result = $conn->query($sql); +$num_rows = $conn->num_rows($result); +for($i=0;$i<$num_rows;$i++) +{ + //First we have to retrieve the time_start, duration_hours and duration_minutes and form as a date with time + $activityid = $conn->query_result($result,$i,'activityid'); + $date_start = $conn->query_result($result,$i,'date_start'); + $time_start = $conn->query_result($result,$i,'time_start'); + $duration_hours = $conn->query_result($result,$i,'duration_hours'); + $duration_minutes = $conn->query_result($result,$i,'duration_minutes'); + + if($duration_hours != '' && $duration_minutes != '') + { + $date_details = explode("-",$date_start); + $start_year = $date_details[0]; + $start_month = $date_details[1]; + $start_date = $date_details[2]; + + $start_details = explode(":",$time_start); + $start_hour = $start_details[0]; + $start_minutes = $start_details[1]; + + $full_duration = "$duration_hours:$duration_minutes:00"; + + $start = date("Y-m-d H:i:s",mktime($start_hour, $start_minutes, 0, $start_month, $start_date, $start_year)); + $end = date("Y-m-d H:i:s",mktime($start_hour+$duration_hours, $start_minutes+$duration_minutes, 0, $start_month, $start_date, $start_year)); + + $end_details = explode(" ",$end); + $due_date = $end_details[0]; + + $end_time_details = explode(":",$end_details[1]); + $time_end = $end_time_details[0].":".$end_time_details[1]; + + $update_query = "update vtiger_activity set due_date=\"$due_date\", time_end=\"$time_end\" where activityid=$activityid"; + + $conn->query($update_query); + } +} Modified: vtigercrm/trunk/modules/Notes/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Notes/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Notes/DetailViewAjax.php Tue Oct 10 10:02:43 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Note(); Modified: vtigercrm/trunk/modules/Notes/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Notes/EditView.php (original) +++ vtigercrm/trunk/modules/Notes/EditView.php Tue Oct 10 10:02:43 2006 @@ -110,7 +110,7 @@ $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Note']); +$smarty->assign("SINGLE_MOD",'Note'); //Display the FCKEditor or not? -- configure $FCKEDITOR_DISPLAY in config.php $smarty->assign("FCKEDITOR_DISPLAY",$FCKEDITOR_DISPLAY); Modified: vtigercrm/trunk/modules/Notes/Note.php ============================================================================== --- vtigercrm/trunk/modules/Notes/Note.php (original) +++ vtigercrm/trunk/modules/Notes/Note.php Tue Oct 10 10:02:43 2006 @@ -89,12 +89,55 @@ { global $log; $log->debug("Entering create_export_query(".$order_by.",". $where.") method ..."); - $query = "SELECT - vtiger_notes.*, - vtiger_contactdetails.firstname, - vtiger_contactdetails.lastname - FROM vtiger_notes - LEFT JOIN vtiger_contactdetails ON vtiger_notes.contact_id=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_notes.notesid and vtiger_crmentity.deleted=0 "; + + include("include/utils/ExportUtils.php"); + + //To get the Permitted fields query and the permitted fields list + $sql = getPermittedFieldsQuery("Notes", "detail_view"); + $fields_list = getFieldsListFromQuery($sql); + + $query = "SELECT $fields_list FROM vtiger_notes + inner join vtiger_crmentity + on vtiger_crmentity.crmid=vtiger_notes.notesid + LEFT JOIN vtiger_senotesrel + ON vtiger_senotesrel.notesid = vtiger_notes.notesid + LEFT JOIN vtiger_contactdetails + ON vtiger_notes.contact_id=vtiger_contactdetails.contactid + + LEFT JOIN vtiger_crmentity vtiger_crmentityRelatedTo + ON vtiger_crmentityRelatedTo.crmid = vtiger_senotesrel.crmid + + LEFT JOIN vtiger_leaddetails vtiger_NoteRelatedToLead + ON vtiger_NoteRelatedToLead.leadid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_account vtiger_NoteRelatedToAccount + ON vtiger_NoteRelatedToAccount.accountid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_potential vtiger_NoteRelatedToPotential + ON vtiger_NoteRelatedToPotential.potentialid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_products vtiger_NoteRelatedToProduct + ON vtiger_NoteRelatedToProduct.productid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_invoice vtiger_NoteRelatedToInvoice + ON vtiger_NoteRelatedToInvoice.invoiceid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_purchaseorder vtiger_NoteRelatedToPO + ON vtiger_NoteRelatedToPO.purchaseorderid = vtiger_senotesrel.crmid + LEFT JOIN vtiger_salesorder vtiger_NoteRelatedToSO + ON vtiger_NoteRelatedToSO.salesorderid = vtiger_senotesrel.crmid + + WHERE vtiger_crmentity.deleted=0 + + AND ((vtiger_senotesrel.crmid IS NULL + AND (vtiger_notes.contact_id = 0 + OR vtiger_notes.contact_id IS NULL)) + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Leads').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Accounts').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Potentials').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Products').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Invoice').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('PurchaseOrder').") + OR vtiger_senotesrel.crmid IN (".getReadEntityIds('SalesOrder').") + OR vtiger_notes.contact_id IN (".getReadEntityIds('Contacts').")) + + "; + $log->debug("Exiting create_export_query method ..."); return $query; } Modified: vtigercrm/trunk/modules/Notes/Save.php ============================================================================== --- vtigercrm/trunk/modules/Notes/Save.php (original) +++ vtigercrm/trunk/modules/Notes/Save.php Tue Oct 10 10:02:43 2006 @@ -85,6 +85,30 @@ 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'] != '') Modified: vtigercrm/trunk/modules/Portal/Popup.php ============================================================================== --- vtigercrm/trunk/modules/Portal/Popup.php (original) +++ vtigercrm/trunk/modules/Portal/Popup.php Tue Oct 10 10:02:43 2006 @@ -1,4 +1,4 @@ - - + @@ -55,7 +55,7 @@
      User List
      '.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_URL'] .' http://
      '.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_NAME'] .'
      Modified: vtigercrm/trunk/modules/Portal/Portal.js ============================================================================== --- vtigercrm/trunk/modules/Portal/Portal.js (original) +++ vtigercrm/trunk/modules/Portal/Portal.js Tue Oct 10 10:02:43 2006 @@ -90,3 +90,25 @@ 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/trunk/modules/Portal/Portal.php ============================================================================== --- vtigercrm/trunk/modules/Portal/Portal.php (original) +++ vtigercrm/trunk/modules/Portal/Portal.php Tue Oct 10 10:02:43 2006 @@ -1,4 +1,4 @@ - Modified: vtigercrm/trunk/modules/Potentials/Charts.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/Charts.php (original) +++ vtigercrm/trunk/modules/Potentials/Charts.php Tue Oct 10 10:02:43 2006 @@ -1124,7 +1124,7 @@ $imagemap = $canvas->getImageMap(); $graph =& Image_Graph::factory('graph', $canvas); - $font =& $graph->addNew('font', calculate_font_name('en_en')); + $font =& $graph->addNew('font', calculate_font_name($lang_crm)); // set the font size to 11 pixels $font->setSize(8); $font->setColor($font_color); Modified: vtigercrm/trunk/modules/Potentials/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Potentials/DetailViewAjax.php Tue Oct 10 10:02:43 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Potential(); Modified: vtigercrm/trunk/modules/Potentials/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/EditView.php (original) +++ vtigercrm/trunk/modules/Potentials/EditView.php Tue Oct 10 10:02:43 2006 @@ -119,7 +119,7 @@ $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",$app_strings['Potential']); +$smarty->assign("SINGLE_MOD",'Potential'); $tabid = getTabid("Potentials"); Modified: vtigercrm/trunk/modules/Potentials/Opportunity.js ============================================================================== --- vtigercrm/trunk/modules/Potentials/Opportunity.js (original) +++ vtigercrm/trunk/modules/Potentials/Opportunity.js Tue Oct 10 10:02:43 2006 @@ -45,7 +45,7 @@ } function set_return_todo(product_id, product_name) { - window.opener.document.createTodo.parent_name.value = product_name; - window.opener.document.createTodo.parent_id.value = product_id; + window.opener.document.createTodo.task_parent_name.value = product_name; + window.opener.document.createTodo.task_parent_id.value = product_id; } Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/Opportunity.php (original) +++ vtigercrm/trunk/modules/Potentials/Opportunity.php Tue Oct 10 10:02:43 2006 @@ -183,34 +183,37 @@ function create_export_query($order_by, $where) { global $log; + global $current_user; $log->debug("Entering create_export_query(".$order_by.",". $where.") method ..."); - if($this->checkIfCustomTableExists('vtiger_potentialscf')) - { - $query = $this->constructCustomQueryAddendum('vtiger_potentialscf','Potentials') ." - vtiger_potential.*, - vtiger_account.accountname account_name, - vtiger_users.user_name assigned_user_name - FROM vtiger_potential - INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid=vtiger_potential.potentialid - 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_users on vtiger_crmentity.smownerid=vtiger_users.id - where vtiger_crmentity.deleted=0 "; - } - else - { - $query = "SELECT - vtiger_potential.*, - vtiger_account.accountname account_name, - vtiger_users.user_name assigned_user_name - FROM vtiger_potential + 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; Modified: vtigercrm/trunk/modules/PriceBooks/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/PriceBooks/DetailViewAjax.php Tue Oct 10 10:02:43 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new PriceBook(); Modified: vtigercrm/trunk/modules/PriceBooks/EditView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/EditView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/EditView.php Tue Oct 10 10:02:43 2006 @@ -50,7 +50,7 @@ $smarty->assign("OP_MODE",$disp_view); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['PriceBook']); +$smarty->assign("SINGLE_MOD",'PriceBook'); $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.js ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/PriceBook.js (original) +++ vtigercrm/trunk/modules/PriceBooks/PriceBook.js Tue Oct 10 10:02:43 2006 @@ -103,16 +103,15 @@ document.addToPB.action="index.php?module=Products&action=addPbProductRelToDB&return_module=Products&return_action=AddProductsToPriceBook" } -function updateListPrice(unitprice,fieldname) +function updateListPrice(unitprice,fieldname,oSelect) { - var elem=document.addToPB.elements; - var i; - for(i=0; i @@ -113,13 +113,13 @@ { $list_body .= ''; $field_name=$entity_id."_listprice"; - $list_body .= ''; + $list_body .= ''; $list_body .= ''; $list_body .= ''; - $list_body .= ''; + $list_body .= ''; $list_body .= ''; } - + } Modified: vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php ============================================================================== --- vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php (original) +++ vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php Tue Oct 10 10:02:43 2006 @@ -1,4 +1,4 @@ -query($list_query); $num_rows = $adb->num_rows($list_result); @@ -66,7 +68,7 @@ //Buttons Add To PriceBook and Cancel $other_text = '
      -    +   
      '.$adb->query_result($list_result,$i,"bookname").''.$unit_price.'
      - + '; + $list_body .= ''; $list_body .= ''; $list_body .= ''; $list_body .= ''; - $list_body .= ''; + $list_body .= ''; } } Modified: vtigercrm/trunk/modules/Products/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Products/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Products/DetailViewAjax.php Tue Oct 10 10:02:43 2006 @@ -22,7 +22,7 @@ $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; + $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { $modObj = new Product(); Modified: vtigercrm/trunk/modules/Products/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Products/EditView.php (original) +++ vtigercrm/trunk/modules/Products/EditView.php Tue Oct 10 10:02:43 2006 @@ -95,7 +95,7 @@ $smarty->assign("OP_MODE",$disp_view); $smarty->assign("MODULE",$currentModule); -$smarty->assign("SINGLE_MOD",$app_strings['Product']); +$smarty->assign("SINGLE_MOD",'Product'); $smarty->assign("MOD", $mod_strings); Modified: vtigercrm/trunk/modules/Products/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Products/ListView.php (original) +++ vtigercrm/trunk/modules/Products/ListView.php Tue Oct 10 10:02:43 2006 @@ -1,4 +1,4 @@ - Modified: vtigercrm/trunk/modules/Products/Product.js ============================================================================== --- vtigercrm/trunk/modules/Products/Product.js (original) +++ vtigercrm/trunk/modules/Products/Product.js Tue Oct 10 10:02:43 2006 @@ -8,18 +8,16 @@ * ********************************************************************************/ document.write("'; } Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/trunk/pkg/bin/startvTiger.bat (original) +++ vtigercrm/trunk/pkg/bin/startvTiger.bat Tue Oct 10 10:02:43 2006 @@ -43,23 +43,23 @@ echo "" echo "making an attempt to kill any existing vtigercrm service" echo "" -bin\apache -k stop -n vtigercrm5 -bin\apache -k uninstall -n vtigercrm5 +bin\apache -k stop -n vtigercrm501 +bin\apache -k uninstall -n vtigercrm501 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 vtigercrm5 -bin\apache -k uninstall -n vtigercrm5 +bin\apache -k stop -n vtigercrm501 +bin\apache -k uninstall -n vtigercrm501 echo "" echo "" -echo "Installing vtigercrm5 apache service after sleeping for 10 seconds" +echo "Installing vtigercrm501 apache service after sleeping for 10 seconds" echo "" %SLEEP_STR% -n 10 127.0.0.1>nul -bin\apache -k install -n vtigercrm5 -f conf\httpd.conf +bin\apache -k install -n vtigercrm501 -f conf\httpd.conf echo "" -echo "Starting vtigercrm5 apache service" +echo "Starting vtigercrm501 apache service" echo "" -bin\apache -n vtigercrm5 -k start +bin\apache -n vtigercrm501 -k start IF ERRORLEVEL 1 goto stopservice goto checkmysql @@ -117,27 +117,27 @@ :checkdatabase echo "" -echo "check to see if vtigercrm5 database already exists" +echo "check to see if vtigercrm501 database already exists" echo "" -mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm5'" | "%WINDIR%\system32\find.exe" "vtigercrm5" > NUL +mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm501'" | "%WINDIR%\system32\find.exe" "vtigercrm501" > NUL IF ERRORLEVEL 1 goto dbnotexists echo "" -ECHO "vtigercrm5 database exists" +ECHO "vtigercrm501 database exists" echo "" goto end :dbnotexists echo "" -ECHO "vtigercrm5 database does not exist" +ECHO "vtigercrm501 database does not exist" echo "" echo %cd% echo "" -echo "Proceeding to create database vtigercrm5 and populate the same" +echo "Proceeding to create database vtigercrm501 and populate the same" echo "" -mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm5" +mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm501" echo "" -echo "vtigercrm5 database created" +echo "vtigercrm501 database created" echo "" goto end Modified: vtigercrm/trunk/pkg/bin/startvTiger.sh ============================================================================== --- vtigercrm/trunk/pkg/bin/startvTiger.sh (original) +++ vtigercrm/trunk/pkg/bin/startvTiger.sh Tue Oct 10 10:02:43 2006 @@ -111,14 +111,14 @@ fi echo "" -echo "Checking if the vtigercrm5 database already exists" +echo "Checking if the vtigercrm501 database already exists" echo "" -echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm5 >/dev/null +echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm501 >/dev/null if [ $? -ne 0 ]; then echo "" - echo "Database vtigercrm5 does not exist. Creating database vtigercrm5" + echo "Database vtigercrm501 does not exist. Creating database vtigercrm501" echo "" - ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm5" + ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm501" fi host=`hostname` Modified: vtigercrm/trunk/pkg/bin/stopvTiger.bat ============================================================================== --- vtigercrm/trunk/pkg/bin/stopvTiger.bat (original) +++ vtigercrm/trunk/pkg/bin/stopvTiger.bat Tue Oct 10 10:02:43 2006 @@ -32,13 +32,13 @@ cd /d %apache_dir% rem shut down apache echo "" -echo "stopping vtigercrm5 apache service" +echo "stopping vtigercrm501 apache service" echo "" -bin\apache -n vtigercrm5 -k stop +bin\apache -n vtigercrm501 -k stop echo "" -echo "uninstalling vtigercrm5 apache service" +echo "uninstalling vtigercrm501 apache service" echo "" -bin\apache -k uninstall -n vtigercrm5 +bin\apache -k uninstall -n vtigercrm501 rem .\bin\ShutdownApache.exe logs\httpd.pid goto StopMySQL Modified: vtigercrm/trunk/soap/firefoxtoolbar.php ============================================================================== --- vtigercrm/trunk/soap/firefoxtoolbar.php (original) +++ vtigercrm/trunk/soap/firefoxtoolbar.php Tue Oct 10 10:02:43 2006 @@ -16,7 +16,7 @@ $log = &LoggerManager::getLogger('firefoxlog'); -$NAMESPACE = 'http://www.vtiger.com/vtigercrm/'; +$NAMESPACE = 'http://www.vtiger.com/products/crm'; $server = new soap_server; $accessDenied = "You are not authorized for performing this action"; $server->configureWSDL('vtigersoap'); Modified: vtigercrm/trunk/soap/thunderbirdplugin.php ============================================================================== --- vtigercrm/trunk/soap/thunderbirdplugin.php (original) +++ vtigercrm/trunk/soap/thunderbirdplugin.php Tue Oct 10 10:02:43 2006 @@ -18,7 +18,7 @@ $log = &LoggerManager::getLogger('thunderbirdplugin'); $accessDenied = "You are not authorized for performing this action"; -$NAMESPACE = 'http://www.vtiger.com/vtigercrm/'; +$NAMESPACE = 'http://www.vtiger.com/products/crm'; $server = new soap_server; $server->configureWSDL('vtigersoap'); @@ -46,7 +46,7 @@ array('username'=>'xsd:string'), array('return'=>'tns:contactdetails'), $NAMESPACE); - + $server->register( 'CheckContactPerm',array('user_name'=>'xsd:string'),array('return'=>'xsd:string'),$NAMESPACE); @@ -55,24 +55,24 @@ $server->register( 'AddContact', - array('user_name'=>'xsd:string', - 'first_name'=>'xsd:string', - 'last_name'=>'xsd:string', + 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', + '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_state'=>'xsd:string', + 'alt_address_postalcode'=>'xsd:string', 'alt_address_country'=>'xsd:string', 'office_phone'=>'xsd:string', 'home_phone'=>'xsd:string', @@ -82,13 +82,41 @@ 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); - + $NAMESPACE); + $server->wsdl->addComplexType( 'contactdetail', 'complexType', @@ -97,7 +125,7 @@ '', array( 'id' => array('name'=>'id','type'=>'xsd:string'), - 'firstname' => array('name'=>'firstname','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'), @@ -141,18 +169,18 @@ ), 'tns:contactdetail' ); - + function SearchContactsByEmail($username,$emailaddress) { require_once('modules/Contacts/Contact.php'); - + $seed_contact = new Contact(); $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) { @@ -164,21 +192,21 @@ "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/User.php'); require_once('modules/Emails/Email.php'); - + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($user_name); - + $email = new Email(); //$log->debug($msgdtls['contactid']); $emailbody = str_replace("'", "''", $email_body); @@ -189,7 +217,7 @@ $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->column_fields[activitytype] = 'Emails'; $email->plugin_save = true; $email->save("Emails"); @@ -208,7 +236,7 @@ return $email->id; } - + function GetContacts($username) { global $adb; @@ -235,9 +263,9 @@ $namelist = explode(" ", $contact["lastname"]); if(isset($namelist)) { - if(count($namelist) >= 2) + if(count($namelist) >= 2) { - $contact["lastname"] = $namelist[count($namelist)-1]; + $contact["lastname"] = $namelist[count($namelist)-1]; for($i=0; $i $contact["email"], "jobtitle" => $contact["title"], "department" => $contact["department"], - "accountname" => $contact["accountname"], + "accountname" => $contact["accountname"], "officephone" => $contact["phone"], "homephone" => $contact["homephone"], - "otherphone" => $contact["otherphone"], + "otherphone" => $contact["otherphone"], "fax" => $contact["fax"], "mobile" => $contact["mobile"], "asstname" => $contact["assistant"], - "asstphone" => $contact["assistantphone"], + "asstphone" => $contact["assistantphone"], "reportsto" => $contact["reports_to_name"], "mailingstreet" => $contact["mailingstreet"], "mailingcity" => $contact["mailingcity"], "mailingstate" => $contact["mailingstate"], "mailingzip" => $contact["mailingzip"], - "mailingcountry" => $contact["mailingcountry"], + "mailingcountry" => $contact["mailingcountry"], "otherstreet" => $contact["otherstreet"], "othercity" => $contact["othercity"], "otherstate" => $contact["otherstate"], "otherzip" => $contact["otherzip"], "othercountry" => $contact["othercountry"], "description" => "", - "category" => "", + "category" => "", ); } //to remove an erroneous compiler warning @@ -317,13 +345,13 @@ { $row = $db->fetchByAssoc($result, 0); //mysql_close(); - return $row["accountid"]; + return $row["accountid"]; } else { $row = $db->fetchByAssoc($result, 0); //mysql_close(); - return $row["accountid"]; + return $row["accountid"]; } } @@ -334,14 +362,14 @@ global $current_user; require_once('modules/Users/User.php'); require_once('modules/Contacts/Contact.php'); - + $seed_user = new User(); $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"; @@ -355,7 +383,7 @@ { $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); } - + $contact = new Contact(); $contact->column_fields[firstname]=in_array('firstname',$permitted_lists) ? $first_name : ""; $contact->column_fields[lastname]=in_array('lastname',$permitted_lists) ? $last_name : ""; @@ -372,18 +400,78 @@ $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[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[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; + $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/User.php'); + require_once('modules/Leads/Lead.php'); + + $seed_user = new User(); + $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 Lead(); + $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) @@ -417,7 +505,7 @@ function end_session($user_name) { - return "Success"; + return "Success"; } function CheckContactPerm($user_name) @@ -454,6 +542,6 @@ } } -$server->service($HTTP_RAW_POST_DATA); -exit(); +$server->service($HTTP_RAW_POST_DATA); +exit(); ?> Modified: vtigercrm/trunk/soap/vtigerolservice.php ============================================================================== --- vtigercrm/trunk/soap/vtigerolservice.php (original) +++ vtigercrm/trunk/soap/vtigerolservice.php Tue Oct 10 10:02:43 2006 @@ -17,7 +17,7 @@ error_reporting(0); -$NAMESPACE = 'http://www.vtigercrm.com/vtigercrm'; +$NAMESPACE = 'http://www.vtiger.com/products/crm'; $server = new soap_server; Modified: vtigercrm/trunk/soap/wordplugin.php ============================================================================== --- vtigercrm/trunk/soap/wordplugin.php (original) +++ vtigercrm/trunk/soap/wordplugin.php Tue Oct 10 10:02:43 2006 @@ -17,7 +17,7 @@ $log = &LoggerManager::getLogger('wordplugin'); error_reporting(0); -$NAMESPACE = 'http://www.vtiger.com/vtigercrm/'; +$NAMESPACE = 'http://www.vtiger.com/products/crm'; $server = new soap_server; $accessDenied = "You are not permitted to perform this action"; $server->configureWSDL('vtigersoap'); Modified: vtigercrm/trunk/themes/alphagrey/images/aboutUS.jpg ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/themes/alphagrey/style.css ============================================================================== --- vtigercrm/trunk/themes/alphagrey/style.css (original) +++ vtigercrm/trunk/themes/alphagrey/style.css Tue Oct 10 10:02:43 2006 @@ -109,7 +109,7 @@ -.level2text { +/*.level2text { font-family: Arial, Helvetica, sans-serif; font-size: 11px; @@ -130,7 +130,7 @@ text-decoration:underline; color:#555555; -} +}*/ .level2Bg { @@ -165,13 +165,6 @@ padding-top:5px; padding-bottom:5px; } - - -.tabLiner { - background:#999 url(images/moduleSelectorBg.gif) bottom repeat-x; - padding:0px; -} - .sep1 { background:#999999; } @@ -183,15 +176,10 @@ a { text-decoration:none; color:#000099; - - - } a:hover { text-decoration:underline; - - } .hdrLink { @@ -239,8 +227,6 @@ } .lvtBg { - - } .lvtHeaderText { @@ -319,16 +305,6 @@ border-bottom:2px solid #aaaaaa; padding-left:0px; } - -.rightAddInfo { - border-left:1px solid #a2a2a2; - border-right:1px solid #dddddd; - border-bottom:1px solid #dddddd; - border-top:1px solid #a2a2a2; - background-color:#fafafa; - padding:5px; -} - .dvtCellLabel, .cellLabel { background-color:#efefef; padding-right:10px; @@ -363,18 +339,6 @@ background-color:#fafafa; } - -.rightUpcomingActivitiesHeader{ - border-bottom:1px solid #dddddd; - padding:5px; - background-color:#ffffdd; -} - -.rightUpcomingActivitiesContent { - padding:5px; - background-color:#ffffef; -} - .detailedViewHeader{ border-bottom:2px solid #dadada; padding:5px; @@ -390,17 +354,6 @@ width:90%; background-color:#ffffff; } - -.detailedViewProdTextBox { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:85%; - background-color:#ffffff; -} - .detailedViewTextBoxOn { font-family: Arial, Helvetica, sans-serif; font-size: 11px; @@ -409,32 +362,6 @@ padding-left:5px; width:90%; background-color:#ffffdd; -} - -.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 ------------------------------------------- */ - -.moduleSearch { - border:1px solid #dddddd; - background-color:#ffffef; - -} - -.searchHdrBox { - - border-bottom:1px dashed #dddddd; } .advSearch { @@ -463,29 +390,6 @@ width:10px } -.searchNotFound { - border:2px solid #999999; - background-color:#fafafa; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #ff0000; - height:50px; - width:640px; -} - - -.loginTopBg { - background:url(images/loginTopBg.gif) repeat-x; -} - -.loginTopShade { - background:url(images/loginTopShade.gif) repeat-x; -} - -.loginBg{ - background:#448cEB url(images/loginBg.gif) repeat-x; -} - .textbox { border:1px solid #999999; background-color:#ffffff; @@ -495,31 +399,8 @@ padding:2px; } - -.loginBottomBg { - background:url(images/loginBottomBg.gif) repeat-x; -} - -.loginSignin { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - color: #448ceb; - font-weight:bold; -} - -.loginBillBoard { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color:#ffffff; -} - .mx { } - -.calTopBg { - background:url(images/calBg.gif) repeat-x; -} - .calListTable td{ border-bottom:1px solid #efefef; border-left:1px solid #efefef; @@ -528,18 +409,6 @@ width:100%; border:1px solid #999999; -} -.calDisplay { - border-left:1px solid #d0d0d0; - border-right:1px solid #d0d0d0; -} -.calBottomBg { - background:url(images/calBottomBg.gif) repeat-x; -} - -.calDayHourCell { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; } .calDayHour { border-top:1px solid #dddddd; @@ -548,35 +417,6 @@ border-right:1px solid #dddddd; background-color:#eaeaea; } -.calDiv { - overflow:auto; width:95%;height:200px;padding:0px;background-color:#fefefe; - border-top: 1px solid #bababa; - border-bottom: 1px solid #bababa; -} -.calColHdr{ - border-top:1px solid #fefefa; - border-left:1px solid #fefefa; - - border-right:1px solid #a9a9a9; - background-color:#f5f5f5; -} -.calHourCol { - border-top: 1px solid #fefefa; - border-left: 1px solid #fefefa; - border-right: 1px solid #9a9a9a; - border-bottom: 1px solid #9a9a9a; - background-color: #efefef; - height: 30px; - -} -.calHourOccupied { - background-color:#d9d9d9; - -} -.calListViewRow { - border-bottom:1px solid e1e1e1; -} - .calAddEvent { position:absolute; z-index:10000; @@ -585,105 +425,14 @@ top:150px; background-color:#ffffff; } - -.addEventHeader{ - border-bottom:2px dotted #cccccc; -} - -.addEventFooter{ - border-top:2px dotted #cccccc; - height:40px; -} - .addEventInnerBox { border:1px dotted #dadada; } - -.cellScheduled { - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSchHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSch{ - border:0px; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellNormalHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffff; - color:#7a7a7a; -} - .cellNormal { border:0px; background-color:#ffffff; } - -.calEventNormal { - border:1px solid #999999; - background-color:#99ffcc; - -} - -.calEventCritical { - border:1px solid #999999; - background-color:#FFCC33; -} -.tblPro1 { - -border:2px solid #dadada; - background-color:white; - -} - -.tblPro1IconCell { - border-right:1px solid #dadada; -} - -.tblPro1HeadingCell { - font-weight:bold; -color:#4a4a4a; -} - -.tblPro1ColHeader { - background-color:#dadada; - border-left:1px solid white; - border-right:1px solid #999999; - font-size: 11px; - line-height: 14px; - background-image:url(images/tblPro1ColBg.gif); -} - -.tblPro1DataCell { - border-bottom:1px solid #f5f5f5; - color:#5a5a5a; - font-size: 11px; - line-height: 14px; - -} - -.divEventToDo { -overflow:auto; -height:150px; -border:1px solid #dadada; - -} - .EventToDo{ } @@ -696,119 +445,6 @@ margin-right: 10px; margin-bottom: 15px; } - -.thumbnailcaption -{ font-size: 0.9em; padding-top: 0.2em ; } - -/* For Settings */ - -.lftMnuTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-color:#BBBBBB; - border-left:1px solid #666666; - border-right:1px solid #666666; - border-top:0px solid #666666; - border-collapse:collapse; - text-align:right; - padding-top:0px; - padding-left:5px; - padding-right:5px; - vertical-align:top; -} - -.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-decoration:none; - width:99%; -} - -.lftMnuHdr tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-align:left; - text-decoration:none; - height:25px; - padding-right:0px; - padding-left:0px; -} - -a.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; - vertical-align:middle; -} - -a.lftMnuHdr:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; -} - -a.lftSubMnu{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; -} - -a.lftSubMnu:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; - background-color:#CCCCCC; -} - .padTab{ padding-top:0px; padding-left:0px; @@ -817,26 +453,6 @@ vertical-align:top; } - -.controlTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - width:100%; - border:0px; -} - -.controlTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - vertical-align:bottom; -} - #company{ position:relative; width:100%; @@ -850,32 +466,9 @@ #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;} -#studioTab{position:relative;left:0px;top:0px;width:100%;display:none;} - -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} -.imgDoc{ - cursor:pointer; - border:0px; -} - #one{ position:relative; display:block; @@ -936,83 +529,12 @@ /*Added for Advance Seearch*/ -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} - -.imgDoc{ - cursor:pointer; - border:0px; -} -#slideMnu{ - background-color:#BBBBBB; - vertical-align:top; -} - #one{ position:relative; display:block; width:245px; } -.prdTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:100%; - border-left:0px solid #CCCCCC; - border-right:0px solid #CCCCCC; - border-collapse:collapse; -} - -.prdTab tr th{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - padding-left:5px; - background-color:#E5E5E5; - height:20px; - color:#000000; - font-weight:bold; - text-decoration:none; - border-bottom:1px solid #CCCCCC; -} - -.prdTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - border-bottom:1px solid #CCCCCC; - padding-left:5px; - color:#000000; - text-decoration:none; - font-weight:normal; - height:20px; -} - -.delTxt{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:underline; - font-weight:normal; - color:#000099; - cursor:pointer; -} /* Dashboard CSS */ a.dash_href{ @@ -1045,13 +567,6 @@ background-color:#bfbfbf; padding:5px; } - -.dash_shadow{ - background-image:url(images/dash_top_shadow.jpg); - background-repeat:repeat-x; - height:10px; -} - .dash_white{ background-color:#FFFFFF; padding:5px 10px 5px 10px; @@ -1068,15 +583,6 @@ color:#000000; padding-left:10px;padding-right:10px; } -.dashMatrixSeperator{ - border-left:2px dashed #dadada; - -} -.dashMatrixBottomLiner{ - border-bottom:2px dashed #dadada; - -} - .dash_switch{ cursor:pointer; width:26px; @@ -1125,56 +631,12 @@ background-repeat:repeat-x; position:top; } - -.dash_sel_top{ - background-image:url(images/dash_sel_top.jpg); - background-repeat:repeat-x; - height:5px; - background-position:left top; - font-size:0px; -} - -.dash_sel_btm{ - background-image:url(images/dash_sel_btm.jpg); - background-repeat:repeat-x; - height:4px; - background-position:left top; - font-size:0px; -} - -.dash_sel_left{ - background-color:#dadada; - border-left:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:200px; - text-align:left; - padding-left:5px; - font-size:11px; - font-weight:bold; - color:#000000; -} - -.dash_sel_right{ - background-color:#dadada; - border-right:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:25px; - padding-left:5px; - cursor:pointer; -} - + /* menu */ -#mnuSlide{ - position:absolute; - left:0px; - top:100px; -/* width:110px;*/ -} - -/* a.submenu{ + + + a.submenu{ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; padding-top:5px; @@ -1200,7 +662,7 @@ text-align:left; text-decoration:none; display:block; -} */ +} #mnuKey{ font-family:Verdana, Arial, Helvetica, sans-serif; @@ -1227,7 +689,7 @@ border-right:1px solid #CCCCCC; opacity:.9; display:none; -} +}*/ /* clock */ @@ -1308,11 +770,6 @@ /* Calculator */ -.calcBg { - /*background-color: #666;*//*BFC1B7*/ - background: url(images/cal_bg.gif); - border: 1px solid #009900; -} .calcResult { width: 100%; height: 25px; @@ -1441,22 +898,6 @@ padding:2px; } - -.frameHdr{ - height:32px; - background-image:url(images/rssframeHdr.gif); - background-repeat:repeat-x; - background-position:top left; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - text-align:left; - padding-left:5px; - color:#FFFF00; - vertical-align:middle; - border:0px solid #000000; -} - .forwardBg{ font-family:Arial, Helvetica, sans-serif; font-size:12px; @@ -1473,45 +914,6 @@ /* New Styles */ -.hometop{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:14px; - color:white; - text-decoration:none; - text-align:left; - padding-left:10px; - background-image:url(../images/hometop.gif); - background-position:top left; - background-repeat:repeat-x; - height:35px; - vertical-align:middle; -} - -.homeBtm{ - background-image:url(../images/HomeBtm.gif); - background-position:top left; - background-repeat:repeat-x; - height:29px; -} - -.imageTab{ - background-color:#F5F5F5; - border:0px solid #EBEBEB; - width:30px; - height:30px; - position:relative; - visibility:visible; -} - -a.imageTab:Hover{ - background-color:#BFBFFF; - border:0px solid #EBEBEB; - width:30px; - height:30px; - display:block; - opacity:.5; -} - .mnuTab{ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; @@ -1525,107 +927,6 @@ padding-left:5px; vertical-align:middle; } - -.mnuSel td{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - background-color:#EBEBEB; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuSel td:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#EBEBEB; -} - -.mnuUnSel td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - background-color:#D7D7D7; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuUnSel td:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#D7D7D7; -} - -.tabRht{ - background-image:url(../images/tabRht.gif); - background-position:top left; - background-repeat:repeat-y; - width:31px; -} - - -.frmSelect{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - border:1px #EBEBEB; -} - -#mnuSlide{ - position:absolute; - left:0px; - top:100px; - width:110px; -} - - -#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:#ECECEC; - border-right:1px solid #CCCCCC; - opacity:.8; -} - /* profile */ .prvPrfBigText { @@ -1645,58 +946,14 @@ border:1px solid #ebebeb; } -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - cursor:pointer; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - cursor:pointer; -} - .prvPrfTexture { background:url(images/prvPrfTexture1.gif); } -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; -} - .prvPrfHoverOn { background-color:#ffffef; } -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; -} - /* Organization */ .orgTab{ @@ -1730,56 +987,7 @@ border-right:1px solid #CCCCCC; } -.globTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - color:#000000; - border:1px solid #999999; - border-collapse:collapse; - width:100%; -} - -.globTab tr th{ - text-align:right; - background-color:#CCCCCC; - border-bottom:1px solid #999999; - border-right:2px solid #999999; - color:#000000; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-decoration:none; - font-weight:bold; - height:20px; - padding-right:5px; - -} - -.globTab tr td{ - text-align:left; - border:1px solid #CCCCCC; - color:#666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:none; - font-weight:normal; - padding-left:5px; - height:20px; -} - - /* Groups */ - -.groupul{ - margin:0px; - font-family:Arial, Helvetica, sans-serif; - font-weight:bold; - font-size:12px; - color:#000000; - text-decoration:underline; - text-align:left; -} - .groupli{ margin-left:20px; font-family:Arial, Helvetica, sans-serif; @@ -1837,35 +1045,6 @@ padding-bottom:3px; } -.classBtnSmall{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:9px; - 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; -} - -.classBtnDisable{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:10px; - background-color:#DBDBDB; - border-bottom:2px solid #CCCCCC; - border-right:2px solid #CCCCCC; - border-top:2px solid #F5F5F5; - border-left:2px solid #F5F5F5; - color:#666666; - text-align:center; - padding-top:3px; - padding-bottom:3px; -} .txtBox{ width:85%; @@ -1907,15 +1086,6 @@ font-family:Arial, Helvetica, sans-serif; font-size:11px; } - -#imLead{ - width:100%; - overflow:auto; - position:relative; - border:1px solid #666666; - height:175px; -} - .txtGreen{ color:green; } @@ -1926,16 +1096,6 @@ padding-top:2px; } /* MY PREFERENCES */ - -#chPhoto{ - position:relative; - display:none; - top:20px; - width:100%; - border:1px dashed #666666; - background-color:#FFFFEC; -} - /* CSS FOR REPORTS */ .reportHdr{ @@ -1971,7 +1131,7 @@ } -/* a.reportMnu{ + a.reportMnu{ font-size:11px; color:#0070BA; text-decoration:none; @@ -1993,20 +1153,8 @@ border-bottom:1px solid #E1E1E1; padding-left:20px; padding-top:3px; -} */ - -.reportGenarateTable{ - border-bottom:1px solid #6D6D6D; - border-left:1px solid #6D6D6D; - border-right:1px solid #6D6D6D; - border-top:0px solid #6D6D6D; - background-image:url(../images/report_bg.gif); - background-repeat:repeat-x; -} - -.reportGenarateTable tr td{ - padding:5px; -} +} + #Generate{ position:relative; width:100%; @@ -2014,16 +1162,9 @@ display:none; } -.lvtSel{ - font-weight:bold; -} - /* END OF REPORT */ - - - /* WEB MAIL */ -/* a.webMnu{ + a.webMnu{ font-size:11px; color:#0070BA; text-decoration:underline; @@ -2032,14 +1173,10 @@ font-size:11px; color:#0070BA; text-decoration:underline; -} */ - - +} /* END OF WEB MAIL */ - /* POPUP */ - -/* a.alpha{ + a.alpha{ font-size:11px; color:gray; text-decoration:none; @@ -2057,7 +1194,7 @@ padding-right:5px; border:1px dotted #CCCCCC; background-color:#FFFFCC; -} */ +} /* Home Page */ .MatrixLayer{ @@ -2159,15 +1296,11 @@ } /* End Of All Menu */ - - - /* Calendar */ .calHdr{ background-image:url(images/mailSubHeaderBg.gif); background-repeat:repeat-x; background-position:left top; - } .calSel{ @@ -2187,13 +1320,6 @@ } - -.calSelTabMask { - background-color:#dfdfdf; - height:5px; - -} - .calInnerBorder { border-left:2px solid #a5a5a5; border-right:2px solid #a5a5a5; @@ -2207,10 +1333,6 @@ background:#fefefe url(images/layerPopupBg.gif); } -.calTopLeft { - border-left: 1px solid #a5a5a5; -} - .calTopRight { border-right: 1px solid #a5a5a5; } @@ -2221,33 +1343,6 @@ font-weight:normal; text-align:center; width:8%; -} - -.calTitle{ - background-position:right top; - background-repeat:no-repeat; - background-image:url(images/cal_title.jpg); - width:150px; -} - -.tabBorder{ - background-color:#EBEBEB; - border-bottom:1px solid #666666; - border-left:1px solid #666666; - border-right:1px solid #666666; - padding:10px; -} - -.eventLay{ - background-color:#a5a5a5; - position:relative; - left:0px; - top:0px; - width:100%; - visibility:visible; - padding:5px 5px 5px 5px; - display:block; - z-index:1000; } a.calMnu{ @@ -2270,9 +1365,9 @@ padding-top:3px; } -.bggray{ +/*.bggray{ background-color: #dfdfdf; -} +}*/ .bgwhite{ background-color: #FFFFFF; } @@ -2294,18 +1389,6 @@ display:none; } .style1 {color: #FF0000} - -#hrViewContent{ - width:100%; - height:150px; - overflow:auto; - position:relative; - border-top:1px solid #CCCCCC; - border-bottom:0px solid white; - border-left:0px solid white; - border-right:0px solid white; -} - .event{ background-color:#ddd; border:1px solid #999999; @@ -2321,11 +1404,6 @@ #hrView{ display:block; } - -#lstView{ - display:none; -} - .calendarNav{ font-size:12px; color:#FFFFFF; @@ -2337,7 +1415,6 @@ background-image:url(images/cal_nav.gif); background-repeat:repeat-x; } - #addEventDropDown{ position:absolute; display:none; @@ -2367,36 +1444,11 @@ top:150px; background-color:#ffffff; } - -#cal_popup{ - width:600px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; - position:absolute; - left:100px; - top:100px; -} - .outer{ border-bottom:1px solid #CCCCCC; border-left:1px solid #CCCCCC; border-right:1px solid #CCCCCC; } - -.outerBorder{ - border:1px solid #CCCCCC; - width:95%; -} - -.fieldHead{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - border:0px solid #CCCCCC; - padding:2px 5px 2px 5px; -} - .calTxt{ width:50%; border:1px solid #CCCCCC; @@ -2418,39 +1470,6 @@ /* End of Calendar */ /* Cal Year View */ -.month_table{ - border:2px solid #CCCCCC; - width:100%; - background-color:white; -} - -.month_table tr th{ - background-color:#E9E9E9; - color:#000000; - text-align:center; - border:1px dotted #CCCCCC; - height:20px; - width:14%; - font-weight:normal; -} - -.month_table tr td{ - border:1px dotted #CCCCCC; - color:#000000; - text-align:center; - height:20px; -} - -.cal_Hdr{ - background-image:url(images/cal_Hdr.gif); - background-repeat:repeat-x; - background-position:left top; - font-weight:bold; - color:#000000; - text-align:left; - border:0px solid #000000; -} - .eventDay{ background-color:#FF9966; font-weight:bold; @@ -2533,12 +1552,6 @@ padding: 4px; border-right: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD; -} -.rptTitle { - border-right: 1px solid #333; - border-bottom: 1px solid #333; - background: #2C527C; - color: #FFF; } .rptGrpHead { background: #FFF; @@ -2590,31 +1603,6 @@ /* Css for quick Create */ -.qcWindow { - background-color:white; - border:2px solid #999999; -} - -.qcHeader{ - background:url(images/qcBg.gif) repeat-x; - background-color:gray; - color:black; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 19px; - padding-left:10px; -} -.qcTextBox{ - border:1px solid #999999; - width:90%; -} -.qcTextArea{ - border:1px solid #999999; - width:90%; - height:70px; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; -} .qcTransport{ background-color:#dadada; @@ -2639,50 +1627,6 @@ /* MY SITES */ -.SiteSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_sel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:bold; - font-size:11px; - text-decoration:none; -} - -.SiteUnSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_unsel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; - cursor:pointer; -} - -.SiteHdr{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_hdr.jpg); - background-position:right bottom; - background-repeat:no-repeat; - height:33px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; -} .unread_email { font-weight:bold; } @@ -2707,13 +1651,6 @@ color: #000000; } -.adProgressBar { - border-style:solid; - border-width:2px; - border-color:blue; - -} - .h2 { font-size:18px; @@ -2725,19 +1662,6 @@ color:gray; } - -.hdeskComments { - - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 14px; - color: #999999; - border:0px; - background-color:#ffffef; - width:100%; - -} - ul { list-style:circle; line-height:20px; @@ -2746,14 +1670,6 @@ font-weight:normal; } - - -.branch { - list-style-image: url("secAdd.gif"); -} - - - .tagCloudTopBg { background-image: url(images/tagCloudBg.gif); background-repeat: repeat-x; @@ -2762,15 +1678,6 @@ .tagCloudDisplay { background-color:#e5e5e5; padding:5px; -} - - - -.heading1 { - font-family: Arial, Helvetica, sans-serif; - font-size: 19px; - line-height: 14px; - color: #000000; } .heading2 { @@ -2779,20 +1686,6 @@ line-height: 16px; font-weight:bold; color: #000000; -} - -.heading3 { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 14px; - color: #999999; -} - -.heading4 { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 14px; - color: #999999; } .settingsUI { @@ -2876,7 +1769,7 @@ font-weight:bold; } -/*.cellLabel { +.cellLabel { background-color:#eaebd9; border-top:1px solid #efefef; border-bottom:1px solid #dadada; @@ -2886,7 +1779,7 @@ .cellText { color:#333333; border-bottom:1px solid #dadada; -} */ +} .listTable{ border-left:1px solid #cccccc; @@ -2986,58 +1879,15 @@ .prvPrfOutline { border:1px solid #ebebeb; } - -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - -} - .prvPrfTexture { background:url(images/prvPrfTexture1.gif); -} -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; } .prvPrfHoverOn { background-color:#ffffef; } -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; -} - .cellBottomDotLine { border-bottom-width: 2px; border-bottom-style: dotted; @@ -3056,14 +1906,9 @@ border-bottom-color: #CCCCCC; } -.crmFormDropDown { -border-width:1px; -} + .thickBorder { border: 2px solid #999999; -} -.trackerBorder { - background-color:#ffffff; } .trackerHeading { background-color:#efefef; @@ -3080,20 +1925,11 @@ .crmTable { border:1px solid #dadada; } -.crmTableColHeading { - background-color:#CCCCCC; - border-left:1px solid #eaeaea; - border-top:1px solid #eaeaea; - border-right:1px solid #999999; - border-bottom:1px solid #999999; -} + .crmTableRow { border-bottom:1px dotted #dadada; border-right:1px dotted #dadada } - - - /* Inventory */ @@ -3121,24 +1957,6 @@ /* Inventory */ - - - -/* styles for RSS Display starts */ -.rssDisplay{ - background-color:#eaeaea; -} - - -/* styles for RSS Display ends */ - - - - - - - - /* Email Client Classes ++++++++++++++++++++++ */ .emailSelected{ @@ -3161,11 +1979,6 @@ background:#d9d9d9 url(images/mailSubHeaderBg.gif) repeat-x; padding:4px; } -.mailDetailsHeader { - border-top:2px dotted #999; - border-bottom:1px solid #ddd; -} - .mailClientWriteEmailHeader { font-family:arial, helvetica, sans-serif; font-size:20px; Modified: vtigercrm/trunk/themes/bluelagoon/images/aboutUS.jpg ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/themes/bluelagoon/style.css ============================================================================== --- vtigercrm/trunk/themes/bluelagoon/style.css (original) +++ vtigercrm/trunk/themes/bluelagoon/style.css Tue Oct 10 10:02:43 2006 @@ -166,13 +166,6 @@ padding-top:5px; padding-bottom:5px; } - - -.tabLiner { - background:#9abffc url(images/moduleSelectorBg.gif) bottom repeat-x; - padding:0px; -} - .sep1 { background:#999999; } @@ -184,15 +177,10 @@ a { text-decoration:none; color:#3344bb; - - - } a:hover { text-decoration:underline; - - } .hdrLink { @@ -240,8 +228,6 @@ } .lvtBg { - - } .lvtHeaderText { @@ -321,15 +307,6 @@ padding-left:0px; } -.rightAddInfo { - border-left:1px solid #a2a2a2; - border-right:1px solid #dddddd; - border-bottom:1px solid #dddddd; - border-top:1px solid #a2a2a2; - background-color:#fafafa; - padding:5px; -} - .dvtCellLabel, .cellLabel { background-color:#f5f5ff; padding-right:10px; @@ -364,22 +341,10 @@ } -.rightUpcomingActivitiesHeader{ - border-bottom:1px solid #ddddcc; - padding:5px; - background-color:#ffffdd; -} - -.rightUpcomingActivitiesContent { - padding:5px; - background-color:#ffffef; -} - .detailedViewHeader{ border-bottom:2px solid #4F94CD; padding:5px; background-color:#afdbff; - } .detailedViewTextBox { @@ -392,16 +357,6 @@ background-color:#ffffff; } -.detailedViewProdTextBox { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:85%; - background-color:#ffffff; -} - .detailedViewTextBoxOn { font-family: Arial, Helvetica, sans-serif; font-size: 11px; @@ -410,32 +365,6 @@ padding-left:5px; width:90%; background-color:#ffffdd; -} - -.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 ------------------------------------------- */ - -.moduleSearch { - border:1px solid #dddddd; - background-color:#ffffef; - -} - -.searchHdrBox { - - border-bottom:1px dashed #dddddd; } .advSearch { @@ -464,29 +393,6 @@ width:10px } -.searchNotFound { - border:2px solid #ff3333; - background-color:#fafafa; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #ff0000; - height:50px; - width:640px; -} - - -.loginTopBg { - background:url(images/loginTopBg.gif) repeat-x; -} - -.loginTopShade { - background:url(images/loginTopShade.gif) repeat-x; -} - -.loginBg{ - background:#448cEB url(images/loginBg.gif) repeat-x; -} - .textbox { border:1px solid #999999; background-color:#ffffff; @@ -497,28 +403,8 @@ } -.loginBottomBg { - background:url(images/loginBottomBg.gif) repeat-x; -} - -.loginSignin { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - color: #448ceb; - font-weight:bold; -} - -.loginBillBoard { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color:#ffffff; -} .mx { -} - -.calTopBg { - background:url(images/calBg.gif) repeat-x; } .calListTable td{ @@ -530,52 +416,13 @@ border:1px solid #999999; } -.calDisplay { - border-left:1px solid #d0d0d0; - border-right:1px solid #d0d0d0; -} -.calBottomBg { - background:url(images/calBottomBg.gif) repeat-x; -} - -.calDayHourCell { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; -} + .calDayHour { border-top:1px solid #c5d5ff; border-left:1px solid #c5d5ff; border-bottom:1px solid #c5d5ff; border-right:1px solid #c5d5ff; background-color:#eae7da; -} -.calDiv { - overflow:auto; width:95%;height:200px;padding:0px;background-color:#fefefe; - border-top: 1px solid #bababa; - border-bottom: 1px solid #bababa; -} -.calColHdr{ - border-top:1px solid #fefefa; - border-left:1px solid #fefefa; - - border-right:1px solid #a8a591; - background-color:#eae7da; -} -.calHourCol { - border-top: 1px solid #fefefa; - border-left: 1px solid #fefefa; - border-right: 1px solid #a8a591; - border-bottom: 1px solid #a8a591; - background-color: #eae7da; - height: 30px; - -} -.calHourOccupied { - background-color:#ffffbb; - -} -.calListViewRow { - border-bottom:1px solid eae3d1; } .calAddEvent { @@ -586,108 +433,17 @@ top:150px; background-color:#ffffff; } - -.addEventHeader{ - border-bottom:2px dotted #cccccc; -} - -.addEventFooter{ - border-top:2px dotted #cccccc; - height:40px; -} - .addEventInnerBox { border:1px dotted #dadada; } -.cellScheduled { - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSchHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSch{ - border:0px; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellNormalHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffff; - color:#7a7a7a; -} .cellNormal { border:0px; background-color:#ffffff; } -.calEventNormal { - border:1px solid #999999; - background-color:#99ffcc; - -} - -.calEventCritical { - border:1px solid #999999; - background-color:#FFCC33; -} -.tblPro1 { - -border:2px solid #dadada; - background-color:white; - -} - -.tblPro1IconCell { - border-right:1px solid #dadada; -} - -.tblPro1HeadingCell { - font-weight:bold; -color:#4a4a4a; -} - -.tblPro1ColHeader { - background-color:#dadada; - border-left:1px solid white; - border-right:1px solid #999999; - font-size: 11px; - line-height: 14px; - background-image:url(images/tblPro1ColBg.gif); -} - -.tblPro1DataCell { - border-bottom:1px solid #f5f5f5; - color:#5a5a5a; - font-size: 11px; - line-height: 14px; - -} - -.divEventToDo { -overflow:auto; -height:150px; -border:1px solid #dadada; - -} - -.EventToDo{ - -} .thumbnail{ background-color:#ffffff; @@ -698,117 +454,6 @@ margin-bottom: 15px; } -.thumbnailcaption -{ font-size: 0.9em; padding-top: 0.2em ; } - -/* For Settings */ - -.lftMnuTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-color:#BBBBBB; - border-left:1px solid #666666; - border-right:1px solid #666666; - border-top:0px solid #666666; - border-collapse:collapse; - text-align:right; - padding-top:0px; - padding-left:5px; - padding-right:5px; - vertical-align:top; -} - -.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-decoration:none; - width:99%; -} - -.lftMnuHdr tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-align:left; - text-decoration:none; - height:25px; - padding-right:0px; - padding-left:0px; -} - -a.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; - vertical-align:middle; -} - -a.lftMnuHdr:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; -} - -a.lftSubMnu{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; -} - -a.lftSubMnu:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; - background-color:#CCCCCC; -} .padTab{ padding-top:0px; @@ -818,26 +463,6 @@ vertical-align:top; } - -.controlTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - width:100%; - border:0px; -} - -.controlTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - vertical-align:bottom; -} - #company{ position:relative; width:100%; @@ -851,32 +476,11 @@ #user{position:relative;left:0px;top:0px;width:100%;display:block;} -#studio{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;} -#studioTab{position:relative;left:0px;top:0px;width:100%;display:none;} - -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} -.imgDoc{ - cursor:pointer; - border:0px; -} - #one{ position:relative; display:block; @@ -910,9 +514,6 @@ /* End of Settings */ -.bggray{ - background-color: #dfdfdf; -} .bgwhite{ background-color: #FFFFFF; } @@ -937,82 +538,11 @@ /*Added for Advance Seearch*/ -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} - -.imgDoc{ - cursor:pointer; - border:0px; -} -#slideMnu{ - background-color:#BBBBBB; - vertical-align:top; -} #one{ position:relative; display:block; width:245px; -} - -.prdTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:100%; - border-left:0px solid #CCCCCC; - border-right:0px solid #CCCCCC; - border-collapse:collapse; -} - -.prdTab tr th{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - padding-left:5px; - background-color:#E5E5E5; - height:20px; - color:#000000; - font-weight:bold; - text-decoration:none; - border-bottom:1px solid #CCCCCC; -} - -.prdTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - border-bottom:1px solid #CCCCCC; - padding-left:5px; - color:#000000; - text-decoration:none; - font-weight:normal; - height:20px; -} - -.delTxt{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:underline; - font-weight:normal; - color:#000099; - cursor:pointer; } /* Dashboard CSS */ @@ -1022,15 +552,12 @@ 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; @@ -1047,11 +574,6 @@ padding:5px; } -.dash_shadow{ - background-image:url(images/dash_top_shadow.jpg); - background-repeat:repeat-x; - height:10px; -} .dash_white{ background-color:#FFFFFF; @@ -1069,15 +591,6 @@ color:#000000; padding-left:10px;padding-right:10px; } -.dashMatrixSeperator{ - border-left:2px dashed #dadada; - -} -.dashMatrixBottomLiner{ - border-bottom:2px dashed #dadada; - -} - .dash_switch{ cursor:pointer; width:26px; @@ -1127,108 +640,6 @@ position:top; } -.dash_sel_top{ - background-image:url(images/dash_sel_top.jpg); - background-repeat:repeat-x; - height:5px; - background-position:left top; - font-size:0px; -} - -.dash_sel_btm{ - background-image:url(images/dash_sel_btm.jpg); - background-repeat:repeat-x; - height:4px; - background-position:left top; - font-size:0px; -} - -.dash_sel_left{ - background-color:#F9F7C9; - border-left:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:200px; - text-align:left; - padding-left:5px; - font-size:11px; - font-weight:bold; - color:#000000; -} - -.dash_sel_right{ - background-color:#F9F7C9; - border-right:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:25px; - padding-left:5px; - cursor:pointer; -} - -/* menu */ - -#mnuSlide{ - position:absolute; - left:0px; - top:100px; -/* width:110px;*/ -} - -/* 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 */ @@ -1309,11 +720,6 @@ /* Calculator */ -.calcBg { - /*background-color: #666;*//*BFC1B7*/ - background: url(images/cal_bg.gif); - border: 1px solid #009900; -} .calcResult { width: 100%; height: 25px; @@ -1367,6 +773,7 @@ width:25px; /*background-color: #CCC;*/ } + #calc{ position:absolute; left:100px; @@ -1443,20 +850,6 @@ } -.frameHdr{ - height:32px; - background-image:url(images/rssframeHdr.gif); - background-repeat:repeat-x; - background-position:top left; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - text-align:left; - padding-left:5px; - color:#FFFF00; - vertical-align:middle; - border:0px solid #000000; -} .forwardBg{ font-family:Arial, Helvetica, sans-serif; @@ -1474,45 +867,6 @@ /* New Styles */ -.hometop{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:14px; - color:white; - text-decoration:none; - text-align:left; - padding-left:10px; - background-image:url(../images/hometop.gif); - background-position:top left; - background-repeat:repeat-x; - height:35px; - vertical-align:middle; -} - -.homeBtm{ - background-image:url(../images/HomeBtm.gif); - background-position:top left; - background-repeat:repeat-x; - height:29px; -} - -.imageTab{ - background-color:#F5F5F5; - border:0px solid #EBEBEB; - width:30px; - height:30px; - position:relative; - visibility:visible; -} - -a.imageTab:Hover{ - background-color:#BFBFFF; - border:0px solid #EBEBEB; - width:30px; - height:30px; - display:block; - opacity:.5; -} - .mnuTab{ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; @@ -1527,106 +881,6 @@ vertical-align:middle; } -.mnuSel td{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - background-color:#EBEBEB; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuSel td:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#EBEBEB; -} - -.mnuUnSel td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - background-color:#D7D7D7; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuUnSel td:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#D7D7D7; -} - -.tabRht{ - background-image:url(../images/tabRht.gif); - background-position:top left; - background-repeat:repeat-y; - width:31px; -} - - -.frmSelect{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - border:1px #EBEBEB; -} - -#mnuSlide{ - position:absolute; - left:0px; - top:100px; - width:110px; -} - - -#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:#ECECEC; - border-right:1px solid #CCCCCC; - opacity:.8; -} - /* profile */ .prvPrfBigText { @@ -1646,56 +900,13 @@ border:1px solid #ebebeb; } -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - cursor:pointer; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - cursor:pointer; -} - .prvPrfTexture { background:url(images/prvPrfTexture1.gif); } -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; -} - .prvPrfHoverOn { background-color:#ffffef; -} -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; } /* Organization */ @@ -1731,55 +942,6 @@ border-right:1px solid #CCCCCC; } -.globTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - color:#000000; - border:1px solid #999999; - border-collapse:collapse; - width:100%; -} - -.globTab tr th{ - text-align:right; - background-color:#CCCCCC; - border-bottom:1px solid #999999; - border-right:2px solid #999999; - color:#000000; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-decoration:none; - font-weight:bold; - height:20px; - padding-right:5px; - -} - -.globTab tr td{ - text-align:left; - border:1px solid #CCCCCC; - color:#666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:none; - font-weight:normal; - padding-left:5px; - height:20px; -} - - -/* Groups */ - -.groupul{ - margin:0px; - font-family:Arial, Helvetica, sans-serif; - font-weight:bold; - font-size:12px; - color:#000000; - text-decoration:underline; - text-align:left; -} .groupli{ margin-left:20px; @@ -1838,35 +1000,6 @@ padding-bottom:3px; } -.classBtnSmall{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:9px; - 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; -} - -.classBtnDisable{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:10px; - background-color:#DBDBDB; - border-bottom:2px solid #CCCCCC; - border-right:2px solid #CCCCCC; - border-top:2px solid #F5F5F5; - border-left:2px solid #F5F5F5; - color:#666666; - text-align:center; - padding-top:3px; - padding-bottom:3px; -} .txtBox{ width:85%; @@ -1909,13 +1042,6 @@ font-size:11px; } -#imLead{ - width:100%; - overflow:auto; - position:relative; - border:1px solid #666666; - height:175px; -} .txtGreen{ color:green; @@ -1928,14 +1054,6 @@ } /* MY PREFERENCES */ -#chPhoto{ - position:relative; - display:none; - top:20px; - width:100%; - border:1px dashed #666666; - background-color:#FFFFEC; -} /* CSS FOR REPORTS */ @@ -1972,7 +1090,7 @@ } -/* a.reportMnu{ +a.reportMnu{ font-size:11px; color:#0070BA; text-decoration:none; @@ -1994,37 +1112,17 @@ border-bottom:1px solid #E1E1E1; padding-left:20px; padding-top:3px; -} */ - -.reportGenarateTable{ - border-bottom:1px solid #6D6D6D; - border-left:1px solid #6D6D6D; - border-right:1px solid #6D6D6D; - border-top:0px solid #6D6D6D; - background-image:url(../images/report_bg.gif); - background-repeat:repeat-x; -} - -.reportGenarateTable tr td{ - padding:5px; -} +} + #Generate{ position:relative; width:100%; text-align:center; display:none; } - -.lvtSel{ - font-weight:bold; -} - /* END OF REPORT */ - - - /* WEB MAIL */ -/* a.webMnu{ +a.webMnu{ font-size:11px; color:#0070BA; text-decoration:underline; @@ -2033,14 +1131,14 @@ font-size:11px; color:#0070BA; text-decoration:underline; -} */ +} /* END OF WEB MAIL */ /* POPUP */ -/* a.alpha{ + a.alpha{ font-size:11px; color:gray; text-decoration:none; @@ -2058,7 +1156,7 @@ padding-right:5px; border:1px dotted #CCCCCC; background-color:#FFFFCC; -} */ +} /* Home Page */ .MatrixLayer{ @@ -2189,12 +1287,6 @@ } -.calSelTabMask { - background-color:#D6D2AB; - height:5px; - -} - .calInnerBorder { border-left:2px solid #A5B5EE; border-right:2px solid #A5B5EE; @@ -2208,15 +1300,9 @@ background:#fefefe url(images/layerPopupBg.gif); } -.calTopLeft { - border-left: 1px solid #A5B5EE; -} - .calTopRight { border-right: 1px solid #A5B5EE; } - - .calUnSel{ color:#000000; font-weight:normal; @@ -2224,32 +1310,6 @@ width:8%; } -.calTitle{ - background-position:right top; - background-repeat:no-repeat; - background-image:url(images/cal_title.jpg); - width:150px; -} - -.tabBorder{ - background-color:#EBEBEB; - border-bottom:1px solid #666666; - border-left:1px solid #666666; - border-right:1px solid #666666; - padding:10px; -} - -.eventLay{ - background-color:#DBF3FD; - position:relative; - left:0px; - top:0px; - width:100%; - visibility:visible; - padding:5px 5px 5px 5px; - display:block; - z-index:1000; -} a.calMnu{ font-size:11px; @@ -2271,9 +1331,6 @@ padding-top:3px; } -.bggray{ - background-color: #dfdfdf; -} .bgwhite{ background-color: #FFFFFF; } @@ -2296,16 +1353,6 @@ } .style1 {color: #FF0000} -#hrViewContent{ - width:100%; - height:150px; - overflow:auto; - position:relative; - border-top:1px solid #CCCCCC; - border-bottom:0px solid white; - border-left:0px solid white; - border-right:0px solid white; -} .event{ background-color:#D3EAF0; @@ -2323,9 +1370,6 @@ display:block; } -#lstView{ - display:none; -} .calendarNav{ font-size:12px; @@ -2369,15 +1413,6 @@ background-color:#ffffff; } -#cal_popup{ - width:600px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; - position:absolute; - left:100px; - top:100px; -} .outer{ border-bottom:1px solid #CCCCCC; @@ -2385,18 +1420,6 @@ border-right:1px solid #CCCCCC; } -.outerBorder{ - border:1px solid #CCCCCC; - width:95%; -} - -.fieldHead{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - border:0px solid #CCCCCC; - padding:2px 5px 2px 5px; -} .calTxt{ width:50%; @@ -2419,39 +1442,6 @@ /* End of Calendar */ /* Cal Year View */ -.month_table{ - border:2px solid #CCCCCC; - width:100%; - background-color:white; -} - -.month_table tr th{ - background-color:#E9E9E9; - color:#000000; - text-align:center; - border:1px dotted #CCCCCC; - height:20px; - width:14%; - font-weight:normal; -} - -.month_table tr td{ - border:1px dotted #CCCCCC; - color:#000000; - text-align:center; - height:20px; -} - -.cal_Hdr{ - background-image:url(images/cal_Hdr.gif); - background-repeat:repeat-x; - background-position:left top; - font-weight:bold; - color:#000000; - text-align:left; - border:0px solid #000000; -} - .eventDay{ background-color:#FF9966; font-weight:bold; @@ -2534,12 +1524,6 @@ padding: 4px; border-right: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD; -} -.rptTitle { - border-right: 1px solid #333; - border-bottom: 1px solid #333; - background: #2C527C; - color: #FFF; } .rptGrpHead { background: #FFF; @@ -2591,31 +1575,6 @@ /* Css for quick Create */ -.qcWindow { - background-color:white; - border:2px solid #999999; -} - -.qcHeader{ - background:url(images/qcBg.gif) repeat-x; - background-color:gray; - color:black; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 19px; - padding-left:10px; -} -.qcTextBox{ - border:1px solid #999999; - width:90%; -} -.qcTextArea{ - border:1px solid #999999; - width:90%; - height:70px; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; -} .qcTransport{ background-color:#d5d6ff; @@ -2640,50 +1599,6 @@ /* MY SITES */ -.SiteSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_sel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:bold; - font-size:11px; - text-decoration:none; -} - -.SiteUnSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_unsel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; - cursor:pointer; -} - -.SiteHdr{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_hdr.jpg); - background-position:right bottom; - background-repeat:no-repeat; - height:33px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; -} .unread_email { font-weight:bold; } @@ -2708,12 +1623,6 @@ color: #000000; } -.adProgressBar { - border-style:solid; - border-width:2px; - border-color:blue; - -} .h2 { @@ -2727,17 +1636,6 @@ color:gray; } -.hdeskComments { - - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 14px; - color: #999999; - border:0px; - background-color:#ffffef; - width:100%; - -} ul { list-style:circle; @@ -2747,14 +1645,6 @@ font-weight:normal; } - - -.branch { - list-style-image: url("secAdd.gif"); -} - - - .tagCloudTopBg { background-image: url(images/tagCloudBg.gif); background-repeat: repeat-x; @@ -2764,16 +1654,6 @@ background-color:#fff; padding:5px; } - - - -.heading1 { - font-family: Arial, Helvetica, sans-serif; - font-size: 19px; - line-height: 14px; - color: #000000; -} - .heading2 { font-family: Arial, Helvetica, sans-serif; font-size: 16px; @@ -2781,30 +1661,13 @@ font-weight:bold; color: #000000; } - -.heading3 { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 14px; - color: #999999; -} - -.heading4 { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 14px; - color: #999999; -} - .settingsUI { text-align:left; background-color:#fff; background-image:url(images/layerPopupBg.gif); border:2px solid #aaaaff; - -} - +} .settingsTabHeader { text-align:left; @@ -2881,7 +1744,7 @@ font-weight:bold; } -/*.cellLabel { +.cellLabel { background-color:#eaebd9; border-top:1px solid #efefef; border-bottom:1px solid #dadada; @@ -2891,7 +1754,7 @@ .cellText { color:#333333; border-bottom:1px solid #dadada; -} */ +} .listTable{ border-left:1px solid #cccccc; @@ -2992,55 +1855,16 @@ border:1px solid #ebebeb; } -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - -} + .prvPrfTexture { background:url(images/prvPrfTexture1.gif); -} -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; } .prvPrfHoverOn { background-color:#ffffef; -} -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; } .cellBottomDotLine { @@ -3061,14 +1885,8 @@ border-bottom-color: #CCCCCC; } -.crmFormDropDown { -border-width:1px; -} .thickBorder { border: 2px solid #999999; -} -.trackerBorder { - background-color:#ffffff; } .trackerHeading { background-color:#efefef; @@ -3085,21 +1903,10 @@ .crmTable { border:1px solid #dadada; } -.crmTableColHeading { - background-color:#CCCCCC; - border-left:1px solid #eaeaea; - border-top:1px solid #eaeaea; - border-right:1px solid #999999; - border-bottom:1px solid #999999; -} .crmTableRow { border-bottom:1px dotted #dadada; border-right:1px dotted #dadada } - - - - /* Inventory */ .lineOnTop { @@ -3130,9 +1937,9 @@ /* styles for RSS Display starts */ -.rssDisplay{ +/*.rssDisplay{ background-color:#e8e3ca; -} +}*/ /* styles for RSS Display ends */ @@ -3165,10 +1972,6 @@ .mailSubHeader { background:#b4b8ff url(images/mailSubHeaderBg.gif) repeat-x; padding:4px; -} -.mailDetailsHeader { - border-top:2px dotted #999; - border-bottom:1px solid #ddd; } .mailClientWriteEmailHeader { Modified: vtigercrm/trunk/themes/woodspice/images/aboutUS.jpg ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/themes/woodspice/style.css ============================================================================== --- vtigercrm/trunk/themes/woodspice/style.css (original) +++ vtigercrm/trunk/themes/woodspice/style.css Tue Oct 10 10:02:43 2006 @@ -30,13 +30,6 @@ border-left:2px dotted #332211; padding:10px; } - - -.yellowBox { - background-color:#ffffE1; - border:1px solid #999999; -} - .genHeaderBig{ font-family: Arial, Helvetica, sans-serif; font-size: 16px; @@ -58,18 +51,9 @@ color: #000000; font-weight:bold; } - -.rssDisplayPanel { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 12px; - color: #ABABAB; -} - - .hdrNameBg { background:#ffffff url(images/primeTopBg.gif) repeat-x; - + } .hdrTabBg { @@ -144,43 +128,6 @@ padding-right:40px; } - -/*.level2text { - background:#bbbbbb url(images/level2Bg.gif) repeat-x; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - padding-left:20px; - padding-right:20px; - padding-top:5px; - padding-bottom:5px; - font-weight:bold; - color:white; -}*/ - -.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:#e0dbb0 url(images/level2TabBg.gif) bottom repeat-x; font-family: Arial, Helvetica, sans-serif; @@ -206,11 +153,6 @@ padding-bottom:5px; } - -.tabLiner { - background:#9abffc url(images/moduleSelectorBg.gif) bottom repeat-x; - padding:0px; -} .sep1 { background:#999999; @@ -356,15 +298,6 @@ padding-left:0px; } -.rightAddInfo { - border-left:1px solid #a2a2a2; - border-right:1px solid #dddddd; - border-bottom:1px solid #dddddd; - border-top:1px solid #a2a2a2; - background-color:#fafafa; - padding:5px; -} - .dvtCellLabel, .cellLabel { background-color:#efefe2; padding-right:10px; @@ -396,17 +329,6 @@ padding:5px; background-color:#fafafa; -} - -.rightUpcomingActivitiesHeader{ - border-bottom:1px solid #ddddcc; - padding:5px; - background-color:#ffffdd; -} - -.rightUpcomingActivitiesContent { - padding:5px; - background-color:#ffffef; } .detailedViewHeader{ @@ -426,16 +348,6 @@ background-color:#ffffff; } -.detailedViewProdTextBox { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - border:1px solid #bababa; - padding-left:5px; - width:85%; - background-color:#ffffff; -} - .detailedViewTextBoxOn { font-family: Arial, Helvetica, sans-serif; font-size: 11px; @@ -446,31 +358,9 @@ background-color:#ffffdd; } -.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 ------------------------------------------- */ -.moduleSearch { - border:1px solid #dddddd; - background-color:#ffffef; - -} - -.searchHdrBox { - - border-bottom:1px dashed #dddddd; -} .advSearch { padding:10px; @@ -498,28 +388,6 @@ width:10px } -.searchNotFound { - border:2px solid #ff3333; - background-color:#fafafa; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #ff0000; - height:50px; - width:640px; -} - - -.loginTopBg { - background:url(images/loginTopBg.gif) repeat-x; -} - -.loginTopShade { - background:url(images/loginTopShade.gif) repeat-x; -} - -.loginBg{ - background:#448cEB url(images/loginBg.gif) repeat-x; -} .textbox { border:1px solid #999999; @@ -531,28 +399,9 @@ } -.loginBottomBg { - background:url(images/loginBottomBg.gif) repeat-x; -} - -.loginSignin { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - color: #448ceb; - font-weight:bold; -} - -.loginBillBoard { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color:#ffffff; -} + .mx { -} - -.calTopBg { - background:url(images/calBg.gif) repeat-x; } .calListTable td{ @@ -564,18 +413,7 @@ border:1px solid #999999; } -.calDisplay { - border-left:1px solid #d0d0d0; - border-right:1px solid #d0d0d0; -} -.calBottomBg { - background:url(images/calBottomBg.gif) repeat-x; -} - -.calDayHourCell { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; -} + .calDayHour { border-top:1px solid #a8a591; border-left:1px solid #a8a591; @@ -583,34 +421,7 @@ border-right:1px solid #a8a591; background-color:#eae7da; } -.calDiv { - overflow:auto; width:95%;height:320px;padding:0px;background-color:#fefefe; - border-top: 1px solid #bababa; - border-bottom: 1px solid #bababa; -} -.calColHdr{ - border-top:1px solid #fefefa; - border-left:1px solid #fefefa; - - border-right:1px solid #a8a591; - background-color:#eae7da; -} -.calHourCol { - border-top: 1px solid #fefefa; - border-left: 1px solid #fefefa; - border-right: 1px solid #a8a591; - border-bottom: 1px solid #a8a591; - background-color: #eae7da; - height: 40px; - -} -.calHourOccupied { - background-color:#ffffbb; - -} -.calListViewRow { - border-bottom:1px solid eae3d1; -} + .calAddEvent { position:absolute; @@ -621,102 +432,17 @@ background-color:#ffffff; } -.addEventHeader{ - border-bottom:2px dotted #cccccc; -} - -.addEventFooter{ - border-top:2px dotted #cccccc; - height:40px; -} + .addEventInnerBox { border:1px dotted #dadada; } -.cellScheduled { - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSchHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellSch{ - border:0px; - background-color:#ffffef; - color:#7a7a7a; -} - -.cellNormalHover { - border-bottom:1px solid #999999; - border-right:1px solid #999999; - border-left:1px solid #dadada; - border-top:1px solid #dadada; - background-color:#ffffff; - color:#7a7a7a; -} .cellNormal { border:0px; background-color:#ffffff; -} - -.calEventNormal { - border:1px solid #999999; - background-color:#99ffcc; - -} - -.calEventCritical { - border:1px solid #999999; - background-color:#FFCC33; -} -.tblPro1 { - -border:2px solid #dadada; - background-color:white; - -} - -.tblPro1IconCell { - border-right:1px solid #dadada; -} - -.tblPro1HeadingCell { - font-weight:bold; -color:#4a4a4a; -} - -.tblPro1ColHeader { - background-color:#dadada; - border-left:1px solid white; - border-right:1px solid #999999; - font-size: 11px; - line-height: 14px; - background-image:url(images/tblPro1ColBg.gif); -} - -.tblPro1DataCell { - border-bottom:1px solid #f5f5f5; - color:#5a5a5a; - font-size: 11px; - line-height: 14px; - -} - -.divEventToDo { -overflow:auto; -height:150px; -border:1px solid #dadada; - } .EventToDo{ @@ -732,118 +458,6 @@ margin-bottom: 15px; } -.thumbnailcaption -{ font-size: 0.9em; padding-top: 0.2em ; } - -/* For Settings */ - -.lftMnuTab{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#FFFFFF; - background-color:#BBBBBB; - border-left:1px solid #666666; - border-right:1px solid #666666; - border-top:0px solid #666666; - border-collapse:collapse; - text-align:right; - padding-top:0px; - padding-left:5px; - padding-right:5px; - vertical-align:top; -} - -.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-decoration:none; - width:99%; -} - -.lftMnuHdr tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#DDDDDD; - border-bottom:1px solid #BBBBBB; - text-align:left; - text-decoration:none; - height:25px; - padding-right:0px; - padding-left:0px; -} - -a.lftMnuHdr{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; - vertical-align:middle; -} - -a.lftMnuHdr:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - color:white; - background-color:#666666; - border-top:1px solid #BBBBBB; - border-bottom:1px solid #999999; - text-align:left; - text-decoration:none; - height:25px; - padding-left:5px; - width:100%; - display:block; -} - -a.lftSubMnu{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; -} - -a.lftSubMnu:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - display:block; - color:#666666; - height:20px; - width:93%; - text-align:left; - padding-left:15px; - text-decoration:none; - border-bottom:1px solid #BBBBBB; - padding-top:2px; - white-space:nowrap; - background-color:#CCCCCC; -} - .padTab{ padding-top:0px; padding-left:0px; @@ -851,25 +465,6 @@ padding-bottom:0px; vertical-align:top; -} - -.controlTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - width:100%; - border:0px; -} - -.controlTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-align:center; - font-weight:bold; - text-decoration:none; - vertical-align:bottom; } #company{ @@ -885,31 +480,12 @@ #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;} -#studioTab{position:relative;left:0px;top:0px;width:100%;display:none;} - -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} -.imgDoc{ - cursor:pointer; - border:0px; -} + #one{ position:relative; @@ -944,9 +520,7 @@ /* End of Settings */ -.bggray{ - background-color: #dfdfdf; -} + .bgwhite{ background-color: #FFFFFF; } @@ -969,92 +543,10 @@ display:none; } -/*Added for Advance Seearch*/ - -#scrollTab{ - position:relative; - width:100%; - height:350px; - overflow:auto; - border:0px solid #CCCCCC; - display:block; -} - -.dock{ - vertical-align:middle; - text-align:left; - padding-left:0px; -} - -.imgDoc{ - cursor:pointer; - border:0px; -} -#slideMnu{ - background-color:#BBBBBB; - vertical-align:top; -} - #one{ position:relative; display:block; width:245px; -} - -.prdTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - width:100%; - border-left:0px solid #CCCCCC; - border-right:0px solid #CCCCCC; - border-collapse:collapse; -} - -.prdTab tr th{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - padding-left:5px; - background-color:#E5E5E5; - height:20px; - color:#000000; - font-weight:bold; - text-decoration:none; - border-bottom:1px solid #CCCCCC; -} - -.prdTab tr td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-align:left; - border-right:1px solid #CCCCCC; - border-left:1px solid #CCCCCC; - border-bottom:1px solid #CCCCCC; - padding-left:5px; - color:#000000; - text-decoration:none; - font-weight:normal; - height:20px; -} - -.delTxt{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:underline; - font-weight:normal; - color:#000099; - cursor:pointer; -} - -/* Dashboard CSS */ -a.dash_href{ - display:block; - width:24px;height:24px; - vertical-align:middle; - margin-top:10px; } @@ -1081,11 +573,6 @@ padding:5px; } -.dash_shadow{ - background-image:url(images/dash_top_shadow.jpg); - background-repeat:repeat-x; - height:10px; -} .dash_white{ background-color:#FFFFFF; @@ -1103,14 +590,7 @@ color:#000000; padding-left:10px;padding-right:10px; } -.dashMatrixSeperator{ - border-left:2px dashed #dadada; - -} -.dashMatrixBottomLiner{ - border-bottom:2px dashed #dadada; - -} + .dash_switch{ cursor:pointer; @@ -1161,55 +641,12 @@ position:top; } -.dash_sel_top{ - background-image:url(images/dash_sel_top.jpg); - background-repeat:repeat-x; - height:5px; - background-position:left top; - font-size:0px; -} - -.dash_sel_btm{ - background-image:url(images/dash_sel_btm.jpg); - background-repeat:repeat-x; - height:4px; - background-position:left top; - font-size:0px; -} - -.dash_sel_left{ - background-color:#F9F7C9; - border-left:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:200px; - text-align:left; - padding-left:5px; - font-size:11px; - font-weight:bold; - color:#000000; -} - -.dash_sel_right{ - background-color:#F9F7C9; - border-right:1px solid #000000; - border-top:1px solid #000000; - border-bottom:1px solid #000000; - width:25px; - padding-left:5px; - cursor:pointer; -} /* menu */ -#mnuSlide{ - position:absolute; - left:0px; - top:100px; -/* width:110px;*/ -} - -/* a.submenu{ + + + a.submenu{ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; padding-top:5px; @@ -1235,7 +672,7 @@ text-align:left; text-decoration:none; display:block; -} */ +} #mnuKey{ font-family:Verdana, Arial, Helvetica, sans-serif; @@ -1343,11 +780,7 @@ /* Calculator */ -.calcBg { - /*background-color: #666;*//*BFC1B7*/ - background: url(images/cal_bg.gif); - border: 1px solid #009900; -} + .calcResult { width: 100%; height: 25px; @@ -1477,21 +910,6 @@ } -.frameHdr{ - height:32px; - background-image:url(images/rssframeHdr.gif); - background-repeat:repeat-x; - background-position:top left; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - text-align:left; - padding-left:5px; - color:#FFFF00; - vertical-align:middle; - border:0px solid #000000; -} - .forwardBg{ font-family:Arial, Helvetica, sans-serif; font-size:12px; @@ -1508,44 +926,7 @@ /* New Styles */ -.hometop{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:14px; - color:white; - text-decoration:none; - text-align:left; - padding-left:10px; - background-image:url(../images/hometop.gif); - background-position:top left; - background-repeat:repeat-x; - height:35px; - vertical-align:middle; -} - -.homeBtm{ - background-image:url(../images/HomeBtm.gif); - background-position:top left; - background-repeat:repeat-x; - height:29px; -} - -.imageTab{ - background-color:#F5F5F5; - border:0px solid #EBEBEB; - width:30px; - height:30px; - position:relative; - visibility:visible; -} - -a.imageTab:Hover{ - background-color:#BFBFFF; - border:0px solid #EBEBEB; - width:30px; - height:30px; - display:block; - opacity:.5; -} + .mnuTab{ font-family:Verdana, Arial, Helvetica, sans-serif; @@ -1561,106 +942,6 @@ vertical-align:middle; } -.mnuSel td{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - background-color:#EBEBEB; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuSel td:Hover{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - color:#000000; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#EBEBEB; -} - -.mnuUnSel td{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - background-color:#D7D7D7; - height:30px; - text-decoration:none; - padding-top:5px; - cursor:pointer; - padding-top:5px; -} - -.mnuUnSel td:Hover{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - color:#00487F; - padding-left:5px; - height:30px; - text-decoration:underline; - padding-top:5px; - cursor:pointer; - padding-top:5px; - background-color:#D7D7D7; -} - -.tabRht{ - background-image:url(../images/tabRht.gif); - background-position:top left; - background-repeat:repeat-y; - width:31px; -} - - -.frmSelect{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - border:1px #EBEBEB; -} - -#mnuSlide{ - position:absolute; - left:0px; - top:100px; - width:110px; -} - - -#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:#ECECEC; - border-right:1px solid #CCCCCC; - opacity:.8; -} - /* profile */ .prvPrfBigText { @@ -1680,56 +961,16 @@ border:1px solid #ebebeb; } -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - cursor:pointer; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - cursor:pointer; -} + .prvPrfTexture { background:url(images/prvPrfTexture1.gif); } -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; -} .prvPrfHoverOn { background-color:#ffffef; -} -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; } /* Organization */ @@ -1765,55 +1006,9 @@ border-right:1px solid #CCCCCC; } -.globTab{ - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - font-weight:normal; - color:#000000; - border:1px solid #999999; - border-collapse:collapse; - width:100%; -} - -.globTab tr th{ - text-align:right; - background-color:#CCCCCC; - border-bottom:1px solid #999999; - border-right:2px solid #999999; - color:#000000; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - text-decoration:none; - font-weight:bold; - height:20px; - padding-right:5px; - -} - -.globTab tr td{ - text-align:left; - border:1px solid #CCCCCC; - color:#666666; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - text-decoration:none; - font-weight:normal; - padding-left:5px; - height:20px; -} - /* Groups */ -.groupul{ - margin:0px; - font-family:Arial, Helvetica, sans-serif; - font-weight:bold; - font-size:12px; - color:#000000; - text-decoration:underline; - text-align:left; -} .groupli{ margin-left:20px; @@ -1872,36 +1067,6 @@ padding-bottom:3px; } -.classBtnSmall{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:9px; - 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; -} - -.classBtnDisable{ - font-family:Verdana, Arial, Helvetica, sans-serif; - text-decoration:none; - font-weight:normal; - font-size:10px; - background-color:#DBDBDB; - border-bottom:2px solid #CCCCCC; - border-right:2px solid #CCCCCC; - border-top:2px solid #F5F5F5; - border-left:2px solid #F5F5F5; - color:#666666; - text-align:center; - padding-top:3px; - padding-bottom:3px; -} - .txtBox{ width:85%; border:1px solid #666666; @@ -1943,13 +1108,6 @@ font-size:11px; } -#imLead{ - width:100%; - overflow:auto; - position:relative; - border:1px solid #666666; - height:175px; -} .txtGreen{ color:green; @@ -1962,14 +1120,6 @@ } /* MY PREFERENCES */ -#chPhoto{ - position:relative; - display:none; - top:20px; - width:100%; - border:1px dashed #666666; - background-color:#FFFFEC; -} /* CSS FOR REPORTS */ @@ -2006,7 +1156,7 @@ } -/* a.reportMnu{ +a.reportMnu{ font-size:11px; color:#0070BA; text-decoration:none; @@ -2028,20 +1178,8 @@ border-bottom:1px solid #E1E1E1; padding-left:20px; padding-top:3px; -} */ - -.reportGenarateTable{ - border-bottom:1px solid #6D6D6D; - border-left:1px solid #6D6D6D; - border-right:1px solid #6D6D6D; - border-top:0px solid #6D6D6D; - background-image:url(../images/report_bg.gif); - background-repeat:repeat-x; -} - -.reportGenarateTable tr td{ - padding:5px; -} +} + #Generate{ position:relative; width:100%; @@ -2049,16 +1187,13 @@ display:none; } -.lvtSel{ - font-weight:bold; -} - + /* END OF REPORT */ /* WEB MAIL */ -/* a.webMnu{ + a.webMnu{ font-size:11px; color:#0070BA; text-decoration:underline; @@ -2067,14 +1202,14 @@ font-size:11px; color:#0070BA; text-decoration:underline; -} */ +} /* END OF WEB MAIL */ /* POPUP */ -/* a.alpha{ + a.alpha{ font-size:11px; color:gray; text-decoration:none; @@ -2092,7 +1227,7 @@ padding-right:5px; border:1px dotted #CCCCCC; background-color:#FFFFCC; -} */ +} /* Home Page */ .MatrixLayer{ @@ -2222,13 +1357,6 @@ } - -.calSelTabMask { - background-color:#D6D2AB; - height:5px; - -} - .calInnerBorder { border-left:1px solid #d6d2ab; border-right:1px solid #d6d2ab; @@ -2242,9 +1370,6 @@ background:#fefefe url(images/layerPopupBg.gif); } -.calTopLeft { - border-left: 1px solid #939271; -} .calTopRight { border-right: 1px solid #939271; @@ -2258,32 +1383,6 @@ width:8%; } -.calTitle{ - background-position:right top; - background-repeat:no-repeat; - background-image:url(images/cal_title.jpg); - width:150px; -} - -.tabBorder{ - background-color:#EBEBEB; - border-bottom:1px solid #666666; - border-left:1px solid #666666; - border-right:1px solid #666666; - padding:10px; -} - -.eventLay{ - background-color:#DBF3FD; - position:relative; - left:0px; - top:0px; - width:100%; - visibility:visible; - padding:5px 5px 5px 5px; - display:block; - z-index:1000; -} a.calMnu{ font-size:11px; @@ -2304,10 +1403,6 @@ padding-left:5px; padding-top:3px; } - -.bggray{ - background-color: #dfdfdf; -} .bgwhite{ background-color: #FFFFFF; } @@ -2329,17 +1424,6 @@ display:none; } .style1 {color: #FF0000} - -#hrViewContent{ - width:100%; - height:250px; - overflow:auto; - position:relative; - border-top:1px solid #CCCCCC; - border-bottom:0px solid white; - border-left:0px solid white; - border-right:0px solid white; -} .event{ background-color:#D3EAF0; @@ -2356,11 +1440,6 @@ #hrView{ display:block; } - -#lstView{ - display:none; -} - .calendarNav{ font-size:12px; color:#FFFFFF; @@ -2403,33 +1482,10 @@ background-color:#ffffff; } -#cal_popup{ - width:600px; - border:3px solid #CCCCCC; - background-color:#FFFFFF; - padding:5px; - position:absolute; - left:100px; - top:100px; -} - .outer{ border-bottom:1px solid #CCCCCC; border-left:1px solid #CCCCCC; border-right:1px solid #CCCCCC; -} - -.outerBorder{ - border:1px solid #CCCCCC; - width:95%; -} - -.fieldHead{ - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - font-weight:bold; - border:0px solid #CCCCCC; - padding:2px 5px 2px 5px; } .calTxt{ @@ -2453,38 +1509,7 @@ /* End of Calendar */ /* Cal Year View */ -.month_table{ - border:2px solid #CCCCCC; - width:100%; - background-color:white; -} - -.month_table tr th{ - background-color:#E9E9E9; - color:#000000; - text-align:center; - border:1px dotted #CCCCCC; - height:20px; - width:14%; - font-weight:normal; -} - -.month_table tr td{ - border:1px dotted #CCCCCC; - color:#000000; - text-align:center; - height:20px; -} - -.cal_Hdr{ - background-image:url(images/cal_Hdr.gif); - background-repeat:repeat-x; - background-position:left top; - font-weight:bold; - color:#000000; - text-align:left; - border:0px solid #000000; -} + .eventDay{ background-color:#FF9966; @@ -2569,12 +1594,7 @@ border-right: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD; } -.rptTitle { - border-right: 1px solid #333; - border-bottom: 1px solid #333; - background: #2C527C; - color: #FFF; -} + .rptGrpHead { background: #FFF; border-bottom: 1px solid #FFF; @@ -2625,31 +1645,7 @@ /* Css for quick Create */ -.qcWindow { - background-color:white; - border:2px solid #999999; -} - -.qcHeader{ - background:url(images/qcBg.gif) repeat-x; - background-color:gray; - color:black; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 19px; - padding-left:10px; -} -.qcTextBox{ - border:1px solid #999999; - width:90%; -} -.qcTextArea{ - border:1px solid #999999; - width:90%; - height:70px; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; -} + .qcTransport{ background-color:#d3d2c1; @@ -2674,50 +1670,7 @@ /* MY SITES */ -.SiteSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_sel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:bold; - font-size:11px; - text-decoration:none; -} - -.SiteUnSel{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_unsel.jpg); - background-position:left bottom; - background-repeat:no-repeat; - height:33px; - width:194px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; - cursor:pointer; -} - -.SiteHdr{ - font-family:Arial, Helvetica, sans-serif; - background-image:url(images/site_hdr.jpg); - background-position:right bottom; - background-repeat:no-repeat; - height:33px; - text-align:center; - vertical-align:middle; - color:#000000; - font-weight:normal; - font-size:11px; - text-decoration:none; -} + .unread_email { font-weight:bold; } @@ -2742,12 +1695,6 @@ color: #000000; } -.adProgressBar { - border-style:solid; - border-width:2px; - border-color:blue; - -} .h2 { @@ -2761,17 +1708,6 @@ color:gray; } -.hdeskComments { - - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - line-height: 14px; - color: #999999; - border:0px; - background-color:#ffffef; - width:100%; - -} ul { list-style:circle; @@ -2783,9 +1719,6 @@ } -.branch { - list-style-image: url("secAdd.gif"); -} @@ -2801,12 +1734,7 @@ -.heading1 { - font-family: Arial, Helvetica, sans-serif; - font-size: 19px; - line-height: 14px; - color: #000000; -} + .heading2 { font-family: Arial, Helvetica, sans-serif; @@ -2816,19 +1744,7 @@ color: #000000; } -.heading3 { - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 14px; - color: #999999; -} - -.heading4 { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 14px; - color: #999999; -} + .settingsUI { @@ -2909,7 +1825,7 @@ font-weight:bold; } -/*.cellLabel { +.cellLabel { background-color:#eaebd9; border-top:1px solid #efefef; border-bottom:1px solid #dadada; @@ -2919,7 +1835,7 @@ .cellText { color:#333333; border-bottom:1px solid #dadada; -} */ +} .listTable{ border-left:1px solid #cccccc; @@ -3019,56 +1935,19 @@ border:1px solid #ebebeb; } -.prvPrfSelectedTab { - background:url(images/prvPrfSelectedTab.gif) repeat-x; - -} - -.prvPrfUnSelectedTab { - background:url(images/prvPrfUnSelectedTab.gif) repeat-x; - -} + .prvPrfTexture { background:url(images/prvPrfTexture1.gif); } -.prvPrfBgOn{ - background-color:#33ee33; -} -.prvPrfBgOff{ - background-color:#cccccc; -} + .prvPrfHoverOn { background-color:#ffffef; } -.prvPrfHoverOut { - background-color:#ffffff; -} - -.prvPrfBgImgGlobal { - background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat; -} -.prvPrfBgImgTab { - background:url(images/prvPrfBgImgTab.jpg) top right no-repeat; -} -.prvPrfBgImgStandard { - background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat; -} -.prvPrfBgImgUtils { - background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat; -} -.prvPrfBgImgField { - background:url(images/prvPrfBgImgField.jpg) top right no-repeat; -} - -.prvPrfTabSample { - border-top:1px solid #ababab; - border-left:1px solid #ababab; - border-right:1px solid #a1a1a1; -} + .cellBottomDotLine { border-bottom-width: 2px; @@ -3088,15 +1967,11 @@ border-bottom-color: #CCCCCC; } -.crmFormDropDown { -border-width:1px; -} + .thickBorder { border: 2px solid #999999; } -.trackerBorder { - background-color:#ffffff; -} + .trackerHeading { background-color:#efefef; } @@ -3112,19 +1987,11 @@ .crmTable { border:1px solid #dadada; } -.crmTableColHeading { - background-color:#CCCCCC; - border-left:1px solid #eaeaea; - border-top:1px solid #eaeaea; - border-right:1px solid #999999; - border-bottom:1px solid #999999; -} + .crmTableRow { border-bottom:1px dotted #dadada; border-right:1px dotted #dadada } - - /* Inventory */ @@ -3153,24 +2020,6 @@ /* Inventory */ - - - -/* styles for RSS Display starts */ -.rssDisplay{ - background-color:#e8e3ca; -} - - -/* styles for RSS Display ends */ - - - - - - - - /* Email Client Classes ++++++++++++++++++++++ */ .emailSelected{ @@ -3192,10 +2041,7 @@ background:#e0dbb0 url(images/mailSubHeaderBg.gif) repeat-x; padding:4px; } -.mailDetailsHeader { - border-top:2px dotted #999; - border-bottom:1px solid #ddd; -} + .mailClientWriteEmailHeader{ font-family:arial, helvetica, sans-serif; Modified: vtigercrm/trunk/vtigerservice.php ============================================================================== --- vtigercrm/trunk/vtigerservice.php (original) +++ vtigercrm/trunk/vtigerservice.php Tue Oct 10 10:02:43 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ - +ini_set (error_reporting,E_ALL & ~E_NOTICE ); if(isset($_REQUEST['service'])) { if($_REQUEST['service'] == "outlook") @@ -44,11 +44,11 @@ { echo "

      vtigerCRM Soap Services

      "; echo "
    26. vtigerCRM Outlook Plugin EndPoint URL -- Click here
    27. "; - echo "
    28. vtigerCRM Word Plugin EndPoint URL -- Click here
    29. "; + echo "
    30. vtigerCRM Word Plugin EndPoint URL -- Click here
    31. "; echo "
    32. vtigerCRM ThunderBird Extenstion EndPoint URL -- Click here
    33. "; echo "
    34. vtigerCRM Customer Portal EndPoint URL -- Click here
    35. "; echo "
    36. vtigerCRM WebForm EndPoint URL -- Click here
    37. "; - echo "
    38. vtigerCRM FireFox Extension EndPoint URL -- Click here
    39. "; + echo "
    40. vtigerCRM FireFox Extension EndPoint URL -- Click here
    41. "; } Modified: vtigercrm/trunk/vtigerversion.php ============================================================================== --- vtigercrm/trunk/vtigerversion.php (original) +++ vtigercrm/trunk/vtigerversion.php Tue Oct 10 10:02:43 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -$patch_version = ''; +$patch_version = '1'; $modified_database = ''; $vtiger_current_version = '5.0.0'; ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Oct 11 09:47:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 11 Oct 2006 13:47:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9624 - /vtigercrm/tags/vtigercrm-5.0.1/ Message-ID: <20061011134755.419986FDF53@vtiger.fosslabs.com> Author: richie Date: Wed Oct 11 07:47:51 2006 New Revision: 9624 Log: tag removed Removed: vtigercrm/tags/vtigercrm-5.0.1/ From vtigercrm-commits at vtiger.fosslabs.com Wed Oct 11 10:59:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 11 Oct 2006 14:59:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9625 - /vtigercrm/tags/vtigercrm-5.0.1/ Message-ID: <20061011145917.7767E787FEB@vtiger.fosslabs.com> Author: richie Date: Wed Oct 11 08:59:12 2006 New Revision: 9625 Log: 5.0.1 version tagged Added: vtigercrm/tags/vtigercrm-5.0.1/ - copied from r9624, vtigercrm/trunk/ From vtigercrm-commits at vtiger.fosslabs.com Wed Oct 11 11:31:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 11 Oct 2006 15:31:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9626 - /vtigercrm/branches/5.0.2/ Message-ID: <20061011153120.EAA136D4958@vtiger.fosslabs.com> Author: richie Date: Wed Oct 11 09:31:09 2006 New Revision: 9626 Log: Creating a branch for 5.0.2 Added: vtigercrm/branches/5.0.2/ - copied from r9625, vtigercrm/trunk/ From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 02:48:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 06:48:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9627 - in /vtigercrm/branches/5.0.1: ./ include/utils/ install/ modules/Accounts/ modules/Calendar/ modules/Campaigns/ modules/Contacts/ modules/Emails/ modules/Home/ modules/Import/ modules/Invoice/ modules/Leads/ modules/Notes/ modules/Potentials/ modules/PriceBooks/ modules/Products/ modules/PurchaseOrder/ modules/Quotes/ modules/SalesOrder/ modules/Users/ modules/Vendors/ modules/Webmails/ soap/ Message-ID: <20061016064859.9A592787FC0@vtiger.fosslabs.com> Author: richie Date: Mon Oct 16 00:46:06 2006 New Revision: 9627 Log: module name ,File name ,Class name made unique Modified: vtigercrm/branches/5.0.1/Popup.php vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php vtigercrm/branches/5.0.1/include/utils/ListViewUtils.php vtigercrm/branches/5.0.1/include/utils/export.php vtigercrm/branches/5.0.1/include/utils/utils.php vtigercrm/branches/5.0.1/index.php vtigercrm/branches/5.0.1/install/5createTables.inc.php vtigercrm/branches/5.0.1/install/populateSeedData.php vtigercrm/branches/5.0.1/modules/Accounts/Account.php vtigercrm/branches/5.0.1/modules/Accounts/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Accounts/Delete.php vtigercrm/branches/5.0.1/modules/Accounts/DetailView.php vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Accounts/EditView.php vtigercrm/branches/5.0.1/modules/Accounts/HeadLines.php vtigercrm/branches/5.0.1/modules/Accounts/ListView.php vtigercrm/branches/5.0.1/modules/Accounts/ListViewTop.php vtigercrm/branches/5.0.1/modules/Accounts/Save.php vtigercrm/branches/5.0.1/modules/Accounts/Tickerdetail.php vtigercrm/branches/5.0.1/modules/Calendar/Activity.php vtigercrm/branches/5.0.1/modules/Calendar/RenderRelatedListUI.php vtigercrm/branches/5.0.1/modules/Campaigns/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Campaigns/Campaign.php vtigercrm/branches/5.0.1/modules/Campaigns/Delete.php vtigercrm/branches/5.0.1/modules/Campaigns/DetailView.php vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php vtigercrm/branches/5.0.1/modules/Campaigns/ListView.php vtigercrm/branches/5.0.1/modules/Campaigns/Save.php vtigercrm/branches/5.0.1/modules/Contacts/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Contacts/Contact.php vtigercrm/branches/5.0.1/modules/Contacts/Delete.php vtigercrm/branches/5.0.1/modules/Contacts/DetailView.php vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Contacts/EditView.php vtigercrm/branches/5.0.1/modules/Contacts/ListView.php vtigercrm/branches/5.0.1/modules/Contacts/Save.php vtigercrm/branches/5.0.1/modules/Emails/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Emails/ChooseEmail.php vtigercrm/branches/5.0.1/modules/Emails/Delete.php vtigercrm/branches/5.0.1/modules/Emails/DetailView.php vtigercrm/branches/5.0.1/modules/Emails/EditView.php vtigercrm/branches/5.0.1/modules/Emails/Email.php vtigercrm/branches/5.0.1/modules/Emails/EmailsAjax.php vtigercrm/branches/5.0.1/modules/Emails/ListView.php vtigercrm/branches/5.0.1/modules/Emails/Save.php vtigercrm/branches/5.0.1/modules/Emails/mailsend.php vtigercrm/branches/5.0.1/modules/Emails/sendmail.php vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php vtigercrm/branches/5.0.1/modules/Import/ImportAccount.php vtigercrm/branches/5.0.1/modules/Import/ImportContact.php vtigercrm/branches/5.0.1/modules/Import/ImportLead.php vtigercrm/branches/5.0.1/modules/Import/ImportOpportunity.php vtigercrm/branches/5.0.1/modules/Import/ImportProduct.php vtigercrm/branches/5.0.1/modules/Import/ImportStep2.php vtigercrm/branches/5.0.1/modules/Import/ImportSteplast.php vtigercrm/branches/5.0.1/modules/Invoice/EditView.php vtigercrm/branches/5.0.1/modules/Leads/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Leads/Delete.php vtigercrm/branches/5.0.1/modules/Leads/DetailView.php vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Leads/EditView.php vtigercrm/branches/5.0.1/modules/Leads/Lead.php vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php vtigercrm/branches/5.0.1/modules/Leads/ListView.php vtigercrm/branches/5.0.1/modules/Leads/Save.php vtigercrm/branches/5.0.1/modules/Leads/result.php vtigercrm/branches/5.0.1/modules/Notes/Delete.php vtigercrm/branches/5.0.1/modules/Notes/DetailView.php vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Notes/EditView.php vtigercrm/branches/5.0.1/modules/Notes/ListView.php vtigercrm/branches/5.0.1/modules/Notes/Note.php vtigercrm/branches/5.0.1/modules/Notes/Save.php vtigercrm/branches/5.0.1/modules/Potentials/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Potentials/Charts.php vtigercrm/branches/5.0.1/modules/Potentials/Delete.php vtigercrm/branches/5.0.1/modules/Potentials/DetailView.php vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Potentials/EditView.php vtigercrm/branches/5.0.1/modules/Potentials/ListView.php vtigercrm/branches/5.0.1/modules/Potentials/ListViewTop.php vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php vtigercrm/branches/5.0.1/modules/Potentials/Save.php vtigercrm/branches/5.0.1/modules/PriceBooks/CallRelatedList.php vtigercrm/branches/5.0.1/modules/PriceBooks/Delete.php vtigercrm/branches/5.0.1/modules/PriceBooks/DetailView.php vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php vtigercrm/branches/5.0.1/modules/PriceBooks/ListView.php vtigercrm/branches/5.0.1/modules/PriceBooks/PriceBook.php vtigercrm/branches/5.0.1/modules/PriceBooks/Save.php vtigercrm/branches/5.0.1/modules/Products/AddProductToPriceBooks.php vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php vtigercrm/branches/5.0.1/modules/Products/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Products/Delete.php vtigercrm/branches/5.0.1/modules/Products/DetailView.php vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Products/EditView.php vtigercrm/branches/5.0.1/modules/Products/ListView.php vtigercrm/branches/5.0.1/modules/Products/Product.php vtigercrm/branches/5.0.1/modules/Products/Save.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/CallRelatedList.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/CreatePDF.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/Delete.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailView.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/EditView.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListTopPurchaseOrder.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListView.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/PurchaseOrder.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/Save.php vtigercrm/branches/5.0.1/modules/Quotes/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Quotes/CreatePDF.php vtigercrm/branches/5.0.1/modules/Quotes/Delete.php vtigercrm/branches/5.0.1/modules/Quotes/DetailView.php vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Quotes/EditView.php vtigercrm/branches/5.0.1/modules/Quotes/ListTopQuotes.php vtigercrm/branches/5.0.1/modules/Quotes/ListView.php vtigercrm/branches/5.0.1/modules/Quotes/Quote.php vtigercrm/branches/5.0.1/modules/Quotes/Save.php vtigercrm/branches/5.0.1/modules/SalesOrder/EditView.php vtigercrm/branches/5.0.1/modules/Users/Authenticate.php vtigercrm/branches/5.0.1/modules/Users/ChangePassword.php vtigercrm/branches/5.0.1/modules/Users/CreateUserPrivilegeFile.php vtigercrm/branches/5.0.1/modules/Users/DetailView.php vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Users/EditView.php vtigercrm/branches/5.0.1/modules/Users/ListLoginHistory.php vtigercrm/branches/5.0.1/modules/Users/ListView.php vtigercrm/branches/5.0.1/modules/Users/Logout.php vtigercrm/branches/5.0.1/modules/Users/Save.php vtigercrm/branches/5.0.1/modules/Users/ShowAuditTrail.php vtigercrm/branches/5.0.1/modules/Users/ShowHistory.php vtigercrm/branches/5.0.1/modules/Users/User.php vtigercrm/branches/5.0.1/modules/Users/massChangeStatus.php vtigercrm/branches/5.0.1/modules/Users/populatetemplate.php vtigercrm/branches/5.0.1/modules/Vendors/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Vendors/Delete.php vtigercrm/branches/5.0.1/modules/Vendors/DetailView.php vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Vendors/EditView.php vtigercrm/branches/5.0.1/modules/Vendors/ListView.php vtigercrm/branches/5.0.1/modules/Vendors/Save.php vtigercrm/branches/5.0.1/modules/Vendors/Vendor.php vtigercrm/branches/5.0.1/modules/Webmails/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Webmails/Save.php vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php vtigercrm/branches/5.0.1/soap/vtigerolservice.php vtigercrm/branches/5.0.1/soap/webforms.php vtigercrm/branches/5.0.1/soap/wordplugin.php Modified: vtigercrm/branches/5.0.1/Popup.php ============================================================================== --- vtigercrm/branches/5.0.1/Popup.php (original) +++ vtigercrm/branches/5.0.1/Popup.php Mon Oct 16 00:46:06 2006 @@ -33,8 +33,8 @@ switch($currentModule) { case 'Contacts': - require_once("modules/$currentModule/Contact.php"); - $focus = new Contact(); + require_once("modules/$currentModule/Contacts.php"); + $focus = new Contacts(); $log = LoggerManager::getLogger('contact_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom'); $comboFieldArray = getComboArray($comboFieldNames); @@ -47,8 +47,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","",""); break; case 'Campaigns': - require_once("modules/$currentModule/Campaign.php"); - $focus = new Campaign(); + require_once("modules/$currentModule/Campaigns.php"); + $focus = new Campaigns(); $log = LoggerManager::getLogger('campaign_list'); $comboFieldNames = Array('campaignstatus'=>'campaignstatus_dom', 'campaigntype'=>'campaigntype_dom'); @@ -60,8 +60,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','campaignname','true','basic',$popuptype,"","",""); break; case 'Accounts': - require_once("modules/$currentModule/Account.php"); - $focus = new Account(); + require_once("modules/$currentModule/Accounts.php"); + $focus = new Accounts(); $log = LoggerManager::getLogger('account_list'); $comboFieldNames = Array('accounttype'=>'account_type_dom' ,'industry'=>'industry_dom'); @@ -74,8 +74,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','accountname','true','basic',$popuptype,"","",""); break; case 'Leads': - require_once("modules/$currentModule/Lead.php"); - $focus = new Lead(); + require_once("modules/$currentModule/Leads.php"); + $focus = new Leads(); $log = LoggerManager::getLogger('contact_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom' ,'leadstatus'=>'leadstatus_dom' @@ -91,8 +91,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","",""); break; case 'Potentials': - require_once("modules/$currentModule/Opportunity.php"); - $focus = new Potential(); + require_once("modules/$currentModule/Potentials.php"); + $focus = new Potentials(); $log = LoggerManager::getLogger('potential_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom' ,'opportunity_type'=>'opportunity_type_dom' @@ -104,8 +104,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','potentialname','true','basic',$popuptype,"","",""); break; case 'Quotes': - require_once("modules/$currentModule/Quote.php"); - $focus = new Quote(); + require_once("modules/$currentModule/Quotes.php"); + $focus = new Quotes(); $log = LoggerManager::getLogger('quotes_list'); $comboFieldNames = Array('quotestage'=>'quotestage_dom'); $comboFieldArray = getComboArray($comboFieldNames); @@ -121,8 +121,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','subject','true','basic',$popuptype,"","",""); break; case 'Products': - require_once("modules/$currentModule/Product.php"); - $focus = new Product(); + require_once("modules/$currentModule/Products.php"); + $focus = new Products(); $smarty->assign("SINGLE_MOD",'Product'); if(isset($_REQUEST['curr_row'])) { @@ -135,8 +135,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','productname','true','basic',$popuptype,"","",""); break; case 'Vendors': - require_once("modules/$currentModule/Vendor.php"); - $focus = new Vendor(); + require_once("modules/$currentModule/Vendors.php"); + $focus = new Vendors(); $smarty->assign("SINGLE_MOD",'Vendor'); $alphabetical = AlphabeticalSearch($currentModule,'Popup','vendorname','true','basic',$popuptype,"","",""); break; @@ -150,15 +150,15 @@ break; case 'PurchaseOrder': require_once("modules/$currentModule/PurchaseOrder.php"); - $focus = new Order(); + $focus = new PurchaseOrder(); $smarty->assign("SINGLE_MOD",'PurchaseOrder'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); $alphabetical = AlphabeticalSearch($currentModule,'Popup','subject','true','basic',$popuptype,"","",""); break; case 'PriceBooks': - require_once("modules/$currentModule/PriceBook.php"); - $focus = new PriceBook(); + require_once("modules/$currentModule/PriceBooks.php"); + $focus = new PriceBooks(); $smarty->assign("SINGLE_MOD",'PriceBook'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); @@ -175,8 +175,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','bookname','true','basic',$popuptype,"","",""); break; case 'Users': - require_once("modules/$currentModule/User.php"); - $focus = new User(); + require_once("modules/$currentModule/Users.php"); + $focus = new Users(); $smarty->assign("SINGLE_MOD",'Users'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); Modified: vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php Mon Oct 16 00:46:06 2006 @@ -863,15 +863,15 @@ $nemail=count($realid); if ($pmodule=='Accounts'){ - require_once('modules/Accounts/Account.php'); - $myfocus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $myfocus = new Accounts(); $myfocus->retrieve_entity_info($entityid,"Accounts"); $fullname=br2nl($myfocus->column_fields['accountname']); $account_selected = 'selected'; } elseif ($pmodule=='Contacts'){ - require_once('modules/Contacts/Contact.php'); - $myfocus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $myfocus = new Contacts(); $myfocus->retrieve_entity_info($entityid,"Contacts"); $fname=br2nl($myfocus->column_fields['firstname']); $lname=br2nl($myfocus->column_fields['lastname']); @@ -879,8 +879,8 @@ $contact_selected = 'selected'; } elseif ($pmodule=='Leads'){ - require_once('modules/Leads/Lead.php'); - $myfocus = new Lead(); + require_once('modules/Leads/Leads.php'); + $myfocus = new Leads(); $myfocus->retrieve_entity_info($entityid,"Leads"); $fname=br2nl($myfocus->column_fields['firstname']); $lname=br2nl($myfocus->column_fields['lastname']); Modified: vtigercrm/branches/5.0.1/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/ListViewUtils.php Mon Oct 16 00:46:06 2006 @@ -1385,8 +1385,8 @@ } elseif($popuptype == "specific_account_address") { - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($entity_id,"Accounts"); $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']).'"); window.close()\'>'.$temp_val.''; @@ -1394,8 +1394,8 @@ } elseif($popuptype == "specific_contact_account_address") { - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($entity_id,"Accounts"); $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']).'"); window.close()\'>'.$temp_val.''; @@ -1405,8 +1405,8 @@ elseif($popuptype == "specific_potential_account_address") { $acntid = $adb->query_result($list_result,$list_result_count,"accountid"); - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($acntid,"Accounts"); $account_name = getAccountName($acntid); @@ -1461,8 +1461,8 @@ } elseif($popuptype == "specific_vendor_address") { - require_once('modules/Vendors/Vendor.php'); - $acct_focus = new Vendor(); + require_once('modules/Vendors/Vendors.php'); + $acct_focus = new Vendors(); $acct_focus->retrieve_entity_info($entity_id,"Vendors"); $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']).'"); window.close()\'>'.$temp_val.''; Modified: vtigercrm/branches/5.0.1/include/utils/export.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/export.php (original) +++ vtigercrm/branches/5.0.1/include/utils/export.php Mon Oct 16 00:46:06 2006 @@ -20,23 +20,23 @@ require_once('config.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Leads/Lead.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Leads/Leads.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Emails/Emails.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Users/User.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Users/Users.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/UserInfoUtil.php'); global $allow_exports; session_start(); -$current_user = new User(); +$current_user = new Users(); if(isset($_SESSION['authenticated_user_id'])) { Modified: vtigercrm/branches/5.0.1/include/utils/utils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/utils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/utils.php Mon Oct 16 00:46:06 2006 @@ -2048,9 +2048,9 @@ $log->debug("Entering getEmailParentsList(".$module.",".$id.") method ..."); global $adb; if($module == 'Contacts') - $focus = new Contact(); + $focus = new Contacts(); if($module == 'Leads') - $focus = new Lead(); + $focus = new Leads(); $focus->retrieve_entity_info($id,$module); $fieldid = 0; Modified: vtigercrm/branches/5.0.1/index.php ============================================================================== --- vtigercrm/branches/5.0.1/index.php (original) +++ vtigercrm/branches/5.0.1/index.php Mon Oct 16 00:46:06 2006 @@ -101,7 +101,7 @@ set_default_config($default_config_values); require_once('include/logging.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); global $currentModule; @@ -352,7 +352,7 @@ $lang_crm = (isset($_SESSION['authenticated_user_language'])) ? $_SESSION['authenticated_user_language'] : ""; $GLOBALS['request_string'] = "&module=$module&action=$action&record=$record&lang_crm=$lang_crm"; -$current_user = new User(); +$current_user = new Users(); if($use_current_login) { @@ -432,90 +432,22 @@ // Use the record to track the viewing. // todo - Have a record of modules and thier primary object names. //Getting the actual module - $actualModule = $currentModule; switch($currentModule) { - case 'Leads': - require_once("modules/$currentModule/Lead.php"); - $focus = new Lead(); - break; - case 'Contacts': - require_once("modules/$currentModule/Contact.php"); - $focus = new Contact(); - break; - case 'Accounts': - require_once("modules/$currentModule/Account.php"); - $focus = new Account(); - break; - case 'Potentials': - require_once("modules/$currentModule/Opportunity.php"); - $focus = new Potential(); - break; case 'Calendar': require_once("modules/$currentModule/Activity.php"); $focus = new Activity(); break; - case 'Notes': - require_once("modules/$currentModule/Note.php"); - $focus = new Note(); - break; - case 'Emails': - require_once("modules/$currentModule/Email.php"); - $focus = new Email(); - break; - case 'Users': - require_once("modules/$currentModule/User.php"); - $focus = new User(); - break; - case 'Products': - require_once("modules/$currentModule/Product.php"); - $focus = new Product(); - break; - case 'Vendors': - require_once("modules/$currentModule/Vendor.php"); - $focus = new Vendor(); - $actualModule = 'Vendors'; - break; - case 'PriceBooks': - require_once("modules/$currentModule/PriceBook.php"); - $focus = new PriceBook(); - $actualModule = 'PriceBooks'; - break; - case 'HelpDesk': - require_once("modules/$currentModule/HelpDesk.php"); - $focus = new HelpDesk(); - break; - case 'Faq': - require_once("modules/$currentModule/Faq.php"); - $focus = new Faq(); - break; - case 'Quotes': - require_once("modules/$currentModule/Quote.php"); - $focus = new Quote(); - break; - case 'PurchaseOrder': - require_once("modules/$currentModule/PurchaseOrder.php"); - $focus = new Order(); - break; - case 'SalesOrder': - require_once("modules/$currentModule/SalesOrder.php"); - $focus = new SalesOrder(); - break; - - case 'Invoice': - require_once("modules/$currentModule/Invoice.php"); - $focus = new Invoice(); - break; - case 'Campaigns': - require_once("modules/$currentModule/Campaign.php"); - $focus = new Campaign(); + default: + require_once("modules/$currentModule/$currentModule.php"); + $focus = new $currentModule(); break; } if(isset($_REQUEST['record']) && $_REQUEST['record']!='' && $_REQUEST["module"] != "Webmails") { // Only track a viewing if the record was retrieved. - $focus->track_view($current_user->id, $actualModule,$_REQUEST['record']); + $focus->track_view($current_user->id, $currentModule,$_REQUEST['record']); } } Modified: vtigercrm/branches/5.0.1/install/5createTables.inc.php ============================================================================== --- vtigercrm/branches/5.0.1/install/5createTables.inc.php (original) +++ vtigercrm/branches/5.0.1/install/5createTables.inc.php Mon Oct 16 00:46:06 2006 @@ -22,14 +22,14 @@ require_once('config.php'); require_once('include/database/PearDatabase.php'); require_once('include/logging.php'); -require_once('modules/Leads/Lead.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Leads/Leads.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Users/User.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Users/Users.php'); require_once('modules/Import/ImportMap.php'); require_once('modules/Import/UsersLastImport.php'); require_once('modules/Users/LoginHistory.php'); @@ -66,7 +66,7 @@ global $default_user_is_admin; // create default admin user - $user = new User(); + $user = new Users(); $user->column_fields["last_name"] = 'Administrator'; $user->column_fields["user_name"] = 'admin'; $user->column_fields["status"] = 'Active'; @@ -122,7 +122,7 @@ //Creating the Standard User - $user = new User(); + $user = new Users(); $user->column_fields["last_name"] = 'StandardUser'; $user->column_fields["user_name"] = 'standarduser'; $user->column_fields["is_admin"] = 'off'; Modified: vtigercrm/branches/5.0.1/install/populateSeedData.php ============================================================================== --- vtigercrm/branches/5.0.1/install/populateSeedData.php (original) +++ vtigercrm/branches/5.0.1/install/populateSeedData.php Mon Oct 16 00:46:06 2006 @@ -19,29 +19,29 @@ require_once('config.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('modules/Contacts/contactSeedData.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Campaigns/Campaign.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); require_once('include/language/en_us.lang.php'); require_once('include/ComboStrings.php'); require_once('include/ComboUtil.php'); -require_once('modules/Products/Product.php'); -require_once('modules/PriceBooks/PriceBook.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Products/Products.php'); +require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/Vendors/Vendors.php'); require_once('modules/Faq/Faq.php'); require_once('modules/HelpDesk/HelpDesk.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Quotes/Quotes.php'); require_once('modules/SalesOrder/SalesOrder.php'); require_once('modules/PurchaseOrder/PurchaseOrder.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/InventoryUtils.php'); //Included to save inventory related products in demo data global $first_name_array; @@ -113,7 +113,7 @@ } // Look up the user id for the assigned user -$seed_user = new User(); +$seed_user = new Users(); //$adb->println("PSD assignname=".$assigned_user_name); @@ -121,7 +121,7 @@ global $current_user; -$current_user = new User(); +$current_user = new Users(); $result = $current_user->retrieve_entity_info($assigned_user_id,'Users'); $tagkey = 1; @@ -147,7 +147,7 @@ $account_name = $company_name_array[$i]; // Create new accounts. - $account = new Account(); + $account = new Accounts(); $account->column_fields["accountname"] = $account_name; $account->column_fields["phone"] = create_phone_number(); $account->column_fields["assigned_user_id"] = $assigned_user_id; @@ -196,7 +196,7 @@ //Create new opportunities - $opp = new Potential(); + $opp = new Potentials(); $opp->column_fields["assigned_user_id"] = $assigned_user_id; $opp->column_fields["potentialname"] = $account_name." - 1000 units"; @@ -235,7 +235,7 @@ for($i=0; $i<10; $i++) { - $contact = new Contact(); + $contact = new Contacts(); $contact->column_fields["firstname"] = ucfirst(strtolower($first_name_array[$i])); $contact->column_fields["lastname"] = ucfirst(strtolower($last_name_array[$i])); $contact->column_fields["assigned_user_id"] = $assigned_user_id; @@ -327,7 +327,7 @@ $company_count=0; for($i=0; $i<10; $i++) { - $lead = new Lead(); + $lead = new Leads(); $lead->column_fields["firstname"] = ucfirst(strtolower($first_name_array[$i])); $lead->column_fields["lastname"] = ucfirst(strtolower($last_name_array[$i])); @@ -404,7 +404,7 @@ //Populating Vendor Data for($i=0; $i<10; $i++) { - $vendor = new Vendor(); + $vendor = new Vendors(); $vendor->column_fields["vendorname"] = ucfirst(strtolower($first_name_array[$i])); $vendor->column_fields["phone"] = create_phone_number(); $vendor->column_fields["email"] = strtolower($vendor->column_fields["vendorname"])."@company.com"; @@ -442,7 +442,7 @@ .jpeg###","product7.jpeg###product8.jpeg###product9.jpeg###product10.jpeg###"); for($i=0; $i<10; $i++) { - $product = new Product(); + $product = new Products(); if($i>4) { $parent_key = array_rand($opportunity_ids); @@ -579,7 +579,7 @@ $validtill_array = array ("2006-09-21", "2006-10-29", "2006-12-11", "2006-10-09", "2006-11-18"); for($i=0;$i<5;$i++) { - $quote = new Quote(); + $quote = new Quotes(); $quote->column_fields["assigned_user_id"] = $assigned_user_id; $account_key = array_rand($account_ids); @@ -730,7 +730,7 @@ for($i=0;$i<5;$i++) { - $po = new Order(); + $po = new PurchaseOrder(); $po->column_fields["assigned_user_id"] = $assigned_user_id; $vendor_key = array_rand($vendor_ids); @@ -896,7 +896,7 @@ for($i=0;$i<5;$i++) { - $email = new Email(); + $email = new Emails(); $email->column_fields["assigned_user_id"] = $assigned_user_id; @@ -923,7 +923,7 @@ //$num_array = array(0,1,2,3,4); for($i=0;$i<12;$i++) { - $pricebook = new PriceBook(); + $pricebook = new PriceBooks(); $rand = array_rand($num_array); $pricebook->column_fields["bookname"] = $PB_array[$i]; @@ -940,7 +940,7 @@ for($i=0;$i<7;$i++) { - $notes = new Note(); + $notes = new Notes(); $rand = array_rand($num_array); $contact_key = array_rand($contact_ids); @@ -1118,7 +1118,7 @@ //$expected_response = Array(null,null,null); for($i=0;$icolumn_fields["campaignname"] = $campaign_name; $campaign->column_fields["campaigntype"] = $campaign_type_array[$i]; Modified: vtigercrm/branches/5.0.1/modules/Accounts/Account.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/Account.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/Account.php Mon Oct 16 00:46:06 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Accounts/Account.php,v 1.53 2005/04/28 08:06:45 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Accounts/Accounts.php,v 1.53 2005/04/28 08:06:45 rank Exp $ * Description: Defines the Account SugarBean Account entity with the necessary * methods and variables. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. @@ -26,11 +26,11 @@ require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -96,7 +96,7 @@ var $default_order_by = 'accountname'; var $default_sort_order = 'ASC'; - function Account() { + function Accounts() { $this->log =LoggerManager::getLogger('account'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Accounts'); @@ -147,7 +147,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $mod_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; if(isPermitted("Contacts",1,"") == 'yes') @@ -191,7 +191,7 @@ $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; - $focus = new Potential(); + $focus = new Potentials(); $button = ''; if(isPermitted("Potentials",1,"") == 'yes') @@ -388,9 +388,9 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quote.php'); - - $focus = new Quote(); + require_once('modules/Quotes/Quotes.php'); + + $focus = new Quotes(); $button = ''; if(isPermitted("Quotes",1,"") == 'yes') @@ -627,10 +627,10 @@ { global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Product.php'); + require_once('modules/Products/Products.php'); global $app_strings; - $focus = new Product(); + $focus = new Products(); $button = ''; Modified: vtigercrm/branches/5.0.1/modules/Accounts/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -22,7 +22,7 @@ } else { -$focus = new Account(); +$focus = new Accounts(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Accounts/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/Delete.php Mon Oct 16 00:46:06 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Account(); +$focus = new Accounts(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Accounts/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/DetailView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ global $app_list_strings; global $log, $currentModule, $singlepane_view; -$focus = new Account(); +$focus = new Accounts(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Accounts"); $focus->id = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $acntObj = new Account(); + $acntObj = new Accounts(); $acntObj->retrieve_entity_info($crmid,"Accounts"); $acntObj->column_fields[$fieldname] = $fieldvalue; if($fieldname == 'annual_revenue')//annual revenue converted to dollar value while saving Modified: vtigercrm/branches/5.0.1/modules/Accounts/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/EditView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -31,7 +31,7 @@ global $app_strings,$mod_strings,$currentModule,$theme; $smarty=new vtigerCRM_Smarty; -$focus = new Account(); +$focus = new Accounts(); if(isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Accounts/HeadLines.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/HeadLines.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/HeadLines.php Mon Oct 16 00:46:06 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -include("modules/Accounts/Account.php"); +include("modules/Accounts/Accounts.php"); include("getCompanyProfile.php"); $variable = $_REQUEST['tickersymbol']; $url = "http://finance.yahoo.com/q?s=".$variable; Modified: vtigercrm/branches/5.0.1/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/ListView.php Mon Oct 16 00:46:06 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -43,7 +43,7 @@ $url_string = ''; -$focus = new Account(); +$focus = new Accounts(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Accounts/ListViewTop.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/ListViewTop.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/ListViewTop.php Mon Oct 16 00:46:06 2006 @@ -28,7 +28,7 @@ $log = LoggerManager::getLogger('top accounts_list'); $log->debug("Entering getTopAccounts() method ..."); require_once("data/Tracker.php"); - require_once('modules/Potentials/Opportunity.php'); + require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); global $app_strings; Modified: vtigercrm/branches/5.0.1/modules/Accounts/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/Save.php Mon Oct 16 00:46:06 2006 @@ -21,14 +21,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/logging.php'); //require_once('database/DatabaseConnection.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); global $log; -$focus = new Account(); +$focus = new Accounts(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/Accounts/Tickerdetail.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/Tickerdetail.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/Tickerdetail.php Mon Oct 16 00:46:06 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once("modules/Accounts/Account.php"); +require_once("modules/Accounts/Accounts.php"); require_once("getCompanyProfile.php"); $variable = $_REQUEST['tickersymbol']; $url = "http://moneycentral.msn.com/investor/research/profile.asp?Symbol=".trim($variable); Modified: vtigercrm/branches/5.0.1/modules/Calendar/Activity.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Calendar/Activity.php (original) +++ vtigercrm/branches/5.0.1/modules/Calendar/Activity.php Mon Oct 16 00:46:06 2006 @@ -154,7 +154,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; @@ -177,7 +177,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new User(); + $focus = new Users(); $button = ''; @@ -395,8 +395,8 @@ global $log,$adb; $log->debug("Entering get_tasksforol(".$username.") method ..."); global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -447,8 +447,8 @@ global $log,$adb; $log->debug("Entering get_calendarsforol(".$user_name.") method ..."); global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); Modified: vtigercrm/branches/5.0.1/modules/Calendar/RenderRelatedListUI.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Calendar/RenderRelatedListUI.php (original) +++ vtigercrm/branches/5.0.1/modules/Calendar/RenderRelatedListUI.php Mon Oct 16 00:46:06 2006 @@ -10,8 +10,8 @@ ********************************************************************************/ require_once('include/RelatedListView.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/UserInfoUtil.php'); // functions added for group calendar -Jaguar Modified: vtigercrm/branches/5.0.1/modules/Campaigns/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Campaigns/Campaign.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 @@ -23,7 +23,7 @@ } else { -$focus = new Campaign(); +$focus = new Campaigns(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Campaigns/Campaign.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/Campaign.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/Campaign.php Mon Oct 16 00:46:06 2006 @@ -18,8 +18,8 @@ require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); require_once('include/utils/utils.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Leads/Leads.php'); require_once('user_privileges/default_module_view.php'); class Campaign extends CRMEntity { @@ -66,7 +66,7 @@ 'Campaign Type'=>'campaigntype', ); - function Campaign() + function Campaigns() { $this->log =LoggerManager::getLogger('campaign'); $this->db = new PearDatabase(); @@ -120,7 +120,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $mod_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; if($singlepane_view == 'true') @@ -145,7 +145,7 @@ $log->debug("Entering get_leads(".$id.") method ..."); global $mod_strings; - $focus = new Lead(); + $focus = new Leads(); $button = ''; if($singlepane_view == 'true') @@ -169,7 +169,7 @@ $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; - $focus = new Potential(); + $focus = new Potentials(); $button = ''; if($singlepane_view == 'true') Modified: vtigercrm/branches/5.0.1/modules/Campaigns/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/Delete.php Mon Oct 16 00:46:06 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('ticket_delete'); -$focus = new Campaign(); +$focus = new Campaigns(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/DetailView.php Mon Oct 16 00:46:06 2006 @@ -11,12 +11,12 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Campaigns/Campaign.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'); -$focus = new Campaign(); +$focus = new Campaigns(); if(isset($_REQUEST['record']) && $_REQUEST['record']!= null ) { Modified: vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Campaign(); + $modObj = new Campaigns(); $modObj->retrieve_entity_info($crmid,"Campaigns"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php Mon Oct 16 00:46:06 2006 @@ -11,12 +11,12 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once('include/utils/utils.php'); -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$currentModule,$theme; -$focus = new Campaign(); +$focus = new Campaigns(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] !='') Modified: vtigercrm/branches/5.0.1/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/ListView.php Mon Oct 16 00:46:06 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once("data/Tracker.php"); @@ -28,7 +28,7 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; -$focus = new Campaign(); +$focus = new Campaigns(); $category = getParentTab(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Campaigns/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/Save.php Mon Oct 16 00:46:06 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new Campaign(); +$focus = new Campaigns(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/Contacts/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout @@ -22,7 +22,7 @@ } else { -$focus = new Contact(); +$focus = new Contacts(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/Contact.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/Contact.php Mon Oct 16 00:46:06 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Contacts/Contact.php,v 1.70 2005/04/27 11:21:49 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Contacts/Contacts.php,v 1.70 2005/04/27 11:21:49 rank Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -25,11 +25,11 @@ require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); require_once('include/utils/utils.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Campaigns/Campaign.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); require_once('modules/HelpDesk/HelpDesk.php'); require_once('user_privileges/default_module_view.php'); @@ -125,7 +125,7 @@ var $default_order_by = 'lastname'; var $default_sort_order = 'ASC'; - function Contact() { + function Contacts() { $this->log = LoggerManager::getLogger('contact'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Contacts'); @@ -334,7 +334,7 @@ $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; - $focus = new Potential(); + $focus = new Potentials(); $button = ''; if(isPermitted("Potentials",1,"") == 'yes') @@ -486,8 +486,8 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quote.php'); - $focus = new Quote(); + require_once('modules/Quotes/Quotes.php'); + $focus = new Quotes(); $button = ''; if(isPermitted("Quotes",1,"") == 'yes') @@ -540,8 +540,8 @@ global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); global $app_strings; - require_once('modules/Products/Product.php'); - $focus = new Product(); + require_once('modules/Products/Products.php'); + $focus = new Products(); $button = ''; if(isPermitted("Products",1,"") == 'yes') @@ -570,7 +570,7 @@ $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new Order(); + $focus = new PurchaseOrder(); $button = ''; @@ -600,7 +600,7 @@ $log->debug("Entering get_emails(".$id.") method ..."); global $mod_strings; - $focus = new Email(); + $focus = new Emails(); $button = ''; @@ -631,7 +631,7 @@ $log->debug("Entering get_campaigns(".$id.") method ..."); global $mod_strings; - $focus = new Campaign(); + $focus = new Campaigns(); if($singlepane_view == 'true') $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; else @@ -735,8 +735,8 @@ { global $log; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -775,8 +775,8 @@ { global $log,$adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); Modified: vtigercrm/branches/5.0.1/modules/Contacts/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/Delete.php Mon Oct 16 00:46:06 2006 @@ -17,13 +17,13 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Contact(); +$focus = new Contacts(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Contacts/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/DetailView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -33,7 +33,7 @@ global $app_strings; global $currentModule, $singlepane_view; -$focus = new Contact(); +$focus = new Contacts(); if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $cntObj = new Contact(); + $cntObj = new Contacts(); $cntObj->retrieve_entity_info($crmid,"Contacts"); $cntObj->column_fields[$fieldname] = $fieldvalue; $cntObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Contacts/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/EditView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -39,7 +39,7 @@ $image_error=isset($_REQUEST['image_error'])?$_REQUEST['image_error']:"false"; //end -$focus = new Contact(); +$focus = new Contacts(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) @@ -68,9 +68,9 @@ if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']=='') { - require_once('modules/Accounts/Account.php'); + require_once('modules/Accounts/Accounts.php'); $focus->column_fields['account_id'] = $_REQUEST['account_id']; - $acct_focus = new Account(); + $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']; Modified: vtigercrm/branches/5.0.1/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/ListView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -39,7 +39,7 @@ global $currentModule,$theme; -$focus = new Contact(); +$focus = new Contacts(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Contacts/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/Save.php Mon Oct 16 00:46:06 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once("modules/Emails/mail.php"); @@ -51,7 +51,7 @@ $local_log =& LoggerManager::getLogger('index'); global $log,$adb; -$focus = new Contact(); +$focus = new Contacts(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/Emails/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -11,10 +11,10 @@ require_once('Smarty_setup.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); -$focus = new Email(); +$focus = new Emails(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Emails/ChooseEmail.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/ChooseEmail.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/ChooseEmail.php Mon Oct 16 00:46:06 2006 @@ -29,20 +29,20 @@ if ($pmodule=='Accounts') { - require_once('modules/Accounts/Account.php'); - $myfocus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $myfocus = new Accounts(); $myfocus->retrieve_entity_info($entityid,"Accounts"); } elseif ($pmodule=='Contacts') { - require_once('modules/Contacts/Contact.php'); - $myfocus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $myfocus = new Contacts(); $myfocus->retrieve_entity_info($entityid,"Contacts"); } elseif ($pmodule=='Leads') { - require_once('modules/Leads/Lead.php'); - $myfocus = new Lead(); + require_once('modules/Leads/Leads.php'); + $myfocus = new Leads(); $myfocus->retrieve_entity_info($entityid,"Leads"); } ?> Modified: vtigercrm/branches/5.0.1/modules/Emails/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/Delete.php Mon Oct 16 00:46:06 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('email_delete'); -$focus = new Email(); +$focus = new Emails(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the email."); Modified: vtigercrm/branches/5.0.1/modules/Emails/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/DetailView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/upload_file.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ global $mod_strings; global $currentModule; -$focus = new Email(); +$focus = new Emails(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record'])) Modified: vtigercrm/branches/5.0.1/modules/Emails/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/EditView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/FormValidationUtil.php'); @@ -34,7 +34,7 @@ global $current_user; global $currentModule; -$focus = new Email(); +$focus = new Emails(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['upload_error'] == true) Modified: vtigercrm/branches/5.0.1/modules/Emails/Email.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/Email.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/Email.php Mon Oct 16 00:46:06 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Email.php,v 1.41 2005/04/28 08:11:21 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Emails.php,v 1.41 2005/04/28 08:11:21 rank Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -25,10 +25,10 @@ require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Users/User.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Users/Users.php'); // Email is used to store customer information. class Email extends CRMEntity { @@ -78,9 +78,9 @@ /** This function will set the columnfields for Email module */ - function Email() { + function Emails() { $this->log = LoggerManager::getLogger('email'); - $this->log->debug("Entering Email() method ..."); + $this->log->debug("Entering Emails() method ..."); $this->log = LoggerManager::getLogger('email'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Emails'); @@ -101,7 +101,7 @@ global $mod_strings; global $app_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; $returnset = '&return_module=Emails&return_action=CallRelatedList&return_id='.$id; Modified: vtigercrm/branches/5.0.1/modules/Emails/EmailsAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/EmailsAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/EmailsAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = $_REQUEST["fieldValue"]; if($crmid != "") { - $modObj = new Email(); + $modObj = new Emails(); $modObj->retrieve_entity_info($crmid,"Emails"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Emails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/ListView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/utils/utils.php'); @@ -42,7 +42,7 @@ $url_string = ''; // assigning http url string -$focus = new Email(); +$focus = new Emails(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Emails/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/Save.php Mon Oct 16 00:46:06 2006 @@ -51,13 +51,13 @@ $mailbox = 'INBOX'; } -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Email(); +$focus = new Emails(); global $current_user; setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/Emails/mailsend.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/mailsend.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/mailsend.php Mon Oct 16 00:46:06 2006 @@ -124,20 +124,20 @@ $fresult=$adb->query($myquery); if ($pmodule=='Contacts') { - require_once('modules/Contacts/Contact.php'); - $myfocus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $myfocus = new Contacts(); $myfocus->retrieve_entity_info($mycrmid,"Contacts"); } elseif ($pmodule=='Accounts') { - require_once('modules/Accounts/Account.php'); - $myfocus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $myfocus = new Accounts(); $myfocus->retrieve_entity_info($mycrmid,"Accounts"); } elseif ($pmodule=='Leads') { - require_once('modules/Leads/Lead.php'); - $myfocus = new Lead(); + require_once('modules/Leads/Leads.php'); + $myfocus = new Leads(); $myfocus->retrieve_entity_info($mycrmid,"Leads"); } $fldname=$adb->query_result($fresult,0,"columnname"); Modified: vtigercrm/branches/5.0.1/modules/Emails/sendmail.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/sendmail.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/sendmail.php Mon Oct 16 00:46:06 2006 @@ -18,7 +18,7 @@ * @copyright 2001 - 2003 Brent R. Matzelle */ -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/logging.php'); require("modules/Emails/class.phpmailer.php"); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php (original) +++ vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php Mon Oct 16 00:46:06 2006 @@ -21,18 +21,18 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Leads/Leads.php'); require_once('modules/Faq/Faq.php'); -require_once('modules/Vendors/Vendor.php'); -require_once('modules/PriceBooks/PriceBook.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Vendors/Vendors.php'); +require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/Quotes/Quotes.php'); require_once('modules/PurchaseOrder/PurchaseOrder.php'); require_once('modules/SalesOrder/SalesOrder.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('modules/Home/language/en_us.lang.php'); require_once('include/database/PearDatabase.php'); require_once('modules/CustomView/CustomView.php'); Modified: vtigercrm/branches/5.0.1/modules/Import/ImportAccount.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportAccount.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportAccount.php Mon Oct 16 00:46:06 2006 @@ -22,11 +22,11 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/ComboUtil.php'); // Account is used to store vtiger_account information. Modified: vtigercrm/branches/5.0.1/modules/Import/ImportContact.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportContact.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportContact.php Mon Oct 16 00:46:06 2006 @@ -18,7 +18,7 @@ ********************************************************************************/ include_once('config.php'); require_once('include/logging.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('modules/Import/UsersLastImport.php'); require_once('include/database/PearDatabase.php'); require_once('include/ComboUtil.php'); @@ -169,7 +169,7 @@ $arr = array(); // check if it already exists - $focus = new Account(); + $focus = new Accounts(); $query = ''; Modified: vtigercrm/branches/5.0.1/modules/Import/ImportLead.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportLead.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportLead.php Mon Oct 16 00:46:06 2006 @@ -26,13 +26,13 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/ComboUtil.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); class ImportLead extends Lead { Modified: vtigercrm/branches/5.0.1/modules/Import/ImportOpportunity.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportOpportunity.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportOpportunity.php Mon Oct 16 00:46:06 2006 @@ -22,11 +22,11 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/ComboUtil.php'); // Get _dom arrays from Database @@ -131,7 +131,7 @@ $arr = array(); // check if it already exists - $focus = new Account(); + $focus = new Accounts(); $query = ''; Modified: vtigercrm/branches/5.0.1/modules/Import/ImportProduct.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportProduct.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportProduct.php Mon Oct 16 00:46:06 2006 @@ -26,14 +26,14 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Products/Products.php'); require_once('include/ComboUtil.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); class ImportProduct extends Product { Modified: vtigercrm/branches/5.0.1/modules/Import/ImportStep2.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportStep2.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportStep2.php Mon Oct 16 00:46:06 2006 @@ -250,27 +250,27 @@ if($_REQUEST['module']=='Accounts') { $tablename='account'; - $focus1=new Account(); + $focus1=new Accounts(); } if($_REQUEST['module']=='Contacts') { $tablename='contactdetails'; - $focus1=new Contact(); + $focus1=new Contacts(); } if($_REQUEST['module']=='Leads') { $tablename='leaddetails'; - $focus1=new Lead(); + $focus1=new Leads(); } if($_REQUEST['module']=='Potentials') { $tablename='potential'; - $focus1=new Potential(); + $focus1=new Potentials(); } if($_REQUEST['module']=='Products') { $tablename='products'; - $focus1=new Product(); + $focus1=new Products(); } Modified: vtigercrm/branches/5.0.1/modules/Import/ImportSteplast.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportSteplast.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportSteplast.php Mon Oct 16 00:46:06 2006 @@ -26,7 +26,7 @@ require_once('modules/Import/UsersLastImport.php'); require_once('modules/Import/parse_utils.php'); require_once('include/ListView/ListView.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/utils/utils.php'); global $mod_strings; Modified: vtigercrm/branches/5.0.1/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Invoice/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Invoice/EditView.php Mon Oct 16 00:46:06 2006 @@ -23,9 +23,9 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('modules/SalesOrder/SalesOrder.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -43,7 +43,7 @@ if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoinvoice') { $quoteid = $_REQUEST['record']; - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToInvoice($focus,$quote_focus,$quoteid); @@ -179,7 +179,7 @@ } if(isset($_REQUEST['opportunity_id']) && $_REQUEST['opportunity_id'] !='') { - $potfocus = new Potential(); + $potfocus = new Potentials(); $potfocus->column_fields['potential_id'] = $_REQUEST['opportunity_id']; $associated_prod = getAssociatedProducts("Potentials",$potfocus,$potfocus->column_fields['potential_id']); @@ -194,8 +194,8 @@ if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && ($_REQUEST['record']=='' || $_REQUEST['convertmode'] == "potentoinvoice")){ - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/branches/5.0.1/modules/Leads/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -22,7 +22,7 @@ } else { -$focus = new Lead(); +$focus = new Leads(); $MODULE = $_REQUEST['module']; $RECORD = $_REQUEST['record']; $currentmodule = $_REQUEST['module']; Modified: vtigercrm/branches/5.0.1/modules/Leads/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/Delete.php Mon Oct 16 00:46:06 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('lead_delete'); -$focus = new Lead(); +$focus = new Leads(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Leads/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/DetailView.php Mon Oct 16 00:46:06 2006 @@ -14,7 +14,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/database/PearDatabase.php'); require_once('include/CustomFieldUtil.php'); require_once('include/utils/utils.php'); @@ -25,7 +25,7 @@ global $app_strings; global $currentModule, $singlepane_view; global $log; -$focus = new Lead(); +$focus = new Leads(); if(isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -24,7 +24,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $leadObj = new Lead(); + $leadObj = new Leads(); $leadObj->retrieve_entity_info($crmid,"Leads"); $leadObj->column_fields[$fieldname] = $fieldvalue; $leadObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Leads/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/EditView.php Mon Oct 16 00:46:06 2006 @@ -14,7 +14,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/database/PearDatabase.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); @@ -23,7 +23,7 @@ global $mod_strings,$app_strings,$theme,$currentModule; -$focus = new Lead(); +$focus = new Leads(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Leads/Lead.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/Lead.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/Lead.php Mon Oct 16 00:46:06 2006 @@ -19,9 +19,9 @@ require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Campaigns/Campaign.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -84,9 +84,9 @@ var $default_order_by = 'lastname'; var $default_sort_order = 'ASC'; - function Lead() { + function Leads() { $this->log = LoggerManager::getLogger('lead'); - $this->log->debug("Entering Lead() method ..."); + $this->log->debug("Entering Leads() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Leads'); $this->log->debug("Exiting Lead method ..."); @@ -230,7 +230,7 @@ global $log, $singlepane_view; $log->debug("Entering get_campaigns(".$id.") method ..."); global $mod_strings; - $focus = new Campaign(); + $focus = new Campaigns(); $button = ''; if($singlepane_view == 'true') @@ -258,7 +258,7 @@ global $mod_strings; require_once('include/RelatedListView.php'); - $focus = new Email(); + $focus = new Emails(); $button = ''; @@ -358,11 +358,11 @@ { global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Product.php'); + require_once('modules/Products/Products.php'); global $mod_strings; global $app_strings; - $focus = new Product(); + $focus = new Products(); $button = ''; Modified: vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); //Getting the Parameters from the ConvertLead Form $id = $_REQUEST["record"]; @@ -39,7 +39,7 @@ $potential_name = $check_unit[0]; //Retrieve info from all the vtiger_tables related to leads -$focus = new Lead(); +$focus = new Leads(); $focus->retrieve_entity_info($id,"Leads"); //get all the lead related columns Modified: vtigercrm/branches/5.0.1/modules/Leads/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/ListView.php Mon Oct 16 00:46:06 2006 @@ -19,7 +19,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -49,7 +49,7 @@ $url_string = ''; // assigning http url string -$focus = new Lead(); +$focus = new Leads(); $smarty = new vtigerCRM_Smarty; $other_text=Array(); Modified: vtigercrm/branches/5.0.1/modules/Leads/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/Save.php Mon Oct 16 00:46:06 2006 @@ -13,14 +13,14 @@ * Contributor(s): ______________________________________. ********************************************************************************/ -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/UserInfoUtil.php'); $local_log =& LoggerManager::getLogger('index'); global $log,$adb; -$focus = new Lead(); +$focus = new Leads(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/Leads/result.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/result.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/result.php Mon Oct 16 00:46:06 2006 @@ -12,7 +12,7 @@ require_once('include/utils/utils.php'); require_once 'Excel/reader.php'; -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/database/PearDatabase.php'); $data = new Spreadsheet_Excel_Reader(); Modified: vtigercrm/branches/5.0.1/modules/Notes/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/Delete.php Mon Oct 16 00:46:06 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('note_delete'); -$focus = new Note(); +$focus = new Notes(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the note."); Modified: vtigercrm/branches/5.0.1/modules/Notes/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/DetailView.php Mon Oct 16 00:46:06 2006 @@ -22,14 +22,14 @@ require_once('data/Tracker.php'); require_once('Smarty_setup.php'); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/upload_file.php'); require_once('include/utils/utils.php'); global $app_strings; global $mod_strings; global $currentModule; -$focus = new Note(); +$focus = new Notes(); if(isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Notes"); Modified: vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Note(); + $modObj = new Notes(); $modObj->retrieve_entity_info($crmid,"Notes"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Notes/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/EditView.php Mon Oct 16 00:46:06 2006 @@ -22,12 +22,12 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/utils/utils.php'); global $app_strings,$app_list_strings,$mod_strings,$theme,$currentModule; -$focus = new Note(); +$focus = new Notes(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['upload_error'] == true) Modified: vtigercrm/branches/5.0.1/modules/Notes/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/ListView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -66,7 +66,7 @@ $url_string = ''; // assigning http url string -$focus = new Note(); +$focus = new Notes(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Notes/Note.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/Note.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/Note.php Mon Oct 16 00:46:06 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Notes/Note.php,v 1.15 2005/03/15 10:01:08 shaw Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Notes/Notes.php,v 1.15 2005/03/15 10:01:08 shaw Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -70,9 +70,9 @@ var $default_order_by = 'modifiedtime'; var $default_sort_order = 'ASC'; - function Note() { + function Notes() { $this->log = LoggerManager::getLogger('notes'); - $this->log->debug("Entering Note() method ..."); + $this->log->debug("Entering Notes() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Notes'); $this->log->debug("Exiting Note method ..."); Modified: vtigercrm/branches/5.0.1/modules/Notes/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/Save.php Mon Oct 16 00:46:06 2006 @@ -21,13 +21,13 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/logging.php'); require_once('include/upload_file.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Note(); +$focus = new Notes(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/Potentials/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ } else { -$focus = new Potential(); +$focus = new Potentials(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/Potentials/Charts.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/Charts.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/Charts.php Mon Oct 16 00:46:06 2006 @@ -19,7 +19,7 @@ require_once('config.php'); require_once('include/logging.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('Image/Graph.php'); require_once('include/utils/utils.php'); require_once('include/utils/GraphUtils.php'); @@ -102,7 +102,7 @@ //Now do the db queries //query for opportunity data that matches $datay and $user - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -441,7 +441,7 @@ //Now do the db queries //query for opportunity data that matches $datay and $user - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -779,7 +779,7 @@ //Now do the db queries //query for opportunity data that matches $datax and $user - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -1057,7 +1057,7 @@ $where .= ")"; } - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by lead source data Modified: vtigercrm/branches/5.0.1/modules/Potentials/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/Delete.php Mon Oct 16 00:46:06 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Potential(); +$focus = new Potentials(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the opportunity."); Modified: vtigercrm/branches/5.0.1/modules/Potentials/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/DetailView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/CustomFieldUtil.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -31,7 +31,7 @@ global $app_strings; global $currentModule, $singlepane_view; -$focus = new Potential(); +$focus = new Potentials(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Potential(); + $modObj = new Potentials(); $modObj->retrieve_entity_info($crmid,"Potentials"); $modObj->column_fields[$fieldname] = $fieldvalue; $_REQUEST[$fieldname] = $fieldvalue; Modified: vtigercrm/branches/5.0.1/modules/Potentials/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/EditView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -30,7 +30,7 @@ global $app_strings; global $mod_strings; global $currentModule; -$focus = new Potential(); +$focus = new Potentials(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/branches/5.0.1/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/ListView.php Mon Oct 16 00:46:06 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -38,7 +38,7 @@ $url_string = ''; // assigning http url string -$focus = new Potential(); +$focus = new Potentials(); $smarty = new vtigerCRM_Smarty(); $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Potentials/ListViewTop.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/ListViewTop.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/ListViewTop.php Mon Oct 16 00:46:06 2006 @@ -28,7 +28,7 @@ $log = LoggerManager::getLogger('top opportunity_list'); $log->debug("Entering getTopPotentials() method ..."); require_once("data/Tracker.php"); - require_once('modules/Potentials/Opportunity.php'); + require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); Modified: vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php Mon Oct 16 00:46:06 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Potentials/Opportunity.php,v 1.65 2005/04/28 08:08:27 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Potentials/Potentials.php,v 1.65 2005/04/28 08:08:27 rank Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -25,10 +25,10 @@ require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -96,7 +96,7 @@ var $default_order_by = 'potentialname'; var $default_sort_order = 'ASC'; - function Potential() { + function Potentials() { $this->log = LoggerManager::getLogger('potential'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Potentials'); @@ -233,7 +233,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; @@ -294,10 +294,10 @@ { global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Product.php'); + require_once('modules/Products/Products.php'); global $app_strings; - $focus = new Product(); + $focus = new Products(); $button = ''; @@ -446,10 +446,10 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quote.php'); + require_once('modules/Quotes/Quotes.php'); if($this->column_fields['account_id']!='') - $focus = new Quote(); + $focus = new Quotes(); $button = ''; if(isPermitted("Quotes",1,"") == 'yes') Modified: vtigercrm/branches/5.0.1/modules/Potentials/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/Save.php Mon Oct 16 00:46:06 2006 @@ -20,13 +20,13 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Potential(); +$focus = new Potentials(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -22,7 +22,7 @@ { global $currentModule; -$focus = new PriceBook(); +$focus = new PriceBooks(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/Delete.php Mon Oct 16 00:46:06 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new PriceBook(); +$focus = new PriceBooks(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/DetailView.php Mon Oct 16 00:46:06 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new PriceBook(); +$focus = new PriceBooks(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new PriceBook(); + $modObj = new PriceBooks(); $modObj->retrieve_entity_info($crmid,"PriceBooks"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php Mon Oct 16 00:46:06 2006 @@ -11,12 +11,12 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$theme,$currentModule; -$focus = new PriceBook(); +$focus = new PriceBooks(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/ListView.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/ListView/ListView.php'); require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); @@ -33,7 +33,7 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$focus = new PriceBook(); +$focus = new PriceBooks(); $other_text=Array(); if(!$_SESSION['lvs'][$currentModule]) Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/PriceBook.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/PriceBook.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/PriceBook.php Mon Oct 16 00:46:06 2006 @@ -51,9 +51,9 @@ /** Constructor which will set the column_fields in this object */ - function PriceBook() { + function PriceBooks() { $this->log =LoggerManager::getLogger('pricebook'); - $this->log->debug("Entering PriceBook() method ..."); + $this->log->debug("Entering PriceBooks() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('PriceBooks'); $this->log->debug("Exiting PriceBook method ..."); @@ -98,8 +98,8 @@ global $log,$singlepane_view; $log->debug("Entering get_pricebook_products(".$id.") method ..."); global $app_strings; - require_once('modules/Products/Product.php'); - $focus = new Product(); + require_once('modules/Products/Products.php'); + $focus = new Products(); $button = ''; Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/Save.php Mon Oct 16 00:46:06 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new PriceBook(); +$focus = new PriceBooks(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/Products/AddProductToPriceBooks.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/AddProductToPriceBooks.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/AddProductToPriceBooks.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/utils/utils.php'); require_once('include/ComboUtil.php'); @@ -30,7 +30,7 @@ $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$focus = new PriceBook(); +$focus = new PriceBooks(); //Retreive the list of PriceBooks $list_query = getListQuery("PriceBooks"); Modified: vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/utils.php'); require_once('include/utils/utils.php'); require_once('include/ComboUtil.php'); @@ -29,7 +29,7 @@ $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$focus = new Product(); +$focus = new Products(); if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; Modified: vtigercrm/branches/5.0.1/modules/Products/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -21,7 +21,7 @@ } else { -$focus = new Product(); +$focus = new Products(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) Modified: vtigercrm/branches/5.0.1/modules/Products/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/Delete.php Mon Oct 16 00:46:06 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new Product(); +$focus = new Products(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Products/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/DetailView.php Mon Oct 16 00:46:06 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new Product(); +$focus = new Products(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { //Display the error message Modified: vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/database/PearDatabase.php'); global $adb,$current_user; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Product(); + $modObj = new Products(); $modObj->retrieve_entity_info($crmid,"Products"); $modObj->column_fields[$fieldname] = $fieldvalue; if($fieldname == 'unit_price')//unit price converted to dollar value while saving Modified: vtigercrm/branches/5.0.1/modules/Products/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/EditView.php Mon Oct 16 00:46:06 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/FormValidationUtil.php'); global $app_strings; @@ -28,7 +28,7 @@ -$focus = new Product(); +$focus = new Products(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['record']!="") Modified: vtigercrm/branches/5.0.1/modules/Products/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/ListView.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/ListView/ListView.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -56,7 +56,7 @@ } $url_string = '&smodule=PRODUCTS'; // assigning http url string -$focus = new Product(); +$focus = new Products(); //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> $sorder = $focus->getSortOrder(); Modified: vtigercrm/branches/5.0.1/modules/Products/Product.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/Product.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/Product.php Mon Oct 16 00:46:06 2006 @@ -72,9 +72,9 @@ /** Constructor which will set the column_fields in this object */ - function Product() { + function Products() { $this->log =LoggerManager::getLogger('product'); - $this->log->debug("Entering Product() method ..."); + $this->log->debug("Entering Products() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Products'); $this->log->debug("Exiting Product method ..."); @@ -301,8 +301,8 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quote.php'); - $focus = new Quote(); + require_once('modules/Quotes/Quotes.php'); + $focus = new Quotes(); $button = ''; if($singlepane_view == 'true') @@ -345,7 +345,7 @@ $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new Order(); + $focus = new PurchaseOrder(); $button = ''; @@ -466,8 +466,8 @@ global $log,$singlepane_view; $log->debug("Entering get_product_pricebooks(".$id.") method ..."); global $mod_strings; - require_once('modules/PriceBooks/PriceBook.php'); - $focus = new PriceBook(); + require_once('modules/PriceBooks/PriceBooks.php'); + $focus = new PriceBooks(); $button = ''; if($singlepane_view == 'true') $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; Modified: vtigercrm/branches/5.0.1/modules/Products/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/Save.php Mon Oct 16 00:46:06 2006 @@ -21,14 +21,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); global $log,$current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); $rate = $rate_symbol['rate']; -$focus = new Product(); +$focus = new Products(); if(isset($_REQUEST['record'])) { $focus->id = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -21,7 +21,7 @@ } else { -$focus = new Order(); +$focus = new PurchaseOrder(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/CreatePDF.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/CreatePDF.php Mon Oct 16 00:46:06 2006 @@ -26,7 +26,7 @@ $id = $_REQUEST['record']; //retreiving the vtiger_invoice info -$focus = new Order(); +$focus = new PurchaseOrder(); $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); $vendor_name = getVendorName($focus->column_fields[vendor_id]); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/Delete.php Mon Oct 16 00:46:06 2006 @@ -24,7 +24,7 @@ require_once('include/logging.php'); $log = LoggerManager::getLogger('order_delete'); -$focus = new Order(); +$focus = new PurchaseOrder(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailView.php Mon Oct 16 00:46:06 2006 @@ -29,7 +29,7 @@ require_once('user_privileges/default_module_view.php'); global $mod_strings,$app_strings,$theme,$currentModule,$singlepane_view; -$focus = new Order(); +$focus = new PurchaseOrder(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Order(); + $modObj = new PurchaseOrder(); $modObj->retrieve_entity_info($crmid,"PurchaseOrder"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/EditView.php Mon Oct 16 00:46:06 2006 @@ -31,7 +31,7 @@ global $app_strings,$mod_strings,$log,$theme,$currentModule; -$focus = new Order(); +$focus = new PurchaseOrder(); $smarty = new vtigerCRM_Smarty(); global $current_user; $currencyid=fetchCurrency($current_user->id); @@ -60,8 +60,8 @@ // Get vtiger_vendor address if vtiger_vendorid is given if(isset($_REQUEST['vendor_id']) && $_REQUEST['vendor_id']!='' && $_REQUEST['record']==''){ - require_once('modules/Vendors/Vendor.php'); - $vend_focus = new Vendor(); + require_once('modules/Vendors/Vendors.php'); + $vend_focus = new Vendors(); $vend_focus->retrieve_entity_info($_REQUEST['vendor_id'],"Vendors"); $focus->column_fields['bill_city']=$vend_focus->column_fields['city']; Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListTopPurchaseOrder.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListTopPurchaseOrder.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListTopPurchaseOrder.php Mon Oct 16 00:46:06 2006 @@ -47,7 +47,7 @@ $viewid = "0"; } } - $focus = new Order(); + $focus = new PurchaseOrder(); $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListView.php Mon Oct 16 00:46:06 2006 @@ -35,7 +35,7 @@ $url_string = '&smodule=PO'; -$focus = new Order(); +$focus = new PurchaseOrder(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/PurchaseOrder.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/PurchaseOrder.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/PurchaseOrder.php Mon Oct 16 00:46:06 2006 @@ -30,7 +30,7 @@ require_once('user_privileges/default_module_view.php'); // Account is used to store vtiger_account information. -class Order extends CRMEntity { +class PurchaseOrder extends CRMEntity { var $log; var $db; @@ -94,7 +94,7 @@ * 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. */ - function Order() { + function PurchaseOrder() { $this->log =LoggerManager::getLogger('PurchaseOrder'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('PurchaseOrder'); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/Save.php Mon Oct 16 00:46:06 2006 @@ -27,7 +27,7 @@ $local_log =& LoggerManager::getLogger('index'); -$focus = new Order(); +$focus = new PurchaseOrder(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/Quotes/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ } else { -$focus = new Quote(); +$focus = new Quotes(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Quotes/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/CreatePDF.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/CreatePDF.php Mon Oct 16 00:46:06 2006 @@ -11,7 +11,7 @@ require_once('include/fpdf/pdf.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/database/PearDatabase.php'); global $adb,$app_strings; @@ -25,7 +25,7 @@ global $products_per_page; $products_per_page="6"; -$focus = new Quote(); +$focus = new Quotes(); $focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); $account_name = getAccountName($focus->column_fields[account_id]); Modified: vtigercrm/branches/5.0.1/modules/Quotes/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/Delete.php Mon Oct 16 00:46:06 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('quote_delete'); -$focus = new Quote(); +$focus = new Quotes(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Quotes/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/DetailView.php Mon Oct 16 00:46:06 2006 @@ -22,13 +22,13 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); global $mod_strings,$app_strings,$currentModule,$theme,$singlepane_view; -$focus = new Quote(); +$focus = new Quotes(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); Modified: vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Quote(); + $modObj = new Quotes(); $modObj->retrieve_entity_info($crmid,"Quotes"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Quotes/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/EditView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ $log->debug("Inside Quote EditView"); -$focus = new Quote(); +$focus = new Quotes(); $smarty = new vtigerCRM_Smarty; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); @@ -70,8 +70,8 @@ // Get Account address if vtiger_account is given if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']==''){ - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/branches/5.0.1/modules/Quotes/ListTopQuotes.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/ListTopQuotes.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/ListTopQuotes.php Mon Oct 16 00:46:06 2006 @@ -19,7 +19,7 @@ function getTopQuotes() { require_once("data/Tracker.php"); - require_once('modules/Quotes/Quote.php'); + require_once('modules/Quotes/Quotes.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); require_once('include/database/PearDatabase.php'); @@ -51,7 +51,7 @@ $viewid = "0"; } } - $focus = new Quote(); + $focus = new Quotes(); $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; Modified: vtigercrm/branches/5.0.1/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/ListView.php Mon Oct 16 00:46:06 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -33,7 +33,7 @@ $url_string = ''; -$focus = new Quote(); +$focus = new Quotes(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Quotes/Quote.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/Quote.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/Quote.php Mon Oct 16 00:46:06 2006 @@ -101,7 +101,7 @@ /** Constructor which will set the column_fields in this object */ - function Quote() { + function Quotes() { $this->log =LoggerManager::getLogger('quote'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Quotes'); Modified: vtigercrm/branches/5.0.1/modules/Quotes/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/Save.php Mon Oct 16 00:46:06 2006 @@ -21,7 +21,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); include("modules/Emails/mail.php"); @@ -34,7 +34,7 @@ $rate = $rate_symbol['rate']; $log->debug("Inside Quote Save"); -$focus = new Quote(); +$focus = new Quotes(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/SalesOrder/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/SalesOrder/EditView.php Mon Oct 16 00:46:06 2006 @@ -23,7 +23,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/SalesOrder/SalesOrder.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -44,7 +44,7 @@ if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoso') { $quoteid = $_REQUEST['record']; - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -80,7 +80,7 @@ $quoteid = $focus->column_fields['quote_id']; $smarty->assign("QUOTE_ID", $focus->column_fields['quote_id']); - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -118,7 +118,7 @@ $focus->column_fields['duedate'] = getDBInsertDateValue($curr_due_date); } $quoteid = $focus->column_fields['quote_id']; - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -161,8 +161,8 @@ // Get Account address if vtiger_account is given if(isset($_REQUEST['account_id']) && $_REQUEST['record']=='' && $_REQUEST['account_id'] != ''){ - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/branches/5.0.1/modules/Users/Authenticate.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/Authenticate.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/Authenticate.php Mon Oct 16 00:46:06 2006 @@ -20,14 +20,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('modules/Users/CreateUserPrivilegeFile.php'); require_once('include/logging.php'); require_once('user_privileges/audit_trail.php'); global $mod_strings; -$focus = new User(); +$focus = new Users(); // Add in defensive code here. $focus->column_fields["user_name"] = to_html($_REQUEST['user_name']); Modified: vtigercrm/branches/5.0.1/modules/Users/ChangePassword.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ChangePassword.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ChangePassword.php Mon Oct 16 00:46:06 2006 @@ -23,7 +23,7 @@ // The popup_picker.html file is used for generating a list from which to find and choose one instance. global $theme; -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); Modified: vtigercrm/branches/5.0.1/modules/Users/CreateUserPrivilegeFile.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/CreateUserPrivilegeFile.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/CreateUserPrivilegeFile.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('config.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/utils/utils.php'); require_once('include/utils/GetUserGroups.php'); @@ -32,7 +32,7 @@ $newbuf .="retrieve_entity_info($userid,"Users"); $userInfo=Array(); $user_focus->column_fields["id"] = ''; @@ -120,7 +120,7 @@ $newbuf .="retrieve_entity_info($userid,"Users"); if($user_focus->is_admin == 'on') { Modified: vtigercrm/branches/5.0.1/modules/Users/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/DetailView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/utils/utils.php'); require_once('include/utils/CommonUtils.php'); require_once('include/utils/UserInfoUtil.php'); @@ -37,7 +37,7 @@ global $app_strings; global $mod_strings; -$focus = new User(); +$focus = new Users(); if(!empty($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],'Users'); Modified: vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -24,7 +24,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $userObj = new User(); + $userObj = new Users(); $userObj->retrieve_entity_info($crmid,"Users"); $userObj->column_fields[$fieldname] = $fieldvalue; $userObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Users/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/EditView.php Mon Oct 16 00:46:06 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/utils/UserInfoUtil.php'); require_once('modules/Users/Forms.php'); require_once('include/database/PearDatabase.php'); @@ -36,7 +36,7 @@ $smarty=new vtigerCRM_Smarty; -$focus = new User(); +$focus = new Users(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $smarty->assign("ID",$_REQUEST['record']); Modified: vtigercrm/branches/5.0.1/modules/Users/ListLoginHistory.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ListLoginHistory.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ListLoginHistory.php Mon Oct 16 00:46:06 2006 @@ -12,7 +12,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/branches/5.0.1/modules/Users/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ListView.php Mon Oct 16 00:46:06 2006 @@ -24,7 +24,7 @@ global $current_language; $mod_strings = return_module_language($current_language,'Users'); $category = getParentTab(); -$focus = new User(); +$focus = new Users(); $smarty = new vtigerCRM_Smarty; $no_of_users=UserCount(); //Retreiving the start value from request Modified: vtigercrm/branches/5.0.1/modules/Users/Logout.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/Logout.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/Logout.php Mon Oct 16 00:46:06 2006 @@ -20,7 +20,7 @@ require_once('include/logging.php'); require_once('database/DatabaseConnection.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('config.php'); require_once('include/db_backup/backup.php'); require_once('include/db_backup/ftp.php'); Modified: vtigercrm/branches/5.0.1/modules/Users/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/Save.php Mon Oct 16 00:46:06 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/logging.php'); require_once('include/utils/UserInfoUtil.php'); $log =& LoggerManager::getLogger('index'); @@ -46,7 +46,7 @@ if (isset($_POST['record']) && !is_admin($current_user) && $_POST['record'] != $current_user->id) echo ("Unauthorized access to user administration."); elseif (!isset($_POST['record']) && !is_admin($current_user)) echo ("Unauthorized access to user administration."); -$focus = new User(); +$focus = new Users(); if(isset($_REQUEST["record"]) && $_REQUEST["record"] != '') { $focus->mode='edit'; Modified: vtigercrm/branches/5.0.1/modules/Users/ShowAuditTrail.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ShowAuditTrail.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ShowAuditTrail.php Mon Oct 16 00:46:06 2006 @@ -12,7 +12,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/AuditTrail.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/branches/5.0.1/modules/Users/ShowHistory.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ShowHistory.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ShowHistory.php Mon Oct 16 00:46:06 2006 @@ -12,11 +12,11 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -#require_once('modules/Users/User.php'); +#require_once('modules/Users/Users.php'); require_once('include/utils/utils.php'); global $app_strings; Modified: vtigercrm/branches/5.0.1/modules/Users/User.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/User.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/User.php Mon Oct 16 00:46:06 2006 @@ -21,7 +21,7 @@ ********************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/User.php,v 1.10 2005/04/19 14:40:48 ray Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/Users.php,v 1.10 2005/04/19 14:40:48 ray Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -33,7 +33,7 @@ require_once('data/CRMEntity.php'); require_once('include/utils/UserInfoUtil.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('data/Tracker.php'); // User is used to store customer information. @@ -155,11 +155,11 @@ * */ - function User() { + function Users() { $this->log = LoggerManager::getLogger('user'); - $this->log->debug("Entering User() method ..."); + $this->log->debug("Entering Users() method ..."); $this->db = new PearDatabase(); - $this->log->debug("Exiting User() method ..."); + $this->log->debug("Exiting Users() method ..."); } Modified: vtigercrm/branches/5.0.1/modules/Users/massChangeStatus.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/massChangeStatus.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/massChangeStatus.php Mon Oct 16 00:46:06 2006 @@ -15,12 +15,12 @@ require_once('include/ComboUtil.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); global $app_list_strings; global $app_strings; global $current_user; -$focus = new Lead(); +$focus = new Leads(); $idlist = $_POST['idlist']; //echo $idlist; Modified: vtigercrm/branches/5.0.1/modules/Users/populatetemplate.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/populatetemplate.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/populatetemplate.php Mon Oct 16 00:46:06 2006 @@ -10,9 +10,9 @@ ********************************************************************************/ //query the specific vtiger_table and then get the data and write the data here require_once('include/database/PearDatabase.php'); -include_once('modules/Contacts/Contact.php'); -include_once('modules/Leads/Lead.php'); -include_once('modules/Users/User.php'); +include_once('modules/Contacts/Contacts.php'); +include_once('modules/Leads/Leads.php'); +include_once('modules/Users/Users.php'); global $log; //download the template file and store it in some specific location @@ -60,11 +60,11 @@ //get the module if($module == 'leads') { - $focus = new Lead(); + $focus = new Leads(); } else { - $focus = new Contact(); + $focus = new Contacts(); } $focus->retrieve_entity_info($recordid,$module); Modified: vtigercrm/branches/5.0.1/modules/Vendors/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ else { global $currentModule; -$focus = new Vendor(); +$focus = new Vendors(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/Vendors/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/Delete.php Mon Oct 16 00:46:06 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new Vendor(); +$focus = new Vendors(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Vendors/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/DetailView.php Mon Oct 16 00:46:06 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new Vendor(); +$focus = new Vendors(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php Mon Oct 16 00:46:06 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Vendor(); + $modObj = new Vendors(); $modObj->retrieve_entity_info($crmid,"Vendors"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Vendors/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/EditView.php Mon Oct 16 00:46:06 2006 @@ -11,12 +11,12 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$theme,$currentModule; -$focus = new Vendor(); +$focus = new Vendors(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/branches/5.0.1/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/ListView.php Mon Oct 16 00:46:06 2006 @@ -11,7 +11,7 @@ require_once('include/database/PearDatabase.php'); require_once('include/database/Postgres8.php'); require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/ListView/ListView.php'); require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); @@ -32,7 +32,7 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$focus = new Vendor(); +$focus = new Vendors(); $other_text = Array(); if(!$_SESSION['lvs'][$currentModule]) Modified: vtigercrm/branches/5.0.1/modules/Vendors/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/Save.php Mon Oct 16 00:46:06 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new Vendor(); +$focus = new Vendors(); setObjectValuesFromRequest(&$focus); $focus->save("Vendors"); Modified: vtigercrm/branches/5.0.1/modules/Vendors/Vendor.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/Vendor.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/Vendor.php Mon Oct 16 00:46:06 2006 @@ -58,9 +58,9 @@ /** Constructor which will set the column_fields in this object */ - function Vendor() { + function Vendors() { $this->log =LoggerManager::getLogger('vendor'); - $this->log->debug("Entering Vendor() method ..."); + $this->log->debug("Entering Vendors() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Vendors'); $this->log->debug("Exiting Vendor method ..."); @@ -75,8 +75,8 @@ global $log,$singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); global $app_strings; - require_once('modules/Products/Product.php'); - $focus = new Product(); + require_once('modules/Products/Products.php'); + $focus = new Products(); $button = ''; @@ -100,7 +100,7 @@ $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new Order(); + $focus = new PurchaseOrder(); $button = ''; @@ -123,8 +123,8 @@ global $log,$singlepane_view; $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - require_once('modules/Contacts/Contact.php'); - $focus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $focus = new Contacts(); $button = ''; if($singlepane_view == 'true') Modified: vtigercrm/branches/5.0.1/modules/Webmails/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Webmails/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Webmails/CallRelatedList.php Mon Oct 16 00:46:06 2006 @@ -11,7 +11,7 @@ global $current_user; require_once('Smarty_setup.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once('data/Tracker.php'); Modified: vtigercrm/branches/5.0.1/modules/Webmails/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Webmails/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Webmails/Save.php Mon Oct 16 00:46:06 2006 @@ -9,7 +9,7 @@ * ********************************************************************************/ -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('modules/Webmails/Webmail.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); @@ -20,7 +20,7 @@ global $current_user; $local_log =& LoggerManager::getLogger('index'); -$focus = new Email(); +$focus = new Emails(); $to_address = explode(";",$_REQUEST['to_list']); $cc_address = explode(";",$_REQUEST['cc_list']); @@ -61,8 +61,8 @@ 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/Contact.php'); - $contact_focus = new 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"); Modified: vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php (original) +++ vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php Mon Oct 16 00:46:06 2006 @@ -175,8 +175,8 @@ function CheckLeadPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -193,8 +193,8 @@ function CheckContactPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -211,8 +211,8 @@ function CheckAccountPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -229,8 +229,8 @@ function CheckTicketPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -247,8 +247,8 @@ function CheckVendorPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -265,8 +265,8 @@ function CheckProductPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -283,8 +283,8 @@ function CheckNotePermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -301,8 +301,8 @@ function CheckSitePermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -319,8 +319,8 @@ function CheckRssPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -340,8 +340,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -365,11 +365,11 @@ function LogintoVtigerCRM($user_name,$password) { global $log; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); $return_access = "FALSE"; - $objuser = new User(); + $objuser = new Users(); if($password != "") { @@ -397,8 +397,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -436,15 +436,15 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Note.php"); - - $focus = new Note(); + require_once("modules/Notes/Notes.php"); + + $focus = new Notes(); if(isPermitted("Notes","EditView") == "yes") { $focus->column_fields['notes_title'] = $subject; @@ -473,17 +473,17 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Product.php"); + require_once("modules/Products/Products.php"); if(isPermitted("Products","EditView") == "yes") { - $focus = new Product(); + $focus = new Products(); $focus->column_fields['productname'] = $productname; $focus->column_fields['productcode'] = $code; $focus->column_fields['website'] = $website; @@ -508,16 +508,16 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Vendor.php"); + require_once("modules/Vendors/Vendors.php"); if(isPermitted("Vendors","EditView" ) == "yes") { - $focus = new Vendor(); + $focus = new Vendors(); $focus->column_fields['vendorname'] = $vendorname; $focus->column_fields['email'] = $email; $focus->column_fields['phone'] = $phone; @@ -547,8 +547,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -591,15 +591,15 @@ 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/User.php"); - $seed_user=new 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/Account.php"); + require_once("modules/Accounts/Accounts.php"); if(isPermitted("Accounts","EditView") == "yes") { - $account=new Account(); + $account=new Accounts(); $account->column_fields['accountname']=$accountname; $account->column_fields['email1']=$email; $account->column_fields['phone']=$phone; @@ -642,15 +642,15 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Lead.php"); - - $focus = new Lead(); + require_once("modules/Leads/Leads.php"); + + $focus = new Leads(); if(isPermitted("Leads","EditView") == "yes") { $focus->column_fields['lastname'] = $lastname; @@ -689,16 +689,16 @@ { global $adb,$log; global $current_user; - require_once('modules/Users/User.php'); - $seed_user = new 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/Contact.php'); + require_once('modules/Contacts/Contacts.php'); if(isPermitted("Contacts","EditView") == "yes") { - $contact = new Contact(); + $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 Modified: vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php (original) +++ vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php Mon Oct 16 00:46:06 2006 @@ -13,7 +13,7 @@ require_once('include/logging.php'); require_once('include/nusoap/nusoap.php'); require_once('include/database/PearDatabase.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); $log = &LoggerManager::getLogger('thunderbirdplugin'); @@ -173,9 +173,9 @@ function SearchContactsByEmail($username,$emailaddress) { - require_once('modules/Contacts/Contact.php'); - - $seed_contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); $output_list = Array(); $response = $seed_contact->get_searchbyemailid($username,$emailaddress); @@ -201,13 +201,13 @@ function track_email($user_name, $contact_ids, $date_sent, $email_subject, $email_body) { global $adb; - require_once('modules/Users/User.php'); - require_once('modules/Emails/Email.php'); - - $seed_user = new User(); + 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 Email(); + $email = new Emails(); //$log->debug($msgdtls['contactid']); $emailbody = str_replace("'", "''", $email_body); $emailsubject = str_replace("'", "''",$email_subject); @@ -241,9 +241,9 @@ { global $adb; global $log; - require_once('modules/Contacts/Contact.php'); - - $seed_contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); $output_list = Array(); $query = $seed_contact->get_contactsforol($username); @@ -332,8 +332,8 @@ $rows_count = $db->getRowCount($result); if($rows_count==0) { - require_once('modules/Accounts/Account.php'); - $account = new Account(); + 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"); @@ -360,10 +360,10 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new 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"); @@ -384,7 +384,7 @@ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); } - $contact = new Contact(); + $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") : ""; @@ -418,10 +418,10 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Leads/Lead.php'); - - $seed_user = new 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"); @@ -442,7 +442,7 @@ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); } - $Lead = new Lead(); + $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") : ""; @@ -478,8 +478,8 @@ { global $adb,$log; $return_access = 'failure'; - require_once('modules/Users/User.php'); - $objuser = new User(); + require_once('modules/Users/Users.php'); + $objuser = new Users(); if($password != "" && $user_name != '') { $objuser->column_fields['user_name'] = $user_name; @@ -511,8 +511,8 @@ function CheckContactPerm($user_name) { global $current_user; - require_once('modules/Users/User.php'); - $seed_user = new 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"); @@ -528,8 +528,8 @@ function CheckContactViewPerm($user_name) { global $current_user,$log; - require_once('modules/Users/User.php'); - $seed_user = new 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"); Modified: vtigercrm/branches/5.0.1/soap/vtigerolservice.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/vtigerolservice.php (original) +++ vtigercrm/branches/5.0.1/soap/vtigerolservice.php Mon Oct 16 00:46:06 2006 @@ -280,9 +280,9 @@ function SearchContactsByEmail($username,$emailaddress) { - require_once('modules/Contacts/Contact.php'); + require_once('modules/Contacts/Contacts.php'); - $seed_contact = new Contact(); + $seed_contact = new Contacts(); $output_list = Array(); $response = $seed_contact->get_searchbyemailid($username,$emailaddress); @@ -308,17 +308,17 @@ function AddMessageToContact($username,$contactid,$msgdtls) { global $adb; - require_once('modules/Users/User.php'); - require_once('modules/Emails/Email.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Emails/Emails.php'); + + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); foreach($msgdtls as $msgdtl) { if(isset($msgdtl)) { - $email = new Email(); + $email = new Emails(); //$log->debug($msgdtls['contactid']); $email_body = str_replace("'", "''", $msgdtl['body']); $email_subject = str_replace("'", "''",$msgdtl['subject']); @@ -356,11 +356,11 @@ function LoginToVtiger($userid,$password) { global $adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); $return_access = "FALSE"; - $objuser = new User(); + $objuser = new Users(); if($password != "") { @@ -385,8 +385,8 @@ function CheckEmailPermission($username) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -403,8 +403,8 @@ function CheckContactPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -421,8 +421,8 @@ function CheckActivityPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -439,12 +439,12 @@ function AddEmailAttachment($emailid,$filedata,$filename,$filesize,$filetype,$username) { global $adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('include/utils/utils.php'); $date_var = date('YmdHis'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $crmid = $adb->getUniqueID("vtiger_crmentity"); @@ -483,9 +483,9 @@ function GetContacts($username) { global $adb; - require_once('modules/Contacts/Contact.php'); - - $seed_contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); $output_list = Array(); $query = $seed_contact->get_contactsforol($username); @@ -564,15 +564,15 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.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"); - $contact = new Contact(); + $contact = new Contacts(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -646,15 +646,15 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.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"); - $contact = new Contact(); + $contact = new Contacts(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -727,15 +727,15 @@ function DeleteContacts($username,$crmid) { global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.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"); - $contact = new Contact(); + $contact = new Contacts(); $contact->id = $crmid; $contact->mark_deleted($contact->id); @@ -760,8 +760,8 @@ $rows_count = $db->getRowCount($result); if($rows_count==0) { - require_once('modules/Accounts/Account.php'); - $account = new Account(); + 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"); @@ -856,10 +856,10 @@ function AddTasks($username,$taskdtls) { global $current_user,$adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -937,10 +937,10 @@ function UpdateTasks($username,$taskdtls) { global $current_user,$adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1022,10 +1022,10 @@ function DeleteTasks($username,$crmid) { global $current_user; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1091,10 +1091,10 @@ function AddClndr($username,$clndrdtls) { global $current_user,$adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1159,10 +1159,10 @@ { global $current_user; global $adb,$log; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1228,10 +1228,10 @@ function DeleteClndr($username,$crmid) { global $current_user; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); Modified: vtigercrm/branches/5.0.1/soap/webforms.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/webforms.php (original) +++ vtigercrm/branches/5.0.1/soap/webforms.php Mon Oct 16 00:46:06 2006 @@ -82,8 +82,8 @@ $assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id'); } - require_once("modules/Leads/Lead.php"); - $focus = new Lead(); + require_once("modules/Leads/Leads.php"); + $focus = new Leads(); $focus->column_fields['lastname'] = $lastname; $focus->column_fields['email'] = $email; $focus->column_fields['phone'] = $phone; @@ -126,8 +126,8 @@ $assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id'); } - require_once('modules/Contacts/Contact.php'); - $focus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $focus = new Contacts(); $focus->column_fields['firstname'] = $first_name; $focus->column_fields['lastname'] = $last_name; Modified: vtigercrm/branches/5.0.1/soap/wordplugin.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/wordplugin.php (original) +++ vtigercrm/branches/5.0.1/soap/wordplugin.php Mon Oct 16 00:46:06 2006 @@ -215,8 +215,8 @@ function get_tickets_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -237,15 +237,15 @@ function get_contacts_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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","index") == "yes") { - require_once('modules/Contacts/Contact.php'); - $contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $contact = new Contacts(); $log->debug($contact->getColumnNames()); return $contact->getColumnNames(); } @@ -261,15 +261,15 @@ function get_accounts_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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("Accounts","index") == "yes") { - require_once('modules/Accounts/Account.php'); - $account = new Account(); + require_once('modules/Accounts/Accounts.php'); + $account = new Accounts(); $log->debug($account->getColumnNames_Acnt()); return $account->getColumnNames_Acnt(); } @@ -285,16 +285,16 @@ function get_leads_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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("Leads","index") == "yes") { - require_once('modules/Leads/Lead.php'); - $lead = new Lead(); + require_once('modules/Leads/Leads.php'); + $lead = new Leads(); $log->debug($lead->getColumnNames_Lead()); return $lead->getColumnNames_Lead(); } @@ -309,12 +309,12 @@ function get_user_columns($user_name, $password) { global $current_user; - require_once('modules/Users/User.php'); - $seed_user=new 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'); - $user = new User(); + $user = new Users(); return $user->getColumnNames_User(); } @@ -323,8 +323,8 @@ function create_session($user_name, $password) { global $adb,$log; - require_once('modules/Users/User.php'); - $objuser = new User(); + require_once('modules/Users/Users.php'); + $objuser = new Users(); if($password != "" && $user_name != '') { $objuser->column_fields['user_name'] = $user_name; From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 03:04:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 07:04:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9628 - in /vtigercrm/branches/5.0.2: ./ include/utils/ install/ modules/Accounts/ modules/Calendar/ modules/Campaigns/ modules/Contacts/ modules/Emails/ modules/Home/ modules/Import/ modules/Invoice/ modules/Leads/ modules/Notes/ modules/Potentials/ modules/PriceBooks/ modules/Products/ modules/PurchaseOrder/ modules/Quotes/ modules/SalesOrder/ modules/Users/ modules/Vendors/ modules/Webmails/ soap/ Message-ID: <20061016070428.557F4787E3D@vtiger.fosslabs.com> Author: richie Date: Mon Oct 16 01:02:11 2006 New Revision: 9628 Log: module name ,File name ,Class name made unique --Jeri Modified: vtigercrm/branches/5.0.2/Popup.php vtigercrm/branches/5.0.2/include/utils/EditViewUtils.php vtigercrm/branches/5.0.2/include/utils/ListViewUtils.php vtigercrm/branches/5.0.2/include/utils/export.php vtigercrm/branches/5.0.2/include/utils/utils.php vtigercrm/branches/5.0.2/index.php vtigercrm/branches/5.0.2/install/5createTables.inc.php vtigercrm/branches/5.0.2/install/populateSeedData.php vtigercrm/branches/5.0.2/modules/Accounts/Account.php vtigercrm/branches/5.0.2/modules/Accounts/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Accounts/Delete.php vtigercrm/branches/5.0.2/modules/Accounts/DetailView.php vtigercrm/branches/5.0.2/modules/Accounts/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Accounts/EditView.php vtigercrm/branches/5.0.2/modules/Accounts/HeadLines.php vtigercrm/branches/5.0.2/modules/Accounts/ListView.php vtigercrm/branches/5.0.2/modules/Accounts/ListViewTop.php vtigercrm/branches/5.0.2/modules/Accounts/Save.php vtigercrm/branches/5.0.2/modules/Accounts/Tickerdetail.php vtigercrm/branches/5.0.2/modules/Calendar/Activity.php vtigercrm/branches/5.0.2/modules/Calendar/RenderRelatedListUI.php vtigercrm/branches/5.0.2/modules/Campaigns/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Campaigns/Campaign.php vtigercrm/branches/5.0.2/modules/Campaigns/Delete.php vtigercrm/branches/5.0.2/modules/Campaigns/DetailView.php vtigercrm/branches/5.0.2/modules/Campaigns/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Campaigns/EditView.php vtigercrm/branches/5.0.2/modules/Campaigns/ListView.php vtigercrm/branches/5.0.2/modules/Campaigns/Save.php vtigercrm/branches/5.0.2/modules/Contacts/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Contacts/Contact.php vtigercrm/branches/5.0.2/modules/Contacts/Delete.php vtigercrm/branches/5.0.2/modules/Contacts/DetailView.php vtigercrm/branches/5.0.2/modules/Contacts/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Contacts/EditView.php vtigercrm/branches/5.0.2/modules/Contacts/ListView.php vtigercrm/branches/5.0.2/modules/Contacts/Save.php vtigercrm/branches/5.0.2/modules/Emails/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Emails/ChooseEmail.php vtigercrm/branches/5.0.2/modules/Emails/Delete.php vtigercrm/branches/5.0.2/modules/Emails/DetailView.php vtigercrm/branches/5.0.2/modules/Emails/EditView.php vtigercrm/branches/5.0.2/modules/Emails/Email.php vtigercrm/branches/5.0.2/modules/Emails/EmailsAjax.php vtigercrm/branches/5.0.2/modules/Emails/ListView.php vtigercrm/branches/5.0.2/modules/Emails/Save.php vtigercrm/branches/5.0.2/modules/Emails/mailsend.php vtigercrm/branches/5.0.2/modules/Emails/sendmail.php vtigercrm/branches/5.0.2/modules/Home/UnifiedSearch.php vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php vtigercrm/branches/5.0.2/modules/Import/ImportContact.php vtigercrm/branches/5.0.2/modules/Import/ImportLead.php vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php vtigercrm/branches/5.0.2/modules/Import/ImportStep2.php vtigercrm/branches/5.0.2/modules/Import/ImportSteplast.php vtigercrm/branches/5.0.2/modules/Invoice/EditView.php vtigercrm/branches/5.0.2/modules/Leads/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Leads/Delete.php vtigercrm/branches/5.0.2/modules/Leads/DetailView.php vtigercrm/branches/5.0.2/modules/Leads/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Leads/EditView.php vtigercrm/branches/5.0.2/modules/Leads/Lead.php vtigercrm/branches/5.0.2/modules/Leads/LeadConvertToEntities.php vtigercrm/branches/5.0.2/modules/Leads/ListView.php vtigercrm/branches/5.0.2/modules/Leads/Save.php vtigercrm/branches/5.0.2/modules/Leads/result.php vtigercrm/branches/5.0.2/modules/Notes/Delete.php vtigercrm/branches/5.0.2/modules/Notes/DetailView.php vtigercrm/branches/5.0.2/modules/Notes/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Notes/EditView.php vtigercrm/branches/5.0.2/modules/Notes/ListView.php vtigercrm/branches/5.0.2/modules/Notes/Note.php vtigercrm/branches/5.0.2/modules/Notes/Save.php vtigercrm/branches/5.0.2/modules/Potentials/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Potentials/Charts.php vtigercrm/branches/5.0.2/modules/Potentials/Delete.php vtigercrm/branches/5.0.2/modules/Potentials/DetailView.php vtigercrm/branches/5.0.2/modules/Potentials/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Potentials/EditView.php vtigercrm/branches/5.0.2/modules/Potentials/ListView.php vtigercrm/branches/5.0.2/modules/Potentials/ListViewTop.php vtigercrm/branches/5.0.2/modules/Potentials/Opportunity.php vtigercrm/branches/5.0.2/modules/Potentials/Save.php vtigercrm/branches/5.0.2/modules/PriceBooks/CallRelatedList.php vtigercrm/branches/5.0.2/modules/PriceBooks/Delete.php vtigercrm/branches/5.0.2/modules/PriceBooks/DetailView.php vtigercrm/branches/5.0.2/modules/PriceBooks/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/PriceBooks/EditView.php vtigercrm/branches/5.0.2/modules/PriceBooks/ListView.php vtigercrm/branches/5.0.2/modules/PriceBooks/PriceBook.php vtigercrm/branches/5.0.2/modules/PriceBooks/Save.php vtigercrm/branches/5.0.2/modules/Products/AddProductToPriceBooks.php vtigercrm/branches/5.0.2/modules/Products/AddProductsToPriceBook.php vtigercrm/branches/5.0.2/modules/Products/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Products/Delete.php vtigercrm/branches/5.0.2/modules/Products/DetailView.php vtigercrm/branches/5.0.2/modules/Products/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Products/EditView.php vtigercrm/branches/5.0.2/modules/Products/ListView.php vtigercrm/branches/5.0.2/modules/Products/Product.php vtigercrm/branches/5.0.2/modules/Products/Save.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/CallRelatedList.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/CreatePDF.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/Delete.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailView.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/EditView.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListTopPurchaseOrder.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListView.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/PurchaseOrder.php vtigercrm/branches/5.0.2/modules/PurchaseOrder/Save.php vtigercrm/branches/5.0.2/modules/Quotes/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Quotes/CreatePDF.php vtigercrm/branches/5.0.2/modules/Quotes/Delete.php vtigercrm/branches/5.0.2/modules/Quotes/DetailView.php vtigercrm/branches/5.0.2/modules/Quotes/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Quotes/EditView.php vtigercrm/branches/5.0.2/modules/Quotes/ListTopQuotes.php vtigercrm/branches/5.0.2/modules/Quotes/ListView.php vtigercrm/branches/5.0.2/modules/Quotes/Quote.php vtigercrm/branches/5.0.2/modules/Quotes/Save.php vtigercrm/branches/5.0.2/modules/SalesOrder/EditView.php vtigercrm/branches/5.0.2/modules/Users/Authenticate.php vtigercrm/branches/5.0.2/modules/Users/ChangePassword.php vtigercrm/branches/5.0.2/modules/Users/CreateUserPrivilegeFile.php vtigercrm/branches/5.0.2/modules/Users/DetailView.php vtigercrm/branches/5.0.2/modules/Users/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Users/EditView.php vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php vtigercrm/branches/5.0.2/modules/Users/ListView.php vtigercrm/branches/5.0.2/modules/Users/Logout.php vtigercrm/branches/5.0.2/modules/Users/Save.php vtigercrm/branches/5.0.2/modules/Users/ShowAuditTrail.php vtigercrm/branches/5.0.2/modules/Users/ShowHistory.php vtigercrm/branches/5.0.2/modules/Users/User.php vtigercrm/branches/5.0.2/modules/Users/massChangeStatus.php vtigercrm/branches/5.0.2/modules/Users/populatetemplate.php vtigercrm/branches/5.0.2/modules/Vendors/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Vendors/Delete.php vtigercrm/branches/5.0.2/modules/Vendors/DetailView.php vtigercrm/branches/5.0.2/modules/Vendors/DetailViewAjax.php vtigercrm/branches/5.0.2/modules/Vendors/EditView.php vtigercrm/branches/5.0.2/modules/Vendors/ListView.php vtigercrm/branches/5.0.2/modules/Vendors/Save.php vtigercrm/branches/5.0.2/modules/Vendors/Vendor.php vtigercrm/branches/5.0.2/modules/Webmails/CallRelatedList.php vtigercrm/branches/5.0.2/modules/Webmails/Save.php vtigercrm/branches/5.0.2/soap/firefoxtoolbar.php vtigercrm/branches/5.0.2/soap/thunderbirdplugin.php vtigercrm/branches/5.0.2/soap/vtigerolservice.php vtigercrm/branches/5.0.2/soap/webforms.php vtigercrm/branches/5.0.2/soap/wordplugin.php Modified: vtigercrm/branches/5.0.2/Popup.php ============================================================================== --- vtigercrm/branches/5.0.2/Popup.php (original) +++ vtigercrm/branches/5.0.2/Popup.php Mon Oct 16 01:02:11 2006 @@ -33,8 +33,8 @@ switch($currentModule) { case 'Contacts': - require_once("modules/$currentModule/Contact.php"); - $focus = new Contact(); + require_once("modules/$currentModule/Contacts.php"); + $focus = new Contacts(); $log = LoggerManager::getLogger('contact_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom'); $comboFieldArray = getComboArray($comboFieldNames); @@ -47,8 +47,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","",""); break; case 'Campaigns': - require_once("modules/$currentModule/Campaign.php"); - $focus = new Campaign(); + require_once("modules/$currentModule/Campaigns.php"); + $focus = new Campaigns(); $log = LoggerManager::getLogger('campaign_list'); $comboFieldNames = Array('campaignstatus'=>'campaignstatus_dom', 'campaigntype'=>'campaigntype_dom'); @@ -60,8 +60,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','campaignname','true','basic',$popuptype,"","",""); break; case 'Accounts': - require_once("modules/$currentModule/Account.php"); - $focus = new Account(); + require_once("modules/$currentModule/Accounts.php"); + $focus = new Accounts(); $log = LoggerManager::getLogger('account_list'); $comboFieldNames = Array('accounttype'=>'account_type_dom' ,'industry'=>'industry_dom'); @@ -74,8 +74,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','accountname','true','basic',$popuptype,"","",""); break; case 'Leads': - require_once("modules/$currentModule/Lead.php"); - $focus = new Lead(); + require_once("modules/$currentModule/Leads.php"); + $focus = new Leads(); $log = LoggerManager::getLogger('contact_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom' ,'leadstatus'=>'leadstatus_dom' @@ -91,8 +91,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","",""); break; case 'Potentials': - require_once("modules/$currentModule/Opportunity.php"); - $focus = new Potential(); + require_once("modules/$currentModule/Potentials.php"); + $focus = new Potentials(); $log = LoggerManager::getLogger('potential_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom' ,'opportunity_type'=>'opportunity_type_dom' @@ -104,8 +104,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','potentialname','true','basic',$popuptype,"","",""); break; case 'Quotes': - require_once("modules/$currentModule/Quote.php"); - $focus = new Quote(); + require_once("modules/$currentModule/Quotes.php"); + $focus = new Quotes(); $log = LoggerManager::getLogger('quotes_list'); $comboFieldNames = Array('quotestage'=>'quotestage_dom'); $comboFieldArray = getComboArray($comboFieldNames); @@ -121,8 +121,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','subject','true','basic',$popuptype,"","",""); break; case 'Products': - require_once("modules/$currentModule/Product.php"); - $focus = new Product(); + require_once("modules/$currentModule/Products.php"); + $focus = new Products(); $smarty->assign("SINGLE_MOD",'Product'); if(isset($_REQUEST['curr_row'])) { @@ -135,8 +135,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','productname','true','basic',$popuptype,"","",""); break; case 'Vendors': - require_once("modules/$currentModule/Vendor.php"); - $focus = new Vendor(); + require_once("modules/$currentModule/Vendors.php"); + $focus = new Vendors(); $smarty->assign("SINGLE_MOD",'Vendor'); $alphabetical = AlphabeticalSearch($currentModule,'Popup','vendorname','true','basic',$popuptype,"","",""); break; @@ -150,15 +150,15 @@ break; case 'PurchaseOrder': require_once("modules/$currentModule/PurchaseOrder.php"); - $focus = new Order(); + $focus = new PurchaseOrder(); $smarty->assign("SINGLE_MOD",'PurchaseOrder'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); $alphabetical = AlphabeticalSearch($currentModule,'Popup','subject','true','basic',$popuptype,"","",""); break; case 'PriceBooks': - require_once("modules/$currentModule/PriceBook.php"); - $focus = new PriceBook(); + require_once("modules/$currentModule/PriceBooks.php"); + $focus = new PriceBooks(); $smarty->assign("SINGLE_MOD",'PriceBook'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); @@ -175,8 +175,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','bookname','true','basic',$popuptype,"","",""); break; case 'Users': - require_once("modules/$currentModule/User.php"); - $focus = new User(); + require_once("modules/$currentModule/Users.php"); + $focus = new Users(); $smarty->assign("SINGLE_MOD",'Users'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); Modified: vtigercrm/branches/5.0.2/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.2/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.2/include/utils/EditViewUtils.php Mon Oct 16 01:02:11 2006 @@ -863,15 +863,15 @@ $nemail=count($realid); if ($pmodule=='Accounts'){ - require_once('modules/Accounts/Account.php'); - $myfocus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $myfocus = new Accounts(); $myfocus->retrieve_entity_info($entityid,"Accounts"); $fullname=br2nl($myfocus->column_fields['accountname']); $account_selected = 'selected'; } elseif ($pmodule=='Contacts'){ - require_once('modules/Contacts/Contact.php'); - $myfocus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $myfocus = new Contacts(); $myfocus->retrieve_entity_info($entityid,"Contacts"); $fname=br2nl($myfocus->column_fields['firstname']); $lname=br2nl($myfocus->column_fields['lastname']); @@ -879,8 +879,8 @@ $contact_selected = 'selected'; } elseif ($pmodule=='Leads'){ - require_once('modules/Leads/Lead.php'); - $myfocus = new Lead(); + require_once('modules/Leads/Leads.php'); + $myfocus = new Leads(); $myfocus->retrieve_entity_info($entityid,"Leads"); $fname=br2nl($myfocus->column_fields['firstname']); $lname=br2nl($myfocus->column_fields['lastname']); Modified: vtigercrm/branches/5.0.2/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.2/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.2/include/utils/ListViewUtils.php Mon Oct 16 01:02:11 2006 @@ -1385,8 +1385,8 @@ } elseif($popuptype == "specific_account_address") { - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($entity_id,"Accounts"); $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']).'"); window.close()\'>'.$temp_val.''; @@ -1394,8 +1394,8 @@ } elseif($popuptype == "specific_contact_account_address") { - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($entity_id,"Accounts"); $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']).'"); window.close()\'>'.$temp_val.''; @@ -1405,8 +1405,8 @@ elseif($popuptype == "specific_potential_account_address") { $acntid = $adb->query_result($list_result,$list_result_count,"accountid"); - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($acntid,"Accounts"); $account_name = getAccountName($acntid); @@ -1461,8 +1461,8 @@ } elseif($popuptype == "specific_vendor_address") { - require_once('modules/Vendors/Vendor.php'); - $acct_focus = new Vendor(); + require_once('modules/Vendors/Vendors.php'); + $acct_focus = new Vendors(); $acct_focus->retrieve_entity_info($entity_id,"Vendors"); $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']).'"); window.close()\'>'.$temp_val.''; Modified: vtigercrm/branches/5.0.2/include/utils/export.php ============================================================================== --- vtigercrm/branches/5.0.2/include/utils/export.php (original) +++ vtigercrm/branches/5.0.2/include/utils/export.php Mon Oct 16 01:02:11 2006 @@ -20,23 +20,23 @@ require_once('config.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Leads/Lead.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Leads/Leads.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Emails/Emails.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Users/User.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Users/Users.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/UserInfoUtil.php'); global $allow_exports; session_start(); -$current_user = new User(); +$current_user = new Users(); if(isset($_SESSION['authenticated_user_id'])) { Modified: vtigercrm/branches/5.0.2/include/utils/utils.php ============================================================================== --- vtigercrm/branches/5.0.2/include/utils/utils.php (original) +++ vtigercrm/branches/5.0.2/include/utils/utils.php Mon Oct 16 01:02:11 2006 @@ -2048,9 +2048,9 @@ $log->debug("Entering getEmailParentsList(".$module.",".$id.") method ..."); global $adb; if($module == 'Contacts') - $focus = new Contact(); + $focus = new Contacts(); if($module == 'Leads') - $focus = new Lead(); + $focus = new Leads(); $focus->retrieve_entity_info($id,$module); $fieldid = 0; Modified: vtigercrm/branches/5.0.2/index.php ============================================================================== --- vtigercrm/branches/5.0.2/index.php (original) +++ vtigercrm/branches/5.0.2/index.php Mon Oct 16 01:02:11 2006 @@ -101,7 +101,7 @@ set_default_config($default_config_values); require_once('include/logging.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); global $currentModule; @@ -352,7 +352,7 @@ $lang_crm = (isset($_SESSION['authenticated_user_language'])) ? $_SESSION['authenticated_user_language'] : ""; $GLOBALS['request_string'] = "&module=$module&action=$action&record=$record&lang_crm=$lang_crm"; -$current_user = new User(); +$current_user = new Users(); if($use_current_login) { @@ -432,90 +432,22 @@ // Use the record to track the viewing. // todo - Have a record of modules and thier primary object names. //Getting the actual module - $actualModule = $currentModule; switch($currentModule) { - case 'Leads': - require_once("modules/$currentModule/Lead.php"); - $focus = new Lead(); - break; - case 'Contacts': - require_once("modules/$currentModule/Contact.php"); - $focus = new Contact(); - break; - case 'Accounts': - require_once("modules/$currentModule/Account.php"); - $focus = new Account(); - break; - case 'Potentials': - require_once("modules/$currentModule/Opportunity.php"); - $focus = new Potential(); - break; case 'Calendar': require_once("modules/$currentModule/Activity.php"); $focus = new Activity(); break; - case 'Notes': - require_once("modules/$currentModule/Note.php"); - $focus = new Note(); - break; - case 'Emails': - require_once("modules/$currentModule/Email.php"); - $focus = new Email(); - break; - case 'Users': - require_once("modules/$currentModule/User.php"); - $focus = new User(); - break; - case 'Products': - require_once("modules/$currentModule/Product.php"); - $focus = new Product(); - break; - case 'Vendors': - require_once("modules/$currentModule/Vendor.php"); - $focus = new Vendor(); - $actualModule = 'Vendors'; - break; - case 'PriceBooks': - require_once("modules/$currentModule/PriceBook.php"); - $focus = new PriceBook(); - $actualModule = 'PriceBooks'; - break; - case 'HelpDesk': - require_once("modules/$currentModule/HelpDesk.php"); - $focus = new HelpDesk(); - break; - case 'Faq': - require_once("modules/$currentModule/Faq.php"); - $focus = new Faq(); - break; - case 'Quotes': - require_once("modules/$currentModule/Quote.php"); - $focus = new Quote(); - break; - case 'PurchaseOrder': - require_once("modules/$currentModule/PurchaseOrder.php"); - $focus = new Order(); - break; - case 'SalesOrder': - require_once("modules/$currentModule/SalesOrder.php"); - $focus = new SalesOrder(); - break; - - case 'Invoice': - require_once("modules/$currentModule/Invoice.php"); - $focus = new Invoice(); - break; - case 'Campaigns': - require_once("modules/$currentModule/Campaign.php"); - $focus = new Campaign(); + default: + require_once("modules/$currentModule/$currentModule.php"); + $focus = new $currentModule(); break; } if(isset($_REQUEST['record']) && $_REQUEST['record']!='' && $_REQUEST["module"] != "Webmails") { // Only track a viewing if the record was retrieved. - $focus->track_view($current_user->id, $actualModule,$_REQUEST['record']); + $focus->track_view($current_user->id, $currentModule,$_REQUEST['record']); } } Modified: vtigercrm/branches/5.0.2/install/5createTables.inc.php ============================================================================== --- vtigercrm/branches/5.0.2/install/5createTables.inc.php (original) +++ vtigercrm/branches/5.0.2/install/5createTables.inc.php Mon Oct 16 01:02:11 2006 @@ -22,14 +22,14 @@ require_once('config.php'); require_once('include/database/PearDatabase.php'); require_once('include/logging.php'); -require_once('modules/Leads/Lead.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Leads/Leads.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Users/User.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Users/Users.php'); require_once('modules/Import/ImportMap.php'); require_once('modules/Import/UsersLastImport.php'); require_once('modules/Users/LoginHistory.php'); @@ -66,7 +66,7 @@ global $default_user_is_admin; // create default admin user - $user = new User(); + $user = new Users(); $user->column_fields["last_name"] = 'Administrator'; $user->column_fields["user_name"] = 'admin'; $user->column_fields["status"] = 'Active'; @@ -122,7 +122,7 @@ //Creating the Standard User - $user = new User(); + $user = new Users(); $user->column_fields["last_name"] = 'StandardUser'; $user->column_fields["user_name"] = 'standarduser'; $user->column_fields["is_admin"] = 'off'; Modified: vtigercrm/branches/5.0.2/install/populateSeedData.php ============================================================================== --- vtigercrm/branches/5.0.2/install/populateSeedData.php (original) +++ vtigercrm/branches/5.0.2/install/populateSeedData.php Mon Oct 16 01:02:11 2006 @@ -19,29 +19,29 @@ require_once('config.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('modules/Contacts/contactSeedData.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Campaigns/Campaign.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); require_once('include/language/en_us.lang.php'); require_once('include/ComboStrings.php'); require_once('include/ComboUtil.php'); -require_once('modules/Products/Product.php'); -require_once('modules/PriceBooks/PriceBook.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Products/Products.php'); +require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/Vendors/Vendors.php'); require_once('modules/Faq/Faq.php'); require_once('modules/HelpDesk/HelpDesk.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Quotes/Quotes.php'); require_once('modules/SalesOrder/SalesOrder.php'); require_once('modules/PurchaseOrder/PurchaseOrder.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/InventoryUtils.php'); //Included to save inventory related products in demo data global $first_name_array; @@ -113,7 +113,7 @@ } // Look up the user id for the assigned user -$seed_user = new User(); +$seed_user = new Users(); //$adb->println("PSD assignname=".$assigned_user_name); @@ -121,7 +121,7 @@ global $current_user; -$current_user = new User(); +$current_user = new Users(); $result = $current_user->retrieve_entity_info($assigned_user_id,'Users'); $tagkey = 1; @@ -147,7 +147,7 @@ $account_name = $company_name_array[$i]; // Create new accounts. - $account = new Account(); + $account = new Accounts(); $account->column_fields["accountname"] = $account_name; $account->column_fields["phone"] = create_phone_number(); $account->column_fields["assigned_user_id"] = $assigned_user_id; @@ -196,7 +196,7 @@ //Create new opportunities - $opp = new Potential(); + $opp = new Potentials(); $opp->column_fields["assigned_user_id"] = $assigned_user_id; $opp->column_fields["potentialname"] = $account_name." - 1000 units"; @@ -235,7 +235,7 @@ for($i=0; $i<10; $i++) { - $contact = new Contact(); + $contact = new Contacts(); $contact->column_fields["firstname"] = ucfirst(strtolower($first_name_array[$i])); $contact->column_fields["lastname"] = ucfirst(strtolower($last_name_array[$i])); $contact->column_fields["assigned_user_id"] = $assigned_user_id; @@ -327,7 +327,7 @@ $company_count=0; for($i=0; $i<10; $i++) { - $lead = new Lead(); + $lead = new Leads(); $lead->column_fields["firstname"] = ucfirst(strtolower($first_name_array[$i])); $lead->column_fields["lastname"] = ucfirst(strtolower($last_name_array[$i])); @@ -404,7 +404,7 @@ //Populating Vendor Data for($i=0; $i<10; $i++) { - $vendor = new Vendor(); + $vendor = new Vendors(); $vendor->column_fields["vendorname"] = ucfirst(strtolower($first_name_array[$i])); $vendor->column_fields["phone"] = create_phone_number(); $vendor->column_fields["email"] = strtolower($vendor->column_fields["vendorname"])."@company.com"; @@ -442,7 +442,7 @@ .jpeg###","product7.jpeg###product8.jpeg###product9.jpeg###product10.jpeg###"); for($i=0; $i<10; $i++) { - $product = new Product(); + $product = new Products(); if($i>4) { $parent_key = array_rand($opportunity_ids); @@ -579,7 +579,7 @@ $validtill_array = array ("2006-09-21", "2006-10-29", "2006-12-11", "2006-10-09", "2006-11-18"); for($i=0;$i<5;$i++) { - $quote = new Quote(); + $quote = new Quotes(); $quote->column_fields["assigned_user_id"] = $assigned_user_id; $account_key = array_rand($account_ids); @@ -730,7 +730,7 @@ for($i=0;$i<5;$i++) { - $po = new Order(); + $po = new PurchaseOrder(); $po->column_fields["assigned_user_id"] = $assigned_user_id; $vendor_key = array_rand($vendor_ids); @@ -896,7 +896,7 @@ for($i=0;$i<5;$i++) { - $email = new Email(); + $email = new Emails(); $email->column_fields["assigned_user_id"] = $assigned_user_id; @@ -923,7 +923,7 @@ //$num_array = array(0,1,2,3,4); for($i=0;$i<12;$i++) { - $pricebook = new PriceBook(); + $pricebook = new PriceBooks(); $rand = array_rand($num_array); $pricebook->column_fields["bookname"] = $PB_array[$i]; @@ -940,7 +940,7 @@ for($i=0;$i<7;$i++) { - $notes = new Note(); + $notes = new Notes(); $rand = array_rand($num_array); $contact_key = array_rand($contact_ids); @@ -1118,7 +1118,7 @@ //$expected_response = Array(null,null,null); for($i=0;$icolumn_fields["campaignname"] = $campaign_name; $campaign->column_fields["campaigntype"] = $campaign_type_array[$i]; Modified: vtigercrm/branches/5.0.2/modules/Accounts/Account.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/Account.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/Account.php Mon Oct 16 01:02:11 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Accounts/Account.php,v 1.53 2005/04/28 08:06:45 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Accounts/Accounts.php,v 1.53 2005/04/28 08:06:45 rank Exp $ * Description: Defines the Account SugarBean Account entity with the necessary * methods and variables. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. @@ -26,11 +26,11 @@ require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -96,7 +96,7 @@ var $default_order_by = 'accountname'; var $default_sort_order = 'ASC'; - function Account() { + function Accounts() { $this->log =LoggerManager::getLogger('account'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Accounts'); @@ -147,7 +147,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $mod_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; if(isPermitted("Contacts",1,"") == 'yes') @@ -191,7 +191,7 @@ $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; - $focus = new Potential(); + $focus = new Potentials(); $button = ''; if(isPermitted("Potentials",1,"") == 'yes') @@ -388,9 +388,9 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quote.php'); - - $focus = new Quote(); + require_once('modules/Quotes/Quotes.php'); + + $focus = new Quotes(); $button = ''; if(isPermitted("Quotes",1,"") == 'yes') @@ -627,10 +627,10 @@ { global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Product.php'); + require_once('modules/Products/Products.php'); global $app_strings; - $focus = new Product(); + $focus = new Products(); $button = ''; Modified: vtigercrm/branches/5.0.2/modules/Accounts/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -22,7 +22,7 @@ } else { -$focus = new Account(); +$focus = new Accounts(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.2/modules/Accounts/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/Delete.php Mon Oct 16 01:02:11 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Account(); +$focus = new Accounts(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.2/modules/Accounts/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/DetailView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ global $app_list_strings; global $log, $currentModule, $singlepane_view; -$focus = new Account(); +$focus = new Accounts(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Accounts"); $focus->id = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.2/modules/Accounts/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $acntObj = new Account(); + $acntObj = new Accounts(); $acntObj->retrieve_entity_info($crmid,"Accounts"); $acntObj->column_fields[$fieldname] = $fieldvalue; if($fieldname == 'annual_revenue')//annual revenue converted to dollar value while saving Modified: vtigercrm/branches/5.0.2/modules/Accounts/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/EditView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -31,7 +31,7 @@ global $app_strings,$mod_strings,$currentModule,$theme; $smarty=new vtigerCRM_Smarty; -$focus = new Account(); +$focus = new Accounts(); if(isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.2/modules/Accounts/HeadLines.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/HeadLines.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/HeadLines.php Mon Oct 16 01:02:11 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -include("modules/Accounts/Account.php"); +include("modules/Accounts/Accounts.php"); include("getCompanyProfile.php"); $variable = $_REQUEST['tickersymbol']; $url = "http://finance.yahoo.com/q?s=".$variable; Modified: vtigercrm/branches/5.0.2/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/ListView.php Mon Oct 16 01:02:11 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -43,7 +43,7 @@ $url_string = ''; -$focus = new Account(); +$focus = new Accounts(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.2/modules/Accounts/ListViewTop.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/ListViewTop.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/ListViewTop.php Mon Oct 16 01:02:11 2006 @@ -28,7 +28,7 @@ $log = LoggerManager::getLogger('top accounts_list'); $log->debug("Entering getTopAccounts() method ..."); require_once("data/Tracker.php"); - require_once('modules/Potentials/Opportunity.php'); + require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); global $app_strings; Modified: vtigercrm/branches/5.0.2/modules/Accounts/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/Save.php Mon Oct 16 01:02:11 2006 @@ -21,14 +21,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/logging.php'); //require_once('database/DatabaseConnection.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); global $log; -$focus = new Account(); +$focus = new Accounts(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.2/modules/Accounts/Tickerdetail.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Accounts/Tickerdetail.php (original) +++ vtigercrm/branches/5.0.2/modules/Accounts/Tickerdetail.php Mon Oct 16 01:02:11 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once("modules/Accounts/Account.php"); +require_once("modules/Accounts/Accounts.php"); require_once("getCompanyProfile.php"); $variable = $_REQUEST['tickersymbol']; $url = "http://moneycentral.msn.com/investor/research/profile.asp?Symbol=".trim($variable); Modified: vtigercrm/branches/5.0.2/modules/Calendar/Activity.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Calendar/Activity.php (original) +++ vtigercrm/branches/5.0.2/modules/Calendar/Activity.php Mon Oct 16 01:02:11 2006 @@ -154,7 +154,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; @@ -177,7 +177,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new User(); + $focus = new Users(); $button = ''; @@ -395,8 +395,8 @@ global $log,$adb; $log->debug("Entering get_tasksforol(".$username.") method ..."); global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -447,8 +447,8 @@ global $log,$adb; $log->debug("Entering get_calendarsforol(".$user_name.") method ..."); global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); Modified: vtigercrm/branches/5.0.2/modules/Calendar/RenderRelatedListUI.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Calendar/RenderRelatedListUI.php (original) +++ vtigercrm/branches/5.0.2/modules/Calendar/RenderRelatedListUI.php Mon Oct 16 01:02:11 2006 @@ -10,8 +10,8 @@ ********************************************************************************/ require_once('include/RelatedListView.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/UserInfoUtil.php'); // functions added for group calendar -Jaguar Modified: vtigercrm/branches/5.0.2/modules/Campaigns/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Campaigns/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Campaigns/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Campaigns/Campaign.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 @@ -23,7 +23,7 @@ } else { -$focus = new Campaign(); +$focus = new Campaigns(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.2/modules/Campaigns/Campaign.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Campaigns/Campaign.php (original) +++ vtigercrm/branches/5.0.2/modules/Campaigns/Campaign.php Mon Oct 16 01:02:11 2006 @@ -18,8 +18,8 @@ require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); require_once('include/utils/utils.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Leads/Leads.php'); require_once('user_privileges/default_module_view.php'); class Campaign extends CRMEntity { @@ -66,7 +66,7 @@ 'Campaign Type'=>'campaigntype', ); - function Campaign() + function Campaigns() { $this->log =LoggerManager::getLogger('campaign'); $this->db = new PearDatabase(); @@ -120,7 +120,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $mod_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; if($singlepane_view == 'true') @@ -145,7 +145,7 @@ $log->debug("Entering get_leads(".$id.") method ..."); global $mod_strings; - $focus = new Lead(); + $focus = new Leads(); $button = ''; if($singlepane_view == 'true') @@ -169,7 +169,7 @@ $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; - $focus = new Potential(); + $focus = new Potentials(); $button = ''; if($singlepane_view == 'true') Modified: vtigercrm/branches/5.0.2/modules/Campaigns/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Campaigns/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Campaigns/Delete.php Mon Oct 16 01:02:11 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('ticket_delete'); -$focus = new Campaign(); +$focus = new Campaigns(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.2/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Campaigns/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Campaigns/DetailView.php Mon Oct 16 01:02:11 2006 @@ -11,12 +11,12 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Campaigns/Campaign.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'); -$focus = new Campaign(); +$focus = new Campaigns(); if(isset($_REQUEST['record']) && $_REQUEST['record']!= null ) { Modified: vtigercrm/branches/5.0.2/modules/Campaigns/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Campaigns/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Campaigns/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Campaign(); + $modObj = new Campaigns(); $modObj->retrieve_entity_info($crmid,"Campaigns"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/Campaigns/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Campaigns/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Campaigns/EditView.php Mon Oct 16 01:02:11 2006 @@ -11,12 +11,12 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once('include/utils/utils.php'); -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$currentModule,$theme; -$focus = new Campaign(); +$focus = new Campaigns(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] !='') Modified: vtigercrm/branches/5.0.2/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Campaigns/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Campaigns/ListView.php Mon Oct 16 01:02:11 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once("data/Tracker.php"); @@ -28,7 +28,7 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; -$focus = new Campaign(); +$focus = new Campaigns(); $category = getParentTab(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.2/modules/Campaigns/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Campaigns/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Campaigns/Save.php Mon Oct 16 01:02:11 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new Campaign(); +$focus = new Campaigns(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.2/modules/Contacts/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Contacts/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Contacts/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout @@ -22,7 +22,7 @@ } else { -$focus = new Contact(); +$focus = new Contacts(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.2/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Contacts/Contact.php (original) +++ vtigercrm/branches/5.0.2/modules/Contacts/Contact.php Mon Oct 16 01:02:11 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Contacts/Contact.php,v 1.70 2005/04/27 11:21:49 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Contacts/Contacts.php,v 1.70 2005/04/27 11:21:49 rank Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -25,11 +25,11 @@ require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); require_once('include/utils/utils.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Campaigns/Campaign.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); require_once('modules/HelpDesk/HelpDesk.php'); require_once('user_privileges/default_module_view.php'); @@ -125,7 +125,7 @@ var $default_order_by = 'lastname'; var $default_sort_order = 'ASC'; - function Contact() { + function Contacts() { $this->log = LoggerManager::getLogger('contact'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Contacts'); @@ -334,7 +334,7 @@ $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; - $focus = new Potential(); + $focus = new Potentials(); $button = ''; if(isPermitted("Potentials",1,"") == 'yes') @@ -486,8 +486,8 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quote.php'); - $focus = new Quote(); + require_once('modules/Quotes/Quotes.php'); + $focus = new Quotes(); $button = ''; if(isPermitted("Quotes",1,"") == 'yes') @@ -540,8 +540,8 @@ global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); global $app_strings; - require_once('modules/Products/Product.php'); - $focus = new Product(); + require_once('modules/Products/Products.php'); + $focus = new Products(); $button = ''; if(isPermitted("Products",1,"") == 'yes') @@ -570,7 +570,7 @@ $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new Order(); + $focus = new PurchaseOrder(); $button = ''; @@ -600,7 +600,7 @@ $log->debug("Entering get_emails(".$id.") method ..."); global $mod_strings; - $focus = new Email(); + $focus = new Emails(); $button = ''; @@ -631,7 +631,7 @@ $log->debug("Entering get_campaigns(".$id.") method ..."); global $mod_strings; - $focus = new Campaign(); + $focus = new Campaigns(); if($singlepane_view == 'true') $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; else @@ -735,8 +735,8 @@ { global $log; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -775,8 +775,8 @@ { global $log,$adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); Modified: vtigercrm/branches/5.0.2/modules/Contacts/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Contacts/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Contacts/Delete.php Mon Oct 16 01:02:11 2006 @@ -17,13 +17,13 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Contact(); +$focus = new Contacts(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.2/modules/Contacts/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Contacts/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Contacts/DetailView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -33,7 +33,7 @@ global $app_strings; global $currentModule, $singlepane_view; -$focus = new Contact(); +$focus = new Contacts(); if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.2/modules/Contacts/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Contacts/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Contacts/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $cntObj = new Contact(); + $cntObj = new Contacts(); $cntObj->retrieve_entity_info($crmid,"Contacts"); $cntObj->column_fields[$fieldname] = $fieldvalue; $cntObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/Contacts/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Contacts/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Contacts/EditView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -39,7 +39,7 @@ $image_error=isset($_REQUEST['image_error'])?$_REQUEST['image_error']:"false"; //end -$focus = new Contact(); +$focus = new Contacts(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) @@ -68,9 +68,9 @@ if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']=='') { - require_once('modules/Accounts/Account.php'); + require_once('modules/Accounts/Accounts.php'); $focus->column_fields['account_id'] = $_REQUEST['account_id']; - $acct_focus = new Account(); + $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']; Modified: vtigercrm/branches/5.0.2/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Contacts/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Contacts/ListView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -39,7 +39,7 @@ global $currentModule,$theme; -$focus = new Contact(); +$focus = new Contacts(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.2/modules/Contacts/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Contacts/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Contacts/Save.php Mon Oct 16 01:02:11 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once("modules/Emails/mail.php"); @@ -51,7 +51,7 @@ $local_log =& LoggerManager::getLogger('index'); global $log,$adb; -$focus = new Contact(); +$focus = new Contacts(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.2/modules/Emails/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -11,10 +11,10 @@ require_once('Smarty_setup.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); -$focus = new Email(); +$focus = new Emails(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.2/modules/Emails/ChooseEmail.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/ChooseEmail.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/ChooseEmail.php Mon Oct 16 01:02:11 2006 @@ -29,20 +29,20 @@ if ($pmodule=='Accounts') { - require_once('modules/Accounts/Account.php'); - $myfocus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $myfocus = new Accounts(); $myfocus->retrieve_entity_info($entityid,"Accounts"); } elseif ($pmodule=='Contacts') { - require_once('modules/Contacts/Contact.php'); - $myfocus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $myfocus = new Contacts(); $myfocus->retrieve_entity_info($entityid,"Contacts"); } elseif ($pmodule=='Leads') { - require_once('modules/Leads/Lead.php'); - $myfocus = new Lead(); + require_once('modules/Leads/Leads.php'); + $myfocus = new Leads(); $myfocus->retrieve_entity_info($entityid,"Leads"); } ?> Modified: vtigercrm/branches/5.0.2/modules/Emails/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/Delete.php Mon Oct 16 01:02:11 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('email_delete'); -$focus = new Email(); +$focus = new Emails(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the email."); Modified: vtigercrm/branches/5.0.2/modules/Emails/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/DetailView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/upload_file.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ global $mod_strings; global $currentModule; -$focus = new Email(); +$focus = new Emails(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record'])) Modified: vtigercrm/branches/5.0.2/modules/Emails/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/EditView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/FormValidationUtil.php'); @@ -34,7 +34,7 @@ global $current_user; global $currentModule; -$focus = new Email(); +$focus = new Emails(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['upload_error'] == true) Modified: vtigercrm/branches/5.0.2/modules/Emails/Email.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/Email.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/Email.php Mon Oct 16 01:02:11 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Email.php,v 1.41 2005/04/28 08:11:21 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Emails.php,v 1.41 2005/04/28 08:11:21 rank Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -25,10 +25,10 @@ require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Users/User.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Users/Users.php'); // Email is used to store customer information. class Email extends CRMEntity { @@ -78,9 +78,9 @@ /** This function will set the columnfields for Email module */ - function Email() { + function Emails() { $this->log = LoggerManager::getLogger('email'); - $this->log->debug("Entering Email() method ..."); + $this->log->debug("Entering Emails() method ..."); $this->log = LoggerManager::getLogger('email'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Emails'); @@ -101,7 +101,7 @@ global $mod_strings; global $app_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; $returnset = '&return_module=Emails&return_action=CallRelatedList&return_id='.$id; Modified: vtigercrm/branches/5.0.2/modules/Emails/EmailsAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/EmailsAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/EmailsAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = $_REQUEST["fieldValue"]; if($crmid != "") { - $modObj = new Email(); + $modObj = new Emails(); $modObj->retrieve_entity_info($crmid,"Emails"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/Emails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/ListView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/utils/utils.php'); @@ -42,7 +42,7 @@ $url_string = ''; // assigning http url string -$focus = new Email(); +$focus = new Emails(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.2/modules/Emails/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/Save.php Mon Oct 16 01:02:11 2006 @@ -51,13 +51,13 @@ $mailbox = 'INBOX'; } -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Email(); +$focus = new Emails(); global $current_user; setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.2/modules/Emails/mailsend.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/mailsend.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/mailsend.php Mon Oct 16 01:02:11 2006 @@ -124,20 +124,20 @@ $fresult=$adb->query($myquery); if ($pmodule=='Contacts') { - require_once('modules/Contacts/Contact.php'); - $myfocus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $myfocus = new Contacts(); $myfocus->retrieve_entity_info($mycrmid,"Contacts"); } elseif ($pmodule=='Accounts') { - require_once('modules/Accounts/Account.php'); - $myfocus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $myfocus = new Accounts(); $myfocus->retrieve_entity_info($mycrmid,"Accounts"); } elseif ($pmodule=='Leads') { - require_once('modules/Leads/Lead.php'); - $myfocus = new Lead(); + require_once('modules/Leads/Leads.php'); + $myfocus = new Leads(); $myfocus->retrieve_entity_info($mycrmid,"Leads"); } $fldname=$adb->query_result($fresult,0,"columnname"); Modified: vtigercrm/branches/5.0.2/modules/Emails/sendmail.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/sendmail.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/sendmail.php Mon Oct 16 01:02:11 2006 @@ -18,7 +18,7 @@ * @copyright 2001 - 2003 Brent R. Matzelle */ -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/logging.php'); require("modules/Emails/class.phpmailer.php"); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/branches/5.0.2/modules/Home/UnifiedSearch.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Home/UnifiedSearch.php (original) +++ vtigercrm/branches/5.0.2/modules/Home/UnifiedSearch.php Mon Oct 16 01:02:11 2006 @@ -21,18 +21,18 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Leads/Leads.php'); require_once('modules/Faq/Faq.php'); -require_once('modules/Vendors/Vendor.php'); -require_once('modules/PriceBooks/PriceBook.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Vendors/Vendors.php'); +require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/Quotes/Quotes.php'); require_once('modules/PurchaseOrder/PurchaseOrder.php'); require_once('modules/SalesOrder/SalesOrder.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('modules/Home/language/en_us.lang.php'); require_once('include/database/PearDatabase.php'); require_once('modules/CustomView/CustomView.php'); Modified: vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php Mon Oct 16 01:02:11 2006 @@ -22,11 +22,11 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/ComboUtil.php'); // Account is used to store vtiger_account information. Modified: vtigercrm/branches/5.0.2/modules/Import/ImportContact.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportContact.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportContact.php Mon Oct 16 01:02:11 2006 @@ -18,7 +18,7 @@ ********************************************************************************/ include_once('config.php'); require_once('include/logging.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('modules/Import/UsersLastImport.php'); require_once('include/database/PearDatabase.php'); require_once('include/ComboUtil.php'); @@ -169,7 +169,7 @@ $arr = array(); // check if it already exists - $focus = new Account(); + $focus = new Accounts(); $query = ''; Modified: vtigercrm/branches/5.0.2/modules/Import/ImportLead.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportLead.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportLead.php Mon Oct 16 01:02:11 2006 @@ -26,13 +26,13 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/ComboUtil.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); class ImportLead extends Lead { Modified: vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php Mon Oct 16 01:02:11 2006 @@ -22,11 +22,11 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/ComboUtil.php'); // Get _dom arrays from Database @@ -131,7 +131,7 @@ $arr = array(); // check if it already exists - $focus = new Account(); + $focus = new Accounts(); $query = ''; Modified: vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php Mon Oct 16 01:02:11 2006 @@ -26,14 +26,14 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Products/Products.php'); require_once('include/ComboUtil.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); class ImportProduct extends Product { Modified: vtigercrm/branches/5.0.2/modules/Import/ImportStep2.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportStep2.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportStep2.php Mon Oct 16 01:02:11 2006 @@ -250,27 +250,27 @@ if($_REQUEST['module']=='Accounts') { $tablename='account'; - $focus1=new Account(); + $focus1=new Accounts(); } if($_REQUEST['module']=='Contacts') { $tablename='contactdetails'; - $focus1=new Contact(); + $focus1=new Contacts(); } if($_REQUEST['module']=='Leads') { $tablename='leaddetails'; - $focus1=new Lead(); + $focus1=new Leads(); } if($_REQUEST['module']=='Potentials') { $tablename='potential'; - $focus1=new Potential(); + $focus1=new Potentials(); } if($_REQUEST['module']=='Products') { $tablename='products'; - $focus1=new Product(); + $focus1=new Products(); } Modified: vtigercrm/branches/5.0.2/modules/Import/ImportSteplast.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportSteplast.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportSteplast.php Mon Oct 16 01:02:11 2006 @@ -26,7 +26,7 @@ require_once('modules/Import/UsersLastImport.php'); require_once('modules/Import/parse_utils.php'); require_once('include/ListView/ListView.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/utils/utils.php'); global $mod_strings; Modified: vtigercrm/branches/5.0.2/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Invoice/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Invoice/EditView.php Mon Oct 16 01:02:11 2006 @@ -23,9 +23,9 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('modules/SalesOrder/SalesOrder.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -43,7 +43,7 @@ if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoinvoice') { $quoteid = $_REQUEST['record']; - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToInvoice($focus,$quote_focus,$quoteid); @@ -179,7 +179,7 @@ } if(isset($_REQUEST['opportunity_id']) && $_REQUEST['opportunity_id'] !='') { - $potfocus = new Potential(); + $potfocus = new Potentials(); $potfocus->column_fields['potential_id'] = $_REQUEST['opportunity_id']; $associated_prod = getAssociatedProducts("Potentials",$potfocus,$potfocus->column_fields['potential_id']); @@ -194,8 +194,8 @@ if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && ($_REQUEST['record']=='' || $_REQUEST['convertmode'] == "potentoinvoice")){ - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/branches/5.0.2/modules/Leads/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -22,7 +22,7 @@ } else { -$focus = new Lead(); +$focus = new Leads(); $MODULE = $_REQUEST['module']; $RECORD = $_REQUEST['record']; $currentmodule = $_REQUEST['module']; Modified: vtigercrm/branches/5.0.2/modules/Leads/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/Delete.php Mon Oct 16 01:02:11 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('lead_delete'); -$focus = new Lead(); +$focus = new Leads(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.2/modules/Leads/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/DetailView.php Mon Oct 16 01:02:11 2006 @@ -14,7 +14,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/database/PearDatabase.php'); require_once('include/CustomFieldUtil.php'); require_once('include/utils/utils.php'); @@ -25,7 +25,7 @@ global $app_strings; global $currentModule, $singlepane_view; global $log; -$focus = new Lead(); +$focus = new Leads(); if(isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.2/modules/Leads/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -24,7 +24,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $leadObj = new Lead(); + $leadObj = new Leads(); $leadObj->retrieve_entity_info($crmid,"Leads"); $leadObj->column_fields[$fieldname] = $fieldvalue; $leadObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/Leads/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/EditView.php Mon Oct 16 01:02:11 2006 @@ -14,7 +14,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/database/PearDatabase.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); @@ -23,7 +23,7 @@ global $mod_strings,$app_strings,$theme,$currentModule; -$focus = new Lead(); +$focus = new Leads(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.2/modules/Leads/Lead.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/Lead.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/Lead.php Mon Oct 16 01:02:11 2006 @@ -19,9 +19,9 @@ require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Campaigns/Campaign.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -84,9 +84,9 @@ var $default_order_by = 'lastname'; var $default_sort_order = 'ASC'; - function Lead() { + function Leads() { $this->log = LoggerManager::getLogger('lead'); - $this->log->debug("Entering Lead() method ..."); + $this->log->debug("Entering Leads() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Leads'); $this->log->debug("Exiting Lead method ..."); @@ -230,7 +230,7 @@ global $log, $singlepane_view; $log->debug("Entering get_campaigns(".$id.") method ..."); global $mod_strings; - $focus = new Campaign(); + $focus = new Campaigns(); $button = ''; if($singlepane_view == 'true') @@ -258,7 +258,7 @@ global $mod_strings; require_once('include/RelatedListView.php'); - $focus = new Email(); + $focus = new Emails(); $button = ''; @@ -358,11 +358,11 @@ { global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Product.php'); + require_once('modules/Products/Products.php'); global $mod_strings; global $app_strings; - $focus = new Product(); + $focus = new Products(); $button = ''; Modified: vtigercrm/branches/5.0.2/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/LeadConvertToEntities.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); //Getting the Parameters from the ConvertLead Form $id = $_REQUEST["record"]; @@ -39,7 +39,7 @@ $potential_name = $check_unit[0]; //Retrieve info from all the vtiger_tables related to leads -$focus = new Lead(); +$focus = new Leads(); $focus->retrieve_entity_info($id,"Leads"); //get all the lead related columns Modified: vtigercrm/branches/5.0.2/modules/Leads/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/ListView.php Mon Oct 16 01:02:11 2006 @@ -19,7 +19,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -49,7 +49,7 @@ $url_string = ''; // assigning http url string -$focus = new Lead(); +$focus = new Leads(); $smarty = new vtigerCRM_Smarty; $other_text=Array(); Modified: vtigercrm/branches/5.0.2/modules/Leads/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/Save.php Mon Oct 16 01:02:11 2006 @@ -13,14 +13,14 @@ * Contributor(s): ______________________________________. ********************************************************************************/ -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/UserInfoUtil.php'); $local_log =& LoggerManager::getLogger('index'); global $log,$adb; -$focus = new Lead(); +$focus = new Leads(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.2/modules/Leads/result.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/result.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/result.php Mon Oct 16 01:02:11 2006 @@ -12,7 +12,7 @@ require_once('include/utils/utils.php'); require_once 'Excel/reader.php'; -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/database/PearDatabase.php'); $data = new Spreadsheet_Excel_Reader(); Modified: vtigercrm/branches/5.0.2/modules/Notes/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Notes/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Notes/Delete.php Mon Oct 16 01:02:11 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('note_delete'); -$focus = new Note(); +$focus = new Notes(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the note."); Modified: vtigercrm/branches/5.0.2/modules/Notes/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Notes/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Notes/DetailView.php Mon Oct 16 01:02:11 2006 @@ -22,14 +22,14 @@ require_once('data/Tracker.php'); require_once('Smarty_setup.php'); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/upload_file.php'); require_once('include/utils/utils.php'); global $app_strings; global $mod_strings; global $currentModule; -$focus = new Note(); +$focus = new Notes(); if(isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Notes"); Modified: vtigercrm/branches/5.0.2/modules/Notes/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Notes/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Notes/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Note(); + $modObj = new Notes(); $modObj->retrieve_entity_info($crmid,"Notes"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/Notes/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Notes/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Notes/EditView.php Mon Oct 16 01:02:11 2006 @@ -22,12 +22,12 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/utils/utils.php'); global $app_strings,$app_list_strings,$mod_strings,$theme,$currentModule; -$focus = new Note(); +$focus = new Notes(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['upload_error'] == true) Modified: vtigercrm/branches/5.0.2/modules/Notes/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Notes/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Notes/ListView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -66,7 +66,7 @@ $url_string = ''; // assigning http url string -$focus = new Note(); +$focus = new Notes(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.2/modules/Notes/Note.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Notes/Note.php (original) +++ vtigercrm/branches/5.0.2/modules/Notes/Note.php Mon Oct 16 01:02:11 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Notes/Note.php,v 1.15 2005/03/15 10:01:08 shaw Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Notes/Notes.php,v 1.15 2005/03/15 10:01:08 shaw Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -70,9 +70,9 @@ var $default_order_by = 'modifiedtime'; var $default_sort_order = 'ASC'; - function Note() { + function Notes() { $this->log = LoggerManager::getLogger('notes'); - $this->log->debug("Entering Note() method ..."); + $this->log->debug("Entering Notes() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Notes'); $this->log->debug("Exiting Note method ..."); Modified: vtigercrm/branches/5.0.2/modules/Notes/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Notes/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Notes/Save.php Mon Oct 16 01:02:11 2006 @@ -21,13 +21,13 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/logging.php'); require_once('include/upload_file.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Note(); +$focus = new Notes(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.2/modules/Potentials/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ } else { -$focus = new Potential(); +$focus = new Potentials(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.2/modules/Potentials/Charts.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/Charts.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/Charts.php Mon Oct 16 01:02:11 2006 @@ -19,7 +19,7 @@ require_once('config.php'); require_once('include/logging.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('Image/Graph.php'); require_once('include/utils/utils.php'); require_once('include/utils/GraphUtils.php'); @@ -102,7 +102,7 @@ //Now do the db queries //query for opportunity data that matches $datay and $user - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -441,7 +441,7 @@ //Now do the db queries //query for opportunity data that matches $datay and $user - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -779,7 +779,7 @@ //Now do the db queries //query for opportunity data that matches $datax and $user - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -1057,7 +1057,7 @@ $where .= ")"; } - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by lead source data Modified: vtigercrm/branches/5.0.2/modules/Potentials/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/Delete.php Mon Oct 16 01:02:11 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Potential(); +$focus = new Potentials(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the opportunity."); Modified: vtigercrm/branches/5.0.2/modules/Potentials/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/DetailView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/CustomFieldUtil.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -31,7 +31,7 @@ global $app_strings; global $currentModule, $singlepane_view; -$focus = new Potential(); +$focus = new Potentials(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.2/modules/Potentials/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Potential(); + $modObj = new Potentials(); $modObj->retrieve_entity_info($crmid,"Potentials"); $modObj->column_fields[$fieldname] = $fieldvalue; $_REQUEST[$fieldname] = $fieldvalue; Modified: vtigercrm/branches/5.0.2/modules/Potentials/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/EditView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -30,7 +30,7 @@ global $app_strings; global $mod_strings; global $currentModule; -$focus = new Potential(); +$focus = new Potentials(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/branches/5.0.2/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/ListView.php Mon Oct 16 01:02:11 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -38,7 +38,7 @@ $url_string = ''; // assigning http url string -$focus = new Potential(); +$focus = new Potentials(); $smarty = new vtigerCRM_Smarty(); $other_text = Array(); Modified: vtigercrm/branches/5.0.2/modules/Potentials/ListViewTop.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/ListViewTop.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/ListViewTop.php Mon Oct 16 01:02:11 2006 @@ -28,7 +28,7 @@ $log = LoggerManager::getLogger('top opportunity_list'); $log->debug("Entering getTopPotentials() method ..."); require_once("data/Tracker.php"); - require_once('modules/Potentials/Opportunity.php'); + require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); Modified: vtigercrm/branches/5.0.2/modules/Potentials/Opportunity.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/Opportunity.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/Opportunity.php Mon Oct 16 01:02:11 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Potentials/Opportunity.php,v 1.65 2005/04/28 08:08:27 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Potentials/Potentials.php,v 1.65 2005/04/28 08:08:27 rank Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -25,10 +25,10 @@ require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -96,7 +96,7 @@ var $default_order_by = 'potentialname'; var $default_sort_order = 'ASC'; - function Potential() { + function Potentials() { $this->log = LoggerManager::getLogger('potential'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Potentials'); @@ -233,7 +233,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; @@ -294,10 +294,10 @@ { global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Product.php'); + require_once('modules/Products/Products.php'); global $app_strings; - $focus = new Product(); + $focus = new Products(); $button = ''; @@ -446,10 +446,10 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quote.php'); + require_once('modules/Quotes/Quotes.php'); if($this->column_fields['account_id']!='') - $focus = new Quote(); + $focus = new Quotes(); $button = ''; if(isPermitted("Quotes",1,"") == 'yes') Modified: vtigercrm/branches/5.0.2/modules/Potentials/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Potentials/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Potentials/Save.php Mon Oct 16 01:02:11 2006 @@ -20,13 +20,13 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Potential(); +$focus = new Potentials(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PriceBooks/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/PriceBooks/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -22,7 +22,7 @@ { global $currentModule; -$focus = new PriceBook(); +$focus = new PriceBooks(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PriceBooks/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/PriceBooks/Delete.php Mon Oct 16 01:02:11 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new PriceBook(); +$focus = new PriceBooks(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PriceBooks/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/PriceBooks/DetailView.php Mon Oct 16 01:02:11 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new PriceBook(); +$focus = new PriceBooks(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PriceBooks/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/PriceBooks/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new PriceBook(); + $modObj = new PriceBooks(); $modObj->retrieve_entity_info($crmid,"PriceBooks"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PriceBooks/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/PriceBooks/EditView.php Mon Oct 16 01:02:11 2006 @@ -11,12 +11,12 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$theme,$currentModule; -$focus = new PriceBook(); +$focus = new PriceBooks(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PriceBooks/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/PriceBooks/ListView.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/ListView/ListView.php'); require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); @@ -33,7 +33,7 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$focus = new PriceBook(); +$focus = new PriceBooks(); $other_text=Array(); if(!$_SESSION['lvs'][$currentModule]) Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/PriceBook.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PriceBooks/PriceBook.php (original) +++ vtigercrm/branches/5.0.2/modules/PriceBooks/PriceBook.php Mon Oct 16 01:02:11 2006 @@ -51,9 +51,9 @@ /** Constructor which will set the column_fields in this object */ - function PriceBook() { + function PriceBooks() { $this->log =LoggerManager::getLogger('pricebook'); - $this->log->debug("Entering PriceBook() method ..."); + $this->log->debug("Entering PriceBooks() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('PriceBooks'); $this->log->debug("Exiting PriceBook method ..."); @@ -98,8 +98,8 @@ global $log,$singlepane_view; $log->debug("Entering get_pricebook_products(".$id.") method ..."); global $app_strings; - require_once('modules/Products/Product.php'); - $focus = new Product(); + require_once('modules/Products/Products.php'); + $focus = new Products(); $button = ''; Modified: vtigercrm/branches/5.0.2/modules/PriceBooks/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PriceBooks/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/PriceBooks/Save.php Mon Oct 16 01:02:11 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new PriceBook(); +$focus = new PriceBooks(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.2/modules/Products/AddProductToPriceBooks.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/AddProductToPriceBooks.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/AddProductToPriceBooks.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/utils/utils.php'); require_once('include/ComboUtil.php'); @@ -30,7 +30,7 @@ $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$focus = new PriceBook(); +$focus = new PriceBooks(); //Retreive the list of PriceBooks $list_query = getListQuery("PriceBooks"); Modified: vtigercrm/branches/5.0.2/modules/Products/AddProductsToPriceBook.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/AddProductsToPriceBook.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/AddProductsToPriceBook.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/utils.php'); require_once('include/utils/utils.php'); require_once('include/ComboUtil.php'); @@ -29,7 +29,7 @@ $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$focus = new Product(); +$focus = new Products(); if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; Modified: vtigercrm/branches/5.0.2/modules/Products/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -21,7 +21,7 @@ } else { -$focus = new Product(); +$focus = new Products(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) Modified: vtigercrm/branches/5.0.2/modules/Products/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/Delete.php Mon Oct 16 01:02:11 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new Product(); +$focus = new Products(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.2/modules/Products/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/DetailView.php Mon Oct 16 01:02:11 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new Product(); +$focus = new Products(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { //Display the error message Modified: vtigercrm/branches/5.0.2/modules/Products/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/database/PearDatabase.php'); global $adb,$current_user; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Product(); + $modObj = new Products(); $modObj->retrieve_entity_info($crmid,"Products"); $modObj->column_fields[$fieldname] = $fieldvalue; if($fieldname == 'unit_price')//unit price converted to dollar value while saving Modified: vtigercrm/branches/5.0.2/modules/Products/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/EditView.php Mon Oct 16 01:02:11 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/FormValidationUtil.php'); global $app_strings; @@ -28,7 +28,7 @@ -$focus = new Product(); +$focus = new Products(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['record']!="") Modified: vtigercrm/branches/5.0.2/modules/Products/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/ListView.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/ListView/ListView.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -56,7 +56,7 @@ } $url_string = '&smodule=PRODUCTS'; // assigning http url string -$focus = new Product(); +$focus = new Products(); //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> $sorder = $focus->getSortOrder(); Modified: vtigercrm/branches/5.0.2/modules/Products/Product.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/Product.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/Product.php Mon Oct 16 01:02:11 2006 @@ -72,9 +72,9 @@ /** Constructor which will set the column_fields in this object */ - function Product() { + function Products() { $this->log =LoggerManager::getLogger('product'); - $this->log->debug("Entering Product() method ..."); + $this->log->debug("Entering Products() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Products'); $this->log->debug("Exiting Product method ..."); @@ -301,8 +301,8 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quote.php'); - $focus = new Quote(); + require_once('modules/Quotes/Quotes.php'); + $focus = new Quotes(); $button = ''; if($singlepane_view == 'true') @@ -345,7 +345,7 @@ $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new Order(); + $focus = new PurchaseOrder(); $button = ''; @@ -466,8 +466,8 @@ global $log,$singlepane_view; $log->debug("Entering get_product_pricebooks(".$id.") method ..."); global $mod_strings; - require_once('modules/PriceBooks/PriceBook.php'); - $focus = new PriceBook(); + require_once('modules/PriceBooks/PriceBooks.php'); + $focus = new PriceBooks(); $button = ''; if($singlepane_view == 'true') $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; Modified: vtigercrm/branches/5.0.2/modules/Products/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Products/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Products/Save.php Mon Oct 16 01:02:11 2006 @@ -21,14 +21,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); global $log,$current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); $rate = $rate_symbol['rate']; -$focus = new Product(); +$focus = new Products(); if(isset($_REQUEST['record'])) { $focus->id = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -21,7 +21,7 @@ } else { -$focus = new Order(); +$focus = new PurchaseOrder(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/CreatePDF.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/CreatePDF.php Mon Oct 16 01:02:11 2006 @@ -26,7 +26,7 @@ $id = $_REQUEST['record']; //retreiving the vtiger_invoice info -$focus = new Order(); +$focus = new PurchaseOrder(); $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); $vendor_name = getVendorName($focus->column_fields[vendor_id]); Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/Delete.php Mon Oct 16 01:02:11 2006 @@ -24,7 +24,7 @@ require_once('include/logging.php'); $log = LoggerManager::getLogger('order_delete'); -$focus = new Order(); +$focus = new PurchaseOrder(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailView.php Mon Oct 16 01:02:11 2006 @@ -29,7 +29,7 @@ require_once('user_privileges/default_module_view.php'); global $mod_strings,$app_strings,$theme,$currentModule,$singlepane_view; -$focus = new Order(); +$focus = new PurchaseOrder(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Order(); + $modObj = new PurchaseOrder(); $modObj->retrieve_entity_info($crmid,"PurchaseOrder"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/EditView.php Mon Oct 16 01:02:11 2006 @@ -31,7 +31,7 @@ global $app_strings,$mod_strings,$log,$theme,$currentModule; -$focus = new Order(); +$focus = new PurchaseOrder(); $smarty = new vtigerCRM_Smarty(); global $current_user; $currencyid=fetchCurrency($current_user->id); @@ -60,8 +60,8 @@ // Get vtiger_vendor address if vtiger_vendorid is given if(isset($_REQUEST['vendor_id']) && $_REQUEST['vendor_id']!='' && $_REQUEST['record']==''){ - require_once('modules/Vendors/Vendor.php'); - $vend_focus = new Vendor(); + require_once('modules/Vendors/Vendors.php'); + $vend_focus = new Vendors(); $vend_focus->retrieve_entity_info($_REQUEST['vendor_id'],"Vendors"); $focus->column_fields['bill_city']=$vend_focus->column_fields['city']; Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListTopPurchaseOrder.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListTopPurchaseOrder.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListTopPurchaseOrder.php Mon Oct 16 01:02:11 2006 @@ -47,7 +47,7 @@ $viewid = "0"; } } - $focus = new Order(); + $focus = new PurchaseOrder(); $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListView.php Mon Oct 16 01:02:11 2006 @@ -35,7 +35,7 @@ $url_string = '&smodule=PO'; -$focus = new Order(); +$focus = new PurchaseOrder(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/PurchaseOrder.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/PurchaseOrder.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/PurchaseOrder.php Mon Oct 16 01:02:11 2006 @@ -30,7 +30,7 @@ require_once('user_privileges/default_module_view.php'); // Account is used to store vtiger_account information. -class Order extends CRMEntity { +class PurchaseOrder extends CRMEntity { var $log; var $db; @@ -94,7 +94,7 @@ * 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. */ - function Order() { + function PurchaseOrder() { $this->log =LoggerManager::getLogger('PurchaseOrder'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('PurchaseOrder'); Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/PurchaseOrder/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/Save.php Mon Oct 16 01:02:11 2006 @@ -27,7 +27,7 @@ $local_log =& LoggerManager::getLogger('index'); -$focus = new Order(); +$focus = new PurchaseOrder(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.2/modules/Quotes/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ } else { -$focus = new Quote(); +$focus = new Quotes(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.2/modules/Quotes/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/CreatePDF.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/CreatePDF.php Mon Oct 16 01:02:11 2006 @@ -11,7 +11,7 @@ require_once('include/fpdf/pdf.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/database/PearDatabase.php'); global $adb,$app_strings; @@ -25,7 +25,7 @@ global $products_per_page; $products_per_page="6"; -$focus = new Quote(); +$focus = new Quotes(); $focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); $account_name = getAccountName($focus->column_fields[account_id]); Modified: vtigercrm/branches/5.0.2/modules/Quotes/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/Delete.php Mon Oct 16 01:02:11 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('quote_delete'); -$focus = new Quote(); +$focus = new Quotes(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.2/modules/Quotes/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/DetailView.php Mon Oct 16 01:02:11 2006 @@ -22,13 +22,13 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); global $mod_strings,$app_strings,$currentModule,$theme,$singlepane_view; -$focus = new Quote(); +$focus = new Quotes(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); Modified: vtigercrm/branches/5.0.2/modules/Quotes/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Quote(); + $modObj = new Quotes(); $modObj->retrieve_entity_info($crmid,"Quotes"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/Quotes/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/EditView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ $log->debug("Inside Quote EditView"); -$focus = new Quote(); +$focus = new Quotes(); $smarty = new vtigerCRM_Smarty; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); @@ -70,8 +70,8 @@ // Get Account address if vtiger_account is given if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']==''){ - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/branches/5.0.2/modules/Quotes/ListTopQuotes.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/ListTopQuotes.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/ListTopQuotes.php Mon Oct 16 01:02:11 2006 @@ -19,7 +19,7 @@ function getTopQuotes() { require_once("data/Tracker.php"); - require_once('modules/Quotes/Quote.php'); + require_once('modules/Quotes/Quotes.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); require_once('include/database/PearDatabase.php'); @@ -51,7 +51,7 @@ $viewid = "0"; } } - $focus = new Quote(); + $focus = new Quotes(); $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; Modified: vtigercrm/branches/5.0.2/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/ListView.php Mon Oct 16 01:02:11 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -33,7 +33,7 @@ $url_string = ''; -$focus = new Quote(); +$focus = new Quotes(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.2/modules/Quotes/Quote.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/Quote.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/Quote.php Mon Oct 16 01:02:11 2006 @@ -101,7 +101,7 @@ /** Constructor which will set the column_fields in this object */ - function Quote() { + function Quotes() { $this->log =LoggerManager::getLogger('quote'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Quotes'); Modified: vtigercrm/branches/5.0.2/modules/Quotes/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Quotes/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Quotes/Save.php Mon Oct 16 01:02:11 2006 @@ -21,7 +21,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); include("modules/Emails/mail.php"); @@ -34,7 +34,7 @@ $rate = $rate_symbol['rate']; $log->debug("Inside Quote Save"); -$focus = new Quote(); +$focus = new Quotes(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.2/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/SalesOrder/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/SalesOrder/EditView.php Mon Oct 16 01:02:11 2006 @@ -23,7 +23,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/SalesOrder/SalesOrder.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -44,7 +44,7 @@ if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoso') { $quoteid = $_REQUEST['record']; - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -80,7 +80,7 @@ $quoteid = $focus->column_fields['quote_id']; $smarty->assign("QUOTE_ID", $focus->column_fields['quote_id']); - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -118,7 +118,7 @@ $focus->column_fields['duedate'] = getDBInsertDateValue($curr_due_date); } $quoteid = $focus->column_fields['quote_id']; - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -161,8 +161,8 @@ // Get Account address if vtiger_account is given if(isset($_REQUEST['account_id']) && $_REQUEST['record']=='' && $_REQUEST['account_id'] != ''){ - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/branches/5.0.2/modules/Users/Authenticate.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/Authenticate.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/Authenticate.php Mon Oct 16 01:02:11 2006 @@ -20,14 +20,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('modules/Users/CreateUserPrivilegeFile.php'); require_once('include/logging.php'); require_once('user_privileges/audit_trail.php'); global $mod_strings; -$focus = new User(); +$focus = new Users(); // Add in defensive code here. $focus->column_fields["user_name"] = to_html($_REQUEST['user_name']); Modified: vtigercrm/branches/5.0.2/modules/Users/ChangePassword.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/ChangePassword.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/ChangePassword.php Mon Oct 16 01:02:11 2006 @@ -23,7 +23,7 @@ // The popup_picker.html file is used for generating a list from which to find and choose one instance. global $theme; -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); Modified: vtigercrm/branches/5.0.2/modules/Users/CreateUserPrivilegeFile.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/CreateUserPrivilegeFile.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/CreateUserPrivilegeFile.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('config.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/utils/utils.php'); require_once('include/utils/GetUserGroups.php'); @@ -32,7 +32,7 @@ $newbuf .="retrieve_entity_info($userid,"Users"); $userInfo=Array(); $user_focus->column_fields["id"] = ''; @@ -120,7 +120,7 @@ $newbuf .="retrieve_entity_info($userid,"Users"); if($user_focus->is_admin == 'on') { Modified: vtigercrm/branches/5.0.2/modules/Users/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/DetailView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/utils/utils.php'); require_once('include/utils/CommonUtils.php'); require_once('include/utils/UserInfoUtil.php'); @@ -37,7 +37,7 @@ global $app_strings; global $mod_strings; -$focus = new User(); +$focus = new Users(); if(!empty($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],'Users'); Modified: vtigercrm/branches/5.0.2/modules/Users/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -24,7 +24,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $userObj = new User(); + $userObj = new Users(); $userObj->retrieve_entity_info($crmid,"Users"); $userObj->column_fields[$fieldname] = $fieldvalue; $userObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/Users/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/EditView.php Mon Oct 16 01:02:11 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/utils/UserInfoUtil.php'); require_once('modules/Users/Forms.php'); require_once('include/database/PearDatabase.php'); @@ -36,7 +36,7 @@ $smarty=new vtigerCRM_Smarty; -$focus = new User(); +$focus = new Users(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $smarty->assign("ID",$_REQUEST['record']); Modified: vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php Mon Oct 16 01:02:11 2006 @@ -12,7 +12,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/branches/5.0.2/modules/Users/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/ListView.php Mon Oct 16 01:02:11 2006 @@ -24,7 +24,7 @@ global $current_language; $mod_strings = return_module_language($current_language,'Users'); $category = getParentTab(); -$focus = new User(); +$focus = new Users(); $smarty = new vtigerCRM_Smarty; $no_of_users=UserCount(); //Retreiving the start value from request Modified: vtigercrm/branches/5.0.2/modules/Users/Logout.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/Logout.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/Logout.php Mon Oct 16 01:02:11 2006 @@ -20,7 +20,7 @@ require_once('include/logging.php'); require_once('database/DatabaseConnection.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('config.php'); require_once('include/db_backup/backup.php'); require_once('include/db_backup/ftp.php'); Modified: vtigercrm/branches/5.0.2/modules/Users/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/Save.php Mon Oct 16 01:02:11 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/logging.php'); require_once('include/utils/UserInfoUtil.php'); $log =& LoggerManager::getLogger('index'); @@ -46,7 +46,7 @@ if (isset($_POST['record']) && !is_admin($current_user) && $_POST['record'] != $current_user->id) echo ("Unauthorized access to user administration."); elseif (!isset($_POST['record']) && !is_admin($current_user)) echo ("Unauthorized access to user administration."); -$focus = new User(); +$focus = new Users(); if(isset($_REQUEST["record"]) && $_REQUEST["record"] != '') { $focus->mode='edit'; Modified: vtigercrm/branches/5.0.2/modules/Users/ShowAuditTrail.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/ShowAuditTrail.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/ShowAuditTrail.php Mon Oct 16 01:02:11 2006 @@ -12,7 +12,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/AuditTrail.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/branches/5.0.2/modules/Users/ShowHistory.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/ShowHistory.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/ShowHistory.php Mon Oct 16 01:02:11 2006 @@ -12,11 +12,11 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -#require_once('modules/Users/User.php'); +#require_once('modules/Users/Users.php'); require_once('include/utils/utils.php'); global $app_strings; Modified: vtigercrm/branches/5.0.2/modules/Users/User.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/User.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/User.php Mon Oct 16 01:02:11 2006 @@ -21,7 +21,7 @@ ********************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/User.php,v 1.10 2005/04/19 14:40:48 ray Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/Users.php,v 1.10 2005/04/19 14:40:48 ray Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -33,7 +33,7 @@ require_once('data/CRMEntity.php'); require_once('include/utils/UserInfoUtil.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('data/Tracker.php'); // User is used to store customer information. @@ -155,11 +155,11 @@ * */ - function User() { + function Users() { $this->log = LoggerManager::getLogger('user'); - $this->log->debug("Entering User() method ..."); + $this->log->debug("Entering Users() method ..."); $this->db = new PearDatabase(); - $this->log->debug("Exiting User() method ..."); + $this->log->debug("Exiting Users() method ..."); } Modified: vtigercrm/branches/5.0.2/modules/Users/massChangeStatus.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/massChangeStatus.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/massChangeStatus.php Mon Oct 16 01:02:11 2006 @@ -15,12 +15,12 @@ require_once('include/ComboUtil.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); global $app_list_strings; global $app_strings; global $current_user; -$focus = new Lead(); +$focus = new Leads(); $idlist = $_POST['idlist']; //echo $idlist; Modified: vtigercrm/branches/5.0.2/modules/Users/populatetemplate.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/populatetemplate.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/populatetemplate.php Mon Oct 16 01:02:11 2006 @@ -10,9 +10,9 @@ ********************************************************************************/ //query the specific vtiger_table and then get the data and write the data here require_once('include/database/PearDatabase.php'); -include_once('modules/Contacts/Contact.php'); -include_once('modules/Leads/Lead.php'); -include_once('modules/Users/User.php'); +include_once('modules/Contacts/Contacts.php'); +include_once('modules/Leads/Leads.php'); +include_once('modules/Users/Users.php'); global $log; //download the template file and store it in some specific location @@ -60,11 +60,11 @@ //get the module if($module == 'leads') { - $focus = new Lead(); + $focus = new Leads(); } else { - $focus = new Contact(); + $focus = new Contacts(); } $focus->retrieve_entity_info($recordid,$module); Modified: vtigercrm/branches/5.0.2/modules/Vendors/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Vendors/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Vendors/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ else { global $currentModule; -$focus = new Vendor(); +$focus = new Vendors(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.2/modules/Vendors/Delete.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Vendors/Delete.php (original) +++ vtigercrm/branches/5.0.2/modules/Vendors/Delete.php Mon Oct 16 01:02:11 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new Vendor(); +$focus = new Vendors(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.2/modules/Vendors/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Vendors/DetailView.php (original) +++ vtigercrm/branches/5.0.2/modules/Vendors/DetailView.php Mon Oct 16 01:02:11 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new Vendor(); +$focus = new Vendors(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.2/modules/Vendors/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Vendors/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Vendors/DetailViewAjax.php Mon Oct 16 01:02:11 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Vendor(); + $modObj = new Vendors(); $modObj->retrieve_entity_info($crmid,"Vendors"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.2/modules/Vendors/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Vendors/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/Vendors/EditView.php Mon Oct 16 01:02:11 2006 @@ -11,12 +11,12 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$theme,$currentModule; -$focus = new Vendor(); +$focus = new Vendors(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/branches/5.0.2/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Vendors/ListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Vendors/ListView.php Mon Oct 16 01:02:11 2006 @@ -11,7 +11,7 @@ require_once('include/database/PearDatabase.php'); require_once('include/database/Postgres8.php'); require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/ListView/ListView.php'); require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); @@ -32,7 +32,7 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$focus = new Vendor(); +$focus = new Vendors(); $other_text = Array(); if(!$_SESSION['lvs'][$currentModule]) Modified: vtigercrm/branches/5.0.2/modules/Vendors/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Vendors/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Vendors/Save.php Mon Oct 16 01:02:11 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new Vendor(); +$focus = new Vendors(); setObjectValuesFromRequest(&$focus); $focus->save("Vendors"); Modified: vtigercrm/branches/5.0.2/modules/Vendors/Vendor.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Vendors/Vendor.php (original) +++ vtigercrm/branches/5.0.2/modules/Vendors/Vendor.php Mon Oct 16 01:02:11 2006 @@ -58,9 +58,9 @@ /** Constructor which will set the column_fields in this object */ - function Vendor() { + function Vendors() { $this->log =LoggerManager::getLogger('vendor'); - $this->log->debug("Entering Vendor() method ..."); + $this->log->debug("Entering Vendors() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Vendors'); $this->log->debug("Exiting Vendor method ..."); @@ -75,8 +75,8 @@ global $log,$singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); global $app_strings; - require_once('modules/Products/Product.php'); - $focus = new Product(); + require_once('modules/Products/Products.php'); + $focus = new Products(); $button = ''; @@ -100,7 +100,7 @@ $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new Order(); + $focus = new PurchaseOrder(); $button = ''; @@ -123,8 +123,8 @@ global $log,$singlepane_view; $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - require_once('modules/Contacts/Contact.php'); - $focus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $focus = new Contacts(); $button = ''; if($singlepane_view == 'true') Modified: vtigercrm/branches/5.0.2/modules/Webmails/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Webmails/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.2/modules/Webmails/CallRelatedList.php Mon Oct 16 01:02:11 2006 @@ -11,7 +11,7 @@ global $current_user; require_once('Smarty_setup.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once('data/Tracker.php'); Modified: vtigercrm/branches/5.0.2/modules/Webmails/Save.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Webmails/Save.php (original) +++ vtigercrm/branches/5.0.2/modules/Webmails/Save.php Mon Oct 16 01:02:11 2006 @@ -9,7 +9,7 @@ * ********************************************************************************/ -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('modules/Webmails/Webmail.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); @@ -20,7 +20,7 @@ global $current_user; $local_log =& LoggerManager::getLogger('index'); -$focus = new Email(); +$focus = new Emails(); $to_address = explode(";",$_REQUEST['to_list']); $cc_address = explode(";",$_REQUEST['cc_list']); @@ -61,8 +61,8 @@ 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/Contact.php'); - $contact_focus = new 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"); Modified: vtigercrm/branches/5.0.2/soap/firefoxtoolbar.php ============================================================================== --- vtigercrm/branches/5.0.2/soap/firefoxtoolbar.php (original) +++ vtigercrm/branches/5.0.2/soap/firefoxtoolbar.php Mon Oct 16 01:02:11 2006 @@ -175,8 +175,8 @@ function CheckLeadPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -193,8 +193,8 @@ function CheckContactPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -211,8 +211,8 @@ function CheckAccountPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -229,8 +229,8 @@ function CheckTicketPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -247,8 +247,8 @@ function CheckVendorPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -265,8 +265,8 @@ function CheckProductPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -283,8 +283,8 @@ function CheckNotePermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -301,8 +301,8 @@ function CheckSitePermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -319,8 +319,8 @@ function CheckRssPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -340,8 +340,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -365,11 +365,11 @@ function LogintoVtigerCRM($user_name,$password) { global $log; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); $return_access = "FALSE"; - $objuser = new User(); + $objuser = new Users(); if($password != "") { @@ -397,8 +397,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -436,15 +436,15 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Note.php"); - - $focus = new Note(); + require_once("modules/Notes/Notes.php"); + + $focus = new Notes(); if(isPermitted("Notes","EditView") == "yes") { $focus->column_fields['notes_title'] = $subject; @@ -473,17 +473,17 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Product.php"); + require_once("modules/Products/Products.php"); if(isPermitted("Products","EditView") == "yes") { - $focus = new Product(); + $focus = new Products(); $focus->column_fields['productname'] = $productname; $focus->column_fields['productcode'] = $code; $focus->column_fields['website'] = $website; @@ -508,16 +508,16 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Vendor.php"); + require_once("modules/Vendors/Vendors.php"); if(isPermitted("Vendors","EditView" ) == "yes") { - $focus = new Vendor(); + $focus = new Vendors(); $focus->column_fields['vendorname'] = $vendorname; $focus->column_fields['email'] = $email; $focus->column_fields['phone'] = $phone; @@ -547,8 +547,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -591,15 +591,15 @@ 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/User.php"); - $seed_user=new 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/Account.php"); + require_once("modules/Accounts/Accounts.php"); if(isPermitted("Accounts","EditView") == "yes") { - $account=new Account(); + $account=new Accounts(); $account->column_fields['accountname']=$accountname; $account->column_fields['email1']=$email; $account->column_fields['phone']=$phone; @@ -642,15 +642,15 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Lead.php"); - - $focus = new Lead(); + require_once("modules/Leads/Leads.php"); + + $focus = new Leads(); if(isPermitted("Leads","EditView") == "yes") { $focus->column_fields['lastname'] = $lastname; @@ -689,16 +689,16 @@ { global $adb,$log; global $current_user; - require_once('modules/Users/User.php'); - $seed_user = new 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/Contact.php'); + require_once('modules/Contacts/Contacts.php'); if(isPermitted("Contacts","EditView") == "yes") { - $contact = new Contact(); + $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 Modified: vtigercrm/branches/5.0.2/soap/thunderbirdplugin.php ============================================================================== --- vtigercrm/branches/5.0.2/soap/thunderbirdplugin.php (original) +++ vtigercrm/branches/5.0.2/soap/thunderbirdplugin.php Mon Oct 16 01:02:11 2006 @@ -13,7 +13,7 @@ require_once('include/logging.php'); require_once('include/nusoap/nusoap.php'); require_once('include/database/PearDatabase.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); $log = &LoggerManager::getLogger('thunderbirdplugin'); @@ -173,9 +173,9 @@ function SearchContactsByEmail($username,$emailaddress) { - require_once('modules/Contacts/Contact.php'); - - $seed_contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); $output_list = Array(); $response = $seed_contact->get_searchbyemailid($username,$emailaddress); @@ -201,13 +201,13 @@ function track_email($user_name, $contact_ids, $date_sent, $email_subject, $email_body) { global $adb; - require_once('modules/Users/User.php'); - require_once('modules/Emails/Email.php'); - - $seed_user = new User(); + 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 Email(); + $email = new Emails(); //$log->debug($msgdtls['contactid']); $emailbody = str_replace("'", "''", $email_body); $emailsubject = str_replace("'", "''",$email_subject); @@ -241,9 +241,9 @@ { global $adb; global $log; - require_once('modules/Contacts/Contact.php'); - - $seed_contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); $output_list = Array(); $query = $seed_contact->get_contactsforol($username); @@ -332,8 +332,8 @@ $rows_count = $db->getRowCount($result); if($rows_count==0) { - require_once('modules/Accounts/Account.php'); - $account = new Account(); + 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"); @@ -360,10 +360,10 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new 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"); @@ -384,7 +384,7 @@ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); } - $contact = new Contact(); + $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") : ""; @@ -418,10 +418,10 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Leads/Lead.php'); - - $seed_user = new 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"); @@ -442,7 +442,7 @@ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); } - $Lead = new Lead(); + $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") : ""; @@ -478,8 +478,8 @@ { global $adb,$log; $return_access = 'failure'; - require_once('modules/Users/User.php'); - $objuser = new User(); + require_once('modules/Users/Users.php'); + $objuser = new Users(); if($password != "" && $user_name != '') { $objuser->column_fields['user_name'] = $user_name; @@ -511,8 +511,8 @@ function CheckContactPerm($user_name) { global $current_user; - require_once('modules/Users/User.php'); - $seed_user = new 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"); @@ -528,8 +528,8 @@ function CheckContactViewPerm($user_name) { global $current_user,$log; - require_once('modules/Users/User.php'); - $seed_user = new 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"); Modified: vtigercrm/branches/5.0.2/soap/vtigerolservice.php ============================================================================== --- vtigercrm/branches/5.0.2/soap/vtigerolservice.php (original) +++ vtigercrm/branches/5.0.2/soap/vtigerolservice.php Mon Oct 16 01:02:11 2006 @@ -280,9 +280,9 @@ function SearchContactsByEmail($username,$emailaddress) { - require_once('modules/Contacts/Contact.php'); + require_once('modules/Contacts/Contacts.php'); - $seed_contact = new Contact(); + $seed_contact = new Contacts(); $output_list = Array(); $response = $seed_contact->get_searchbyemailid($username,$emailaddress); @@ -308,17 +308,17 @@ function AddMessageToContact($username,$contactid,$msgdtls) { global $adb; - require_once('modules/Users/User.php'); - require_once('modules/Emails/Email.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Emails/Emails.php'); + + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); foreach($msgdtls as $msgdtl) { if(isset($msgdtl)) { - $email = new Email(); + $email = new Emails(); //$log->debug($msgdtls['contactid']); $email_body = str_replace("'", "''", $msgdtl['body']); $email_subject = str_replace("'", "''",$msgdtl['subject']); @@ -356,11 +356,11 @@ function LoginToVtiger($userid,$password) { global $adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); $return_access = "FALSE"; - $objuser = new User(); + $objuser = new Users(); if($password != "") { @@ -385,8 +385,8 @@ function CheckEmailPermission($username) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -403,8 +403,8 @@ function CheckContactPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -421,8 +421,8 @@ function CheckActivityPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -439,12 +439,12 @@ function AddEmailAttachment($emailid,$filedata,$filename,$filesize,$filetype,$username) { global $adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('include/utils/utils.php'); $date_var = date('YmdHis'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $crmid = $adb->getUniqueID("vtiger_crmentity"); @@ -483,9 +483,9 @@ function GetContacts($username) { global $adb; - require_once('modules/Contacts/Contact.php'); - - $seed_contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); $output_list = Array(); $query = $seed_contact->get_contactsforol($username); @@ -564,15 +564,15 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.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"); - $contact = new Contact(); + $contact = new Contacts(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -646,15 +646,15 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.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"); - $contact = new Contact(); + $contact = new Contacts(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -727,15 +727,15 @@ function DeleteContacts($username,$crmid) { global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.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"); - $contact = new Contact(); + $contact = new Contacts(); $contact->id = $crmid; $contact->mark_deleted($contact->id); @@ -760,8 +760,8 @@ $rows_count = $db->getRowCount($result); if($rows_count==0) { - require_once('modules/Accounts/Account.php'); - $account = new Account(); + 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"); @@ -856,10 +856,10 @@ function AddTasks($username,$taskdtls) { global $current_user,$adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -937,10 +937,10 @@ function UpdateTasks($username,$taskdtls) { global $current_user,$adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1022,10 +1022,10 @@ function DeleteTasks($username,$crmid) { global $current_user; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1091,10 +1091,10 @@ function AddClndr($username,$clndrdtls) { global $current_user,$adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1159,10 +1159,10 @@ { global $current_user; global $adb,$log; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1228,10 +1228,10 @@ function DeleteClndr($username,$crmid) { global $current_user; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); Modified: vtigercrm/branches/5.0.2/soap/webforms.php ============================================================================== --- vtigercrm/branches/5.0.2/soap/webforms.php (original) +++ vtigercrm/branches/5.0.2/soap/webforms.php Mon Oct 16 01:02:11 2006 @@ -82,8 +82,8 @@ $assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id'); } - require_once("modules/Leads/Lead.php"); - $focus = new Lead(); + require_once("modules/Leads/Leads.php"); + $focus = new Leads(); $focus->column_fields['lastname'] = $lastname; $focus->column_fields['email'] = $email; $focus->column_fields['phone'] = $phone; @@ -126,8 +126,8 @@ $assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id'); } - require_once('modules/Contacts/Contact.php'); - $focus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $focus = new Contacts(); $focus->column_fields['firstname'] = $first_name; $focus->column_fields['lastname'] = $last_name; Modified: vtigercrm/branches/5.0.2/soap/wordplugin.php ============================================================================== --- vtigercrm/branches/5.0.2/soap/wordplugin.php (original) +++ vtigercrm/branches/5.0.2/soap/wordplugin.php Mon Oct 16 01:02:11 2006 @@ -215,8 +215,8 @@ function get_tickets_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -237,15 +237,15 @@ function get_contacts_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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","index") == "yes") { - require_once('modules/Contacts/Contact.php'); - $contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $contact = new Contacts(); $log->debug($contact->getColumnNames()); return $contact->getColumnNames(); } @@ -261,15 +261,15 @@ function get_accounts_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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("Accounts","index") == "yes") { - require_once('modules/Accounts/Account.php'); - $account = new Account(); + require_once('modules/Accounts/Accounts.php'); + $account = new Accounts(); $log->debug($account->getColumnNames_Acnt()); return $account->getColumnNames_Acnt(); } @@ -285,16 +285,16 @@ function get_leads_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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("Leads","index") == "yes") { - require_once('modules/Leads/Lead.php'); - $lead = new Lead(); + require_once('modules/Leads/Leads.php'); + $lead = new Leads(); $log->debug($lead->getColumnNames_Lead()); return $lead->getColumnNames_Lead(); } @@ -309,12 +309,12 @@ function get_user_columns($user_name, $password) { global $current_user; - require_once('modules/Users/User.php'); - $seed_user=new 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'); - $user = new User(); + $user = new Users(); return $user->getColumnNames_User(); } @@ -323,8 +323,8 @@ function create_session($user_name, $password) { global $adb,$log; - require_once('modules/Users/User.php'); - $objuser = new User(); + require_once('modules/Users/Users.php'); + $objuser = new Users(); if($password != "" && $user_name != '') { $objuser->column_fields['user_name'] = $user_name; From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 03:13:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 07:13:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9629 - in /vtigercrm/branches/5.0.2/modules: Accounts/ Campaigns/ Contacts/ Emails/ Leads/ Notes/ Potentials/ PriceBooks/ Products/ Quotes/ Users/ Vendors/ Message-ID: <20061016071346.ADBDA787FC0@vtiger.fosslabs.com> Author: richie Date: Mon Oct 16 01:13:28 2006 New Revision: 9629 Log: Files removed as filename,classname,modulename made unique Removed: vtigercrm/branches/5.0.2/modules/Accounts/Account.php vtigercrm/branches/5.0.2/modules/Campaigns/Campaign.php vtigercrm/branches/5.0.2/modules/Contacts/Contact.php vtigercrm/branches/5.0.2/modules/Emails/Email.php vtigercrm/branches/5.0.2/modules/Leads/Lead.php vtigercrm/branches/5.0.2/modules/Notes/Note.php vtigercrm/branches/5.0.2/modules/Potentials/Opportunity.php vtigercrm/branches/5.0.2/modules/PriceBooks/PriceBook.php vtigercrm/branches/5.0.2/modules/Products/Product.php vtigercrm/branches/5.0.2/modules/Quotes/Quote.php vtigercrm/branches/5.0.2/modules/Users/User.php vtigercrm/branches/5.0.2/modules/Vendors/Vendor.php From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 03:17:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 07:17:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9630 - in /vtigercrm/branches/5.0.2/modules: Accounts/ Campaigns/ Contacts/ Emails/ Leads/ Notes/ Potentials/ PriceBooks/ Products/ Quotes/ Users/ Vendors/ Message-ID: <20061016071749.380B1787FC0@vtiger.fosslabs.com> Author: richie Date: Mon Oct 16 01:17:23 2006 New Revision: 9630 Log: Filename changed as filename,modulename,classname made unique--Jeri Added: vtigercrm/branches/5.0.2/modules/Accounts/Accounts.php vtigercrm/branches/5.0.2/modules/Campaigns/Campaigns.php vtigercrm/branches/5.0.2/modules/Contacts/Contacts.php vtigercrm/branches/5.0.2/modules/Emails/Emails.php vtigercrm/branches/5.0.2/modules/Leads/Leads.php (with props) vtigercrm/branches/5.0.2/modules/Notes/Notes.php vtigercrm/branches/5.0.2/modules/Potentials/Potentials.php vtigercrm/branches/5.0.2/modules/PriceBooks/PriceBooks.php (with props) vtigercrm/branches/5.0.2/modules/Products/Products.php (with props) vtigercrm/branches/5.0.2/modules/Quotes/Quotes.php (with props) vtigercrm/branches/5.0.2/modules/Users/Users.php (with props) vtigercrm/branches/5.0.2/modules/Vendors/Vendors.php (with props) From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 03:52:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 07:52:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9631 - in /vtigercrm/branches/5.0.1: ./ include/utils/ install/ modules/Accounts/ modules/Calendar/ modules/Campaigns/ modules/Contacts/ modules/Emails/ modules/Home/ modules/Import/ modules/Invoice/ modules/Leads/ modules/Notes/ modules/Potentials/ modules/PriceBooks/ modules/Products/ modules/PurchaseOrder/ modules/Quotes/ modules/SalesOrder/ modules/Users/ modules/Vendors/ modules/Webmails/ soap/ Message-ID: <20061016075251.E85FE787E3D@vtiger.fosslabs.com> Author: richie Date: Mon Oct 16 01:50:32 2006 New Revision: 9631 Log: Changes reverted back to v9625 Modified: vtigercrm/branches/5.0.1/Popup.php vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php vtigercrm/branches/5.0.1/include/utils/ListViewUtils.php vtigercrm/branches/5.0.1/include/utils/export.php vtigercrm/branches/5.0.1/include/utils/utils.php vtigercrm/branches/5.0.1/index.php vtigercrm/branches/5.0.1/install/5createTables.inc.php vtigercrm/branches/5.0.1/install/populateSeedData.php vtigercrm/branches/5.0.1/modules/Accounts/Account.php vtigercrm/branches/5.0.1/modules/Accounts/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Accounts/Delete.php vtigercrm/branches/5.0.1/modules/Accounts/DetailView.php vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Accounts/EditView.php vtigercrm/branches/5.0.1/modules/Accounts/HeadLines.php vtigercrm/branches/5.0.1/modules/Accounts/ListView.php vtigercrm/branches/5.0.1/modules/Accounts/ListViewTop.php vtigercrm/branches/5.0.1/modules/Accounts/Save.php vtigercrm/branches/5.0.1/modules/Accounts/Tickerdetail.php vtigercrm/branches/5.0.1/modules/Calendar/Activity.php vtigercrm/branches/5.0.1/modules/Calendar/RenderRelatedListUI.php vtigercrm/branches/5.0.1/modules/Campaigns/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Campaigns/Campaign.php vtigercrm/branches/5.0.1/modules/Campaigns/Delete.php vtigercrm/branches/5.0.1/modules/Campaigns/DetailView.php vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php vtigercrm/branches/5.0.1/modules/Campaigns/ListView.php vtigercrm/branches/5.0.1/modules/Campaigns/Save.php vtigercrm/branches/5.0.1/modules/Contacts/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Contacts/Contact.php vtigercrm/branches/5.0.1/modules/Contacts/Delete.php vtigercrm/branches/5.0.1/modules/Contacts/DetailView.php vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Contacts/EditView.php vtigercrm/branches/5.0.1/modules/Contacts/ListView.php vtigercrm/branches/5.0.1/modules/Contacts/Save.php vtigercrm/branches/5.0.1/modules/Emails/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Emails/ChooseEmail.php vtigercrm/branches/5.0.1/modules/Emails/Delete.php vtigercrm/branches/5.0.1/modules/Emails/DetailView.php vtigercrm/branches/5.0.1/modules/Emails/EditView.php vtigercrm/branches/5.0.1/modules/Emails/Email.php vtigercrm/branches/5.0.1/modules/Emails/EmailsAjax.php vtigercrm/branches/5.0.1/modules/Emails/ListView.php vtigercrm/branches/5.0.1/modules/Emails/Save.php vtigercrm/branches/5.0.1/modules/Emails/mailsend.php vtigercrm/branches/5.0.1/modules/Emails/sendmail.php vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php vtigercrm/branches/5.0.1/modules/Import/ImportAccount.php vtigercrm/branches/5.0.1/modules/Import/ImportContact.php vtigercrm/branches/5.0.1/modules/Import/ImportLead.php vtigercrm/branches/5.0.1/modules/Import/ImportOpportunity.php vtigercrm/branches/5.0.1/modules/Import/ImportProduct.php vtigercrm/branches/5.0.1/modules/Import/ImportStep2.php vtigercrm/branches/5.0.1/modules/Import/ImportSteplast.php vtigercrm/branches/5.0.1/modules/Invoice/EditView.php vtigercrm/branches/5.0.1/modules/Leads/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Leads/Delete.php vtigercrm/branches/5.0.1/modules/Leads/DetailView.php vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Leads/EditView.php vtigercrm/branches/5.0.1/modules/Leads/Lead.php vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php vtigercrm/branches/5.0.1/modules/Leads/ListView.php vtigercrm/branches/5.0.1/modules/Leads/Save.php vtigercrm/branches/5.0.1/modules/Leads/result.php vtigercrm/branches/5.0.1/modules/Notes/Delete.php vtigercrm/branches/5.0.1/modules/Notes/DetailView.php vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Notes/EditView.php vtigercrm/branches/5.0.1/modules/Notes/ListView.php vtigercrm/branches/5.0.1/modules/Notes/Note.php vtigercrm/branches/5.0.1/modules/Notes/Save.php vtigercrm/branches/5.0.1/modules/Potentials/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Potentials/Charts.php vtigercrm/branches/5.0.1/modules/Potentials/Delete.php vtigercrm/branches/5.0.1/modules/Potentials/DetailView.php vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Potentials/EditView.php vtigercrm/branches/5.0.1/modules/Potentials/ListView.php vtigercrm/branches/5.0.1/modules/Potentials/ListViewTop.php vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php vtigercrm/branches/5.0.1/modules/Potentials/Save.php vtigercrm/branches/5.0.1/modules/PriceBooks/CallRelatedList.php vtigercrm/branches/5.0.1/modules/PriceBooks/Delete.php vtigercrm/branches/5.0.1/modules/PriceBooks/DetailView.php vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php vtigercrm/branches/5.0.1/modules/PriceBooks/ListView.php vtigercrm/branches/5.0.1/modules/PriceBooks/PriceBook.php vtigercrm/branches/5.0.1/modules/PriceBooks/Save.php vtigercrm/branches/5.0.1/modules/Products/AddProductToPriceBooks.php vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php vtigercrm/branches/5.0.1/modules/Products/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Products/Delete.php vtigercrm/branches/5.0.1/modules/Products/DetailView.php vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Products/EditView.php vtigercrm/branches/5.0.1/modules/Products/ListView.php vtigercrm/branches/5.0.1/modules/Products/Product.php vtigercrm/branches/5.0.1/modules/Products/Save.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/CallRelatedList.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/CreatePDF.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/Delete.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailView.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/EditView.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListTopPurchaseOrder.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListView.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/PurchaseOrder.php vtigercrm/branches/5.0.1/modules/PurchaseOrder/Save.php vtigercrm/branches/5.0.1/modules/Quotes/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Quotes/CreatePDF.php vtigercrm/branches/5.0.1/modules/Quotes/Delete.php vtigercrm/branches/5.0.1/modules/Quotes/DetailView.php vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Quotes/EditView.php vtigercrm/branches/5.0.1/modules/Quotes/ListTopQuotes.php vtigercrm/branches/5.0.1/modules/Quotes/ListView.php vtigercrm/branches/5.0.1/modules/Quotes/Quote.php vtigercrm/branches/5.0.1/modules/Quotes/Save.php vtigercrm/branches/5.0.1/modules/SalesOrder/EditView.php vtigercrm/branches/5.0.1/modules/Users/Authenticate.php vtigercrm/branches/5.0.1/modules/Users/ChangePassword.php vtigercrm/branches/5.0.1/modules/Users/CreateUserPrivilegeFile.php vtigercrm/branches/5.0.1/modules/Users/DetailView.php vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Users/EditView.php vtigercrm/branches/5.0.1/modules/Users/ListLoginHistory.php vtigercrm/branches/5.0.1/modules/Users/ListView.php vtigercrm/branches/5.0.1/modules/Users/Logout.php vtigercrm/branches/5.0.1/modules/Users/Save.php vtigercrm/branches/5.0.1/modules/Users/ShowAuditTrail.php vtigercrm/branches/5.0.1/modules/Users/ShowHistory.php vtigercrm/branches/5.0.1/modules/Users/User.php vtigercrm/branches/5.0.1/modules/Users/massChangeStatus.php vtigercrm/branches/5.0.1/modules/Users/populatetemplate.php vtigercrm/branches/5.0.1/modules/Vendors/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Vendors/Delete.php vtigercrm/branches/5.0.1/modules/Vendors/DetailView.php vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php vtigercrm/branches/5.0.1/modules/Vendors/EditView.php vtigercrm/branches/5.0.1/modules/Vendors/ListView.php vtigercrm/branches/5.0.1/modules/Vendors/Save.php vtigercrm/branches/5.0.1/modules/Vendors/Vendor.php vtigercrm/branches/5.0.1/modules/Webmails/CallRelatedList.php vtigercrm/branches/5.0.1/modules/Webmails/Save.php vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php vtigercrm/branches/5.0.1/soap/vtigerolservice.php vtigercrm/branches/5.0.1/soap/webforms.php vtigercrm/branches/5.0.1/soap/wordplugin.php Modified: vtigercrm/branches/5.0.1/Popup.php ============================================================================== --- vtigercrm/branches/5.0.1/Popup.php (original) +++ vtigercrm/branches/5.0.1/Popup.php Mon Oct 16 01:50:32 2006 @@ -33,8 +33,8 @@ switch($currentModule) { case 'Contacts': - require_once("modules/$currentModule/Contacts.php"); - $focus = new Contacts(); + require_once("modules/$currentModule/Contact.php"); + $focus = new Contact(); $log = LoggerManager::getLogger('contact_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom'); $comboFieldArray = getComboArray($comboFieldNames); @@ -47,8 +47,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","",""); break; case 'Campaigns': - require_once("modules/$currentModule/Campaigns.php"); - $focus = new Campaigns(); + require_once("modules/$currentModule/Campaign.php"); + $focus = new Campaign(); $log = LoggerManager::getLogger('campaign_list'); $comboFieldNames = Array('campaignstatus'=>'campaignstatus_dom', 'campaigntype'=>'campaigntype_dom'); @@ -60,8 +60,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','campaignname','true','basic',$popuptype,"","",""); break; case 'Accounts': - require_once("modules/$currentModule/Accounts.php"); - $focus = new Accounts(); + require_once("modules/$currentModule/Account.php"); + $focus = new Account(); $log = LoggerManager::getLogger('account_list'); $comboFieldNames = Array('accounttype'=>'account_type_dom' ,'industry'=>'industry_dom'); @@ -74,8 +74,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','accountname','true','basic',$popuptype,"","",""); break; case 'Leads': - require_once("modules/$currentModule/Leads.php"); - $focus = new Leads(); + require_once("modules/$currentModule/Lead.php"); + $focus = new Lead(); $log = LoggerManager::getLogger('contact_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom' ,'leadstatus'=>'leadstatus_dom' @@ -91,8 +91,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","",""); break; case 'Potentials': - require_once("modules/$currentModule/Potentials.php"); - $focus = new Potentials(); + require_once("modules/$currentModule/Opportunity.php"); + $focus = new Potential(); $log = LoggerManager::getLogger('potential_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom' ,'opportunity_type'=>'opportunity_type_dom' @@ -104,8 +104,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','potentialname','true','basic',$popuptype,"","",""); break; case 'Quotes': - require_once("modules/$currentModule/Quotes.php"); - $focus = new Quotes(); + require_once("modules/$currentModule/Quote.php"); + $focus = new Quote(); $log = LoggerManager::getLogger('quotes_list'); $comboFieldNames = Array('quotestage'=>'quotestage_dom'); $comboFieldArray = getComboArray($comboFieldNames); @@ -121,8 +121,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','subject','true','basic',$popuptype,"","",""); break; case 'Products': - require_once("modules/$currentModule/Products.php"); - $focus = new Products(); + require_once("modules/$currentModule/Product.php"); + $focus = new Product(); $smarty->assign("SINGLE_MOD",'Product'); if(isset($_REQUEST['curr_row'])) { @@ -135,8 +135,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','productname','true','basic',$popuptype,"","",""); break; case 'Vendors': - require_once("modules/$currentModule/Vendors.php"); - $focus = new Vendors(); + require_once("modules/$currentModule/Vendor.php"); + $focus = new Vendor(); $smarty->assign("SINGLE_MOD",'Vendor'); $alphabetical = AlphabeticalSearch($currentModule,'Popup','vendorname','true','basic',$popuptype,"","",""); break; @@ -150,15 +150,15 @@ break; case 'PurchaseOrder': require_once("modules/$currentModule/PurchaseOrder.php"); - $focus = new PurchaseOrder(); + $focus = new Order(); $smarty->assign("SINGLE_MOD",'PurchaseOrder'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); $alphabetical = AlphabeticalSearch($currentModule,'Popup','subject','true','basic',$popuptype,"","",""); break; case 'PriceBooks': - require_once("modules/$currentModule/PriceBooks.php"); - $focus = new PriceBooks(); + require_once("modules/$currentModule/PriceBook.php"); + $focus = new PriceBook(); $smarty->assign("SINGLE_MOD",'PriceBook'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); @@ -175,8 +175,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','bookname','true','basic',$popuptype,"","",""); break; case 'Users': - require_once("modules/$currentModule/Users.php"); - $focus = new Users(); + require_once("modules/$currentModule/User.php"); + $focus = new User(); $smarty->assign("SINGLE_MOD",'Users'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); Modified: vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/EditViewUtils.php Mon Oct 16 01:50:32 2006 @@ -863,15 +863,15 @@ $nemail=count($realid); if ($pmodule=='Accounts'){ - require_once('modules/Accounts/Accounts.php'); - $myfocus = new Accounts(); + require_once('modules/Accounts/Account.php'); + $myfocus = new Account(); $myfocus->retrieve_entity_info($entityid,"Accounts"); $fullname=br2nl($myfocus->column_fields['accountname']); $account_selected = 'selected'; } elseif ($pmodule=='Contacts'){ - require_once('modules/Contacts/Contacts.php'); - $myfocus = new Contacts(); + require_once('modules/Contacts/Contact.php'); + $myfocus = new Contact(); $myfocus->retrieve_entity_info($entityid,"Contacts"); $fname=br2nl($myfocus->column_fields['firstname']); $lname=br2nl($myfocus->column_fields['lastname']); @@ -879,8 +879,8 @@ $contact_selected = 'selected'; } elseif ($pmodule=='Leads'){ - require_once('modules/Leads/Leads.php'); - $myfocus = new Leads(); + require_once('modules/Leads/Lead.php'); + $myfocus = new Lead(); $myfocus->retrieve_entity_info($entityid,"Leads"); $fname=br2nl($myfocus->column_fields['firstname']); $lname=br2nl($myfocus->column_fields['lastname']); Modified: vtigercrm/branches/5.0.1/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/ListViewUtils.php Mon Oct 16 01:50:32 2006 @@ -1385,8 +1385,8 @@ } elseif($popuptype == "specific_account_address") { - require_once('modules/Accounts/Accounts.php'); - $acct_focus = new Accounts(); + require_once('modules/Accounts/Account.php'); + $acct_focus = new Account(); $acct_focus->retrieve_entity_info($entity_id,"Accounts"); $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']).'"); window.close()\'>'.$temp_val.''; @@ -1394,8 +1394,8 @@ } elseif($popuptype == "specific_contact_account_address") { - require_once('modules/Accounts/Accounts.php'); - $acct_focus = new Accounts(); + require_once('modules/Accounts/Account.php'); + $acct_focus = new Account(); $acct_focus->retrieve_entity_info($entity_id,"Accounts"); $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']).'"); window.close()\'>'.$temp_val.''; @@ -1405,8 +1405,8 @@ elseif($popuptype == "specific_potential_account_address") { $acntid = $adb->query_result($list_result,$list_result_count,"accountid"); - require_once('modules/Accounts/Accounts.php'); - $acct_focus = new Accounts(); + require_once('modules/Accounts/Account.php'); + $acct_focus = new Account(); $acct_focus->retrieve_entity_info($acntid,"Accounts"); $account_name = getAccountName($acntid); @@ -1461,8 +1461,8 @@ } elseif($popuptype == "specific_vendor_address") { - require_once('modules/Vendors/Vendors.php'); - $acct_focus = new Vendors(); + require_once('modules/Vendors/Vendor.php'); + $acct_focus = new Vendor(); $acct_focus->retrieve_entity_info($entity_id,"Vendors"); $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']).'"); window.close()\'>'.$temp_val.''; Modified: vtigercrm/branches/5.0.1/include/utils/export.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/export.php (original) +++ vtigercrm/branches/5.0.1/include/utils/export.php Mon Oct 16 01:50:32 2006 @@ -20,23 +20,23 @@ require_once('config.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -require_once('modules/Accounts/Accounts.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Leads/Leads.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Leads/Lead.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Emails/Email.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Potentials/Potentials.php'); -require_once('modules/Users/Users.php'); -require_once('modules/Products/Products.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Users/User.php'); +require_once('modules/Products/Product.php'); require_once('include/utils/UserInfoUtil.php'); global $allow_exports; session_start(); -$current_user = new Users(); +$current_user = new User(); if(isset($_SESSION['authenticated_user_id'])) { Modified: vtigercrm/branches/5.0.1/include/utils/utils.php ============================================================================== --- vtigercrm/branches/5.0.1/include/utils/utils.php (original) +++ vtigercrm/branches/5.0.1/include/utils/utils.php Mon Oct 16 01:50:32 2006 @@ -2048,9 +2048,9 @@ $log->debug("Entering getEmailParentsList(".$module.",".$id.") method ..."); global $adb; if($module == 'Contacts') - $focus = new Contacts(); + $focus = new Contact(); if($module == 'Leads') - $focus = new Leads(); + $focus = new Lead(); $focus->retrieve_entity_info($id,$module); $fieldid = 0; Modified: vtigercrm/branches/5.0.1/index.php ============================================================================== --- vtigercrm/branches/5.0.1/index.php (original) +++ vtigercrm/branches/5.0.1/index.php Mon Oct 16 01:50:32 2006 @@ -101,7 +101,7 @@ set_default_config($default_config_values); require_once('include/logging.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); global $currentModule; @@ -352,7 +352,7 @@ $lang_crm = (isset($_SESSION['authenticated_user_language'])) ? $_SESSION['authenticated_user_language'] : ""; $GLOBALS['request_string'] = "&module=$module&action=$action&record=$record&lang_crm=$lang_crm"; -$current_user = new Users(); +$current_user = new User(); if($use_current_login) { @@ -432,22 +432,90 @@ // Use the record to track the viewing. // todo - Have a record of modules and thier primary object names. //Getting the actual module + $actualModule = $currentModule; switch($currentModule) { + case 'Leads': + require_once("modules/$currentModule/Lead.php"); + $focus = new Lead(); + break; + case 'Contacts': + require_once("modules/$currentModule/Contact.php"); + $focus = new Contact(); + break; + case 'Accounts': + require_once("modules/$currentModule/Account.php"); + $focus = new Account(); + break; + case 'Potentials': + require_once("modules/$currentModule/Opportunity.php"); + $focus = new Potential(); + break; case 'Calendar': require_once("modules/$currentModule/Activity.php"); $focus = new Activity(); break; - default: - require_once("modules/$currentModule/$currentModule.php"); - $focus = new $currentModule(); + case 'Notes': + require_once("modules/$currentModule/Note.php"); + $focus = new Note(); + break; + case 'Emails': + require_once("modules/$currentModule/Email.php"); + $focus = new Email(); + break; + case 'Users': + require_once("modules/$currentModule/User.php"); + $focus = new User(); + break; + case 'Products': + require_once("modules/$currentModule/Product.php"); + $focus = new Product(); + break; + case 'Vendors': + require_once("modules/$currentModule/Vendor.php"); + $focus = new Vendor(); + $actualModule = 'Vendors'; + break; + case 'PriceBooks': + require_once("modules/$currentModule/PriceBook.php"); + $focus = new PriceBook(); + $actualModule = 'PriceBooks'; + break; + case 'HelpDesk': + require_once("modules/$currentModule/HelpDesk.php"); + $focus = new HelpDesk(); + break; + case 'Faq': + require_once("modules/$currentModule/Faq.php"); + $focus = new Faq(); + break; + case 'Quotes': + require_once("modules/$currentModule/Quote.php"); + $focus = new Quote(); + break; + case 'PurchaseOrder': + require_once("modules/$currentModule/PurchaseOrder.php"); + $focus = new Order(); + break; + case 'SalesOrder': + require_once("modules/$currentModule/SalesOrder.php"); + $focus = new SalesOrder(); + break; + + case 'Invoice': + require_once("modules/$currentModule/Invoice.php"); + $focus = new Invoice(); + break; + case 'Campaigns': + require_once("modules/$currentModule/Campaign.php"); + $focus = new Campaign(); break; } if(isset($_REQUEST['record']) && $_REQUEST['record']!='' && $_REQUEST["module"] != "Webmails") { // Only track a viewing if the record was retrieved. - $focus->track_view($current_user->id, $currentModule,$_REQUEST['record']); + $focus->track_view($current_user->id, $actualModule,$_REQUEST['record']); } } Modified: vtigercrm/branches/5.0.1/install/5createTables.inc.php ============================================================================== --- vtigercrm/branches/5.0.1/install/5createTables.inc.php (original) +++ vtigercrm/branches/5.0.1/install/5createTables.inc.php Mon Oct 16 01:50:32 2006 @@ -22,14 +22,14 @@ require_once('config.php'); require_once('include/database/PearDatabase.php'); require_once('include/logging.php'); -require_once('modules/Leads/Leads.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Accounts/Accounts.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Leads/Lead.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Accounts/Account.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Emails/Emails.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Emails/Email.php'); +require_once('modules/Users/User.php'); require_once('modules/Import/ImportMap.php'); require_once('modules/Import/UsersLastImport.php'); require_once('modules/Users/LoginHistory.php'); @@ -66,7 +66,7 @@ global $default_user_is_admin; // create default admin user - $user = new Users(); + $user = new User(); $user->column_fields["last_name"] = 'Administrator'; $user->column_fields["user_name"] = 'admin'; $user->column_fields["status"] = 'Active'; @@ -122,7 +122,7 @@ //Creating the Standard User - $user = new Users(); + $user = new User(); $user->column_fields["last_name"] = 'StandardUser'; $user->column_fields["user_name"] = 'standarduser'; $user->column_fields["is_admin"] = 'off'; Modified: vtigercrm/branches/5.0.1/install/populateSeedData.php ============================================================================== --- vtigercrm/branches/5.0.1/install/populateSeedData.php (original) +++ vtigercrm/branches/5.0.1/install/populateSeedData.php Mon Oct 16 01:50:32 2006 @@ -19,29 +19,29 @@ require_once('config.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); require_once('modules/Contacts/contactSeedData.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Accounts/Accounts.php'); -require_once('modules/Campaigns/Campaigns.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Accounts/Account.php'); +require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('modules/Calendar/Activity.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); require_once('include/language/en_us.lang.php'); require_once('include/ComboStrings.php'); require_once('include/ComboUtil.php'); -require_once('modules/Products/Products.php'); -require_once('modules/PriceBooks/PriceBooks.php'); -require_once('modules/Vendors/Vendors.php'); +require_once('modules/Products/Product.php'); +require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/Vendors/Vendor.php'); require_once('modules/Faq/Faq.php'); require_once('modules/HelpDesk/HelpDesk.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Quotes/Quote.php'); require_once('modules/SalesOrder/SalesOrder.php'); require_once('modules/PurchaseOrder/PurchaseOrder.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('include/utils/InventoryUtils.php'); //Included to save inventory related products in demo data global $first_name_array; @@ -113,7 +113,7 @@ } // Look up the user id for the assigned user -$seed_user = new Users(); +$seed_user = new User(); //$adb->println("PSD assignname=".$assigned_user_name); @@ -121,7 +121,7 @@ global $current_user; -$current_user = new Users(); +$current_user = new User(); $result = $current_user->retrieve_entity_info($assigned_user_id,'Users'); $tagkey = 1; @@ -147,7 +147,7 @@ $account_name = $company_name_array[$i]; // Create new accounts. - $account = new Accounts(); + $account = new Account(); $account->column_fields["accountname"] = $account_name; $account->column_fields["phone"] = create_phone_number(); $account->column_fields["assigned_user_id"] = $assigned_user_id; @@ -196,7 +196,7 @@ //Create new opportunities - $opp = new Potentials(); + $opp = new Potential(); $opp->column_fields["assigned_user_id"] = $assigned_user_id; $opp->column_fields["potentialname"] = $account_name." - 1000 units"; @@ -235,7 +235,7 @@ for($i=0; $i<10; $i++) { - $contact = new Contacts(); + $contact = new Contact(); $contact->column_fields["firstname"] = ucfirst(strtolower($first_name_array[$i])); $contact->column_fields["lastname"] = ucfirst(strtolower($last_name_array[$i])); $contact->column_fields["assigned_user_id"] = $assigned_user_id; @@ -327,7 +327,7 @@ $company_count=0; for($i=0; $i<10; $i++) { - $lead = new Leads(); + $lead = new Lead(); $lead->column_fields["firstname"] = ucfirst(strtolower($first_name_array[$i])); $lead->column_fields["lastname"] = ucfirst(strtolower($last_name_array[$i])); @@ -404,7 +404,7 @@ //Populating Vendor Data for($i=0; $i<10; $i++) { - $vendor = new Vendors(); + $vendor = new Vendor(); $vendor->column_fields["vendorname"] = ucfirst(strtolower($first_name_array[$i])); $vendor->column_fields["phone"] = create_phone_number(); $vendor->column_fields["email"] = strtolower($vendor->column_fields["vendorname"])."@company.com"; @@ -442,7 +442,7 @@ .jpeg###","product7.jpeg###product8.jpeg###product9.jpeg###product10.jpeg###"); for($i=0; $i<10; $i++) { - $product = new Products(); + $product = new Product(); if($i>4) { $parent_key = array_rand($opportunity_ids); @@ -579,7 +579,7 @@ $validtill_array = array ("2006-09-21", "2006-10-29", "2006-12-11", "2006-10-09", "2006-11-18"); for($i=0;$i<5;$i++) { - $quote = new Quotes(); + $quote = new Quote(); $quote->column_fields["assigned_user_id"] = $assigned_user_id; $account_key = array_rand($account_ids); @@ -730,7 +730,7 @@ for($i=0;$i<5;$i++) { - $po = new PurchaseOrder(); + $po = new Order(); $po->column_fields["assigned_user_id"] = $assigned_user_id; $vendor_key = array_rand($vendor_ids); @@ -896,7 +896,7 @@ for($i=0;$i<5;$i++) { - $email = new Emails(); + $email = new Email(); $email->column_fields["assigned_user_id"] = $assigned_user_id; @@ -923,7 +923,7 @@ //$num_array = array(0,1,2,3,4); for($i=0;$i<12;$i++) { - $pricebook = new PriceBooks(); + $pricebook = new PriceBook(); $rand = array_rand($num_array); $pricebook->column_fields["bookname"] = $PB_array[$i]; @@ -940,7 +940,7 @@ for($i=0;$i<7;$i++) { - $notes = new Notes(); + $notes = new Note(); $rand = array_rand($num_array); $contact_key = array_rand($contact_ids); @@ -1118,7 +1118,7 @@ //$expected_response = Array(null,null,null); for($i=0;$icolumn_fields["campaignname"] = $campaign_name; $campaign->column_fields["campaigntype"] = $campaign_type_array[$i]; Modified: vtigercrm/branches/5.0.1/modules/Accounts/Account.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/Account.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/Account.php Mon Oct 16 01:50:32 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Accounts/Accounts.php,v 1.53 2005/04/28 08:06:45 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Accounts/Account.php,v 1.53 2005/04/28 08:06:45 rank Exp $ * Description: Defines the Account SugarBean Account entity with the necessary * methods and variables. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. @@ -26,11 +26,11 @@ require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Emails/Email.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -96,7 +96,7 @@ var $default_order_by = 'accountname'; var $default_sort_order = 'ASC'; - function Accounts() { + function Account() { $this->log =LoggerManager::getLogger('account'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Accounts'); @@ -147,7 +147,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $mod_strings; - $focus = new Contacts(); + $focus = new Contact(); $button = ''; if(isPermitted("Contacts",1,"") == 'yes') @@ -191,7 +191,7 @@ $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; - $focus = new Potentials(); + $focus = new Potential(); $button = ''; if(isPermitted("Potentials",1,"") == 'yes') @@ -388,9 +388,9 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quotes.php'); - - $focus = new Quotes(); + require_once('modules/Quotes/Quote.php'); + + $focus = new Quote(); $button = ''; if(isPermitted("Quotes",1,"") == 'yes') @@ -627,10 +627,10 @@ { global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Products.php'); + require_once('modules/Products/Product.php'); global $app_strings; - $focus = new Products(); + $focus = new Product(); $button = ''; Modified: vtigercrm/branches/5.0.1/modules/Accounts/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Accounts/Account.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -22,7 +22,7 @@ } else { -$focus = new Accounts(); +$focus = new Account(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Accounts/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/Delete.php Mon Oct 16 01:50:32 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Accounts/Account.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Accounts(); +$focus = new Account(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Accounts/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/DetailView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Accounts/Account.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ global $app_list_strings; global $log, $currentModule, $singlepane_view; -$focus = new Accounts(); +$focus = new Account(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Accounts"); $focus->id = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Accounts/Account.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $acntObj = new Accounts(); + $acntObj = new Account(); $acntObj->retrieve_entity_info($crmid,"Accounts"); $acntObj->column_fields[$fieldname] = $fieldvalue; if($fieldname == 'annual_revenue')//annual revenue converted to dollar value while saving Modified: vtigercrm/branches/5.0.1/modules/Accounts/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/EditView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Accounts/Account.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -31,7 +31,7 @@ global $app_strings,$mod_strings,$currentModule,$theme; $smarty=new vtigerCRM_Smarty; -$focus = new Accounts(); +$focus = new Account(); if(isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Accounts/HeadLines.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/HeadLines.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/HeadLines.php Mon Oct 16 01:50:32 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -include("modules/Accounts/Accounts.php"); +include("modules/Accounts/Account.php"); include("getCompanyProfile.php"); $variable = $_REQUEST['tickersymbol']; $url = "http://finance.yahoo.com/q?s=".$variable; Modified: vtigercrm/branches/5.0.1/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/ListView.php Mon Oct 16 01:50:32 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Accounts/Account.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -43,7 +43,7 @@ $url_string = ''; -$focus = new Accounts(); +$focus = new Account(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Accounts/ListViewTop.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/ListViewTop.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/ListViewTop.php Mon Oct 16 01:50:32 2006 @@ -28,7 +28,7 @@ $log = LoggerManager::getLogger('top accounts_list'); $log->debug("Entering getTopAccounts() method ..."); require_once("data/Tracker.php"); - require_once('modules/Potentials/Potentials.php'); + require_once('modules/Potentials/Opportunity.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); global $app_strings; Modified: vtigercrm/branches/5.0.1/modules/Accounts/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/Save.php Mon Oct 16 01:50:32 2006 @@ -21,14 +21,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Accounts/Account.php'); require_once('include/logging.php'); //require_once('database/DatabaseConnection.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); global $log; -$focus = new Accounts(); +$focus = new Account(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/Accounts/Tickerdetail.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Accounts/Tickerdetail.php (original) +++ vtigercrm/branches/5.0.1/modules/Accounts/Tickerdetail.php Mon Oct 16 01:50:32 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once("modules/Accounts/Accounts.php"); +require_once("modules/Accounts/Account.php"); require_once("getCompanyProfile.php"); $variable = $_REQUEST['tickersymbol']; $url = "http://moneycentral.msn.com/investor/research/profile.asp?Symbol=".trim($variable); Modified: vtigercrm/branches/5.0.1/modules/Calendar/Activity.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Calendar/Activity.php (original) +++ vtigercrm/branches/5.0.1/modules/Calendar/Activity.php Mon Oct 16 01:50:32 2006 @@ -154,7 +154,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new Contacts(); + $focus = new Contact(); $button = ''; @@ -177,7 +177,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new Users(); + $focus = new User(); $button = ''; @@ -395,8 +395,8 @@ global $log,$adb; $log->debug("Entering get_tasksforol(".$username.") method ..."); global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -447,8 +447,8 @@ global $log,$adb; $log->debug("Entering get_calendarsforol(".$user_name.") method ..."); global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($user_name); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); Modified: vtigercrm/branches/5.0.1/modules/Calendar/RenderRelatedListUI.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Calendar/RenderRelatedListUI.php (original) +++ vtigercrm/branches/5.0.1/modules/Calendar/RenderRelatedListUI.php Mon Oct 16 01:50:32 2006 @@ -10,8 +10,8 @@ ********************************************************************************/ require_once('include/RelatedListView.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Products/Products.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Products/Product.php'); require_once('include/utils/UserInfoUtil.php'); // functions added for group calendar -Jaguar Modified: vtigercrm/branches/5.0.1/modules/Campaigns/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Campaigns/Campaign.php'); require_once('modules/CustomView/CustomView.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout @@ -23,7 +23,7 @@ } else { -$focus = new Campaigns(); +$focus = new Campaign(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Campaigns/Campaign.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/Campaign.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/Campaign.php Mon Oct 16 01:50:32 2006 @@ -18,8 +18,8 @@ require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); require_once('include/utils/utils.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Leads/Lead.php'); require_once('user_privileges/default_module_view.php'); class Campaign extends CRMEntity { @@ -66,7 +66,7 @@ 'Campaign Type'=>'campaigntype', ); - function Campaigns() + function Campaign() { $this->log =LoggerManager::getLogger('campaign'); $this->db = new PearDatabase(); @@ -120,7 +120,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $mod_strings; - $focus = new Contacts(); + $focus = new Contact(); $button = ''; if($singlepane_view == 'true') @@ -145,7 +145,7 @@ $log->debug("Entering get_leads(".$id.") method ..."); global $mod_strings; - $focus = new Leads(); + $focus = new Lead(); $button = ''; if($singlepane_view == 'true') @@ -169,7 +169,7 @@ $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; - $focus = new Potentials(); + $focus = new Potential(); $button = ''; if($singlepane_view == 'true') Modified: vtigercrm/branches/5.0.1/modules/Campaigns/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/Delete.php Mon Oct 16 01:50:32 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Campaigns/Campaign.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('ticket_delete'); -$focus = new Campaigns(); +$focus = new Campaign(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/DetailView.php Mon Oct 16 01:50:32 2006 @@ -11,12 +11,12 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Campaigns/Campaign.php'); require_once('modules/CustomView/CustomView.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new Campaigns(); +$focus = new Campaign(); if(isset($_REQUEST['record']) && $_REQUEST['record']!= null ) { Modified: vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Campaigns/Campaign.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Campaigns(); + $modObj = new Campaign(); $modObj->retrieve_entity_info($crmid,"Campaigns"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/EditView.php Mon Oct 16 01:50:32 2006 @@ -11,12 +11,12 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once('include/utils/utils.php'); -require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Campaigns/Campaign.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$currentModule,$theme; -$focus = new Campaigns(); +$focus = new Campaign(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] !='') Modified: vtigercrm/branches/5.0.1/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/ListView.php Mon Oct 16 01:50:32 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Campaigns/Campaign.php'); require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once("data/Tracker.php"); @@ -28,7 +28,7 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; -$focus = new Campaigns(); +$focus = new Campaign(); $category = getParentTab(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Campaigns/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Campaigns/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Campaigns/Save.php Mon Oct 16 01:50:32 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Campaigns/Campaign.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new Campaigns(); +$focus = new Campaign(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/Contacts/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout @@ -22,7 +22,7 @@ } else { -$focus = new Contacts(); +$focus = new Contact(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/Contact.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/Contact.php Mon Oct 16 01:50:32 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Contacts/Contacts.php,v 1.70 2005/04/27 11:21:49 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Contacts/Contact.php,v 1.70 2005/04/27 11:21:49 rank Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -25,11 +25,11 @@ require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); require_once('include/utils/utils.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Campaigns/Campaigns.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Emails/Email.php'); require_once('modules/HelpDesk/HelpDesk.php'); require_once('user_privileges/default_module_view.php'); @@ -125,7 +125,7 @@ var $default_order_by = 'lastname'; var $default_sort_order = 'ASC'; - function Contacts() { + function Contact() { $this->log = LoggerManager::getLogger('contact'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Contacts'); @@ -334,7 +334,7 @@ $log->debug("Entering get_opportunities(".$id.") method ..."); global $mod_strings; - $focus = new Potentials(); + $focus = new Potential(); $button = ''; if(isPermitted("Potentials",1,"") == 'yes') @@ -486,8 +486,8 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quotes.php'); - $focus = new Quotes(); + require_once('modules/Quotes/Quote.php'); + $focus = new Quote(); $button = ''; if(isPermitted("Quotes",1,"") == 'yes') @@ -540,8 +540,8 @@ global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); global $app_strings; - require_once('modules/Products/Products.php'); - $focus = new Products(); + require_once('modules/Products/Product.php'); + $focus = new Product(); $button = ''; if(isPermitted("Products",1,"") == 'yes') @@ -570,7 +570,7 @@ $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new PurchaseOrder(); + $focus = new Order(); $button = ''; @@ -600,7 +600,7 @@ $log->debug("Entering get_emails(".$id.") method ..."); global $mod_strings; - $focus = new Emails(); + $focus = new Email(); $button = ''; @@ -631,7 +631,7 @@ $log->debug("Entering get_campaigns(".$id.") method ..."); global $mod_strings; - $focus = new Campaigns(); + $focus = new Campaign(); if($singlepane_view == 'true') $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id; else @@ -735,8 +735,8 @@ { global $log; global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -775,8 +775,8 @@ { global $log,$adb; global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($user_name); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); Modified: vtigercrm/branches/5.0.1/modules/Contacts/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/Delete.php Mon Oct 16 01:50:32 2006 @@ -17,13 +17,13 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Contacts(); +$focus = new Contact(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Contacts/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/DetailView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -33,7 +33,7 @@ global $app_strings; global $currentModule, $singlepane_view; -$focus = new Contacts(); +$focus = new Contact(); if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $cntObj = new Contacts(); + $cntObj = new Contact(); $cntObj->retrieve_entity_info($crmid,"Contacts"); $cntObj->column_fields[$fieldname] = $fieldvalue; $cntObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Contacts/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/EditView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -39,7 +39,7 @@ $image_error=isset($_REQUEST['image_error'])?$_REQUEST['image_error']:"false"; //end -$focus = new Contacts(); +$focus = new Contact(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) @@ -68,9 +68,9 @@ if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']=='') { - require_once('modules/Accounts/Accounts.php'); + require_once('modules/Accounts/Account.php'); $focus->column_fields['account_id'] = $_REQUEST['account_id']; - $acct_focus = new Accounts(); + $acct_focus = new Account(); $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']; Modified: vtigercrm/branches/5.0.1/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/ListView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -39,7 +39,7 @@ global $currentModule,$theme; -$focus = new Contacts(); +$focus = new Contact(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Contacts/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Contacts/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Contacts/Save.php Mon Oct 16 01:50:32 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once("modules/Emails/mail.php"); @@ -51,7 +51,7 @@ $local_log =& LoggerManager::getLogger('index'); global $log,$adb; -$focus = new Contacts(); +$focus = new Contact(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/Emails/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -11,10 +11,10 @@ require_once('Smarty_setup.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('include/utils/utils.php'); -$focus = new Emails(); +$focus = new Email(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Emails/ChooseEmail.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/ChooseEmail.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/ChooseEmail.php Mon Oct 16 01:50:32 2006 @@ -29,20 +29,20 @@ if ($pmodule=='Accounts') { - require_once('modules/Accounts/Accounts.php'); - $myfocus = new Accounts(); + require_once('modules/Accounts/Account.php'); + $myfocus = new Account(); $myfocus->retrieve_entity_info($entityid,"Accounts"); } elseif ($pmodule=='Contacts') { - require_once('modules/Contacts/Contacts.php'); - $myfocus = new Contacts(); + require_once('modules/Contacts/Contact.php'); + $myfocus = new Contact(); $myfocus->retrieve_entity_info($entityid,"Contacts"); } elseif ($pmodule=='Leads') { - require_once('modules/Leads/Leads.php'); - $myfocus = new Leads(); + require_once('modules/Leads/Lead.php'); + $myfocus = new Lead(); $myfocus->retrieve_entity_info($entityid,"Leads"); } ?> Modified: vtigercrm/branches/5.0.1/modules/Emails/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/Delete.php Mon Oct 16 01:50:32 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('email_delete'); -$focus = new Emails(); +$focus = new Email(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the email."); Modified: vtigercrm/branches/5.0.1/modules/Emails/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/DetailView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('include/upload_file.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ global $mod_strings; global $currentModule; -$focus = new Emails(); +$focus = new Email(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record'])) Modified: vtigercrm/branches/5.0.1/modules/Emails/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/EditView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/FormValidationUtil.php'); @@ -34,7 +34,7 @@ global $current_user; global $currentModule; -$focus = new Emails(); +$focus = new Email(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['upload_error'] == true) Modified: vtigercrm/branches/5.0.1/modules/Emails/Email.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/Email.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/Email.php Mon Oct 16 01:50:32 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Emails.php,v 1.41 2005/04/28 08:11:21 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Email.php,v 1.41 2005/04/28 08:11:21 rank Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -25,10 +25,10 @@ require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Accounts/Accounts.php'); -require_once('modules/Potentials/Potentials.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Accounts/Account.php'); +require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Users/User.php'); // Email is used to store customer information. class Email extends CRMEntity { @@ -78,9 +78,9 @@ /** This function will set the columnfields for Email module */ - function Emails() { + function Email() { $this->log = LoggerManager::getLogger('email'); - $this->log->debug("Entering Emails() method ..."); + $this->log->debug("Entering Email() method ..."); $this->log = LoggerManager::getLogger('email'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Emails'); @@ -101,7 +101,7 @@ global $mod_strings; global $app_strings; - $focus = new Contacts(); + $focus = new Contact(); $button = ''; $returnset = '&return_module=Emails&return_action=CallRelatedList&return_id='.$id; Modified: vtigercrm/branches/5.0.1/modules/Emails/EmailsAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/EmailsAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/EmailsAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = $_REQUEST["fieldValue"]; if($crmid != "") { - $modObj = new Emails(); + $modObj = new Email(); $modObj->retrieve_entity_info($crmid,"Emails"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Emails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/ListView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/utils/utils.php'); @@ -42,7 +42,7 @@ $url_string = ''; // assigning http url string -$focus = new Emails(); +$focus = new Email(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Emails/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/Save.php Mon Oct 16 01:50:32 2006 @@ -51,13 +51,13 @@ $mailbox = 'INBOX'; } -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Emails(); +$focus = new Email(); global $current_user; setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/Emails/mailsend.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/mailsend.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/mailsend.php Mon Oct 16 01:50:32 2006 @@ -124,20 +124,20 @@ $fresult=$adb->query($myquery); if ($pmodule=='Contacts') { - require_once('modules/Contacts/Contacts.php'); - $myfocus = new Contacts(); + require_once('modules/Contacts/Contact.php'); + $myfocus = new Contact(); $myfocus->retrieve_entity_info($mycrmid,"Contacts"); } elseif ($pmodule=='Accounts') { - require_once('modules/Accounts/Accounts.php'); - $myfocus = new Accounts(); + require_once('modules/Accounts/Account.php'); + $myfocus = new Account(); $myfocus->retrieve_entity_info($mycrmid,"Accounts"); } elseif ($pmodule=='Leads') { - require_once('modules/Leads/Leads.php'); - $myfocus = new Leads(); + require_once('modules/Leads/Lead.php'); + $myfocus = new Lead(); $myfocus->retrieve_entity_info($mycrmid,"Leads"); } $fldname=$adb->query_result($fresult,0,"columnname"); Modified: vtigercrm/branches/5.0.1/modules/Emails/sendmail.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Emails/sendmail.php (original) +++ vtigercrm/branches/5.0.1/modules/Emails/sendmail.php Mon Oct 16 01:50:32 2006 @@ -18,7 +18,7 @@ * @copyright 2001 - 2003 Brent R. Matzelle */ -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('include/logging.php'); require("modules/Emails/class.phpmailer.php"); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php (original) +++ vtigercrm/branches/5.0.1/modules/Home/UnifiedSearch.php Mon Oct 16 01:50:32 2006 @@ -21,18 +21,18 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Accounts/Accounts.php'); -require_once('modules/Potentials/Potentials.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Accounts/Account.php'); +require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Leads/Lead.php'); require_once('modules/Faq/Faq.php'); -require_once('modules/Vendors/Vendors.php'); -require_once('modules/PriceBooks/PriceBooks.php'); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Vendors/Vendor.php'); +require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/Quotes/Quote.php'); require_once('modules/PurchaseOrder/PurchaseOrder.php'); require_once('modules/SalesOrder/SalesOrder.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Campaigns/Campaign.php'); require_once('modules/Home/language/en_us.lang.php'); require_once('include/database/PearDatabase.php'); require_once('modules/CustomView/CustomView.php'); Modified: vtigercrm/branches/5.0.1/modules/Import/ImportAccount.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportAccount.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportAccount.php Mon Oct 16 01:50:32 2006 @@ -22,11 +22,11 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Potentials/Potentials.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Emails/Emails.php'); -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Emails/Email.php'); +require_once('modules/Accounts/Account.php'); require_once('include/ComboUtil.php'); // Account is used to store vtiger_account information. Modified: vtigercrm/branches/5.0.1/modules/Import/ImportContact.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportContact.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportContact.php Mon Oct 16 01:50:32 2006 @@ -18,7 +18,7 @@ ********************************************************************************/ include_once('config.php'); require_once('include/logging.php'); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('modules/Import/UsersLastImport.php'); require_once('include/database/PearDatabase.php'); require_once('include/ComboUtil.php'); @@ -169,7 +169,7 @@ $arr = array(); // check if it already exists - $focus = new Accounts(); + $focus = new Account(); $query = ''; Modified: vtigercrm/branches/5.0.1/modules/Import/ImportLead.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportLead.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportLead.php Mon Oct 16 01:50:32 2006 @@ -26,13 +26,13 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Potentials/Potentials.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Emails/Emails.php'); -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Emails/Email.php'); +require_once('modules/Accounts/Account.php'); require_once('include/ComboUtil.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); class ImportLead extends Lead { Modified: vtigercrm/branches/5.0.1/modules/Import/ImportOpportunity.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportOpportunity.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportOpportunity.php Mon Oct 16 01:50:32 2006 @@ -22,11 +22,11 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Potentials/Potentials.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Emails/Emails.php'); -require_once('modules/Accounts/Accounts.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Emails/Email.php'); +require_once('modules/Accounts/Account.php'); require_once('include/ComboUtil.php'); // Get _dom arrays from Database @@ -131,7 +131,7 @@ $arr = array(); // check if it already exists - $focus = new Accounts(); + $focus = new Account(); $query = ''; Modified: vtigercrm/branches/5.0.1/modules/Import/ImportProduct.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportProduct.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportProduct.php Mon Oct 16 01:50:32 2006 @@ -26,14 +26,14 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contacts.php'); -require_once('modules/Potentials/Potentials.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Emails/Emails.php'); -require_once('modules/Accounts/Accounts.php'); -require_once('modules/Products/Products.php'); +require_once('modules/Contacts/Contact.php'); +require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Emails/Email.php'); +require_once('modules/Accounts/Account.php'); +require_once('modules/Products/Product.php'); require_once('include/ComboUtil.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); class ImportProduct extends Product { Modified: vtigercrm/branches/5.0.1/modules/Import/ImportStep2.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportStep2.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportStep2.php Mon Oct 16 01:50:32 2006 @@ -250,27 +250,27 @@ if($_REQUEST['module']=='Accounts') { $tablename='account'; - $focus1=new Accounts(); + $focus1=new Account(); } if($_REQUEST['module']=='Contacts') { $tablename='contactdetails'; - $focus1=new Contacts(); + $focus1=new Contact(); } if($_REQUEST['module']=='Leads') { $tablename='leaddetails'; - $focus1=new Leads(); + $focus1=new Lead(); } if($_REQUEST['module']=='Potentials') { $tablename='potential'; - $focus1=new Potentials(); + $focus1=new Potential(); } if($_REQUEST['module']=='Products') { $tablename='products'; - $focus1=new Products(); + $focus1=new Product(); } Modified: vtigercrm/branches/5.0.1/modules/Import/ImportSteplast.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Import/ImportSteplast.php (original) +++ vtigercrm/branches/5.0.1/modules/Import/ImportSteplast.php Mon Oct 16 01:50:32 2006 @@ -26,7 +26,7 @@ require_once('modules/Import/UsersLastImport.php'); require_once('modules/Import/parse_utils.php'); require_once('include/ListView/ListView.php'); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('include/utils/utils.php'); global $mod_strings; Modified: vtigercrm/branches/5.0.1/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Invoice/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Invoice/EditView.php Mon Oct 16 01:50:32 2006 @@ -23,9 +23,9 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); require_once('modules/SalesOrder/SalesOrder.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -43,7 +43,7 @@ if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoinvoice') { $quoteid = $_REQUEST['record']; - $quote_focus = new Quotes(); + $quote_focus = new Quote(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToInvoice($focus,$quote_focus,$quoteid); @@ -179,7 +179,7 @@ } if(isset($_REQUEST['opportunity_id']) && $_REQUEST['opportunity_id'] !='') { - $potfocus = new Potentials(); + $potfocus = new Potential(); $potfocus->column_fields['potential_id'] = $_REQUEST['opportunity_id']; $associated_prod = getAssociatedProducts("Potentials",$potfocus,$potfocus->column_fields['potential_id']); @@ -194,8 +194,8 @@ if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && ($_REQUEST['record']=='' || $_REQUEST['convertmode'] == "potentoinvoice")){ - require_once('modules/Accounts/Accounts.php'); - $acct_focus = new Accounts(); + require_once('modules/Accounts/Account.php'); + $acct_focus = new Account(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/branches/5.0.1/modules/Leads/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -22,7 +22,7 @@ } else { -$focus = new Leads(); +$focus = new Lead(); $MODULE = $_REQUEST['module']; $RECORD = $_REQUEST['record']; $currentmodule = $_REQUEST['module']; Modified: vtigercrm/branches/5.0.1/modules/Leads/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/Delete.php Mon Oct 16 01:50:32 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('lead_delete'); -$focus = new Leads(); +$focus = new Lead(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Leads/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/DetailView.php Mon Oct 16 01:50:32 2006 @@ -14,7 +14,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); require_once('include/database/PearDatabase.php'); require_once('include/CustomFieldUtil.php'); require_once('include/utils/utils.php'); @@ -25,7 +25,7 @@ global $app_strings; global $currentModule, $singlepane_view; global $log; -$focus = new Leads(); +$focus = new Lead(); if(isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -24,7 +24,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $leadObj = new Leads(); + $leadObj = new Lead(); $leadObj->retrieve_entity_info($crmid,"Leads"); $leadObj->column_fields[$fieldname] = $fieldvalue; $leadObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Leads/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/EditView.php Mon Oct 16 01:50:32 2006 @@ -14,7 +14,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); require_once('include/database/PearDatabase.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); @@ -23,7 +23,7 @@ global $mod_strings,$app_strings,$theme,$currentModule; -$focus = new Leads(); +$focus = new Lead(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Leads/Lead.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/Lead.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/Lead.php Mon Oct 16 01:50:32 2006 @@ -19,9 +19,9 @@ require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Campaigns/Campaigns.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Emails/Email.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -84,9 +84,9 @@ var $default_order_by = 'lastname'; var $default_sort_order = 'ASC'; - function Leads() { + function Lead() { $this->log = LoggerManager::getLogger('lead'); - $this->log->debug("Entering Leads() method ..."); + $this->log->debug("Entering Lead() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Leads'); $this->log->debug("Exiting Lead method ..."); @@ -230,7 +230,7 @@ global $log, $singlepane_view; $log->debug("Entering get_campaigns(".$id.") method ..."); global $mod_strings; - $focus = new Campaigns(); + $focus = new Campaign(); $button = ''; if($singlepane_view == 'true') @@ -258,7 +258,7 @@ global $mod_strings; require_once('include/RelatedListView.php'); - $focus = new Emails(); + $focus = new Email(); $button = ''; @@ -358,11 +358,11 @@ { global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Products.php'); + require_once('modules/Products/Product.php'); global $mod_strings; global $app_strings; - $focus = new Products(); + $focus = new Product(); $button = ''; Modified: vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/LeadConvertToEntities.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); //Getting the Parameters from the ConvertLead Form $id = $_REQUEST["record"]; @@ -39,7 +39,7 @@ $potential_name = $check_unit[0]; //Retrieve info from all the vtiger_tables related to leads -$focus = new Leads(); +$focus = new Lead(); $focus->retrieve_entity_info($id,"Leads"); //get all the lead related columns Modified: vtigercrm/branches/5.0.1/modules/Leads/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/ListView.php Mon Oct 16 01:50:32 2006 @@ -19,7 +19,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -49,7 +49,7 @@ $url_string = ''; // assigning http url string -$focus = new Leads(); +$focus = new Lead(); $smarty = new vtigerCRM_Smarty; $other_text=Array(); Modified: vtigercrm/branches/5.0.1/modules/Leads/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/Save.php Mon Oct 16 01:50:32 2006 @@ -13,14 +13,14 @@ * Contributor(s): ______________________________________. ********************************************************************************/ -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/UserInfoUtil.php'); $local_log =& LoggerManager::getLogger('index'); global $log,$adb; -$focus = new Leads(); +$focus = new Lead(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/Leads/result.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Leads/result.php (original) +++ vtigercrm/branches/5.0.1/modules/Leads/result.php Mon Oct 16 01:50:32 2006 @@ -12,7 +12,7 @@ require_once('include/utils/utils.php'); require_once 'Excel/reader.php'; -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('include/database/PearDatabase.php'); $data = new Spreadsheet_Excel_Reader(); Modified: vtigercrm/branches/5.0.1/modules/Notes/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/Delete.php Mon Oct 16 01:50:32 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Notes/Notes.php'); +require_once('modules/Notes/Note.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('note_delete'); -$focus = new Notes(); +$focus = new Note(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the note."); Modified: vtigercrm/branches/5.0.1/modules/Notes/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/DetailView.php Mon Oct 16 01:50:32 2006 @@ -22,14 +22,14 @@ require_once('data/Tracker.php'); require_once('Smarty_setup.php'); -require_once('modules/Notes/Notes.php'); +require_once('modules/Notes/Note.php'); require_once('include/upload_file.php'); require_once('include/utils/utils.php'); global $app_strings; global $mod_strings; global $currentModule; -$focus = new Notes(); +$focus = new Note(); if(isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Notes"); Modified: vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Notes/Notes.php'); +require_once('modules/Notes/Note.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Notes(); + $modObj = new Note(); $modObj->retrieve_entity_info($crmid,"Notes"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Notes/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/EditView.php Mon Oct 16 01:50:32 2006 @@ -22,12 +22,12 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Notes/Notes.php'); +require_once('modules/Notes/Note.php'); require_once('include/utils/utils.php'); global $app_strings,$app_list_strings,$mod_strings,$theme,$currentModule; -$focus = new Notes(); +$focus = new Note(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['upload_error'] == true) Modified: vtigercrm/branches/5.0.1/modules/Notes/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/ListView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Notes/Notes.php'); +require_once('modules/Notes/Note.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -66,7 +66,7 @@ $url_string = ''; // assigning http url string -$focus = new Notes(); +$focus = new Note(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Notes/Note.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/Note.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/Note.php Mon Oct 16 01:50:32 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Notes/Notes.php,v 1.15 2005/03/15 10:01:08 shaw Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Notes/Note.php,v 1.15 2005/03/15 10:01:08 shaw Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -70,9 +70,9 @@ var $default_order_by = 'modifiedtime'; var $default_sort_order = 'ASC'; - function Notes() { + function Note() { $this->log = LoggerManager::getLogger('notes'); - $this->log->debug("Entering Notes() method ..."); + $this->log->debug("Entering Note() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Notes'); $this->log->debug("Exiting Note method ..."); Modified: vtigercrm/branches/5.0.1/modules/Notes/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Notes/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Notes/Save.php Mon Oct 16 01:50:32 2006 @@ -21,13 +21,13 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Notes/Notes.php'); +require_once('modules/Notes/Note.php'); require_once('include/logging.php'); require_once('include/upload_file.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Notes(); +$focus = new Note(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/Potentials/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ } else { -$focus = new Potentials(); +$focus = new Potential(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/Potentials/Charts.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/Charts.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/Charts.php Mon Oct 16 01:50:32 2006 @@ -19,7 +19,7 @@ require_once('config.php'); require_once('include/logging.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('Image/Graph.php'); require_once('include/utils/utils.php'); require_once('include/utils/GraphUtils.php'); @@ -102,7 +102,7 @@ //Now do the db queries //query for opportunity data that matches $datay and $user - $opp = new Potentials(); + $opp = new Potential(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -441,7 +441,7 @@ //Now do the db queries //query for opportunity data that matches $datay and $user - $opp = new Potentials(); + $opp = new Potential(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -779,7 +779,7 @@ //Now do the db queries //query for opportunity data that matches $datax and $user - $opp = new Potentials(); + $opp = new Potential(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -1057,7 +1057,7 @@ $where .= ")"; } - $opp = new Potentials(); + $opp = new Potential(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by lead source data Modified: vtigercrm/branches/5.0.1/modules/Potentials/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/Delete.php Mon Oct 16 01:50:32 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Potentials(); +$focus = new Potential(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the opportunity."); Modified: vtigercrm/branches/5.0.1/modules/Potentials/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/DetailView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('include/CustomFieldUtil.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -31,7 +31,7 @@ global $app_strings; global $currentModule, $singlepane_view; -$focus = new Potentials(); +$focus = new Potential(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Potentials(); + $modObj = new Potential(); $modObj->retrieve_entity_info($crmid,"Potentials"); $modObj->column_fields[$fieldname] = $fieldvalue; $_REQUEST[$fieldname] = $fieldvalue; Modified: vtigercrm/branches/5.0.1/modules/Potentials/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/EditView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -30,7 +30,7 @@ global $app_strings; global $mod_strings; global $currentModule; -$focus = new Potentials(); +$focus = new Potential(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/branches/5.0.1/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/ListView.php Mon Oct 16 01:50:32 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -38,7 +38,7 @@ $url_string = ''; // assigning http url string -$focus = new Potentials(); +$focus = new Potential(); $smarty = new vtigerCRM_Smarty(); $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Potentials/ListViewTop.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/ListViewTop.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/ListViewTop.php Mon Oct 16 01:50:32 2006 @@ -28,7 +28,7 @@ $log = LoggerManager::getLogger('top opportunity_list'); $log->debug("Entering getTopPotentials() method ..."); require_once("data/Tracker.php"); - require_once('modules/Potentials/Potentials.php'); + require_once('modules/Potentials/Opportunity.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); Modified: vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/Opportunity.php Mon Oct 16 01:50:32 2006 @@ -13,7 +13,7 @@ * Contributor(s): ______________________________________. ********************************************************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Potentials/Potentials.php,v 1.65 2005/04/28 08:08:27 rank Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Potentials/Opportunity.php,v 1.65 2005/04/28 08:08:27 rank Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -25,10 +25,10 @@ require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Notes.php'); -require_once('modules/Emails/Emails.php'); +require_once('modules/Notes/Note.php'); +require_once('modules/Emails/Email.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -96,7 +96,7 @@ var $default_order_by = 'potentialname'; var $default_sort_order = 'ASC'; - function Potentials() { + function Potential() { $this->log = LoggerManager::getLogger('potential'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Potentials'); @@ -233,7 +233,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new Contacts(); + $focus = new Contact(); $button = ''; @@ -294,10 +294,10 @@ { global $log, $singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); - require_once('modules/Products/Products.php'); + require_once('modules/Products/Product.php'); global $app_strings; - $focus = new Products(); + $focus = new Product(); $button = ''; @@ -446,10 +446,10 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quotes.php'); + require_once('modules/Quotes/Quote.php'); if($this->column_fields['account_id']!='') - $focus = new Quotes(); + $focus = new Quote(); $button = ''; if(isPermitted("Quotes",1,"") == 'yes') Modified: vtigercrm/branches/5.0.1/modules/Potentials/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Potentials/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Potentials/Save.php Mon Oct 16 01:50:32 2006 @@ -20,13 +20,13 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Potentials/Potentials.php'); +require_once('modules/Potentials/Opportunity.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Potentials(); +$focus = new Potential(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/PriceBooks/PriceBook.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -22,7 +22,7 @@ { global $currentModule; -$focus = new PriceBooks(); +$focus = new PriceBook(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/Delete.php Mon Oct 16 01:50:32 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/PriceBooks/PriceBook.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new PriceBooks(); +$focus = new PriceBook(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/DetailView.php Mon Oct 16 01:50:32 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/PriceBooks/PriceBook.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new PriceBooks(); +$focus = new PriceBook(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/PriceBooks/PriceBook.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new PriceBooks(); + $modObj = new PriceBook(); $modObj->retrieve_entity_info($crmid,"PriceBooks"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/EditView.php Mon Oct 16 01:50:32 2006 @@ -11,12 +11,12 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/PriceBooks/PriceBook.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$theme,$currentModule; -$focus = new PriceBooks(); +$focus = new PriceBook(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/ListView.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/PriceBooks/PriceBook.php'); require_once('include/ListView/ListView.php'); require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); @@ -33,7 +33,7 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$focus = new PriceBooks(); +$focus = new PriceBook(); $other_text=Array(); if(!$_SESSION['lvs'][$currentModule]) Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/PriceBook.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/PriceBook.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/PriceBook.php Mon Oct 16 01:50:32 2006 @@ -51,9 +51,9 @@ /** Constructor which will set the column_fields in this object */ - function PriceBooks() { + function PriceBook() { $this->log =LoggerManager::getLogger('pricebook'); - $this->log->debug("Entering PriceBooks() method ..."); + $this->log->debug("Entering PriceBook() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('PriceBooks'); $this->log->debug("Exiting PriceBook method ..."); @@ -98,8 +98,8 @@ global $log,$singlepane_view; $log->debug("Entering get_pricebook_products(".$id.") method ..."); global $app_strings; - require_once('modules/Products/Products.php'); - $focus = new Products(); + require_once('modules/Products/Product.php'); + $focus = new Product(); $button = ''; Modified: vtigercrm/branches/5.0.1/modules/PriceBooks/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PriceBooks/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/PriceBooks/Save.php Mon Oct 16 01:50:32 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/PriceBooks/PriceBook.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new PriceBooks(); +$focus = new PriceBook(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/Products/AddProductToPriceBooks.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/AddProductToPriceBooks.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/AddProductToPriceBooks.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/PriceBooks/PriceBook.php'); require_once('include/utils/utils.php'); require_once('include/ComboUtil.php'); @@ -30,7 +30,7 @@ $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$focus = new PriceBooks(); +$focus = new PriceBook(); //Retreive the list of PriceBooks $list_query = getListQuery("PriceBooks"); Modified: vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/AddProductsToPriceBook.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Products.php'); +require_once('modules/Products/Product.php'); require_once('include/utils/utils.php'); require_once('include/utils/utils.php'); require_once('include/ComboUtil.php'); @@ -29,7 +29,7 @@ $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$focus = new Products(); +$focus = new Product(); if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; Modified: vtigercrm/branches/5.0.1/modules/Products/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Products/Products.php'); +require_once('modules/Products/Product.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -21,7 +21,7 @@ } else { -$focus = new Products(); +$focus = new Product(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) Modified: vtigercrm/branches/5.0.1/modules/Products/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/Delete.php Mon Oct 16 01:50:32 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Products/Products.php'); +require_once('modules/Products/Product.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new Products(); +$focus = new Product(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Products/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/DetailView.php Mon Oct 16 01:50:32 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Products.php'); +require_once('modules/Products/Product.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new Products(); +$focus = new Product(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { //Display the error message Modified: vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Products/Products.php'); +require_once('modules/Products/Product.php'); require_once('include/database/PearDatabase.php'); global $adb,$current_user; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Products(); + $modObj = new Product(); $modObj->retrieve_entity_info($crmid,"Products"); $modObj->column_fields[$fieldname] = $fieldvalue; if($fieldname == 'unit_price')//unit price converted to dollar value while saving Modified: vtigercrm/branches/5.0.1/modules/Products/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/EditView.php Mon Oct 16 01:50:32 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/Products/Products.php'); +require_once('modules/Products/Product.php'); require_once('include/FormValidationUtil.php'); global $app_strings; @@ -28,7 +28,7 @@ -$focus = new Products(); +$focus = new Product(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['record']!="") Modified: vtigercrm/branches/5.0.1/modules/Products/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/ListView.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Products.php'); +require_once('modules/Products/Product.php'); require_once('include/ListView/ListView.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -56,7 +56,7 @@ } $url_string = '&smodule=PRODUCTS'; // assigning http url string -$focus = new Products(); +$focus = new Product(); //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> $sorder = $focus->getSortOrder(); Modified: vtigercrm/branches/5.0.1/modules/Products/Product.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/Product.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/Product.php Mon Oct 16 01:50:32 2006 @@ -72,9 +72,9 @@ /** Constructor which will set the column_fields in this object */ - function Products() { + function Product() { $this->log =LoggerManager::getLogger('product'); - $this->log->debug("Entering Products() method ..."); + $this->log->debug("Entering Product() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Products'); $this->log->debug("Exiting Product method ..."); @@ -301,8 +301,8 @@ global $log, $singlepane_view; $log->debug("Entering get_quotes(".$id.") method ..."); global $app_strings; - require_once('modules/Quotes/Quotes.php'); - $focus = new Quotes(); + require_once('modules/Quotes/Quote.php'); + $focus = new Quote(); $button = ''; if($singlepane_view == 'true') @@ -345,7 +345,7 @@ $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new PurchaseOrder(); + $focus = new Order(); $button = ''; @@ -466,8 +466,8 @@ global $log,$singlepane_view; $log->debug("Entering get_product_pricebooks(".$id.") method ..."); global $mod_strings; - require_once('modules/PriceBooks/PriceBooks.php'); - $focus = new PriceBooks(); + require_once('modules/PriceBooks/PriceBook.php'); + $focus = new PriceBook(); $button = ''; if($singlepane_view == 'true') $returnset = '&return_module=Products&return_action=DetailView&return_id='.$id; Modified: vtigercrm/branches/5.0.1/modules/Products/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Products/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Products/Save.php Mon Oct 16 01:50:32 2006 @@ -21,14 +21,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Products/Products.php'); +require_once('modules/Products/Product.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); global $log,$current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); $rate = $rate_symbol['rate']; -$focus = new Products(); +$focus = new Product(); if(isset($_REQUEST['record'])) { $focus->id = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -21,7 +21,7 @@ } else { -$focus = new PurchaseOrder(); +$focus = new Order(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/CreatePDF.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/CreatePDF.php Mon Oct 16 01:50:32 2006 @@ -26,7 +26,7 @@ $id = $_REQUEST['record']; //retreiving the vtiger_invoice info -$focus = new PurchaseOrder(); +$focus = new Order(); $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); $vendor_name = getVendorName($focus->column_fields[vendor_id]); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/Delete.php Mon Oct 16 01:50:32 2006 @@ -24,7 +24,7 @@ require_once('include/logging.php'); $log = LoggerManager::getLogger('order_delete'); -$focus = new PurchaseOrder(); +$focus = new Order(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailView.php Mon Oct 16 01:50:32 2006 @@ -29,7 +29,7 @@ require_once('user_privileges/default_module_view.php'); global $mod_strings,$app_strings,$theme,$currentModule,$singlepane_view; -$focus = new PurchaseOrder(); +$focus = new Order(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new PurchaseOrder(); + $modObj = new Order(); $modObj->retrieve_entity_info($crmid,"PurchaseOrder"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/EditView.php Mon Oct 16 01:50:32 2006 @@ -31,7 +31,7 @@ global $app_strings,$mod_strings,$log,$theme,$currentModule; -$focus = new PurchaseOrder(); +$focus = new Order(); $smarty = new vtigerCRM_Smarty(); global $current_user; $currencyid=fetchCurrency($current_user->id); @@ -60,8 +60,8 @@ // Get vtiger_vendor address if vtiger_vendorid is given if(isset($_REQUEST['vendor_id']) && $_REQUEST['vendor_id']!='' && $_REQUEST['record']==''){ - require_once('modules/Vendors/Vendors.php'); - $vend_focus = new Vendors(); + require_once('modules/Vendors/Vendor.php'); + $vend_focus = new Vendor(); $vend_focus->retrieve_entity_info($_REQUEST['vendor_id'],"Vendors"); $focus->column_fields['bill_city']=$vend_focus->column_fields['city']; Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListTopPurchaseOrder.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListTopPurchaseOrder.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListTopPurchaseOrder.php Mon Oct 16 01:50:32 2006 @@ -47,7 +47,7 @@ $viewid = "0"; } } - $focus = new PurchaseOrder(); + $focus = new Order(); $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/ListView.php Mon Oct 16 01:50:32 2006 @@ -35,7 +35,7 @@ $url_string = '&smodule=PO'; -$focus = new PurchaseOrder(); +$focus = new Order(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/PurchaseOrder.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/PurchaseOrder.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/PurchaseOrder.php Mon Oct 16 01:50:32 2006 @@ -30,7 +30,7 @@ require_once('user_privileges/default_module_view.php'); // Account is used to store vtiger_account information. -class PurchaseOrder extends CRMEntity { +class Order extends CRMEntity { var $log; var $db; @@ -94,7 +94,7 @@ * 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. */ - function PurchaseOrder() { + function Order() { $this->log =LoggerManager::getLogger('PurchaseOrder'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('PurchaseOrder'); Modified: vtigercrm/branches/5.0.1/modules/PurchaseOrder/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/PurchaseOrder/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/PurchaseOrder/Save.php Mon Oct 16 01:50:32 2006 @@ -27,7 +27,7 @@ $local_log =& LoggerManager::getLogger('index'); -$focus = new PurchaseOrder(); +$focus = new Order(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/branches/5.0.1/modules/Quotes/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ } else { -$focus = new Quotes(); +$focus = new Quote(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/branches/5.0.1/modules/Quotes/CreatePDF.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/CreatePDF.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/CreatePDF.php Mon Oct 16 01:50:32 2006 @@ -11,7 +11,7 @@ require_once('include/fpdf/pdf.php'); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); require_once('include/database/PearDatabase.php'); global $adb,$app_strings; @@ -25,7 +25,7 @@ global $products_per_page; $products_per_page="6"; -$focus = new Quotes(); +$focus = new Quote(); $focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); $account_name = getAccountName($focus->column_fields[account_id]); Modified: vtigercrm/branches/5.0.1/modules/Quotes/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/Delete.php Mon Oct 16 01:50:32 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('quote_delete'); -$focus = new Quotes(); +$focus = new Quote(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Quotes/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/DetailView.php Mon Oct 16 01:50:32 2006 @@ -22,13 +22,13 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); global $mod_strings,$app_strings,$currentModule,$theme,$singlepane_view; -$focus = new Quotes(); +$focus = new Quote(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); Modified: vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Quotes(); + $modObj = new Quote(); $modObj->retrieve_entity_info($crmid,"Quotes"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Quotes/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/EditView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ $log->debug("Inside Quote EditView"); -$focus = new Quotes(); +$focus = new Quote(); $smarty = new vtigerCRM_Smarty; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); @@ -70,8 +70,8 @@ // Get Account address if vtiger_account is given if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']==''){ - require_once('modules/Accounts/Accounts.php'); - $acct_focus = new Accounts(); + require_once('modules/Accounts/Account.php'); + $acct_focus = new Account(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/branches/5.0.1/modules/Quotes/ListTopQuotes.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/ListTopQuotes.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/ListTopQuotes.php Mon Oct 16 01:50:32 2006 @@ -19,7 +19,7 @@ function getTopQuotes() { require_once("data/Tracker.php"); - require_once('modules/Quotes/Quotes.php'); + require_once('modules/Quotes/Quote.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); require_once('include/database/PearDatabase.php'); @@ -51,7 +51,7 @@ $viewid = "0"; } } - $focus = new Quotes(); + $focus = new Quote(); $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; Modified: vtigercrm/branches/5.0.1/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/ListView.php Mon Oct 16 01:50:32 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -33,7 +33,7 @@ $url_string = ''; -$focus = new Quotes(); +$focus = new Quote(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/branches/5.0.1/modules/Quotes/Quote.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/Quote.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/Quote.php Mon Oct 16 01:50:32 2006 @@ -101,7 +101,7 @@ /** Constructor which will set the column_fields in this object */ - function Quotes() { + function Quote() { $this->log =LoggerManager::getLogger('quote'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Quotes'); Modified: vtigercrm/branches/5.0.1/modules/Quotes/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Quotes/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Quotes/Save.php Mon Oct 16 01:50:32 2006 @@ -21,7 +21,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); include("modules/Emails/mail.php"); @@ -34,7 +34,7 @@ $rate = $rate_symbol['rate']; $log->debug("Inside Quote Save"); -$focus = new Quotes(); +$focus = new Quote(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/branches/5.0.1/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/SalesOrder/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/SalesOrder/EditView.php Mon Oct 16 01:50:32 2006 @@ -23,7 +23,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/SalesOrder/SalesOrder.php'); -require_once('modules/Quotes/Quotes.php'); +require_once('modules/Quotes/Quote.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -44,7 +44,7 @@ if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoso') { $quoteid = $_REQUEST['record']; - $quote_focus = new Quotes(); + $quote_focus = new Quote(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -80,7 +80,7 @@ $quoteid = $focus->column_fields['quote_id']; $smarty->assign("QUOTE_ID", $focus->column_fields['quote_id']); - $quote_focus = new Quotes(); + $quote_focus = new Quote(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -118,7 +118,7 @@ $focus->column_fields['duedate'] = getDBInsertDateValue($curr_due_date); } $quoteid = $focus->column_fields['quote_id']; - $quote_focus = new Quotes(); + $quote_focus = new Quote(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -161,8 +161,8 @@ // Get Account address if vtiger_account is given if(isset($_REQUEST['account_id']) && $_REQUEST['record']=='' && $_REQUEST['account_id'] != ''){ - require_once('modules/Accounts/Accounts.php'); - $acct_focus = new Accounts(); + require_once('modules/Accounts/Account.php'); + $acct_focus = new Account(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/branches/5.0.1/modules/Users/Authenticate.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/Authenticate.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/Authenticate.php Mon Oct 16 01:50:32 2006 @@ -20,14 +20,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('modules/Users/CreateUserPrivilegeFile.php'); require_once('include/logging.php'); require_once('user_privileges/audit_trail.php'); global $mod_strings; -$focus = new Users(); +$focus = new User(); // Add in defensive code here. $focus->column_fields["user_name"] = to_html($_REQUEST['user_name']); Modified: vtigercrm/branches/5.0.1/modules/Users/ChangePassword.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ChangePassword.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ChangePassword.php Mon Oct 16 01:50:32 2006 @@ -23,7 +23,7 @@ // The popup_picker.html file is used for generating a list from which to find and choose one instance. global $theme; -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); Modified: vtigercrm/branches/5.0.1/modules/Users/CreateUserPrivilegeFile.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/CreateUserPrivilegeFile.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/CreateUserPrivilegeFile.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('config.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/utils/utils.php'); require_once('include/utils/GetUserGroups.php'); @@ -32,7 +32,7 @@ $newbuf .="retrieve_entity_info($userid,"Users"); $userInfo=Array(); $user_focus->column_fields["id"] = ''; @@ -120,7 +120,7 @@ $newbuf .="retrieve_entity_info($userid,"Users"); if($user_focus->is_admin == 'on') { Modified: vtigercrm/branches/5.0.1/modules/Users/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/DetailView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('include/utils/utils.php'); require_once('include/utils/CommonUtils.php'); require_once('include/utils/UserInfoUtil.php'); @@ -37,7 +37,7 @@ global $app_strings; global $mod_strings; -$focus = new Users(); +$focus = new User(); if(!empty($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],'Users'); Modified: vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -24,7 +24,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $userObj = new Users(); + $userObj = new User(); $userObj->retrieve_entity_info($crmid,"Users"); $userObj->column_fields[$fieldname] = $fieldvalue; $userObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Users/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/EditView.php Mon Oct 16 01:50:32 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('include/utils/UserInfoUtil.php'); require_once('modules/Users/Forms.php'); require_once('include/database/PearDatabase.php'); @@ -36,7 +36,7 @@ $smarty=new vtigerCRM_Smarty; -$focus = new Users(); +$focus = new User(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $smarty->assign("ID",$_REQUEST['record']); Modified: vtigercrm/branches/5.0.1/modules/Users/ListLoginHistory.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ListLoginHistory.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ListLoginHistory.php Mon Oct 16 01:50:32 2006 @@ -12,7 +12,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/branches/5.0.1/modules/Users/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ListView.php Mon Oct 16 01:50:32 2006 @@ -24,7 +24,7 @@ global $current_language; $mod_strings = return_module_language($current_language,'Users'); $category = getParentTab(); -$focus = new Users(); +$focus = new User(); $smarty = new vtigerCRM_Smarty; $no_of_users=UserCount(); //Retreiving the start value from request Modified: vtigercrm/branches/5.0.1/modules/Users/Logout.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/Logout.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/Logout.php Mon Oct 16 01:50:32 2006 @@ -20,7 +20,7 @@ require_once('include/logging.php'); require_once('database/DatabaseConnection.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('config.php'); require_once('include/db_backup/backup.php'); require_once('include/db_backup/ftp.php'); Modified: vtigercrm/branches/5.0.1/modules/Users/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/Save.php Mon Oct 16 01:50:32 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('include/logging.php'); require_once('include/utils/UserInfoUtil.php'); $log =& LoggerManager::getLogger('index'); @@ -46,7 +46,7 @@ if (isset($_POST['record']) && !is_admin($current_user) && $_POST['record'] != $current_user->id) echo ("Unauthorized access to user administration."); elseif (!isset($_POST['record']) && !is_admin($current_user)) echo ("Unauthorized access to user administration."); -$focus = new Users(); +$focus = new User(); if(isset($_REQUEST["record"]) && $_REQUEST["record"] != '') { $focus->mode='edit'; Modified: vtigercrm/branches/5.0.1/modules/Users/ShowAuditTrail.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ShowAuditTrail.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ShowAuditTrail.php Mon Oct 16 01:50:32 2006 @@ -12,7 +12,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/AuditTrail.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/branches/5.0.1/modules/Users/ShowHistory.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/ShowHistory.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/ShowHistory.php Mon Oct 16 01:50:32 2006 @@ -12,11 +12,11 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/Users.php'); +require_once('modules/Users/User.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -#require_once('modules/Users/Users.php'); +#require_once('modules/Users/User.php'); require_once('include/utils/utils.php'); global $app_strings; Modified: vtigercrm/branches/5.0.1/modules/Users/User.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/User.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/User.php Mon Oct 16 01:50:32 2006 @@ -21,7 +21,7 @@ ********************************************/ /********************************************************************************* - * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/Users.php,v 1.10 2005/04/19 14:40:48 ray Exp $ + * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/User.php,v 1.10 2005/04/19 14:40:48 ray Exp $ * Description: TODO: To be written. * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. * All Rights Reserved. @@ -33,7 +33,7 @@ require_once('data/CRMEntity.php'); require_once('include/utils/UserInfoUtil.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); require_once('data/Tracker.php'); // User is used to store customer information. @@ -155,11 +155,11 @@ * */ - function Users() { + function User() { $this->log = LoggerManager::getLogger('user'); - $this->log->debug("Entering Users() method ..."); + $this->log->debug("Entering User() method ..."); $this->db = new PearDatabase(); - $this->log->debug("Exiting Users() method ..."); + $this->log->debug("Exiting User() method ..."); } Modified: vtigercrm/branches/5.0.1/modules/Users/massChangeStatus.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/massChangeStatus.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/massChangeStatus.php Mon Oct 16 01:50:32 2006 @@ -15,12 +15,12 @@ require_once('include/ComboUtil.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); global $app_list_strings; global $app_strings; global $current_user; -$focus = new Leads(); +$focus = new Lead(); $idlist = $_POST['idlist']; //echo $idlist; Modified: vtigercrm/branches/5.0.1/modules/Users/populatetemplate.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Users/populatetemplate.php (original) +++ vtigercrm/branches/5.0.1/modules/Users/populatetemplate.php Mon Oct 16 01:50:32 2006 @@ -10,9 +10,9 @@ ********************************************************************************/ //query the specific vtiger_table and then get the data and write the data here require_once('include/database/PearDatabase.php'); -include_once('modules/Contacts/Contacts.php'); -include_once('modules/Leads/Leads.php'); -include_once('modules/Users/Users.php'); +include_once('modules/Contacts/Contact.php'); +include_once('modules/Leads/Lead.php'); +include_once('modules/Users/User.php'); global $log; //download the template file and store it in some specific location @@ -60,11 +60,11 @@ //get the module if($module == 'leads') { - $focus = new Leads(); + $focus = new Lead(); } else { - $focus = new Contacts(); + $focus = new Contact(); } $focus->retrieve_entity_info($recordid,$module); Modified: vtigercrm/branches/5.0.1/modules/Vendors/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendors.php'); +require_once('modules/Vendors/Vendor.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ else { global $currentModule; -$focus = new Vendors(); +$focus = new Vendor(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/branches/5.0.1/modules/Vendors/Delete.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/Delete.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/Delete.php Mon Oct 16 01:50:32 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Vendors/Vendors.php'); +require_once('modules/Vendors/Vendor.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new Vendors(); +$focus = new Vendor(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/branches/5.0.1/modules/Vendors/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/DetailView.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/DetailView.php Mon Oct 16 01:50:32 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendors.php'); +require_once('modules/Vendors/Vendor.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new Vendors(); +$focus = new Vendor(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/DetailViewAjax.php Mon Oct 16 01:50:32 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Vendors/Vendors.php'); +require_once('modules/Vendors/Vendor.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Vendors(); + $modObj = new Vendor(); $modObj->retrieve_entity_info($crmid,"Vendors"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/branches/5.0.1/modules/Vendors/EditView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/EditView.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/EditView.php Mon Oct 16 01:50:32 2006 @@ -11,12 +11,12 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/Vendors/Vendors.php'); +require_once('modules/Vendors/Vendor.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$theme,$currentModule; -$focus = new Vendors(); +$focus = new Vendor(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/branches/5.0.1/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/ListView.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/ListView.php Mon Oct 16 01:50:32 2006 @@ -11,7 +11,7 @@ require_once('include/database/PearDatabase.php'); require_once('include/database/Postgres8.php'); require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendors.php'); +require_once('modules/Vendors/Vendor.php'); require_once('include/ListView/ListView.php'); require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); @@ -32,7 +32,7 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$focus = new Vendors(); +$focus = new Vendor(); $other_text = Array(); if(!$_SESSION['lvs'][$currentModule]) Modified: vtigercrm/branches/5.0.1/modules/Vendors/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/Save.php Mon Oct 16 01:50:32 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Vendors/Vendors.php'); +require_once('modules/Vendors/Vendor.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new Vendors(); +$focus = new Vendor(); setObjectValuesFromRequest(&$focus); $focus->save("Vendors"); Modified: vtigercrm/branches/5.0.1/modules/Vendors/Vendor.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Vendors/Vendor.php (original) +++ vtigercrm/branches/5.0.1/modules/Vendors/Vendor.php Mon Oct 16 01:50:32 2006 @@ -58,9 +58,9 @@ /** Constructor which will set the column_fields in this object */ - function Vendors() { + function Vendor() { $this->log =LoggerManager::getLogger('vendor'); - $this->log->debug("Entering Vendors() method ..."); + $this->log->debug("Entering Vendor() method ..."); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('Vendors'); $this->log->debug("Exiting Vendor method ..."); @@ -75,8 +75,8 @@ global $log,$singlepane_view; $log->debug("Entering get_products(".$id.") method ..."); global $app_strings; - require_once('modules/Products/Products.php'); - $focus = new Products(); + require_once('modules/Products/Product.php'); + $focus = new Product(); $button = ''; @@ -100,7 +100,7 @@ $log->debug("Entering get_purchase_orders(".$id.") method ..."); global $app_strings; require_once('modules/PurchaseOrder/PurchaseOrder.php'); - $focus = new PurchaseOrder(); + $focus = new Order(); $button = ''; @@ -123,8 +123,8 @@ global $log,$singlepane_view; $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - require_once('modules/Contacts/Contacts.php'); - $focus = new Contacts(); + require_once('modules/Contacts/Contact.php'); + $focus = new Contact(); $button = ''; if($singlepane_view == 'true') Modified: vtigercrm/branches/5.0.1/modules/Webmails/CallRelatedList.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Webmails/CallRelatedList.php (original) +++ vtigercrm/branches/5.0.1/modules/Webmails/CallRelatedList.php Mon Oct 16 01:50:32 2006 @@ -11,7 +11,7 @@ global $current_user; require_once('Smarty_setup.php'); -require_once('modules/Leads/Leads.php'); +require_once('modules/Leads/Lead.php'); require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once('data/Tracker.php'); Modified: vtigercrm/branches/5.0.1/modules/Webmails/Save.php ============================================================================== --- vtigercrm/branches/5.0.1/modules/Webmails/Save.php (original) +++ vtigercrm/branches/5.0.1/modules/Webmails/Save.php Mon Oct 16 01:50:32 2006 @@ -9,7 +9,7 @@ * ********************************************************************************/ -require_once('modules/Emails/Emails.php'); +require_once('modules/Emails/Email.php'); require_once('modules/Webmails/Webmail.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); @@ -20,7 +20,7 @@ global $current_user; $local_log =& LoggerManager::getLogger('index'); -$focus = new Emails(); +$focus = new Email(); $to_address = explode(";",$_REQUEST['to_list']); $cc_address = explode(";",$_REQUEST['cc_list']); @@ -61,8 +61,8 @@ 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(); + require_once('modules/Contacts/Contact.php'); + $contact_focus = new Contact(); $contact_focus->column_fields['lastname'] =$email->fromname; $contact_focus->column_fields['email'] = $email->from; $contact_focus->save("Contacts"); Modified: vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php (original) +++ vtigercrm/branches/5.0.1/soap/firefoxtoolbar.php Mon Oct 16 01:50:32 2006 @@ -175,8 +175,8 @@ function CheckLeadPermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -193,8 +193,8 @@ function CheckContactPermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -211,8 +211,8 @@ function CheckAccountPermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -229,8 +229,8 @@ function CheckTicketPermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -247,8 +247,8 @@ function CheckVendorPermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -265,8 +265,8 @@ function CheckProductPermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -283,8 +283,8 @@ function CheckNotePermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -301,8 +301,8 @@ function CheckSitePermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -319,8 +319,8 @@ function CheckRssPermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -340,8 +340,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -365,11 +365,11 @@ function LogintoVtigerCRM($user_name,$password) { global $log; - require_once('modules/Users/Users.php'); + require_once('modules/Users/User.php'); $return_access = "FALSE"; - $objuser = new Users(); + $objuser = new User(); if($password != "") { @@ -397,8 +397,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -436,15 +436,15 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $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(); + require_once("modules/Notes/Note.php"); + + $focus = new Note(); if(isPermitted("Notes","EditView") == "yes") { $focus->column_fields['notes_title'] = $subject; @@ -473,17 +473,17 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $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"); + require_once("modules/Products/Product.php"); if(isPermitted("Products","EditView") == "yes") { - $focus = new Products(); + $focus = new Product(); $focus->column_fields['productname'] = $productname; $focus->column_fields['productcode'] = $code; $focus->column_fields['website'] = $website; @@ -508,16 +508,16 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $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"); + require_once("modules/Vendors/Vendor.php"); if(isPermitted("Vendors","EditView" ) == "yes") { - $focus = new Vendors(); + $focus = new Vendor(); $focus->column_fields['vendorname'] = $vendorname; $focus->column_fields['email'] = $email; $focus->column_fields['phone'] = $phone; @@ -547,8 +547,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -591,15 +591,15 @@ 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(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $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"); + require_once("modules/Accounts/Account.php"); if(isPermitted("Accounts","EditView") == "yes") { - $account=new Accounts(); + $account=new Account(); $account->column_fields['accountname']=$accountname; $account->column_fields['email1']=$email; $account->column_fields['phone']=$phone; @@ -642,15 +642,15 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $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(); + require_once("modules/Leads/Lead.php"); + + $focus = new Lead(); if(isPermitted("Leads","EditView") == "yes") { $focus->column_fields['lastname'] = $lastname; @@ -689,16 +689,16 @@ { global $adb,$log; global $current_user; - require_once('modules/Users/Users.php'); - $seed_user = new Users(); + require_once('modules/Users/User.php'); + $seed_user = new User(); $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'); + require_once('modules/Contacts/Contact.php'); if(isPermitted("Contacts","EditView") == "yes") { - $contact = new Contacts(); + $contact = new Contact(); $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 Modified: vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php (original) +++ vtigercrm/branches/5.0.1/soap/thunderbirdplugin.php Mon Oct 16 01:50:32 2006 @@ -13,7 +13,7 @@ require_once('include/logging.php'); require_once('include/nusoap/nusoap.php'); require_once('include/database/PearDatabase.php'); -require_once('modules/Contacts/Contacts.php'); +require_once('modules/Contacts/Contact.php'); $log = &LoggerManager::getLogger('thunderbirdplugin'); @@ -173,9 +173,9 @@ function SearchContactsByEmail($username,$emailaddress) { - require_once('modules/Contacts/Contacts.php'); - - $seed_contact = new Contacts(); + require_once('modules/Contacts/Contact.php'); + + $seed_contact = new Contact(); $output_list = Array(); $response = $seed_contact->get_searchbyemailid($username,$emailaddress); @@ -201,13 +201,13 @@ 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(); + require_once('modules/Users/User.php'); + require_once('modules/Emails/Email.php'); + + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($user_name); - $email = new Emails(); + $email = new Email(); //$log->debug($msgdtls['contactid']); $emailbody = str_replace("'", "''", $email_body); $emailsubject = str_replace("'", "''",$email_subject); @@ -241,9 +241,9 @@ { global $adb; global $log; - require_once('modules/Contacts/Contacts.php'); - - $seed_contact = new Contacts(); + require_once('modules/Contacts/Contact.php'); + + $seed_contact = new Contact(); $output_list = Array(); $query = $seed_contact->get_contactsforol($username); @@ -332,8 +332,8 @@ $rows_count = $db->getRowCount($result); if($rows_count==0) { - require_once('modules/Accounts/Accounts.php'); - $account = new Accounts(); + require_once('modules/Accounts/Account.php'); + $account = new Account(); $account->column_fields[accountname] = $account_name; $account->column_fields[assigned_user_id]=$user_id; //$account->saveentity("Accounts"); @@ -360,10 +360,10 @@ { global $adb; global $current_user; - require_once('modules/Users/Users.php'); - require_once('modules/Contacts/Contacts.php'); - - $seed_user = new Users(); + require_once('modules/Users/User.php'); + require_once('modules/Contacts/Contact.php'); + + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($user_name); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -384,7 +384,7 @@ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); } - $contact = new Contacts(); + $contact = new Contact(); $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") : ""; @@ -418,10 +418,10 @@ { global $adb; global $current_user; - require_once('modules/Users/Users.php'); - require_once('modules/Leads/Leads.php'); - - $seed_user = new Users(); + require_once('modules/Users/User.php'); + require_once('modules/Leads/Lead.php'); + + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($user_name); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -442,7 +442,7 @@ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); } - $Lead = new Leads(); + $Lead = new Lead(); $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") : ""; @@ -478,8 +478,8 @@ { global $adb,$log; $return_access = 'failure'; - require_once('modules/Users/Users.php'); - $objuser = new Users(); + require_once('modules/Users/User.php'); + $objuser = new User(); if($password != "" && $user_name != '') { $objuser->column_fields['user_name'] = $user_name; @@ -511,8 +511,8 @@ function CheckContactPerm($user_name) { global $current_user; - require_once('modules/Users/Users.php'); - $seed_user = new Users(); + require_once('modules/Users/User.php'); + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($user_name); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -528,8 +528,8 @@ function CheckContactViewPerm($user_name) { global $current_user,$log; - require_once('modules/Users/Users.php'); - $seed_user = new Users(); + require_once('modules/Users/User.php'); + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($user_name); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); Modified: vtigercrm/branches/5.0.1/soap/vtigerolservice.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/vtigerolservice.php (original) +++ vtigercrm/branches/5.0.1/soap/vtigerolservice.php Mon Oct 16 01:50:32 2006 @@ -280,9 +280,9 @@ function SearchContactsByEmail($username,$emailaddress) { - require_once('modules/Contacts/Contacts.php'); + require_once('modules/Contacts/Contact.php'); - $seed_contact = new Contacts(); + $seed_contact = new Contact(); $output_list = Array(); $response = $seed_contact->get_searchbyemailid($username,$emailaddress); @@ -308,17 +308,17 @@ function AddMessageToContact($username,$contactid,$msgdtls) { global $adb; - require_once('modules/Users/Users.php'); - require_once('modules/Emails/Emails.php'); - - $seed_user = new Users(); + require_once('modules/Users/User.php'); + require_once('modules/Emails/Email.php'); + + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); foreach($msgdtls as $msgdtl) { if(isset($msgdtl)) { - $email = new Emails(); + $email = new Email(); //$log->debug($msgdtls['contactid']); $email_body = str_replace("'", "''", $msgdtl['body']); $email_subject = str_replace("'", "''",$msgdtl['subject']); @@ -356,11 +356,11 @@ function LoginToVtiger($userid,$password) { global $adb; - require_once('modules/Users/Users.php'); + require_once('modules/Users/User.php'); $return_access = "FALSE"; - $objuser = new Users(); + $objuser = new User(); if($password != "") { @@ -385,8 +385,8 @@ function CheckEmailPermission($username) { global $current_user,$log; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -403,8 +403,8 @@ function CheckContactPermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -421,8 +421,8 @@ function CheckActivityPermission($username) { global $current_user; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($username); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -439,12 +439,12 @@ function AddEmailAttachment($emailid,$filedata,$filename,$filesize,$filetype,$username) { global $adb; - require_once('modules/Users/Users.php'); + require_once('modules/Users/User.php'); require_once('include/utils/utils.php'); $date_var = date('YmdHis'); - $seed_user = new Users(); + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $crmid = $adb->getUniqueID("vtiger_crmentity"); @@ -483,9 +483,9 @@ function GetContacts($username) { global $adb; - require_once('modules/Contacts/Contacts.php'); - - $seed_contact = new Contacts(); + require_once('modules/Contacts/Contact.php'); + + $seed_contact = new Contact(); $output_list = Array(); $query = $seed_contact->get_contactsforol($username); @@ -564,15 +564,15 @@ { global $adb; global $current_user; - require_once('modules/Users/Users.php'); - require_once('modules/Contacts/Contacts.php'); - - $seed_user = new Users(); + require_once('modules/Users/User.php'); + require_once('modules/Contacts/Contact.php'); + + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); - $contact = new Contacts(); + $contact = new Contact(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -646,15 +646,15 @@ { global $adb; global $current_user; - require_once('modules/Users/Users.php'); - require_once('modules/Contacts/Contacts.php'); - - $seed_user = new Users(); + require_once('modules/Users/User.php'); + require_once('modules/Contacts/Contact.php'); + + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); - $contact = new Contacts(); + $contact = new Contact(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -727,15 +727,15 @@ function DeleteContacts($username,$crmid) { global $current_user; - require_once('modules/Users/Users.php'); - require_once('modules/Contacts/Contacts.php'); - - $seed_user = new Users(); + require_once('modules/Users/User.php'); + require_once('modules/Contacts/Contact.php'); + + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); - $contact = new Contacts(); + $contact = new Contact(); $contact->id = $crmid; $contact->mark_deleted($contact->id); @@ -760,8 +760,8 @@ $rows_count = $db->getRowCount($result); if($rows_count==0) { - require_once('modules/Accounts/Accounts.php'); - $account = new Accounts(); + require_once('modules/Accounts/Account.php'); + $account = new Account(); $account->column_fields[accountname] = $account_name; $account->column_fields[assigned_user_id]=$user_id; //$account->saveentity("Accounts"); @@ -856,10 +856,10 @@ function AddTasks($username,$taskdtls) { global $current_user,$adb; - require_once('modules/Users/Users.php'); + require_once('modules/Users/User.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new Users(); + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -937,10 +937,10 @@ function UpdateTasks($username,$taskdtls) { global $current_user,$adb; - require_once('modules/Users/Users.php'); + require_once('modules/Users/User.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new Users(); + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1022,10 +1022,10 @@ function DeleteTasks($username,$crmid) { global $current_user; - require_once('modules/Users/Users.php'); + require_once('modules/Users/User.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new Users(); + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1091,10 +1091,10 @@ function AddClndr($username,$clndrdtls) { global $current_user,$adb; - require_once('modules/Users/Users.php'); + require_once('modules/Users/User.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new Users(); + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1159,10 +1159,10 @@ { global $current_user; global $adb,$log; - require_once('modules/Users/Users.php'); + require_once('modules/Users/User.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new Users(); + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1228,10 +1228,10 @@ function DeleteClndr($username,$crmid) { global $current_user; - require_once('modules/Users/Users.php'); + require_once('modules/Users/User.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new Users(); + $seed_user = new User(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); Modified: vtigercrm/branches/5.0.1/soap/webforms.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/webforms.php (original) +++ vtigercrm/branches/5.0.1/soap/webforms.php Mon Oct 16 01:50:32 2006 @@ -82,8 +82,8 @@ $assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id'); } - require_once("modules/Leads/Leads.php"); - $focus = new Leads(); + require_once("modules/Leads/Lead.php"); + $focus = new Lead(); $focus->column_fields['lastname'] = $lastname; $focus->column_fields['email'] = $email; $focus->column_fields['phone'] = $phone; @@ -126,8 +126,8 @@ $assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id'); } - require_once('modules/Contacts/Contacts.php'); - $focus = new Contacts(); + require_once('modules/Contacts/Contact.php'); + $focus = new Contact(); $focus->column_fields['firstname'] = $first_name; $focus->column_fields['lastname'] = $last_name; Modified: vtigercrm/branches/5.0.1/soap/wordplugin.php ============================================================================== --- vtigercrm/branches/5.0.1/soap/wordplugin.php (original) +++ vtigercrm/branches/5.0.1/soap/wordplugin.php Mon Oct 16 01:50:32 2006 @@ -215,8 +215,8 @@ function get_tickets_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($user_name); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); @@ -237,15 +237,15 @@ function get_contacts_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $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") { - require_once('modules/Contacts/Contacts.php'); - $contact = new Contacts(); + require_once('modules/Contacts/Contact.php'); + $contact = new Contact(); $log->debug($contact->getColumnNames()); return $contact->getColumnNames(); } @@ -261,15 +261,15 @@ function get_accounts_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($user_name); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); if(isPermitted("Accounts","index") == "yes") { - require_once('modules/Accounts/Accounts.php'); - $account = new Accounts(); + require_once('modules/Accounts/Account.php'); + $account = new Account(); $log->debug($account->getColumnNames_Acnt()); return $account->getColumnNames_Acnt(); } @@ -285,16 +285,16 @@ function get_leads_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/Users.php"); - $seed_user=new Users(); + require_once("modules/Users/User.php"); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($user_name); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); if(isPermitted("Leads","index") == "yes") { - require_once('modules/Leads/Leads.php'); - $lead = new Leads(); + require_once('modules/Leads/Lead.php'); + $lead = new Lead(); $log->debug($lead->getColumnNames_Lead()); return $lead->getColumnNames_Lead(); } @@ -309,12 +309,12 @@ function get_user_columns($user_name, $password) { global $current_user; - require_once('modules/Users/Users.php'); - $seed_user=new Users(); + require_once('modules/Users/User.php'); + $seed_user=new User(); $user_id=$seed_user->retrieve_user_id($user_name); $current_user=$seed_user; $current_user->retrieve_entity_info($user_id, 'Users'); - $user = new Users(); + $user = new User(); return $user->getColumnNames_User(); } @@ -323,8 +323,8 @@ function create_session($user_name, $password) { global $adb,$log; - require_once('modules/Users/Users.php'); - $objuser = new Users(); + require_once('modules/Users/User.php'); + $objuser = new User(); if($password != "" && $user_name != '') { $objuser->column_fields['user_name'] = $user_name; From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 06:05:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 10:05:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9632 - /vtigercrm/branches/5.0.2/Copie de LICENSE.txt Message-ID: <20061016100537.D99ED788944@vtiger.fosslabs.com> Author: aissafranc Date: Mon Oct 16 04:04:46 2006 New Revision: 9632 Log: test commit, i will remove the file after Added: vtigercrm/branches/5.0.2/Copie de LICENSE.txt From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 06:09:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 10:09:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9633 - /vtigercrm/branches/5.0.2/Copie de LICENSE.txt Message-ID: <20061016100939.EFEE4788945@vtiger.fosslabs.com> Author: aissafranc Date: Mon Oct 16 04:09:35 2006 New Revision: 9633 Log: ok, commit work fine Removed: vtigercrm/branches/5.0.2/Copie de LICENSE.txt From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 10:44:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 14:44:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9634 - in /vtigercrm/branches/5.0.2: include/utils/utils.php modules/CustomView/CustomView.php modules/CustomView/EditView.php Message-ID: <20061016144404.863BA788954@vtiger.fosslabs.com> Author: jerrydgeorge Date: Mon Oct 16 08:43:49 2006 New Revision: 9634 Log: Block Details got from database for custom views--Jeri Modified: vtigercrm/branches/5.0.2/include/utils/utils.php vtigercrm/branches/5.0.2/modules/CustomView/CustomView.php vtigercrm/branches/5.0.2/modules/CustomView/EditView.php Modified: vtigercrm/branches/5.0.2/include/utils/utils.php ============================================================================== --- vtigercrm/branches/5.0.2/include/utils/utils.php (original) +++ vtigercrm/branches/5.0.2/include/utils/utils.php Mon Oct 16 08:43:49 2006 @@ -385,6 +385,35 @@ $return_value = $mod_strings; $mod_strings = $temp_mod_strings; + + $log->debug("Exiting return_module_language method ..."); + return $return_value; +} + +/*This function returns the mod_strings for the current language and the specified module +*/ + +function return_specified_module_language($language, $module) +{ + global $log; + global $default_language, $translation_string_prefix; + + @include("modules/$module/language/$language.lang.php"); + if(!isset($mod_strings)) + { + $log->warn("Unable to find the module language file for language: ".$language." and module: ".$module); + require("modules/$module/language/$default_language.lang.php"); + $language_used = $default_language; + } + + if(!isset($mod_strings)) + { + $log->fatal("Unable to load the module($module) language file for the selected language($language) or the default language($default_language)"); + $log->debug("Exiting return_module_language method ..."); + return null; + } + + $return_value = $mod_strings; $log->debug("Exiting return_module_language method ..."); return $return_value; Modified: vtigercrm/branches/5.0.2/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/CustomView/CustomView.php (original) +++ vtigercrm/branches/5.0.2/modules/CustomView/CustomView.php Mon Oct 16 08:43:49 2006 @@ -36,25 +36,7 @@ - var $module_list = Array("Leads"=>Array("Information"=>13,"Address"=>15,"Description"=>16,"Custom Information"=>14), - "Contacts"=>Array("Information"=>4,"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), - "Campaigns"=>Array("Information"=>76,"Expectations"=>78,"Description"=>82,"Custom Information"=>77), - "Products"=>Array("Information"=>31,"Description"=>36,"Pricing Information"=>32,"Stock Information"=>33,"Custom Information"=>34), - "Vendors"=>Array("Information"=>44,"Address"=>46,"Description"=>47,"Custom Information"=>45), - "PriceBooks"=>Array("Information"=>48,"Description"=>50,"Custom Information"=>49), - "Notes"=>Array("Information"=>17,"Description"=>18), - "Emails"=>Array("Information"=>'21,22,23',"Description"=>24), - "HelpDesk"=>Array("Information"=>'25,26',"Description"=>28,"Custom Information"=>27,"Solution"=>29), - "Quotes"=>Array("Information"=>51,"Address"=>53,"Description"=>56,"Terms and Conditions"=>55,"Custom Information"=>52), - "PurchaseOrder"=>Array("Information"=>57,"Address"=>59,"Description"=>62,"Terms and Conditions"=>61,"Custom Information"=>58), - "SalesOrder"=>Array("Information"=>63,"Address"=>65,"Description"=>68,"Terms and Conditions"=>67,"Custom Information"=>64), - "Faq"=>Array("Information"=>'37,38,39'), - "Invoice"=>Array("Information"=>69,"Address"=>71,"Description"=>74,"Terms and Conditions"=>73,"Custom Information"=>70) - ); - + var $module_list = Array(); var $customviewmodule; @@ -292,6 +274,8 @@ function getModuleColumnsList($module) { + + $module_info = $this->getCustomViewModuleInfo($module); foreach($this->module_list[$module] as $key=>$value) { $columnlist = $this->getColumnsListbyBlock($module,$value); @@ -342,7 +326,7 @@ global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); - + $module_info = $this->getCustomViewModuleInfo($module); foreach($this->module_list[$module] as $key=>$blockid) { $blockids[] = $blockid; @@ -1525,5 +1509,35 @@ return $calist; } + + /* This function sets the block information for the given module to the class variable module_list + * and return the array + */ + + function getCustomViewModuleInfo($module) + { + global $adb; + global $current_language; + $current_mod_strings = return_specified_module_language($current_language, $module); + $block_info = Array(); + $Sql = "select distinct block,vtiger_field.tabid,name,blocklabel from vtiger_field inner join vtiger_blocks on vtiger_blocks.blockid=vtiger_field.block inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where displaytype != 3 and vtiger_field.block not in(40,6,75,35,30,54,60,66,72) and vtiger_tab.name='$module' order by block"; + $result = $adb->query($Sql); + while($block_result = $adb->fetch_array($result)) + { + $block_label = $block_result['blocklabel']; + if (trim($block_label) == '') + { + $block_info[$pre_block_label] = $block_info[$pre_block_label].",".$block_result['block']; + }else + { + $lan_block_label = $current_mod_strings[$block_label]; + $block_info[$lan_block_label] = $block_result['block']; + } + $pre_block_label = $lan_block_label; + } + $this->module_list[$module] = $block_info; + return $this->module_list; + } + } ?> Modified: vtigercrm/branches/5.0.2/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/CustomView/EditView.php (original) +++ vtigercrm/branches/5.0.2/modules/CustomView/EditView.php Mon Oct 16 08:43:49 2006 @@ -221,7 +221,7 @@ foreach($oCustomView->module_list[$module] as $key=>$value) { $advfilter = array(); - $label = $app_list_strings['moduleList'][$module]." ".$key; + $label = $key; if(isset($columnslist[$module][$key])) { foreach($columnslist[$module][$key] as $field=>$fieldlabel) From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 10:52:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 14:52:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9635 - /vtigercrm/branches/5.0.2/modules/Users/DefaultDataPopulator.php Message-ID: <20061016145210.DAF2F788959@vtiger.fosslabs.com> Author: jerrydgeorge Date: Mon Oct 16 08:52:03 2006 New Revision: 9635 Log: issue because of the Entries for manufacturer and Emails fields has been fixed --Jeri Modified: vtigercrm/branches/5.0.2/modules/Users/DefaultDataPopulator.php Modified: vtigercrm/branches/5.0.2/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/DefaultDataPopulator.php Mon Oct 16 08:52:03 2006 @@ -428,7 +428,7 @@ $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").",'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,1,31,'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')"); @@ -502,8 +502,8 @@ $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,23,1,'V~M',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,2,23,1,'V~O',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,9,23,1,'T~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,22,1,'T~O',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,null,'BAS')"); //Block21 -- End From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 11:39:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 15:39:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9636 - /vtigercrm/branches/5.0.2/modules/Settings/CustomFieldList.php Message-ID: <20061016153943.231EB787E3D@vtiger.fosslabs.com> Author: jerrydgeorge Date: Mon Oct 16 09:39:36 2006 New Revision: 9636 Log: Hardcoded array removed and custom field supported modules obtained from database--Jeri Modified: vtigercrm/branches/5.0.2/modules/Settings/CustomFieldList.php Modified: vtigercrm/branches/5.0.2/modules/Settings/CustomFieldList.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Settings/CustomFieldList.php (original) +++ vtigercrm/branches/5.0.2/modules/Settings/CustomFieldList.php Mon Oct 16 09:39:36 2006 @@ -22,20 +22,8 @@ $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); $smarty->assign("IMAGE_PATH", $image_path); -$module_array=Array('Leads'=>'Leads', - 'Accounts'=>'Accounts', - 'Contacts'=>'Contacts', - 'Potentials'=>'Potentials', - 'HelpDesk'=>'HelpDesk', - 'Products'=>'Products', - 'Vendors'=>'Vendors', - 'PriceBooks'=>'PriceBooks', - 'PurchaseOrder'=>'PurchaseOrder', - 'SalesOrder'=>'SalesOrder', - 'Quotes'=>'Quotes', - 'Invoice'=>'Invoice', - 'Campaigns'=>'Campaigns' - ); +$module_array=getCustomFieldSupportedModules(); + $cfimagecombo = Array($image_path."text.gif", $image_path."number.gif", $image_path."percent.gif", @@ -166,4 +154,18 @@ return $label; } +/* function to get the modules supports Custom Fields +*/ + +function getCustomFieldSupportedModules() +{ + global $adb; + $sql="select distinct vtiger_field.tabid,name from vtiger_field inner join vtiger_tab on vtiger_field.tabid=vtiger_tab.tabid where vtiger_field.tabid not in(9,10,16,15,8,29)"; + $result = $adb->query($sql); + while($moduleinfo=$adb->fetch_array($result)) + { + $modulelist[$moduleinfo['name']] = $moduleinfo['name']; + } + return $modulelist; +} ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 16 13:38:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 16 Oct 2006 17:38:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9637 - in /vtigercrm/branches/5.0.2: Smarty/templates/Settings/TaxConfig.tpl include/js/Inventory.js modules/Settings/TaxConfig.php Message-ID: <20061016173855.B334D76D56F@vtiger.fosslabs.com> Author: richie Date: Mon Oct 16 11:38:47 2006 New Revision: 9637 Log: * Modified to provide the TaxLabel editing Modified: vtigercrm/branches/5.0.2/Smarty/templates/Settings/TaxConfig.tpl vtigercrm/branches/5.0.2/include/js/Inventory.js vtigercrm/branches/5.0.2/modules/Settings/TaxConfig.php Modified: vtigercrm/branches/5.0.2/Smarty/templates/Settings/TaxConfig.tpl ============================================================================== --- vtigercrm/branches/5.0.2/Smarty/templates/Settings/TaxConfig.tpl (original) +++ vtigercrm/branches/5.0.2/Smarty/templates/Settings/TaxConfig.tpl Mon Oct 16 11:38:47 2006 @@ -13,6 +13,7 @@ + {literal} '; echo "


        @@ -130,11 +132,11 @@ $unit_price = $adb->query_result($list_result,$i,"unit_price"); $field_name=$entity_id."_listprice"; - $list_body .= ''.$adb->query_result($list_result,$i,"productname").''.$adb->query_result($list_result,$i,"productcode").''.$unit_price.'
      "; - echo ""; + echo ""; echo "
      vtiger CRM 5.0.0 | Visit www.vtiger.com for more information
      vtiger CRM 5.0.2 | Visit www.vtiger.com for more information © Copyright Details
      "; // echo " Modified: vtigercrm/branches/5.0.2/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/5.0.2/install/4createConfigFile.php (original) +++ vtigercrm/branches/5.0.2/install/4createConfigFile.php Mon Oct 30 05:45:05 2006 @@ -45,8 +45,8 @@ // vtiger CRM version number; do not edit! -$vtiger_version = "5.0.1"; -$release_date = "10 October 2006"; +$vtiger_version = "5.0.2"; +$release_date = "31 October 2006"; if (isset($_REQUEST['db_hostname'])) Modified: vtigercrm/branches/5.0.2/install/5createTables.php ============================================================================== --- vtigercrm/branches/5.0.2/install/5createTables.php (original) +++ vtigercrm/branches/5.0.2/install/5createTables.php Mon Oct 30 05:45:05 2006 @@ -123,7 +123,7 @@
      "; Modified: vtigercrm/branches/5.0.2/modules/Users/about_us.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/about_us.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/about_us.php Thu Oct 26 11:42:44 2006 @@ -22,7 +22,7 @@ } else { - $patch_string = "--None--"; + $patch_string = $vtiger_current_version; } global $app_strings; global $app_list_strings; From vtigercrm-commits at vtiger.fosslabs.com Thu Oct 26 13:54:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 26 Oct 2006 17:54:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9733 - in /vtigercrm/branches/5.0.2/modules/Import: ImportAccount.php ImportContact.php ImportLead.php ImportOpportunity.php ImportProduct.php Message-ID: <20061026175417.6C007788B30@vtiger.fosslabs.com> Author: richie Date: Thu Oct 26 11:54:11 2006 New Revision: 9733 Log: Class name changed Modified: vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php vtigercrm/branches/5.0.2/modules/Import/ImportContact.php vtigercrm/branches/5.0.2/modules/Import/ImportLead.php vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php Modified: vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportAccount.php Thu Oct 26 11:54:11 2006 @@ -30,7 +30,7 @@ require_once('include/ComboUtil.php'); // Account is used to store vtiger_account information. -class ImportAccount extends Account { +class ImportAccount extends Accounts { var $db; // Get _dom arrays from Database Modified: vtigercrm/branches/5.0.2/modules/Import/ImportContact.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportContact.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportContact.php Thu Oct 26 11:54:11 2006 @@ -28,7 +28,7 @@ $comboFieldArray = getComboArray($comboFieldNames); // Contact is used to store customer information. -class ImportContact extends Contact { +class ImportContact extends Contacts { // these are vtiger_fields that may be set on import // but are to be processed and incorporated // into vtiger_fields of the parent class Modified: vtigercrm/branches/5.0.2/modules/Import/ImportLead.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportLead.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportLead.php Thu Oct 26 11:54:11 2006 @@ -35,7 +35,7 @@ require_once('modules/Leads/Leads.php'); -class ImportLead extends Lead { +class ImportLead extends Leads { var $db; // This is the list of the functions to run when importing Modified: vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportOpportunity.php Thu Oct 26 11:54:11 2006 @@ -36,7 +36,7 @@ $comboFieldArray = getComboArray($comboFieldNames); // Account is used to store vtiger_account information. -class ImportOpportunity extends Potential { +class ImportOpportunity extends Potentials { var $db; // This is the list of vtiger_fields that are required. Modified: vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php (original) +++ vtigercrm/branches/5.0.2/modules/Import/ImportProduct.php Thu Oct 26 11:54:11 2006 @@ -36,7 +36,7 @@ require_once('modules/Leads/Leads.php'); -class ImportProduct extends Product { +class ImportProduct extends Products { var $db; // This is the list of the functions to run when importing From vtigercrm-commits at vtiger.fosslabs.com Thu Oct 26 19:48:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 26 Oct 2006 23:48:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9734 - /vtigercrm/branches/4.2/include/submenu.js Message-ID: <20061026234850.DFA997704D0@vtiger.fosslabs.com> Author: allanbush Date: Thu Oct 26 17:48:48 2006 New Revision: 9734 Log: Fixed calendar display issues with IE and select boxes not being hidden properly. Closes #35. Modified: vtigercrm/branches/4.2/include/submenu.js Modified: vtigercrm/branches/4.2/include/submenu.js ============================================================================== --- vtigercrm/branches/4.2/include/submenu.js (original) +++ vtigercrm/branches/4.2/include/submenu.js Thu Oct 26 17:48:48 2006 @@ -6,8 +6,8 @@ getObj("subMenuBg").style.width=getObj("subMenu").offsetWidth getObj("subMenuBg").style.height=getObj("subMenu").offsetHeight - /*for (i=0;i Author: allanbush Date: Thu Oct 26 18:12:41 2006 New Revision: 9735 Log: Removed "Custom Action" button from customview edit view as I have no idea what it's there for. Modified: vtigercrm/branches/4.2/modules/CustomView/EditView.html vtigercrm/branches/4.2/modules/CustomView/EditView.php Modified: vtigercrm/branches/4.2/modules/CustomView/EditView.html ============================================================================== --- vtigercrm/branches/4.2/modules/CustomView/EditView.html (original) +++ vtigercrm/branches/4.2/modules/CustomView/EditView.html Thu Oct 26 18:12:41 2006 @@ -182,11 +182,6 @@ //return true; } -function goto_CustomAction(module) -{ - document.location.href = "index.php?module="+module+"&action=CustomAction&record={CUSTOMVIEWID}"; -} - @@ -206,7 +201,6 @@ {CANSAVE} - {CUSTOMACTIONBUTTON}
      Modified: vtigercrm/branches/4.2/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/branches/4.2/modules/CustomView/EditView.php (original) +++ vtigercrm/branches/4.2/modules/CustomView/EditView.php Thu Oct 26 18:12:41 2006 @@ -144,13 +144,6 @@ $xtpl->assign("MANDATORYCHECK",implode(",",$oCustomView->mandatoryvalues)); $xtpl->assign("SHOWVALUES",implode(",",$oCustomView->showvalues)); - - $cactionhtml = ""; - - if($cv_module == "Leads" || $cv_module == "Accounts" || $cv_module == "Contacts") - { - $xtpl->assign("CUSTOMACTIONBUTTON",$cactionhtml); - } } // current user can only save his own records From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 27 05:27:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 27 Oct 2006 09:27:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9736 - /vtigercrm/branches/5.0.2/modules/Settings/DeleteCustomField.php Message-ID: <20061027092701.40D54787EBE@vtiger.fosslabs.com> Author: jerrydgeorge Date: Fri Oct 27 03:26:24 2006 New Revision: 9736 Log: Columns from Customview and reports are deleted when a cutom field is deleted --jeri Modified: vtigercrm/branches/5.0.2/modules/Settings/DeleteCustomField.php Modified: vtigercrm/branches/5.0.2/modules/Settings/DeleteCustomField.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Settings/DeleteCustomField.php (original) +++ vtigercrm/branches/5.0.2/modules/Settings/DeleteCustomField.php Fri Oct 27 03:26:24 2006 @@ -50,7 +50,15 @@ $adb->query($dbquery); -//HANDLE HERE - we have to remove the entries in customview and report related tables which have this field ($colName) +//we have to remove the entries in customview and report related tables which have this field ($colName) +$adb->query("delete from vtiger_cvcolumnlist where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_cvstdfilter where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_cvadvfilter where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_selectcolumn where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_relcriteria where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_reportsortcol where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_reportdatefilter where datecolumnname like '%".$colName."%'"); +$adb->query("delete from vtiger_reportsummary where columnname like '%".$colName."%'"); //Deleting from convert lead mapping vtiger_table- Jaguar @@ -66,10 +74,7 @@ $deltablequery = 'drop table '.$colName; $adb->query($deltablequery); } -//we have to delete the custom field from custom views - don -$adb->query("delete from vtiger_cvcolumnlist where columnname like '%".$colName."%'"); -$adb->query("delete from vtiger_cvstdfilter where columnname like '%".$colName."%'"); -$adb->query("delete from vtiger_cvadvfilter where columnname like '%".$colName."%'"); + header("Location:index.php?module=Settings&action=CustomFieldList&fld_module=".$fld_module."&parenttab=Settings"); From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 27 06:35:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 27 Oct 2006 10:35:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9737 - /vtigercrm/branches/5.0.2/modules/Leads/Leads.php Message-ID: <20061027103524.61F33788B1A@vtiger.fosslabs.com> Author: richie Date: Fri Oct 27 04:35:20 2006 New Revision: 9737 Log: save_module function has been included Modified: vtigercrm/branches/5.0.2/modules/Leads/Leads.php Modified: vtigercrm/branches/5.0.2/modules/Leads/Leads.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Leads/Leads.php (original) +++ vtigercrm/branches/5.0.2/modules/Leads/Leads.php Fri Oct 27 04:35:20 2006 @@ -86,6 +86,12 @@ $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 From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 27 09:52:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 27 Oct 2006 13:52:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9738 - /vtigercrm/branches/5.0.2/include/utils/ExportUtils.php Message-ID: <20061027135226.EA706788A61@vtiger.fosslabs.com> Author: richie Date: Fri Oct 27 07:51:46 2006 New Revision: 9738 Log: common file aded Added: vtigercrm/branches/5.0.2/include/utils/ExportUtils.php From vtigercrm-commits at vtiger.fosslabs.com Fri Oct 27 10:15:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 27 Oct 2006 14:15:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9739 - /vtigercrm/trunk/include/utils/ExportUtils.php Message-ID: <20061027141517.8FFB0787EBE@vtiger.fosslabs.com> Author: richie Date: Fri Oct 27 08:13:59 2006 New Revision: 9739 Log: common file aded Added: vtigercrm/trunk/include/utils/ExportUtils.php From vtigercrm-commits at vtiger.fosslabs.com Sun Oct 29 13:50:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 29 Oct 2006 18:50:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9740 - in /vtigercrm/branches/5.0.2/modules/Migration: 502DBChanges.php ModifyDatabase/42P2_to_50.php ModifyDatabase/deleteCustomFields.php Message-ID: <20061029185023.ECE03788A0F@vtiger.fosslabs.com> Author: richie Date: Sun Oct 29 11:50:16 2006 New Revision: 9740 Log: file added and modifed for 502 db changes Added: vtigercrm/branches/5.0.2/modules/Migration/502DBChanges.php vtigercrm/branches/5.0.2/modules/Migration/ModifyDatabase/deleteCustomFields.php (with props) Modified: vtigercrm/branches/5.0.2/modules/Migration/ModifyDatabase/42P2_to_50.php Modified: vtigercrm/branches/5.0.2/modules/Migration/ModifyDatabase/42P2_to_50.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Migration/ModifyDatabase/42P2_to_50.php (original) +++ vtigercrm/branches/5.0.2/modules/Migration/ModifyDatabase/42P2_to_50.php Sun Oct 29 11:50:16 2006 @@ -3766,6 +3766,59 @@ } } +//Added after 5.0.1 +//we have to delete the entries from customview and report related tables for deleted customfields +include("modules/Migration/ModifyDatabase/deleteCustomFields.php"); + +//5.0.2 database changes - added on 27-10-06 + +//Query added to show Manufacturer field in Products module +Execute("update vtiger_field set displaytype=1,block=31 where tabid=14 and block=1"); +Execute("update vtiger_field set block=23,displaytype=1 where block=1 and displaytype=23 and tabid=10"); +Execute("update vtiger_field set block=22,displaytype=1 where block=1 and displaytype=22 and tabid=10"); + +//Added to rearange the attachment in HelpDesk +Execute(" update vtiger_field set block=25,sequence=12 where tabid=13 and fieldname='filename'"); + +//Query added to as entityname,its tablename,its primarykey are saved in a table +Execute(" CREATE TABLE `vtiger_entityname` ( + `tabid` int(19) NOT NULL default '0', + `modulename` varchar(50) NOT NULL, + `tablename` varchar(50) NOT NULL, + `fieldname` varchar(150) NOT NULL, + `entityidfield` varchar(150) NOT NULL, + PRIMARY KEY (`tabid`), + KEY `entityname_tabid_idx` (`tabid`) +)"); + +//Data Populated for the existing modules +Execute("insert into vtiger_entityname values(7,'Leads','vtiger_leaddetails','lastname,firstname','leadid')"); +Execute("insert into vtiger_entityname values(6,'Accounts','vtiger_account','accountname','accountid')"); +Execute("insert into vtiger_entityname values(4,'Contacts','vtiger_contactdetails','lastname,firstname','contactid')"); +Execute("insert into vtiger_entityname values(2,'Potentials','vtiger_potential','potentialname','potentialid')"); +Execute("insert into vtiger_entityname values(8,'Notes','vtiger_notes','title','notesid')"); +Execute("insert into vtiger_entityname values(13,'HelpDesk','vtiger_troubletickets','title','ticketid')"); +Execute("insert into vtiger_entityname values(9,'Calendar','vtiger_activity','subject','activityid')"); +Execute("insert into vtiger_entityname values(10,'Emails','vtiger_activity','subject','activityid')"); +Execute("insert into vtiger_entityname values(14,'Products','vtiger_products','productname','productid')"); +Execute("insert into vtiger_entityname values(29,'Users','vtiger_users','last_name,first_name','id')"); +Execute("insert into vtiger_entityname values(23,'Invoice','vtiger_invoice','subject','invoiceid')"); +Execute("insert into vtiger_entityname values(20,'Quotes','vtiger_quotes','subject','quoteid')"); +Execute("insert into vtiger_entityname values(21,'PurchaseOrder','vtiger_purchaseorder','subject','purchaseorderid')"); +Execute("insert into vtiger_entityname values(22,'SalesOrder','vtiger_salesorder','subject','salesorderid')"); +Execute("insert into vtiger_entityname values(18,'Vendors','vtiger_vendor','vendorname','vendorid')"); +Execute("insert into vtiger_entityname values(19,'PriceBooks','vtiger_pricebook','bookname','pricebookid')"); +Execute("insert into vtiger_entityname values(26,'Campaigns','vtiger_campaign','campaignname','campaignid')"); +Execute("insert into vtiger_entityname values(15,'Faq','vtiger_faq','question','id')"); + +//added quantity in stock in product default listview - All +$res = $conn->query("select vtiger_cvcolumnlist.cvid from vtiger_cvcolumnlist inner join vtiger_customview on vtiger_cvcolumnlist.cvid=vtiger_customview.cvid where entitytype='Products' and viewname='All'"); +if($conn->num_rows != 0) +{ + $cvid = $conn->query_result($res,0,'cvid'); + Execute("insert into vtiger_cvcolumnlist values($cvid,5,'vtiger_products:qtyinstock:qtyinstock:Products_Quantity_In_Stock:V')"); +} + From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 07:45:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 12:45:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9741 - in /vtigercrm/branches/5.0.2/install: 0welcome.php 4createConfigFile.php 5createTables.php Message-ID: <20061030124511.9F36E7830A2@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 05:45:05 2006 New Revision: 9741 Log: version changed to 5.0.2 Modified: vtigercrm/branches/5.0.2/install/0welcome.php vtigercrm/branches/5.0.2/install/4createConfigFile.php vtigercrm/branches/5.0.2/install/5createTables.php Modified: vtigercrm/branches/5.0.2/install/0welcome.php ============================================================================== --- vtigercrm/branches/5.0.2/install/0welcome.php (original) +++ vtigercrm/branches/5.0.2/install/0welcome.php Mon Oct 30 05:45:05 2006 @@ -97,10 +97,10 @@
      -

             This Configuration Wizard will create vtiger CRM 5.0.1 databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready. +

             This Configuration Wizard will create vtiger CRM 5.0.2 databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready.

      -

      - vtiger CRM 5.0.1 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.

      -

      vtiger CRM 5.0.1 will not work on mysql 4.0.x versions

      vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements
      +

      - vtiger CRM 5.0.2 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.

      +

      vtiger CRM 5.0.2 will not work on mysql 4.0.x versions

      vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements

      The installation wizard will guide you with the installation regardless of the setup you may have.

      - - -
      - vtigercrm-5.0.1 is all set to go! + vtigercrm-5.0.2 is all set to go!
        From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 07:49:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 12:49:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9742 - /vtigercrm/branches/5.0.2/modules/Users/about_us.php Message-ID: <20061030124950.47C1C7830A2@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 05:49:45 2006 New Revision: 9742 Log: few developers added Modified: vtigercrm/branches/5.0.2/modules/Users/about_us.php Modified: vtigercrm/branches/5.0.2/modules/Users/about_us.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/about_us.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/about_us.php Mon Oct 30 05:49:45 2006 @@ -83,18 +83,20 @@ - + + + - + - + From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 08:19:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 13:19:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9743 - in /vtigercrm/branches/5.0.2: Smarty/templates/ProfileDetailView.tpl include/language/en_us.lang.php include/utils/UserInfoUtil.php modules/Users/RenameProfile.php modules/Users/profilePrivileges.php Message-ID: <20061030131938.8B651788BA0@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 06:19:21 2006 New Revision: 9743 Log: * Modified to handle the profile name and description renaming Added: vtigercrm/branches/5.0.2/modules/Users/RenameProfile.php Modified: vtigercrm/branches/5.0.2/Smarty/templates/ProfileDetailView.tpl vtigercrm/branches/5.0.2/include/language/en_us.lang.php vtigercrm/branches/5.0.2/include/utils/UserInfoUtil.php vtigercrm/branches/5.0.2/modules/Users/profilePrivileges.php Modified: vtigercrm/branches/5.0.2/Smarty/templates/ProfileDetailView.tpl ============================================================================== --- vtigercrm/branches/5.0.2/Smarty/templates/ProfileDetailView.tpl (original) +++ vtigercrm/branches/5.0.2/Smarty/templates/ProfileDetailView.tpl Mon Oct 30 06:19:21 2006 @@ -20,6 +20,45 @@ {/literal} + + +{/literal}
        Ahmed
        Anusha
        Bharath
        Bharathi
        Don
        Ela
        Gopal
        Jeri
        Mani
        Mickie
        Minnie
        Nithya
        Philip
        Radiant
        Richie
        SRaj
        Vashni
         
        Aissa Belaid
        @@ -29,13 +68,15 @@
        {include file='SetMenu.tpl'} - + + +
        @@ -79,9 +120,47 @@
       
      +
         +
      + + + + + @@ -309,4 +388,11 @@ document.getElementById(obj).className = 'hideTable'; } {/literal} +{literal} + //for move RenameProfile + var theEventHandle = document.getElementById("renameUI"); + var theEventRoot = document.getElementById("renameProfile"); + Drag.init(theEventHandle, theEventRoot); +{/literal} + Modified: vtigercrm/branches/5.0.2/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.2/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.2/include/language/en_us.lang.php Mon Oct 30 06:19:21 2006 @@ -1042,6 +1042,9 @@ 'LBL_ADDRESS_INF'=>'Address Information', 'yes'=>'yes', +'LBL_RENAMEPROFILE_BUTTON_LABEL'=>'Rename', +'LBL_RENAME_PROFILE'=>'Rename Profile', +'LBL_PROFILE_NAME'=>'Profile Name', ); Modified: vtigercrm/branches/5.0.2/include/utils/UserInfoUtil.php ============================================================================== --- vtigercrm/branches/5.0.2/include/utils/UserInfoUtil.php (original) +++ vtigercrm/branches/5.0.2/include/utils/UserInfoUtil.php Mon Oct 30 06:19:21 2006 @@ -1346,6 +1346,23 @@ $log->debug("Exiting getProfileName method ..."); return $profilename; } +/** Function to get the vtiger_profile Description from the vtiger_profileid + * @param $profileid -- Profile Id:: Type integer + * @returns $rolename -- Role Name:: Type varchar + * + */ +function getProfileDescription($profileid) +{ + global $log; + $log->debug("Entering getProfileDescription(".$profileid.") method ..."); + global $adb; + $sql1 = "select description from vtiger_profile where profileid=".$profileid; + $result = $adb->query($sql1); + $profileDescription = $adb->query_result($result,0,"description"); + $log->debug("Exiting getProfileName method ..."); + return $profileDescription; +} + /** Function to check if the currently logged in user is permitted to perform the specified action * @param $module -- Module Name:: Type varchar Modified: vtigercrm/branches/5.0.2/modules/Users/profilePrivileges.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/profilePrivileges.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/profilePrivileges.php Mon Oct 30 06:19:21 2006 @@ -59,16 +59,24 @@ else { $profileName=getProfileName($profileId); + } $smarty->assign("PROFILE_NAME", $profileName); if(isset($_REQUEST['profile_description']) && $_REQUEST['profile_description'] != '' && $_REQUEST['mode'] == 'create') + $smarty->assign("PROFILE_DESCRIPTION",$_REQUEST['profile_description']); +else +{ + $profileDescription = getProfileDescription($profileId); +} + +$smarty->assign("Profile_Name", $profileName); +$smarty->assign("Profile_Description", $profileDescription); + if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != '') $smarty->assign("MODE",$_REQUEST['mode']); - - //Initially setting the secondary selected vtiger_tab From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 08:27:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 13:27:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9744 - /vtigercrm/branches/5.0.2/modules/Calendar/Appointment.php Message-ID: <20061030132708.3897F788BAC@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 06:27:03 2006 New Revision: 9744 Log: changes made to fix the issue in event display in calendar view --Minnie Modified: vtigercrm/branches/5.0.2/modules/Calendar/Appointment.php Modified: vtigercrm/branches/5.0.2/modules/Calendar/Appointment.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Calendar/Appointment.php (original) +++ vtigercrm/branches/5.0.2/modules/Calendar/Appointment.php Mon Oct 30 06:27:03 2006 @@ -60,7 +60,7 @@ require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); $shared_ids = getSharedCalendarId($current_user->id); - $q= "select vtiger_activity.*, vtiger_crmentity.*, vtiger_activitygrouprelation.groupname FROM vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid left join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted = 0 and vtiger_activity.activitytype in ('Call','Meeting') AND (vtiger_activity.date_start < '". $to_datetime->get_formatted_date() ."' AND vtiger_activity.date_start >= '". $from_datetime->get_formatted_date()."') "; + $q= "select vtiger_activity.*, vtiger_crmentity.*, vtiger_activitygrouprelation.groupname FROM vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid left join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname WHERE vtiger_crmentity.deleted = 0 and vtiger_activity.activitytype in ('Call','Meeting') AND (vtiger_activity.date_start < '". $to_datetime->get_formatted_date() ."' AND vtiger_activity.date_start >= '". $from_datetime->get_formatted_date()."') "; if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[16] == 3) { $sec_parameter=getListViewSecurityParameter('Calendar'); @@ -83,7 +83,7 @@ unset($obj); } //Get Recurring events - $q = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_crmentity.description, vtiger_activity.time_start,vtiger_activity.time_end, vtiger_activity.duration_hours, vtiger_activity.duration_minutes,vtiger_activity.due_date, vtiger_activity.priority, vtiger_activity.location,vtiger_activity.eventstatus, vtiger_crmentity.*, vtiger_recurringevents.recurringid, vtiger_recurringevents.recurringdate as date_start ,vtiger_recurringevents.recurringtype,vtiger_activitygrouprelation.groupname from vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid inner join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid"; + $q = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_crmentity.description, vtiger_activity.time_start,vtiger_activity.time_end, vtiger_activity.duration_hours, vtiger_activity.duration_minutes,vtiger_activity.due_date, vtiger_activity.priority, vtiger_activity.location,vtiger_activity.eventstatus, vtiger_crmentity.*, vtiger_recurringevents.recurringid, vtiger_recurringevents.recurringdate as date_start ,vtiger_recurringevents.recurringtype,vtiger_activitygrouprelation.groupname from vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid inner join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname "; $q.=" where vtiger_crmentity.deleted = 0 and vtiger_activity.activitytype in ('Call','Meeting') AND (recurringdate < '".$to_datetime->get_formatted_date()."' AND recurringdate >= '".$from_datetime->get_formatted_date(). "') "; @@ -93,7 +93,7 @@ $q .= $sec_parameter; } - $q .= " ORDER by recurringid"; + $q .= " ORDER by vtiger_recurringevents.recurringid"; $r = $adb->query($q); $n = $adb->getRowCount($r); $a = 0; From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 08:29:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 13:29:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9745 - in /vtigercrm/branches/5.0.2/Smarty/templates: pendingActivities.tpl upcomingActivities.tpl Message-ID: <20061030132944.8A6CB788BAD@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 06:29:37 2006 New Revision: 9745 Log: files added to integrate Home page activities feature --Minnie Added: vtigercrm/branches/5.0.2/Smarty/templates/pendingActivities.tpl vtigercrm/branches/5.0.2/Smarty/templates/upcomingActivities.tpl From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 08:33:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 13:33:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9746 - /vtigercrm/branches/5.0.2/Smarty/templates/HomePage.tpl Message-ID: <20061030133325.53C9E788910@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 06:33:12 2006 New Revision: 9746 Log: files added to integrate Home page activities feature --Minnie Modified: vtigercrm/branches/5.0.2/Smarty/templates/HomePage.tpl Modified: vtigercrm/branches/5.0.2/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/branches/5.0.2/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/branches/5.0.2/Smarty/templates/HomePage.tpl Mon Oct 30 06:33:12 2006 @@ -18,7 +18,26 @@ - + {**} @@ -169,75 +188,12 @@
      - {if $ACTIVITIES.0.Entries.noofactivities > 0} - - - - - - - - - - - - -
      {$MOD.LBL_UPCOMING_EVENTS}
      - - {if $ACTIVITIES.0.Entries.noofactivities eq 1} - {$ACTIVITIES.0.Entries.noofactivities} {$APP.Event} {$APP.LBL_FOR} {$MOD[$ACTIVITIES.0.Title.0]} - {else} - {$ACTIVITIES.0.Entries.noofactivities} {$APP.Events} {$APP.LBL_FOR} {$MOD[$ACTIVITIES.0.Title.0]} - {/if} -
      - - - - {foreach item=entries from=$ACTIVITIES.0.Entries} - - - - - {/foreach} -
      {$entries.IMAGE}{$entries.0}{*
      {$entries.ACCOUNT_NAME*}
      -
      -
      - {/if} - - -{if $ACTIVITIES.1.Entries.noofactivities > 0} - - - - - - - - - - -
      - {$MOD.LBL_PENDING_EVENTS}
      - - {if $ACTIVITIES.1.Entries.noofactivities eq 1} - {$ACTIVITIES.1.Entries.noofactivities} {$MOD.LBL_SINGLE_PENDING_EVENT} - {else} - {$ACTIVITIES.1.Entries.noofactivities} {$MOD.LBL_MULTIPLE_PENDING_EVENTS} - {/if} -
      - - {foreach item=entries from=$ACTIVITIES.1.Entries} - - - - - {/foreach} -
      {$entries.IMAGE}{$entries.0}{*
      {$entries.ACCOUNT_NAME*}
      -
      - -
      -{/if} - +
      + {include file="upcomingActivities.tpl"} +

      +
      + {include file="pendingActivities.tpl"} +

      From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 08:44:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 13:44:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9747 - /vtigercrm/branches/5.0.2/modules/Calendar/OpenListView.php Message-ID: <20061030134447.0DC4B7830A2@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 06:44:42 2006 New Revision: 9747 Log: files added to integrate Home page activities feature --Minnie Modified: vtigercrm/branches/5.0.2/modules/Calendar/OpenListView.php Modified: vtigercrm/branches/5.0.2/modules/Calendar/OpenListView.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Calendar/OpenListView.php (original) +++ vtigercrm/branches/5.0.2/modules/Calendar/OpenListView.php Mon Oct 30 06:44:42 2006 @@ -49,82 +49,67 @@ //code added to customize upcomming and pending activities if($_REQUEST['activity_view']=='') { - $query = "select activity_view from vtiger_users where id ='$current_user->id'"; - $result=$adb->query($query); - $activity_view=$adb->query_result($result,0,'activity_view'); + $activity_view='today'; } else $activity_view=$_REQUEST['activity_view']; $today = date("Y-m-d", time()); - if($activity_view == 'Today') - { - $later = date("Y-m-d",strtotime("$today +1 day")); - } - else if($activity_view == 'This Week') - { - $later = date("Y-m-d", strtotime("$today +7 days")); - } - else if($activity_view == 'This Month') - { - $later = date("Y-m-d", strtotime("$today +1 month")); - } - else if($activity_view == 'This Year') - { - $later = date("Y-m-d", strtotime("$today +1 year")); - } - else if($activity_view == 'OverDue') - { - $later = date("Y-m-d", strtotime("$today +1 day")); - } - $last_tendays = date("Y-m-d",strtotime("$today -10 days")); + if($activity_view == 'today') + { + $upcoming_condition = " AND (date_start = '$today' OR vtiger_recurringevents.recurringdate = '$today')"; + $pending_condition = " AND (due_date = '$today' OR vtiger_recurringevents.recurringdate = '$today')"; + } + else if($activity_view == 'all') + { + $upcoming_condition = " AND (date_start >= '$today' OR vtiger_recurringevents.recurringdate >= '$today')"; + $pending_condition = " AND (due_date <= '$today' OR vtiger_recurringevents.recurringdate <= '$today')"; + } if($mode != 1) { //for upcoming avtivities - $list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity 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_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE 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.status is NULL OR vtiger_activity.status != 'Deferred') and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Not Held' ) AND ((date_start > '$today' AND date_start < '$later') OR (vtiger_recurringevents.recurringdate between '$today' and '$later') ) AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'"; + $list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity 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_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE 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.status is NULL OR vtiger_activity.status != 'Deferred') and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Not Held' ) ".$upcoming_condition." AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'"; } else { - //for pending activities for the last 10 days - $list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity 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_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE 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.status is NULL OR vtiger_activity.status != 'Deferred') and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Not Held' ) AND ((due_date > '$last_tendays' AND due_date <= '$today') OR (vtiger_recurringevents.recurringdate > '$last_tendays' AND vtiger_recurringevents.recurringdate <= '$today')) AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'"; - } + //for pending activities + $list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity 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_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE 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.status is NULL OR vtiger_activity.status != 'Deferred') and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Not Held' ) ".$pending_condition." AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'"; + } + $res = $adb->query($list_query); $noofrecords = $adb->num_rows($res); - $list_result = $adb->limitQuery($list_query,0,5); $open_activity_list = array(); - $noofrows = $adb->num_rows($list_result); - if (count($list_result)>0) + $noofrows = $adb->num_rows($res); + if (count($res)>0) for($i=0;$i<$noofrows;$i++) { - $parent_name=getRelatedTo("Calendar",$list_result,$i); - $open_activity_list[] = Array('name' => $adb->query_result($list_result,$i,'subject'), - 'id' => $adb->query_result($list_result,$i,'activityid'), - 'type' => $adb->query_result($list_result,$i,'activitytype'), - 'module' => $adb->query_result($list_result,$i,'setype'), - 'status' => $adb->query_result($list_result,$i,'status'), - 'firstname' => $adb->query_result($list_result,$i,'firstname'), - 'lastname' => $adb->query_result($list_result,$i,'lastname'), - 'accountname' => $adb->query_result($list_result,$i,'accountname'), - 'accountid' => $adb->query_result($list_result, $i, 'accountid'), - 'contactid' => $adb->query_result($list_result,$i,'contactid'), - 'date_start' => getDisplayDate($adb->query_result($list_result,$i,'date_start')), - 'due_date' => getDisplayDate($adb->query_result($list_result,$i,'due_date')), - 'recurringtype' => getDisplayDate($adb->query_result($list_result,$i,'recurringtype')), - 'recurringdate' => getDisplayDate($adb->query_result($list_result,$i,'recurringdate')), + $parent_name=getRelatedTo("Calendar",$res,$i); + $open_activity_list[] = Array('name' => $adb->query_result($res,$i,'subject'), + 'id' => $adb->query_result($res,$i,'activityid'), + 'type' => $adb->query_result($res,$i,'activitytype'), + 'module' => $adb->query_result($res,$i,'setype'), + 'status' => $adb->query_result($res,$i,'status'), + 'firstname' => $adb->query_result($res,$i,'firstname'), + 'lastname' => $adb->query_result($res,$i,'lastname'), + 'accountname' => $adb->query_result($res,$i,'accountname'), + 'accountid' => $adb->query_result($res, $i, 'accountid'), + 'contactid' => $adb->query_result($res,$i,'contactid'), + 'date_start' => getDisplayDate($adb->query_result($res,$i,'date_start')), + 'due_date' => getDisplayDate($adb->query_result($res,$i,'due_date')), + 'recurringtype' => getDisplayDate($adb->query_result($res,$i,'recurringtype')), + 'recurringdate' => getDisplayDate($adb->query_result($res,$i,'recurringdate')), 'parent'=> $parent_name, // Fredy Klammsteiner, 4.8.2005: changes from 4.0.1 migrated to 4.2 - 'priority' => $adb->query_result($list_result,$i,'priority'), // Armando L?scher 04.07.2005 -> ?priority -> Desc: Get vtiger_priority from db + 'priority' => $adb->query_result($res,$i,'priority'), // Armando L?scher 04.07.2005 -> ?priority -> Desc: Get vtiger_priority from db ); } - $later_day = getDisplayDate(date("Y-m-d", strtotime("$later -1 day "))); $title=array(); $title[]=$activity_view; $title[]='myUpcoPendAct.gif'; - //.'('.$current_module_strings["LBL_TODAY"].' '.$later_day.')'; $title[]='home_myact'; - $title[]=getActivityView($activity_view); + //$title[]=getActivityView($activity_view); $title[]='showActivityView'; $title[]='MyUpcumingFrm'; $title[]='activity_view'; @@ -229,7 +214,6 @@ } } // Code by Jaguar Ends - $entries['noofactivities'] = $noofrecords; $entries[$event['id']] = array( '0' => ''.$event["name"].'', 'IMAGE' => '', @@ -241,7 +225,7 @@ 'RECURRINGTYPE' => ereg_replace('--','',$event['recurringtype']), ); } - $values=Array('Title'=>$title,'Header'=>$header,'Entries'=>$entries); + $values=Array('noofactivities'=>$noofrecords,'Title'=>$title,'Header'=>$header,'Entries'=>$entries); $log->debug("Exiting getPendingActivities method ..."); return $values; } From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 08:47:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 13:47:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9748 - /vtigercrm/branches/5.0.2/modules/Calendar/ActivityAjax.php Message-ID: <20061030134713.72BE6786B41@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 06:47:04 2006 New Revision: 9748 Log: files added to integrate Home page activities feature --Minnie Modified: vtigercrm/branches/5.0.2/modules/Calendar/ActivityAjax.php Modified: vtigercrm/branches/5.0.2/modules/Calendar/ActivityAjax.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Calendar/ActivityAjax.php (original) +++ vtigercrm/branches/5.0.2/modules/Calendar/ActivityAjax.php Mon Oct 30 06:47:04 2006 @@ -19,6 +19,27 @@ $cal_log =& LoggerManager::getLogger('calendar'); $cal_log->debug("In CalendarAjax file"); $mysel = $_REQUEST['view']; +if($_REQUEST['file'] == 'OpenListView') +{ + require_once('Smarty_setup.php'); + $smarty = new vtigerCRM_Smarty; + require_once("modules/Calendar/OpenListView.php"); + $smarty->assign("APP",$app_strings); + $smarty->assign("IMAGE_PATH",$image_path); + if($_REQUEST['mode'] == '0') + { + $activities[0] = getPendingActivities(0); + $smarty->assign("ACTIVITIES",$activities); + $smarty->display("upcomingActivities.tpl"); + } + else if($_REQUEST['mode'] == '1') + { + $activities[1] = getPendingActivities(1); + $smarty->assign("ACTIVITIES",$activities); + $smarty->display("pendingActivities.tpl"); + } + die(); +} $calendar_arr = Array(); $calendar_arr['IMAGE_PATH'] = $image_path; $date_data = array(); From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 09:09:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 14:09:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9749 - in /vtigercrm/branches/5.0.2: include/RelatedListView.php include/language/en_us.lang.php modules/HelpDesk/HelpDesk.php Message-ID: <20061030140948.D2ACE788BAB@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 07:09:39 2006 New Revision: 9749 Log: * Modified to display the start and end date headers and values in activity history Modified: vtigercrm/branches/5.0.2/include/RelatedListView.php vtigercrm/branches/5.0.2/include/language/en_us.lang.php vtigercrm/branches/5.0.2/modules/HelpDesk/HelpDesk.php Modified: vtigercrm/branches/5.0.2/include/RelatedListView.php ============================================================================== --- vtigercrm/branches/5.0.2/include/RelatedListView.php (original) +++ vtigercrm/branches/5.0.2/include/RelatedListView.php Mon Oct 30 07:09:39 2006 @@ -383,8 +383,8 @@ $header[] = $app_strings['LBL_TYPE']; $header[] = $app_strings['LBL_SUBJECT']; $header[] = $app_strings['LBL_RELATED_TO']; - $header[] = $mod_strings['LBL_START_DATE']; - $header[] = $mod_strings['LBL_END_DATE']; + $header[] = $app_strings['LBL_START_DATE']; + $header[] = $app_strings['LBL_END_DATE']; //$header[] = $app_strings['LBL_DESCRIPTION']; $header[] = $app_strings['LBL_ACTION']; $header[] = $app_strings['LBL_ASSIGNED_TO']; Modified: vtigercrm/branches/5.0.2/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.2/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.2/include/language/en_us.lang.php Mon Oct 30 07:09:39 2006 @@ -1045,6 +1045,8 @@ 'LBL_RENAMEPROFILE_BUTTON_LABEL'=>'Rename', 'LBL_RENAME_PROFILE'=>'Rename Profile', 'LBL_PROFILE_NAME'=>'Profile Name', +'LBL_START_DATE'=>'Start Date', +'LBL_END_DATE'=>'End Date', ); Modified: vtigercrm/branches/5.0.2/modules/HelpDesk/HelpDesk.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/HelpDesk/HelpDesk.php (original) +++ vtigercrm/branches/5.0.2/modules/HelpDesk/HelpDesk.php Mon Oct 30 07:09:39 2006 @@ -534,7 +534,7 @@ { global $log; $log->debug("Entering get_history(".$id.") method ..."); - $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus, + $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus, vtiger_activity.date_start, vtiger_activity.due_date, vtiger_activity.activitytype, vtiger_troubletickets.ticketid, vtiger_troubletickets.title, vtiger_crmentity.modifiedtime, vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name from vtiger_activity From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 09:16:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 14:16:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9750 - /vtigercrm/branches/5.0.2/modules/Emails/class.phpmailer.php Message-ID: <20061030141629.AFE43788BB9@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 07:16:25 2006 New Revision: 9750 Log: * Removed the extra parameter for the functions SendmailSend, MailSend and SmtpSend, where as these functions have only two arguements Modified: vtigercrm/branches/5.0.2/modules/Emails/class.phpmailer.php Modified: vtigercrm/branches/5.0.2/modules/Emails/class.phpmailer.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Emails/class.phpmailer.php (original) +++ vtigercrm/branches/5.0.2/modules/Emails/class.phpmailer.php Mon Oct 30 07:16:25 2006 @@ -366,13 +366,13 @@ switch($this->Mailer) { case "sendmail": - $result = $this->SendmailSend($header, $header, html_entity_decode($body)); + $result = $this->SendmailSend($header, html_entity_decode($body)); break; case "mail": - $result = $this->MailSend($header, $header, html_entity_decode($body)); + $result = $this->MailSend($header, html_entity_decode($body)); break; case "smtp": - $result = $this->SmtpSend($header, $header, html_entity_decode($body)); + $result = $this->SmtpSend($header, html_entity_decode($body)); break; default: $this->SetError($this->Mailer . $this->Lang("mailer_not_supported")); From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 09:58:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 14:58:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9751 - in /vtigercrm/branches/5.0.2: Smarty/templates/MigrationStep1.tpl modules/Migration/502DBChanges.php modules/Migration/MigrationStep1.php Message-ID: <20061030145838.9BFCD788BAB@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 07:58:31 2006 New Revision: 9751 Log: * Modified to provide the link to apply the Database changes betseen 5.0.0/5.0.1 to 5.0.2 Modified: vtigercrm/branches/5.0.2/Smarty/templates/MigrationStep1.tpl vtigercrm/branches/5.0.2/modules/Migration/502DBChanges.php vtigercrm/branches/5.0.2/modules/Migration/MigrationStep1.php Modified: vtigercrm/branches/5.0.2/Smarty/templates/MigrationStep1.tpl ============================================================================== --- vtigercrm/branches/5.0.2/Smarty/templates/MigrationStep1.tpl (original) +++ vtigercrm/branches/5.0.2/Smarty/templates/MigrationStep1.tpl Mon Oct 30 07:58:31 2006 @@ -25,6 +25,12 @@ Modified: vtigercrm/branches/5.0.2/modules/Migration/502DBChanges.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Migration/502DBChanges.php (original) +++ vtigercrm/branches/5.0.2/modules/Migration/502DBChanges.php Mon Oct 30 07:58:31 2006 @@ -61,7 +61,7 @@ } - +echo "
        5.0.2 Database changes has been done.
      "; ?> Modified: vtigercrm/branches/5.0.2/modules/Migration/MigrationStep1.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Migration/MigrationStep1.php (original) +++ vtigercrm/branches/5.0.2/modules/Migration/MigrationStep1.php Mon Oct 30 07:58:31 2006 @@ -129,6 +129,11 @@ } } +//For 5.0.2 we have added this table. After 5.0.2 we have to remove this and provide the migration in some other way +$res = $adb->query("show create table vtiger_entityname"); +if(!$res) + $smarty->assign("502_PATCH","apply"); + $smarty->display("MigrationStep1.tpl"); From vtigercrm-commits at vtiger.fosslabs.com Mon Oct 30 10:47:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 30 Oct 2006 15:47:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9752 - /vtigercrm/branches/5.0.2/Release_Notes.html Message-ID: <20061030154730.7FABA788BA6@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 08:47:25 2006 New Revision: 9752 Log: modified for 5.0.2 release Modified: vtigercrm/branches/5.0.2/Release_Notes.html Modified: vtigercrm/branches/5.0.2/Release_Notes.html ============================================================================== --- vtigercrm/branches/5.0.2/Release_Notes.html (original) +++ vtigercrm/branches/5.0.2/Release_Notes.html Mon Oct 30 08:47:25 2006 @@ -27,6 +27,101 @@

      +

       

      +

      vtiger CRM 5.0.2: Release Notes

      +

      Date: October 31, 2006

      +

      Hi All,

      +

      Welcome to vtiger CRM. We are happy to annouce the release of latest + version of vtiger CRM.In this release, we have focussed on the following bug + fixes,

      +

      issues and feature enhancements listed below for your reference:

      +

       

      +

      Table of Contents

      +
        +
      1. Summary
      2. +
      3. Features & Enhancements
      4. +
      5. Bug Fixes
      6. +
      7. Known Issues
      8. +
      9. How to update the patch
      10. +
      +

      1. Summary

      +

      {$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} +
       
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      S. NoItemStatus
      1 Features 
      2Product SizePlatform Independent - 6.1 MB
      + Windows (EXE) - 26 MB
      + Linux (BIN) - 43 MB
      3Database MigrationAvailable for migrating data from 4.2Patch2/4.2.3/4.2.4/5.0.0 to 5.0.2
      4Product Download Click + Here
      5vtiger CRM - PHP Documentation URL: Click + Here
      6Product Documentation +

      Available at the Wiki

      +
      +

      2. Features & Enhancements

      +
        +
      • Viewing quantity in stock in the product list view has been added
      • +
      • Display of Event date in the Activity history
      • +
      • Facility to add tags within the Tag cloud box.
      • +
      • Today's and All views are enabled in the Home page under Upcoming and Pending activities section
        +
      • +
      +

       

      +

      3. Bug Fixes

      +
        +
      • Editing a calender entry resets the start and end time.
      • +
      • Error in custom list view when a custom field related to that view is + deleted has been handled.
      • +
      • Display of currency rate in campaign page
      • +
      • Formating issues in HTML editor.
      • +
      • Using the $contacts-salutationtype$ from Contacts in an email template, + the email client does not send the email-this issue has been fixed.
      • +
      • PHP Version check during installatioin
      • +
      • Issue in removing contacts from Events and To dos.
      • +
      • Product stock reduced twice - SO and Invoice -quantity
      • +
      +

      For more information, please refer our vtiger + CRM Bug Tracker.

      +

      4. Known Issues

      +

      We have about 125 issues to be fixed. You can refer our vtiger CRM Bug Tracker for the details of these issues.

      +

      5.How to update the patch

      +

      Kindly refer to the Migration wizard tool in our product under settings tab. +

      +

       

      +
      +

       

      vtiger CRM 5.0.1: Release Notes

      Date: Octoer 10, 2006

      From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 31 01:56:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 06:56:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9753 - /thunderbirdextn/trunk/install.rdf Message-ID: <20061031065652.36FD0788B98@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 23:56:20 2006 New Revision: 9753 Log: Version changed to 5.0.2 --Bharath Modified: thunderbirdextn/trunk/install.rdf Modified: thunderbirdextn/trunk/install.rdf ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 31 02:00:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 07:00:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9754 - /vtigertoolbar/trunk/firefox/install.rdf Message-ID: <20061031070000.C46EF788BC4@vtiger.fosslabs.com> Author: richie Date: Mon Oct 30 23:59:24 2006 New Revision: 9754 Log: Version changed to 5.0.1 to 5.0.2 and support for firefox 2.0 has been done --Bharath Modified: vtigertoolbar/trunk/firefox/install.rdf Modified: vtigertoolbar/trunk/firefox/install.rdf ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 31 02:00:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 07:00:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9755 - /vtigercrm/branches/5.0.2/modules/Calendar/addEventUI.php Message-ID: <20061031070024.9EA27788B98@vtiger.fosslabs.com> Author: richie Date: Tue Oct 31 00:00:21 2006 New Revision: 9755 Log: style modified for todo popup Modified: vtigercrm/branches/5.0.2/modules/Calendar/addEventUI.php Modified: vtigercrm/branches/5.0.2/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Calendar/addEventUI.php (original) +++ vtigercrm/branches/5.0.2/modules/Calendar/addEventUI.php Tue Oct 31 00:00:21 2006 @@ -649,7 +649,7 @@
      -
      - - + + + customerportal ".$version.""; ?> +   + + +   Modified: customerportal/trunk/images/loginVtigerCRM.gif ============================================================================== Binary files - no diff available. Modified: customerportal/trunk/index.php ============================================================================== --- customerportal/trunk/index.php (original) +++ customerportal/trunk/index.php Tue Oct 31 00:54:31 2006 @@ -13,6 +13,7 @@ session_start(); include("include.php"); +include("version.php"); if($_REQUEST['param'] == 'forgot_password') { @@ -35,7 +36,7 @@ session_unregister('last_login'); session_unregister('support_start_date'); session_unregister('support_end_date'); - session_destroy(); + //session_destroy(); //include("index.php"); include("login.php"); } Modified: customerportal/trunk/login.php ============================================================================== --- customerportal/trunk/login.php (original) +++ customerportal/trunk/login.php Tue Oct 31 00:54:31 2006 @@ -10,6 +10,7 @@ ********************************************************************************/ require_once("language/en_us.lang.php"); +include("version.php"); @session_start(); if(isset($_SESSION['customer_id']) && isset($_SESSION['customer_name'])) @@ -74,7 +75,7 @@ ?> - Customer Portal + Customer Portal   Email ID : From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 31 03:42:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 08:42:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9759 - /vtigercrm/branches/5.0.2/Release_Notes.html Message-ID: <20061031084233.1116F788BD2@vtiger.fosslabs.com> Author: richie Date: Tue Oct 31 01:42:29 2006 New Revision: 9759 Log: modified for 5.0.2 Modified: vtigercrm/branches/5.0.2/Release_Notes.html Modified: vtigercrm/branches/5.0.2/Release_Notes.html ============================================================================== --- vtigercrm/branches/5.0.2/Release_Notes.html (original) +++ vtigercrm/branches/5.0.2/Release_Notes.html Tue Oct 31 01:42:29 2006 @@ -31,15 +31,14 @@

      vtiger CRM 5.0.2: Release Notes

      Date: October 31, 2006

      Hi All,

      -

      Welcome to vtiger CRM. We are happy to annouce the release of latest - version of vtiger CRM.In this release, we have focussed on the following bug - fixes,

      -

      issues and feature enhancements listed below for your reference:

      -

       

      +

      Welcome to vtiger CRM!

      +

      We are happy to announce the release of vtiger CRM 5.0.2. In this release, + we have focused mainly on the bug fixes and minor enhancements so that our end-user + community will have better experience with our product.

      Table of Contents

      1. Summary
      2. -
      3. Features & Enhancements
      4. +
      5. Enhancements
      6. Bug Fixes
      7. Known Issues
      8. How to update the patch
      9. @@ -90,34 +89,42 @@ -

        2. Features & Enhancements

        +

        2. Enhancements

          -
        • Viewing quantity in stock in the product list view has been added
        • +
        • Viewing quantity in stock in the product list view
        • Display of Event date in the Activity history
        • Facility to add tags within the Tag cloud box.
        • -
        • Today's and All views are enabled in the Home page under Upcoming and Pending activities section
          +
        • Today's and All views are enabled in the Home page under Upcoming and Pending Activities sections

         

        3. Bug Fixes

          -
        • Editing a calender entry resets the start and end time.
        • -
        • Error in custom list view when a custom field related to that view is - deleted has been handled.
        • -
        • Display of currency rate in campaign page
        • -
        • Formating issues in HTML editor.
        • +
        • Editing a calender entry resets the start and end time (Ticket 2271 )
        • +
        • Error in custom list view when a custom field related to that view is deleted + has been handled (Ticket 2432)
        • +
        • Display of currency rate in campaign page (Ticket 2333 )
        • +
        • Formating issues in HTML editor.(Ticket 2290 )
        • Using the $contacts-salutationtype$ from Contacts in an email template, - the email client does not send the email-this issue has been fixed.
        • -
        • PHP Version check during installatioin
        • -
        • Issue in removing contacts from Events and To dos.
        • -
        • Product stock reduced twice - SO and Invoice -quantity
        • + the email client does not send the email-this issue has been fixed. (Ticket + 2273) +
        • PHP Version check during installation (Ticket 2329 )
        • +
        • Issue in removing contacts from Events and To dos (Ticket 2048 )
        • +
        • Product stock reduced twice - SO and Invoice -quantity (Ticket 1497 )
        -

        For more information, please refer our vtiger - CRM Bug Tracker.

        +

        For more information, please refer our vtiger CRM Bug Tracker.

        4. Known Issues

        We have about 125 issues to be fixed. You can refer our vtiger CRM Bug Tracker for the details of these issues.

        -

        5.How to update the patch

        -

        Kindly refer to the Migration wizard tool in our product under settings tab. +

        +5.How to update the patch +

        +

        To upgrade from the version 5.0.0 or 5.0.1 to the latest version 5.0.2 +

          +
        1. Login as admin user +
        2. Click on the Settings tab +
        3. Go to Migration Wizard. +
        4. Use the link 'Click here to apply the 5.0.2 Database changes from 5.0.0/5.0.1' +

         


        From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 31 04:36:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 09:36:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9760 - /vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php Message-ID: <20061031093627.081F0787D91@vtiger.fosslabs.com> Author: richie Date: Tue Oct 31 02:36:23 2006 New Revision: 9760 Log: * Changed the class name of User to Users Modified: vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php Modified: vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php ============================================================================== --- vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php (original) +++ vtigercrm/branches/5.0.2/modules/Users/ListLoginHistory.php Tue Oct 31 02:36:23 2006 @@ -42,7 +42,7 @@ $category = getParenttab(); -$oUser = new User($id); +$oUser = new Users($id); $user_list = getUserslist(); From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 31 04:53:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 09:53:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9761 - /vtigercrm/branches/5.0.2/include/language/en_us.lang.php Message-ID: <20061031095309.AD68B788910@vtiger.fosslabs.com> Author: richie Date: Tue Oct 31 02:53:06 2006 New Revision: 9761 Log: label added for Home page activities feature --Minnie Modified: vtigercrm/branches/5.0.2/include/language/en_us.lang.php Modified: vtigercrm/branches/5.0.2/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.2/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.2/include/language/en_us.lang.php Tue Oct 31 02:53:06 2006 @@ -59,6 +59,20 @@ 'LBL_SEARCH'=>'Search', 'LBL_LAST_VIEWED'=>'Last Viewed', + +'LBL_TODAY'=>'Today', + +'LBL_ALL'=>'All', + +'LBL_SHOW'=>'Show :', + +'today'=>"Today's", + +'all'=>'All', + +'LBL_UPCOMING_EVENTS'=>'Upcoming Activities', + +'LBL_PENDING_EVENTS'=>'Pending Activities', 'NTC_WELCOME_MESSAGE'=>"Welcome to vtiger CRM!", From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 31 05:44:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 10:44:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9762 - in /vtigercrm/trunk: ./ Smarty/templates/ Smarty/templates/Inventory/ Smarty/templates/Settings/ data/ include/ include/js/ include/language/ include/nusoap/ include/utils/ install/ modules/Accounts/ modules/Accounts/language/ modules/Calendar/ modules/Calendar/language/ modules/Campaigns/ modules/Contacts/ modules/CustomView/ modules/Emails/ modules/Faq/ modules/HelpDesk/ modules/Home/ modules/Import/ modules/Invoice/ modules/Leads/ modules/Migration/ modules/Migration/ModifyDatabase/ modules/Notes/ modules/Portal/ modules/Potentials/ modules/Potentials/language/ modules/PriceBooks/ modules/Products/ modules/PurchaseOrder/ modules/Quotes/ modules/Reports/ modules/SalesOrder/ modules/SalesOrder/pdf_templates/ modules/Settings/ modules/Users/ modules/Vendors/ modules/Webmails/ schema/ soap/ Message-ID: <20061031104413.65951788BDB@vtiger.fosslabs.com> Author: richie Date: Tue Oct 31 03:40:43 2006 New Revision: 9762 Log: 5.0.2 changes added Removed: vtigercrm/trunk/INSTALLATION.txt Modified: vtigercrm/trunk/Popup.php vtigercrm/trunk/Release_Notes.html vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl vtigercrm/trunk/Smarty/templates/ActivityEditView.tpl vtigercrm/trunk/Smarty/templates/ActivityListView.tpl vtigercrm/trunk/Smarty/templates/Buttons_List.tpl vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl vtigercrm/trunk/Smarty/templates/CreateView.tpl vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl vtigercrm/trunk/Smarty/templates/DisplayFields.tpl vtigercrm/trunk/Smarty/templates/EmailDetailView.tpl vtigercrm/trunk/Smarty/templates/EmailDetails.tpl vtigercrm/trunk/Smarty/templates/HomePage.tpl vtigercrm/trunk/Smarty/templates/ImportStep2.tpl vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl vtigercrm/trunk/Smarty/templates/ListRoles.tpl vtigercrm/trunk/Smarty/templates/ListView.tpl vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl vtigercrm/trunk/Smarty/templates/QuickCreate.tpl vtigercrm/trunk/Smarty/templates/Settings.tpl vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl vtigercrm/trunk/Smarty/templates/TagCloudDisplay.tpl vtigercrm/trunk/Smarty/templates/salesEditView.tpl vtigercrm/trunk/data/CRMEntity.php vtigercrm/trunk/data/Tracker.php vtigercrm/trunk/include/RelatedListView.php vtigercrm/trunk/include/js/Inventory.js vtigercrm/trunk/include/language/en_us.lang.php vtigercrm/trunk/include/nusoap/class.soap_transport_http.php vtigercrm/trunk/include/utils/CommonUtils.php vtigercrm/trunk/include/utils/DetailViewUtils.php vtigercrm/trunk/include/utils/EditViewUtils.php vtigercrm/trunk/include/utils/InventoryUtils.php vtigercrm/trunk/include/utils/ListViewUtils.php vtigercrm/trunk/include/utils/UserInfoUtil.php vtigercrm/trunk/include/utils/export.php vtigercrm/trunk/include/utils/utils.php vtigercrm/trunk/index.php vtigercrm/trunk/install/0welcome.php vtigercrm/trunk/install/1checkSystem.php vtigercrm/trunk/install/2setConfig.php vtigercrm/trunk/install/4createConfigFile.php vtigercrm/trunk/install/5createTables.inc.php vtigercrm/trunk/install/5createTables.php vtigercrm/trunk/install/populateSeedData.php vtigercrm/trunk/modules/Accounts/CallRelatedList.php vtigercrm/trunk/modules/Accounts/Delete.php vtigercrm/trunk/modules/Accounts/DetailView.php vtigercrm/trunk/modules/Accounts/DetailViewAjax.php vtigercrm/trunk/modules/Accounts/EditView.php vtigercrm/trunk/modules/Accounts/HeadLines.php vtigercrm/trunk/modules/Accounts/ListView.php vtigercrm/trunk/modules/Accounts/ListViewTop.php vtigercrm/trunk/modules/Accounts/Merge.php vtigercrm/trunk/modules/Accounts/Save.php vtigercrm/trunk/modules/Accounts/Tickerdetail.php vtigercrm/trunk/modules/Accounts/language/en_us.lang.php vtigercrm/trunk/modules/Calendar/Activity.php vtigercrm/trunk/modules/Calendar/ActivityAjax.php vtigercrm/trunk/modules/Calendar/Appointment.php vtigercrm/trunk/modules/Calendar/CalendarCommon.php vtigercrm/trunk/modules/Calendar/DetailView.php vtigercrm/trunk/modules/Calendar/ListView.php vtigercrm/trunk/modules/Calendar/OpenListView.php vtigercrm/trunk/modules/Calendar/RenderRelatedListUI.php vtigercrm/trunk/modules/Calendar/addEventUI.php vtigercrm/trunk/modules/Calendar/language/en_us.lang.php vtigercrm/trunk/modules/Campaigns/CallRelatedList.php vtigercrm/trunk/modules/Campaigns/Delete.php vtigercrm/trunk/modules/Campaigns/DetailView.php vtigercrm/trunk/modules/Campaigns/DetailViewAjax.php vtigercrm/trunk/modules/Campaigns/EditView.php vtigercrm/trunk/modules/Campaigns/ListView.php vtigercrm/trunk/modules/Campaigns/Save.php vtigercrm/trunk/modules/Contacts/CallRelatedList.php vtigercrm/trunk/modules/Contacts/Delete.php vtigercrm/trunk/modules/Contacts/DetailView.php vtigercrm/trunk/modules/Contacts/DetailViewAjax.php vtigercrm/trunk/modules/Contacts/EditView.php vtigercrm/trunk/modules/Contacts/ListView.php vtigercrm/trunk/modules/Contacts/Save.php vtigercrm/trunk/modules/CustomView/CustomView.php vtigercrm/trunk/modules/CustomView/EditView.php vtigercrm/trunk/modules/CustomView/PopulateCustomView.php vtigercrm/trunk/modules/Emails/CallRelatedList.php vtigercrm/trunk/modules/Emails/ChooseEmail.php vtigercrm/trunk/modules/Emails/Delete.php vtigercrm/trunk/modules/Emails/DetailView.php vtigercrm/trunk/modules/Emails/EditView.php vtigercrm/trunk/modules/Emails/EmailsAjax.php vtigercrm/trunk/modules/Emails/ListView.php vtigercrm/trunk/modules/Emails/Save.php vtigercrm/trunk/modules/Emails/class.phpmailer.php vtigercrm/trunk/modules/Emails/mail.php vtigercrm/trunk/modules/Emails/mailsend.php vtigercrm/trunk/modules/Emails/sendmail.php vtigercrm/trunk/modules/Faq/Faq.php vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php vtigercrm/trunk/modules/HelpDesk/HelpDesk.php vtigercrm/trunk/modules/HelpDesk/ListView.php vtigercrm/trunk/modules/Home/UnifiedSearch.php vtigercrm/trunk/modules/Import/ImportAccount.php vtigercrm/trunk/modules/Import/ImportAjax.php vtigercrm/trunk/modules/Import/ImportContact.php vtigercrm/trunk/modules/Import/ImportLead.php vtigercrm/trunk/modules/Import/ImportMap.php vtigercrm/trunk/modules/Import/ImportOpportunity.php vtigercrm/trunk/modules/Import/ImportProduct.php vtigercrm/trunk/modules/Import/ImportStep2.php vtigercrm/trunk/modules/Import/ImportSteplast.php vtigercrm/trunk/modules/Invoice/EditView.php vtigercrm/trunk/modules/Invoice/Invoice.php vtigercrm/trunk/modules/Invoice/ListTopInvoice.php vtigercrm/trunk/modules/Invoice/ListView.php vtigercrm/trunk/modules/Invoice/Save.php vtigercrm/trunk/modules/Leads/CallRelatedList.php vtigercrm/trunk/modules/Leads/Delete.php vtigercrm/trunk/modules/Leads/DetailView.php vtigercrm/trunk/modules/Leads/DetailViewAjax.php vtigercrm/trunk/modules/Leads/EditView.php vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php vtigercrm/trunk/modules/Leads/ListView.php vtigercrm/trunk/modules/Leads/Save.php vtigercrm/trunk/modules/Leads/result.php vtigercrm/trunk/modules/Migration/MigrationStep1.php vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php vtigercrm/trunk/modules/Notes/Delete.php vtigercrm/trunk/modules/Notes/DetailView.php vtigercrm/trunk/modules/Notes/DetailViewAjax.php vtigercrm/trunk/modules/Notes/EditView.php vtigercrm/trunk/modules/Notes/ListView.php vtigercrm/trunk/modules/Notes/Save.php vtigercrm/trunk/modules/Portal/Portal.js vtigercrm/trunk/modules/Portal/Save.php vtigercrm/trunk/modules/Potentials/CallRelatedList.php vtigercrm/trunk/modules/Potentials/Charts.php vtigercrm/trunk/modules/Potentials/Delete.php vtigercrm/trunk/modules/Potentials/DetailView.php vtigercrm/trunk/modules/Potentials/DetailViewAjax.php vtigercrm/trunk/modules/Potentials/EditView.php vtigercrm/trunk/modules/Potentials/ListView.php vtigercrm/trunk/modules/Potentials/ListViewTop.php vtigercrm/trunk/modules/Potentials/Save.php vtigercrm/trunk/modules/Potentials/language/en_us.lang.php vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php vtigercrm/trunk/modules/PriceBooks/Delete.php vtigercrm/trunk/modules/PriceBooks/DetailView.php vtigercrm/trunk/modules/PriceBooks/DetailViewAjax.php vtigercrm/trunk/modules/PriceBooks/EditView.php vtigercrm/trunk/modules/PriceBooks/ListView.php vtigercrm/trunk/modules/PriceBooks/Save.php vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php vtigercrm/trunk/modules/Products/CallRelatedList.php vtigercrm/trunk/modules/Products/Delete.php vtigercrm/trunk/modules/Products/DetailView.php vtigercrm/trunk/modules/Products/DetailViewAjax.php vtigercrm/trunk/modules/Products/EditView.php vtigercrm/trunk/modules/Products/ListView.php vtigercrm/trunk/modules/Products/Save.php vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php vtigercrm/trunk/modules/PurchaseOrder/Delete.php vtigercrm/trunk/modules/PurchaseOrder/DetailView.php vtigercrm/trunk/modules/PurchaseOrder/DetailViewAjax.php vtigercrm/trunk/modules/PurchaseOrder/EditView.php vtigercrm/trunk/modules/PurchaseOrder/ListTopPurchaseOrder.php vtigercrm/trunk/modules/PurchaseOrder/ListView.php vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php vtigercrm/trunk/modules/PurchaseOrder/Save.php vtigercrm/trunk/modules/Quotes/CallRelatedList.php vtigercrm/trunk/modules/Quotes/CreatePDF.php vtigercrm/trunk/modules/Quotes/Delete.php vtigercrm/trunk/modules/Quotes/DetailView.php vtigercrm/trunk/modules/Quotes/DetailViewAjax.php vtigercrm/trunk/modules/Quotes/EditView.php vtigercrm/trunk/modules/Quotes/ListTopQuotes.php vtigercrm/trunk/modules/Quotes/ListView.php vtigercrm/trunk/modules/Quotes/Save.php vtigercrm/trunk/modules/Reports/ReportColumns.php vtigercrm/trunk/modules/Reports/ReportRun.php vtigercrm/trunk/modules/Reports/Reports.php vtigercrm/trunk/modules/SalesOrder/EditView.php vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php vtigercrm/trunk/modules/SalesOrder/ListView.php vtigercrm/trunk/modules/SalesOrder/SalesOrder.php vtigercrm/trunk/modules/SalesOrder/Save.php vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php vtigercrm/trunk/modules/Settings/CustomFieldList.php vtigercrm/trunk/modules/Settings/DeleteCustomField.php vtigercrm/trunk/modules/Settings/EditComboField.php vtigercrm/trunk/modules/Settings/TaxConfig.php vtigercrm/trunk/modules/Users/Authenticate.php vtigercrm/trunk/modules/Users/ChangePassword.php vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php vtigercrm/trunk/modules/Users/DefaultDataPopulator.php vtigercrm/trunk/modules/Users/DetailView.php vtigercrm/trunk/modules/Users/DetailViewAjax.php vtigercrm/trunk/modules/Users/EditView.php vtigercrm/trunk/modules/Users/ListLoginHistory.php vtigercrm/trunk/modules/Users/ListView.php vtigercrm/trunk/modules/Users/Logout.php vtigercrm/trunk/modules/Users/Save.php vtigercrm/trunk/modules/Users/ShowAuditTrail.php vtigercrm/trunk/modules/Users/ShowHistory.php vtigercrm/trunk/modules/Users/about_us.php vtigercrm/trunk/modules/Users/massChangeStatus.php vtigercrm/trunk/modules/Users/populatetemplate.php vtigercrm/trunk/modules/Users/profilePrivileges.php vtigercrm/trunk/modules/Users/updateLeadDBStatus.php vtigercrm/trunk/modules/Vendors/CallRelatedList.php vtigercrm/trunk/modules/Vendors/Delete.php vtigercrm/trunk/modules/Vendors/DetailView.php vtigercrm/trunk/modules/Vendors/DetailViewAjax.php vtigercrm/trunk/modules/Vendors/EditView.php vtigercrm/trunk/modules/Vendors/ListView.php vtigercrm/trunk/modules/Vendors/Save.php vtigercrm/trunk/modules/Webmails/CallRelatedList.php vtigercrm/trunk/modules/Webmails/Save.php vtigercrm/trunk/schema/DatabaseSchema.xml vtigercrm/trunk/soap/firefoxtoolbar.php vtigercrm/trunk/soap/thunderbirdplugin.php vtigercrm/trunk/soap/vtigerolservice.php vtigercrm/trunk/soap/webforms.php vtigercrm/trunk/soap/wordplugin.php vtigercrm/trunk/vtigerversion.php Modified: vtigercrm/trunk/Popup.php ============================================================================== --- vtigercrm/trunk/Popup.php (original) +++ vtigercrm/trunk/Popup.php Tue Oct 31 03:40:43 2006 @@ -33,8 +33,8 @@ switch($currentModule) { case 'Contacts': - require_once("modules/$currentModule/Contact.php"); - $focus = new Contact(); + require_once("modules/$currentModule/Contacts.php"); + $focus = new Contacts(); $log = LoggerManager::getLogger('contact_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom'); $comboFieldArray = getComboArray($comboFieldNames); @@ -47,8 +47,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","",""); break; case 'Campaigns': - require_once("modules/$currentModule/Campaign.php"); - $focus = new Campaign(); + require_once("modules/$currentModule/Campaigns.php"); + $focus = new Campaigns(); $log = LoggerManager::getLogger('campaign_list'); $comboFieldNames = Array('campaignstatus'=>'campaignstatus_dom', 'campaigntype'=>'campaigntype_dom'); @@ -60,8 +60,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','campaignname','true','basic',$popuptype,"","",""); break; case 'Accounts': - require_once("modules/$currentModule/Account.php"); - $focus = new Account(); + require_once("modules/$currentModule/Accounts.php"); + $focus = new Accounts(); $log = LoggerManager::getLogger('account_list'); $comboFieldNames = Array('accounttype'=>'account_type_dom' ,'industry'=>'industry_dom'); @@ -74,8 +74,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','accountname','true','basic',$popuptype,"","",""); break; case 'Leads': - require_once("modules/$currentModule/Lead.php"); - $focus = new Lead(); + require_once("modules/$currentModule/Leads.php"); + $focus = new Leads(); $log = LoggerManager::getLogger('contact_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom' ,'leadstatus'=>'leadstatus_dom' @@ -91,8 +91,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","",""); break; case 'Potentials': - require_once("modules/$currentModule/Opportunity.php"); - $focus = new Potential(); + require_once("modules/$currentModule/Potentials.php"); + $focus = new Potentials(); $log = LoggerManager::getLogger('potential_list'); $comboFieldNames = Array('leadsource'=>'leadsource_dom' ,'opportunity_type'=>'opportunity_type_dom' @@ -104,8 +104,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','potentialname','true','basic',$popuptype,"","",""); break; case 'Quotes': - require_once("modules/$currentModule/Quote.php"); - $focus = new Quote(); + require_once("modules/$currentModule/Quotes.php"); + $focus = new Quotes(); $log = LoggerManager::getLogger('quotes_list'); $comboFieldNames = Array('quotestage'=>'quotestage_dom'); $comboFieldArray = getComboArray($comboFieldNames); @@ -121,8 +121,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','subject','true','basic',$popuptype,"","",""); break; case 'Products': - require_once("modules/$currentModule/Product.php"); - $focus = new Product(); + require_once("modules/$currentModule/Products.php"); + $focus = new Products(); $smarty->assign("SINGLE_MOD",'Product'); if(isset($_REQUEST['curr_row'])) { @@ -135,8 +135,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','productname','true','basic',$popuptype,"","",""); break; case 'Vendors': - require_once("modules/$currentModule/Vendor.php"); - $focus = new Vendor(); + require_once("modules/$currentModule/Vendors.php"); + $focus = new Vendors(); $smarty->assign("SINGLE_MOD",'Vendor'); $alphabetical = AlphabeticalSearch($currentModule,'Popup','vendorname','true','basic',$popuptype,"","",""); break; @@ -150,15 +150,15 @@ break; case 'PurchaseOrder': require_once("modules/$currentModule/PurchaseOrder.php"); - $focus = new Order(); + $focus = new PurchaseOrder(); $smarty->assign("SINGLE_MOD",'PurchaseOrder'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); $alphabetical = AlphabeticalSearch($currentModule,'Popup','subject','true','basic',$popuptype,"","",""); break; case 'PriceBooks': - require_once("modules/$currentModule/PriceBook.php"); - $focus = new PriceBook(); + require_once("modules/$currentModule/PriceBooks.php"); + $focus = new PriceBooks(); $smarty->assign("SINGLE_MOD",'PriceBook'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); @@ -175,8 +175,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'Popup','bookname','true','basic',$popuptype,"","",""); break; case 'Users': - require_once("modules/$currentModule/User.php"); - $focus = new User(); + require_once("modules/$currentModule/Users.php"); + $focus = new Users(); $smarty->assign("SINGLE_MOD",'Users'); if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); Modified: vtigercrm/trunk/Release_Notes.html ============================================================================== --- vtigercrm/trunk/Release_Notes.html (original) +++ vtigercrm/trunk/Release_Notes.html Tue Oct 31 03:40:43 2006 @@ -1,5 +1,5 @@ -vtiger CRM 5 Beta: Release Notes +vtiger CRM 5.0.2 : Release Notes {/literal} + + +{/literal}
        @@ -29,13 +68,15 @@
        {include file='SetMenu.tpl'} - + + +
        @@ -79,9 +120,47 @@
        -   - - +    + + + + + + + + @@ -309,4 +388,11 @@ document.getElementById(obj).className = 'hideTable'; } {/literal} +{literal} + //for move RenameProfile + var theEventHandle = document.getElementById("renameUI"); + var theEventRoot = document.getElementById("renameProfile"); + Drag.init(theEventHandle, theEventRoot); +{/literal} + Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original) +++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Tue Oct 31 03:40:43 2006 @@ -68,10 +68,9 @@ Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Tue Oct 31 03:40:43 2006 @@ -11,20 +11,14 @@ -->*} {include file="Buttons_List1.tpl"} +

        - - - - +
        - - - {$MOD.LBL_SETTINGS} -
        Modified: vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl Tue Oct 31 03:40:43 2006 @@ -13,6 +13,7 @@ + {literal} '; echo "


        "; - echo ""; + echo ""; echo "
        vtiger CRM 5.0.0 | Visit www.vtiger.com for more information
        vtiger CRM 5.0.2 | Visit www.vtiger.com for more information © Copyright Details
        "; // echo " Modified: vtigercrm/trunk/install/1checkSystem.php ============================================================================== --- vtigercrm/trunk/install/1checkSystem.php (original) +++ vtigercrm/trunk/install/1checkSystem.php Tue Oct 31 03:40:43 2006 @@ -203,7 +203,7 @@
        "; Modified: vtigercrm/trunk/install/0welcome.php ============================================================================== --- vtigercrm/trunk/install/0welcome.php (original) +++ vtigercrm/trunk/install/0welcome.php Tue Oct 31 03:40:43 2006 @@ -97,10 +97,10 @@
        -

               This Configuration Wizard will create vtiger CRM 5.0.1 databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready. +

               This Configuration Wizard will create vtiger CRM 5.0.2 databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready.

        -

        - vtiger CRM 5.0.1 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.

        -

        vtiger CRM 5.0.1 will not work on mysql 4.0.x versions

        vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements
        +

        - vtiger CRM 5.0.2 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.

        +

        vtiger CRM 5.0.2 will not work on mysql 4.0.x versions

        vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements

        The installation wizard will guide you with the installation regardless of the setup you may have.

        - + Modified: vtigercrm/trunk/install/2setConfig.php ============================================================================== --- vtigercrm/trunk/install/2setConfig.php (original) +++ vtigercrm/trunk/install/2setConfig.php Tue Oct 31 03:40:43 2006 @@ -99,7 +99,7 @@ elseif (isset($dbconfig['db_name']) && $dbconfig['db_name']!='_DBC_NAME_') $db_name = $dbconfig['db_name']; else - $db_name = 'vtigercrm501'; + $db_name = 'vtigercrm502'; !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; if (isset($_REQUEST['host_name'])) $host_name = $_REQUEST['host_name']; @@ -145,7 +145,7 @@ } else { !isset($_REQUEST['db_hostname']) ? $db_hostname = $hostname: $db_hostname = $_REQUEST['db_hostname']; - !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm501" : $db_name = $_REQUEST['db_name']; + !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm502" : $db_name = $_REQUEST['db_name']; !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; !isset($_REQUEST['host_name']) ? $host_name= $hostname : $host_name= $_REQUEST['host_name']; !isset($_REQUEST['site_URL']) ? $site_URL = $web_root : $site_URL = $_REQUEST['site_URL']; @@ -155,7 +155,7 @@ !isset($_REQUEST['mail_server_username']) ? $mail_server_username = $mail_server_username : $mail_server_username = stripslashes($_REQUEST['mail_server_username']); !isset($_REQUEST['mail_server_password']) ? $mail_server_password = $mail_server_password : $mail_server_password = stripslashes($_REQUEST['mail_server_password']); !isset($_REQUEST['admin_email']) ? $admin_email = "" : $admin_email = $_REQUEST['admin_email']; - } + } !isset($_REQUEST['check_createdb']) ? $check_createdb = "" : $check_createdb = $_REQUEST['check_createdb']; !isset($_REQUEST['root_user']) ? $root_user = "" : $root_user = $_REQUEST['root_user']; !isset($_REQUEST['root_password']) ? $root_password = "" : $root_password = $_REQUEST['root_password']; @@ -367,7 +367,7 @@
        Core Components
        PHP version 5.0.x
        PHP version
        Failed.
        Invalid version ($php_version) Installed
        " : "Passed
        Version $php_version Installed
        "; ?>
        Database Type * - No Database Support Deteched + No Database Support Detected Modified: vtigercrm/trunk/install/4createConfigFile.php ============================================================================== --- vtigercrm/trunk/install/4createConfigFile.php (original) +++ vtigercrm/trunk/install/4createConfigFile.php Tue Oct 31 03:40:43 2006 @@ -45,8 +45,8 @@ // vtiger CRM version number; do not edit! -$vtiger_version = "5.0.1"; -$release_date = "10 October 2006"; +$vtiger_version = "5.0.2"; +$release_date = "31 October 2006"; if (isset($_REQUEST['db_hostname'])) Modified: vtigercrm/trunk/install/5createTables.inc.php ============================================================================== --- vtigercrm/trunk/install/5createTables.inc.php (original) +++ vtigercrm/trunk/install/5createTables.inc.php Tue Oct 31 03:40:43 2006 @@ -22,14 +22,14 @@ require_once('config.php'); require_once('include/database/PearDatabase.php'); require_once('include/logging.php'); -require_once('modules/Leads/Lead.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Leads/Leads.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Users/User.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Users/Users.php'); require_once('modules/Import/ImportMap.php'); require_once('modules/Import/UsersLastImport.php'); require_once('modules/Users/LoginHistory.php'); @@ -66,7 +66,7 @@ global $default_user_is_admin; // create default admin user - $user = new User(); + $user = new Users(); $user->column_fields["last_name"] = 'Administrator'; $user->column_fields["user_name"] = 'admin'; $user->column_fields["status"] = 'Active'; @@ -122,7 +122,7 @@ //Creating the Standard User - $user = new User(); + $user = new Users(); $user->column_fields["last_name"] = 'StandardUser'; $user->column_fields["user_name"] = 'standarduser'; $user->column_fields["is_admin"] = 'off'; Modified: vtigercrm/trunk/install/5createTables.php ============================================================================== --- vtigercrm/trunk/install/5createTables.php (original) +++ vtigercrm/trunk/install/5createTables.php Tue Oct 31 03:40:43 2006 @@ -123,7 +123,7 @@
        - vtigercrm-5.0.1 is all set to go! + vtigercrm-5.0.2 is all set to go!
          Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== --- vtigercrm/trunk/install/populateSeedData.php (original) +++ vtigercrm/trunk/install/populateSeedData.php Tue Oct 31 03:40:43 2006 @@ -19,29 +19,29 @@ require_once('config.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('modules/Contacts/contactSeedData.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Campaigns/Campaign.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Campaigns/Campaigns.php'); +require_once('modules/Potentials/Potentials.php'); require_once('modules/Calendar/Activity.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); require_once('include/language/en_us.lang.php'); require_once('include/ComboStrings.php'); require_once('include/ComboUtil.php'); -require_once('modules/Products/Product.php'); -require_once('modules/PriceBooks/PriceBook.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Products/Products.php'); +require_once('modules/PriceBooks/PriceBooks.php'); +require_once('modules/Vendors/Vendors.php'); require_once('modules/Faq/Faq.php'); require_once('modules/HelpDesk/HelpDesk.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Quotes/Quotes.php'); require_once('modules/SalesOrder/SalesOrder.php'); require_once('modules/PurchaseOrder/PurchaseOrder.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/InventoryUtils.php'); //Included to save inventory related products in demo data global $first_name_array; @@ -113,7 +113,7 @@ } // Look up the user id for the assigned user -$seed_user = new User(); +$seed_user = new Users(); //$adb->println("PSD assignname=".$assigned_user_name); @@ -121,7 +121,7 @@ global $current_user; -$current_user = new User(); +$current_user = new Users(); $result = $current_user->retrieve_entity_info($assigned_user_id,'Users'); $tagkey = 1; @@ -147,7 +147,7 @@ $account_name = $company_name_array[$i]; // Create new accounts. - $account = new Account(); + $account = new Accounts(); $account->column_fields["accountname"] = $account_name; $account->column_fields["phone"] = create_phone_number(); $account->column_fields["assigned_user_id"] = $assigned_user_id; @@ -196,7 +196,7 @@ //Create new opportunities - $opp = new Potential(); + $opp = new Potentials(); $opp->column_fields["assigned_user_id"] = $assigned_user_id; $opp->column_fields["potentialname"] = $account_name." - 1000 units"; @@ -235,7 +235,7 @@ for($i=0; $i<10; $i++) { - $contact = new Contact(); + $contact = new Contacts(); $contact->column_fields["firstname"] = ucfirst(strtolower($first_name_array[$i])); $contact->column_fields["lastname"] = ucfirst(strtolower($last_name_array[$i])); $contact->column_fields["assigned_user_id"] = $assigned_user_id; @@ -327,7 +327,7 @@ $company_count=0; for($i=0; $i<10; $i++) { - $lead = new Lead(); + $lead = new Leads(); $lead->column_fields["firstname"] = ucfirst(strtolower($first_name_array[$i])); $lead->column_fields["lastname"] = ucfirst(strtolower($last_name_array[$i])); @@ -404,7 +404,7 @@ //Populating Vendor Data for($i=0; $i<10; $i++) { - $vendor = new Vendor(); + $vendor = new Vendors(); $vendor->column_fields["vendorname"] = ucfirst(strtolower($first_name_array[$i])); $vendor->column_fields["phone"] = create_phone_number(); $vendor->column_fields["email"] = strtolower($vendor->column_fields["vendorname"])."@company.com"; @@ -442,7 +442,7 @@ .jpeg###","product7.jpeg###product8.jpeg###product9.jpeg###product10.jpeg###"); for($i=0; $i<10; $i++) { - $product = new Product(); + $product = new Products(); if($i>4) { $parent_key = array_rand($opportunity_ids); @@ -579,7 +579,7 @@ $validtill_array = array ("2006-09-21", "2006-10-29", "2006-12-11", "2006-10-09", "2006-11-18"); for($i=0;$i<5;$i++) { - $quote = new Quote(); + $quote = new Quotes(); $quote->column_fields["assigned_user_id"] = $assigned_user_id; $account_key = array_rand($account_ids); @@ -730,7 +730,7 @@ for($i=0;$i<5;$i++) { - $po = new Order(); + $po = new PurchaseOrder(); $po->column_fields["assigned_user_id"] = $assigned_user_id; $vendor_key = array_rand($vendor_ids); @@ -896,7 +896,7 @@ for($i=0;$i<5;$i++) { - $email = new Email(); + $email = new Emails(); $email->column_fields["assigned_user_id"] = $assigned_user_id; @@ -923,7 +923,7 @@ //$num_array = array(0,1,2,3,4); for($i=0;$i<12;$i++) { - $pricebook = new PriceBook(); + $pricebook = new PriceBooks(); $rand = array_rand($num_array); $pricebook->column_fields["bookname"] = $PB_array[$i]; @@ -940,7 +940,7 @@ for($i=0;$i<7;$i++) { - $notes = new Note(); + $notes = new Notes(); $rand = array_rand($num_array); $contact_key = array_rand($contact_ids); @@ -1118,7 +1118,7 @@ //$expected_response = Array(null,null,null); for($i=0;$icolumn_fields["campaignname"] = $campaign_name; $campaign->column_fields["campaigntype"] = $campaign_type_array[$i]; Modified: vtigercrm/trunk/modules/Accounts/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Accounts/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -22,7 +22,7 @@ } else { -$focus = new Account(); +$focus = new Accounts(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/trunk/modules/Accounts/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/Delete.php (original) +++ vtigercrm/trunk/modules/Accounts/Delete.php Tue Oct 31 03:40:43 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Account(); +$focus = new Accounts(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/trunk/modules/Accounts/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/DetailView.php (original) +++ vtigercrm/trunk/modules/Accounts/DetailView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ global $app_list_strings; global $log, $currentModule, $singlepane_view; -$focus = new Account(); +$focus = new Accounts(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Accounts"); $focus->id = $_REQUEST['record']; Modified: vtigercrm/trunk/modules/Accounts/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Accounts/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $acntObj = new Account(); + $acntObj = new Accounts(); $acntObj->retrieve_entity_info($crmid,"Accounts"); $acntObj->column_fields[$fieldname] = $fieldvalue; if($fieldname == 'annual_revenue')//annual revenue converted to dollar value while saving Modified: vtigercrm/trunk/modules/Accounts/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/EditView.php (original) +++ vtigercrm/trunk/modules/Accounts/EditView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -31,7 +31,7 @@ global $app_strings,$mod_strings,$currentModule,$theme; $smarty=new vtigerCRM_Smarty; -$focus = new Account(); +$focus = new Accounts(); if(isset($_REQUEST['record'])) { Modified: vtigercrm/trunk/modules/Accounts/HeadLines.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/HeadLines.php (original) +++ vtigercrm/trunk/modules/Accounts/HeadLines.php Tue Oct 31 03:40:43 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -include("modules/Accounts/Account.php"); +include("modules/Accounts/Accounts.php"); include("getCompanyProfile.php"); $variable = $_REQUEST['tickersymbol']; $url = "http://finance.yahoo.com/q?s=".$variable; Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Tue Oct 31 03:40:43 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -43,7 +43,7 @@ $url_string = ''; -$focus = new Account(); +$focus = new Accounts(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); @@ -80,6 +80,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { list($where, $ustring) = split("#@@#",getWhereCondition($currentModule)); Modified: vtigercrm/trunk/modules/Accounts/ListViewTop.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListViewTop.php (original) +++ vtigercrm/trunk/modules/Accounts/ListViewTop.php Tue Oct 31 03:40:43 2006 @@ -28,7 +28,7 @@ $log = LoggerManager::getLogger('top accounts_list'); $log->debug("Entering getTopAccounts() method ..."); require_once("data/Tracker.php"); - require_once('modules/Potentials/Opportunity.php'); + require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); global $app_strings; Modified: vtigercrm/trunk/modules/Accounts/Merge.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/Merge.php (original) +++ vtigercrm/trunk/modules/Accounts/Merge.php Tue Oct 31 03:40:43 2006 @@ -1,259 +1,259 @@ - - - - -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"); -} - -//echo $mass_merge; -//die; -//for setting vtiger_accountid=0 for the contacts which are deleted -$ct_query = "select crmid from vtiger_crmentity where setype='Contacts' and deleted=1"; -$result = $adb->query($ct_query); - -while($row = $adb->fetch_array($result)) -{ - $deleted_id[] = $row['crmid']; -} - -if(count($deleted_id) > 0) -{ - $deleted_id = implode(",",$deleted_id); - $update_query = "update vtiger_contactdetails set accountid = 0 where contactid in (".$deleted_id.")"; - $result = $adb->query($update_query); -} -//End setting vtiger_accountid=0 for the contacts which are deleted - -//<<<<<<<<<<<<<<<
          >>>>>>>>>>>>>>>>>>>>>>> -$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 == "Contacts") - { - $tablename = "crmentityContacts"; - } - } - $querycolumns[$x] = $tablename.".".$columnname; - if($columnname == "smownerid") - { - if($modulename == "Accounts") - { - $querycolumns[$x] = "concat(vtiger_users.last_name,' ',vtiger_users.first_name) as userjoinname,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($modulename == "Contacts") - { - $querycolumns[$x] = "concat(usersContacts.last_name,' ',usersContacts.first_name) as userjoincname"; - } - } - if($columnname == "parentid") - { - $querycolumns[$x] = "accountAccount.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($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"; - } - } - - if($modulename == "Contacts") - { - $field_label[$x] = "CONTACT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); - } - -} - -$csvheader = implode(",",$field_label); -//<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>> - -if(count($querycolumns) > 0) -{ - $selectcolumns = implode($querycolumns,","); - -$query = "select ".$selectcolumns." from vtiger_account - 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_account as vtiger_accountAccount on vtiger_accountAccount.accountid = vtiger_account.parentid - left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid - left join vtiger_contactdetails on vtiger_contactdetails.accountid=vtiger_account.accountid - 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 - left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid - 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 - where vtiger_crmentity.deleted=0 and (crmentityContacts.deleted=0 || vtiger_crmentityContacts.deleted is null) and vtiger_account.accountid in(".$mass_merge.")"; -//echo $query; -//die; -$result = $adb->query($query); - -while($columnValues = $adb->fetch_array($result)) -{ - $y=$adb->num_fields($result); - for($x=0; $x<$y; $x++) - { - $value = $columnValues[$x]; - //<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>> - if($value == "0") - { - $value = ""; - } - if(trim($value) == "--None--" || trim($value) == "--none--") - { - $value = ""; - } - //<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>> - $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"); +} + +//echo $mass_merge; +//die; +//for setting vtiger_accountid=0 for the contacts which are deleted +$ct_query = "select crmid from vtiger_crmentity where setype='Contacts' and deleted=1"; +$result = $adb->query($ct_query); + +while($row = $adb->fetch_array($result)) +{ + $deleted_id[] = $row['crmid']; +} + +if(count($deleted_id) > 0) +{ + $deleted_id = implode(",",$deleted_id); + $update_query = "update vtiger_contactdetails set accountid = 0 where contactid in (".$deleted_id.")"; + $result = $adb->query($update_query); +} +//End setting vtiger_accountid=0 for the contacts which are deleted + +//<<<<<<<<<<<<<<<
          >>>>>>>>>>>>>>>>>>>>>>> +$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 == "Contacts") + { + $tablename = "vtiger_crmentityContacts"; + } + } + $querycolumns[$x] = $tablename.".".$columnname; + if($columnname == "smownerid") + { + if($modulename == "Accounts") + { + $querycolumns[$x] = "concat(vtiger_users.last_name,' ',vtiger_users.first_name) as userjoinname,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($modulename == "Contacts") + { + $querycolumns[$x] = "concat(vtiger_usersContacts.last_name,' ',vtiger_usersContacts.first_name) as userjoincname"; + } + } + if($columnname == "parentid") + { + $querycolumns[$x] = "vtiger_accountAccount.accountname"; + } + if($columnname == "accountid") + { + $querycolumns[$x] = "vtiger_accountContacts.accountname"; + } + if($columnname == "reportsto") + { + $querycolumns[$x] = "vtiger_contactdetailsContacts.lastname"; + } + + if($modulename == "Accounts") + { + $field_label[$x] = "ACCOUNT_".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"; + } + } + + if($modulename == "Contacts") + { + $field_label[$x] = "CONTACT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel"))); + } + +} + +$csvheader = implode(",",$field_label); +//<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>> + +if(count($querycolumns) > 0) +{ + $selectcolumns = implode($querycolumns,","); + +$query = "select ".$selectcolumns." from vtiger_account + 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_account as vtiger_accountAccount on vtiger_accountAccount.accountid = vtiger_account.parentid + left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid + left join vtiger_contactdetails on vtiger_contactdetails.accountid=vtiger_account.accountid + 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 + left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid + 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 + where vtiger_crmentity.deleted=0 and (vtiger_crmentityContacts.deleted=0 || vtiger_crmentityContacts.deleted is null) and vtiger_account.accountid in(".$mass_merge.")"; +//echo $query; +//die; +$result = $adb->query($query); + +while($columnValues = $adb->fetch_array($result)) +{ + $y=$adb->num_fields($result); + for($x=0; $x<$y; $x++) + { + $value = $columnValues[$x]; + //<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>> + if($value == "0") + { + $value = ""; + } + if(trim($value) == "--None--" || trim($value) == "--none--") + { + $value = ""; + } + //<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>> + $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); +?> + + + Modified: vtigercrm/trunk/modules/Accounts/Save.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/Save.php (original) +++ vtigercrm/trunk/modules/Accounts/Save.php Tue Oct 31 03:40:43 2006 @@ -21,14 +21,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Accounts/Account.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/logging.php'); //require_once('database/DatabaseConnection.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); global $log; -$focus = new Account(); +$focus = new Accounts(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/trunk/modules/Accounts/Tickerdetail.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/Tickerdetail.php (original) +++ vtigercrm/trunk/modules/Accounts/Tickerdetail.php Tue Oct 31 03:40:43 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once("modules/Accounts/Account.php"); +require_once("modules/Accounts/Accounts.php"); require_once("getCompanyProfile.php"); $variable = $_REQUEST['tickersymbol']; $url = "http://moneycentral.msn.com/investor/research/profile.asp?Symbol=".trim($variable); Modified: vtigercrm/trunk/modules/Accounts/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Accounts/language/en_us.lang.php Tue Oct 31 03:40:43 2006 @@ -205,6 +205,8 @@ 'Press'=>'Press', 'Prospect'=>'Prospect', 'Reseller'=>'Reseller', +'LBL_START_DATE' => 'Start Date', +'LBL_END_DATE' => 'End Date', Modified: vtigercrm/trunk/modules/Calendar/Activity.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/Activity.php (original) +++ vtigercrm/trunk/modules/Calendar/Activity.php Tue Oct 31 03:40:43 2006 @@ -30,19 +30,8 @@ class Activity extends CRMEntity { var $log; var $db; - - var $table_name = "vtiger_activity"; - #var $object_name = "activity"; - // Mike Crowe Mod --------------------------------------------------------Renamed to match vtiger_tab - var $object_name = "Activities"; - // Mike Crowe Mod --------------------------------------------------------added for general search - var $base_table_name = "vtiger_activity"; - var $cf_table_name = ""; - var $module_id = "activityid"; - - var $reminder_table = "vtiger_activity_reminder"; - - var $tab_name = Array('vtiger_crmentity','vtiger_activity','vtiger_seactivityrel','vtiger_cntactivityrel','vtiger_salesmanactivityrel','vtiger_activity_reminder','vtiger_recurringevents','vtiger_invitees'); + var $reminder_table = 'vtiger_activity_reminder'; + 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_salesmanactivityrel'=>'activityid','vtiger_activity_reminder'=>'activity_id','vtiger_recurringevents'=>'activityid'); @@ -104,8 +93,261 @@ $this->column_fields = getColumnFields('Calendar'); } - var $new_schema = true; - + + function save_module($module) + { + //Handling module specific save + //Insert into seactivity rel + if(isset($this->column_fields['parent_id']) && $this->column_fields['parent_id'] != '') + { + $this->insertIntoEntityTable("vtiger_seactivityrel", $module); + } + elseif($this->column_fields['parent_id']=='' && $insertion_mode=="edit") + { + $this->deleteRelation("vtiger_seactivityrel"); + } + //Insert into cntactivity rel + + if(isset($this->column_fields['contact_id']) && $this->column_fields['contact_id'] != '') + { + $this->insertIntoEntityTable('vtiger_cntactivityrel', $module); + } + elseif($this->column_fields['contact_id'] =='' && $insertion_mode=="edit") + { + $this->deleteRelation('vtiger_cntactivityrel'); + } + + //Handling for recurring type + //Insert into vtiger_activity_remainder table + if(isset($this->column_fields['recurringtype']) && $this->column_fields['recurringtype']!='') + $recur_type = trim($this->column_fields['recurringtype']); + else + $recur_type=''; + + if($recur_type == "--None--") + { + $this->insertIntoReminderTable('vtiger_activity_reminder',$module,""); + } + + //Insert into vtiger_recurring event table + $recur_type = trim($this->column_fields['recurringtype']); + if($recur_type != "--None--" && $recur_type != '') + { + $recur_data = getrecurringObjValue(); + if(is_object($recur_data)) + $this->insertIntoRecurringTable($recur_data); + } + + //Handling for invitees + if(isset($_REQUEST['inviteesid']) && $_REQUEST['inviteesid']!='') + { + $selected_users_string = $_REQUEST['inviteesid']; + $invitees_array = explode(';',$selected_users_string); + $this->insertIntoInviteeTable('vtiger_invitees',$module,$invitees_array); + + } + + //Inserting into sales man activity rel + $this->insertIntoSmActivityRel($module); + + + + } + + + /** Function to insert values in vtiger_activity_remainder table for the specified module, + * @param $table_name -- table name:: Type varchar + * @param $module -- module:: Type varchar + */ + function insertIntoReminderTable($table_name,$module,$recurid) + { + global $log; + $log->info("in insertIntoReminderTable ".$table_name." module is ".$module); + if($_REQUEST['set_reminder'] == 'Yes') + { + $log->debug("set reminder is set"); + $rem_days = $_REQUEST['remdays']; + $log->debug("rem_days is ".$rem_days); + $rem_hrs = $_REQUEST['remhrs']; + $log->debug("rem_hrs is ".$rem_hrs); + $rem_min = $_REQUEST['remmin']; + $log->debug("rem_minutes is ".$rem_min); + $reminder_time = $rem_days * 24 * 60 + $rem_hrs * 60 + $rem_min; + $log->debug("reminder_time is ".$reminder_time); + if ($recurid == "") + { + if($_REQUEST['mode'] == 'edit') + { + $this->activity_reminder($this->id,$reminder_time,0,$recurid,'edit'); + } + else + { + $this->activity_reminder($this->id,$reminder_time,0,$recurid,''); + } + } + else + { + $this->activity_reminder($this->id,$reminder_time,0,$recurid,''); + } + } + elseif($_REQUEST['set_reminder'] == 'No') + { + $this->activity_reminder($this->id,'0',0,$recurid,'delete'); + } + } + + + // Code included by Jaguar - starts + /** Function to insert values in vtiger_recurringevents table for the specified tablename,module + * @param $recurObj -- Recurring Object:: Type varchar + */ +function insertIntoRecurringTable(& $recurObj) +{ + global $log,$adb; + $log->info("in insertIntoRecurringTable "); + $st_date = $recurObj->startdate->get_formatted_date(); + $log->debug("st_date ".$st_date); + $end_date = $recurObj->enddate->get_formatted_date(); + $log->debug("end_date is set ".$end_date); + $type = $recurObj->recur_type; + $log->debug("type is ".$type); + $flag="true"; + + if($_REQUEST['mode'] == 'edit') + { + $activity_id=$this->id; + + $sql='select min(recurringdate) AS min_date,max(recurringdate) AS max_date, recurringtype, activityid from vtiger_recurringevents where activityid='. $activity_id.' group by activityid, recurringtype'; + + $result = $adb->query($sql); + $noofrows = $adb->num_rows($result); + for($i=0; $i<$noofrows; $i++) + { + $recur_type_b4_edit = $adb->query_result($result,$i,"recurringtype"); + $date_start_b4edit = $adb->query_result($result,$i,"min_date"); + $end_date_b4edit = $adb->query_result($result,$i,"max_date"); + } + if(($st_date == $date_start_b4edit) && ($end_date==$end_date_b4edit) && ($type == $recur_type_b4_edit)) + { + if($_REQUEST['set_reminder'] == 'Yes') + { + $sql = 'delete from vtiger_activity_reminder where activity_id='.$activity_id; + $adb->query($sql); + $sql = 'delete from vtiger_recurringevents where activityid='.$activity_id; + $adb->query($sql); + $flag="true"; + } + elseif($_REQUEST['set_reminder'] == 'No') + { + $sql = 'delete from vtiger_activity_reminder where activity_id='.$activity_id; + $adb->query($sql); + $flag="false"; + } + else + $flag="false"; + } + else + { + $sql = 'delete from vtiger_activity_reminder where activity_id='.$activity_id; + $adb->query($sql); + $sql = 'delete from vtiger_recurringevents where activityid='.$activity_id; + $adb->query($sql); + } + } + $date_array = $recurObj->recurringdates; + if(isset($recurObj->recur_freq) && $recurObj->recur_freq != null) + $recur_freq = $recurObj->recur_freq; + else + $recur_freq = 1; + if($recurObj->recur_type == 'Daily' || $recurObj->recur_type == 'Yearly') + $recurringinfo = $recurObj->recur_type; + elseif($recurObj->recur_type == 'Weekly') + { + $recurringinfo = $recurObj->recur_type; + if($recurObj->dayofweek_to_rpt != null) + $recurringinfo = $recurringinfo.'::'.implode('::',$recurObj->dayofweek_to_rpt); + } + elseif($recurObj->recur_type == 'Monthly') + { + $recurringinfo = $recurObj->recur_type.'::'.$recurObj->repeat_monthby; + if($recurObj->repeat_monthby == 'date') + $recurringinfo = $recurringinfo.'::'.$recurObj->rptmonth_datevalue; + else + $recurringinfo = $recurringinfo.'::'.$recurObj->rptmonth_daytype.'::'.$recurObj->dayofweek_to_rpt[0]; + } + else + { + $recurringinfo = ''; + } + if($flag=="true") + { + for($k=0; $k< count($date_array); $k++) + { + $tdate=$date_array[$k]; + if($tdate <= $end_date) + { + $max_recurid_qry = 'select max(recurringid) AS recurid from vtiger_recurringevents;'; + $result = $adb->query($max_recurid_qry); + $noofrows = $adb->num_rows($result); + for($i=0; $i<$noofrows; $i++) + { + $recur_id = $adb->query_result($result,$i,"recurid"); + } + $current_id =$recur_id+1; + $recurring_insert = "insert into vtiger_recurringevents values ('".$current_id."','".$this->id."','".$tdate."','".$type."','".$recur_freq."','".$recurringinfo."')"; + $adb->query($recurring_insert); + if($_REQUEST['set_reminder'] == 'Yes') + { + $this->insertIntoReminderTable("vtiger_activity_reminder",$module,$current_id,''); + } + } + } + } +} + + + /** Function to insert values in vtiger_invitees table for the specified module,tablename ,invitees_array + * @param $table_name -- table name:: Type varchar + * @param $module -- module:: Type varchar + * @param $invitees_array Array + */ + function insertIntoInviteeTable($table_name,$module,$invitees_array) + { + global $log,$adb; + $log->debug("Entering insertIntoInviteeTable(".$table_name.",".$module.",".$invitees_array.") method ..."); + foreach($invitees_array as $inviteeid) + { + if($inviteeid != '') + { + $query="insert into vtiger_invitees values(".$this->id.",".$inviteeid.")"; + $adb->query($query); + } + } + $log->debug("Exiting insertIntoInviteeTable method ..."); + + } + + + /** Function to insert values in vtiger_salesmanactivityrel table for the specified module + * @param $module -- module:: Type varchar + */ + + function insertIntoSmActivityRel($module) + { + global $adb; + global $current_user; + if($this->mode == 'edit') + { + + $sql = "delete from vtiger_salesmanactivityrel where activityid=".$this->id." and smid = ".$this->column_fields['assigned_user_id'].""; + $adb->query($sql); + + } + $sql_qry = "insert into vtiger_salesmanactivityrel (smid,activityid) values(".$this->column_fields['assigned_user_id'].",".$this->id.")"; + $adb->query($sql_qry); + + } + // Mike Crowe Mod --------------------------------------------------------Default ordering for us /** @@ -154,7 +396,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new Contact(); + $focus = new Contacts(); $button = ''; @@ -177,7 +419,7 @@ $log->debug("Entering get_contacts(".$id.") method ..."); global $app_strings; - $focus = new User(); + $focus = new Users(); $button = ''; @@ -395,8 +637,8 @@ global $log,$adb; $log->debug("Entering get_tasksforol(".$username.") method ..."); global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -447,8 +689,8 @@ global $log,$adb; $log->debug("Entering get_calendarsforol(".$user_name.") method ..."); global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); Modified: vtigercrm/trunk/modules/Calendar/ActivityAjax.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/ActivityAjax.php (original) +++ vtigercrm/trunk/modules/Calendar/ActivityAjax.php Tue Oct 31 03:40:43 2006 @@ -19,6 +19,27 @@ $cal_log =& LoggerManager::getLogger('calendar'); $cal_log->debug("In CalendarAjax file"); $mysel = $_REQUEST['view']; +if($_REQUEST['file'] == 'OpenListView') +{ + require_once('Smarty_setup.php'); + $smarty = new vtigerCRM_Smarty; + require_once("modules/Calendar/OpenListView.php"); + $smarty->assign("APP",$app_strings); + $smarty->assign("IMAGE_PATH",$image_path); + if($_REQUEST['mode'] == '0') + { + $activities[0] = getPendingActivities(0); + $smarty->assign("ACTIVITIES",$activities); + $smarty->display("upcomingActivities.tpl"); + } + else if($_REQUEST['mode'] == '1') + { + $activities[1] = getPendingActivities(1); + $smarty->assign("ACTIVITIES",$activities); + $smarty->display("pendingActivities.tpl"); + } + die(); +} $calendar_arr = Array(); $calendar_arr['IMAGE_PATH'] = $image_path; $date_data = array(); Modified: vtigercrm/trunk/modules/Calendar/Appointment.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/Appointment.php (original) +++ vtigercrm/trunk/modules/Calendar/Appointment.php Tue Oct 31 03:40:43 2006 @@ -60,7 +60,7 @@ require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); $shared_ids = getSharedCalendarId($current_user->id); - $q= "select vtiger_activity.*, vtiger_crmentity.*, vtiger_activitygrouprelation.groupname FROM vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid left join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted = 0 and vtiger_activity.activitytype in ('Call','Meeting') AND (vtiger_activity.date_start < '". $to_datetime->get_formatted_date() ."' AND vtiger_activity.date_start >= '". $from_datetime->get_formatted_date()."') "; + $q= "select vtiger_activity.*, vtiger_crmentity.*, vtiger_activitygrouprelation.groupname FROM vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid left join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname WHERE vtiger_crmentity.deleted = 0 and vtiger_activity.activitytype in ('Call','Meeting') AND (vtiger_activity.date_start < '". $to_datetime->get_formatted_date() ."' AND vtiger_activity.date_start >= '". $from_datetime->get_formatted_date()."') "; if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[16] == 3) { $sec_parameter=getListViewSecurityParameter('Calendar'); @@ -83,7 +83,7 @@ unset($obj); } //Get Recurring events - $q = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_crmentity.description, vtiger_activity.time_start,vtiger_activity.time_end, vtiger_activity.duration_hours, vtiger_activity.duration_minutes,vtiger_activity.due_date, vtiger_activity.priority, vtiger_activity.location,vtiger_activity.eventstatus, vtiger_crmentity.*, vtiger_recurringevents.recurringid, vtiger_recurringevents.recurringdate as date_start ,vtiger_recurringevents.recurringtype,vtiger_activitygrouprelation.groupname from vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid inner join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid"; + $q = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_crmentity.description, vtiger_activity.time_start,vtiger_activity.time_end, vtiger_activity.duration_hours, vtiger_activity.duration_minutes,vtiger_activity.due_date, vtiger_activity.priority, vtiger_activity.location,vtiger_activity.eventstatus, vtiger_crmentity.*, vtiger_recurringevents.recurringid, vtiger_recurringevents.recurringdate as date_start ,vtiger_recurringevents.recurringtype,vtiger_activitygrouprelation.groupname from vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid inner join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname "; $q.=" where vtiger_crmentity.deleted = 0 and vtiger_activity.activitytype in ('Call','Meeting') AND (recurringdate < '".$to_datetime->get_formatted_date()."' AND recurringdate >= '".$from_datetime->get_formatted_date(). "') "; @@ -93,7 +93,7 @@ $q .= $sec_parameter; } - $q .= " ORDER by recurringid"; + $q .= " ORDER by vtiger_recurringevents.recurringid"; $r = $adb->query($q); $n = $adb->getRowCount($r); $a = 0; Modified: vtigercrm/trunk/modules/Calendar/CalendarCommon.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/CalendarCommon.php (original) +++ vtigercrm/trunk/modules/Calendar/CalendarCommon.php Tue Oct 31 03:40:43 2006 @@ -206,7 +206,7 @@ $hrsel = 'selected'; else $hrsel = ''; - $combo .= ''; + $combo .= ''; } $combo .= ' '; $combo .= ' '; $combo .= 'Hr '; $combo .= ' min'; } Modified: vtigercrm/trunk/modules/Calendar/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/DetailView.php (original) +++ vtigercrm/trunk/modules/Calendar/DetailView.php Tue Oct 31 03:40:43 2006 @@ -136,21 +136,21 @@ $data['date_start'] = $stdate; $data['due_date'] = $enddate; $data['assigned_user_id'] = $finaldata['assigned_user_id']; -$data['taskpriority'] = $finaldata['taskpriority']; +$data['taskpriority'] = $mod_strings[$finaldata['taskpriority']]; $data['modifiedtime'] = $finaldata['modifiedtime']; $data['createdtime'] = $finaldata['createdtime']; $data['parent_name'] = $finaldata['parent_id']; $data['description'] = $finaldata['description']; if($activity_mode == 'Task') { - $data['taskstatus'] = $finaldata['taskstatus']; + $data['taskstatus'] = $mod_strings[$finaldata['taskstatus']]; $data['activitytype'] = $activity_mode; $data['contact_id'] = $finaldata['contact_id']; } elseif($activity_mode == 'Events') { $data['visibility'] = $finaldata['visibility']; - $data['eventstatus'] = $finaldata['eventstatus']; + $data['eventstatus'] = $mod_strings[$finaldata['eventstatus']]; $data['activitytype'] = $finaldata['activitytype']; $data['location'] = $finaldata['location']; //Calculating reminder time Modified: vtigercrm/trunk/modules/Calendar/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/ListView.php (original) +++ vtigercrm/trunk/modules/Calendar/ListView.php Tue Oct 31 03:40:43 2006 @@ -76,6 +76,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); $where = ""; $url_string = ''; // assigning http url string Modified: vtigercrm/trunk/modules/Calendar/OpenListView.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/OpenListView.php (original) +++ vtigercrm/trunk/modules/Calendar/OpenListView.php Tue Oct 31 03:40:43 2006 @@ -49,82 +49,67 @@ //code added to customize upcomming and pending activities if($_REQUEST['activity_view']=='') { - $query = "select activity_view from vtiger_users where id ='$current_user->id'"; - $result=$adb->query($query); - $activity_view=$adb->query_result($result,0,'activity_view'); + $activity_view='today'; } else $activity_view=$_REQUEST['activity_view']; $today = date("Y-m-d", time()); - if($activity_view == 'Today') - { - $later = date("Y-m-d",strtotime("$today +1 day")); - } - else if($activity_view == 'This Week') - { - $later = date("Y-m-d", strtotime("$today +7 days")); - } - else if($activity_view == 'This Month') - { - $later = date("Y-m-d", strtotime("$today +1 month")); - } - else if($activity_view == 'This Year') - { - $later = date("Y-m-d", strtotime("$today +1 year")); - } - else if($activity_view == 'OverDue') - { - $later = date("Y-m-d", strtotime("$today +1 day")); - } - $last_tendays = date("Y-m-d",strtotime("$today -10 days")); + if($activity_view == 'today') + { + $upcoming_condition = " AND (date_start = '$today' OR vtiger_recurringevents.recurringdate = '$today')"; + $pending_condition = " AND (due_date = '$today' OR vtiger_recurringevents.recurringdate = '$today')"; + } + else if($activity_view == 'all') + { + $upcoming_condition = " AND (date_start >= '$today' OR vtiger_recurringevents.recurringdate >= '$today')"; + $pending_condition = " AND (due_date <= '$today' OR vtiger_recurringevents.recurringdate <= '$today')"; + } if($mode != 1) { //for upcoming avtivities - $list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity 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_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE 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.status is NULL OR vtiger_activity.status != 'Deferred') and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Not Held' ) AND ((date_start > '$today' AND date_start < '$later') OR (vtiger_recurringevents.recurringdate between '$today' and '$later') ) AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'"; + $list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity 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_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE 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.status is NULL OR vtiger_activity.status != 'Deferred') and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Not Held' ) ".$upcoming_condition." AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'"; } else { - //for pending activities for the last 10 days - $list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity 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_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE 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.status is NULL OR vtiger_activity.status != 'Deferred') and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Not Held' ) AND ((due_date > '$last_tendays' AND due_date <= '$today') OR (vtiger_recurringevents.recurringdate > '$last_tendays' AND vtiger_recurringevents.recurringdate <= '$today')) AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'"; - } + //for pending activities + $list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity 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_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE 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.status is NULL OR vtiger_activity.status != 'Deferred') and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Not Held' ) ".$pending_condition." AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'"; + } + $res = $adb->query($list_query); $noofrecords = $adb->num_rows($res); - $list_result = $adb->limitQuery($list_query,0,5); $open_activity_list = array(); - $noofrows = $adb->num_rows($list_result); - if (count($list_result)>0) + $noofrows = $adb->num_rows($res); + if (count($res)>0) for($i=0;$i<$noofrows;$i++) { - $parent_name=getRelatedTo("Calendar",$list_result,$i); - $open_activity_list[] = Array('name' => $adb->query_result($list_result,$i,'subject'), - 'id' => $adb->query_result($list_result,$i,'activityid'), - 'type' => $adb->query_result($list_result,$i,'activitytype'), - 'module' => $adb->query_result($list_result,$i,'setype'), - 'status' => $adb->query_result($list_result,$i,'status'), - 'firstname' => $adb->query_result($list_result,$i,'firstname'), - 'lastname' => $adb->query_result($list_result,$i,'lastname'), - 'accountname' => $adb->query_result($list_result,$i,'accountname'), - 'accountid' => $adb->query_result($list_result, $i, 'accountid'), - 'contactid' => $adb->query_result($list_result,$i,'contactid'), - 'date_start' => getDisplayDate($adb->query_result($list_result,$i,'date_start')), - 'due_date' => getDisplayDate($adb->query_result($list_result,$i,'due_date')), - 'recurringtype' => getDisplayDate($adb->query_result($list_result,$i,'recurringtype')), - 'recurringdate' => getDisplayDate($adb->query_result($list_result,$i,'recurringdate')), + $parent_name=getRelatedTo("Calendar",$res,$i); + $open_activity_list[] = Array('name' => $adb->query_result($res,$i,'subject'), + 'id' => $adb->query_result($res,$i,'activityid'), + 'type' => $adb->query_result($res,$i,'activitytype'), + 'module' => $adb->query_result($res,$i,'setype'), + 'status' => $adb->query_result($res,$i,'status'), + 'firstname' => $adb->query_result($res,$i,'firstname'), + 'lastname' => $adb->query_result($res,$i,'lastname'), + 'accountname' => $adb->query_result($res,$i,'accountname'), + 'accountid' => $adb->query_result($res, $i, 'accountid'), + 'contactid' => $adb->query_result($res,$i,'contactid'), + 'date_start' => getDisplayDate($adb->query_result($res,$i,'date_start')), + 'due_date' => getDisplayDate($adb->query_result($res,$i,'due_date')), + 'recurringtype' => getDisplayDate($adb->query_result($res,$i,'recurringtype')), + 'recurringdate' => getDisplayDate($adb->query_result($res,$i,'recurringdate')), 'parent'=> $parent_name, // Fredy Klammsteiner, 4.8.2005: changes from 4.0.1 migrated to 4.2 - 'priority' => $adb->query_result($list_result,$i,'priority'), // Armando L?scher 04.07.2005 -> ?priority -> Desc: Get vtiger_priority from db + 'priority' => $adb->query_result($res,$i,'priority'), // Armando L?scher 04.07.2005 -> ?priority -> Desc: Get vtiger_priority from db ); } - $later_day = getDisplayDate(date("Y-m-d", strtotime("$later -1 day "))); $title=array(); $title[]=$activity_view; $title[]='myUpcoPendAct.gif'; - //.'('.$current_module_strings["LBL_TODAY"].' '.$later_day.')'; $title[]='home_myact'; - $title[]=getActivityView($activity_view); + //$title[]=getActivityView($activity_view); $title[]='showActivityView'; $title[]='MyUpcumingFrm'; $title[]='activity_view'; @@ -229,7 +214,6 @@ } } // Code by Jaguar Ends - $entries['noofactivities'] = $noofrecords; $entries[$event['id']] = array( '0' => ''.$event["name"].'', 'IMAGE' => '', @@ -241,7 +225,7 @@ 'RECURRINGTYPE' => ereg_replace('--','',$event['recurringtype']), ); } - $values=Array('Title'=>$title,'Header'=>$header,'Entries'=>$entries); + $values=Array('noofactivities'=>$noofrecords,'Title'=>$title,'Header'=>$header,'Entries'=>$entries); $log->debug("Exiting getPendingActivities method ..."); return $values; } Modified: vtigercrm/trunk/modules/Calendar/RenderRelatedListUI.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/RenderRelatedListUI.php (original) +++ vtigercrm/trunk/modules/Calendar/RenderRelatedListUI.php Tue Oct 31 03:40:43 2006 @@ -10,8 +10,8 @@ ********************************************************************************/ require_once('include/RelatedListView.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/UserInfoUtil.php'); // functions added for group calendar -Jaguar Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/addEventUI.php (original) +++ vtigercrm/trunk/modules/Calendar/addEventUI.php Tue Oct 31 03:40:43 2006 @@ -202,8 +202,8 @@ - - + +
          @@ -649,7 +649,7 @@
        -
        - + Modified: vtigercrm/trunk/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Tue Oct 31 03:40:43 2006 @@ -402,6 +402,8 @@ 'Pending Input'=>'Pending Input', 'LBL_REMAINDER_DAY'=>'days', 'LBL_REMAINDER_HRS'=>'hrs', +'Call'=>'Call', +'Meeting'=>'Meeting', ); Modified: vtigercrm/trunk/modules/Campaigns/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Campaigns/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Campaigns/Campaign.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 @@ -23,7 +23,7 @@ } else { -$focus = new Campaign(); +$focus = new Campaigns(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/trunk/modules/Campaigns/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/Delete.php (original) +++ vtigercrm/trunk/modules/Campaigns/Delete.php Tue Oct 31 03:40:43 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('ticket_delete'); -$focus = new Campaign(); +$focus = new Campaigns(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/DetailView.php (original) +++ vtigercrm/trunk/modules/Campaigns/DetailView.php Tue Oct 31 03:40:43 2006 @@ -11,12 +11,12 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Campaigns/Campaign.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'); -$focus = new Campaign(); +$focus = new Campaigns(); if(isset($_REQUEST['record']) && $_REQUEST['record']!= null ) { Modified: vtigercrm/trunk/modules/Campaigns/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Campaigns/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Campaign(); + $modObj = new Campaigns(); $modObj->retrieve_entity_info($crmid,"Campaigns"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/trunk/modules/Campaigns/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/EditView.php (original) +++ vtigercrm/trunk/modules/Campaigns/EditView.php Tue Oct 31 03:40:43 2006 @@ -11,12 +11,12 @@ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once('include/utils/utils.php'); -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$currentModule,$theme; -$focus = new Campaign(); +$focus = new Campaigns(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] !='') Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Tue Oct 31 03:40:43 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); require_once("data/Tracker.php"); @@ -28,7 +28,7 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; -$focus = new Campaign(); +$focus = new Campaigns(); $category = getParentTab(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); @@ -77,6 +77,7 @@ $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid); $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); //<<<<>>>> if($viewid != 0) Modified: vtigercrm/trunk/modules/Campaigns/Save.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/Save.php (original) +++ vtigercrm/trunk/modules/Campaigns/Save.php Tue Oct 31 03:40:43 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Campaigns/Campaign.php'); +require_once('modules/Campaigns/Campaigns.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new Campaign(); +$focus = new Campaigns(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/trunk/modules/Contacts/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Contacts/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout @@ -22,7 +22,7 @@ } else { -$focus = new Contact(); +$focus = new Contacts(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/trunk/modules/Contacts/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/Delete.php (original) +++ vtigercrm/trunk/modules/Contacts/Delete.php Tue Oct 31 03:40:43 2006 @@ -17,13 +17,13 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Contact(); +$focus = new Contacts(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/trunk/modules/Contacts/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/DetailView.php (original) +++ vtigercrm/trunk/modules/Contacts/DetailView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -33,7 +33,7 @@ global $app_strings; global $currentModule, $singlepane_view; -$focus = new Contact(); +$focus = new Contacts(); if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/trunk/modules/Contacts/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Contacts/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $cntObj = new Contact(); + $cntObj = new Contacts(); $cntObj->retrieve_entity_info($crmid,"Contacts"); $cntObj->column_fields[$fieldname] = $fieldvalue; $cntObj->id = $crmid; Modified: vtigercrm/trunk/modules/Contacts/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/EditView.php (original) +++ vtigercrm/trunk/modules/Contacts/EditView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -39,7 +39,7 @@ $image_error=isset($_REQUEST['image_error'])?$_REQUEST['image_error']:"false"; //end -$focus = new Contact(); +$focus = new Contacts(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) @@ -68,9 +68,9 @@ if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']=='') { - require_once('modules/Accounts/Account.php'); + require_once('modules/Accounts/Accounts.php'); $focus->column_fields['account_id'] = $_REQUEST['account_id']; - $acct_focus = new Account(); + $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']; Modified: vtigercrm/trunk/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ListView.php (original) +++ vtigercrm/trunk/modules/Contacts/ListView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -39,7 +39,7 @@ global $currentModule,$theme; -$focus = new Contact(); +$focus = new Contacts(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); @@ -114,6 +114,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); // Buttons and View options if($viewid != 0) { Modified: vtigercrm/trunk/modules/Contacts/Save.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/Save.php (original) +++ vtigercrm/trunk/modules/Contacts/Save.php Tue Oct 31 03:40:43 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once("modules/Emails/mail.php"); @@ -51,7 +51,7 @@ $local_log =& LoggerManager::getLogger('index'); global $log,$adb; -$focus = new Contact(); +$focus = new Contacts(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/trunk/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/CustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/CustomView.php Tue Oct 31 03:40:43 2006 @@ -36,25 +36,7 @@ - var $module_list = Array("Leads"=>Array("Information"=>13,"Address"=>15,"Description"=>16,"Custom Information"=>14), - "Contacts"=>Array("Information"=>4,"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), - "Campaigns"=>Array("Information"=>76,"Expectations"=>78,"Description"=>82,"Custom Information"=>77), - "Products"=>Array("Information"=>31,"Description"=>36,"Pricing Information"=>32,"Stock Information"=>33,"Custom Information"=>34), - "Vendors"=>Array("Information"=>44,"Address"=>46,"Description"=>47,"Custom Information"=>45), - "PriceBooks"=>Array("Information"=>48,"Description"=>50,"Custom Information"=>49), - "Notes"=>Array("Information"=>17,"Description"=>18), - "Emails"=>Array("Information"=>'21,22,23',"Description"=>24), - "HelpDesk"=>Array("Information"=>'25,26',"Description"=>28,"Custom Information"=>27,"Solution"=>29), - "Quotes"=>Array("Information"=>51,"Address"=>53,"Description"=>56,"Terms and Conditions"=>55,"Custom Information"=>52), - "PurchaseOrder"=>Array("Information"=>57,"Address"=>59,"Description"=>62,"Terms and Conditions"=>61,"Custom Information"=>58), - "SalesOrder"=>Array("Information"=>63,"Address"=>65,"Description"=>68,"Terms and Conditions"=>67,"Custom Information"=>64), - "Faq"=>Array("Information"=>'37,38,39'), - "Invoice"=>Array("Information"=>69,"Address"=>71,"Description"=>74,"Terms and Conditions"=>73,"Custom Information"=>70) - ); - + var $module_list = Array(); var $customviewmodule; @@ -292,6 +274,8 @@ function getModuleColumnsList($module) { + + $module_info = $this->getCustomViewModuleInfo($module); foreach($this->module_list[$module] as $key=>$value) { $columnlist = $this->getColumnsListbyBlock($module,$value); @@ -342,7 +326,7 @@ global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); - + $module_info = $this->getCustomViewModuleInfo($module); foreach($this->module_list[$module] as $key=>$blockid) { $blockids[] = $blockid; @@ -1525,5 +1509,35 @@ return $calist; } + + /* This function sets the block information for the given module to the class variable module_list + * and return the array + */ + + function getCustomViewModuleInfo($module) + { + global $adb; + global $current_language; + $current_mod_strings = return_specified_module_language($current_language, $module); + $block_info = Array(); + $Sql = "select distinct block,vtiger_field.tabid,name,blocklabel from vtiger_field inner join vtiger_blocks on vtiger_blocks.blockid=vtiger_field.block inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where displaytype != 3 and vtiger_field.block not in(40,6,75,35,30,54,60,66,72) and vtiger_tab.name='$module' order by block"; + $result = $adb->query($Sql); + while($block_result = $adb->fetch_array($result)) + { + $block_label = $block_result['blocklabel']; + if (trim($block_label) == '') + { + $block_info[$pre_block_label] = $block_info[$pre_block_label].",".$block_result['block']; + }else + { + $lan_block_label = $current_mod_strings[$block_label]; + $block_info[$lan_block_label] = $block_result['block']; + } + $pre_block_label = $lan_block_label; + } + $this->module_list[$module] = $block_info; + return $this->module_list; + } + } ?> Modified: vtigercrm/trunk/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/EditView.php (original) +++ vtigercrm/trunk/modules/CustomView/EditView.php Tue Oct 31 03:40:43 2006 @@ -221,7 +221,7 @@ foreach($oCustomView->module_list[$module] as $key=>$value) { $advfilter = array(); - $label = $app_list_strings['moduleList'][$module]." ".$key; + $label = $key; if(isset($columnslist[$module][$key])) { foreach($columnslist[$module][$key] as $field=>$fieldlabel) Modified: vtigercrm/trunk/modules/CustomView/PopulateCustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/PopulateCustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/PopulateCustomView.php Tue Oct 31 03:40:43 2006 @@ -315,6 +315,7 @@ Array('vtiger_products:productname:productname:Products_Product_Name:V', 'vtiger_products:productcode:productcode:Products_Product_Code:V', 'vtiger_products:commissionrate:commissionrate:Products_Commission_Rate:V', + 'vtiger_products:qtyinstock:qtyinstock:Products_Quantity_In_Stock:V', 'vtiger_products:qty_per_unit:qty_per_unit:Products_Qty/Unit:V', 'vtiger_products:unit_price:unit_price:Products_Unit_Price:V'), Modified: vtigercrm/trunk/modules/Emails/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Emails/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Emails/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -11,10 +11,10 @@ require_once('Smarty_setup.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); -$focus = new Email(); +$focus = new Emails(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/trunk/modules/Emails/ChooseEmail.php ============================================================================== --- vtigercrm/trunk/modules/Emails/ChooseEmail.php (original) +++ vtigercrm/trunk/modules/Emails/ChooseEmail.php Tue Oct 31 03:40:43 2006 @@ -29,20 +29,20 @@ if ($pmodule=='Accounts') { - require_once('modules/Accounts/Account.php'); - $myfocus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $myfocus = new Accounts(); $myfocus->retrieve_entity_info($entityid,"Accounts"); } elseif ($pmodule=='Contacts') { - require_once('modules/Contacts/Contact.php'); - $myfocus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $myfocus = new Contacts(); $myfocus->retrieve_entity_info($entityid,"Contacts"); } elseif ($pmodule=='Leads') { - require_once('modules/Leads/Lead.php'); - $myfocus = new Lead(); + require_once('modules/Leads/Leads.php'); + $myfocus = new Leads(); $myfocus->retrieve_entity_info($entityid,"Leads"); } ?> Modified: vtigercrm/trunk/modules/Emails/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Emails/Delete.php (original) +++ vtigercrm/trunk/modules/Emails/Delete.php Tue Oct 31 03:40:43 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('email_delete'); -$focus = new Email(); +$focus = new Emails(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the email."); Modified: vtigercrm/trunk/modules/Emails/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Emails/DetailView.php (original) +++ vtigercrm/trunk/modules/Emails/DetailView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/upload_file.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ global $mod_strings; global $currentModule; -$focus = new Email(); +$focus = new Emails(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record'])) Modified: vtigercrm/trunk/modules/Emails/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Emails/EditView.php (original) +++ vtigercrm/trunk/modules/Emails/EditView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/FormValidationUtil.php'); @@ -34,7 +34,7 @@ global $current_user; global $currentModule; -$focus = new Email(); +$focus = new Emails(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['upload_error'] == true) Modified: vtigercrm/trunk/modules/Emails/EmailsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Emails/EmailsAjax.php (original) +++ vtigercrm/trunk/modules/Emails/EmailsAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = $_REQUEST["fieldValue"]; if($crmid != "") { - $modObj = new Email(); + $modObj = new Emails(); $modObj->retrieve_entity_info($crmid,"Emails"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/trunk/modules/Emails/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Emails/ListView.php (original) +++ vtigercrm/trunk/modules/Emails/ListView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/utils/utils.php'); @@ -42,7 +42,7 @@ $url_string = ''; // assigning http url string -$focus = new Email(); +$focus = new Emails(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/trunk/modules/Emails/Save.php ============================================================================== --- vtigercrm/trunk/modules/Emails/Save.php (original) +++ vtigercrm/trunk/modules/Emails/Save.php Tue Oct 31 03:40:43 2006 @@ -51,13 +51,13 @@ $mailbox = 'INBOX'; } -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Email(); +$focus = new Emails(); global $current_user; setObjectValuesFromRequest(&$focus); Modified: vtigercrm/trunk/modules/Emails/class.phpmailer.php ============================================================================== --- vtigercrm/trunk/modules/Emails/class.phpmailer.php (original) +++ vtigercrm/trunk/modules/Emails/class.phpmailer.php Tue Oct 31 03:40:43 2006 @@ -365,14 +365,14 @@ // Choose the mailer switch($this->Mailer) { - case "sendmail": - $result = $this->SendmailSend($header, $body); + case "sendmail": + $result = $this->SendmailSend($header, html_entity_decode($body)); break; case "mail": - $result = $this->MailSend($header, $body); + $result = $this->MailSend($header, html_entity_decode($body)); break; case "smtp": - $result = $this->SmtpSend($header, $body); + $result = $this->SmtpSend($header, html_entity_decode($body)); break; default: $this->SetError($this->Mailer . $this->Lang("mailer_not_supported")); Modified: vtigercrm/trunk/modules/Emails/mail.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mail.php (original) +++ vtigercrm/trunk/modules/Emails/mail.php Tue Oct 31 03:40:43 2006 @@ -137,7 +137,7 @@ $adb->println("Inside the function setMailerProperties"); $mail->Subject = $subject; - $mail->Body = nl2br($contents); + $mail->Body = $contents; //$mail->Body = html_entity_decode(nl2br($contents)); //if we get html tags in mail then we will use this line $mail->AltBody = strip_tags(preg_replace(array("/

        /i","/
        /i","/
        /i"),array("\n","\n","\n"),$contents)); Modified: vtigercrm/trunk/modules/Emails/mailsend.php ============================================================================== --- vtigercrm/trunk/modules/Emails/mailsend.php (original) +++ vtigercrm/trunk/modules/Emails/mailsend.php Tue Oct 31 03:40:43 2006 @@ -124,24 +124,27 @@ $fresult=$adb->query($myquery); if ($pmodule=='Contacts') { - require_once('modules/Contacts/Contact.php'); - $myfocus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $myfocus = new Contacts(); $myfocus->retrieve_entity_info($mycrmid,"Contacts"); } elseif ($pmodule=='Accounts') { - require_once('modules/Accounts/Account.php'); - $myfocus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $myfocus = new Accounts(); $myfocus->retrieve_entity_info($mycrmid,"Accounts"); } elseif ($pmodule=='Leads') { - require_once('modules/Leads/Lead.php'); - $myfocus = new Lead(); + require_once('modules/Leads/Leads.php'); + $myfocus = new Leads(); $myfocus->retrieve_entity_info($mycrmid,"Leads"); } $fldname=$adb->query_result($fresult,0,"columnname"); $emailadd=br2nl($myfocus->column_fields[$fldname]); + +//This is to convert the html encoded string to original html entities so that in mail description contents will be displayed correctly + $focus->column_fields['description'] = from_html($focus->column_fields['description']); if($emailadd != '') { Modified: vtigercrm/trunk/modules/Emails/sendmail.php ============================================================================== --- vtigercrm/trunk/modules/Emails/sendmail.php (original) +++ vtigercrm/trunk/modules/Emails/sendmail.php Tue Oct 31 03:40:43 2006 @@ -18,7 +18,7 @@ * @copyright 2001 - 2003 Brent R. Matzelle */ -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('include/logging.php'); require("modules/Emails/class.phpmailer.php"); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/trunk/modules/Faq/Faq.php ============================================================================== --- vtigercrm/trunk/modules/Faq/Faq.php (original) +++ vtigercrm/trunk/modules/Faq/Faq.php Tue Oct 31 03:40:43 2006 @@ -33,7 +33,7 @@ var $log; var $db; - var $tab_name = Array('vtiger_crmentity','vtiger_faq','vtiger_faqcomments'); + var $tab_name = Array('vtiger_crmentity','vtiger_faq'); var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_faq'=>'id','vtiger_faqcomments'=>'faqid'); var $entity_table = "vtiger_crmentity"; @@ -86,6 +86,40 @@ $this->log->debug("Exiting Faq method ..."); } + function save_module($module) + { + //Inserting into Faq comment table + $this->insertIntoFAQCommentTable('vtiger_faqcomments', $module); + + } + + + /** Function to insert values in vtiger_faqcomments table for the specified module, + * @param $table_name -- table name:: Type varchar + * @param $module -- module:: Type varchar + */ + function insertIntoFAQCommentTable($table_name, $module) + { + global $log; + $log->info("in insertIntoFAQCommentTable ".$table_name." module is ".$module); + global $adb; + + $current_time = $adb->formatDate(date('YmdHis')); + + if($this->column_fields['comments'] != '') + $comment = $this->column_fields['comments']; + else + $comment = $_REQUEST['comments']; + + if($comment != '') + { + $comment = addslashes($comment); + $sql = "insert into vtiger_faqcomments values('',".$this->id.",'".$comment."',".$current_time.")"; + $adb->query($sql); + } + } + + /** Function to get the list of comments for the given FAQ id * @param int $faqid - FAQ id * @return list $list - return the list of comments and comment informations as a html output where as these comments and comments informations will be formed in div tag. Modified: vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php Tue Oct 31 03:40:43 2006 @@ -49,7 +49,9 @@ $sql = "select ticketid, comments, createdtime from vtiger_ticketcomments where ticketid=".$_REQUEST['record']; $res = $adb->query($sql); $noofrows = $adb->num_rows($res); - $answer .= '\r\n\r\nCOMMENTS:'; + + if($noofrows > 0) + $answer .= '\r\n\r\nCOMMENTS:'; for($i=0; $i < $noofrows; $i++) { $comments = $adb->query_result($res,$i,'comments'); Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original) +++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Tue Oct 31 03:40:43 2006 @@ -24,7 +24,7 @@ var $log; var $db; - var $tab_name = Array('vtiger_crmentity','vtiger_troubletickets','vtiger_seticketsrel','vtiger_ticketcf','vtiger_ticketcomments','vtiger_attachments'); + 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 $column_fields = Array(); @@ -91,6 +91,83 @@ $this->log->debug("Exiting HelpDesk method ..."); } + + function save_module($module) + { + //Inserting into Ticket Comment Table + $this->insertIntoTicketCommentTable("vtiger_ticketcomments",'HelpDesk'); + + //Inserting into vtiger_seticketsrel table + + if(isset($this->column_fields['parent_id']) && $this->column_fields['parent_id'] != '') + { + $this->insertIntoEntityTable('vtiger_seticketsrel', 'HelpDesk'); + } + elseif($this->column_fields['parent_id']=='' && $insertion_mode=="edit") + { + $this->deleteRelation('vtiger_seticketsrel'); + } + + //Inserting into vtiger_attachments + $this->insertIntoAttachment($this->id,'HelpDesk'); + + } + + /** Function to insert values in vtiger_ticketcomments for the specified tablename and module + * @param $table_name -- table name:: Type varchar + * @param $module -- module:: Type varchar + */ + function insertIntoTicketCommentTable($table_name, $module) + { + global $log; + $log->info("in insertIntoTicketCommentTable ".$table_name." module is ".$module); + global $adb; + global $current_user; + + $current_time = $adb->formatDate(date('YmdHis')); + if($this->column_fields['assigned_user_id'] != '') + $ownertype = 'user'; + else + $ownertype = 'customer'; + + if($this->column_fields['comments'] != '') + $comment = $this->column_fields['comments']; + else + $comment = $_REQUEST['comments']; + + if($comment != '') + { + $comment = addslashes($comment); + $sql = "insert into vtiger_ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."',".$current_time.")"; + $adb->query($sql); + } + } + + + /** + * 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; + + foreach($_FILES as $fileindex => $files) + { + if($files['name'] != '' && $files['size'] > 0) + { + $file_saved = $this->uploadAndSaveFile($id,$module,$files); + } + } + + $log->debug("Exiting from insertIntoAttachment($id,$module) method."); + } + + /** Function used to get the sort order for HelpDesk listview * @return string $sorder - first check the $_REQUEST['sorder'] if request value is empty then check in the $_SESSION['HELPDESK_SORT_ORDER'] if this session value is empty then default sort order will be returned. */ @@ -457,7 +534,7 @@ { global $log; $log->debug("Entering get_history(".$id.") method ..."); - $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus, + $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus, vtiger_activity.date_start, vtiger_activity.due_date, vtiger_activity.activitytype, vtiger_troubletickets.ticketid, vtiger_troubletickets.title, vtiger_crmentity.modifiedtime, vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name from vtiger_activity Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Tue Oct 31 03:40:43 2006 @@ -82,6 +82,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); if($viewid != 0) { $CActionDtls = $oCustomView->getCustomActionDetails($viewid); Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php ============================================================================== --- vtigercrm/trunk/modules/Home/UnifiedSearch.php (original) +++ vtigercrm/trunk/modules/Home/UnifiedSearch.php Tue Oct 31 03:40:43 2006 @@ -21,18 +21,6 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Leads/Lead.php'); -require_once('modules/Faq/Faq.php'); -require_once('modules/Vendors/Vendor.php'); -require_once('modules/PriceBooks/PriceBook.php'); -require_once('modules/Quotes/Quote.php'); -require_once('modules/PurchaseOrder/PurchaseOrder.php'); -require_once('modules/SalesOrder/SalesOrder.php'); -require_once('modules/Invoice/Invoice.php'); -require_once('modules/Campaigns/Campaign.php'); require_once('modules/Home/language/en_us.lang.php'); require_once('include/database/PearDatabase.php'); require_once('modules/CustomView/CustomView.php'); @@ -41,37 +29,25 @@ global $mod_strings; $total_record_count = 0; -//echo get_module_title("", "Search Results", true); -if(isset($_REQUEST['query_string']) && preg_match("/[\w]/", $_REQUEST['query_string'])) { + +$query_string = trim($_REQUEST['query_string']); +if(isset($query_string) && $query_string != '')//preg_match("/[\w]/", $_REQUEST['query_string'])) +{ //module => object - $object_array = Array( - 'Potentials'=>'Potential', - 'Accounts'=>'Account', - 'Contacts'=>'Contact', - 'Leads'=>'Lead', - 'Notes'=>'Note', - 'Calendar'=>'Activity', - 'Emails'=>'Email', - 'HelpDesk'=>'HelpDesk', - 'Products'=>'Product', - 'Faq'=>'Faq', - //'Events'=>'', - 'Vendors'=>'Vendor', - 'PriceBooks'=>'PriceBook', - 'Quotes'=>'Quote', - 'PurchaseOrder'=>'Order', - 'SalesOrder'=>'SalesOrder', - 'Invoice'=>'Invoice', - 'Campaigns'=>'Campaign' - ); + $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 = $_REQUEST['query_string']; + $search_val = $query_string; $search_module = $_REQUEST['search_module']; getSearchModulesComboList($search_module); @@ -285,4 +261,28 @@

        $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/trunk/modules/Import/ImportAccount.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportAccount.php (original) +++ vtigercrm/trunk/modules/Import/ImportAccount.php Tue Oct 31 03:40:43 2006 @@ -22,15 +22,15 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/ComboUtil.php'); // Account is used to store vtiger_account information. -class ImportAccount extends Account { +class ImportAccount extends Accounts { var $db; // Get _dom arrays from Database Modified: vtigercrm/trunk/modules/Import/ImportAjax.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportAjax.php (original) +++ vtigercrm/trunk/modules/Import/ImportAjax.php Tue Oct 31 03:40:43 2006 @@ -12,6 +12,14 @@ require_once('Smarty_setup.php'); include('modules/Import/ImportMap.php'); include('modules/Import/Forms.php'); + +//This is to delete the map +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']); Modified: vtigercrm/trunk/modules/Import/ImportContact.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportContact.php (original) +++ vtigercrm/trunk/modules/Import/ImportContact.php Tue Oct 31 03:40:43 2006 @@ -18,7 +18,7 @@ ********************************************************************************/ include_once('config.php'); require_once('include/logging.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('modules/Import/UsersLastImport.php'); require_once('include/database/PearDatabase.php'); require_once('include/ComboUtil.php'); @@ -28,7 +28,7 @@ $comboFieldArray = getComboArray($comboFieldNames); // Contact is used to store customer information. -class ImportContact extends Contact { +class ImportContact extends Contacts { // these are vtiger_fields that may be set on import // but are to be processed and incorporated // into vtiger_fields of the parent class @@ -169,7 +169,7 @@ $arr = array(); // check if it already exists - $focus = new Account(); + $focus = new Accounts(); $query = ''; Modified: vtigercrm/trunk/modules/Import/ImportLead.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportLead.php (original) +++ vtigercrm/trunk/modules/Import/ImportLead.php Tue Oct 31 03:40:43 2006 @@ -26,16 +26,16 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/ComboUtil.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); -class ImportLead extends Lead { +class ImportLead extends Leads { var $db; // This is the list of the functions to run when importing Modified: vtigercrm/trunk/modules/Import/ImportMap.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportMap.php (original) +++ vtigercrm/trunk/modules/Import/ImportMap.php Tue Oct 31 03:40:43 2006 @@ -99,6 +99,14 @@ $this->content = "".$this->db->getEmptyBlob().""; $this->has_header = $has_header; $this->deleted = 0; + + //check whether this map name is already exist, if yes then overwrite the existing one, else create new + $res = $this->db->query("select id from vtiger_import_maps where name='".trim($name)."'"); + if($this->db->num_rows($res) > 0) + { + $this->id = $this->db->query_result($res,0,'id'); + } + $returnid = $this->save(); $this->db->updateBlob($this->table_name,"content","name='".$name."' and module='".$module."'",$content); @@ -180,7 +188,7 @@ */ function getSavedMappingsList($module) { - $query = "SELECT * FROM $this->table_name where module='".$module."'"; + $query = "SELECT * FROM $this->table_name where module='".$module."' and deleted=0"; $result = $this->db->query($query,true," Error: "); $map_lists = array(); @@ -197,7 +205,7 @@ */ function getSavedMappingContent($mapid) { - $query = "SELECT * FROM $this->table_name where id='".$mapid."'"; + $query = "SELECT * FROM $this->table_name where id='".$mapid."' and deleted=0"; $result = $this->db->query($query,true," Error: "); $mapping_arr = array(); Modified: vtigercrm/trunk/modules/Import/ImportOpportunity.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportOpportunity.php (original) +++ vtigercrm/trunk/modules/Import/ImportOpportunity.php Tue Oct 31 03:40:43 2006 @@ -22,11 +22,11 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); require_once('include/ComboUtil.php'); // Get _dom arrays from Database @@ -36,7 +36,7 @@ $comboFieldArray = getComboArray($comboFieldNames); // Account is used to store vtiger_account information. -class ImportOpportunity extends Potential { +class ImportOpportunity extends Potentials { var $db; // This is the list of vtiger_fields that are required. @@ -131,7 +131,7 @@ $arr = array(); // check if it already exists - $focus = new Account(); + $focus = new Accounts(); $query = ''; Modified: vtigercrm/trunk/modules/Import/ImportProduct.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportProduct.php (original) +++ vtigercrm/trunk/modules/Import/ImportProduct.php Tue Oct 31 03:40:43 2006 @@ -26,17 +26,17 @@ require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Contacts/Contacts.php'); +require_once('modules/Potentials/Potentials.php'); +require_once('modules/Notes/Notes.php'); +require_once('modules/Emails/Emails.php'); +require_once('modules/Accounts/Accounts.php'); +require_once('modules/Products/Products.php'); require_once('include/ComboUtil.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); -class ImportProduct extends Product { +class ImportProduct extends Products { var $db; // This is the list of the functions to run when importing Modified: vtigercrm/trunk/modules/Import/ImportStep2.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportStep2.php (original) +++ vtigercrm/trunk/modules/Import/ImportStep2.php Tue Oct 31 03:40:43 2006 @@ -183,6 +183,8 @@ } } $map_list_combo .= ''; +//This link is Delete link for the selected mapping +$map_list_combo .= "   "; $smarty->assign("SAVED_MAP_LISTS",$map_list_combo); @@ -250,27 +252,27 @@ if($_REQUEST['module']=='Accounts') { $tablename='account'; - $focus1=new Account(); + $focus1=new Accounts(); } if($_REQUEST['module']=='Contacts') { $tablename='contactdetails'; - $focus1=new Contact(); + $focus1=new Contacts(); } if($_REQUEST['module']=='Leads') { $tablename='leaddetails'; - $focus1=new Lead(); + $focus1=new Leads(); } if($_REQUEST['module']=='Potentials') { $tablename='potential'; - $focus1=new Potential(); + $focus1=new Potentials(); } if($_REQUEST['module']=='Products') { $tablename='products'; - $focus1=new Product(); + $focus1=new Products(); } Modified: vtigercrm/trunk/modules/Import/ImportSteplast.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportSteplast.php (original) +++ vtigercrm/trunk/modules/Import/ImportSteplast.php Tue Oct 31 03:40:43 2006 @@ -26,7 +26,7 @@ require_once('modules/Import/UsersLastImport.php'); require_once('modules/Import/parse_utils.php'); require_once('include/ListView/ListView.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); require_once('include/utils/utils.php'); global $mod_strings; Modified: vtigercrm/trunk/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/EditView.php (original) +++ vtigercrm/trunk/modules/Invoice/EditView.php Tue Oct 31 03:40:43 2006 @@ -23,9 +23,9 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Invoice/Invoice.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('modules/SalesOrder/SalesOrder.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -43,7 +43,7 @@ if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoinvoice') { $quoteid = $_REQUEST['record']; - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToInvoice($focus,$quote_focus,$quoteid); @@ -179,7 +179,7 @@ } if(isset($_REQUEST['opportunity_id']) && $_REQUEST['opportunity_id'] !='') { - $potfocus = new Potential(); + $potfocus = new Potentials(); $potfocus->column_fields['potential_id'] = $_REQUEST['opportunity_id']; $associated_prod = getAssociatedProducts("Potentials",$potfocus,$potfocus->column_fields['potential_id']); @@ -194,8 +194,8 @@ if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && ($_REQUEST['record']=='' || $_REQUEST['convertmode'] == "potentoinvoice")){ - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/trunk/modules/Invoice/Invoice.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Invoice.php (original) +++ vtigercrm/trunk/modules/Invoice/Invoice.php Tue Oct 31 03:40:43 2006 @@ -33,22 +33,12 @@ class Invoice extends CRMEntity { var $log; var $db; - + var $table_name = "vtiger_invoice"; + var $module_id = "invoiceid"; var $tab_name = Array('vtiger_crmentity','vtiger_invoice','vtiger_invoicebillads','vtiger_invoiceshipads','vtiger_invoicecf'); var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_invoice'=>'invoiceid','vtiger_invoicebillads'=>'invoicebilladdressid','vtiger_invoiceshipads'=>'invoiceshipaddressid','vtiger_invoicecf'=>'invoiceid'); - - var $entity_table = "vtiger_crmentity"; - - var $billadr_table = "vtiger_invoicebillads"; - - var $object_name = "Invoice"; - - var $new_schema = true; - - var $module_id = "invoiceid"; - var $column_fields = Array(); var $sortby_fields = Array('subject','crmid','invoicestatus','smownerid'); @@ -102,6 +92,25 @@ $this->column_fields = getColumnFields('Invoice'); $this->log->debug("Exiting Invoice method ..."); } + + + /** Function to handle the module specific save operations + + */ + + function save_module($module) + { + //Checking if vtiger_salesorderid is present and updating the quote status + if($this->column_fields["salesorder_id"] != '') + { + $so_id = $this->column_fields["salesorder_id"]; + $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'); + } + /** Function used to get the sort order for Invoice listview * @return string $sorder - first check the $_REQUEST['sorder'] if request value is empty then check in the $_SESSION['INVOICE_SORT_ORDER'] if this session value is empty then default sort order will be returned. Modified: vtigercrm/trunk/modules/Invoice/ListTopInvoice.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListTopInvoice.php (original) +++ vtigercrm/trunk/modules/Invoice/ListTopInvoice.php Tue Oct 31 03:40:43 2006 @@ -52,9 +52,9 @@ $date_var = date('Y-m-d'); //Changed for Patch 2 by Don - $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_invoice.invoicestatus != \'Paid\' ORDER BY total DESC'; + $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_invoice.invoicestatus != \'Paid\''; $query = getListQuery("Invoice",$where); - + $query .= " ORDER BY total DESC"; //<<<<<<<>>>>>>>> $list_result = $adb->limitQuery($query,0,5); Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Tue Oct 31 03:40:43 2006 @@ -80,6 +80,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); if(isPermitted('Invoice','Delete','') == 'yes') { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; Modified: vtigercrm/trunk/modules/Invoice/Save.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Save.php (original) +++ vtigercrm/trunk/modules/Invoice/Save.php Tue Oct 31 03:40:43 2006 @@ -30,25 +30,9 @@ $focus = new Invoice(); global $current_user; -$currencyid=fetchCurrency($current_user->id); -$rate_symbol = getCurrencySymbolandCRate($currencyid); -$rate = $rate_symbol['rate']; setObjectValuesFromRequest(&$focus); $focus->save("Invoice"); - -//Checking if vtiger_salesorderid is present and updating the quote status -if($focus->column_fields["salesorder_id"] != '') -{ - $so_id = $focus->column_fields["salesorder_id"]; - $query1 = "update vtiger_salesorder set sostatus='Approved' where salesorderid=".$so_id; - $adb->query($query1); -} - - -//Based on the total Number of rows we will save the product relationship with this entity -saveInventoryProductDetails(&$focus, 'Invoice'); - $return_id = $focus->id; Modified: vtigercrm/trunk/modules/Leads/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Leads/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Leads/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/utils/utils.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -22,7 +22,7 @@ } else { -$focus = new Lead(); +$focus = new Leads(); $MODULE = $_REQUEST['module']; $RECORD = $_REQUEST['record']; $currentmodule = $_REQUEST['module']; Modified: vtigercrm/trunk/modules/Leads/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Delete.php (original) +++ vtigercrm/trunk/modules/Leads/Delete.php Tue Oct 31 03:40:43 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('lead_delete'); -$focus = new Lead(); +$focus = new Leads(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/trunk/modules/Leads/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/DetailView.php (original) +++ vtigercrm/trunk/modules/Leads/DetailView.php Tue Oct 31 03:40:43 2006 @@ -14,7 +14,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/database/PearDatabase.php'); require_once('include/CustomFieldUtil.php'); require_once('include/utils/utils.php'); @@ -25,7 +25,7 @@ global $app_strings; global $currentModule, $singlepane_view; global $log; -$focus = new Lead(); +$focus = new Leads(); if(isset($_REQUEST['record'])) { Modified: vtigercrm/trunk/modules/Leads/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Leads/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Leads/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -24,7 +24,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $leadObj = new Lead(); + $leadObj = new Leads(); $leadObj->retrieve_entity_info($crmid,"Leads"); $leadObj->column_fields[$fieldname] = $fieldvalue; $leadObj->id = $crmid; Modified: vtigercrm/trunk/modules/Leads/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/EditView.php (original) +++ vtigercrm/trunk/modules/Leads/EditView.php Tue Oct 31 03:40:43 2006 @@ -14,7 +14,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/database/PearDatabase.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); @@ -23,7 +23,7 @@ global $mod_strings,$app_strings,$theme,$currentModule; -$focus = new Lead(); +$focus = new Leads(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); //Getting the Parameters from the ConvertLead Form $id = $_REQUEST["record"]; @@ -39,7 +39,7 @@ $potential_name = $check_unit[0]; //Retrieve info from all the vtiger_tables related to leads -$focus = new Lead(); +$focus = new Leads(); $focus->retrieve_entity_info($id,"Leads"); //get all the lead related columns Modified: vtigercrm/trunk/modules/Leads/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ListView.php (original) +++ vtigercrm/trunk/modules/Leads/ListView.php Tue Oct 31 03:40:43 2006 @@ -19,7 +19,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -49,7 +49,7 @@ $url_string = ''; // assigning http url string -$focus = new Lead(); +$focus = new Leads(); $smarty = new vtigerCRM_Smarty; $other_text=Array(); @@ -83,6 +83,7 @@ $smarty->assign("CHANGE_STATUS",$change_status); $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); Modified: vtigercrm/trunk/modules/Leads/Save.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Save.php (original) +++ vtigercrm/trunk/modules/Leads/Save.php Tue Oct 31 03:40:43 2006 @@ -13,14 +13,14 @@ * Contributor(s): ______________________________________. ********************************************************************************/ -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/UserInfoUtil.php'); $local_log =& LoggerManager::getLogger('index'); global $log,$adb; -$focus = new Lead(); +$focus = new Leads(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/trunk/modules/Leads/result.php ============================================================================== --- vtigercrm/trunk/modules/Leads/result.php (original) +++ vtigercrm/trunk/modules/Leads/result.php Tue Oct 31 03:40:43 2006 @@ -12,7 +12,7 @@ require_once('include/utils/utils.php'); require_once 'Excel/reader.php'; -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/database/PearDatabase.php'); $data = new Spreadsheet_Excel_Reader(); Modified: vtigercrm/trunk/modules/Migration/MigrationStep1.php ============================================================================== --- vtigercrm/trunk/modules/Migration/MigrationStep1.php (original) +++ vtigercrm/trunk/modules/Migration/MigrationStep1.php Tue Oct 31 03:40:43 2006 @@ -129,6 +129,11 @@ } } +//For 5.0.2 we have added this table. After 5.0.2 we have to remove this and provide the migration in some other way +$res = $adb->query("show create table vtiger_entityname"); +if(!$res) + $smarty->assign("502_PATCH","apply"); + $smarty->display("MigrationStep1.tpl"); Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php ============================================================================== --- vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php (original) +++ vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50.php Tue Oct 31 03:40:43 2006 @@ -1257,7 +1257,7 @@ "insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_contactdetails:firstname:firstname:Contacts_First_Name:V')", "insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_contactdetails:lastname:lastname:Contacts_Last_Name:V')", "insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_contactdetails:title:title:Contacts_Title:V')", - "insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_account:accountname:accountname:Contacts_Account_Name:V')", + "insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_contactdetails:accountid:account_id:Contacts_Account_Name:I')", "insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_contactdetails:email:email:Contacts_Email:V')", "insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_contactdetails:phone:phone:Contacts_Office_Phone:V')", "insert into vtiger_cvcolumnlist values ($cvid,6,'vtiger_crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V')" @@ -3766,6 +3766,59 @@ } } +//Added after 5.0.1 +//we have to delete the entries from customview and report related tables for deleted customfields +include("modules/Migration/ModifyDatabase/deleteCustomFields.php"); + +//5.0.2 database changes - added on 27-10-06 + +//Query added to show Manufacturer field in Products module +Execute("update vtiger_field set displaytype=1,block=31 where tabid=14 and block=1"); +Execute("update vtiger_field set block=23,displaytype=1 where block=1 and displaytype=23 and tabid=10"); +Execute("update vtiger_field set block=22,displaytype=1 where block=1 and displaytype=22 and tabid=10"); + +//Added to rearange the attachment in HelpDesk +Execute(" update vtiger_field set block=25,sequence=12 where tabid=13 and fieldname='filename'"); + +//Query added to as entityname,its tablename,its primarykey are saved in a table +Execute(" CREATE TABLE `vtiger_entityname` ( + `tabid` int(19) NOT NULL default '0', + `modulename` varchar(50) NOT NULL, + `tablename` varchar(50) NOT NULL, + `fieldname` varchar(150) NOT NULL, + `entityidfield` varchar(150) NOT NULL, + PRIMARY KEY (`tabid`), + KEY `entityname_tabid_idx` (`tabid`) +)"); + +//Data Populated for the existing modules +Execute("insert into vtiger_entityname values(7,'Leads','vtiger_leaddetails','lastname,firstname','leadid')"); +Execute("insert into vtiger_entityname values(6,'Accounts','vtiger_account','accountname','accountid')"); +Execute("insert into vtiger_entityname values(4,'Contacts','vtiger_contactdetails','lastname,firstname','contactid')"); +Execute("insert into vtiger_entityname values(2,'Potentials','vtiger_potential','potentialname','potentialid')"); +Execute("insert into vtiger_entityname values(8,'Notes','vtiger_notes','title','notesid')"); +Execute("insert into vtiger_entityname values(13,'HelpDesk','vtiger_troubletickets','title','ticketid')"); +Execute("insert into vtiger_entityname values(9,'Calendar','vtiger_activity','subject','activityid')"); +Execute("insert into vtiger_entityname values(10,'Emails','vtiger_activity','subject','activityid')"); +Execute("insert into vtiger_entityname values(14,'Products','vtiger_products','productname','productid')"); +Execute("insert into vtiger_entityname values(29,'Users','vtiger_users','last_name,first_name','id')"); +Execute("insert into vtiger_entityname values(23,'Invoice','vtiger_invoice','subject','invoiceid')"); +Execute("insert into vtiger_entityname values(20,'Quotes','vtiger_quotes','subject','quoteid')"); +Execute("insert into vtiger_entityname values(21,'PurchaseOrder','vtiger_purchaseorder','subject','purchaseorderid')"); +Execute("insert into vtiger_entityname values(22,'SalesOrder','vtiger_salesorder','subject','salesorderid')"); +Execute("insert into vtiger_entityname values(18,'Vendors','vtiger_vendor','vendorname','vendorid')"); +Execute("insert into vtiger_entityname values(19,'PriceBooks','vtiger_pricebook','bookname','pricebookid')"); +Execute("insert into vtiger_entityname values(26,'Campaigns','vtiger_campaign','campaignname','campaignid')"); +Execute("insert into vtiger_entityname values(15,'Faq','vtiger_faq','question','id')"); + +//added quantity in stock in product default listview - All +$res = $conn->query("select vtiger_cvcolumnlist.cvid from vtiger_cvcolumnlist inner join vtiger_customview on vtiger_cvcolumnlist.cvid=vtiger_customview.cvid where entitytype='Products' and viewname='All'"); +if($conn->num_rows != 0) +{ + $cvid = $conn->query_result($res,0,'cvid'); + Execute("insert into vtiger_cvcolumnlist values($cvid,5,'vtiger_products:qtyinstock:qtyinstock:Products_Quantity_In_Stock:V')"); +} + Modified: vtigercrm/trunk/modules/Notes/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Notes/Delete.php (original) +++ vtigercrm/trunk/modules/Notes/Delete.php Tue Oct 31 03:40:43 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('note_delete'); -$focus = new Note(); +$focus = new Notes(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the note."); Modified: vtigercrm/trunk/modules/Notes/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Notes/DetailView.php (original) +++ vtigercrm/trunk/modules/Notes/DetailView.php Tue Oct 31 03:40:43 2006 @@ -22,14 +22,14 @@ require_once('data/Tracker.php'); require_once('Smarty_setup.php'); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/upload_file.php'); require_once('include/utils/utils.php'); global $app_strings; global $mod_strings; global $currentModule; -$focus = new Note(); +$focus = new Notes(); if(isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Notes"); Modified: vtigercrm/trunk/modules/Notes/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Notes/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Notes/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Note(); + $modObj = new Notes(); $modObj->retrieve_entity_info($crmid,"Notes"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/trunk/modules/Notes/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Notes/EditView.php (original) +++ vtigercrm/trunk/modules/Notes/EditView.php Tue Oct 31 03:40:43 2006 @@ -22,12 +22,12 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/utils/utils.php'); global $app_strings,$app_list_strings,$mod_strings,$theme,$currentModule; -$focus = new Note(); +$focus = new Notes(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['upload_error'] == true) Modified: vtigercrm/trunk/modules/Notes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Notes/ListView.php (original) +++ vtigercrm/trunk/modules/Notes/ListView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -66,7 +66,7 @@ $url_string = ''; // assigning http url string -$focus = new Note(); +$focus = new Notes(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); Modified: vtigercrm/trunk/modules/Notes/Save.php ============================================================================== --- vtigercrm/trunk/modules/Notes/Save.php (original) +++ vtigercrm/trunk/modules/Notes/Save.php Tue Oct 31 03:40:43 2006 @@ -21,13 +21,13 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Notes/Note.php'); +require_once('modules/Notes/Notes.php'); require_once('include/logging.php'); require_once('include/upload_file.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Note(); +$focus = new Notes(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/trunk/modules/Portal/Portal.js ============================================================================== --- vtigercrm/trunk/modules/Portal/Portal.js (original) +++ vtigercrm/trunk/modules/Portal/Portal.js Tue Oct 31 03:40:43 2006 @@ -71,6 +71,7 @@ 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', Modified: vtigercrm/trunk/modules/Portal/Save.php ============================================================================== --- vtigercrm/trunk/modules/Portal/Save.php (original) +++ vtigercrm/trunk/modules/Portal/Save.php Tue Oct 31 03:40:43 2006 @@ -13,10 +13,10 @@ if(isset($_REQUEST['record']) && $_REQUEST['record'] !='') { - $result=UpdatePortal($_REQUEST['portalname'],"http://".$_REQUEST['portalurl'],$_REQUEST['record']); + $result=UpdatePortal($_REQUEST['portalname'],"http://".str_replace("#$#$#","&",$_REQUEST['portalurl']),$_REQUEST['record']); }else { - $result=SavePortal($_REQUEST['portalname'],"http://".$_REQUEST['portalurl']); + $result=SavePortal($_REQUEST['portalname'],"http://".str_replace("#$#$#","&",$_REQUEST['portalurl'])); } header("Location: index.php?action=PortalAjax&module=Portal&file=ListView&mode=ajax&datamode=manage"); ?> Modified: vtigercrm/trunk/modules/Potentials/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Potentials/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ } else { -$focus = new Potential(); +$focus = new Potentials(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/trunk/modules/Potentials/Charts.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/Charts.php (original) +++ vtigercrm/trunk/modules/Potentials/Charts.php Tue Oct 31 03:40:43 2006 @@ -19,7 +19,7 @@ require_once('config.php'); require_once('include/logging.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('Image/Graph.php'); require_once('include/utils/utils.php'); require_once('include/utils/GraphUtils.php'); @@ -102,7 +102,7 @@ //Now do the db queries //query for opportunity data that matches $datay and $user - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -441,7 +441,7 @@ //Now do the db queries //query for opportunity data that matches $datay and $user - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -779,7 +779,7 @@ //Now do the db queries //query for opportunity data that matches $datax and $user - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by sales stage data @@ -1057,7 +1057,7 @@ $where .= ")"; } - $opp = new Potential(); + $opp = new Potentials(); $opp_list = $opp->get_full_list("amount DESC, closingdate DESC", $where); //build pipeline by lead source data Modified: vtigercrm/trunk/modules/Potentials/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/Delete.php (original) +++ vtigercrm/trunk/modules/Potentials/Delete.php Tue Oct 31 03:40:43 2006 @@ -17,12 +17,12 @@ * Description: TODO: To be written. ********************************************************************************/ -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); $log = LoggerManager::getLogger('contact_delete'); -$focus = new Potential(); +$focus = new Potentials(); if(!isset($_REQUEST['record'])) die("A record number must be specified to delete the opportunity."); Modified: vtigercrm/trunk/modules/Potentials/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/DetailView.php (original) +++ vtigercrm/trunk/modules/Potentials/DetailView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/CustomFieldUtil.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); @@ -31,7 +31,7 @@ global $app_strings; global $currentModule, $singlepane_view; -$focus = new Potential(); +$focus = new Potentials(); $smarty = new vtigerCRM_Smarty; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/trunk/modules/Potentials/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Potentials/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Potential(); + $modObj = new Potentials(); $modObj->retrieve_entity_info($crmid,"Potentials"); $modObj->column_fields[$fieldname] = $fieldvalue; $_REQUEST[$fieldname] = $fieldvalue; Modified: vtigercrm/trunk/modules/Potentials/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/EditView.php (original) +++ vtigercrm/trunk/modules/Potentials/EditView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -30,7 +30,7 @@ global $app_strings; global $mod_strings; global $currentModule; -$focus = new Potential(); +$focus = new Potentials(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/trunk/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListView.php (original) +++ vtigercrm/trunk/modules/Potentials/ListView.php Tue Oct 31 03:40:43 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -38,7 +38,7 @@ $url_string = ''; // assigning http url string -$focus = new Potential(); +$focus = new Potentials(); $smarty = new vtigerCRM_Smarty(); $other_text = Array(); @@ -108,7 +108,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); - +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); if(isPermitted('Potentials','Delete','') == 'yes') { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; Modified: vtigercrm/trunk/modules/Potentials/ListViewTop.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListViewTop.php (original) +++ vtigercrm/trunk/modules/Potentials/ListViewTop.php Tue Oct 31 03:40:43 2006 @@ -28,7 +28,7 @@ $log = LoggerManager::getLogger('top opportunity_list'); $log->debug("Entering getTopPotentials() method ..."); require_once("data/Tracker.php"); - require_once('modules/Potentials/Opportunity.php'); + require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -42,7 +42,7 @@ $title[]='myTopOpenPotentials.gif'; $title[]=$current_module_strings['LBL_TOP_OPPORTUNITIES']; $title[]='home_mypot'; - $where = "AND vtiger_potential.sales_stage <> '".$app_strings['LBL_CLOSE_WON']."' AND vtiger_potential.sales_stage <> '".$app_strings['LBL_CLOSE_LOST']."' AND vtiger_crmentity.smownerid='".$current_user->id."' ORDER BY amount DESC"; + $where = "AND vtiger_potential.sales_stage <> 'Closed Won' AND vtiger_potential.sales_stage <> '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']; @@ -53,6 +53,7 @@ $header[]=$current_module_strings['LBL_LIST_AMOUNT'].'('.$curr_symbol.')'; $header[]=$current_module_strings['LBL_LIST_DATE_CLOSED']; $list_query = getListQuery("Potentials",$where); + $list_query .=" ORDER BY amount DESC"; $list_result = $adb->limitQuery($list_query,0,5); $open_potentials_list = array(); $noofrows = $adb->num_rows($list_result); Modified: vtigercrm/trunk/modules/Potentials/Save.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/Save.php (original) +++ vtigercrm/trunk/modules/Potentials/Save.php Tue Oct 31 03:40:43 2006 @@ -20,13 +20,13 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Potentials/Opportunity.php'); +require_once('modules/Potentials/Potentials.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); -$focus = new Potential(); +$focus = new Potentials(); global $current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); Modified: vtigercrm/trunk/modules/Potentials/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Potentials/language/en_us.lang.php Tue Oct 31 03:40:43 2006 @@ -100,6 +100,7 @@ 'Account Name'=>'Account Name', 'Currency'=>'Currency', 'Expected Close Date'=>'Expected Close Date', +'Opportunity Type'=>'Opportunity Type', 'Type'=>'Type', 'Next Step'=>'Next Step', 'Lead Source'=>'Lead Source', Modified: vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -22,7 +22,7 @@ { global $currentModule; -$focus = new PriceBook(); +$focus = new PriceBooks(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/trunk/modules/PriceBooks/Delete.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/Delete.php (original) +++ vtigercrm/trunk/modules/PriceBooks/Delete.php Tue Oct 31 03:40:43 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new PriceBook(); +$focus = new PriceBooks(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/trunk/modules/PriceBooks/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/DetailView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/DetailView.php Tue Oct 31 03:40:43 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new PriceBook(); +$focus = new PriceBooks(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/trunk/modules/PriceBooks/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/PriceBooks/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new PriceBook(); + $modObj = new PriceBooks(); $modObj->retrieve_entity_info($crmid,"PriceBooks"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/trunk/modules/PriceBooks/EditView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/EditView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/EditView.php Tue Oct 31 03:40:43 2006 @@ -11,12 +11,12 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$theme,$currentModule; -$focus = new PriceBook(); +$focus = new PriceBooks(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/ListView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/ListView.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/ListView/ListView.php'); require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); @@ -33,7 +33,7 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$focus = new PriceBook(); +$focus = new PriceBooks(); $other_text=Array(); if(!$_SESSION['lvs'][$currentModule]) Modified: vtigercrm/trunk/modules/PriceBooks/Save.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/Save.php (original) +++ vtigercrm/trunk/modules/PriceBooks/Save.php Tue Oct 31 03:40:43 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new PriceBook(); +$focus = new PriceBooks(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php ============================================================================== --- vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php (original) +++ vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/PriceBooks/PriceBook.php'); +require_once('modules/PriceBooks/PriceBooks.php'); require_once('include/utils/utils.php'); require_once('include/ComboUtil.php'); @@ -30,7 +30,7 @@ $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$focus = new PriceBook(); +$focus = new PriceBooks(); //Retreive the list of PriceBooks $list_query = getListQuery("PriceBooks"); Modified: vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php ============================================================================== --- vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php (original) +++ vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/utils.php'); require_once('include/utils/utils.php'); require_once('include/ComboUtil.php'); @@ -29,7 +29,7 @@ $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$focus = new Product(); +$focus = new Products(); if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by']; Modified: vtigercrm/trunk/modules/Products/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Products/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Products/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); @@ -21,7 +21,7 @@ } else { -$focus = new Product(); +$focus = new Products(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) Modified: vtigercrm/trunk/modules/Products/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Products/Delete.php (original) +++ vtigercrm/trunk/modules/Products/Delete.php Tue Oct 31 03:40:43 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new Product(); +$focus = new Products(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/trunk/modules/Products/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Products/DetailView.php (original) +++ vtigercrm/trunk/modules/Products/DetailView.php Tue Oct 31 03:40:43 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new Product(); +$focus = new Products(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { //Display the error message Modified: vtigercrm/trunk/modules/Products/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Products/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Products/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/database/PearDatabase.php'); global $adb,$current_user; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Product(); + $modObj = new Products(); $modObj->retrieve_entity_info($crmid,"Products"); $modObj->column_fields[$fieldname] = $fieldvalue; if($fieldname == 'unit_price')//unit price converted to dollar value while saving Modified: vtigercrm/trunk/modules/Products/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Products/EditView.php (original) +++ vtigercrm/trunk/modules/Products/EditView.php Tue Oct 31 03:40:43 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/FormValidationUtil.php'); global $app_strings; @@ -28,7 +28,7 @@ -$focus = new Product(); +$focus = new Products(); $smarty = new vtigerCRM_Smarty(); if($_REQUEST['record']!="") Modified: vtigercrm/trunk/modules/Products/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Products/ListView.php (original) +++ vtigercrm/trunk/modules/Products/ListView.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/ListView/ListView.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -56,7 +56,7 @@ } $url_string = '&smodule=PRODUCTS'; // assigning http url string -$focus = new Product(); +$focus = new Products(); //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>> $sorder = $focus->getSortOrder(); @@ -84,6 +84,7 @@ //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); if($viewnamedesc['viewname'] == 'All') { $smarty->assign("ALL", 'All'); Modified: vtigercrm/trunk/modules/Products/Save.php ============================================================================== --- vtigercrm/trunk/modules/Products/Save.php (original) +++ vtigercrm/trunk/modules/Products/Save.php Tue Oct 31 03:40:43 2006 @@ -21,14 +21,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Products/Product.php'); +require_once('modules/Products/Products.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); global $log,$current_user; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); $rate = $rate_symbol['rate']; -$focus = new Product(); +$focus = new Products(); if(isset($_REQUEST['record'])) { $focus->id = $_REQUEST['record']; Modified: vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -21,7 +21,7 @@ } else { -$focus = new Order(); +$focus = new PurchaseOrder(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Tue Oct 31 03:40:43 2006 @@ -26,7 +26,7 @@ $id = $_REQUEST['record']; //retreiving the vtiger_invoice info -$focus = new Order(); +$focus = new PurchaseOrder(); $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); $vendor_name = getVendorName($focus->column_fields[vendor_id]); Modified: vtigercrm/trunk/modules/PurchaseOrder/Delete.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/Delete.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/Delete.php Tue Oct 31 03:40:43 2006 @@ -24,7 +24,7 @@ require_once('include/logging.php'); $log = LoggerManager::getLogger('order_delete'); -$focus = new Order(); +$focus = new PurchaseOrder(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/trunk/modules/PurchaseOrder/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/DetailView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Tue Oct 31 03:40:43 2006 @@ -29,7 +29,7 @@ require_once('user_privileges/default_module_view.php'); global $mod_strings,$app_strings,$theme,$currentModule,$singlepane_view; -$focus = new Order(); +$focus = new PurchaseOrder(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); Modified: vtigercrm/trunk/modules/PurchaseOrder/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Order(); + $modObj = new PurchaseOrder(); $modObj->retrieve_entity_info($crmid,"PurchaseOrder"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/EditView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/EditView.php Tue Oct 31 03:40:43 2006 @@ -31,7 +31,7 @@ global $app_strings,$mod_strings,$log,$theme,$currentModule; -$focus = new Order(); +$focus = new PurchaseOrder(); $smarty = new vtigerCRM_Smarty(); global $current_user; $currencyid=fetchCurrency($current_user->id); @@ -60,8 +60,8 @@ // Get vtiger_vendor address if vtiger_vendorid is given if(isset($_REQUEST['vendor_id']) && $_REQUEST['vendor_id']!='' && $_REQUEST['record']==''){ - require_once('modules/Vendors/Vendor.php'); - $vend_focus = new Vendor(); + require_once('modules/Vendors/Vendors.php'); + $vend_focus = new Vendors(); $vend_focus->retrieve_entity_info($_REQUEST['vendor_id'],"Vendors"); $focus->column_fields['bill_city']=$vend_focus->column_fields['city']; Modified: vtigercrm/trunk/modules/PurchaseOrder/ListTopPurchaseOrder.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListTopPurchaseOrder.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListTopPurchaseOrder.php Tue Oct 31 03:40:43 2006 @@ -47,7 +47,7 @@ $viewid = "0"; } } - $focus = new Order(); + $focus = new PurchaseOrder(); $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -56,9 +56,9 @@ //<<<<<<<<>>>>>>>> $date_var = date('Y-m-d'); - $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_purchaseorder.duedate >= \''.$date_var.'\' ORDER BY total DESC'; + $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_purchaseorder.duedate >= \''.$date_var.'\''; $query = getListQuery("PurchaseOrder",$where); - + $query .=" ORDER BY total DESC"; //<<<<<<<>>>>>>>> Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Tue Oct 31 03:40:43 2006 @@ -35,7 +35,7 @@ $url_string = '&smodule=PO'; -$focus = new Order(); +$focus = new PurchaseOrder(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); @@ -81,6 +81,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); if(isPermitted('PurchaseOrder','Delete','') == 'yes') { Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Tue Oct 31 03:40:43 2006 @@ -30,7 +30,7 @@ require_once('user_privileges/default_module_view.php'); // Account is used to store vtiger_account information. -class Order extends CRMEntity { +class PurchaseOrder extends CRMEntity { var $log; var $db; @@ -42,10 +42,6 @@ var $billadr_table = "vtiger_pobillads"; - var $object_name = "Order"; - - var $new_schema = true; - var $module_id = "purchaseorderid"; var $column_fields = Array(); @@ -94,12 +90,20 @@ * 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. */ - function Order() { + function PurchaseOrder() { $this->log =LoggerManager::getLogger('PurchaseOrder'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('PurchaseOrder'); } + 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); + } + + + /** Function used to get the sort order for Purchase Order listview * @return string $sorder - first check the $_REQUEST['sorder'] if request value is empty then check in the $_SESSION['PURCHASEORDER_SORT_ORDER'] if this session value is empty then default sort order will be returned. */ Modified: vtigercrm/trunk/modules/PurchaseOrder/Save.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/Save.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/Save.php Tue Oct 31 03:40:43 2006 @@ -27,31 +27,23 @@ $local_log =& LoggerManager::getLogger('index'); -$focus = new Order(); +$focus = new PurchaseOrder(); global $current_user; -$currencyid=fetchCurrency($current_user->id); -$rate_symbol = getCurrencySymbolandCRate($currencyid); -$rate = $rate_symbol['rate']; setObjectValuesFromRequest(&$focus); //Added code for auto product stock updation on receiving goods -$update_prod_stock=''; +$focus->update_prod_stock=''; if($focus->column_fields['postatus'] == 'Received Shipment' && $focus->mode == 'edit') { $prev_postatus=getPoStatus($focus->id); if($focus->column_fields['postatus'] != $prev_postatus) { - $update_prod_stock='true'; + $focus->update_prod_stock='true'; } } $focus->save("PurchaseOrder"); - - -//Based on the total Number of rows we will save the product relationship with this entity -saveInventoryProductDetails(&$focus, 'PurchaseOrder', $update_prod_stock); - $return_id = $focus->id; Modified: vtigercrm/trunk/modules/Quotes/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Quotes/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -11,7 +11,7 @@ require_once('Smarty_setup.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ } else { -$focus = new Quote(); +$focus = new Quotes(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/CreatePDF.php (original) +++ vtigercrm/trunk/modules/Quotes/CreatePDF.php Tue Oct 31 03:40:43 2006 @@ -11,7 +11,7 @@ require_once('include/fpdf/pdf.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/database/PearDatabase.php'); global $adb,$app_strings; @@ -25,7 +25,7 @@ global $products_per_page; $products_per_page="6"; -$focus = new Quote(); +$focus = new Quotes(); $focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); $account_name = getAccountName($focus->column_fields[account_id]); Modified: vtigercrm/trunk/modules/Quotes/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Delete.php (original) +++ vtigercrm/trunk/modules/Quotes/Delete.php Tue Oct 31 03:40:43 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('quote_delete'); -$focus = new Quote(); +$focus = new Quotes(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/trunk/modules/Quotes/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/DetailView.php (original) +++ vtigercrm/trunk/modules/Quotes/DetailView.php Tue Oct 31 03:40:43 2006 @@ -22,13 +22,13 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); global $mod_strings,$app_strings,$currentModule,$theme,$singlepane_view; -$focus = new Quote(); +$focus = new Quotes(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],"Quotes"); Modified: vtigercrm/trunk/modules/Quotes/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Quotes/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Quote(); + $modObj = new Quotes(); $modObj->retrieve_entity_info($crmid,"Quotes"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/trunk/modules/Quotes/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/EditView.php (original) +++ vtigercrm/trunk/modules/Quotes/EditView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -32,7 +32,7 @@ $log->debug("Inside Quote EditView"); -$focus = new Quote(); +$focus = new Quotes(); $smarty = new vtigerCRM_Smarty; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); @@ -70,8 +70,8 @@ // Get Account address if vtiger_account is given if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']==''){ - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/trunk/modules/Quotes/ListTopQuotes.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListTopQuotes.php (original) +++ vtigercrm/trunk/modules/Quotes/ListTopQuotes.php Tue Oct 31 03:40:43 2006 @@ -19,7 +19,7 @@ function getTopQuotes() { require_once("data/Tracker.php"); - require_once('modules/Quotes/Quote.php'); + require_once('modules/Quotes/Quotes.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); require_once('include/database/PearDatabase.php'); @@ -51,7 +51,7 @@ $viewid = "0"; } } - $focus = new Quote(); + $focus = new Quotes(); $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -60,9 +60,9 @@ //<<<<<<<<>>>>>>>> $date_var = date('Y-m-d'); - $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_quotes.validtill >= \''.$date_var.'\' ORDER BY total DESC'; + $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_quotes.validtill >= \''.$date_var.'\''; $query = getListQuery("Quotes",$where); - + $query .=" ORDER BY total DESC"; //<<<<<<<>>>>>>>> $list_result = $adb->limitQuery($query,0,5); Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Tue Oct 31 03:40:43 2006 @@ -15,7 +15,7 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -33,7 +33,7 @@ $url_string = ''; -$focus = new Quote(); +$focus = new Quotes(); $smarty = new vtigerCRM_Smarty; $other_text = Array(); @@ -79,6 +79,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); if(isPermitted('Quotes','Delete','') == 'yes') { Modified: vtigercrm/trunk/modules/Quotes/Save.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Save.php (original) +++ vtigercrm/trunk/modules/Quotes/Save.php Tue Oct 31 03:40:43 2006 @@ -21,7 +21,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); include("modules/Emails/mail.php"); @@ -34,7 +34,7 @@ $rate = $rate_symbol['rate']; $log->debug("Inside Quote Save"); -$focus = new Quote(); +$focus = new Quotes(); setObjectValuesFromRequest(&$focus); Modified: vtigercrm/trunk/modules/Reports/ReportColumns.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportColumns.php (original) +++ vtigercrm/trunk/modules/Reports/ReportColumns.php Tue Oct 31 03:40:43 2006 @@ -113,7 +113,7 @@ $shtml .= ""; foreach($ogReport->sec_module_columnslist[$secmodule[$i]][$key] as $field=>$fieldlabel) { - if(isset($mod_strings[$fieldlable])) + if(isset($mod_strings[$fieldlabel])) { $shtml .= ""; }else Modified: vtigercrm/trunk/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/trunk/modules/Reports/ReportRun.php (original) +++ vtigercrm/trunk/modules/Reports/ReportRun.php Tue Oct 31 03:40:43 2006 @@ -1269,11 +1269,14 @@ } - if($module == "Campaigns")// added for 5.0 - { - $query = "from vtiger_campaign - 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)." + if($module == "Campaigns") + { + $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"; } $log->info("ReportRun :: Successfully returned getReportsQuery".$module); Modified: vtigercrm/trunk/modules/Reports/Reports.php ============================================================================== --- vtigercrm/trunk/modules/Reports/Reports.php (original) +++ vtigercrm/trunk/modules/Reports/Reports.php Tue Oct 31 03:40:43 2006 @@ -793,10 +793,20 @@ { $fieldcolname = $adb->query_result($result,$i,"columnname"); $fieldlist = explode(":",$fieldcolname); + + //Fix for multilanguage support - code contribution by Ding jianting + $fieldlabel_array = explode("_",$fieldlist[2]); + $mod_strings = return_module_language($current_language,$fieldlabel_array[0]); if($fieldcolname != "") { - $shtml .= ""; - } + $fieldlabel = trim(str_replace($modules," ",$fieldlist[2])); + if(isset($mod_strings[$fieldlabel])) { + $shtml .= ""; + } else { + $shtml .= ""; + } + } + //Code contribution ends } $log->info("Reports :: Successfully returned getSelectedColumnsList"); Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/EditView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/EditView.php Tue Oct 31 03:40:43 2006 @@ -23,7 +23,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/SalesOrder/SalesOrder.php'); -require_once('modules/Quotes/Quote.php'); +require_once('modules/Quotes/Quotes.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -44,7 +44,7 @@ if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoso') { $quoteid = $_REQUEST['record']; - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -80,7 +80,7 @@ $quoteid = $focus->column_fields['quote_id']; $smarty->assign("QUOTE_ID", $focus->column_fields['quote_id']); - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -118,7 +118,7 @@ $focus->column_fields['duedate'] = getDBInsertDateValue($curr_due_date); } $quoteid = $focus->column_fields['quote_id']; - $quote_focus = new Quote(); + $quote_focus = new Quotes(); $quote_focus->id = $quoteid; $quote_focus->retrieve_entity_info($quoteid,"Quotes"); $focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid); @@ -161,8 +161,8 @@ // Get Account address if vtiger_account is given if(isset($_REQUEST['account_id']) && $_REQUEST['record']=='' && $_REQUEST['account_id'] != ''){ - require_once('modules/Accounts/Account.php'); - $acct_focus = new Account(); + require_once('modules/Accounts/Accounts.php'); + $acct_focus = new Accounts(); $acct_focus->retrieve_entity_info($_REQUEST['account_id'],"Accounts"); $focus->column_fields['bill_city']=$acct_focus->column_fields['bill_city']; $focus->column_fields['ship_city']=$acct_focus->column_fields['ship_city']; Modified: vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php Tue Oct 31 03:40:43 2006 @@ -56,9 +56,9 @@ //<<<<<<<<>>>>>>>> $date_var = date('Y-m-d'); - $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_salesorder.duedate >= \''.$date_var.'\' ORDER BY total DESC'; + $where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and vtiger_salesorder.duedate >= \''.$date_var.'\''; $query = getListQuery("SalesOrder",$where); - + $query .=" ORDER BY total DESC"; //<<<<<<<>>>>>>>> $list_result = $adb->limitQuery($query,0,5); Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListView.php Tue Oct 31 03:40:43 2006 @@ -79,6 +79,7 @@ $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid); //<<<<>>>> $smarty->assign("CHANGE_OWNER",getUserslist()); +$smarty->assign("CHANGE_GROUP_OWNER",getGroupslist()); // Buttons and View options if(isPermitted('SalesOrder','Delete','') == 'yes') { Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original) +++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Tue Oct 31 03:40:43 2006 @@ -106,6 +106,23 @@ $this->db = new PearDatabase(); $this->column_fields = getColumnFields('SalesOrder'); } + + function save_module($module) + { + + //Checking if quote_id is present and updating the quote status + if($this->column_fields["quote_id"] != '') + { + $qt_id = $this->column_fields["quote_id"]; + $query1 = "update vtiger_quotes set quotestage='Accepted' where quoteid=".$qt_id; + $this->db->query($query1); + } + + //Based on the total Number of rows we will save the product relationship with this entity + saveInventoryProductDetails(&$this, 'SalesOrder'); + + + } /** Function used to get the sort order for Sales Order listview * @return string $sorder - first check the $_REQUEST['sorder'] if request value is empty then check in the $_SESSION['SALESORDER_SORT_ORDER'] if this session value is empty then default sort order will be returned. Modified: vtigercrm/trunk/modules/SalesOrder/Save.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/Save.php (original) +++ vtigercrm/trunk/modules/SalesOrder/Save.php Tue Oct 31 03:40:43 2006 @@ -31,39 +31,7 @@ $focus = new SalesOrder(); setObjectValuesFromRequest(&$focus); -if($focus->mode == 'edit' && ($focus->column_fields['sostatus'] == 'Delivered' || $focus->column_fields['sostatus'] == 'Approved')) -{ - $prev_sostatus=$adb->query_result($adb->query("select sostatus from vtiger_salesorder where salesorderid=$focus->id"),0,'sostatus'); - - if($focus->column_fields['sostatus'] != $prev_sostatus) - { - if($focus->column_fields['sostatus'] == 'Delivered') - { - //Deduct the quantity from Quantity In Stock and Quantity In Demand - $updateStockAndDemand = 'true'; - } - elseif($focus->column_fields['sostatus'] == 'Approved') - { - //Add the quantity with Quantity In Demand - $updateDemand = 'true'; - } - } - -} - $focus->save("SalesOrder"); - -//Checking if quote_id is present and updating the quote status -if($focus->column_fields["quote_id"] != '') -{ - $qt_id = $focus->column_fields["quote_id"]; - $query1 = "update vtiger_quotes set quotestage='Accepted' where quoteid=".$qt_id; - $adb->query($query1); -} - -//Based on the total Number of rows we will save the product relationship with this entity -saveInventoryProductDetails(&$focus, 'SalesOrder','',$updateStockAndDemand, $updateDemand); - $return_id = $focus->id; Modified: vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php (original) +++ vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php Tue Oct 31 03:40:43 2006 @@ -69,7 +69,7 @@ // vtiger_invoice number block $invBlock=array("145","65"); -$pdf->addRecBlock($id, "Invoice Number",$invBlock); +$pdf->addRecBlock($id, "SO Number",$invBlock); /* ************ End Invoice Data ************************ */ Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php ============================================================================== --- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original) +++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Tue Oct 31 03:40:43 2006 @@ -79,25 +79,7 @@ //Assigning the vtiger_table Name $tableName =''; - if($fldmodule == 'Leads') - { - $tableName='vtiger_leadscf'; - } - elseif($fldmodule == 'Accounts') - { - - $tableName='vtiger_accountscf'; - } - elseif($fldmodule == 'Contacts') - { - - $tableName='vtiger_contactscf'; - } - elseif($fldmodule == 'Potentials') - { - $tableName='vtiger_potentialscf'; - } - elseif($fldmodule == 'HelpDesk') + if($fldmodule == 'HelpDesk') { $tableName='vtiger_ticketcf'; } @@ -113,25 +95,9 @@ { $tableName='vtiger_pricebookcf'; } - elseif($fldmodule == 'Quotes') - { - $tableName='vtiger_quotescf'; - } - elseif($fldmodule == 'PurchaseOrder') - { - $tableName='vtiger_purchaseordercf'; - } - elseif($fldmodule == 'SalesOrder') - { - $tableName='vtiger_salesordercf'; - } - elseif($fldmodule == 'Invoice') - { - $tableName='vtiger_invoicecf'; - } - elseif($fldmodule == 'Campaigns') - { - $tableName='vtiger_campaignscf'; + elseif($fldmodule != '') + { + $tableName= 'vtiger_'.strtolower($fldmodule).'cf'; } //Assigning the uitype $fldlength=$_REQUEST['fldLength']; Modified: vtigercrm/trunk/modules/Settings/CustomFieldList.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CustomFieldList.php (original) +++ vtigercrm/trunk/modules/Settings/CustomFieldList.php Tue Oct 31 03:40:43 2006 @@ -22,20 +22,8 @@ $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); $smarty->assign("IMAGE_PATH", $image_path); -$module_array=Array('Leads'=>'Leads', - 'Accounts'=>'Accounts', - 'Contacts'=>'Contacts', - 'Potentials'=>'Potentials', - 'HelpDesk'=>'HelpDesk', - 'Products'=>'Products', - 'Vendors'=>'Vendors', - 'PriceBooks'=>'PriceBooks', - 'PurchaseOrder'=>'PurchaseOrder', - 'SalesOrder'=>'SalesOrder', - 'Quotes'=>'Quotes', - 'Invoice'=>'Invoice', - 'Campaigns'=>'Campaigns' - ); +$module_array=getCustomFieldSupportedModules(); + $cfimagecombo = Array($image_path."text.gif", $image_path."number.gif", $image_path."percent.gif", @@ -166,4 +154,18 @@ return $label; } +/* function to get the modules supports Custom Fields +*/ + +function getCustomFieldSupportedModules() +{ + global $adb; + $sql="select distinct vtiger_field.tabid,name from vtiger_field inner join vtiger_tab on vtiger_field.tabid=vtiger_tab.tabid where vtiger_field.tabid not in(9,10,16,15,8,29)"; + $result = $adb->query($sql); + while($moduleinfo=$adb->fetch_array($result)) + { + $modulelist[$moduleinfo['name']] = $moduleinfo['name']; + } + return $modulelist; +} ?> Modified: vtigercrm/trunk/modules/Settings/DeleteCustomField.php ============================================================================== --- vtigercrm/trunk/modules/Settings/DeleteCustomField.php (original) +++ vtigercrm/trunk/modules/Settings/DeleteCustomField.php Tue Oct 31 03:40:43 2006 @@ -50,7 +50,15 @@ $adb->query($dbquery); -//HANDLE HERE - we have to remove the entries in customview and report related tables which have this field ($colName) +//we have to remove the entries in customview and report related tables which have this field ($colName) +$adb->query("delete from vtiger_cvcolumnlist where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_cvstdfilter where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_cvadvfilter where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_selectcolumn where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_relcriteria where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_reportsortcol where columnname like '%".$colName."%'"); +$adb->query("delete from vtiger_reportdatefilter where datecolumnname like '%".$colName."%'"); +$adb->query("delete from vtiger_reportsummary where columnname like '%".$colName."%'"); //Deleting from convert lead mapping vtiger_table- Jaguar @@ -67,5 +75,7 @@ $adb->query($deltablequery); } + + header("Location:index.php?module=Settings&action=CustomFieldList&fld_module=".$fld_module."&parenttab=Settings"); ?> Modified: vtigercrm/trunk/modules/Settings/EditComboField.php ============================================================================== --- vtigercrm/trunk/modules/Settings/EditComboField.php (original) +++ vtigercrm/trunk/modules/Settings/EditComboField.php Tue Oct 31 03:40:43 2006 @@ -91,7 +91,9 @@ $smarty->assign("ENTRIES",$fldVal); $smarty->assign("MODULE",$moduleName); $smarty->assign("FIELDNAME",$tableName); -$smarty->assign("FIELDLABEL",$fieldlabel); +//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); +$smarty->assign("FIELDLABEL",$temp_label); $smarty->assign("UITYPE", $uitype); $smarty->assign("MOD", return_module_language($current_language,'Settings')); $smarty->assign("IMAGE_PATH",$image_path); Modified: vtigercrm/trunk/modules/Settings/TaxConfig.php ============================================================================== --- vtigercrm/trunk/modules/Settings/TaxConfig.php (original) +++ vtigercrm/trunk/modules/Settings/TaxConfig.php Tue Oct 31 03:40:43 2006 @@ -1,214 +1,244 @@ -assign("EDIT_MODE", 'true'); -} -elseif($_REQUEST['sh_edit_tax'] == 'true') -{ - $smarty->assign("SH_EDIT_MODE", 'true'); -} - -//To add tax -if($_REQUEST['add_tax_type'] == 'true') -{ - //Add the given tax name and value as a new tax type - echo addTaxType($_REQUEST['addTaxLabel'],$_REQUEST['addTaxValue']); - $getlist = true; -} -elseif($_REQUEST['sh_add_tax_type'] == 'true') -{ - echo addTaxType($_REQUEST['sh_addTaxLabel'],$_REQUEST['sh_addTaxValue'],'sh'); - $getlist = true; -} - -//To Disable ie., delete or enable -if(($_REQUEST['disable'] == 'true' || $_REQUEST['enable'] == 'true') && $_REQUEST['taxname'] != '') -{ - if($_REQUEST['disable'] == 'true') - changeDeleted($_REQUEST['taxname'],1); - else - changeDeleted($_REQUEST['taxname'],0); - $getlist = true; -} -elseif(($_REQUEST['sh_disable'] == 'true' || $_REQUEST['sh_enable'] == 'true') && $_REQUEST['sh_taxname'] != '') -{ - if($_REQUEST['sh_disable'] == 'true') - changeDeleted($_REQUEST['sh_taxname'],1,'sh'); - else - changeDeleted($_REQUEST['sh_taxname'],0,'sh'); - $getlist = true; -} - -//after done save or enable/disable or added new tax the list will be retrieved again from db -if($getlist) -{ - $tax_details = getAllTaxes(); - $sh_tax_details = getAllTaxes('all','sh'); -} - -$smarty->assign("TAX_COUNT", count($tax_details)); -$smarty->assign("SH_TAX_COUNT", count($sh_tax_details)); - -if(count($tax_details) == 0) - $smarty->assign("TAX_COUNT", 0); -if(count($sh_tax_details) == 0) - $smarty->assign("SH_TAX_COUNT", 0); - -$smarty->assign("TAX_VALUES", $tax_details); -$smarty->assign("SH_TAX_VALUES", $sh_tax_details); - -$smarty->assign("MOD", return_module_language($current_language,'Settings')); -$smarty->assign("IMAGE_PATH",$image_path); -$smarty->assign("APP", $app_strings); -$smarty->assign("MOD", $mod_strings); -$smarty->display("Settings/TaxConfig.tpl"); - - -/** Function to update the list of Tax percentages for the passed tax types - * @param array $new_percentages - array of tax types and the values like [taxid]=new value ie., [1]=3.56, [2]=11.45 - * @param string $sh - sh or empty, if sh passed then update will be done in shipping and handling related table - * @return void - */ -function updateTaxPercentages($new_percentages, $sh='') -{ - global $adb, $log; - $log->debug("Entering into the function updateTaxPercentages"); - - $tax_percentage = Array(); - - foreach($new_percentages as $taxid => $new_val) - { - if($new_val != '') - { - if($sh != '' && $sh == 'sh') - $query = "update vtiger_shippingtaxinfo set percentage = \"$new_val\" where taxid=\"$taxid\""; - else - $query = "update vtiger_inventorytaxinfo set percentage = \"$new_val\" where taxid=\"$taxid\""; - $adb->query($query); - } - } - - $log->debug("Exiting from the function updateTaxPercentages"); -} - -/** Function used to add the tax type which will do database alterations - * @param string $taxlabel - tax label name to be added - * @param string $taxvalue - tax value to be added - * @param string $sh - sh or empty , if sh passed then the tax will be added in shipping and handling related table - * @return void - */ -function addTaxType($taxlabel, $taxvalue, $sh='') -{ - global $adb, $log; - $log->debug("Entering into function addTaxType($taxlabel, $taxvalue, $sh)"); - - //First we will check whether the tax is already available or not - if($sh != '' && $sh == 'sh') - $check_query = "select taxlabel from vtiger_shippingtaxinfo where taxlabel='".addslashes($taxlabel)."'"; - else - $check_query = "select taxlabel from vtiger_inventorytaxinfo where taxlabel='".addslashes($taxlabel)."'"; - $check_res = $adb->query($check_query); - - if($adb->num_rows($check_res) > 0) - return "This tax is already available"; - - //if the tax is not available then add this tax. - //Add this tax as a column in related table - if($sh != '' && $sh == 'sh') - { - $taxid = $adb->getUniqueID("vtiger_shippingtaxinfo"); - $taxname = "shtax".$taxid; - - $query = "alter table vtiger_inventoryshippingrel add column $taxname decimal(7,3) default NULL"; - } - else - { - $taxid = $adb->getUniqueID("vtiger_inventorytaxinfo"); - $taxname = "tax".$taxid; - $query = "alter table vtiger_inventoryproductrel add column $taxname decimal(7,3) default NULL"; - } - $res = $adb->query($query); - - //if the tax is added as a column then we should add this tax in the list of taxes - if($res) - { - if($sh != '' && $sh == 'sh') - $query1 = "insert into vtiger_shippingtaxinfo values($taxid,'".$taxname."','".$taxlabel."','".$taxvalue."',0)"; - else - $query1 = "insert into vtiger_inventorytaxinfo values($taxid,'".$taxname."','".$taxlabel."','".$taxvalue."',0)"; - - $res1 = $adb->query($query1); - } - - $log->debug("Exit from function addTaxType($taxlabel, $taxvalue)"); - if($res1) - return ''; - else - return "There may be some problem in adding the Tax type. Please try again"; -} - -/** Function used to Enable or Disable the tax type - * @param string $taxname - taxname to enable or disble - * @param int $deleted - 0 or 1 where 0 to enable and 1 to disable - * @param string $sh - sh or empty, if sh passed then the enable/disable will be done in shipping and handling tax table ie.,vtiger_shippingtaxinfo else this enable/disable will be done in Product tax table ie., in vtiger_inventorytaxinfo - * @return void - */ -function changeDeleted($taxname, $deleted, $sh='') -{ - global $log, $adb; - $log->debug("Entering into function changeDeleted($taxname, $deleted, $sh)"); - - if($sh == 'sh') - $adb->query("update vtiger_shippingtaxinfo set deleted=$deleted where taxname=\"$taxname\""); - else - $adb->query("update vtiger_inventorytaxinfo set deleted=$deleted where taxname=\"$taxname\""); - $log->debug("Exit from function changeDeleted($taxname, $deleted, $sh)"); -} - -?> +assign("EDIT_MODE", 'true'); +} +elseif($_REQUEST['sh_edit_tax'] == 'true') +{ + $smarty->assign("SH_EDIT_MODE", 'true'); +} + +//To add tax +if($_REQUEST['add_tax_type'] == 'true') +{ + //Add the given tax name and value as a new tax type + echo addTaxType($_REQUEST['addTaxLabel'],$_REQUEST['addTaxValue']); + $getlist = true; +} +elseif($_REQUEST['sh_add_tax_type'] == 'true') +{ + echo addTaxType($_REQUEST['sh_addTaxLabel'],$_REQUEST['sh_addTaxValue'],'sh'); + $getlist = true; +} + +//To Disable ie., delete or enable +if(($_REQUEST['disable'] == 'true' || $_REQUEST['enable'] == 'true') && $_REQUEST['taxname'] != '') +{ + if($_REQUEST['disable'] == 'true') + changeDeleted($_REQUEST['taxname'],1); + else + changeDeleted($_REQUEST['taxname'],0); + $getlist = true; +} +elseif(($_REQUEST['sh_disable'] == 'true' || $_REQUEST['sh_enable'] == 'true') && $_REQUEST['sh_taxname'] != '') +{ + if($_REQUEST['sh_disable'] == 'true') + changeDeleted($_REQUEST['sh_taxname'],1,'sh'); + else + changeDeleted($_REQUEST['sh_taxname'],0,'sh'); + $getlist = true; +} + +//after done save or enable/disable or added new tax the list will be retrieved again from db +if($getlist) +{ + $tax_details = getAllTaxes(); + $sh_tax_details = getAllTaxes('all','sh'); +} + +$smarty->assign("TAX_COUNT", count($tax_details)); +$smarty->assign("SH_TAX_COUNT", count($sh_tax_details)); + +if(count($tax_details) == 0) + $smarty->assign("TAX_COUNT", 0); +if(count($sh_tax_details) == 0) + $smarty->assign("SH_TAX_COUNT", 0); + +$smarty->assign("TAX_VALUES", $tax_details); + +$smarty->assign("SH_TAX_VALUES", $sh_tax_details); + +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("MOD", $mod_strings); +$smarty->display("Settings/TaxConfig.tpl"); + + +/** Function to update the list of Tax percentages for the passed tax types + * @param array $new_percentages - array of tax types and the values like [taxid]=new value ie., [1]=3.56, [2]=11.45 + * @param string $sh - sh or empty, if sh passed then update will be done in shipping and handling related table + * @return void + */ +function updateTaxPercentages($new_percentages, $sh='') +{ + global $adb, $log; + $log->debug("Entering into the function updateTaxPercentages"); + + foreach($new_percentages as $taxid => $new_val) + { + if($new_val != '') + { + if($sh != '' && $sh == 'sh') + $query = "update vtiger_shippingtaxinfo set percentage=\"$new_val\" where taxid=\"$taxid\""; + else + $query = "update vtiger_inventorytaxinfo set percentage = \"$new_val\" where taxid=\"$taxid\""; + $adb->query($query); + } + } + + $log->debug("Exiting from the function updateTaxPercentages"); +} + +/** Function to update the list of Tax Labels for the taxes + * @param array $new_labels - array of tax types and the values like [taxid]=new label ie., [1]=aa, [2]=bb + * @param string $sh - sh or empty, if sh passed then update will be done in shipping and handling related table + * @return void + */ +function updateTaxLabels($new_labels, $sh='') +{ + global $adb, $log; + $log->debug("Entering into the function updateTaxPercentages"); + + foreach($new_labels as $taxid => $new_val) + { + if($new_val != '') + { + if($sh != '' && $sh == 'sh') + $query = "update vtiger_shippingtaxinfo set taxlabel= \"$new_val\" where taxid=\"$taxid\""; + else + $query = "update vtiger_inventorytaxinfo set taxlabel = \"$new_val\" where taxid=\"$taxid\""; + $adb->query($query); + } + } + + $log->debug("Exiting from the function updateTaxPercentages"); +} +/** Function used to add the tax type which will do database alterations + * @param string $taxlabel - tax label name to be added + * @param string $taxvalue - tax value to be added + * @param string $sh - sh or empty , if sh passed then the tax will be added in shipping and handling related table + * @return void + */ +function addTaxType($taxlabel, $taxvalue, $sh='') +{ + global $adb, $log; + $log->debug("Entering into function addTaxType($taxlabel, $taxvalue, $sh)"); + + //First we will check whether the tax is already available or not + if($sh != '' && $sh == 'sh') + $check_query = "select taxlabel from vtiger_shippingtaxinfo where taxlabel='".addslashes($taxlabel)."'"; + else + $check_query = "select taxlabel from vtiger_inventorytaxinfo where taxlabel='".addslashes($taxlabel)."'"; + $check_res = $adb->query($check_query); + + if($adb->num_rows($check_res) > 0) + return "This tax is already available"; + + //if the tax is not available then add this tax. + //Add this tax as a column in related table + if($sh != '' && $sh == 'sh') + { + $taxid = $adb->getUniqueID("vtiger_shippingtaxinfo"); + $taxname = "shtax".$taxid; + $query = "alter table vtiger_inventoryshippingrel add column $taxname decimal(7,3) default NULL"; + } + else + { + $taxid = $adb->getUniqueID("vtiger_inventorytaxinfo"); + $taxname = "tax".$taxid; + $query = "alter table vtiger_inventoryproductrel add column $taxname decimal(7,3) default NULL"; + } + $res = $adb->query($query); + + //if the tax is added as a column then we should add this tax in the list of taxes + if($res) + { + if($sh != '' && $sh == 'sh') + $query1 = "insert into vtiger_shippingtaxinfo values($taxid,'".$taxname."','".$taxlabel."','".$taxvalue."',0)"; + else + $query1 = "insert into vtiger_inventorytaxinfo values($taxid,'".$taxname."','".$taxlabel."','".$taxvalue."',0)"; + + $res1 = $adb->query($query1); + } + + $log->debug("Exit from function addTaxType($taxlabel, $taxvalue)"); + if($res1) + return ''; + else + return "There may be some problem in adding the Tax type. Please try again"; +} + +/** Function used to Enable or Disable the tax type + * @param string $taxname - taxname to enable or disble + * @param int $deleted - 0 or 1 where 0 to enable and 1 to disable + * @param string $sh - sh or empty, if sh passed then the enable/disable will be done in shipping and handling tax table ie.,vtiger_shippingtaxinfo else this enable/disable will be done in Product tax table ie., in vtiger_inventorytaxinfo + * @return void + */ +function changeDeleted($taxname, $deleted, $sh='') +{ + global $log, $adb; + $log->debug("Entering into function changeDeleted($taxname, $deleted, $sh)"); + + if($sh == 'sh') + $adb->query("update vtiger_shippingtaxinfo set deleted=$deleted where taxname=\"$taxname\""); + else + $adb->query("update vtiger_inventorytaxinfo set deleted=$deleted where taxname=\"$taxname\""); + $log->debug("Exit from function changeDeleted($taxname, $deleted, $sh)"); +} + +?> Modified: vtigercrm/trunk/modules/Users/Authenticate.php ============================================================================== --- vtigercrm/trunk/modules/Users/Authenticate.php (original) +++ vtigercrm/trunk/modules/Users/Authenticate.php Tue Oct 31 03:40:43 2006 @@ -20,14 +20,14 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('modules/Users/CreateUserPrivilegeFile.php'); require_once('include/logging.php'); require_once('user_privileges/audit_trail.php'); global $mod_strings; -$focus = new User(); +$focus = new Users(); // Add in defensive code here. $focus->column_fields["user_name"] = to_html($_REQUEST['user_name']); Modified: vtigercrm/trunk/modules/Users/ChangePassword.php ============================================================================== --- vtigercrm/trunk/modules/Users/ChangePassword.php (original) +++ vtigercrm/trunk/modules/Users/ChangePassword.php Tue Oct 31 03:40:43 2006 @@ -23,7 +23,7 @@ // The popup_picker.html file is used for generating a list from which to find and choose one instance. global $theme; -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php ============================================================================== --- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original) +++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('config.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/utils/utils.php'); require_once('include/utils/GetUserGroups.php'); @@ -32,7 +32,7 @@ $newbuf .="retrieve_entity_info($userid,"Users"); $userInfo=Array(); $user_focus->column_fields["id"] = ''; @@ -120,7 +120,7 @@ $newbuf .="retrieve_entity_info($userid,"Users"); if($user_focus->is_admin == 'on') { Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Oct 31 03:40:43 2006 @@ -412,7 +412,7 @@ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,25,2,'T~O',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,25,2,'T~O',1,null,'BAS')"); //Added on 26-12-2005 to add attachment in ticket editview - $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,12,26,1,'V~O',0,3,'BAS')"); + $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,12,25,1,'V~O',0,3,'BAS')"); $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'title','vtiger_troubletickets',1,'22','ticket_title','Title',1,0,0,100,1,26,1,'V~M',0,1,'BAS')"); $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_troubletickets',1,'19','description','Description',1,0,0,100,1,28,1,'V~O',0,2,'BAS')"); @@ -428,7 +428,7 @@ $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").",'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,1,31,'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')"); @@ -502,8 +502,8 @@ $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,23,1,'V~M',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,2,23,1,'V~O',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')"); - $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,9,23,1,'T~O',1,null,'BAS')"); + $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,22,1,'T~O',1,null,'BAS')"); $this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,null,'BAS')"); //Block21 -- End @@ -912,6 +912,25 @@ //user Details End +//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')"); // Insert End Modified: vtigercrm/trunk/modules/Users/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Users/DetailView.php (original) +++ vtigercrm/trunk/modules/Users/DetailView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/utils/utils.php'); require_once('include/utils/CommonUtils.php'); require_once('include/utils/UserInfoUtil.php'); @@ -37,7 +37,7 @@ global $app_strings; global $mod_strings; -$focus = new User(); +$focus = new Users(); if(!empty($_REQUEST['record'])) { $focus->retrieve_entity_info($_REQUEST['record'],'Users'); Modified: vtigercrm/trunk/modules/Users/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Users/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Users/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -24,7 +24,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $userObj = new User(); + $userObj = new Users(); $userObj->retrieve_entity_info($crmid,"Users"); $userObj->column_fields[$fieldname] = $fieldvalue; $userObj->id = $crmid; Modified: vtigercrm/trunk/modules/Users/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Users/EditView.php (original) +++ vtigercrm/trunk/modules/Users/EditView.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/utils/UserInfoUtil.php'); require_once('modules/Users/Forms.php'); require_once('include/database/PearDatabase.php'); @@ -36,7 +36,7 @@ $smarty=new vtigerCRM_Smarty; -$focus = new User(); +$focus = new Users(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { $smarty->assign("ID",$_REQUEST['record']); Modified: vtigercrm/trunk/modules/Users/ListLoginHistory.php ============================================================================== --- vtigercrm/trunk/modules/Users/ListLoginHistory.php (original) +++ vtigercrm/trunk/modules/Users/ListLoginHistory.php Tue Oct 31 03:40:43 2006 @@ -12,7 +12,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); @@ -42,7 +42,7 @@ $category = getParenttab(); -$oUser = new User($id); +$oUser = new Users($id); $user_list = getUserslist(); Modified: vtigercrm/trunk/modules/Users/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Users/ListView.php (original) +++ vtigercrm/trunk/modules/Users/ListView.php Tue Oct 31 03:40:43 2006 @@ -24,7 +24,7 @@ global $current_language; $mod_strings = return_module_language($current_language,'Users'); $category = getParentTab(); -$focus = new User(); +$focus = new Users(); $smarty = new vtigerCRM_Smarty; $no_of_users=UserCount(); //Retreiving the start value from request Modified: vtigercrm/trunk/modules/Users/Logout.php ============================================================================== --- vtigercrm/trunk/modules/Users/Logout.php (original) +++ vtigercrm/trunk/modules/Users/Logout.php Tue Oct 31 03:40:43 2006 @@ -20,7 +20,7 @@ require_once('include/logging.php'); require_once('database/DatabaseConnection.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('config.php'); require_once('include/db_backup/backup.php'); require_once('include/db_backup/ftp.php'); Modified: vtigercrm/trunk/modules/Users/Save.php ============================================================================== --- vtigercrm/trunk/modules/Users/Save.php (original) +++ vtigercrm/trunk/modules/Users/Save.php Tue Oct 31 03:40:43 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('include/logging.php'); require_once('include/utils/UserInfoUtil.php'); $log =& LoggerManager::getLogger('index'); @@ -46,7 +46,7 @@ if (isset($_POST['record']) && !is_admin($current_user) && $_POST['record'] != $current_user->id) echo ("Unauthorized access to user administration."); elseif (!isset($_POST['record']) && !is_admin($current_user)) echo ("Unauthorized access to user administration."); -$focus = new User(); +$focus = new Users(); if(isset($_REQUEST["record"]) && $_REQUEST["record"] != '') { $focus->mode='edit'; Modified: vtigercrm/trunk/modules/Users/ShowAuditTrail.php ============================================================================== --- vtigercrm/trunk/modules/Users/ShowAuditTrail.php (original) +++ vtigercrm/trunk/modules/Users/ShowAuditTrail.php Tue Oct 31 03:40:43 2006 @@ -12,7 +12,7 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/AuditTrail.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); Modified: vtigercrm/trunk/modules/Users/ShowHistory.php ============================================================================== --- vtigercrm/trunk/modules/Users/ShowHistory.php (original) +++ vtigercrm/trunk/modules/Users/ShowHistory.php Tue Oct 31 03:40:43 2006 @@ -12,11 +12,11 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/LoginHistory.php'); -require_once('modules/Users/User.php'); +require_once('modules/Users/Users.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -#require_once('modules/Users/User.php'); +#require_once('modules/Users/Users.php'); require_once('include/utils/utils.php'); global $app_strings; Modified: vtigercrm/trunk/modules/Users/about_us.php ============================================================================== --- vtigercrm/trunk/modules/Users/about_us.php (original) +++ vtigercrm/trunk/modules/Users/about_us.php Tue Oct 31 03:40:43 2006 @@ -22,7 +22,7 @@ } else { - $patch_string = "--None--"; + $patch_string = $vtiger_current_version; } global $app_strings; global $app_list_strings; @@ -83,18 +83,20 @@ - + + + - + - + Modified: vtigercrm/trunk/modules/Users/massChangeStatus.php ============================================================================== --- vtigercrm/trunk/modules/Users/massChangeStatus.php (original) +++ vtigercrm/trunk/modules/Users/massChangeStatus.php Tue Oct 31 03:40:43 2006 @@ -15,12 +15,12 @@ require_once('include/ComboUtil.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); global $app_list_strings; global $app_strings; global $current_user; -$focus = new Lead(); +$focus = new Leads(); $idlist = $_POST['idlist']; //echo $idlist; Modified: vtigercrm/trunk/modules/Users/populatetemplate.php ============================================================================== --- vtigercrm/trunk/modules/Users/populatetemplate.php (original) +++ vtigercrm/trunk/modules/Users/populatetemplate.php Tue Oct 31 03:40:43 2006 @@ -10,9 +10,9 @@ ********************************************************************************/ //query the specific vtiger_table and then get the data and write the data here require_once('include/database/PearDatabase.php'); -include_once('modules/Contacts/Contact.php'); -include_once('modules/Leads/Lead.php'); -include_once('modules/Users/User.php'); +include_once('modules/Contacts/Contacts.php'); +include_once('modules/Leads/Leads.php'); +include_once('modules/Users/Users.php'); global $log; //download the template file and store it in some specific location @@ -60,11 +60,11 @@ //get the module if($module == 'leads') { - $focus = new Lead(); + $focus = new Leads(); } else { - $focus = new Contact(); + $focus = new Contacts(); } $focus->retrieve_entity_info($recordid,$module); Modified: vtigercrm/trunk/modules/Users/profilePrivileges.php ============================================================================== --- vtigercrm/trunk/modules/Users/profilePrivileges.php (original) +++ vtigercrm/trunk/modules/Users/profilePrivileges.php Tue Oct 31 03:40:43 2006 @@ -59,16 +59,24 @@ else { $profileName=getProfileName($profileId); + } $smarty->assign("PROFILE_NAME", $profileName); if(isset($_REQUEST['profile_description']) && $_REQUEST['profile_description'] != '' && $_REQUEST['mode'] == 'create') + $smarty->assign("PROFILE_DESCRIPTION",$_REQUEST['profile_description']); +else +{ + $profileDescription = getProfileDescription($profileId); +} + +$smarty->assign("Profile_Name", $profileName); +$smarty->assign("Profile_Description", $profileDescription); + if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != '') $smarty->assign("MODE",$_REQUEST['mode']); - - //Initially setting the secondary selected vtiger_tab Modified: vtigercrm/trunk/modules/Users/updateLeadDBStatus.php ============================================================================== --- vtigercrm/trunk/modules/Users/updateLeadDBStatus.php (original) +++ vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Tue Oct 31 03:40:43 2006 @@ -19,6 +19,47 @@ $viewid = $_REQUEST['viewname']; $return_module = $_REQUEST['return_module']; $return_action = $_REQUEST['return_action']; +$module_array = array ( + 'Leads' => 'updateLeadGroupRelation', + 'Accounts' => 'updateAccountGroupRelation', + 'Contacts' => 'updateContactGroupRelation', + 'Potentials' => 'updatePotentialGroupRelation', + 'Quotes' => 'updateQuoteGroupRelation', + 'SalesOrder' => 'updateSoGroupRelation', + 'Invoice' => 'updateInvoiceGroupRelation', + 'PurchaseOrder' => 'updatePoGroupRelation', + 'HelpDesk' => 'updateTicketGroupRelation', + 'Campaigns' => 'updateCampaignGroupRelation', + 'Calendar' => 'updateActivityGroupRelation', + ); + +$deletegroup_array = array ( + 'Leads'=>'vtiger_leadgrouprelation', + 'Accounts'=>'vtiger_accountgrouprelation', + 'Contacts'=>'vtiger_contactgrouprelation', + 'Potentials'=>'vtiger_potentialgrouprelation', + 'Quotes'=>'vtiger_quotegrouprelation', + 'SalesOrder'=>'vtiger_sogrouprelation', + 'Invoice'=>'vtiger_invoicegrouprelation', + 'PurchaseOrder'=>'vtiger_pogrouprelation', + 'HelpDesk'=>'vtiger_ticketgrouprelation', + 'Campaigns'=>'vtiger_campaigngrouprelation', + 'Calendar'=>'vtiger_activitygrouprelation', + ); +$tableId_array= array ( + 'Leads'=>'leadid', + 'Accounts'=>'accountid', + 'Contacts'=>'contactid', + 'Potentials'=>'potentialid', + 'Quotes'=>'quoteid', + 'SalesOrder'=>'salesorderid', + 'Invoice'=>'invoiceid', + 'PurchaseOrder'=>'purchaseorderid', + 'HelpDesk'=>'ticketid', + 'Campaigns'=>'campaignid', + 'Calendar'=>'activityid', + ); + global $current_user; global $adb; $storearray = explode(";",trim($idlist,';')); @@ -26,15 +67,31 @@ $ids_list = array(); $date_var = date('YmdHis'); -if(isset($_REQUEST['user_id']) && $_REQUEST['user_id']!='') + +if((isset($_REQUEST['user_id']) && $_REQUEST['user_id']!='') || ($_REQUEST['group_id'] != '')) { foreach($storearray as $id) { if(isPermitted($return_module,'EditView',$id) == 'yes') { - if($id != '') { + if($_REQUEST['user_id'] != '' && $id != '') + { + //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); + + //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); + } + else if($_REQUEST['group_id'] != '' && $id != '') + { + //CHANGE HERE -- Here we have to use the getGroupName function. But that function is not correct one because they have used this function to get the assigned group name for the entity - Mickie + $groupname = $adb->query_result($adb->query("select groupname from vtiger_groups where groupid=".$_REQUEST['group_id']),0,'groupname'); + //This is to update the entity - group relation + $module_array[$return_module]($id,$groupname); + //Now we have to set the smownerid as 0 + $adb->query("update vtiger_crmentity set smownerid=0 where crmid=$id"); } } else Modified: vtigercrm/trunk/modules/Vendors/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Vendors/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); //Redirecting Header for single page layout require_once('user_privileges/default_module_view.php'); global $singlepane_view; @@ -21,7 +21,7 @@ else { global $currentModule; -$focus = new Vendor(); +$focus = new Vendors(); $currentmodule = $_REQUEST['module']; $RECORD = $_REQUEST['record']; Modified: vtigercrm/trunk/modules/Vendors/Delete.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/Delete.php (original) +++ vtigercrm/trunk/modules/Vendors/Delete.php Tue Oct 31 03:40:43 2006 @@ -18,13 +18,13 @@ * defined return URL. ********************************************************************************/ -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); global $mod_strings; require_once('include/logging.php'); $log = LoggerManager::getLogger('product_delete'); -$focus = new Vendor(); +$focus = new Vendors(); if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); Modified: vtigercrm/trunk/modules/Vendors/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/DetailView.php (original) +++ vtigercrm/trunk/modules/Vendors/DetailView.php Tue Oct 31 03:40:43 2006 @@ -10,11 +10,11 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/utils/utils.php'); require_once('user_privileges/default_module_view.php'); -$focus = new Vendor(); +$focus = new Vendors(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { Modified: vtigercrm/trunk/modules/Vendors/DetailViewAjax.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/DetailViewAjax.php (original) +++ vtigercrm/trunk/modules/Vendors/DetailViewAjax.php Tue Oct 31 03:40:43 2006 @@ -10,7 +10,7 @@ ********************************************************************************/ require_once('include/logging.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/database/PearDatabase.php'); global $adb; @@ -25,7 +25,7 @@ $fieldvalue = utf8RawUrlDecode($_REQUEST["fieldValue"]); if($crmid != "") { - $modObj = new Vendor(); + $modObj = new Vendors(); $modObj->retrieve_entity_info($crmid,"Vendors"); $modObj->column_fields[$fieldname] = $fieldvalue; $modObj->id = $crmid; Modified: vtigercrm/trunk/modules/Vendors/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/EditView.php (original) +++ vtigercrm/trunk/modules/Vendors/EditView.php Tue Oct 31 03:40:43 2006 @@ -11,12 +11,12 @@ require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/FormValidationUtil.php'); global $app_strings,$mod_strings,$theme,$currentModule; -$focus = new Vendor(); +$focus = new Vendors(); $smarty = new vtigerCRM_Smarty(); if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') Modified: vtigercrm/trunk/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/ListView.php (original) +++ vtigercrm/trunk/modules/Vendors/ListView.php Tue Oct 31 03:40:43 2006 @@ -11,7 +11,7 @@ require_once('include/database/PearDatabase.php'); require_once('include/database/Postgres8.php'); require_once('Smarty_setup.php'); -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/ListView/ListView.php'); require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); @@ -32,7 +32,7 @@ $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$focus = new Vendor(); +$focus = new Vendors(); $other_text = Array(); if(!$_SESSION['lvs'][$currentModule]) Modified: vtigercrm/trunk/modules/Vendors/Save.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/Save.php (original) +++ vtigercrm/trunk/modules/Vendors/Save.php Tue Oct 31 03:40:43 2006 @@ -21,11 +21,11 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('modules/Vendors/Vendor.php'); +require_once('modules/Vendors/Vendors.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -$focus = new Vendor(); +$focus = new Vendors(); setObjectValuesFromRequest(&$focus); $focus->save("Vendors"); Modified: vtigercrm/trunk/modules/Webmails/CallRelatedList.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/CallRelatedList.php (original) +++ vtigercrm/trunk/modules/Webmails/CallRelatedList.php Tue Oct 31 03:40:43 2006 @@ -11,7 +11,7 @@ global $current_user; require_once('Smarty_setup.php'); -require_once('modules/Leads/Lead.php'); +require_once('modules/Leads/Leads.php'); require_once('include/utils/utils.php'); require_once('include/utils/UserInfoUtil.php'); require_once('data/Tracker.php'); Modified: vtigercrm/trunk/modules/Webmails/Save.php ============================================================================== --- vtigercrm/trunk/modules/Webmails/Save.php (original) +++ vtigercrm/trunk/modules/Webmails/Save.php Tue Oct 31 03:40:43 2006 @@ -9,7 +9,7 @@ * ********************************************************************************/ -require_once('modules/Emails/Email.php'); +require_once('modules/Emails/Emails.php'); require_once('modules/Webmails/Webmail.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); @@ -20,7 +20,7 @@ global $current_user; $local_log =& LoggerManager::getLogger('index'); -$focus = new Email(); +$focus = new Emails(); $to_address = explode(";",$_REQUEST['to_list']); $cc_address = explode(";",$_REQUEST['cc_list']); @@ -61,8 +61,8 @@ 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/Contact.php'); - $contact_focus = new 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"); Modified: vtigercrm/trunk/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/schema/DatabaseSchema.xml (original) +++ vtigercrm/trunk/schema/DatabaseSchema.xml Tue Oct 31 03:40:43 2006 @@ -6082,6 +6082,29 @@
        Ahmed
        Anusha
        Bharath
        Bharathi
        Don
        Ela
        Gopal
        Jeri
        Mani
        Mickie
        Minnie
        Nithya
        Philip
        Radiant
        Richie
        SRaj
        Vashni
         
        Aissa Belaid
        + + + + + + + + + + + + + + + + + + + tabid + + Type=InnoDB +
        + Modified: vtigercrm/trunk/soap/firefoxtoolbar.php ============================================================================== --- vtigercrm/trunk/soap/firefoxtoolbar.php (original) +++ vtigercrm/trunk/soap/firefoxtoolbar.php Tue Oct 31 03:40:43 2006 @@ -175,8 +175,8 @@ function CheckLeadPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -193,8 +193,8 @@ function CheckContactPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -211,8 +211,8 @@ function CheckAccountPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -229,8 +229,8 @@ function CheckTicketPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -247,8 +247,8 @@ function CheckVendorPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -265,8 +265,8 @@ function CheckProductPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -283,8 +283,8 @@ function CheckNotePermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -301,8 +301,8 @@ function CheckSitePermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -319,8 +319,8 @@ function CheckRssPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -340,8 +340,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -365,11 +365,11 @@ function LogintoVtigerCRM($user_name,$password) { global $log; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); $return_access = "FALSE"; - $objuser = new User(); + $objuser = new Users(); if($password != "") { @@ -397,8 +397,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -436,15 +436,15 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Note.php"); - - $focus = new Note(); + require_once("modules/Notes/Notes.php"); + + $focus = new Notes(); if(isPermitted("Notes","EditView") == "yes") { $focus->column_fields['notes_title'] = $subject; @@ -473,17 +473,17 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Product.php"); + require_once("modules/Products/Products.php"); if(isPermitted("Products","EditView") == "yes") { - $focus = new Product(); + $focus = new Products(); $focus->column_fields['productname'] = $productname; $focus->column_fields['productcode'] = $code; $focus->column_fields['website'] = $website; @@ -508,16 +508,16 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Vendor.php"); + require_once("modules/Vendors/Vendors.php"); if(isPermitted("Vendors","EditView" ) == "yes") { - $focus = new Vendor(); + $focus = new Vendors(); $focus->column_fields['vendorname'] = $vendorname; $focus->column_fields['email'] = $email; $focus->column_fields['phone'] = $phone; @@ -547,8 +547,8 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -591,15 +591,15 @@ 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/User.php"); - $seed_user=new 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/Account.php"); + require_once("modules/Accounts/Accounts.php"); if(isPermitted("Accounts","EditView") == "yes") { - $account=new Account(); + $account=new Accounts(); $account->column_fields['accountname']=$accountname; $account->column_fields['email1']=$email; $account->column_fields['phone']=$phone; @@ -642,15 +642,15 @@ global $log; global $adb; global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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/Lead.php"); - - $focus = new Lead(); + require_once("modules/Leads/Leads.php"); + + $focus = new Leads(); if(isPermitted("Leads","EditView") == "yes") { $focus->column_fields['lastname'] = $lastname; @@ -689,16 +689,16 @@ { global $adb,$log; global $current_user; - require_once('modules/Users/User.php'); - $seed_user = new 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/Contact.php'); + require_once('modules/Contacts/Contacts.php'); if(isPermitted("Contacts","EditView") == "yes") { - $contact = new Contact(); + $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 Modified: vtigercrm/trunk/soap/thunderbirdplugin.php ============================================================================== --- vtigercrm/trunk/soap/thunderbirdplugin.php (original) +++ vtigercrm/trunk/soap/thunderbirdplugin.php Tue Oct 31 03:40:43 2006 @@ -13,7 +13,7 @@ require_once('include/logging.php'); require_once('include/nusoap/nusoap.php'); require_once('include/database/PearDatabase.php'); -require_once('modules/Contacts/Contact.php'); +require_once('modules/Contacts/Contacts.php'); $log = &LoggerManager::getLogger('thunderbirdplugin'); @@ -173,9 +173,9 @@ function SearchContactsByEmail($username,$emailaddress) { - require_once('modules/Contacts/Contact.php'); - - $seed_contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); $output_list = Array(); $response = $seed_contact->get_searchbyemailid($username,$emailaddress); @@ -201,13 +201,13 @@ function track_email($user_name, $contact_ids, $date_sent, $email_subject, $email_body) { global $adb; - require_once('modules/Users/User.php'); - require_once('modules/Emails/Email.php'); - - $seed_user = new User(); + 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 Email(); + $email = new Emails(); //$log->debug($msgdtls['contactid']); $emailbody = str_replace("'", "''", $email_body); $emailsubject = str_replace("'", "''",$email_subject); @@ -241,9 +241,9 @@ { global $adb; global $log; - require_once('modules/Contacts/Contact.php'); - - $seed_contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); $output_list = Array(); $query = $seed_contact->get_contactsforol($username); @@ -332,8 +332,8 @@ $rows_count = $db->getRowCount($result); if($rows_count==0) { - require_once('modules/Accounts/Account.php'); - $account = new Account(); + 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"); @@ -360,10 +360,10 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new 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"); @@ -384,7 +384,7 @@ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); } - $contact = new Contact(); + $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") : ""; @@ -418,10 +418,10 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Leads/Lead.php'); - - $seed_user = new 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"); @@ -442,7 +442,7 @@ $permitted_lists[] = $adb->query_result($result1,$i,'fieldname'); } - $Lead = new Lead(); + $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") : ""; @@ -478,8 +478,8 @@ { global $adb,$log; $return_access = 'failure'; - require_once('modules/Users/User.php'); - $objuser = new User(); + require_once('modules/Users/Users.php'); + $objuser = new Users(); if($password != "" && $user_name != '') { $objuser->column_fields['user_name'] = $user_name; @@ -511,8 +511,8 @@ function CheckContactPerm($user_name) { global $current_user; - require_once('modules/Users/User.php'); - $seed_user = new 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"); @@ -528,8 +528,8 @@ function CheckContactViewPerm($user_name) { global $current_user,$log; - require_once('modules/Users/User.php'); - $seed_user = new 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"); Modified: vtigercrm/trunk/soap/vtigerolservice.php ============================================================================== --- vtigercrm/trunk/soap/vtigerolservice.php (original) +++ vtigercrm/trunk/soap/vtigerolservice.php Tue Oct 31 03:40:43 2006 @@ -280,9 +280,9 @@ function SearchContactsByEmail($username,$emailaddress) { - require_once('modules/Contacts/Contact.php'); + require_once('modules/Contacts/Contacts.php'); - $seed_contact = new Contact(); + $seed_contact = new Contacts(); $output_list = Array(); $response = $seed_contact->get_searchbyemailid($username,$emailaddress); @@ -308,17 +308,17 @@ function AddMessageToContact($username,$contactid,$msgdtls) { global $adb; - require_once('modules/Users/User.php'); - require_once('modules/Emails/Email.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Emails/Emails.php'); + + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); foreach($msgdtls as $msgdtl) { if(isset($msgdtl)) { - $email = new Email(); + $email = new Emails(); //$log->debug($msgdtls['contactid']); $email_body = str_replace("'", "''", $msgdtl['body']); $email_subject = str_replace("'", "''",$msgdtl['subject']); @@ -356,11 +356,11 @@ function LoginToVtiger($userid,$password) { global $adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); $return_access = "FALSE"; - $objuser = new User(); + $objuser = new Users(); if($password != "") { @@ -385,8 +385,8 @@ function CheckEmailPermission($username) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -403,8 +403,8 @@ function CheckContactPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -421,8 +421,8 @@ function CheckActivityPermission($username) { global $current_user; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -439,12 +439,12 @@ function AddEmailAttachment($emailid,$filedata,$filename,$filesize,$filetype,$username) { global $adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('include/utils/utils.php'); $date_var = date('YmdHis'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $crmid = $adb->getUniqueID("vtiger_crmentity"); @@ -483,9 +483,9 @@ function GetContacts($username) { global $adb; - require_once('modules/Contacts/Contact.php'); - - $seed_contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + + $seed_contact = new Contacts(); $output_list = Array(); $query = $seed_contact->get_contactsforol($username); @@ -564,15 +564,15 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.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"); - $contact = new Contact(); + $contact = new Contacts(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -646,15 +646,15 @@ { global $adb; global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.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"); - $contact = new Contact(); + $contact = new Contacts(); require('user_privileges/user_privileges_'.$current_user->id.'.php'); require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); @@ -727,15 +727,15 @@ function DeleteContacts($username,$crmid) { global $current_user; - require_once('modules/Users/User.php'); - require_once('modules/Contacts/Contact.php'); - - $seed_user = new User(); + require_once('modules/Users/Users.php'); + require_once('modules/Contacts/Contacts.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"); - $contact = new Contact(); + $contact = new Contacts(); $contact->id = $crmid; $contact->mark_deleted($contact->id); @@ -760,8 +760,8 @@ $rows_count = $db->getRowCount($result); if($rows_count==0) { - require_once('modules/Accounts/Account.php'); - $account = new Account(); + 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"); @@ -856,10 +856,10 @@ function AddTasks($username,$taskdtls) { global $current_user,$adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -937,10 +937,10 @@ function UpdateTasks($username,$taskdtls) { global $current_user,$adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1022,10 +1022,10 @@ function DeleteTasks($username,$crmid) { global $current_user; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1091,10 +1091,10 @@ function AddClndr($username,$clndrdtls) { global $current_user,$adb; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1159,10 +1159,10 @@ { global $current_user; global $adb,$log; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); @@ -1228,10 +1228,10 @@ function DeleteClndr($username,$crmid) { global $current_user; - require_once('modules/Users/User.php'); + require_once('modules/Users/Users.php'); require_once('modules/Calendar/Activity.php'); - $seed_user = new User(); + $seed_user = new Users(); $user_id = $seed_user->retrieve_user_id($username); $current_user = $seed_user; $current_user->retrieve_entity_info($user_id,"Users"); Modified: vtigercrm/trunk/soap/webforms.php ============================================================================== --- vtigercrm/trunk/soap/webforms.php (original) +++ vtigercrm/trunk/soap/webforms.php Tue Oct 31 03:40:43 2006 @@ -82,8 +82,8 @@ $assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id'); } - require_once("modules/Leads/Lead.php"); - $focus = new Lead(); + require_once("modules/Leads/Leads.php"); + $focus = new Leads(); $focus->column_fields['lastname'] = $lastname; $focus->column_fields['email'] = $email; $focus->column_fields['phone'] = $phone; @@ -126,8 +126,8 @@ $assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id'); } - require_once('modules/Contacts/Contact.php'); - $focus = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $focus = new Contacts(); $focus->column_fields['firstname'] = $first_name; $focus->column_fields['lastname'] = $last_name; Modified: vtigercrm/trunk/soap/wordplugin.php ============================================================================== --- vtigercrm/trunk/soap/wordplugin.php (original) +++ vtigercrm/trunk/soap/wordplugin.php Tue Oct 31 03:40:43 2006 @@ -215,8 +215,8 @@ function get_tickets_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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'); @@ -237,15 +237,15 @@ function get_contacts_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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","index") == "yes") { - require_once('modules/Contacts/Contact.php'); - $contact = new Contact(); + require_once('modules/Contacts/Contacts.php'); + $contact = new Contacts(); $log->debug($contact->getColumnNames()); return $contact->getColumnNames(); } @@ -261,15 +261,15 @@ function get_accounts_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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("Accounts","index") == "yes") { - require_once('modules/Accounts/Account.php'); - $account = new Account(); + require_once('modules/Accounts/Accounts.php'); + $account = new Accounts(); $log->debug($account->getColumnNames_Acnt()); return $account->getColumnNames_Acnt(); } @@ -285,16 +285,16 @@ function get_leads_columns($user_name, $password) { global $current_user,$log; - require_once("modules/Users/User.php"); - $seed_user=new 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("Leads","index") == "yes") { - require_once('modules/Leads/Lead.php'); - $lead = new Lead(); + require_once('modules/Leads/Leads.php'); + $lead = new Leads(); $log->debug($lead->getColumnNames_Lead()); return $lead->getColumnNames_Lead(); } @@ -309,12 +309,12 @@ function get_user_columns($user_name, $password) { global $current_user; - require_once('modules/Users/User.php'); - $seed_user=new 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'); - $user = new User(); + $user = new Users(); return $user->getColumnNames_User(); } @@ -323,8 +323,8 @@ function create_session($user_name, $password) { global $adb,$log; - require_once('modules/Users/User.php'); - $objuser = new User(); + require_once('modules/Users/Users.php'); + $objuser = new Users(); if($password != "" && $user_name != '') { $objuser->column_fields['user_name'] = $user_name; Modified: vtigercrm/trunk/vtigerversion.php ============================================================================== --- vtigercrm/trunk/vtigerversion.php (original) +++ vtigercrm/trunk/vtigerversion.php Tue Oct 31 03:40:43 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -$patch_version = '1'; +$patch_version = ''; $modified_database = ''; -$vtiger_current_version = '5.0.0'; +$vtiger_current_version = '5.0.2'; ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 31 07:02:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 12:02:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9763 - in /vtigercrm/trunk: Smarty/templates/ modules/Accounts/ modules/Activities/ modules/Campaigns/ modules/Contacts/ modules/Emails/ modules/Leads/ modules/Migration/ modules/Migration/ModifyDatabase/ modules/Notes/ modules/Potentials/ modules/PriceBooks/ modules/Products/ modules/Quotes/ modules/Users/ modules/Vendors/ themes/alphagrey/images/ themes/bluelagoon/images/ themes/woodspice/images/ Message-ID: <20061031120210.2F3C3788BE8@vtiger.fosslabs.com> Author: richie Date: Tue Oct 31 05:01:29 2006 New Revision: 9763 Log: new files added for 5.0.2 Added: vtigercrm/trunk/Smarty/templates/pendingActivities.tpl vtigercrm/trunk/Smarty/templates/upcomingActivities.tpl vtigercrm/trunk/modules/Accounts/Accounts.php vtigercrm/trunk/modules/Activities/ vtigercrm/trunk/modules/Campaigns/Campaigns.php vtigercrm/trunk/modules/Contacts/Contacts.php vtigercrm/trunk/modules/Emails/Emails.php vtigercrm/trunk/modules/Leads/Leads.php (with props) vtigercrm/trunk/modules/Migration/502DBChanges.php vtigercrm/trunk/modules/Migration/ModifyDatabase/deleteCustomFields.php (with props) vtigercrm/trunk/modules/Notes/Notes.php vtigercrm/trunk/modules/Potentials/Potentials.php vtigercrm/trunk/modules/PriceBooks/PriceBooks.php (with props) vtigercrm/trunk/modules/Products/Products.php (with props) vtigercrm/trunk/modules/Quotes/Quotes.php (with props) vtigercrm/trunk/modules/Users/RenameProfile.php vtigercrm/trunk/modules/Users/Users.php (with props) vtigercrm/trunk/modules/Vendors/Vendors.php (with props) vtigercrm/trunk/themes/alphagrey/images/skype.gif (with props) vtigercrm/trunk/themes/bluelagoon/images/skype.gif (with props) vtigercrm/trunk/themes/woodspice/images/skype.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 31 07:35:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 12:35:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9764 - /vtigercrm/branches/5.0.2/Smarty/templates/Settings.tpl Message-ID: <20061031123548.BD123788B98@vtiger.fosslabs.com> Author: richie Date: Tue Oct 31 05:35:41 2006 New Revision: 9764 Log: Settings UI bug fixed Modified: vtigercrm/branches/5.0.2/Smarty/templates/Settings.tpl Modified: vtigercrm/branches/5.0.2/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/branches/5.0.2/Smarty/templates/Settings.tpl (original) +++ vtigercrm/branches/5.0.2/Smarty/templates/Settings.tpl Tue Oct 31 05:35:41 2006 @@ -495,7 +495,7 @@
        - + From vtigercrm-commits at vtiger.fosslabs.com Tue Oct 31 07:40:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 31 Oct 2006 12:40:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r9765 - /vtigercrm/trunk/Smarty/templates/Settings.tpl Message-ID: <20061031124033.120ED788B98@vtiger.fosslabs.com> Author: richie Date: Tue Oct 31 05:40:28 2006 New Revision: 9765 Log: UI issue fixed in settings home page Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Tue Oct 31 05:40:28 2006 @@ -495,7 +495,7 @@ - +